diff --git a/.changes/header.tpl.md b/.changes/header.tpl.md
new file mode 100644
index 000000000..df8faa7b2
--- /dev/null
+++ b/.changes/header.tpl.md
@@ -0,0 +1,6 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
diff --git a/src/Bundle/ChillMainBundle/config/routes/notification.yaml b/.changes/unreleased/.gitkeep
similarity index 100%
rename from src/Bundle/ChillMainBundle/config/routes/notification.yaml
rename to .changes/unreleased/.gitkeep
diff --git a/.changes/v2.0.0.md b/.changes/v2.0.0.md
new file mode 100644
index 000000000..8d70ecba6
--- /dev/null
+++ b/.changes/v2.0.0.md
@@ -0,0 +1,677 @@
+## 2.0.0
+
+* this is a release to relaunch our proceess of release with semantic versioning
+
+## Test releases
+
+### 2.0.0-beta3
+
+* [person][export] Fixed: rename the alias for `accompanying_period` to `acp` in filter associated with person
+* [activity][export] Feature: improve label for aliases in "Filter by activity type"
+* [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
+* [person][export] Fixed: some inconsistency with date filter on accompanying courses
+* [person][export] Fixed: use left join for related entities in accompanying course aggregators
+* [workflow] Feature: allow user to copy and send manually the access link for the workflow
+* [workflow] Feature: show the email addresses that received an access link for the workflow
+### 2.0.0-beta2
+
+* [workflow]: Fixed: the notification is sent when the user is added to the first step.
+* [budget] Feature: allow to desactivate some charges and resources, adding an `active` key in the configuration
+* [person] Feature: on Evaluation, allow to configure an URL from the admin
+
+### 2022-06
+
+* [workflow]: added pagination to workflow list page
+* [homepage_widget]: null error on tasks widget fixed
+* [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
+* [search]: Order of birthdate fields changed in advanced search to avoid confusion.
+* [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
+* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
+* [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
+* [admin]: Add crud for composition type in admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/611)
+* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
+
+## Test releases
+
+### 2022-05-30
+
+* fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost)
+
+### 2022-05-27
+
+* [storedobject] add title field on StoredObject entity + use it in activity documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
+* [main] add a "read more..." on comment embeddable when overflown (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
+* [person] add closing motive to closed acc course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/603)
+* [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586)
+* [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601)
+* [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702)
+* [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
+* [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
+* [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
+* [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
+* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
+* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
+
+
+### 2022-05-06
+
+* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+
+### 2021-04-29
+
+* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
+* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
+* Load relationships without gender in french fixtures
+* Add command to remove old draft accompanying periods
+* [parcours]: If users assings him/herself as referrer and job is not null. Update parcours job (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/578)
+
+### 2021-04-28
+
+* [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593)
+* [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561)
+* [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560)
+* [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565)
+* [parcours]: Comments can be unpinned + edit/delete for all users that are allowed to edit parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/566)
+
+### 2021-04-26
+
+* [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
+* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
+* [Person_search] Closed parcours shown within an accordeon that can be opened/closed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/574)
+
+### 2021-04-24
+
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
+* [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634)
+* [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572)
+* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570)
+* [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573)
+* [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943)
+* [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older
+* [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
+* [Notifications] delay the sending of notificaiton to kernel.terminate
+* [Notifications / Period user change] fix the sending of notification when user changes
+* [Activity form] invert 'incoming' and 'receiving' in Activity form
+* [Activity form] keep the same order for 'attendee' field in new and edit form
+* [list with period] use "sameas" test operator to introduce requestor in list
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
+* [evaluation_document] changing date to datetime in order to display the time at which document was created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/569)
+
+
+### 2021-04-13
+
+* [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
+* [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
+* [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);
+* [docgen] add a new context with a list of activities in course
+* [docgen] add a comment in budget lines
+* [notifications] allow to send a notification to an email address. The address receive an access link
+* [adresses] add constraints in database to avoid errors later: postcode not null, and validfrom <= validto
+* [accompanying work editor] add a label on document title input
+
+### 2021-04-07
+
+* notification list: move action buttons outside of the toggle
+* fix detecting of non-read notification
+* filter users which are disabled in search user api
+* order query for location and add pagination in list
+* allow every person which has part for a workflow  to see the workflow page
+* able to see the workflow if the evaluation document has been deleted
+* hardcode the list of supported mime types for edition with collabora
+* list of accompanying course: allow to see the pinned comment in list_item
+
+### 2021-04-06
+
+* [main] notification toggle read: correct js syntax for compilation in production (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/548)
+* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535)
+* [activity] espace entre les boutons pour supprimer les documents
+
+
+### continuous release in February and March
+
+* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
+* [person] Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported and if no keyInfos
+(https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/585)
+* [activity] display error messages above the form in creating a new location (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/481)
+* [activity] show required field in activity edit/new by an asterix in the vuejs fields (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/494)
+* [ACL] fix allow to see the course, event if the scope'course does not contains the scope's user
+* [search] enforce limit of results for fetching rsults by search api https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/576
+* [activity] Fix delete button for document (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/554)
+* [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
+* [person] add person ressource to person docgen normaliser (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/517)
+* [person] AccompanyingCourseWorkEdit: fix deleting evaluation documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/546)
+* [person] AccompanyingCourseWorkEdit: download existing documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/512)
+* [person] AccompanyingCourseWorkEdit: replace document by a new one (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/511)
+* [person] AccompanyingPeriodWork: add referrers to work, add doctrine event listener to add logged user to referrers collection and display a referrers list in work list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/502)
+* [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
+* [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
+* [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)
+* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
+* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
+* [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
+* [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)
+* [activity] do not override location if already exist (when validating new activity) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/470)
+* [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
+* [docstore] Add an API entrypoint for StoredObject (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
+* [person] Add the possibility of uploading existing documents to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
+* [person] Add title to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
+* [person] Order social issues by the field "ordering" (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/388)
+* [Person/Household list] when listing other simultaneous members of an household, exclude the members on person, not on members (avoid to show two membersship with the same person)
+* [draft periods] add a delete button (if acl granted) on each draft period listed on draft period page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/463)
+* [Person] Display suffixText in RenderPerson, PersonText.vue, RenderPersonBox.vue (was made for displaying "enfant confie") (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/441)
+* [budget]: budget enabled for persons and households (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/469)
+*  [person] residential address: show residential address or info in PersonRenderBox, refactor Residential Address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/439)
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+* [documents] Improve flex-table item-col placement when long buttons and long metadata
+* [thirdparty] Fix display of multiple contact badges so they wrap onto next line (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/482)
+* [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
+* [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
+* [template] do not list inactive templates (for doc generator)
+* [household] bugfix if position of member is null, renderbox no longer throws an error (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/480)
+* [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
+* [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
+* [activity] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
+* [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
+* [address] person badge in address history changed to open OnTheFly with all person info (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/489)
+* [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
+* [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
+* [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
+* [person_resource] separate create page created to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/504)
+* [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
+* [thirdparty] For contacts show current civility/profession in edit form + fix saving of edited information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/491)
+* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
+* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
+* [thirdparty] add firstname field to thirdparty 'child' or 'contact' types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/508)
+* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
+* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
+* [parcours] List of parcours for a specific user so they can be reassigned in case of absence (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/509)
+* [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
+* [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
+* [filiation] Possible to add person (or create onthefly) to add to filiation graph + add relation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/519)
+* [household] Within parcours listing page of household add create button (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/560)
+* [person_resource] bugfix when adding thirdparty or freetext resource + prevent personOwner themselves to be added. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/526)
+* [aside_activity] style correction + sticky-form create button (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/529)
+* [budget] order within the menu adjusted (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/592)
+* [onthefly] fix create person. Bug was noticed in filiation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/591)
+* [parcours] Create document buttons made sticky (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/532)
+* [person] Trailing guillemet removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/530)
+* [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537)
+* [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542)
+
+* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
+## Test releases
+
+### test release 2022-02-21
+
+* [notifications] Word 'un' changed to number '1' for notifications in user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/483)
+* [documents] 'gabarit' changed to 'modèle' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/405)
+* [person_resources] Menu name and order changed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/460)
+* workflow: fix sending notifications
+* [thirdparty] Extend the thirdparty search to thirdparty children (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/448)
+* [person]: AddPersons: allow creation of person or thirdparty only (no users) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [person]: AddPersons: allow creation of person or thirdparty depending on allowed types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [person]: AddPersons: add suggestion of name when creating new person or thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [main] Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber)
+* [main] Address: stronger client-side validation of addresses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/449)
+* [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
+[activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
+[activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
+* [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465)
+* [Household]: Add end date in HouseholdMember form for 'enfant hors menage' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/434)
+* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
+* [parcours]: Order social activities and only display most recent three in parcours resumé (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/481)
+* [3party]: 3party: redirect to parent when contact (child) is opened in view page
+* [parcours / addresses]: launch an event when a person change address (either through changing household or because the household is associated to a new address). If the person is localising a course, the course location go back to a temporarily address.
+* [thirdparty]: address/phonenumber/email/fonction displayed in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/401)
+* [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465)
+* [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
+
+
+
+### test release 2022-02-14
+
+* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
+* [doc-generator] do not set required fields for mainPerson, person1, person2 (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement#456)
+* [doc-generation] add age and obele in the mainPerson, person1 and person2 list + add obele in person renderString if addAge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/370)
+* [person] accompanying course work: fix on-the-fly update of thirdParty
+* fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
+* [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
+* [person] accompanying course work: fix on-the-fly update of thirdParty
+* [on-the-fly] close modal only after validation
+* [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
+* change order for accompanying course work list
+* [parcours]: Mes parcours brouillon added to user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/440)
+* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
+* [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432)
+* [parcours]: Only the referrer can toggle the intensity of the parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
+* [household]: display address of current household (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/415)
+* ajoute un ordre dans les localisation (api)
+* [pick entity]: fix translations in modal (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/419)
+* [homepage_widget]: fix translation on emergency badge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/440)
+* [person]: create person and household added to button dropdown (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/454)
+* display full address in address.text in normalization. Adapt AddressRenderBox
+* [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
+* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
+* [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+
+
+### test release 2021-02-01
+
+* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
+* renomme date de début en date d'ouverture dans le formulaire parcours
+* [homepage widget] improve content tables, improve counter pluralization with style on number
+* [notification lists] add comments counter information
+* [workflows] fix popover header with previous transition
+* [parcours]: validation + message for closing parcours adjusted.
+* [household]: household composition double edit button replaced by a delete action (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/426)
+[fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
+[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+* [person]: Comment on marital status is possible even if marital status is not defined (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/421)
+* [parcours]: In the list of person results the requestor is not displayed if defined as anonymous (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/424)
+* [bugfix]: modal closes and newly created person/thirdparty is selected when multiple persons/thirdparties are created through the modal (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/429)
+* [person_resource]: Onthefly button added to view person/thirdparty and badge differentiation for a contact-thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/428)
+* [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
+* [AddAddress] disable multiselect search, and rely only on most pertinent Cities and Street computed backend
+* [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+
+
+### test release 2021-01-31
+
+* [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)
+* [person] accompanying course: close modal when edit participation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
+* [person] accompanying course: treat validation error when editing on-the-fly entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
+* [activity] show activity attendee (présence) in the activity list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/412)
+* [activity] admin: change validation rule for social action visible field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/413)
+* [parcours]: component added to change the opening date of a parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/411)
+* [search]: listing of parcours display changed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/410)
+* [user]: page with accompanying periods to which is user is referent (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/408)
+* [person] age added to renderstring + renderbox/ vue component created to display person text (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/389)
+* [household member editor] allow to push to existing household
+
+
+### test release 2021-01-28
+
+* [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362)
+* [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364)
+* [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
+* [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
+* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
+* [person] Add residential address entity, form and list for each person
+* [aside_activity]: dynamicUserPickerType used (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/399)
+* dispatching list
+
+
+### test release 2021-01-26
+
+* [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406)
+* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
+* [person ressources]: module added
+
+
+### test release 2022-01-24
+
+* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
+* [notification: formulaire création] descend la box avec la description dans le bas du formulaire
+* [notification for activity]: fix link to activity
+* [notification] add "URGENT" before accompanying course with emergency = true
+* [notification] add a "read more" button on system notification
+* [notification] add `[Chill]` in the subject of each notification, automatically
+* [notification] add a counter for notification in activity list and accompanying period list, and search results
+* [parcours] bugfix if deathdate is not defined (eg. for a thirdparty) parcours is still displayed. Gave error before.
+* [workflow] add breadcrumb to show steps
+* [popover] add popover html popup mechanism (used by workflow breadcrumb)
+* [templates] improve updatedBy macro in item metadatas
+* [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385)
+* [workflow]
+  * add My workflow section with my opened subscriptions
+  * apply workflow on documents, accompanyingCourseWork and Evaluations
+* [wopi-link] a new vue component allow to open wopi link in a fullscreen chill-themed modal
+
+### test release 2022-01-19
+* vuejs: add dead information on all on-the-fly person render boxes, in vis graph and other templates (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/271)
+* [thirdparty] fix bug in 3rd party view: types was replaced by thirdPartyTypes
+* [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246)
+* [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176)
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+* [forms] dynamic picker types for user/person/thirdparty types created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/386)
+
+### test release 2022-01-17
+
+* [main] Add editableByUser field to locationType entity, adapt the admin template and add this condition in the location-type endpoint (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/297)
+* [main] Add mainLocation field to User entity and add it in user form type
+* rewrite page which allow to select activity
+* [main] Add mainLocation field to User entity and add it in user form type
+* [course list in person context] show full username/label for ref
+* [accompanying period work] remove the possibility to  generate document from an accompanying period work
+* vuejs: add validation on required fields for AddPerson, Address and Location components
+* vuejs: treat 422 validation errors in locations and AddPerson components
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+
+## Test releases
+* vuejs: add validation on required fields for AddPerson, Address and Location components
+* vuejs: treat 422 validation errors in locations and AddPerson components
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+
+### test release 2022-01-12
+
+* fix thirdparty normalizer on telephone field: https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/322
+
+### test release 2022-01-11
+
+* vuejs: translate in French all multiselect widgets
+* [address] define address lines according postal standards for France and Belgium (default) and change AddressRender, chill_entity_render_box and AddressRenderBox.vue
+* [household] change translations (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109)
+* [household] add address i18n in household component (champs-libres/departement-de-la-vendee/accent-suivi-developpement#158)
+* [household] add on the fly i18n in household component
+* [household] redirect to the household page when a household is created from a person (champs-libres/departement-de-la-vendee/accent-suivi-developpement#175)
+* [household] household member editor: display alert if some members have already an household (champs-libres/departement-de-la-vendee/accent-suivi-developpement#172)
+* [household] household member editor: do not add in new members if the member is included in the members of household (champs-libres/departement-de-la-vendee/accent-suivi-developpement#123)
+* [household] household member editor: remove markNoAddress button (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109)
+* [person]: ordering fields in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
+* [person]: Add email and alt names in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
+* [accompanyingCourse] Add a delete action and delete buttons to delete a accompanying course when step = DRAFT (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/64)
+* [accompanyingCourse] Add a administrative location in the accompanying course, set the user current location as default, allow to select a location in a select field and do not allow to confirm the accompanying course if location is empty.
+* [accompanyingCourse] Add the administrative location in the available variables for document generation
+* AddAddress: optimize loading: wait for the user finish typing;
+* UserPicker: fix bug with deprecated role
+* docgen: add base context + tests
+* docgen: add age for person
+* [household menu] fix filiation order https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/265
+* [AddAddress]: optimize loading: wait for the user finish typing;
+* [UserPicker]: fix bug with deprecated role
+* [docgen]: add base context + tests
+* [docgen]: add age for person
+* [task]: fix dropdown menu style + fix bug in singleTaskController (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/338)
+* Household: fix bug when moving person on the same day (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/281)
+* Household: show date validFrom and validTo when moving
+* address reference: add index for refid
+* [accompanyingCourse_work] fix styles conflicts + fix bug with remove goal (remove goals one at a time)
+* [accompanyingCourse] improve masonry on resume page, add origin
+* [notification] new notification interface, can be associated to AccompanyingCourse/Period, Activities.
+  * List notifications, show, and comment in User section
+  * Notify button and contextual notification box on associated objects pages
+* [accompanyingCourse] add a comment for each resource associated. A modal allow to save comment. Comment is displayed in on-the-fly show modal of the accompanyingCourse context (edit page + resume page).
+
+### test release 2021-12-14
+
+* [asideactivity] creation of aside activity category fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/262)
+* [vendee/person] fix typo "situation professionelle" => "situation professionnelle"
+* [main] add availableForUsers condition from locationType in the location API endpoint (champs-libres/departement-de-la-vendee/accent-suivi-developpement#248)
+* [main] add the current location of the user as API point + add it in the activity location list (champs-libres/departement-de-la-vendee/accent-suivi-developpement#247)
+* [activity] improve show/new/edit templates, fix SEE and SEE_DETAILS acl
+* [badges] create specific badge for TMS, and make person/thirdparty badges clickable with on-the-fly modal in :
+    * concerned groups items (activity, calendar)
+    * accompanyingCourseWork lists
+    * accompanyingCourse lists
+* [acompanyingCourse] add initial comment on Resume page
+* [person] create button full width (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/330)
+
+### test release 2021-12-11
+
+* [main] add order field to civility
+* [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)
+* [vendee/person] fix typo "situation professionelle" => "situation professionnelle"
+* [accompanyingcourse_work] Changes in layout/behavior of edit form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/321)
+* [badge-entity] design coherency between pills badge-person and 3 kinds of badge-thirdparty
+* [AddPersons] suggestions row are clickable, not only checkbox
+
+### 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
+
+### 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
+* [period] Validation added when period is confidential and confirmed -> user cannot be null.
+
+
+## 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
+* [person]: accompanying course work: remove creation date display the list of work + handle case when end date is null
+* [main]: Add new pages with a menu for managing location and location type in the admin
+* [main]: Add some fixtures for location type
+* [calendar]: Pass the location when transforming a calendar item (rdv) into an activity
+* [calendar]: Add a user menu for "my calendar"
+
+### Test release 2021-10-18
+
+* [3party]: french translation of contact and company
+* [3party]: show parent in list
+* [3party]: change color for badge "child"
+* [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.
+* [household]: add relationship page with dynamic data visualisation graph
+
+## Test releases
+
+### Test release 2021-10-11
+
+* Address: zoom on postal code geometry + fix origin of manually entered postal code
+
+* in the Address vue component, order the postal code and street address by alphabetic and numeric order
+
+* add 3 new fields to PostalCode and adapt postal code command and fixtures
+
+* [Aside activity] Fixes for aside activity
+
+    * categories with child
+    * fast creation buttons
+    * add ordering for types
+
+* [AccompanyingCourse Resume page] dashboard for AccompanyingCourseWork and for Activities;
+* Improve badges behaviour with small screens;
+
+* [ThirdParty]:
+
+    * third party list
+    * create a kind contact/institution when create a new thirdparty, and set contact embedded as kind=child;
+    * filter thirdparties in list
+
+* [FilterOrder]: add development kit for generating filter and ordering in list
+* [Capitalization of names] person names are capitalized on creation, on prePersist event
+* [On-The-Fly] modale works for showing, editing and creating person or thirdparty ;
+* [AccompanyingCourse Resume page] associated persons list, can see household when hover, and with show on-the-fly modale when clicking person ;
+
+### test release 2021-10-04
+
+* [Household editor][UI] Update how household suggestion and addresses are picked;
+
+    See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/80
+* [AddAddress] Handle address suggestion;
+* [CenterType][Create a person] when overriding the ACL rules, allow to show a PickCenterType
+    when no centers are reachable by the default ACL.
+* [Household] Show comment event if no address are associated with the household;
+* [Person results] Add requestor into search results:
+
+    * a badge "requestor" is shown into search results;
+    * periods where the person is only requestor (without participating) are also shown;
+
+    Issues:
+
+    * https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/13
+    * https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/199
+* [Person form] "accept sms" not required:
+
+    https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/37
+    https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/221
+
+* [Household editor] suggest only temporarily addresses;
+    See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/82
+* On-The-Fly modale works for showing, editing and creating person and thirdparty ;
+* AccompanyingCourse Resume page: list associated persons by household, see household when hover, and show on-the-fly modale when clicking on person ;
+* [AddAddress] Handle address suggestion;
+* [AddAddress][Entity address]: add a link between address and address reference;
+* [Household editor] suggest household by comparing the temporary addresses from courses;
+
+    See https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/81
+* On-The-Fly modale works for showing, editing and creating person and thirdparty
+
+
+## Test released
+
+<!--
+
+Coming soon...
+
+DO NOT ADD unreleased items here. Add them under "Unreleased" title
+
+### Test release yyyy-mm-dd
+
+-->
+
+## Stable releases
+
+No stable releases for v2+
+
diff --git a/.changes/v2.1.0.md b/.changes/v2.1.0.md
new file mode 100644
index 000000000..ade83aee0
--- /dev/null
+++ b/.changes/v2.1.0.md
@@ -0,0 +1,17 @@
+## v2.1.0 - 2023-06-12
+
+### Feature
+
+* [docgen] allow to pick a third party when generating a document in context Activity, AccompanyingPeriod
+
+### Fixed
+
+* ([#111](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/111)) List of "my accompanying periods": separate the active and closed periods in two different lists, and show the inactive_long and inactive_short periods
+
+### Security
+
+* ([#105](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/105)) Rights are checked for display of 'accompanying period' tab in household menu. Rights are also checked for creation of 'accompanying period' from within household context
+
+### DX
+
+* Add methods to RegroupmentRepository and fullfill Center / Regroupment Doctrine mapping
diff --git a/.changes/v2.2.0.md b/.changes/v2.2.0.md
new file mode 100644
index 000000000..5371cad35
--- /dev/null
+++ b/.changes/v2.2.0.md
@@ -0,0 +1,12 @@
+## v2.2.0 - 2023-06-18
+### Feature
+* When navigating from a workflow regarding to an evaluation's document to an accompanying course, scroll directly to the document, and blink to highlight this document
+* Add notification to accompanying period work and work's evaluation's documents
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113))[Export] Filter accompanying period by step at date: allow to pick multiple steps
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113))[export] add a filter on accompanying period: filter by step between two dates
+### Fixed
+* use the correct annotation for the association between PersonCurrentCenter and Person
+* ([#58](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/58))Fix birthdate timezone in PersonRenderBox
+* ([#55](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/55))Fix the notification counter
+### DX
+* DQL function OVERLAPSI: simplify expression in postgresql
diff --git a/.changes/v2.2.1.md b/.changes/v2.2.1.md
new file mode 100644
index 000000000..c96b18585
--- /dev/null
+++ b/.changes/v2.2.1.md
@@ -0,0 +1,3 @@
+## v2.2.1 - 2023-06-19
+### Fixed
+* ([#114](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/114)) [notification on document evaluation] fix entityId and return path when adding a notification on a document in an evaluation
diff --git a/.changes/v2.2.2.md b/.changes/v2.2.2.md
new file mode 100644
index 000000000..61d194b6d
--- /dev/null
+++ b/.changes/v2.2.2.md
@@ -0,0 +1,5 @@
+## v2.2.2 - 2023-06-26
+### Fixed
+* [Accompanying period comments]: order comments from the most recent to the oldest, in the list
+* Api: filter social action to keep only the currently activated
+* ([#82](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/82)) Fix deletion and re-creation of filiation relationship
diff --git a/.changes/v2.3.0.md b/.changes/v2.3.0.md
new file mode 100644
index 000000000..827a338de
--- /dev/null
+++ b/.changes/v2.3.0.md
@@ -0,0 +1,42 @@
+## v2.3.0 - 2023-06-27
+### Feature
+* ([#110](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/110)) Edit saved exports options: the saved exports options (forms, filters, aggregators) are now editable.
+* ([#103](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/103)) Get an unified list of document in person and accompanying period context
+* [export] Set the default date of calculation of the accompanying period's list as "today"
+* Force accompanying period user history to be unique for the same period and stardate/enddate [:warning: may encounter migration issue]
+
+  If some issue is encountered during migration, use this SQL to find the line which are in conflict, examine the problem and delete some of the concerning line
+*
+  ```sql
+  -- to see the line which are in conflict with another one
+  SELECT o.*
+  FROM chill_person_accompanying_period_user_history o
+  JOIN chill_person_accompanying_period_user_history c ON o.id < c.id AND o.accompanyingperiod_id = c.accompanyingperiod_id
+  WHERE tsrange(o.startdate, o.enddate, '[)') && tsrange(c.startdate, c.enddate, '[)')
+  ORDER BY accompanyingperiod_id;
+  -- to examine line in conflict for a given accompanyingperiod_id (given by the previous query)
+  SELECT * FROM chill_person_accompanying_period_user_history WHERE accompanyingperiod_id = IIIIDDDD order by startdate, enddate;
+  ```
+* Rename label of filter in French: "parcours actif" => "parcours ouvert", and "filtrer les parcours ouverts" => "Filtrer les parcours dont la date d'ouverture"
+
+### Traduction francophone des principaux changements
+
+* Les exports enregistrés sont éditables par l'utilisateur;
+* L'onglet "Document" dans les parcours et les dossiers d'usager affiche désormais les documents ajoutés à différents endroits.
+
+  Pour les parcours, il s'agit de:
+
+  - documents ajoutés directement dans le parcours;
+  - documents des échanges;
+  - documents des rendez-vous;
+  - documents des évaluations;
+  - documents directement ajoutés dans le dossier des usagers concernés par le parcours;
+
+  Pour les usagers, il s'agit de:
+
+  - documents des échanges;
+  - documents des parcours;
+  - documents des rendez-vous;
+  - documents des actions, des échanges, des rendez-vous, des évaluations ajoutés dans les parcours.
+* Dans la liste des parcours, la date de calcul des éléments associés est "aujourd'hui" par défaut.
+* Dans les exports, renommage des libellés des filtres: "parcours actif" => "parcours ouvert", et "filtrer les parcours ouverts" => "Filtrer les parcours dont la date d'ouverture"
diff --git a/.changes/v2.4.0.md b/.changes/v2.4.0.md
new file mode 100644
index 000000000..522957300
--- /dev/null
+++ b/.changes/v2.4.0.md
@@ -0,0 +1,36 @@
+## v2.4.0 - 2023-07-07
+
+### Feature
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] on "filter by user working" on accompanying period, add two dates to filters intervention within a period
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] Add an aggregator by user's job working on a course
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] add an aggregator by user's scope working on a course
+* [export] on aggregator "user working on a course"
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] add a center aggregator for Person
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] add a filter on "job working on a course"
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] Add a filter on "scope working on a course"
+* ([#121](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/121)) Create a role "See Confidential Periods", separated from the "Reassign courses" role
+* ([#124](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/124)) Sync user absence / presence through microsoft outlook / graph api.
+
+### Fixed
+* ([#116](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/116)) On the accompanying course page, open the action on view mode if the user does not have right to update them (i.e. if the accompanying period is closed)
+* [export] Rename label for CurrentActionFilter (on accompanying period work) to make precision between "ouvert" and "sans date de fin"
+* Force the db to have either a person_location or a address_location, and avoid to have both also internally in the entity
+* [export] set rolling date on person age aggregator
+* [export] fix list when a person locating a course is without address
+* [export] remove unused condition on course about duration participation
+* Command to subscribe on MS Graph users calendars: improve the loop to be more efficient
+
+### DX
+* Rolling Date: can receive a null parameter
+
+### Traduction francophone des principaux changements
+
+- sur le "filtre par intervenant", ajoute deux dates pour limiter la période d'intervention;
+- ajout d'un regroupement par métier des intervenants sur un parcours;
+- ajout d'un regroupement par service des intervenants sur un parcours;
+- ajout d'un regroupement par utilisateur intervenant sur un parcours
+- ajout d'un regroupement "par centre de l'usager";
+- ajout d'un filtre "par métier intervenant sur un parcours";
+- ajout d'un filtre "par service intervenant sur un parcours";
+- création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);
+- synchronisation de l'absence des utilisateurs par microsoft graph api
diff --git a/.changes/v2.5.0.md b/.changes/v2.5.0.md
new file mode 100644
index 000000000..b3f592c79
--- /dev/null
+++ b/.changes/v2.5.0.md
@@ -0,0 +1,39 @@
+## v2.5.0 - 2023-07-14
+### Feature
+* Allow filtering on the basis of a user within general tasks lists
+* ([#120](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/120)) Adding OrderFilter to the list of social actions.
+* ([#125](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/125)) [export] Add a list for people with their associated course
+* [export] Add ordering by person's lastname or course opening date in list which concerns accompanying course or peoples
+* ([#128](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/128)) [Export] allow to group activities by localisation
+* ([#129](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/129)) [export] Add a filter "filter course having an activity between two dates"
+* ([#112](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/112)) [addresses] Add a cronjob to re-associate addresses with addresses reference every 6 hours
+* Improve filtering layout
+
+### Fixed
+* reimplement the visualization of all calculator results
+* ([#117](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/117)) Repair my unread notification list with actions and evaluations documents
+* ([#126](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/126)) Correct bug in thirdparty API search query: simplify address joins clause for child and parent kind
+
+### DX
+* Documentation for database principles
+* [cronjob] when a cronjob is executed, it may return an array of data that will be passed as argument on the next execution
+
+### UX
+* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Better integration of address details button: look, position, title tag
+* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Show address detail button on person and household banners
+* Improve residential address position on show onthefly modale
+
+### Traduction francophone des principaux changements
+
+* Ajout d'un filtre "par utilisateur" aux pages de tâche
+* Filtre des actions d'accompagnement par date, type, intervenant
+* export: liste des usagers concernés avec détail de leurs parcours
+* export: ajout d'un regroupement des échanges par localisation
+* export: ajout d'un filtre "parcours ayant reçu un échange entre deux dates"
+* ajout d'une tâche cron pour associer les adresses à une adresse de référence
+* correction: réparation de la liste des notifications sur la page d'accueil, dans le cas où une notification concerne une action ou un document dans une évaluation
+* correction: réparation de la recherche des tiers ayant des codes postaux similaires entre les parents et enfants
+* meilleure intégration du bouton "détail d'une adresse": améliration de la taille et de la position
+* bouton permettant de visualiser les détails d'une adresse (modale avec carte) dans la bannière "Usager" et "Ménage"
+* amélioration de la modale permettant de voir les détails d'un usager: les adresses de résidence sont dans la continuité des autres adresses, et non plus dans une colonne séparée
+* améliore le design et l'expérience utilisateur des filtres
diff --git a/.changes/v2.5.1.md b/.changes/v2.5.1.md
new file mode 100644
index 000000000..55cb3cf36
--- /dev/null
+++ b/.changes/v2.5.1.md
@@ -0,0 +1,3 @@
+## v2.5.1 - 2023-07-14
+### Fixed
+* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 
diff --git a/.changes/v2.5.2.md b/.changes/v2.5.2.md
new file mode 100644
index 000000000..4c52b2786
--- /dev/null
+++ b/.changes/v2.5.2.md
@@ -0,0 +1,3 @@
+## v2.5.2 - 2023-07-15
+### Fixed
+* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead) 
diff --git a/.changes/v2.5.3.md b/.changes/v2.5.3.md
new file mode 100644
index 000000000..164a0712a
--- /dev/null
+++ b/.changes/v2.5.3.md
@@ -0,0 +1,3 @@
+## v2.5.3 - 2023-07-20
+### Fixed
+* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 
diff --git a/.changes/v2.6.0.md b/.changes/v2.6.0.md
new file mode 100644
index 000000000..656373532
--- /dev/null
+++ b/.changes/v2.6.0.md
@@ -0,0 +1,21 @@
+## v2.6.0 - 2023-09-14
+### Feature
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
+* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
+### Fixed
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
+* Missing translation in Work Actions exports 
+* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
+* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
+error when trying to reedit a saved export
+
+ 
+* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
+* Add missing translation for comment field placeholder in repositionning household editor.
+ 
+* Do not send an email to creator twice when adding a comment to a notification 
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
+### UX
+* Uniformize badge-person in household banner (background, size)
+ 
diff --git a/.changes/v2.6.1.md b/.changes/v2.6.1.md
new file mode 100644
index 000000000..4907b52e9
--- /dev/null
+++ b/.changes/v2.6.1.md
@@ -0,0 +1,3 @@
+## v2.6.1 - 2023-09-14
+### Fixed
+* Filter out active centers in exports, which uses a different PickCenterType. 
diff --git a/.changes/v2.6.2.md b/.changes/v2.6.2.md
new file mode 100644
index 000000000..4d5b6e293
--- /dev/null
+++ b/.changes/v2.6.2.md
@@ -0,0 +1,3 @@
+## v2.6.2 - 2023-09-18
+### Fixed
+* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
diff --git a/.changes/v2.6.3.md b/.changes/v2.6.3.md
new file mode 100644
index 000000000..a70634785
--- /dev/null
+++ b/.changes/v2.6.3.md
@@ -0,0 +1,4 @@
+## v2.6.3 - 2023-09-19
+### Fixed
+* Remove id property from document 
+mappedsuperclass 
diff --git a/.changes/v2.7.0.md b/.changes/v2.7.0.md
new file mode 100644
index 000000000..df389b9d3
--- /dev/null
+++ b/.changes/v2.7.0.md
@@ -0,0 +1,6 @@
+## v2.7.0 - 2023-09-27
+### Feature
+* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
+### Fixed
+* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
+* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 
diff --git a/.changes/v2.8.0.md b/.changes/v2.8.0.md
new file mode 100644
index 000000000..4e0f03c11
--- /dev/null
+++ b/.changes/v2.8.0.md
@@ -0,0 +1,19 @@
+## v2.8.0 - 2023-10-05
+
+### Feature
+
+* ([#162](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/162)) Reassigning list: when reassigning courses to a new user, the job associated with the course become the one of the new user (if any)
+* Reassining list: the length of the list is increased to 100 courses
+
+### Fixed
+
+* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) Fix filter "accompanying course by social action" to avoid duplication in list
+* ([#164](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/164)) View a third party: avoid errors when a contact has a civility
+* ([#163](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/163)) Fix the filters and aggregators on exports "count peoples"
+* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) From the database, avoid the creation of location history for same period and at same dates
+
+### Traduction francophone des principaux changements
+
+- Fonctionnalité: Réassigner les parcours en lot: lorsque des parcours sont réassignés "en lot", les parcours sont maintenant associés au métier du nouveau référent;
+- Correction: certaines causes qui créaient des doublons dans les listes ont été corrigées;
+- Correction des associations entre l'export "nombre de personnes" et les filtres et regroupements associés
diff --git a/.changes/v2.9.0.md b/.changes/v2.9.0.md
new file mode 100644
index 000000000..2dbf55619
--- /dev/null
+++ b/.changes/v2.9.0.md
@@ -0,0 +1,23 @@
+## v2.9.0 - 2023-10-17
+### Feature
+* ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)) Add history to scopes and to jobs in administrator section. When user job or main scope of user is changed, automaticaly add a new row in history.
+* ([#146](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/146)) Allow closing motives to be identified as 'canceling the accompanying period' + don't take canceled accompanying periods into account
+* [export] add an aggregator for activities: group by job scope's creator aggregator
+* DX: prepare the code for the upgrade to symfony 5.4
+
+### Traductions francophones des principaux changements
+
+- ajout de l'historique des services et métiers pour les utilisateurs. Les exports, filtres et regroupements sont adaptés pour tenir compte du métier et du service
+  de l'utilisateur au moment de l'échange, de sa désignation comme agent traitant de l'échange ou du moment du rendez-vous ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)))
+- modification des motifs de cloture des parcours: ajout d'un chanmp "annule le parcours", qui permet d'indiquer que le motif "annule" le parcours. Les parcours annulés n'apparaissent
+  pas dans les statistiques
+- ajouter d'un regroupement pour les échanges: grouper par métier et service du créateur de l'échange
+
+
+### Possible BC break in configuration
+
+This release remove the use of deprecated package [symfony/templating](https://symfony.com/components/Templating).
+
+If you use this package in your own bundle (usually `src/` directory, or other dependencies), you should add this dependencies in your local composer.json (`composer require symfony/templating`).
+
+But if you do not need this any more, you must ensure that the configuration key `framework.templating` is removed. This is usually located into `config/packages/framework.yaml`. [See here an example](https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/commit/cc716beaecc239e6a189f3db62ea95f169a37505#diff-df607fe73ff82c569824a7392edf5e760e998efe)
diff --git a/.changes/v2.9.1.md b/.changes/v2.9.1.md
new file mode 100644
index 000000000..2e0ddc3ab
--- /dev/null
+++ b/.changes/v2.9.1.md
@@ -0,0 +1,3 @@
+## v2.9.1 - 2023-10-17
+### Fixed
+* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 
diff --git a/.changes/v2.9.2.md b/.changes/v2.9.2.md
new file mode 100644
index 000000000..493606b80
--- /dev/null
+++ b/.changes/v2.9.2.md
@@ -0,0 +1,3 @@
+## v2.9.2 - 2023-10-17
+### Fixed
+* Fix possible null values in string's entities 
diff --git a/.changie.yaml b/.changie.yaml
new file mode 100644
index 000000000..0145062f8
--- /dev/null
+++ b/.changie.yaml
@@ -0,0 +1,39 @@
+changesDir: .changes
+unreleasedDir: unreleased
+headerPath: header.tpl.md
+changelogPath: CHANGELOG.md
+versionExt: md
+versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
+kindFormat: '### {{.Kind}}'
+# Note: it is possible to add a `.custom.Long` text manually into the yaml file produced by `changie new`. This will add a long description.
+changeFormat: >-
+    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{.Body}} {{ if and (.Custom.Long) (not (eq .Custom.Long "")) }}
+
+      {{ .Custom.Long }}{{ end }}
+custom:
+    -   key: Issue
+        label: Issue number (on chill-bundles repository) (optional)
+        optional: true
+        type: int
+        minInt: 1
+body:
+    # allow multiline messages
+    block: true
+kinds:
+    -   label: Feature
+        auto: minor
+    -   label: Deprecated
+        auto: minor
+    -   label: Fixed
+        auto: patch
+    -   label: Security
+        auto: patch
+    -   label: DX
+        auto: patch
+    -   label: UX
+        auto: patch
+newlines:
+    afterChangelogHeader: 1
+    beforeChangelogVersion: 1
+    endOfVersion: 1
+envPrefix: CHANGIE_
diff --git a/.env.test b/.env.test
index 914deb541..9245579c0 100644
--- a/.env.test
+++ b/.env.test
@@ -3,3 +3,39 @@
 # Run tests from root to adapt your own environment
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
+
+ADMIN_PASSWORD=password
+
+LOCALE=fr
+REDIS_URL=redis
+REDIS_PORT=6379
+REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
+
+JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
+JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
+JWT_PASSPHRASE=2a30f6ba26521a2613821da35f28386e
+
+TWILIO_SID=~
+TWILIO_SECRET=~
+DEFAULT_CARRIER_CODE=BE
+
+ADD_ADDRESS_DEFAULT_COUNTRY=BE
+
+ADD_ADDRESS_MAP_CENTER_X=50.8443
+ADD_ADDRESS_MAP_CENTER_Y=4.3523
+ADD_ADDRESS_MAP_CENTER_Z=15
+
+SHORT_MESSAGE_DSN=null://null
+MESSENGER_TRANSPORT_DSN=sync://
+###< symfony/messenger ###
+
+###> doctrine/doctrine-bundle ###
+# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
+#
+DATABASE_URL="postgresql://postgres:postgres@db:5432/test?serverVersion=14&charset=utf8"
+###< doctrine/doctrine-bundle ###
+
+ASYNC_UPLOAD_TEMP_URL_KEY=
+ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
+ASYNC_UPLOAD_TEMP_URL_CONTAINER=
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f1d75ed5..389955c30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@
 # Select what we should cache between builds
 cache:
     paths:
-        - tests/app/vendor/
+        - /vendor/
         - .cache
 
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
@@ -23,17 +23,16 @@ variables:
     # configure database access
     DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8
     # fetch the chill-app using git submodules
-    GIT_SUBMODULE_STRATEGY: recursive
+    # 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
     DEFAULT_CARRIER_CODE: BE
 
 stages:
     - Composer install
     - Tests
+    - Deploy
 
 build:
     stage: Composer install
@@ -49,7 +48,7 @@ build:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/
 
 code_style:
     stage: Tests
@@ -63,7 +62,7 @@ code_style:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/
 
 phpstan_tests:
     stage: Tests
@@ -77,13 +76,14 @@ phpstan_tests:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/
 
 rector_tests:
     stage: Tests
     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     script:
-        - bin/rector --dry-run
+        - tests/console cache:clear
+        - bin/rector process --dry-run
     cache:
         paths:
             - .cache/
@@ -91,7 +91,7 @@ rector_tests:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/
 
 # psalm_tests:
 #     stage: Tests
@@ -108,16 +108,25 @@ rector_tests:
 unit_tests:
     stage: Tests
     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
-    # until we fix testes
-    allow_failure: true
     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=4G bin/phpunit --colors=never
+        - php tests/console doctrine:migrations:migrate -n --env=test
+        - php tests/console chill:db:sync-views --env=test
+        - php -d memory_limit=2G tests/console cache:clear --env=test
+        - php -d memory_limit=3G tests/console doctrine:fixtures:load -n
+        - php -d memory_limit=4G bin/phpunit --colors=never --exclude-group dbIntensive
     artifacts:
         expire_in: 30 min
         paths:
             - bin
-            - tests/app/vendor/
+            - vendor/
+
+release:
+    stage: Deploy
+    image: registry.gitlab.com/gitlab-org/release-cli:latest
+    rules:
+        - if: $CI_COMMIT_TAG
+    script:
+        - echo "running release_job"
+    release:
+        tag_name: '$CI_COMMIT_TAG'
+        description: "./.changes/v$CI_COMMIT_TAG.md"
diff --git a/.gitmodules b/.gitmodules
index 560ba7980..7bc519c88 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "_exts/sphinx-php"]
 	path = _exts/sphinx-php
 	url = https://github.com/fabpot/sphinx-php.git
-[submodule "tests/app"]
-	path = tests/app
-	url = https://gitlab.com/Chill-projet/chill-app.git
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 4b5bf98ee..9aae1c43f 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -13,6 +13,7 @@ $finder = PhpCsFixer\Finder::create();
 
 $finder
     ->in(__DIR__.'/src')
+    ->in(__DIR__.'/utils')
     ->append([__FILE__])
     ->exclude(['docs/', 'tests/app'])
     ->notPath('tests/app')
@@ -90,7 +91,7 @@ $rules = array_merge(
     [
         '@PhpCsFixer' => true,
         '@PhpCsFixer:risky' => false,
-        '@Symfony' => false,
+        '@Symfony' => true,
         '@Symfony:risky' => false,
         'ordered_class_elements' => [
             'order' => [
@@ -110,13 +111,13 @@ $rules = array_merge(
                 'method_private',
             ],
             'sort_algorithm' => 'alpha',
-        ]
+        ],
     ],
     $rules,
     $riskyRules,
     $untilFullSwitchToPhp8,
 );
 
-$rules['header_comment']['header'] = trim(file_get_contents(__DIR__ . '/resource/header.txt'));
+$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 b2f951479..298a9af0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,286 @@
 # Changelog
-
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
 
-* [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for stable releases;
-* date versioning for test releases
 
-## Unreleased
+## v2.9.2 - 2023-10-17
+### Fixed
+* Fix possible null values in string's entities 
+
+## v2.9.1 - 2023-10-17
+### Fixed
+* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 
+
+## v2.9.0 - 2023-10-17
+### Feature
+* ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)) Add history to scopes and to jobs in administrator section. When user job or main scope of user is changed, automaticaly add a new row in history.
+* ([#146](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/146)) Allow closing motives to be identified as 'canceling the accompanying period' + don't take canceled accompanying periods into account
+* [export] add an aggregator for activities: group by job scope's creator aggregator
+* DX: prepare the code for the upgrade to symfony 5.4
+
+### Traductions francophones des principaux changements
+
+- ajout de l'historique des services et métiers pour les utilisateurs. Les exports, filtres et regroupements sont adaptés pour tenir compte du métier et du service
+  de l'utilisateur au moment de l'échange, de sa désignation comme agent traitant de l'échange ou du moment du rendez-vous ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)))
+- modification des motifs de cloture des parcours: ajout d'un chanmp "annule le parcours", qui permet d'indiquer que le motif "annule" le parcours. Les parcours annulés n'apparaissent
+  pas dans les statistiques
+- ajouter d'un regroupement pour les échanges: grouper par métier et service du créateur de l'échange
+
+
+### Possible BC break in configuration
+
+This release remove the use of deprecated package [symfony/templating](https://symfony.com/components/Templating).
+
+If you use this package in your own bundle (usually `src/` directory, or other dependencies), you should add this dependencies in your local composer.json (`composer require symfony/templating`).
+
+But if you do not need this any more, you must ensure that the configuration key `framework.templating` is removed. This is usually located into `config/packages/framework.yaml`. [See here an example](https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/commit/cc716beaecc239e6a189f3db62ea95f169a37505#diff-df607fe73ff82c569824a7392edf5e760e998efe)
+
+## v2.8.0 - 2023-10-05
+
+### Feature
+
+* ([#162](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/162)) Reassigning list: when reassigning courses to a new user, the job associated with the course become the one of the new user (if any)
+* Reassining list: the length of the list is increased to 100 courses
+
+### Fixed
+
+* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) Fix filter "accompanying course by social action" to avoid duplication in list
+* ([#164](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/164)) View a third party: avoid errors when a contact has a civility
+* ([#163](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/163)) Fix the filters and aggregators on exports "count peoples"
+* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) From the database, avoid the creation of location history for same period and at same dates
+
+### Traduction francophone des principaux changements
+
+- Fonctionnalité: Réassigner les parcours en lot: lorsque des parcours sont réassignés "en lot", les parcours sont maintenant associés au métier du nouveau référent;
+- Correction: certaines causes qui créaient des doublons dans les listes ont été corrigées;
+- Correction des associations entre l'export "nombre de personnes" et les filtres et regroupements associés
+
+## v2.7.0 - 2023-09-27
+### Feature
+* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
+### Fixed
+* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
+* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 
+
+## v2.6.3 - 2023-09-19
+### Fixed
+* Remove id property from document 
+mappedsuperclass 
+
+## v2.6.2 - 2023-09-18
+### Fixed
+* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
+
+## v2.6.1 - 2023-09-14
+### Fixed
+* Filter out active centers in exports, which uses a different PickCenterType. 
+
+## v2.6.0 - 2023-09-14
+### Feature
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
+* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
+### Fixed
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
+* Missing translation in Work Actions exports 
+* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
+* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
+error when trying to reedit a saved export
+
+ 
+* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
+* Add missing translation for comment field placeholder in repositionning household editor.
+ 
+* Do not send an email to creator twice when adding a comment to a notification 
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
+### UX
+* Uniformize badge-person in household banner (background, size)
+ 
+
+## v2.5.3 - 2023-07-20
+### Fixed
+* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 
+
+## v2.5.2 - 2023-07-15
+### Fixed
+* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead) 
+
+## v2.5.1 - 2023-07-14
+### Fixed
+* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 
+
+## v2.5.0 - 2023-07-14
+### Feature
+* Allow filtering on the basis of a user within general tasks lists
+* ([#120](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/120)) Adding OrderFilter to the list of social actions.
+* ([#125](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/125)) [export] Add a list for people with their associated course
+* [export] Add ordering by person's lastname or course opening date in list which concerns accompanying course or peoples
+* ([#128](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/128)) [Export] allow to group activities by localisation
+* ([#129](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/129)) [export] Add a filter "filter course having an activity between two dates"
+* ([#112](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/112)) [addresses] Add a cronjob to re-associate addresses with addresses reference every 6 hours
+* Improve filtering layout
+
+### Fixed
+* reimplement the visualization of all calculator results
+* ([#117](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/117)) Repair my unread notification list with actions and evaluations documents
+* ([#126](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/126)) Correct bug in thirdparty API search query: simplify address joins clause for child and parent kind
+
+### DX
+* Documentation for database principles
+* [cronjob] when a cronjob is executed, it may return an array of data that will be passed as argument on the next execution
+
+### UX
+* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Better integration of address details button: look, position, title tag
+* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Show address detail button on person and household banners
+* Improve residential address position on show onthefly modale
+
+### Traduction francophone des principaux changements
+
+* Ajout d'un filtre "par utilisateur" aux pages de tâche
+* Filtre des actions d'accompagnement par date, type, intervenant
+* export: liste des usagers concernés avec détail de leurs parcours
+* export: ajout d'un regroupement des échanges par localisation
+* export: ajout d'un filtre "parcours ayant reçu un échange entre deux dates"
+* ajout d'une tâche cron pour associer les adresses à une adresse de référence
+* correction: réparation de la liste des notifications sur la page d'accueil, dans le cas où une notification concerne une action ou un document dans une évaluation
+* correction: réparation de la recherche des tiers ayant des codes postaux similaires entre les parents et enfants
+* meilleure intégration du bouton "détail d'une adresse": améliration de la taille et de la position
+* bouton permettant de visualiser les détails d'une adresse (modale avec carte) dans la bannière "Usager" et "Ménage"
+* amélioration de la modale permettant de voir les détails d'un usager: les adresses de résidence sont dans la continuité des autres adresses, et non plus dans une colonne séparée
+* améliore le design et l'expérience utilisateur des filtres
+
+## v2.4.0 - 2023-07-07
+
+### Feature
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] on "filter by user working" on accompanying period, add two dates to filters intervention within a period
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] Add an aggregator by user's job working on a course
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] add an aggregator by user's scope working on a course
+* [export] on aggregator "user working on a course"
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] add a center aggregator for Person
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] add a filter on "job working on a course"
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113)) [export] Add a filter on "scope working on a course"
+* ([#121](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/121)) Create a role "See Confidential Periods", separated from the "Reassign courses" role
+* ([#124](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/124)) Sync user absence / presence through microsoft outlook / graph api.
+
+### Fixed
+* ([#116](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/116)) On the accompanying course page, open the action on view mode if the user does not have right to update them (i.e. if the accompanying period is closed)
+* [export] Rename label for CurrentActionFilter (on accompanying period work) to make precision between "ouvert" and "sans date de fin"
+* Force the db to have either a person_location or a address_location, and avoid to have both also internally in the entity
+* [export] set rolling date on person age aggregator
+* [export] fix list when a person locating a course is without address
+* [export] remove unused condition on course about duration participation
+* Command to subscribe on MS Graph users calendars: improve the loop to be more efficient
+
+### DX
+* Rolling Date: can receive a null parameter
+
+### Traduction francophone des principaux changements
+
+- sur le "filtre par intervenant", ajoute deux dates pour limiter la période d'intervention;
+- ajout d'un regroupement par métier des intervenants sur un parcours;
+- ajout d'un regroupement par service des intervenants sur un parcours;
+- ajout d'un regroupement par utilisateur intervenant sur un parcours
+- ajout d'un regroupement "par centre de l'usager";
+- ajout d'un filtre "par métier intervenant sur un parcours";
+- ajout d'un filtre "par service intervenant sur un parcours";
+- création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);
+- synchronisation de l'absence des utilisateurs par microsoft graph api
+
+## v2.3.0 - 2023-06-27
+### Feature
+* ([#110](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/110)) Edit saved exports options: the saved exports options (forms, filters, aggregators) are now editable.
+* ([#103](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/103)) Get an unified list of document in person and accompanying period context
+* [export] Set the default date of calculation of the accompanying period's list as "today"
+* Force accompanying period user history to be unique for the same period and stardate/enddate [:warning: may encounter migration issue]
+
+  If some issue is encountered during migration, use this SQL to find the line which are in conflict, examine the problem and delete some of the concerning line
+*
+  ```sql
+  -- to see the line which are in conflict with another one
+  SELECT o.*
+  FROM chill_person_accompanying_period_user_history o
+  JOIN chill_person_accompanying_period_user_history c ON o.id < c.id AND o.accompanyingperiod_id = c.accompanyingperiod_id
+  WHERE tsrange(o.startdate, o.enddate, '[)') && tsrange(c.startdate, c.enddate, '[)')
+  ORDER BY accompanyingperiod_id;
+  -- to examine line in conflict for a given accompanyingperiod_id (given by the previous query)
+  SELECT * FROM chill_person_accompanying_period_user_history WHERE accompanyingperiod_id = IIIIDDDD order by startdate, enddate;
+  ```
+* Rename label of filter in French: "parcours actif" => "parcours ouvert", and "filtrer les parcours ouverts" => "Filtrer les parcours dont la date d'ouverture"
+
+### Traduction francophone des principaux changements
+
+* Les exports enregistrés sont éditables par l'utilisateur;
+* L'onglet "Document" dans les parcours et les dossiers d'usager affiche désormais les documents ajoutés à différents endroits.
+
+  Pour les parcours, il s'agit de:
+
+  - documents ajoutés directement dans le parcours;
+  - documents des échanges;
+  - documents des rendez-vous;
+  - documents des évaluations;
+  - documents directement ajoutés dans le dossier des usagers concernés par le parcours;
+
+  Pour les usagers, il s'agit de:
+
+  - documents des échanges;
+  - documents des parcours;
+  - documents des rendez-vous;
+  - documents des actions, des échanges, des rendez-vous, des évaluations ajoutés dans les parcours.
+* Dans la liste des parcours, la date de calcul des éléments associés est "aujourd'hui" par défaut.
+* Dans les exports, renommage des libellés des filtres: "parcours actif" => "parcours ouvert", et "filtrer les parcours ouverts" => "Filtrer les parcours dont la date d'ouverture"
+
+## v2.2.2 - 2023-06-26
+### Fixed
+* [Accompanying period comments]: order comments from the most recent to the oldest, in the list
+* Api: filter social action to keep only the currently activated
+* ([#82](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/82)) Fix deletion and re-creation of filiation relationship
+
+## v2.2.1 - 2023-06-19
+### Fixed
+* ([#114](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/114)) [notification on document evaluation] fix entityId and return path when adding a notification on a document in an evaluation
+
+## v2.2.0 - 2023-06-18
+### Feature
+* When navigating from a workflow regarding to an evaluation's document to an accompanying course, scroll directly to the document, and blink to highlight this document
+* Add notification to accompanying period work and work's evaluation's documents
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113))[Export] Filter accompanying period by step at date: allow to pick multiple steps
+* ([#113](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/113))[export] add a filter on accompanying period: filter by step between two dates
+### Fixed
+* use the correct annotation for the association between PersonCurrentCenter and Person
+* ([#58](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/58))Fix birthdate timezone in PersonRenderBox
+* ([#55](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/55))Fix the notification counter
+### DX
+* DQL function OVERLAPSI: simplify expression in postgresql
+
+## v2.1.0 - 2023-06-12
+
+### Feature
+
+* [docgen] allow to pick a third party when generating a document in context Activity, AccompanyingPeriod
+
+### Fixed
+
+* ([#111](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/111)) List of "my accompanying periods": separate the active and closed periods in two different lists, and show the inactive_long and inactive_short periods
+
+### Security
+
+* ([#105](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/105)) Rights are checked for display of 'accompanying period' tab in household menu. Rights are also checked for creation of 'accompanying period' from within household context
+
+### DX
+
+* Add methods to RegroupmentRepository and fullfill Center / Regroupment Doctrine mapping
+
+## 2.0.0
+
+* this is a release to relaunch our proceess of release with semantic versioning
+
+## Test releases
+
+### 2.0.0-beta3
 
-<!-- write down unreleased development here -->
 * [person][export] Fixed: rename the alias for `accompanying_period` to `acp` in filter associated with person
 * [activity][export] Feature: improve label for aliases in "Filter by activity type"
 * [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
@@ -18,9 +288,6 @@ and this project adheres to
 * [person][export] Fixed: use left join for related entities in accompanying course aggregators
 * [workflow] Feature: allow user to copy and send manually the access link for the workflow
 * [workflow] Feature: show the email addresses that received an access link for the workflow
-
-## Test releases
-
 ### 2.0.0-beta2
 
 * [workflow]: Fixed: the notification is sent when the user is added to the first step.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..fe34130d2
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,80 @@
+# Contributing
+
+Chill is an open source, community-driven project.
+
+If you'd like to contribute, please read the following.
+
+## What can you do ?
+
+Chill is an open-source project driven by a community of developers, users and social workers. If you don't feel ready to contribute code or patches, reviewing issues and pull requests (PRs) can be a great start to get involved and give back. 
+
+If you don't have your own instance or don't want to use it, you can try to reproduce bugs using the instance https://demo.chill.social
+
+## Core team
+
+The core team is the group of developers that determine the direction and evolution of the Chill project. Their votes rule if the features and patches proposed by the community are approved or rejected.
+
+All the Chill Core members are long-time contributors with solid technical expertise and they have demonstrated a strong commitment to drive the project forward.
+
+The core team:
+
+- elects his own members;
+- merge pull requests;
+
+### members
+
+Project leader: [julienfastre](https://gitlab.com/julienfastre)
+
+Core members:
+
+- [tchama](https://gitlab.com/tchama)
+- [LenaertsJ](https://gitlab.com/LenaertsJ)
+- [nobohan](https://gitlab.com/nobohan)
+
+### Becoming a project member
+
+About once a year, the core team discusses the opportunity to invite new members. To become a core team member, you must:
+
+- take part on the development for at least 6 month: propose multiple merge requests and participate to the peer review process;
+- through this participation, demonstrate your technical skills and your knowledge of the software and any of their dependencies;
+
+### Core Membership Revocation
+
+A Chill Core membership can be revoked for any of the following reasons:
+
+- Refusal to follow the rules and policies stated in this document;
+- Lack of activity for the past six months;
+- Willful negligence or intent to harm the Chill project;
+
+The decision is taken by the majority of project members.
+
+## Code development rules
+
+### Merge requests
+
+Every merge request must contains:
+
+- one more entries suitable for generating a changelog. This is done using the [changie utility](https://changie.dev);
+- a comprehensible description of the changes;
+- if applicable, automated tests should be adapted or created;
+- the code style must pass the project's rules, and non phpstan errors must be raised nor rector refactoring suggestion.
+
+The pipelines must pass.
+
+In case of emergency, some rules may be temporarily ignored.
+
+### Merge Request Voting Policy
+
+- -1 votes must always be justified by technical and objective reasons;
+- +1 (technically: approbation on the merge request) votes do not require justification, unless there is at least one -1 vote;
+- Core members can change their votes as many times as they desire during the course of a merge request discussion;
+- Core members are not allowed to vote on their own merge requests.
+
+### Merge Request Merging Process
+
+All code must be committed to the repository through merge requests, except for minor changes which can be committed directly to the repository.
+
+### Release Policy
+
+The Core members are also the release manager for every Chill version.
+
diff --git a/composer.json b/composer.json
index b47856954..3195f732b 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         "social worker"
     ],
     "require": {
-        "php": "^7.4|^8.2",
+        "php": "^8.2",
         "ext-json": "*",
         "ext-openssl": "*",
         "ext-redis": "*",
@@ -34,6 +34,7 @@
         "sensio/framework-extra-bundle": "^5.5",
         "spomky-labs/base64url": "^2.0",
         "symfony/browser-kit": "^4.4",
+        "symfony/clock": "^6.2",
         "symfony/css-selector": "^4.4",
         "symfony/expression-language": "^4.4",
         "symfony/form": "^4.4",
@@ -47,7 +48,6 @@
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "^4.4",
         "symfony/serializer": "^5.3",
-        "symfony/templating": "^4.4",
         "symfony/translation": "^4.4",
         "symfony/twig-bundle": "^4.4",
         "symfony/validator": "^4.4",
@@ -66,6 +66,7 @@
         "fakerphp/faker": "^1.13",
         "jangregor/phpstan-prophecy": "^1.0",
         "nelmio/alice": "^3.8",
+        "nikic/php-parser": "^4.15",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/extension-installer": "^1.2",
         "phpstan/phpstan": "^1.9",
@@ -74,7 +75,7 @@
         "phpunit/phpunit": ">= 7.5",
         "psalm/plugin-phpunit": "^0.18.4",
         "psalm/plugin-symfony": "^4.0.2",
-        "rector/rector": "^0.15.23",
+        "rector/rector": "^0.17.7",
         "symfony/debug-bundle": "^5.1",
         "symfony/dotenv": "^4.4",
         "symfony/maker-bundle": "^1.20",
@@ -96,20 +97,21 @@
             "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
             "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
-            "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle",
             "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
-            "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src"
+            "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
+            "Chill\\Utils\\Rector\\": "utils/rector/src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\": "tests/app/src/",
+            "App\\": "tests/",
             "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
-            "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
+            "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
+            "Chill\\Utils\\Rector\\Tests\\": "utils/rector/tests"
         }
     },
     "config": {
@@ -119,16 +121,15 @@
             "ocramius/package-versions": true,
             "phpro/grumphp": true,
             "phpstan/extension-installer": true,
-            "roave/you-are-using-it-wrong": true
+            "roave/you-are-using-it-wrong": true,
+            "symfony/runtime": true
         },
         "bin-dir": "bin",
         "optimize-autoloader": true,
-        "sort-packages": true,
-        "vendor-dir": "tests/app/vendor"
+        "sort-packages": true
     },
     "scripts": {
         "auto-scripts": {
-            "assets:install %PUBLIC_DIR%": "symfony-cmd",
             "cache:clear": "symfony-cmd"
         }
     }
diff --git a/docs/source/_static/code/exports/BirthdateFilter.php b/docs/source/_static/code/exports/BirthdateFilter.php
index 64c1d53a9..e25d8b42f 100644
--- a/docs/source/_static/code/exports/BirthdateFilter.php
+++ b/docs/source/_static/code/exports/BirthdateFilter.php
@@ -62,7 +62,6 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
     {
         $builder->add('date_from', DateType::class, [
             'label' => 'Born after this date',
-            'data' => new DateTime(),
             'attr' => ['class' => 'datepicker'],
             'widget' => 'single_text',
             'format' => 'dd-MM-yyyy',
@@ -70,12 +69,15 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
 
         $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 getFormDefaultData(): array
+    {
+        return ['date_from' => new DateTime(), 'date_to' => new DateTime()];
+    }
 
     // here, we create a simple string which will describe the action of
     // the filter in the Response
diff --git a/docs/source/_static/code/exports/CountPerson.php b/docs/source/_static/code/exports/CountPerson.php
index 48eab8a55..a0f6931ac 100644
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -36,6 +36,10 @@ class CountPerson implements ExportInterface
     {
         // this export does not add any form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getAllowedFormattersTypes()
     {
@@ -50,18 +54,9 @@ class CountPerson implements ExportInterface
     public function getLabels($key, array $values, $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 fn($value) => match ($value) {
+            '_header' => $this->getTitle(),
+            default => $value,
         };
     }
 
@@ -90,9 +85,7 @@ class CountPerson implements ExportInterface
     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);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
diff --git a/docs/source/development/FAQ.rst b/docs/source/development/FAQ.rst
new file mode 100644
index 000000000..c0b7e37e8
--- /dev/null
+++ b/docs/source/development/FAQ.rst
@@ -0,0 +1,36 @@
+.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled "GNU
+Free Documentation License".
+
+.. _faq:
+
+
+Frequently asked questions
+####################
+
+Continuous integration
+***********
+
+Pipeline fails, but php-cs-fixer doesn't alert me when running it locally ?
+========================================
+
+It is possible that you run php-cs-fixer on your local instance of chill and no fixes are made.
+Everything seems fine, so you push. However once the pipeline is run in gitlab, you're notified that it failed due to php
+cs errors.
+
+In this case it's likely that you have to update your version of php-cs-fixer.
+php-cs-fixer is installed when building the docker image: https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/src/branch/main/Dockerfile#L50
+
+Consequently, to update php-cs-fixer we have to update the image by building it again.
+
+For this the following commands can be used,
+
+.. code-block:: php
+
+    docker compose build --pull php
+    # replace existing containers
+    docker compose up -d --force-recreate php
diff --git a/docs/source/development/database-principles.rst b/docs/source/development/database-principles.rst
new file mode 100644
index 000000000..455354934
--- /dev/null
+++ b/docs/source/development/database-principles.rst
@@ -0,0 +1,84 @@
+
+.. database-principles:
+
+Principes de la base de données
+###############################
+
+Cette page donne une compréhension globale de la base de donnée de Chill, et explique quelques détails d'implémentations qui permettent d'accélérer les traitements à partir de la base de donnée, ou de l'exploiter plus aisément.
+
+Cette page est rédigée en français.
+
+.. note::
+
+    La stabilité du schéma de la base de donnée n'est pas garantie.
+
+    Toutefois, ce dernier évolue relativement peu. Il est rare que des tables ou des colonnes soient supprimées ou renommées. Mais il n'est pas garanti que cela puisse arriver.
+
+Généralités
+===========
+
+Une liste commentée de toutes les tables :download:`est disponible au format CSV <./database/table_list.csv`.
+
+Schéma et conventions de nommage
+--------------------------------
+
+Au début de l'histoire de Chill, les schémas postgresql n'étaient pas exploités. Les données étaient stockées dans le schéma :code:`public`.
+
+Par la suite, des nouveaux bundles sont apparus, et les tables ont été classées dans des schémas dédiés.
+
+A l'heure actuelle:
+
+- pour les anciens bundle, ceux qui ont déjà des tables dans le schéma public, les nouvelles tables sont ajoutées à ce schéma. Elles sont préfixées par :code:`chill_<nom du bundle>_`;
+- pour les bundles plus récents, les tables sont créées dans le schéma dédié
+
+Données avec de l'historicité
+-----------------------------
+
+Certaines données sont historisées:
+
+- les référents d'un parcours;
+- les statuts d'un parcours;
+- la liaison entre les centres et les usagers;
+- etc.
+
+Dans ces cas-là, Chill crée généralement deux colonnes, qui sont habituellement nommées :code:`startDate` et :code:`endDate`. Lorsque la colonne :code:`endDate` est à :code:`NULL`, cela signifie que la période n'est pas "fermée". La colonne :code:`startDate` n'est pas nullable.
+
+Dans certains cas, la donnée actuelle (référent d'un parcours, par exemple) est également répétée au niveau de la table en elle-même. Par exemple, la table des parcours :code:`chill_person_accompanying_period` comporte une colonne :code:`step` (le statut du parcours) et :code:`user_id` (id du référent) en plus de l'historique. Bien que redondant, cela simplifie les traitements.
+
+Relations particulières
+=======================
+
+Usagers, ménages, adresses
+--------------------------
+
+Les usagers ont une adresse au travers des ménages: dans l'interface, l'adresse est inscrite dans le dossier du ménage, et elle est "donnée" aux usagers membres du ménage, **et** qui partagent l'adresse de ce ménage. En effet, il est possible que des usagers "appartiennent" à un ménage sans y être domicilié: c'est le cas, par exemple, des enfants en garde alternée.
+
+L'historique de l'appartenance des usagers au ménage est conservée, de même que l'historique des adresses pour un même ménage.
+
+Les tables en jeu sont les suivantes:
+
+- la table :code:`chill_person_person` liste les usagers;
+- la table :code:`chill_person_household_members` liste les appartenances au ménage: il s'agit de la jointure entre les usagers et les ménages:
+  - les colonnes :code:`startDate` et :code:`endDate` indiquent la date de début et la date de fin de l'appartenance;
+  - la colonne :code:`shareHousehold` indique si l'utilisateur partage l'adresse du ménage (si oui, sa valeur est :code:`TRUE`)
+- la table :code:`chill_person_household` liste les ménages
+- la table :code:`chill_person_household_to_addresses` associe les ménages aux adresses;
+- la table :code:`chill_main_address` contient les adresses, en indiquant la date de début de validité (:code:`validFrom`) et la fin de validité (:code:`validTo`).
+
+Pour simplifier la résolution des adresses et des usagers, deux vues ont été mises en œuvre:
+
+- la vue :code:`view_chill_person_household_address` reprend, pour chaque usager, l'historique des appartenances au ménage découpée par l'historique des adresses d'un ménage.
+  Autrement dit, une ligne est créée à chaque fois qu'un usager change de ménage, ou qu'un ménage change d'adresse. Il est donc possible de retrouver l'historique complet des adresses pour un usager donné via cette table.
+- la vue :code:`view_chill_person_current_address` reprend l'adresse actuelle des usagers.
+
+Adresses et unités géographiques
+--------------------------------
+
+Chill propose des statistiques sur la localisation des adresses par rapport à des zones géographiques (:code:`chill_main_geographical_unit`).
+
+Comme la résolution géographique des adresses est coûteuse en CPU et en temps de traitement, une vue matérialisée a été créée: :code:`view_chill_main_address_geographical_unit`. Elle est rafraichie quotidiennement dans la base de donnée de production.
+
+Liste des tables et commentaires
+================================
+
+Une liste commentée de toutes les tables :download:`est disponible au format CSV <./database/table_list.csv`.
diff --git a/docs/source/development/database/table_list.csv b/docs/source/development/database/table_list.csv
new file mode 100644
index 000000000..fe688318d
--- /dev/null
+++ b/docs/source/development/database/table_list.csv
@@ -0,0 +1,155 @@
+order,table_schema,table_name,commentaire
+1,chill_3party,party_category,Catégorie de tiers
+2,chill_3party,party_center,Association entre les tiers et les centres (déprécié)
+3,chill_3party,party_profession,Profession du tiers (déprécié)
+4,chill_3party,third_party,Tiers
+5,chill_3party,thirdparty_category,association tiers - catégories
+6,chill_asideactivity,asideactivity,Activités annexes
+7,chill_asideactivity,asideactivitycategory,Catégories d'activités annexes
+8,chill_budget,charge,Charges du budget
+9,chill_budget,charge_type,Types de charges
+10,chill_budget,resource,Ressources du budget
+11,chill_budget,resource_type,Types de ressources
+12,chill_calendar,calendar,Rendez-vous
+13,chill_calendar,calendar_doc,Document du rendez-vous
+14,chill_calendar,calendar_range,Plage de disponibilité
+15,chill_calendar,calendar_to_persons,association rendez-vous - usagers
+16,chill_calendar,calendar_to_thirdparties,association rendez-vous - tiers
+17,chill_calendar,cancel_reason,Motifs d'annulations
+18,chill_calendar,invite,Invitation aux rendez-vous
+19,chill_doc,accompanyingcourse_document,Documents associés aux parcours
+20,chill_doc,document_category,Catégories de documents
+21,chill_doc,person_document,Documents associés à l'usagers
+22,chill_doc,stored_object,Documents
+23,chill_task,recurring_task,Tâches récurrentes (non utilisé)
+24,chill_task,single_task,Tâches
+25,chill_task,single_task_place_event,Historique des transitions des tâches
+26,chill_vendee,adressederelais,
+27,chill_vendee,center_polygon
+28,chill_vendee,entourage,
+29,chill_vendee,geographical_unit
+30,chill_vendee,geographical_unit_association
+31,chill_vendee,mobilite
+32,chill_vendee,niveauetude
+33,chill_vendee,security_profile
+34,chill_vendee,security_profile_action
+35,chill_vendee,security_profile_jobs
+36,chill_vendee,situationprofessionelle
+37,chill_vendee,statutlogement
+38,chill_vendee,tempsdetravail
+39,chill_vendee,titredesejour
+40,chill_vendee,vendee_person
+41,chill_vendee,vendee_person_mineur
+42,chill_vendee,vendeeperson_entourage
+43,chill_vendee,vendeepersonmineur_adressederelais
+44,public,accompanying_periods_scopes,Services associés aux parcours
+45,public,activity,Échanges
+46,public,activity_activityreason,s
+47,public,activity_person,
+48,public,activity_storedobject,
+49,public,activity_thirdparty,
+50,public,activity_user,
+51,public,activityreason,Sujets d'échange
+52,public,activityreasoncategory,Catégories de sujets
+53,public,activitytpresence,Présence aux échanges
+54,public,activitytype,Types d'échanges
+55,public,activitytypecategory,Catégories de types d'échanges
+56,public,centers,"Centres (territoires, agences, etc.)"
+57,public,chill_activity_activity_chill_person_socialaction,
+58,public,chill_activity_activity_chill_person_socialissue
+59,public,chill_docgen_template,Gabarits de documents
+60,public,chill_main_address,Adresses
+61,public,chill_main_address_legacy,Anciennes adresses (dépréciés)
+62,public,chill_main_address_reference,Adresses de référence
+63,public,chill_main_civility,Civilités
+64,public,chill_main_cronjob_execution,Dernière exécution des tâche cron
+65,public,chill_main_geographical_unit,Unités géographiques
+66,public,chill_main_geographical_unit_layer,Couches d'unités géographiques
+67,public,chill_main_location,Localisations
+68,public,chill_main_location_type,Types de localisations
+69,public,chill_main_notification,Notifications
+70,public,chill_main_notification_addresses_unread
+71,public,chill_main_notification_addresses_user
+72,public,chill_main_notification_comment,
+73,public,chill_main_postal_code,Code postaux
+74,public,chill_main_saved_export,Exports enregistrés
+75,public,chill_main_user_job,Métiers
+76,public,chill_main_workflow_entity,Workflows
+77,public,chill_main_workflow_entity_comment
+78,public,chill_main_workflow_entity_step,Etapes du workflow
+79,public,chill_main_workflow_entity_step_cc_user,
+80,public,chill_main_workflow_entity_step_user
+81,public,chill_main_workflow_entity_step_user_by_accesskey,
+82,public,chill_main_workflow_entity_subscriber_to_final,
+83,public,chill_main_workflow_entity_subscriber_to_step
+84,public,chill_person_accompanying_period,Parcours d'accompagnement
+85,public,chill_person_accompanying_period_closingmotive,Motifs de cloture des parcours
+86,public,chill_person_accompanying_period_comment,Commentaires des parcours
+87,public,chill_person_accompanying_period_location_history,Historique de la localisatio ndes parcours
+88,public,chill_person_accompanying_period_origin,Origine des parcours
+89,public,chill_person_accompanying_period_participation,Appartenance des usagers au parcours
+90,public,chill_person_accompanying_period_resource,Personnes ressources d'un parcours
+91,public,chill_person_accompanying_period_social_issues,
+92,public,chill_person_accompanying_period_step_history
+93,public,chill_person_accompanying_period_user_history
+94,public,chill_person_accompanying_period_work,Actions d'accompagnements
+95,public,chill_person_accompanying_period_work_evaluation,Évaluations (dans les actions d'accompagnements)
+96,public,chill_person_accompanying_period_work_evaluation_document,Documents des évaluations
+97,public,chill_person_accompanying_period_work_goal,Objectifs d'une actions
+98,public,chill_person_accompanying_period_work_goal_result,Objectifs et résultats d'une action
+99,public,chill_person_accompanying_period_work_person,Usagers associés à une actions
+100,public,chill_person_accompanying_period_work_referrer,Référents d'une actions
+101,public,chill_person_accompanying_period_work_result,Résultats d'une action
+102,public,chill_person_accompanying_period_work_third_party,Tiers traitants d'une action
+103,public,chill_person_alt_name,"Noms supplémentaires d'un usager (nom marital, etc.)"
+104,public,chill_person_household,Ménages
+105,public,chill_person_household_composition,
+106,public,chill_person_household_composition_type,Types de composition de ménage
+107,public,chill_person_household_members,Membres du ménages
+108,public,chill_person_household_position,Positions dans le ménage
+109,public,chill_person_household_to_addresses,Association adresses - ménages
+110,public,chill_person_marital_status,Etats civils
+111,public,chill_person_not_duplicate,
+112,public,chill_person_person,Usagers
+113,public,chill_person_person_center_history,Historique des centres d'un usagers
+114,public,chill_person_persons_to_addresses,Déprécié
+115,public,chill_person_phone,Numéros d etéléphone supplémentaires d'un usager
+116,public,chill_person_relations,Types de relations de filiation
+117,public,chill_person_relationships,Relations de filiations
+118,public,chill_person_residential_address,Adresses de résidences
+119,public,chill_person_resource,Personnes ressources (pour les personnes)
+120,public,chill_person_resource_kind,Type de personnes ressources
+121,public,chill_person_social_action,Liste des actions d'accompagnement
+122,public,chill_person_social_action_goal,Objectifs associés à une action
+123,public,chill_person_social_action_result,Résultats associés à une action
+124,public,chill_person_social_issue,Problématiques sociales
+125,public,chill_person_social_work_evaluation,Evaluations disponibles
+126,public,chill_person_social_work_evaluation_action,Associations entre les évaluations et les actions
+127,public,chill_person_social_work_goal,Objectifs disponibles pour une actions
+128,public,chill_person_social_work_goal_result,Objectifs et résultats disponible pour une action
+129,public,chill_person_social_work_result,Résultats disponibles pour une action
+130,public,country,Pays
+131,public,custom_field_long_choice_options,
+132,public,customfield
+133,public,customfieldsdefaultgroup
+134,public,customfieldsgroup
+135,public,geography_columns,Table liée à postgis
+136,public,geometry_columns,Table liée à postgis
+137,public,group_centers,
+138,public,language,Langues
+139,public,messenger_messages,Table système
+140,public,migration_versions,Table système
+141,public,permission_groups
+142,public,permissionsgroup_rolescope
+143,public,persons_spoken_languages
+144,public,regroupment,Regroupement de centres
+145,public,regroupment_center,
+146,public,role_scopes,
+147,public,scopes,Services
+148,public,spatial_ref_sys,Table système (postgis)
+149,public,user_groupcenter,
+150,public,users,Utilisateurs
+151,public,view_chill_person_accompanying_period_info,
+152,public,view_chill_person_current_address
+153,public,view_chill_person_household_address
+154,public,view_chill_person_person_center_history_current
diff --git a/docs/source/development/entity-info.rst b/docs/source/development/entity-info.rst
new file mode 100644
index 000000000..72d8b70ea
--- /dev/null
+++ b/docs/source/development/entity-info.rst
@@ -0,0 +1,203 @@
+
+.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled "GNU
+Free Documentation License".
+
+.. _entity-info:
+
+Stats about event on entity in php world
+########################################
+
+It is necessary to be able to gather information about events for some entities:
+
+- when the event has been done;
+- who did it;
+- ...
+
+Those "infos" are not linked with right management, like describe in :ref:`timelines`.
+
+
+“infos” for some stats and info about an entity
+-----------------------------------------------
+
+Building an info means:
+
+- create an Entity, and map this entity to a SQL view (not a regular table);
+- use the framework to build this entity dynamically.
+
+A framework api is built to be able to build multiple “infos” entities
+through “union” views:
+
+-  use a command ``bin/console chill:db:sync-views`` to synchronize view (create view if it does not exists, or update
+   views when new SQL parts are added in the UNION query. Internally, this command call a new ``ViewEntityInfoManager``,
+   which iterate over available views to build the SQL;
+-  one can create a new “view entity info” by implementing a
+   ``ViewEntityInfoProviderInterface``
+-  this implementation of the interface is free to create another
+   interface for building each part of the UNION query. This interface
+   is created for AccompanyingPeriodInfo:
+   ``Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface``
+
+So, converting new “events” into rows for ``AccompanyingPeriodInfo`` is
+just implementing this interface!
+
+Implementation for AccompanyingPeriod (``AccompanyingPeriod/AccompanyingPeriodInfo``)
+-------------------------------------------------------------------------------------
+
+A class is created for computing some statistical info for an
+AccompanyingPeriod: ``AccompanyingPeriod/AccompanyingPeriodInfo``. This
+contains information about “something happens”, who did it and when.
+
+Having those info in table answer some questions like:
+
+-  when is the last and the first action (AccompanyingPeriodWork,
+   Activity, AccompanyingPeriodWorkEvaluation, …) on the period;
+-  who is “acting” on the period, and when is the last “action” for each
+   user.
+
+The AccompanyingPeriod info is mapped to a SQL view, not a table. The
+sql view is built dynamically (see below), and gather infos from
+ActivityBundle, PersonBundle, CalendarBundle, … It is possible to create
+custom bundle and add info on this view.
+
+.. code:: php
+
+   /**
+    *
+    * @ORM\Entity()
+    * @ORM\Table(name="view_chill_person_accompanying_period_info") <==== THIS IS A VIEW, NOT A TABLE
+    */
+   class AccompanyingPeriodInfo
+   {
+     // ...
+   }
+
+Why do we need this ?
+~~~~~~~~~~~~~~~~~~~~~
+
+For multiple jobs in PHP world:
+
+-  moving the accompanying period to another steps when inactive,
+   automatically;
+-  listing all the users which are intervening on the action on a new
+   “Liste des intervenants” page;
+-  filtering on exports
+
+Later, we will launch automatic anonymise for accompanying period and
+all related entities through this information.
+
+How is built the SQL views which is mapped to “info” entities ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The AccompanyingPeriodInfo entity is mapped by a SQL view (not a regular
+table).
+
+The sql view is built dynamically, it is a SQL view like this, for now (April 2023):
+
+.. code:: sql
+
+   create view view_chill_person_accompanying_period_info
+               (accompanyingperiod_id, relatedentity, relatedentityid, user_id, infodate, discriminator, metadata) as
+   SELECT w.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'::text AS relatedentity,
+          w.id                                                                        AS relatedentityid,
+          cpapwr.user_id,
+          w.enddate                                                                   AS infodate,
+          'accompanying_period_work_end'::text                                        AS discriminator,
+          '{}'::jsonb                                                                 AS metadata
+   FROM chill_person_accompanying_period_work w
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON w.id = cpapwr.accompanyingperiodwork_id
+   WHERE w.enddate IS NOT NULL
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+          e.id                                                                                  AS relatedentityid,
+          e.updatedby_id                                                                        AS user_id,
+          e.updatedat                                                                           AS infodate,
+          'accompanying_period_work_evaluation_updated_at'::text                                AS discriminator,
+          '{}'::jsonb                                                                           AS metadata
+   FROM chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+   WHERE e.updatedat IS NOT NULL
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+          e.id                                                                                  AS relatedentityid,
+          cpapwr.user_id,
+          e.maxdate                                                                             AS infodate,
+          'accompanying_period_work_evaluation_start'::text                                     AS discriminator,
+          '{}'::jsonb                                                                           AS metadata
+   FROM chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id
+   WHERE e.maxdate IS NOT NULL
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+          e.id                                                                                  AS relatedentityid,
+          cpapwr.user_id,
+          e.startdate                                                                           AS infodate,
+          'accompanying_period_work_evaluation_start'::text                                     AS discriminator,
+          '{}'::jsonb                                                                           AS metadata
+   FROM chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument'::text AS relatedentity,
+          doc.id                                                                                        AS relatedentityid,
+          doc.updatedby_id                                                                              AS user_id,
+          doc.updatedat                                                                                 AS infodate,
+          'accompanying_period_work_evaluation_document_updated_at'::text                               AS discriminator,
+          '{}'::jsonb                                                                                   AS metadata
+   FROM chill_person_accompanying_period_work_evaluation_document doc
+            JOIN chill_person_accompanying_period_work_evaluation e ON doc.accompanyingperiodworkevaluation_id = e.id
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+   WHERE doc.updatedat IS NOT NULL
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+          e.id                                                                                  AS relatedentityid,
+          cpapwr.user_id,
+          e.maxdate                                                                             AS infodate,
+          'accompanying_period_work_evaluation_max'::text                                       AS discriminator,
+          '{}'::jsonb                                                                           AS metadata
+   FROM chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id
+   WHERE e.maxdate IS NOT NULL
+   UNION
+   SELECT w.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'::text AS relatedentity,
+          w.id                                                                        AS relatedentityid,
+          cpapwr.user_id,
+          w.startdate                                                                 AS infodate,
+          'accompanying_period_work_start'::text                                      AS discriminator,
+          '{}'::jsonb                                                                 AS metadata
+   FROM chill_person_accompanying_period_work w
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON w.id = cpapwr.accompanyingperiodwork_id
+   UNION
+   SELECT activity.accompanyingperiod_id,
+          'Chill\ActivityBundle\Entity\Activity'::text AS relatedentity,
+          activity.id                                  AS relatedentityid,
+          au.user_id,
+          activity.date                                AS infodate,
+          'activity_date'::text                        AS discriminator,
+          '{}'::jsonb                                  AS metadata
+   FROM activity
+            LEFT JOIN activity_user au ON activity.id = au.activity_id
+   WHERE activity.accompanyingperiod_id IS NOT NULL;
+
+As you can see, the view gather multiple SELECT queries and bind them
+with UNION.
+
+Each SELECT query is built dynamically, through a class implementing an
+interface: ``Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface``, `like
+here <https://gitlab.com/Chill-Projet/chill-bundles/-/blob/master/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php>`__
+
+To add new `SELECT` query in different `UNION` parts in the sql view, create a
+service and implements this interface: ``Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface``.
diff --git a/docs/source/development/index.rst b/docs/source/development/index.rst
index 52c541c8e..d48f92890 100644
--- a/docs/source/development/index.rst
+++ b/docs/source/development/index.rst
@@ -9,7 +9,7 @@
 Development
 ###########
 
-As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the framework's documentation should answer most of your questions. We are explaining here some tips to work with Chill, and things we provide to encounter our needs.
+As Chill relies on the `symfony <http://symfony.com>`_ framework, reading the framework's documentation should answer most of your questions. We are explaining here some tips to work with Chill, and help with things we've encountered.
 
 .. toctree::
     :maxdepth: 2
@@ -35,6 +35,9 @@ As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the fram
     manual/index.rst
     Assets <assets.rst>
     Cron Jobs <cronjob.rst>
+    Info about entities <entity-info.rst>
+    Info about database (in French) <database-principles.rst>
+    Developer FAQ <FAQ.rst>
 
 Layout and UI
 **************
diff --git a/docs/source/development/pagination/example.php b/docs/source/development/pagination/example.php
index 0d79395a7..964da8764 100644
--- a/docs/source/development/pagination/example.php
+++ b/docs/source/development/pagination/example.php
@@ -13,7 +13,7 @@ namespace Chill\MyBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-class example extends Controller
+class example extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
 {
     public function yourAction()
     {
diff --git a/docs/source/development/timelines.rst b/docs/source/development/timelines.rst
index afabdb398..51c0a1bad 100644
--- a/docs/source/development/timelines.rst
+++ b/docs/source/development/timelines.rst
@@ -6,6 +6,8 @@
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
+.. _timelines:
+
 Timelines
 *********
 
@@ -18,24 +20,24 @@ Concept
 From an user point of view
 --------------------------
 
-Chill has two objectives : 
+Chill has two objectives :
 
 * make the administrative tasks more lightweight ;
 * help social workers to have all information they need to work
 
 To reach this second objective, Chill provides a special view: **timeline**. On a timeline view, information is gathered and shown on a single page, from the most recent event to the oldest one.
 
-The information gathered is linked to a *context*. This *context* may be, for instance : 
+The information gathered is linked to a *context*. This *context* may be, for instance :
 
 * a person : events linked to this person are shown on the page ;
 * a center: events linked to a center are shown. They may concern different peoples ;
-* ... 
+* ...
 
 In other word, the *context* is the kind of argument that will be used in the event's query.
 
 Let us recall that only the data the user has allowed to see should be shown.
 
-.. seealso:: 
+.. seealso::
 
    `The issue where the subject was first discussed <https://redmine.champs-libres.coop/issues/224>`_
 
@@ -43,30 +45,30 @@ Let us recall that only the data the user has allowed to see should be shown.
 For developers
 --------------
 
-The `Main` bundle provides interfaces and services to help to build timelines. 
+The `Main` bundle provides interfaces and services to help to build timelines.
 
 If a bundle wants to *push* information in a timeline, it should be create a service which implements `Chill\MainBundle\Timeline\TimelineProviderInterface`, and tag is with `chill.timeline` and arguments defining the supported context (you may use multiple `chill.timeline` tags in order to support multiple context with a single service/class).
 
-If a bundle wants to provide a new context for a timeline, the service `chill.main.timeline_builder` will helps to gather timeline's services supporting the defined context, and run queries across the models. 
+If a bundle wants to provide a new context for a timeline, the service `chill.main.timeline_builder` will helps to gather timeline's services supporting the defined context, and run queries across the models.
 
 .. _understanding-queries :
 
 Understanding queries
 ^^^^^^^^^^^^^^^^^^^^^
 
-Due to the fact that timelines should show only the X last events from Y differents tables, queries for a timeline may consume a lot of resources: at first on the database, and then on the ORM part, which will have to deserialize DB data to PHP classes, which may not be used if they are not part of the "last X events". 
+Due to the fact that timelines should show only the X last events from Y differents tables, queries for a timeline may consume a lot of resources: at first on the database, and then on the ORM part, which will have to deserialize DB data to PHP classes, which may not be used if they are not part of the "last X events".
 
-To avoid such load on database, the objects are queried in two steps : 
+To avoid such load on database, the objects are queried in two steps :
 
 1. An UNION request which gather the last X events, ordered by date. The data retrieved are the ID, the date, and a string key: a type. This type discriminates the data type.
-2. The PHP objects are queried by ID, the type helps the program to link id with the kind of objects. 
+2. The PHP objects are queried by ID, the type helps the program to link id with the kind of objects.
 
 Those methods should ensure that only X PHP objects will be gathered and build by the ORM.
 
 What does the master timeline builder service ?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
- When the service `chill.main.timeline_builder` is instanciated, the service is informed of each service taggued with `chill.timeline` tags. Then, 
+ When the service `chill.main.timeline_builder` is instanciated, the service is informed of each service taggued with `chill.timeline` tags. Then,
 
 1. The service build an UNION query by assembling column and tables names provided by the `fetchQuery` result ;
 2. The UNION query is run, the result contains an id and a type for each row (see :ref:`above <understanding-queries>`)
@@ -84,7 +86,7 @@ To push events on a timeline :
 Implementing the TimelineProviderInterface
 ------------------------------------------
 
-The has the following signature : 
+The has the following signature :
 
 .. code-block:: php
 
@@ -92,19 +94,19 @@ The has the following signature :
 
     interface TimelineProviderInterface
     {
-        
-        /** 
-         * 
+
+        /**
+         *
          * @param string $context
          * @param mixed[] $args the argument to the context.
          * @return TimelineSingleQuery
          * @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
          */
@@ -113,42 +115,42 @@ The has the following signature :
         /**
          * fetch entities from db into an associative array. The keys **MUST BE**
          * the id
-         * 
-         * All ids returned by all SELECT queries 
+         *
+         * 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
-         * 
+         *
          * 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
@@ -156,7 +158,7 @@ The has the following signature :
          * @throws \LogicException if the context is not supported
          */
         public function getEntityTemplate($entity, $context, array $args);
-     
+
     }
 
 
@@ -176,7 +178,7 @@ The parameters should be replaced into the query by :code:`?`. They will be repl
 
 `$context` and `$args` are defined by the bundle which will call the timeline rendering. You may use them to build a different query depending on this context.
 
-For instance, if the context is `'person'`, the args will be this array : 
+For instance, if the context is `'person'`, the args will be this array :
 
 .. code-block:: php
 
@@ -197,7 +199,7 @@ You should find in the bundle documentation which contexts are arguments the bun
 
 .. note::
 
-    We encourage to use `ClassMetaData` to define column names arguments. If you change your column names, changes will be reflected automatically during the execution of your code. 
+    We encourage to use `ClassMetaData` to define column names arguments. If you change your column names, changes will be reflected automatically during the execution of your code.
 
 Example of an implementation :
 
@@ -215,13 +217,13 @@ Example of an implementation :
      */
     class TimelineReportProvider implements TimelineProviderInterface
     {
-        
+
         /**
          *
          * @var EntityManager
          */
         protected $em;
-        
+
         public function __construct(EntityManager $em)
         {
             $this->em = $em;
@@ -230,9 +232,9 @@ Example of an implementation :
         public function fetchQuery($context, array $args)
             {
                 $this->checkContext($context);
-                
+
                 $metadata = $this->em->getClassMetadata('ChillReportBundle:Report');
-                
+
                 return TimelineSingleQuery::fromArray([
                    'id' => $metadata->getColumnName('id'),
                    'type' => 'report',
@@ -254,11 +256,11 @@ Example of an implementation :
 The `supportsType` function
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This function indicate to the master `chill.main.timeline_builder` service (which orchestrate the build of UNION queries) that the service supports the type indicated in the result's array of the `fetchQuery` function. 
+This function indicate to the master `chill.main.timeline_builder` service (which orchestrate the build of UNION queries) that the service supports the type indicated in the result's array of the `fetchQuery` function.
 
-The implementation of our previous example will be : 
+The implementation of our previous example will be :
 
-.. code-block:: php 
+.. code-block:: php
 
 
     namespace Chill\ReportBundle\Timeline;
@@ -272,7 +274,7 @@ The implementation of our previous example will be :
         //...
 
         /**
-         * 
+         *
          * {@inheritDoc}
          */
         public function supportsType($type)
@@ -304,12 +306,12 @@ The results **must be** an array where the id given by the UNION query (remember
         {
             $reports = $this->em->getRepository('ChillReportBundle:Report')
                   ->findBy(array('id' => $ids));
-            
+
             $result = array();
             foreach($reports as $report) {
                 $result[$report->getId()] = $report;
             }
-            
+
             return $result;
         }
 
@@ -318,9 +320,9 @@ The results **must be** an array where the id given by the UNION query (remember
 The `getEntityTemplate` function
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This is where the master service will collect information to render the entity. 
+This is where the master service will collect information to render the entity.
 
-The result must be an associative array with : 
+The result must be an associative array with :
 
 - **template** is the FQDN of the template ;
 - **template_data** is an associative array where keys are the variables'names for this template, and values are the values.
@@ -332,8 +334,8 @@ Example :
     array(
         'template' => 'ChillMyBundle:timeline:template.html.twig',
         'template_data' => array(
-            'period' => $entity, 
-            'person' => $args['person'] 
+            'period' => $entity,
+            'person' => $args['person']
             )
         );
 
@@ -349,7 +351,7 @@ Create a timeline with his own context
 
 You have to create a Controller which will execute the service `chill.main.timeline_builder`. Using the `Chill\MainBundle\Timeline\TimelineBuilder::getTimelineHTML` function, you will get an HTML representation of the timeline, which you may include with twig `raw` filter.
 
-Example : 
+Example :
 
 .. code-block:: php
 
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 7c8ec1931..da2078a7a 100644
--- a/docs/source/development/useful-snippets/controller-secured-for-person.php
+++ b/docs/source/development/useful-snippets/controller-secured-for-person.php
@@ -16,7 +16,7 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Security\Core\Role\Role;
 
-class ConsultationController extends Controller
+class ConsultationController extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
 {
     /**
      * @param int $id personId
@@ -43,7 +43,7 @@ class ConsultationController extends Controller
 
         $circles = $authorizationHelper->getReachableCircles(
             $this->getUser(),
-            new Role(ConsultationVoter::SEE),
+            ConsultationVoter::SEE,
             $person->getCenter()
         );
 
diff --git a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
index 9eca0ae76..c3a90dfee 100644
--- a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
+++ b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
@@ -23,25 +23,18 @@ class ChillMainConfiguration implements ConfigurationInterface
 {
     use AddWidgetConfigurationTrait;
 
-    /**
-     * @var ContainerBuilder
-     */
-    private $containerBuilder;
-
     public function __construct(
         array $widgetFactories,
-        ContainerBuilder $containerBuilder
+        private readonly ContainerBuilder $containerBuilder
     ) {
         // we register here widget factories (see below)
         $this->setWidgetFactories($widgetFactories);
-        // we will need the container builder later...
-        $this->containerBuilder = $containerBuilder;
     }
 
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('chill_main');
+        $treeBuilder = new TreeBuilder('chill_main');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()
@@ -56,7 +49,7 @@ class ChillMainConfiguration implements ConfigurationInterface
             ->end() // end of widgets
             ->end() // end of root/children
             ->end() // end of root
-;
+        ;
 
         return $treeBuilder;
     }
diff --git a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
index 0c8ed3782..0c3f2c182 100644
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
@@ -87,7 +87,7 @@ class ChillPersonAddAPersonWidget implements WidgetInterface
         // 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(), PersonVoter::SEE);
         $and->add($qb->expr()->in('person.center', ':centers'));
         $qb->setParameter('centers', $centers);
 
diff --git a/docs/source/installation/index.rst b/docs/source/installation/index.rst
index 852a2a6d0..910122196 100644
--- a/docs/source/installation/index.rst
+++ b/docs/source/installation/index.rst
@@ -151,6 +151,7 @@ This script will :
 
    # mount into to container
    ./docker-php.sh
+   bin/console chill:db:sync-views
    # and load fixtures
    bin/console doctrine:migrations:migrate
 
@@ -161,7 +162,7 @@ Chill will be available at ``http://localhost:8001.`` Currently, there isn't any
 
    # mount into to container
    ./docker-php.sh
-   # and load fixtures
+   # and load fixtures (do not this for production)
    bin/console doctrine:fixtures:load --purge-with-truncate
 
 There are several users available:
@@ -204,8 +205,10 @@ How to create the database schema (= run migrations) ?
    # if a container is running
    ./docker-php.sh
    bin/console doctrine:migrations:migrate
+   bin/console chill:db:sync-views
    # if not
    docker-compose run --user $(id -u) php bin/console doctrine:migrations:migrate
+   docker-compose run --user $(id -u) php bin/console chill:db:sync-views
 
 
 How to read the email sent by the program ?
@@ -236,6 +239,23 @@ How to open a terminal in the project
    # if not
    docker-compose run --user $(id -u) php /bin/bash
 
+How to run cron-jobs ?
+======================
+
+Some command must be executed in :ref:`cron jobs <cronjob>`. To execute them:
+
+.. code-block:: bash
+
+   # if a container is running
+   ./docker-php.sh
+   bin/console chill:cron-job:execute
+   # some of them are executed only during the night. So, we have to force the execution during the day:
+   bin/console chill:cron-job:execute 'name-of-the-cron'
+   # if not
+   docker-compose run --user $(id -u) php bin/console chill:cron-job:execute
+   # some of them are executed only during the night. So, we have to force the execution during the day:
+   docker-compose run --user $(id -u) php bin/console chill:cron-job:execute 'name-of-the-cron'
+
 How to run composer ?
 =====================
 
diff --git a/docs/source/installation/prod.rst b/docs/source/installation/prod.rst
index f51141e8d..21da15267 100644
--- a/docs/source/installation/prod.rst
+++ b/docs/source/installation/prod.rst
@@ -38,6 +38,14 @@ This should be adapted to your needs:
 
 * Think about how you will backup your database. Some adminsys find easier to store database outside of docker, which might be easier to administrate or replicate.
 
+Run migrations on each update
+=============================
+
+Every time you start a new version, you should apply update the sql schema:
+
+- running ``bin/console doctrine:migration:migrate`` to run sql migration;
+- synchonizing sql views to the last state: ``bin/console chill:db:sync-views``
+
 Cron jobs
 =========
 
diff --git a/exports_alias_conventions.csv b/exports_alias_conventions.csv
deleted file mode 100644
index ab32cda8e..000000000
--- a/exports_alias_conventions.csv
+++ /dev/null
@@ -1,63 +0,0 @@
-Entity,Join,Attribute,Alias
-AccompanyingPeriod::class,,,acp
-,AccompanyingPeriodWork::class,acp.works,acpw
-,AccompanyingPeriodParticipation::class,acp.participations,acppart
-,Location::class,acp.administrativeLocation,acploc
-,ClosingMotive::class,acp.closingMotive,acpmotive
-,UserJob::class,acp.job,acpjob
-,Origin::class,acp.origin,acporigin
-,Scope::class,acp.scopes,acpscope
-,SocialIssue::class,acp.socialIssues,acpsocialissue
-,User::class,acp.user,acpuser
-AccompanyingPeriodWork::class,,,acpw
-,AccompanyingPeriodWorkEvaluation::class,acpw.accompanyingPeriodWorkEvaluations,workeval
-,User::class,acpw.referrers,acpwuser
-,SocialAction::class,acpw.socialAction,acpwsocialaction
-,Goal::class,acpw.goals,goal
-,Result::class,acpw.results,result
-AccompanyingPeriodParticipation::class,,,acppart
-,Person::class,acppart.person,partperson
-AccompanyingPeriodWorkEvaluation::class,,,workeval
-,Evaluation::class,workeval.evaluation,eval
-Goal::class,,,goal
-,Result::class,goal.results,goalresult
-Person::class,,,person
-,Center::class,person.center,center
-,HouseholdMember::class,partperson.householdParticipations,householdmember
-,MaritalStatus::class,person.maritalStatus,personmarital
-,VendeePerson::class,,vp
-,VendeePersonMineur::class,,vpm
-ResidentialAddress::class,,,resaddr
-,ThirdParty::class,resaddr.hostThirdParty,tparty
-ThirdParty::class,,,tparty
-,ThirdPartyCategory::class,tparty.categories,tpartycat
-HouseholdMember::class,,,householdmember
-,Household::class,householdmember.household,household
-,Person::class,householdmember.person,memberperson
-,,memberperson.center,membercenter
-Household::class,,,household
-,HouseholdComposition::class,household.compositions,composition
-Activity::class,,,activity
-,Person::class,activity.person,actperson
-,AccompanyingPeriod::class,activity.accompanyingPeriod,acp
-,Person::class,activity_person_having_activity.person,person_person_having_activity
-,ActivityReason::class,activity_person_having_activity.reasons,reasons_person_having_activity
-,ActivityType::class,activity.activityType,acttype
-,Location::class,activity.location,actloc
-,SocialAction::class,activity.socialActions,actsocialaction
-,SocialIssue::class,activity.socialIssues,actsocialssue
-,ThirdParty::class,activity.thirdParties,acttparty
-,User::class,activity.user,actuser
-,User::class,activity.users,actusers
-,ActivityReason::class,activity.reasons,actreasons
-,Center::class,actperson.center,actcenter
-ActivityReason::class,,,actreasons
-,ActivityReasonCategory::class,actreason.category,actreasoncat
-Calendar::class,,,cal
-,CancelReason::class,cal.cancelReason,calcancel
-,Location::class,cal.location,calloc
-,User::class,cal.user,caluser
-VendeePerson::class,,,vp
-,SituationProfessionelle::class,vp.situationProfessionelle,vpprof
-,StatutLogement::class,vp.statutLogement,vplog
-,TempsDeTravail::class,vp.tempsDeTravail,vptt
diff --git a/exports_alias_conventions.md b/exports_alias_conventions.md
index fd7844691..eb0545702 100644
--- a/exports_alias_conventions.md
+++ b/exports_alias_conventions.md
@@ -18,9 +18,9 @@ These are alias conventions :
 |                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                         |
 |                                         | User::class                             | acp.user                                   | acpuser                                |
 |                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                       |
+|                                         | AccompanyingPeriodInfo::class           | not existing (using custom WITH clause)    | acpinfo                                |
 | AccompanyingPeriodWork::class           |                                         |                                            | acpw                                   |
 |                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                               |
-|                                         | User::class                             | acpw.referrers                             | acpwuser                               |
 |                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                       |
 |                                         | Goal::class                             | acpw.goals                                 | goal                                   |
 |                                         | Result::class                           | acpw.results                               | result                                 |
@@ -28,6 +28,8 @@ These are alias conventions :
 |                                         | Person::class                           | acppart.person                             | partperson                             |
 | AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                               |
 |                                         | Evaluation::class                       | workeval.evaluation                        | eval                                   |
+| AccompanyingPeriodInfo::class           |                                         |                                            | acpinfo                                |
+|                                         | User::class                             | acpinfo.user                               | acpinfo_user                           |
 | Goal::class                             |                                         |                                            | goal                                   |
 |                                         | Result::class                           | goal.results                               | goalresult                             |
 | Person::class                           |                                         |                                            | person                                 |
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 56b7c2228..62dbe0468 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -2,6 +2,7 @@ parameters:
     level: 5
     paths:
         - src/
+        - utils/
     tmpDir: .cache/
     reportUnmatchedIgnoredErrors: false
     excludePaths:
diff --git a/phpunit.rector.xml b/phpunit.rector.xml
new file mode 100644
index 000000000..f8d9d3a11
--- /dev/null
+++ b/phpunit.rector.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         bootstrap="tests/app/vendor/autoload.php"
+         cacheResultFile=".cache/phpunit/test-results-rector"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="true"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true"
+         colors="true"
+>
+    <testsuites>
+        <testsuite name="default">
+            <directory>utils/rector/tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage cacheDirectory=".cache/phpunit/code-coverage-rector"
+              processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">utils/rector/src</directory>
+        </include>
+    </coverage>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8f157fcc5..aa519e376 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,26 +2,51 @@
 
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="tests/app/vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="tests/app/tests/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="APP_ENV" value="test" force="true" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0&amp;max[indirect]=999999" />
         <server name="SHELL_VERBOSITY" value="-1" />
+        <env name="KERNEL_CLASS" value="\App\Kernel" />
     </php>
 
     <testsuites>
+        <!--
+        <testsuite name="ActivityBundle">
+            <directory suffix="Test.php">src/Bundle/ChillActivityBundle/Tests/</directory>
+        </testsuite>
+        -->
+        <testsuite name="AsideActivityBundle">
+            <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
+        </testsuite>
+        <testsuite name="BudgetBundle">
+            <directory suffix="Test.php">src/Bundle/ChillBudgetBundle/Tests/</directory>
+        </testsuite>
+        <testsuite name="CalendarBundle">
+            <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
+        </testsuite>
+        <!-- Missing CustomFieldBundle -->
+        <testsuite name="DocGeneratorBundle">
+            <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
+        </testsuite>
+        <testsuite name="DocStoreBundle">
+            <directory suffix="Test.php">src/Bundle/ChillDocStoreBundle/Tests/</directory>
+        </testsuite>
+        <!--
+        <testsuite name="EventBundle">
+            <directory suffix="Test.php">src/Bundle/ChillEventBundle/tests/</directory>
+        </testsuite>
+        -->
        <testsuite name="MainBundle">
          <directory suffix="Test.php">src/Bundle/ChillMainBundle/Tests/</directory>
        </testsuite>
        <testsuite name="PersonBundle">
          <directory suffix="Test.php">src/Bundle/ChillPersonBundle/Tests/</directory>
-         <!-- test for export will be runned later -->
-         <exclude>src/Bundle/ChillPersonBundle/Tests/Export/*</exclude>
          <!-- we are rewriting accompanying periods... Work in progress -->
          <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php</exclude>
          <!-- we are rewriting address, Work in progress -->
@@ -31,14 +56,18 @@
          <!-- temporarily removed, the time to find a fix -->
          <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
         </testsuite>
-        <testsuite name="AsideActivityBundle">
-          <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
+        <!--
+        <testsuite name="ReportBundle">
+            <directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>
         </testsuite>
-        <testsuite name="CalendarBundle">
-            <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
+        -->
+        <!--
+        <testsuite name="TaskBundle">
+            <directory suffix="Test.php">src/Bundle/ChillTaskBundle/Tests</directory>
         </testsuite>
-        <testsuite name="DocGeneratorBundle">
-            <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
+        -->
+        <testsuite name="ThirdPartyBundle">
+            <directory suffix="Test.php">src/Bundle/ChillThirdPartyBundle/Tests</directory>
         </testsuite>
         <testsuite name="WopiBundle">
             <directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
diff --git a/rector.php b/rector.php
index 2c5b08bec..0dd8e355c 100644
--- a/rector.php
+++ b/rector.php
@@ -2,6 +2,13 @@
 
 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.
+ */
+
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Set\ValueObject\LevelSetList;
@@ -12,14 +19,37 @@ return static function (RectorConfig $rectorConfig): void {
         __DIR__ . '/src',
     ]);
 
-    $rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
-    $rectorConfig->cacheDirectory(__DIR__.'/.cache/rector');
+    $rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/testsApp_KernelDevDebugContainer.xml');
+    $rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
+
+    //$rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
+    //$rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');
 
     // register a single rule
     $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+    $rectorConfig->disableParallel();
 
-    // define sets of rules
-    //    $rectorConfig->sets([
-    //        LevelSetList::UP_TO_PHP_74
-    //    ]);
+    //define sets of rules
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_82,
+        \Rector\Symfony\Set\SymfonyLevelSetList::UP_TO_SYMFONY_44,
+        \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
+        \Rector\PHPUnit\Set\PHPUnitLevelSetList::UP_TO_PHPUNIT_90,
+    ]);
+
+    // some routes are added twice if it remains activated
+    // $rectorConfig->rule(\Rector\Symfony\Configs\Rector\ClassMethod\AddRouteAnnotationRector::class);
+
+    // chill rules
+    //$rectorConfig->rule(\Chill\Utils\Rector\Rector\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector::class);
+
+    // skip some path...
+    $rectorConfig->skip([
+        // we need to discuss this: are we going to have FALSE in tests instead of an error ?
+        \Rector\Php71\Rector\FuncCall\CountOnNullRector::class,
+
+        // we must adapt service definition
+        \Rector\Symfony\Symfony28\Rector\MethodCall\GetToConstructorInjectionRector::class,
+        \Rector\Symfony\Symfony34\Rector\Closure\ContainerGetNameToTypeInTestsRector::class,
+    ]);
 };
diff --git a/src/Bundle/ChillActivityBundle/ChillActivityBundle.php b/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
index 5f872a7dc..a85ddbb75 100644
--- a/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
+++ b/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
@@ -13,6 +13,4 @@ namespace Chill\ActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class ChillActivityBundle extends Bundle
-{
-}
+class ChillActivityBundle extends Bundle {}
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 97678af50..43c0b13bb 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -20,20 +20,22 @@ use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\LocationRepository;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 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 RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
@@ -43,80 +45,36 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_key_exists;
 
 final class ActivityController extends AbstractController
 {
-    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
-
-    private ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
-
-    private ActivityRepository $activityRepository;
-
-    private ActivityTypeCategoryRepository $activityTypeCategoryRepository;
-
-    private ActivityTypeRepositoryInterface $activityTypeRepository;
-
-    private CenterResolverManagerInterface $centerResolver;
-
-    private EntityManagerInterface $entityManager;
-
-    private EventDispatcherInterface $eventDispatcher;
-
-    private LocationRepository $locationRepository;
-
-    private LoggerInterface $logger;
-
-    private PersonRepository $personRepository;
-
-    private SerializerInterface $serializer;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    private TranslatorInterface $translator;
-
-    private UserRepositoryInterface $userRepository;
-
     public function __construct(
-        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
-        ActivityTypeRepositoryInterface $activityTypeRepository,
-        ActivityTypeCategoryRepository $activityTypeCategoryRepository,
-        PersonRepository $personRepository,
-        ThirdPartyRepository $thirdPartyRepository,
-        LocationRepository $locationRepository,
-        ActivityRepository $activityRepository,
-        AccompanyingPeriodRepository $accompanyingPeriodRepository,
-        EntityManagerInterface $entityManager,
-        EventDispatcherInterface $eventDispatcher,
-        LoggerInterface $logger,
-        SerializerInterface $serializer,
-        UserRepositoryInterface $userRepository,
-        CenterResolverManagerInterface $centerResolver,
-        TranslatorInterface $translator
-    ) {
-        $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->logger = $logger;
-        $this->serializer = $serializer;
-        $this->userRepository = $userRepository;
-        $this->centerResolver = $centerResolver;
-        $this->translator = $translator;
-    }
+        private readonly ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
+        private readonly ActivityTypeRepositoryInterface $activityTypeRepository,
+        private readonly ActivityTypeCategoryRepository $activityTypeCategoryRepository,
+        private readonly PersonRepository $personRepository,
+        private readonly ThirdPartyRepository $thirdPartyRepository,
+        private readonly LocationRepository $locationRepository,
+        private readonly ActivityRepository $activityRepository,
+        private readonly AccompanyingPeriodRepository $accompanyingPeriodRepository,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly LoggerInterface $logger,
+        private readonly SerializerInterface $serializer,
+        private readonly UserRepositoryInterface $userRepository,
+        private readonly CenterResolverManagerInterface $centerResolver,
+        private readonly TranslatorInterface $translator,
+        private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly PaginatorFactory $paginatorFactory,
+    ) {}
 
     /**
      * Deletes a Activity entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/delete", name="chill_activity_activity_delete", methods={"GET", "POST", "DELETE"})
      */
-    public function deleteAction(Request $request, $id)
+    public function deleteAction(Request $request, mixed $id)
     {
         $view = null;
 
@@ -129,10 +87,10 @@ final class ActivityController extends AbstractController
         }
 
         if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/confirm_deleteAccompanyingCourse.html.twig';
             $accompanyingPeriod = $activity->getAccompanyingPeriod();
         } else {
-            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
+            $view = '@ChillActivity/Activity/confirm_deletePerson.html.twig';
         }
 
         // TODO
@@ -140,7 +98,7 @@ final class ActivityController extends AbstractController
 
         $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -173,10 +131,6 @@ final class ActivityController extends AbstractController
             }
         }
 
-        if (null === $view) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
         return $this->render($view, [
             'activity' => $activity,
             'delete_form' => $form->createView(),
@@ -187,6 +141,8 @@ final class ActivityController extends AbstractController
 
     /**
      * Displays a form to edit an existing Activity entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/edit", name="chill_activity_activity_edit", methods={"GET", "POST", "PUT"})
      */
     public function editAction(int $id, Request $request): Response
     {
@@ -202,10 +158,10 @@ final class ActivityController extends AbstractController
         $person = $entity->getPerson();
 
         if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/editAccompanyingCourse.html.twig';
             $accompanyingPeriod = $entity->getAccompanyingPeriod();
         } else {
-            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
+            $view = '@ChillActivity/Activity/editPerson.html.twig';
         }
         // TODO
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
@@ -266,10 +222,6 @@ final class ActivityController extends AbstractController
         $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, [
@@ -284,34 +236,64 @@ final class ActivityController extends AbstractController
 
     /**
      * Lists all Activity entities.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/", name="chill_activity_activity_list")
      */
     public function listAction(Request $request): Response
     {
         $view = null;
         $activities = [];
-        // TODO: add pagination
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
+        $filter = $this->buildFilterOrder($person ?? $accompanyingPeriod);
+
+        $filterArgs = [
+            'my_activities' => $filter->getSingleCheckboxData('my_activities'),
+            'types' => $filter->hasEntityChoice('activity_types') ? $filter->getEntityChoiceData('activity_types') : [],
+            'jobs' => $filter->hasEntityChoice('jobs') ? $filter->getEntityChoiceData('jobs') : [],
+            'before' => $filter->getDateRangeData('activity_date')['to'],
+            'after' => $filter->getDateRangeData('activity_date')['from'],
+        ];
 
         if ($person instanceof Person) {
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
+            $count = $this->activityACLAwareRepository->countByPerson($person, ActivityVoter::SEE, $filterArgs);
+            $paginator = $this->paginatorFactory->create($count);
             $activities = $this->activityACLAwareRepository
-                ->findByPerson($person, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
+                ->findByPerson(
+                    $person,
+                    ActivityVoter::SEE,
+                    $paginator->getCurrentPageFirstItemNumber(),
+                    $paginator->getItemsPerPage(),
+                    ['date' => 'DESC', 'id' => 'DESC'],
+                    $filterArgs
+                );
 
             $event = new PrivacyEvent($person, [
                 'element_class' => Activity::class,
                 'action' => 'list',
             ]);
-            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+            $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-            $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
+            $view = '@ChillActivity/Activity/listPerson.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
 
+            $count = $this->activityACLAwareRepository->countByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE, $filterArgs);
+            $paginator = $this->paginatorFactory->create($count);
             $activities = $this->activityACLAwareRepository
-                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
+                ->findByAccompanyingPeriod(
+                    $accompanyingPeriod,
+                    ActivityVoter::SEE,
+                    $paginator->getCurrentPageFirstItemNumber(),
+                    $paginator->getItemsPerPage(),
+                    ['date' => 'DESC', 'id' => 'DESC'],
+                    $filterArgs
+                );
 
-            $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/listAccompanyingCourse.html.twig';
+        } else {
+            throw new \LogicException('Unsupported');
         }
 
         return $this->render(
@@ -320,10 +302,49 @@ final class ActivityController extends AbstractController
                 'activities' => $activities,
                 'person' => $person,
                 'accompanyingCourse' => $accompanyingPeriod,
+                'filter' => $filter,
+                'paginator' => $paginator,
             ]
         );
     }
 
+    private function buildFilterOrder(AccompanyingPeriod|Person $associated): FilterOrderHelper
+    {
+        $filterBuilder = $this->filterOrderHelperFactory->create(self::class);
+        $types = $this->activityACLAwareRepository->findActivityTypeByAssociated($associated);
+        $jobs = $this->activityACLAwareRepository->findUserJobByAssociated($associated);
+
+        $filterBuilder
+            ->addDateRange('activity_date', 'activity.date')
+            ->addSingleCheckbox('my_activities', 'activity_filter.My activities');
+
+        if (1 < count($types)) {
+            $filterBuilder
+                ->addEntityChoice('activity_types', 'activity_filter.Types', \Chill\ActivityBundle\Entity\ActivityType::class, $types, [
+                    'choice_label' => function (\Chill\ActivityBundle\Entity\ActivityType $activityType) {
+                        $text = match ($activityType->hasCategory()) {
+                            true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()).' > ',
+                            false => '',
+                        };
+
+                        return $text.$this->translatableStringHelper->localize($activityType->getName());
+                    },
+                ]);
+        }
+
+        if (1 < count($jobs)) {
+            $filterBuilder
+                ->addEntityChoice('jobs', 'activity_filter.Jobs', UserJob::class, $jobs, [
+                    'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel()),
+                ]);
+        }
+
+        return $filterBuilder->build();
+    }
+
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/new", name="chill_activity_activity_new", methods={"POST", "GET"})
+     */
     public function newAction(Request $request): Response
     {
         $view = null;
@@ -331,16 +352,16 @@ final class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/newAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
+            $view = '@ChillActivity/Activity/newPerson.html.twig';
         }
 
         $activityType_id = $request->get('activityType_id', 0);
         $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;
@@ -375,45 +396,45 @@ final class ActivityController extends AbstractController
         }
 
         $entity->setActivityType($activityType);
-        $entity->setDate(new DateTime('now'));
+        $entity->setDate(new \DateTime('now'));
 
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
 
-            if (array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
+            if (\array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
                 $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']);
+            if (\array_key_exists('date', $activityData)) {
+                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
 
                 if ($date) {
                     $entity->setDate($date);
                 }
             }
 
-            if (array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
+            if (\array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
                 foreach ($activityData['personsId'] as $personId) {
                     $concernedPerson = $this->personRepository->find($personId);
                     $entity->addPerson($concernedPerson);
                 }
             }
 
-            if (array_key_exists('professionalsId', $activityData) && $activityType->getThirdPartiesVisible() > 0) {
+            if (\array_key_exists('professionalsId', $activityData) && $activityType->getThirdPartiesVisible() > 0) {
                 foreach ($activityData['professionalsId'] as $professionalsId) {
                     $professional = $this->thirdPartyRepository->find($professionalsId);
                     $entity->addThirdParty($professional);
                 }
             }
 
-            if (array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
+            if (\array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
                 foreach ($activityData['usersId'] as $userId) {
                     $user = $this->userRepository->find($userId);
 
@@ -423,16 +444,16 @@ final class ActivityController extends AbstractController
                 }
             }
 
-            if (array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
+            if (\array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
                 $location = $this->locationRepository->find($activityData['location']);
                 $entity->setLocation($location);
             }
 
-            if (array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
+            if (\array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
                 $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);
             }
         }
@@ -504,6 +525,9 @@ final class ActivityController extends AbstractController
         ]);
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/select-type", name="chill_activity_activity_select_type")
+     */
     public function selectTypeAction(Request $request): Response
     {
         $view = null;
@@ -511,9 +535,9 @@ final class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:selectTypeAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/selectTypeAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:selectTypePerson.html.twig';
+            $view = '@ChillActivity/Activity/selectTypePerson.html.twig';
         }
 
         $data = [];
@@ -548,6 +572,9 @@ final class ActivityController extends AbstractController
         ]);
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/show", name="chill_activity_activity_show")
+     */
     public function showAction(Request $request, int $id): Response
     {
         $entity = $this->activityRepository->find($id);
@@ -560,11 +587,11 @@ final class ActivityController extends AbstractController
         $person = $entity->getPerson();
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/showAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
+            $view = '@ChillActivity/Activity/showPerson.html.twig';
         } else {
-            throw new RuntimeException('the activity should be linked with a period or person');
+            throw new \RuntimeException('the activity should be linked with a period or person');
         }
 
         if (null !== $accompanyingPeriod) {
@@ -587,10 +614,6 @@ final class ActivityController extends AbstractController
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
          */
 
-        if (null === $view) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
         return $this->render($view, [
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
@@ -650,8 +673,8 @@ final class ActivityController extends AbstractController
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-        // TODO Add permission
-        // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+            // TODO Add permission
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
index 32cec74a5..6d0b825cc 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -24,6 +24,8 @@ class ActivityReasonCategoryController extends AbstractController
 {
     /**
      * Creates a new ActivityReasonCategory entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/create", name="chill_activity_activityreasoncategory_create", methods={"POST"})
      */
     public function createAction(Request $request)
     {
@@ -31,15 +33,15 @@ class ActivityReasonCategoryController extends AbstractController
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]));
+            return $this->redirectToRoute('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -48,9 +50,9 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Displays a form to edit an existing ActivityReasonCategory entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/edit", name="chill_activity_activityreasoncategory_edit")
      */
-    public function editAction($id)
+    public function editAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -62,7 +64,7 @@ class ActivityReasonCategoryController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -70,6 +72,8 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Lists all ActivityReasonCategory entities.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/", name="chill_activity_activityreasoncategory")
      */
     public function indexAction()
     {
@@ -77,20 +81,22 @@ class ActivityReasonCategoryController extends AbstractController
 
         $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/index.html.twig', [
             'entities' => $entities,
         ]);
     }
 
     /**
      * Displays a form to create a new ActivityReasonCategory entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/new", name="chill_activity_activityreasoncategory_new")
      */
     public function newAction()
     {
         $entity = new ActivityReasonCategory();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -99,9 +105,9 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Finds and displays a ActivityReasonCategory entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/show", name="chill_activity_activityreasoncategory_show")
      */
-    public function showAction($id)
+    public function showAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -111,7 +117,7 @@ class ActivityReasonCategoryController extends AbstractController
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/show.html.twig', [
             'entity' => $entity,
         ]);
     }
@@ -119,9 +125,9 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Edits an existing ActivityReasonCategory entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/update", name="chill_activity_activityreasoncategory_update", methods={"POST", "PUT"})
      */
-    public function updateAction(Request $request, $id)
+    public function updateAction(Request $request, mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -134,13 +140,13 @@ class ActivityReasonCategoryController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isValid()) {
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', ['id' => $id]));
+            return $this->redirectToRoute('chill_activity_activityreasoncategory_edit', ['id' => $id]);
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
index 95a49d0ba..141398cc4 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -24,15 +24,12 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  */
 class ActivityReasonController extends AbstractController
 {
-    private ActivityReasonRepository $activityReasonRepository;
-
-    public function __construct(ActivityReasonRepository $activityReasonRepository)
-    {
-        $this->activityReasonRepository = $activityReasonRepository;
-    }
+    public function __construct(private readonly ActivityReasonRepository $activityReasonRepository) {}
 
     /**
      * Creates a new ActivityReason entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/create", name="chill_activity_activityreason_create", methods={"POST"})
      */
     public function createAction(Request $request)
     {
@@ -40,15 +37,15 @@ class ActivityReasonController extends AbstractController
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $entity->getId()]));
+            return $this->redirectToRoute('chill_activity_activityreason', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -57,9 +54,9 @@ class ActivityReasonController extends AbstractController
     /**
      * Displays a form to edit an existing ActivityReason entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/edit", name="chill_activity_activityreason_edit")
      */
-    public function editAction($id)
+    public function editAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -71,7 +68,7 @@ class ActivityReasonController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -79,6 +76,8 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Lists all ActivityReason entities.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/", name="chill_activity_activityreason")
      */
     public function indexAction()
     {
@@ -86,20 +85,22 @@ class ActivityReasonController extends AbstractController
 
         $entities = $this->activityReasonRepository->findAll();
 
-        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/index.html.twig', [
             'entities' => $entities,
         ]);
     }
 
     /**
      * Displays a form to create a new ActivityReason entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/new", name="chill_activity_activityreason_new")
      */
     public function newAction()
     {
         $entity = new ActivityReason();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -108,9 +109,9 @@ class ActivityReasonController extends AbstractController
     /**
      * Finds and displays a ActivityReason entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/show", name="chill_activity_activityreason_show")
      */
-    public function showAction($id)
+    public function showAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -120,7 +121,7 @@ class ActivityReasonController extends AbstractController
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/show.html.twig', [
             'entity' => $entity,
         ]);
     }
@@ -128,9 +129,9 @@ class ActivityReasonController extends AbstractController
     /**
      * Edits an existing ActivityReason entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/update", name="chill_activity_activityreason_update", methods={"POST", "PUT"})
      */
-    public function updateAction(Request $request, $id)
+    public function updateAction(Request $request, mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -143,13 +144,13 @@ class ActivityReasonController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isValid()) {
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $id]));
+            return $this->redirectToRoute('chill_activity_activityreason', ['id' => $id]);
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
index 3a39ca072..8a1ccda44 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
@@ -24,7 +24,7 @@ class AdminActivityPresenceController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
+        /* @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.id', 'ASC');
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
index 666f8721c..887749406 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
@@ -24,7 +24,7 @@ class AdminActivityTypeCategoryController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
+        /* @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.ordering', 'ASC');
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
index 5f245e9c4..ff75e5909 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
@@ -24,7 +24,7 @@ class AdminActivityTypeController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
+        /* @var \Doctrine\ORM\QueryBuilder $query */
         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 4f96bb36f..deca96bd7 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
@@ -18,11 +18,18 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
  */
 class AdminController extends AbstractController
 {
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activity", name="chill_activity_admin_index")
+     */
     public function indexActivityAction()
     {
-        return $this->render('ChillActivityBundle:Admin:layout_activity.html.twig');
+        return $this->render('@ChillActivity/Admin/layout_activity.html.twig');
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activity_redirect_to_main", name="chill_admin_aside_activity_redirect_to_admin_index", options={null})
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activity_redirect_to_main", name="chill_admin_activity_redirect_to_admin_index")
+     */
     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 8c53ca2d9..b205384e6 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
@@ -25,17 +25,11 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-    private EntityManagerInterface $em;
+    private readonly \Faker\Generator $faker;
 
-    /**
-     * @var \Faker\Generator
-     */
-    private $faker;
-
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(private readonly EntityManagerInterface $em)
     {
         $this->faker = FakerFactory::create('fr_FR');
-        $this->em = $em;
     }
 
     public function getOrder()
@@ -50,7 +44,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
             ->findAll();
 
         foreach ($persons as $person) {
-            $activityNbr = mt_rand(0, 3);
+            $activityNbr = random_int(0, 3);
 
             for ($i = 0; $i < $activityNbr; ++$i) {
                 $activity = $this->newRandomActivity($person);
@@ -75,7 +69,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 
         //      ->setAttendee($this->faker->boolean())
 
-        for ($i = 0; mt_rand(0, 4) > $i; ++$i) {
+        for ($i = 0; random_int(0, 4) > $i; ++$i) {
             $reason = $this->getRandomActivityReason();
 
             if (null !== $reason) {
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
index d006a624c..af674be9e 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
@@ -52,13 +52,13 @@ class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterf
         ];
 
         foreach ($reasons as $r) {
-            echo 'Creating activity reason : ' . $r['name']['en'] . "\n";
+            echo 'Creating activity reason : '.$r['name']['en']."\n";
             $activityReason = (new ActivityReason())
-                ->setName(($r['name']))
+                ->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;
         }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
index 63d9a2ee0..a78ae3972 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
@@ -34,13 +34,13 @@ class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtu
         ];
 
         foreach ($categs as $c) {
-            echo 'Creating activity reason category : ' . $c['name']['en'] . "\n";
+            echo 'Creating activity reason category : '.$c['name']['en']."\n";
             $activityReasonCategory = (new ActivityReasonCategory())
-                ->setName(($c['name']))
+                ->setName($c['name'])
                 ->setActive(true);
             $manager->persist($activityReasonCategory);
             $this->addReference(
-                'cat_' . $c['name']['en'],
+                'cat_'.$c['name']['en'],
                 $activityReasonCategory
             );
         }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
index d0cd9d2be..891f2c979 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
@@ -54,14 +54,14 @@ class LoadActivityType extends Fixture implements OrderedFixtureInterface
         ];
 
         foreach ($types as $t) {
-            echo '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']))
+                ->setName($t['name'])
+                ->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 4fb5a3e38..2f15a2676 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
@@ -42,13 +42,13 @@ class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterfac
         ];
 
         foreach ($categories as $cat) {
-            echo 'Creating activity type category : ' . $cat['ref'] . "\n";
+            echo 'Creating activity type category : '.$cat['ref']."\n";
 
             $newCat = (new ActivityTypeCategory())
-                ->setName(($cat['name']));
+                ->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 0ffb2ed0e..e7c893cd9 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -20,8 +20,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-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.
@@ -40,10 +38,10 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             break 2; // we do not want any power on administrative
                         }
 
@@ -51,7 +49,7 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
                         }
 
@@ -60,7 +58,7 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
                 printf(
                     'Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s '
-                        . "permission group, scope '%s' \n",
+                        ."permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );
diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
index 49b3927ed..15e7e7e4b 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -32,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');
@@ -73,7 +73,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
      */
     public function prependRoutes(ContainerBuilder $container)
     {
-        //add routes for custom bundle
+        // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
index e22f6242c..112d49f60 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -13,7 +13,6 @@ namespace Chill\ActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-
 use function is_int;
 
 /**
@@ -26,7 +25,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_activity');
-        $rootNode = $treeBuilder->getRootNode('chill_activity');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()
@@ -59,9 +58,7 @@ class Configuration implements ConfigurationInterface
             ->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')
+            ->ifTrue(static fn ($data) => !\is_int($data))->thenInvalid('The value %s is not a valid integer')
             ->end()
             ->end()
             ->scalarNode('label')
diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index 9adfa057f..9407aecbe 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -36,7 +36,6 @@ use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 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;
@@ -46,11 +45,15 @@ use Symfony\Component\Validator\Constraints as Assert;
  * Class Activity.
  *
  * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
+ *
  * @ORM\Table(name="activity")
+ *
  * @ORM\HasLifecycleCallbacks
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "activity": Activity::class
  * })
+ *
  * @ActivityValidator\ActivityValidity
  *
  * TODO see if necessary
@@ -65,69 +68,84 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     use TrackUpdateTrait;
 
-    public const SENTRECEIVED_RECEIVED = 'received';
+    final public const SENTRECEIVED_RECEIVED = 'received';
 
-    public const SENTRECEIVED_SENT = 'sent';
+    final 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", "docgen:read"})
+     *
      * @SerializedName("activityType")
+     *
      * @ORM\JoinColumn(name="type_id")
      */
     private ActivityType $activityType;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
+     *
      * @Groups({"docgen:read"})
      */
     private ?ActivityPresence $attendee = null;
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     *
      * @Groups({"docgen:read"})
      */
     private CommentEmbeddable $comment;
 
     /**
      * @ORM\Column(type="datetime")
+     *
      * @Groups({"docgen:read"})
      */
-    private DateTime $date;
+    private \DateTime $date;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
+     *
      * @Assert\Valid(traverse=true)
+     *
+     * @var Collection<StoredObject>
      */
     private Collection $documents;
 
     /**
      * @ORM\Column(type="time", nullable=true)
      */
-    private ?DateTime $durationTime = null;
+    private ?\DateTime $durationTime = null;
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     *
      * @Groups({"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="Chill\MainBundle\Entity\Location")
+     *
      * @groups({"read", "docgen:read"})
      */
     private ?Location $location = null;
@@ -139,9 +157,12 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
+     *
      * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<Person>
      */
-    private ?Collection $persons = null;
+    private Collection $persons;
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
@@ -150,58 +171,78 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
+     *
      * @Groups({"docgen:read"})
+     *
+     * @var Collection<ActivityReason>
      */
     private Collection $reasons;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+     *
      * @Groups({"docgen:read"})
      */
     private ?Scope $scope = null;
 
     /**
      * @ORM\Column(type="string", options={"default": ""})
+     *
      * @Groups({"docgen:read"})
      */
     private string $sentReceived = '';
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
+     *
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
+     *
      * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<SocialAction>
      */
     private Collection $socialActions;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
+     *
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
+     *
      * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<SocialIssue>
      */
     private Collection $socialIssues;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     *
      * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<ThirdParty>
      */
-    private ?Collection $thirdParties = null;
+    private Collection $thirdParties;
 
     /**
      * @ORM\Column(type="time", nullable=true)
      */
-    private ?DateTime $travelTime = null;
+    private ?\DateTime $travelTime = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @Groups({"docgen:read"})
      */
-    private ?User $user;
+    private ?User $user = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @Groups({"read", "docgen:read"})
+     *
+     * @var Collection<User>
      */
-    private ?Collection $users = null;
+    private Collection $users;
 
     public function __construct()
     {
@@ -268,7 +309,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
             $this->socialIssues[] = $socialIssue;
         }
 
-        if ($this->getAccompanyingPeriod() !== null) {
+        if (null !== $this->getAccompanyingPeriod()) {
             $this->getAccompanyingPeriod()->addSocialIssue($socialIssue);
         }
 
@@ -334,7 +375,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->comment;
     }
 
-    public function getDate(): DateTime
+    public function getDate(): \DateTime
     {
         return $this->date;
     }
@@ -356,7 +397,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return (int) round(($this->durationTime->getTimestamp() + $this->durationTime->getOffset()) / 60.0, 0);
     }
 
-    public function getDurationTime(): ?DateTime
+    public function getDurationTime(): ?\DateTime
     {
         return $this->durationTime;
     }
@@ -410,7 +451,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
             // TODO better semantic with:  return $this->persons->filter(...);
             foreach ($this->persons as $person) {
-                if ($this->accompanyingPeriod->getOpenParticipationContainsPerson($person) === null) {
+                if (null === $this->accompanyingPeriod->getOpenParticipationContainsPerson($person)) {
                     $personsNotAssociated[] = $person;
                 }
             }
@@ -469,7 +510,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->thirdParties;
     }
 
-    public function getTravelTime(): ?DateTime
+    public function getTravelTime(): ?\DateTime
     {
         return $this->travelTime;
     }
@@ -580,7 +621,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setDate(DateTime $date): self
+    public function setDate(\DateTime $date): self
     {
         $this->date = $date;
 
@@ -594,7 +635,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setDurationTime(?DateTime $durationTime): self
+    public function setDurationTime(?\DateTime $durationTime): self
     {
         $this->durationTime = $durationTime;
 
@@ -664,7 +705,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setTravelTime(DateTime $travelTime): self
+    public function setTravelTime(\DateTime $travelTime): self
     {
         $this->travelTime = $travelTime;
 
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
index 95b3c95d2..c181b7c6b 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
@@ -18,7 +18,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * Class ActivityPresence.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="activitytpresence")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityPresence
@@ -30,15 +32,20 @@ class ActivityPresence
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
index e6da6b7e0..90d088f6f 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
@@ -17,39 +17,38 @@ use Doctrine\ORM\Mapping as ORM;
  * Class ActivityReason.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="activityreason")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityReason
 {
     /**
-     * @var bool
      * @ORM\Column(type="boolean")
      */
-    private $active = true;
+    private bool $active = true;
 
     /**
-     * @var ActivityReasonCategory
      * @ORM\ManyToOne(
      *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
      * inversedBy="reasons")
      */
-    private $category;
+    private ?ActivityReasonCategory $category = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var array
      * @ORM\Column(type="json")
      */
-    private $name;
+    private array $name;
 
     /**
      * Get active.
@@ -81,27 +80,9 @@ class ActivityReason
 
     /**
      * Get name.
-     *
-     * @param mixed|null $locale
-     *
-     * @return array | string
      */
-    public function getName($locale = null)
+    public function getName(): array
     {
-        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;
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
index e8c2e245d..64d7f9672 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
@@ -12,34 +12,37 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Class ActivityReasonCategory.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="activityreasoncategory")
+ *
  * @ORM\HasLifecycleCallbacks
  */
-class ActivityReasonCategory
+class ActivityReasonCategory implements \Stringable
 {
     /**
-     * @var bool
      * @ORM\Column(type="boolean")
      */
-    private $active = true;
+    private bool $active = true;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @var string
+     *
      * @ORM\Column(type="json")
      */
     private $name;
@@ -47,12 +50,13 @@ class ActivityReasonCategory
     /**
      * Array of ActivityReason.
      *
-     * @var ArrayCollection
+     * @var Collection<ActivityReason>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\ActivityBundle\Entity\ActivityReason",
      * mappedBy="category")
      */
-    private $reasons;
+    private Collection $reasons;
 
     /**
      * ActivityReasonCategory constructor.
@@ -62,12 +66,9 @@ class ActivityReasonCategory
         $this->reasons = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
-        return 'ActivityReasonCategory(' . $this->getName('x') . ')';
+        return 'ActivityReasonCategory('.$this->getName('x').')';
     }
 
     /**
@@ -121,11 +122,9 @@ class ActivityReasonCategory
      * as unactive, all the reason have this entity as category is also
      * set as unactive.
      *
-     * @param bool $active
-     *
      * @return ActivityReasonCategory
      */
-    public function setActive($active)
+    public function setActive(bool $active)
     {
         if ($this->active !== $active && !$active) {
             foreach ($this->reasons as $reason) {
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
index a6e0fc694..c14c8292b 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use InvalidArgumentException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -22,31 +21,36 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  * Class ActivityType.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="activitytype")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityType
 {
-    public const FIELD_INVISIBLE = 0;
+    final public const FIELD_INVISIBLE = 0;
 
-    public const FIELD_OPTIONAL = 1;
+    final public const FIELD_OPTIONAL = 1;
 
-    public const FIELD_REQUIRED = 2;
+    final 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;
@@ -118,11 +122,14 @@ class ActivityType
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
@@ -136,7 +143,9 @@ class ActivityType
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
@@ -158,6 +167,7 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     *
      * @Groups({"read"})
      */
     private int $personsVisible = self::FIELD_OPTIONAL;
@@ -238,6 +248,7 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     *
      * @Groups({"read"})
      */
     private int $thirdPartiesVisible = self::FIELD_INVISIBLE;
@@ -264,6 +275,7 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     *
      * @Groups({"read"})
      */
     private int $usersVisible = self::FIELD_OPTIONAL;
@@ -275,10 +287,8 @@ class ActivityType
 
     /**
      * @Assert\Callback
-     *
-     * @param mixed $payload
      */
-    public function checkSocialActionsVisibility(ExecutionContextInterface $context, $payload)
+    public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload)
     {
         if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
             if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
@@ -374,13 +384,13 @@ class ActivityType
 
     public function getLabel(string $field): ?string
     {
-        $property = $field . 'Label';
+        $property = $field.'Label';
 
         if (!property_exists($this, $property)) {
-            throw new InvalidArgumentException('Field "' . $field . '" not found');
+            throw new \InvalidArgumentException('Field "'.$field.'" not found');
         }
 
-        /** @phpstan-ignore-next-line  */
+        /* @phpstan-ignore-next-line */
         return $this->{$property};
     }
 
@@ -533,25 +543,25 @@ class ActivityType
 
     public function isRequired(string $field): bool
     {
-        $property = $field . 'Visible';
+        $property = $field.'Visible';
 
         if (!property_exists($this, $property)) {
-            throw new InvalidArgumentException('Field "' . $field . '" not found');
+            throw new \InvalidArgumentException('Field "'.$field.'" not found');
         }
 
-        /** @phpstan-ignore-next-line  */
+        /* @phpstan-ignore-next-line */
         return self::FIELD_REQUIRED === $this->{$property};
     }
 
     public function isVisible(string $field): bool
     {
-        $property = $field . 'Visible';
+        $property = $field.'Visible';
 
         if (!property_exists($this, $property)) {
-            throw new InvalidArgumentException('Field "' . $field . '" not found');
+            throw new \InvalidArgumentException('Field "'.$field.'" not found');
         }
 
-        /** @phpstan-ignore-next-line  */
+        /* @phpstan-ignore-next-line */
         return self::FIELD_INVISIBLE !== $this->{$property};
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
index 2cf6972c7..680a15fa7 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
@@ -15,7 +15,9 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="activitytypecategory")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityTypeCategory
@@ -27,7 +29,9 @@ class ActivityTypeCategory
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
diff --git a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
index 76fb440e7..31fac3be8 100644
--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -15,22 +15,11 @@ 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 __construct(private readonly EntityManagerInterface $em, private readonly AccompanyingPeriodWorkRepository $workRepository) {}
 
     public function persistActionToCourse(Activity $activity)
     {
@@ -39,11 +28,11 @@ class ActivityEntityListener
 
             $accompanyingCourseWorks = $this->workRepository->findByAccompanyingPeriod($period);
             $periodActions = [];
-            $now = new DateTimeImmutable();
+            $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)) {
+                if (null === $work->getEndDate() || $work->getEndDate() > ($activity->getDate() ?? $now)) {
                     $periodActions[$key] = spl_object_hash($work->getSocialAction());
                 }
             }
@@ -52,14 +41,14 @@ class ActivityEntityListener
             $associatedThirdparties = $activity->getThirdParties();
 
             foreach ($activity->getSocialActions() as $action) {
-                if (in_array(spl_object_hash($action), $periodActions, true)) {
+                if (\in_array(spl_object_hash($action), $periodActions, true)) {
                     continue;
                 }
                 $newAction = new AccompanyingPeriodWork();
                 $newAction->setSocialAction($action);
                 $period->addWork($newAction);
 
-                $date = DateTimeImmutable::createFromMutable($activity->getDate());
+                $date = \DateTimeImmutable::createFromMutable($activity->getDate());
                 $newAction->setStartDate($date);
 
                 foreach ($associatedPersons as $person) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
index 5c6656009..e9e8fb474 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
@@ -27,7 +27,7 @@ class ByActivityNumberAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb
-            ->addSelect('(SELECT COUNT(activity.id) FROM ' . Activity::class . ' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
+            ->addSelect('(SELECT COUNT(activity.id) FROM '.Activity::class.' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
             ->addGroupBy('activity_by_number_aggregator');
     }
 
@@ -41,6 +41,11 @@ class ByActivityNumberAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return static function ($value) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
index 89732412d..9282f92e4 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
@@ -17,21 +17,10 @@ use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class BySocialActionAggregator implements AggregatorInterface
 {
-    private SocialActionRender $actionRender;
-
-    private SocialActionRepository $actionRepository;
-
-    public function __construct(
-        SocialActionRender $actionRender,
-        SocialActionRepository $actionRepository
-    ) {
-        $this->actionRender = $actionRender;
-        $this->actionRepository = $actionRepository;
-    }
+    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $actionRepository) {}
 
     public function addRole(): ?string
     {
@@ -40,7 +29,7 @@ class BySocialActionAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+        if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialActions', 'actsocialaction');
         }
 
@@ -58,6 +47,11 @@ class BySocialActionAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
index 158e87664..bbdadf4d6 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
@@ -17,21 +17,10 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class BySocialIssueAggregator implements AggregatorInterface
 {
-    private SocialIssueRender $issueRender;
-
-    private SocialIssueRepository $issueRepository;
-
-    public function __construct(
-        SocialIssueRepository $issueRepository,
-        SocialIssueRender $issueRender
-    ) {
-        $this->issueRepository = $issueRepository;
-        $this->issueRender = $issueRender;
-    }
+    public function __construct(private readonly SocialIssueRepository $issueRepository, private readonly SocialIssueRender $issueRender) {}
 
     public function addRole(): ?string
     {
@@ -40,7 +29,7 @@ class BySocialIssueAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialIssues', 'actsocialissue');
         }
 
@@ -58,6 +47,11 @@ class BySocialIssueAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/CreatorScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/CreatorScopeAggregator.php
deleted file mode 100644
index 2c7ec1483..000000000
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/CreatorScopeAggregator.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-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 Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\ScopeRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class CreatorScopeAggregator implements AggregatorInterface
-{
-    private ScopeRepository $scopeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        ScopeRepository $scopeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actcreator', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.createdBy', 'actcreator');
-        }
-
-        $qb->addSelect('IDENTITY(actcreator.mainScope) AS creatorscope_aggregator');
-        $qb->addGroupBy('creatorscope_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Scope';
-            }
-
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
-            $s = $this->scopeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['creatorscope_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by creator scope';
-    }
-}
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php
new file mode 100644
index 000000000..ab07afca7
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php
@@ -0,0 +1,76 @@
+<?php
+
+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 Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class ActivityLocationAggregator implements AggregatorInterface
+{
+    public const KEY = 'activity_location_aggregator';
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.location', 'actloc');
+        }
+        $qb->addSelect(sprintf('actloc.name AS %s', self::KEY));
+        $qb->addGroupBy(self::KEY);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form required for this aggregator
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'export.aggregator.activity.by_location.Activity Location';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            return $value;
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return [self::KEY];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.activity.by_location.Title';
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
index 7cd16718e..fa658635b 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -15,26 +15,14 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class ActivityTypeAggregator implements AggregatorInterface
 {
-    public const KEY = 'activity_type_aggregator';
+    final public const KEY = 'activity_type_aggregator';
 
-    protected ActivityTypeRepositoryInterface $activityTypeRepository;
-
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        ActivityTypeRepositoryInterface $activityTypeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->activityTypeRepository = $activityTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(protected ActivityTypeRepositoryInterface $activityTypeRepository, protected TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -43,7 +31,7 @@ class ActivityTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acttype', $qb->getAllAliases(), true)) {
+        if (!\in_array('acttype', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.activityType', 'acttype');
         }
 
@@ -61,7 +49,12 @@ class ActivityTypeAggregator implements AggregatorInterface
         // no form required for this aggregator
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
     {
         // for performance reason, we load data from db only once
         $this->activityTypeRepository->findBy(['id' => $values]);
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
index 9bde692c6..61452af22 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -15,25 +15,14 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class ActivityUserAggregator implements AggregatorInterface
 {
-    public const KEY = 'activity_user_id';
+    final public const KEY = 'activity_user_id';
 
-    private UserRender $userRender;
-
-    private UserRepository $userRepository;
-
-    public function __construct(
-        UserRepository $userRepository,
-        UserRender $userRender
-    ) {
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly UserRepository $userRepository, private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
@@ -59,7 +48,12 @@ class ActivityUserAggregator implements AggregatorInterface
         // nothing to add
     }
 
-    public function getLabels($key, $values, $data): Closure
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, $values, $data): \Closure
     {
         return function ($value) {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
index 139f2743e..cc4ab9d14 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
@@ -17,19 +17,10 @@ use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class ActivityUsersAggregator implements AggregatorInterface
 {
-    private UserRender $userRender;
-
-    private UserRepositoryInterface $userRepository;
-
-    public function __construct(UserRepositoryInterface $userRepository, UserRender $userRender)
-    {
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
@@ -38,7 +29,7 @@ class ActivityUsersAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+        if (!\in_array('actusers', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.users', 'actusers');
         }
 
@@ -57,6 +48,11 @@ class ActivityUsersAggregator implements AggregatorInterface
         // nothing to add on the form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value) {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
index 5741a0e58..3628206ec 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
@@ -12,23 +12,22 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+class ActivityUsersJobAggregator implements AggregatorInterface
 {
-    private TranslatableStringHelperInterface $translatableStringHelper;
+    private const PREFIX = 'act_agg_user_job';
 
-    private UserJobRepositoryInterface $userJobRepository;
-
-    public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->userJobRepository = $userJobRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private readonly UserJobRepositoryInterface $userJobRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -37,23 +36,40 @@ class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorI
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.users', 'actusers');
-        }
+        $p = self::PREFIX;
 
         $qb
-            ->addSelect('IDENTITY(actusers.userJob) AS activity_users_job_aggregator')
-            ->addGroupBy('activity_users_job_aggregator');
+            ->leftJoin('activity.users', "{$p}_user")
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_history",
+                Expr\Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // job_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // nothing to add in the form
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -77,11 +93,11 @@ class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorI
 
     public function getQueryKeys($data): array
     {
-        return ['activity_users_job_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
-        return 'Aggregate by users job';
+        return 'export.aggregator.activity.by_user_job.Aggregate by users job';
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
index 15da300be..bffce629f 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
@@ -12,23 +12,22 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+class ActivityUsersScopeAggregator implements AggregatorInterface
 {
-    private ScopeRepositoryInterface $scopeRepository;
+    private const PREFIX = 'act_agg_user_scope';
 
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private readonly ScopeRepositoryInterface $scopeRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -37,23 +36,40 @@ class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\Aggregato
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.users', 'actusers');
-        }
+        $p = self::PREFIX;
 
         $qb
-            ->addSelect('IDENTITY(actusers.mainScope) AS activity_users_main_scope_aggregator')
-            ->addGroupBy('activity_users_main_scope_aggregator');
+            ->leftJoin('activity.users', "{$p}_user")
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Expr\Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // scope_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // nothing to add in the form
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -77,11 +93,11 @@ class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\Aggregato
 
     public function getQueryKeys($data): array
     {
-        return ['activity_users_main_scope_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
-        return 'Aggregate by users scope';
+        return 'export.aggregator.activity.by_user_scope.Aggregate by users scope';
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByCreatorAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
similarity index 79%
rename from src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByCreatorAggregator.php
rename to src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
index 69149737b..09bdab89e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByCreatorAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -20,17 +20,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByCreatorAggregator implements AggregatorInterface
 {
-    private UserRender $userRender;
-
-    private UserRepositoryInterface $userRepository;
-
-    public function __construct(
-        UserRepositoryInterface $userRepository,
-        UserRender $userRender
-    ) {
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
@@ -45,7 +35,7 @@ class ByCreatorAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -53,6 +43,11 @@ class ByCreatorAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
similarity index 75%
rename from src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
rename to src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
index c3ca6d59c..13224bade 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -17,21 +17,10 @@ use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class ByThirdpartyAggregator implements AggregatorInterface
 {
-    private ThirdPartyRender $thirdPartyRender;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    public function __construct(
-        ThirdPartyRepository $thirdPartyRepository,
-        ThirdPartyRender $thirdPartyRender
-    ) {
-        $this->thirdPartyRepository = $thirdPartyRepository;
-        $this->thirdPartyRender = $thirdPartyRender;
-    }
+    public function __construct(private readonly ThirdPartyRepository $thirdPartyRepository, private readonly ThirdPartyRender $thirdPartyRender) {}
 
     public function addRole(): ?string
     {
@@ -40,7 +29,7 @@ class ByThirdpartyAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acttparty', $qb->getAllAliases(), true)) {
+        if (!\in_array('acttparty', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.thirdParties', 'acttparty');
         }
 
@@ -50,7 +39,7 @@ class ByThirdpartyAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -58,6 +47,11 @@ class ByThirdpartyAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
new file mode 100644
index 000000000..6641f0807
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
@@ -0,0 +1,103 @@
+<?php
+
+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 Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\ScopeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CreatorScopeAggregator implements AggregatorInterface
+{
+    private const PREFIX = 'acp_agg_creator_scope';
+
+    public function __construct(
+        private readonly ScopeRepository $scopeRepository,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $p = self::PREFIX;
+
+        $qb
+            ->leftJoin('activity.createdBy', "{$p}_user")
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // scope_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Scope';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return [self::PREFIX.'_select'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.activity.by_creator_scope.Group activity by creator scope';
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
similarity index 70%
rename from src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
rename to src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
index b4b23dc0b..f7315140e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
@@ -9,15 +9,13 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DateAggregator implements AggregatorInterface
 {
@@ -29,14 +27,6 @@ class DateAggregator implements AggregatorInterface
 
     private const DEFAULT_CHOICE = 'year';
 
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-    }
-
     public function addRole(): ?string
     {
         return null;
@@ -64,7 +54,7 @@ class DateAggregator implements AggregatorInterface
                 break; // order DESC does not works !
 
             default:
-                throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
+                throw new \RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
         }
 
         $qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
@@ -74,7 +64,7 @@ class DateAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -84,32 +74,28 @@ class DateAggregator implements AggregatorInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['frequency' => self::DEFAULT_CHOICE];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return static function ($value) use ($data): string {
             if ('_header' === $value) {
-                return 'by ' . $data['frequency'];
+                return 'by '.$data['frequency'];
             }
 
             if (null === $value) {
                 return '';
             }
 
-            switch ($data['frequency']) {
-                case 'month':
-                case 'week':
-                    //return $this->translator->trans('for week') .' '. $value ;
-
-                case 'year':
-                    //return $this->translator->trans('in year') .' '. $value ;
-
-                default:
-                    return $value;
-            }
+            return match ($data['frequency']) {
+                default => $value,
+            };
         };
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php
new file mode 100644
index 000000000..e43f430d5
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php
@@ -0,0 +1,103 @@
+<?php
+
+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 Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\ScopeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class JobScopeAggregator implements AggregatorInterface
+{
+    private const PREFIX = 'acp_agg_creator_job';
+
+    public function __construct(
+        private readonly ScopeRepository $scopeRepository,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $p = self::PREFIX;
+
+        $qb
+            ->leftJoin('activity.createdBy', "{$p}_user")
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // job_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Scope';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return [self::PREFIX.'_select'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.activity.by_creator_job.Group activity by creator job';
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
similarity index 74%
rename from src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
rename to src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
index ec4ce6315..da2d74f64 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -17,21 +17,10 @@ use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class LocationTypeAggregator implements AggregatorInterface
 {
-    private LocationTypeRepository $locationTypeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        LocationTypeRepository $locationTypeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->locationTypeRepository = $locationTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly LocationTypeRepository $locationTypeRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -40,7 +29,7 @@ class LocationTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.location', 'actloc');
         }
 
@@ -50,7 +39,7 @@ class LocationTypeAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -58,6 +47,11 @@ class LocationTypeAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
index eaccf95cb..4b1f4894e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
@@ -17,34 +17,15 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 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\Validator\Context\ExecutionContextInterface;
 
-use function count;
-use function in_array;
-
 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    protected ActivityReasonCategoryRepository $activityReasonCategoryRepository;
-
-    protected ActivityReasonRepository $activityReasonRepository;
-
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        ActivityReasonCategoryRepository $activityReasonCategoryRepository,
-        ActivityReasonRepository $activityReasonRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->activityReasonCategoryRepository = $activityReasonCategoryRepository;
-        $this->activityReasonRepository = $activityReasonRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(protected ActivityReasonCategoryRepository $activityReasonCategoryRepository, protected ActivityReasonRepository $activityReasonRepository, protected TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -61,20 +42,20 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             $elem = 'actreasoncat.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
-        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
+        if (!\in_array('actreasons', $qb->getAllAliases(), true)) {
             $qb->innerJoin('activity.reasons', 'actreasons');
         }
 
         // join category if necessary
         if ('activity_categories_id' === $alias) {
             // add join only if needed
-            if (!in_array('actreasoncat', $qb->getAllAliases(), true)) {
+            if (!\in_array('actreasoncat', $qb->getAllAliases(), true)) {
                 $qb->join('actreasons.category', 'actreasoncat');
             }
         }
@@ -82,7 +63,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         // add the "group by" part
         $groupBy = $qb->getDQLPart('groupBy');
 
-        if (count($groupBy) > 0) {
+        if (\count($groupBy) > 0) {
             $qb->addGroupBy($alias);
         } else {
             $qb->groupBy($alias);
@@ -111,23 +92,18 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         );
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     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']));
-        }
+        match ($data['level']) {
+            'reasons' => $this->activityReasonRepository->findBy(['id' => $values]),
+            'categories' => $this->activityReasonCategoryRepository->findBy(['id' => $values]),
+            default => throw new \RuntimeException(sprintf("The level data '%s' is invalid.", $data['level'])),
+        };
 
         return function ($value) use ($data) {
             if ('_header' === $value) {
@@ -167,7 +143,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             return ['activity_categories_id'];
         }
 
-        throw new RuntimeException('The data provided are not recognised.');
+        throw new \RuntimeException('The data provided are not recognised.');
     }
 
     public function getTitle()
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
index 5f772e156..774968544 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
@@ -14,18 +14,12 @@ namespace Chill\ActivityBundle\Export\Aggregator;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SentReceivedAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -48,6 +42,11 @@ class SentReceivedAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data): callable
     {
         return function (?string $value): string {
@@ -67,7 +66,7 @@ class SentReceivedAggregator implements AggregatorInterface
                     return $this->translator->trans('export.aggregator.activity.by_sent_received.is received');
 
                 default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
+                    throw new \LogicException(sprintf('The value %s is not valid', $value));
             }
         };
     }
diff --git a/src/Bundle/ChillActivityBundle/Export/Declarations.php b/src/Bundle/ChillActivityBundle/Export/Declarations.php
index 79afb09c8..210988770 100644
--- a/src/Bundle/ChillActivityBundle/Export/Declarations.php
+++ b/src/Bundle/ChillActivityBundle/Export/Declarations.php
@@ -16,9 +16,9 @@ namespace Chill\ActivityBundle\Export;
  */
 abstract class Declarations
 {
-    public const ACTIVITY = 'activity';
+    final public const ACTIVITY = 'activity';
 
-    public const ACTIVITY_ACP = 'activity_linked_to_acp';
+    final public const ACTIVITY_ACP = 'activity_linked_to_acp';
 
-    public const ACTIVITY_PERSON = 'activity_linked_to_person';
+    final public const ACTIVITY_PERSON = 'activity_linked_to_person';
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
index 2b6919340..9cdbc183d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -23,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityDuration implements ExportInterface, GroupedExportInterface
@@ -31,13 +31,16 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
+        return [];
     }
 
     public function getAllowedFormattersTypes(): array
@@ -58,7 +61,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
@@ -86,9 +89,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('activity');
 
@@ -100,14 +101,16 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         return $qb;
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
index 359593059..58ac6e829 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -23,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
@@ -31,7 +31,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
@@ -41,6 +41,11 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         // TODO: Implement buildForm() method.
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -59,7 +64,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_visit_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
@@ -87,9 +92,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('activity');
 
@@ -101,14 +104,16 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         return $qb;
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
index 2dc844aa2..39c79cf1f 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -23,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
@@ -31,13 +31,16 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
+        return [];
     }
 
     public function getAllowedFormattersTypes(): array
@@ -58,7 +61,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_count_activity' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Number of activities linked to an accompanying period' : $value;
@@ -86,9 +89,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository
             ->createQueryBuilder('activity')
@@ -97,14 +98,16 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         $qb->select('COUNT(DISTINCT activity.id) as export_count_activity');
 
         return $qb;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
index 6d25b4e22..45233d97f 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
@@ -12,9 +12,11 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Export\Export\ListActivityHelper;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
 use Chill\MainBundle\Export\ListInterface;
@@ -24,27 +26,18 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ListActivity implements ListInterface, GroupedExportInterface
 {
-    private EntityManagerInterface $entityManager;
-
-    private ListActivityHelper $helper;
-
-    private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
-
-    public function __construct(
-        ListActivityHelper $helper,
-        EntityManagerInterface $entityManager,
-        TranslatableStringExportLabelHelper $translatableStringExportLabelHelper
-    ) {
-        $this->helper = $helper;
-        $this->entityManager = $entityManager;
-        $this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
-    }
+    public function __construct(private readonly ListActivityHelper $helper, private readonly EntityManagerInterface $entityManager, private readonly TranslatableStringExportLabelHelper $translatableStringExportLabelHelper) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
         $this->helper->buildForm($builder);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return $this->helper->getAllowedFormattersTypes();
@@ -52,7 +45,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getDescription()
     {
-        return ListActivityHelper::MSG_KEY . 'List activities linked to an accompanying course';
+        return ListActivityHelper::MSG_KEY.'List activities linked to an accompanying course';
     }
 
     public function getGroup(): string
@@ -62,22 +55,17 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
-            case 'acpId':
-                return static function ($value) {
-                    if ('_header' === $value) {
-                        return ListActivityHelper::MSG_KEY . 'accompanying course id';
-                    }
+        return match ($key) {
+            'acpId' => static function ($value) {
+                if ('_header' === $value) {
+                    return ListActivityHelper::MSG_KEY.'accompanying course id';
+                }
 
-                    return $value ?? '';
-                };
-
-            case 'scopesNames':
-                return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles');
-
-            default:
-                return $this->helper->getLabels($key, $values, $data);
-        }
+                return $value ?? '';
+            },
+            'scopesNames' => $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY.'course circles'),
+            default => $this->helper->getLabels($key, $values, $data),
+        };
     }
 
     public function getQueryKeys($data)
@@ -99,7 +87,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getTitle()
     {
-        return ListActivityHelper::MSG_KEY . 'List activity linked to a course';
+        return ListActivityHelper::MSG_KEY.'List activity linked to a course';
     }
 
     public function getType()
@@ -109,9 +97,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -125,7 +111,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             ->andWhere(
                 $qb->expr()->exists(
                     'SELECT 1
-                    FROM ' . PersonCenterHistory::class . ' acl_count_person_history
+                    FROM '.PersonCenterHistory::class.' acl_count_person_history
                     WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
@@ -142,9 +128,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
         // add select for this step
         $qb
             ->addSelect('acp.id AS acpId')
-            ->addSelect('(SELECT AGGREGATE(acpScope.name) FROM ' . Scope::class . ' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
+            ->addSelect('(SELECT AGGREGATE(acpScope.name) FROM '.Scope::class.' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
             ->addGroupBy('scopesNames');
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         return $qb;
     }
 
@@ -158,6 +146,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return array_merge(
             $this->helper->supportsModifiers(),
             [
+                Declarations::ACTIVITY,
                 \Chill\PersonBundle\Export\Declarations::ACP_TYPE,
             ]
         );
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
index 1cf20dc5f..a8d6f10fd 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -23,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumActivityDuration implements ExportInterface, GroupedExportInterface
@@ -31,7 +31,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
@@ -41,6 +41,11 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         // TODO: Implement buildForm() method.
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -59,7 +64,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
@@ -87,9 +92,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository
             ->createQueryBuilder('activity')
@@ -101,14 +104,16 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         return $qb;
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
index 2c160f3cf..dae572ba5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -23,7 +24,6 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
@@ -31,7 +31,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
@@ -41,6 +41,11 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         // TODO: Implement buildForm() method.
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -59,7 +64,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_visit_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
@@ -87,9 +92,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository
             ->createQueryBuilder('activity')
@@ -101,14 +104,16 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         return $qb;
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
index 4246df173..dbc7e3fde 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -19,21 +19,17 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
 {
-    protected ActivityRepository $activityRepository;
+    public function __construct(protected ActivityRepository $activityRepository) {}
 
-    public function __construct(
-        ActivityRepository $activityRepository
-    ) {
-        $this->activityRepository = $activityRepository;
-    }
+    public function buildForm(FormBuilderInterface $builder) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function getFormDefaultData(): array
     {
+        return [];
     }
 
     public function getAllowedFormattersTypes()
@@ -54,7 +50,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_count_activity' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
index 5d438d3a5..50b8ace2a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use DateTime;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
@@ -30,14 +29,8 @@ use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function count;
-use function in_array;
-
 class ListActivity implements ListInterface, GroupedExportInterface
 {
-    protected EntityManagerInterface $entityManager;
-
     protected array $fields = [
         'id',
         'date',
@@ -52,23 +45,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         'person_id',
     ];
 
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    protected TranslatorInterface $translator;
-
-    private ActivityRepository $activityRepository;
-
-    public function __construct(
-        EntityManagerInterface $em,
-        TranslatorInterface $translator,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        ActivityRepository $activityRepository
-    ) {
-        $this->entityManager = $em;
-        $this->translator = $translator;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->activityRepository = $activityRepository;
-    }
+    public function __construct(protected EntityManagerInterface $entityManager, protected TranslatorInterface $translator, protected TranslatableStringHelperInterface $translatableStringHelper, private readonly ActivityRepository $activityRepository) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
@@ -79,7 +56,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             'label' => 'Fields to include in export',
             'constraints' => [new Callback([
                 'callback' => static function ($selected, ExecutionContextInterface $context) {
-                    if (count($selected) === 0) {
+                    if (0 === \count($selected)) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
@@ -89,6 +66,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_LIST];
@@ -113,7 +95,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         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');
                 };
@@ -137,13 +119,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
                     $activity = $activityRepository->find($value);
 
-                    return implode(', ', array_map(function (ActivityReason $r) {
-                        return '"' .
-                                $this->translatableStringHelper->localize($r->getCategory()->getName())
-                                . ' > ' .
-                                $this->translatableStringHelper->localize($r->getName())
-                                . '"';
-                    }, $activity->getReasons()->toArray()));
+                    return implode(', ', array_map(fn (ActivityReason $r) => '"'.
+                            $this->translatableStringHelper->localize($r->getCategory()->getName())
+                            .' > '.
+                            $this->translatableStringHelper->localize($r->getName())
+                            .'"', $activity->getReasons()->toArray()));
                 };
 
             case 'circle_name':
@@ -152,7 +132,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         return 'circle';
                     }
 
-                    return $this->translatableStringHelper->localize(json_decode($value, true));
+                    return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR));
                 };
 
             case 'type_name':
@@ -161,7 +141,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         return 'activity type';
                     }
 
-                    return $this->translatableStringHelper->localize(json_decode($value, true));
+                    return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR));
                 };
 
             default:
@@ -197,12 +177,10 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
-        if (!array_key_exists('fields', $data)) {
+        if (!\array_key_exists('fields', $data)) {
             throw new InvalidArgumentException('Any fields have been checked.');
         }
 
@@ -226,7 +204,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             ->setParameter('centers', $centers);
 
         foreach ($this->fields as $f) {
-            if (in_array($f, $data['fields'], true)) {
+            if (\in_array($f, $data['fields'], true)) {
                 switch ($f) {
                     case 'id':
                         $qb->addSelect('activity.id AS id');
@@ -299,7 +277,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
+            PersonDeclarations::PERSON_TYPE,
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
index 050034954..6f254bb08 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -30,28 +29,24 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class StatActivityDuration implements ExportInterface, GroupedExportInterface
 {
-    public const SUM = 'sum';
-
-    /**
-     * The action for this report.
-     */
-    protected string $action;
-
-    private ActivityRepository $activityRepository;
+    final public const SUM = 'sum';
 
     /**
      * @param string $action the stat to perform
      */
     public function __construct(
-        ActivityRepository $activityRepository,
-        string $action = 'sum'
-    ) {
-        $this->action = $action;
-        $this->activityRepository = $activityRepository;
-    }
+        private readonly ActivityRepository $activityRepository,
+        /**
+         * The action for this report.
+         */
+        protected string $action = 'sum'
+    ) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
+        return [];
     }
 
     public function getAllowedFormattersTypes()
@@ -65,7 +60,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
             return 'Sum activities linked to a person duration by various parameters.';
         }
 
-        throw new LogicException('this action is not supported: ' . $this->action);
+        throw new \LogicException('this action is not supported: '.$this->action);
     }
 
     public function getGroup(): string
@@ -76,7 +71,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_stat_activity' !== $key) {
-            throw new LogicException(sprintf('The key %s is not used by this export', $key));
+            throw new \LogicException(sprintf('The key %s is not used by this export', $key));
         }
 
         $header = self::SUM === $this->action ? 'Sum activities linked to a person duration' : false;
@@ -100,7 +95,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
             return 'Sum activity linked to a person duration';
         }
 
-        throw new LogicException('This action is not supported: ' . $this->action);
+        throw new \LogicException('This action is not supported: '.$this->action);
     }
 
     public function getType(): string
@@ -153,7 +148,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
+            PersonDeclarations::PERSON_TYPE,
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
index 0e8b28ab4..75d2c3fd0 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
@@ -23,54 +23,24 @@ use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
 use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use const SORT_NUMERIC;
 
 class ListActivityHelper
 {
-    public const MSG_KEY = 'export.list.activity.';
-
-    private ActivityPresenceRepositoryInterface $activityPresenceRepository;
-
-    private ActivityTypeRepositoryInterface $activityTypeRepository;
-
-    private DateTimeHelper $dateTimeHelper;
-
-    private LabelPersonHelper $labelPersonHelper;
-
-    private LabelThirdPartyHelper $labelThirdPartyHelper;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatableStringExportLabelHelper $translatableStringLabelHelper;
-
-    private TranslatorInterface $translator;
-
-    private UserHelper $userHelper;
+    final public const MSG_KEY = 'export.list.activity.';
 
     public function __construct(
-        ActivityPresenceRepositoryInterface $activityPresenceRepository,
-        ActivityTypeRepositoryInterface $activityTypeRepository,
-        DateTimeHelper $dateTimeHelper,
-        LabelPersonHelper $labelPersonHelper,
-        LabelThirdPartyHelper $labelThirdPartyHelper,
-        TranslatorInterface $translator,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        TranslatableStringExportLabelHelper $translatableStringLabelHelper,
-        UserHelper $userHelper
-    ) {
-        $this->activityPresenceRepository = $activityPresenceRepository;
-        $this->activityTypeRepository = $activityTypeRepository;
-        $this->dateTimeHelper = $dateTimeHelper;
-        $this->labelPersonHelper = $labelPersonHelper;
-        $this->labelThirdPartyHelper = $labelThirdPartyHelper;
-        $this->translator = $translator;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translatableStringLabelHelper = $translatableStringLabelHelper;
-        $this->userHelper = $userHelper;
-    }
+        private readonly ActivityPresenceRepositoryInterface $activityPresenceRepository,
+        private readonly ActivityTypeRepositoryInterface $activityTypeRepository,
+        private readonly DateTimeHelper $dateTimeHelper,
+        private readonly LabelPersonHelper $labelPersonHelper,
+        private readonly LabelThirdPartyHelper $labelThirdPartyHelper,
+        private readonly TranslatorInterface $translator,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly TranslatableStringExportLabelHelper $translatableStringLabelHelper,
+        private readonly UserHelper $userHelper
+    ) {}
 
     public function addSelect(QueryBuilder $qb): void
     {
@@ -85,7 +55,7 @@ class ListActivityHelper
             ->addSelect('AGGREGATE(actPerson.id) AS personsNames')
             ->leftJoin('activity.users', 'users_u')
             ->addSelect('AGGREGATE(users_u.id) AS usersIds')
-            ->addSelect('AGGREGATE(users_u.id) AS usersNames')
+            ->addSelect('AGGREGATE(JSON_BUILD_OBJECT(\'uid\', users_u.id, \'d\', activity.date)) AS usersNames')
             ->leftJoin('activity.thirdParties', 'thirdparty')
             ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesIds')
             ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesNames')
@@ -96,17 +66,15 @@ class ListActivityHelper
             ->leftJoin('activity.location', 'location')
             ->addSelect('location.name AS locationName')
             ->addSelect('activity.sentReceived')
-            ->addSelect('IDENTITY(activity.createdBy) AS createdBy')
+            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.createdBy), \'d\', activity.createdAt) AS createdBy')
             ->addSelect('activity.createdAt')
-            ->addSelect('IDENTITY(activity.updatedBy) AS updatedBy')
+            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.updatedBy), \'d\', activity.updatedAt) AS updatedBy')
             ->addSelect('activity.updatedAt')
             ->addGroupBy('activity.id')
             ->addGroupBy('location.id');
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-    }
+    public function buildForm(FormBuilderInterface $builder) {}
 
     public function getAllowedFormattersTypes()
     {
@@ -115,113 +83,78 @@ class ListActivityHelper
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
-            case 'createdAt':
-            case 'updatedAt':
-                return $this->dateTimeHelper->getLabel($key);
+        return match ($key) {
+            'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel($key),
+            'createdBy', 'updatedBy' => $this->userHelper->getLabel($key, $values, $key),
+            'date' => $this->dateTimeHelper->getLabel(self::MSG_KEY.$key),
+            'attendeeName' => function ($value) {
+                if ('_header' === $value) {
+                    return 'Attendee';
+                }
 
-            case 'createdBy':
-            case 'updatedBy':
-                return $this->userHelper->getLabel($key, $values, $key);
+                if (null === $value || null === $presence = $this->activityPresenceRepository->find($value)) {
+                    return '';
+                }
 
-            case 'date':
-                return $this->dateTimeHelper->getLabel(self::MSG_KEY . $key);
+                return $this->translatableStringHelper->localize($presence->getName());
+            },
+            'listReasons' => $this->translatableStringLabelHelper->getLabelMulti($key, $values, 'Activity Reasons'),
+            'typeName' => function ($value) {
+                if ('_header' === $value) {
+                    return 'Activity type';
+                }
 
-            case 'attendeeName':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'Attendee';
-                    }
+                if (null === $value || null === $type = $this->activityTypeRepository->find($value)) {
+                    return '';
+                }
 
-                    if (null === $value || null === $presence = $this->activityPresenceRepository->find($value)) {
-                        return '';
-                    }
+                return $this->translatableStringHelper->localize($type->getName());
+            },
+            'usersNames' => $this->userHelper->getLabelMulti($key, $values, self::MSG_KEY.'users name'),
+            'usersIds', 'thirdPartiesIds', 'personsIds' => static function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return match ($key) {
+                        'usersIds' => self::MSG_KEY.'users ids',
+                        'thirdPartiesIds' => self::MSG_KEY.'third parties ids',
+                        'personsIds' => self::MSG_KEY.'persons ids',
+                    };
+                }
 
-                    return $this->translatableStringHelper->localize($presence->getName());
-                };
+                $decoded = json_decode((string) $value, null, 512, JSON_THROW_ON_ERROR);
 
-            case 'listReasons':
-                return $this->translatableStringLabelHelper->getLabelMulti($key, $values, 'Activity Reasons');
+                return implode(
+                    '|',
+                    array_unique(
+                        array_filter($decoded, static fn (?int $id) => null !== $id),
+                        \SORT_NUMERIC
+                    )
+                );
+            },
+            'personsNames' => $this->labelPersonHelper->getLabelMulti($key, $values, self::MSG_KEY.'persons name'),
+            'thirdPartiesNames' => $this->labelThirdPartyHelper->getLabelMulti($key, $values, self::MSG_KEY.'thirds parties'),
+            'sentReceived' => function ($value) {
+                if ('_header' === $value) {
+                    return self::MSG_KEY.'sent received';
+                }
 
-            case 'typeName':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'Activity type';
-                    }
+                if (null === $value) {
+                    return '';
+                }
 
-                    if (null === $value || null === $type = $this->activityTypeRepository->find($value)) {
-                        return '';
-                    }
+                return $this->translator->trans($value);
+            },
+            default => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return self::MSG_KEY.$key;
+                }
 
-                    return $this->translatableStringHelper->localize($type->getName());
-                };
+                if (null === $value) {
+                    return '';
+                }
 
-            case 'usersNames':
-                return $this->userHelper->getLabelMulti($key, $values, self::MSG_KEY . 'users name');
-
-            case 'usersIds':
-            case 'thirdPartiesIds':
-            case 'personsIds':
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        switch ($key) {
-                            case 'usersIds':
-                                return self::MSG_KEY . 'users ids';
-
-                            case 'thirdPartiesIds':
-                                return self::MSG_KEY . 'third parties ids';
-
-                            case 'personsIds':
-                                return self::MSG_KEY . 'persons ids';
-
-                            default:
-                                throw new LogicException('key not supported');
-                        }
-                    }
-
-                    $decoded = json_decode($value);
-
-                    return implode(
-                        '|',
-                        array_unique(
-                            array_filter($decoded, static fn (?int $id) => null !== $id),
-                            SORT_NUMERIC
-                        )
-                    );
-                };
-
-            case 'personsNames':
-                return $this->labelPersonHelper->getLabelMulti($key, $values, self::MSG_KEY . 'persons name');
-
-            case 'thirdPartiesNames':
-                return $this->labelThirdPartyHelper->getLabelMulti($key, $values, self::MSG_KEY . 'thirds parties');
-
-            case 'sentReceived':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return self::MSG_KEY . 'sent received';
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $this->translator->trans($value);
-                };
-
-            default:
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return self::MSG_KEY . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $this->translator->trans($value);
-                };
-        }
+                return $this->translator->trans($value);
+            },
+        };
     }
 
     public function getQueryKeys($data)
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
index a793f21de..31a29c2eb 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
@@ -23,17 +23,10 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ActivityTypeFilter implements FilterInterface
 {
-    private ActivityTypeRepositoryInterface $activityTypeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
     public function __construct(
-        ActivityTypeRepositoryInterface $activityTypeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->activityTypeRepository = $activityTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly ActivityTypeRepositoryInterface $activityTypeRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -44,7 +37,7 @@ class ActivityTypeFilter implements FilterInterface
     {
         $qb->andWhere(
             $qb->expr()->exists(
-                'SELECT 1 FROM ' . Activity::class . ' act_type_filter_activity
+                'SELECT 1 FROM '.Activity::class.' act_type_filter_activity
                 WHERE act_type_filter_activity.activityType IN (:act_type_filter_activity_types) AND act_type_filter_activity.accompanyingPeriod = acp'
             )
         );
@@ -61,17 +54,19 @@ class ActivityTypeFilter implements FilterInterface
         $builder->add('accepted_activitytypes', EntityType::class, [
             'class' => ActivityType::class,
             'choices' => $this->activityTypeRepository->findAllActive(),
-            'choice_label' => function (ActivityType $aty) {
-                return
-                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
-                    .
-                    $this->translatableStringHelper->localize($aty->getName());
-            },
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()).' > ' : '')
+            .
+            $this->translatableStringHelper->localize($aty->getName()),
             'multiple' => true,
             'expanded' => true,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $types = [];
@@ -80,7 +75,7 @@ class ActivityTypeFilter implements FilterInterface
             $types[] = $this->translatableStringHelper->localize($aty->getName());
         }
 
-        return ['Filtered by activity types: only %activitytypes%', [
+        return ['export.filter.activity.acp_by_activity_type.acp_containing_at_least_one_%activitytypes%', [
             '%activitytypes%' => implode(', ', $types),
         ]];
     }
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
index d0c1b0fc7..13349baa5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@@ -18,16 +18,10 @@ use Chill\PersonBundle\Form\Type\PickSocialActionType;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class BySocialActionFilter implements FilterInterface
 {
-    private SocialActionRender $actionRender;
-
-    public function __construct(SocialActionRender $actionRender)
-    {
-        $this->actionRender = $actionRender;
-    }
+    public function __construct(private readonly SocialActionRender $actionRender) {}
 
     public function addRole(): ?string
     {
@@ -36,7 +30,7 @@ class BySocialActionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+        if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialActions', 'actsocialaction');
         }
 
@@ -61,6 +55,11 @@ class BySocialActionFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $actions = [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
index bbb882a65..bef40290e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
@@ -18,16 +18,10 @@ use Chill\PersonBundle\Form\Type\PickSocialIssueType;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class BySocialIssueFilter implements FilterInterface
 {
-    private SocialIssueRender $issueRender;
-
-    public function __construct(SocialIssueRender $issueRender)
-    {
-        $this->issueRender = $issueRender;
-    }
+    public function __construct(private readonly SocialIssueRender $issueRender) {}
 
     public function addRole(): ?string
     {
@@ -36,7 +30,7 @@ class BySocialIssueFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialIssues', 'actsocialissue');
         }
 
@@ -61,6 +55,11 @@ class BySocialIssueFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $issues = [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
index 570f42ae0..afd708d33 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
@@ -17,6 +17,9 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
+/**
+ * Filter accompanying periods to keep only the one without any activity.
+ */
 class HasNoActivityFilter implements FilterInterface
 {
     public function addRole(): ?string
@@ -29,7 +32,7 @@ class HasNoActivityFilter implements FilterInterface
         $qb
             ->andWhere('
                 NOT EXISTS (
-                    SELECT 1 FROM ' . Activity::class . ' activity
+                    SELECT 1 FROM '.Activity::class.' activity
                     WHERE activity.accompanyingPeriod = acp
                 )
             ');
@@ -42,7 +45,12 @@ class HasNoActivityFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        //no form needed
+        // no form needed
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
     }
 
     public function describeAction($data, $format = 'string'): array
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
new file mode 100644
index 000000000..2d3282ad1
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
@@ -0,0 +1,89 @@
+<?php
+
+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 Chill\ActivityBundle\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInterface
+{
+    public function __construct(
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
+
+    public function getTitle()
+    {
+        return 'export.filter.activity.course_having_activity_between_date.Title';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity after',
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity before',
+            ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
+            'end_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return [
+            'export.filter.activity.course_having_activity_between_date.Only course having an activity between from and to',
+            [
+                'from' => $this->rollingDateConverter->convert($data['start_date']),
+                'to' => $this->rollingDateConverter->convert($data['end_date']),
+            ],
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $alias = 'act_period_having_act_betw_date_alias';
+        $from = 'act_period_having_act_betw_date_start';
+        $to = 'act_period_having_act_betw_date_end';
+
+        $qb->andWhere(
+            $qb->expr()->exists(
+                'SELECT 1 FROM '.Activity::class." {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = acp"
+            )
+        );
+
+        $qb
+            ->setParameter($from, $this->rollingDateConverter->convert($data['start_date']))
+            ->setParameter($to, $this->rollingDateConverter->convert($data['end_date']));
+    }
+
+    public function applyOn()
+    {
+        return \Chill\PersonBundle\Export\Declarations::ACP_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
deleted file mode 100644
index 1906db75e..000000000
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-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 Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class UserScopeFilter implements FilterInterface
-{
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actuser', $qb->getAllAliases(), true)) {
-            $qb->join('activity.user', 'actuser');
-        }
-
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->in('actuser.mainScope', ':userscope');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('userscope', $data['accepted_userscope']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_userscope', EntityType::class, [
-            'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
-                    $s->getName()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $scopes = [];
-
-        foreach ($data['accepted_userscope'] as $s) {
-            $scopes[] = $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        }
-
-        return ['Filtered activity by userscope: only %scopes%', [
-            '%scopes%' => implode(', ', $scopes),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by userscope';
-    }
-}
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
index f2216c929..a67d0155d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -27,17 +27,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ActivityDateFilter implements FilterInterface
 {
-    protected TranslatorInterface $translator;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        TranslatorInterface $translator,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->translator = $translator;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(protected TranslatorInterface $translator, private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -80,11 +70,9 @@ class ActivityDateFilter implements FilterInterface
         $builder
             ->add('date_from', PickRollingDateType::class, [
                 'label' => 'Activities after this date',
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
             ])
             ->add('date_to', PickRollingDateType::class, [
                 'label' => 'Activities before this date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
 
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
@@ -102,14 +90,14 @@ class ActivityDateFilter implements FilterInterface
                 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 (null === $date_to) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
+                        .'should not be empty')
                     ));
                 }
 
@@ -120,14 +108,19 @@ class ActivityDateFilter implements FilterInterface
                 ) {
                     $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')
+                            .'the date given in "Implied in an activity after '
+                            .'this date" field')
                     ));
                 }
             }
         });
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return [
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
index d1758039a..43f9ba0da 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -22,21 +22,12 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function count;
-
 class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    protected ActivityTypeRepositoryInterface $activityTypeRepository;
-
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
     public function __construct(
-        TranslatableStringHelperInterface $translatableStringHelper,
-        ActivityTypeRepositoryInterface $activityTypeRepository
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->activityTypeRepository = $activityTypeRepository;
-    }
+        protected TranslatableStringHelperInterface $translatableStringHelper,
+        protected ActivityTypeRepositoryInterface $activityTypeRepository
+    ) {}
 
     public function addRole(): ?string
     {
@@ -61,12 +52,9 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $builder->add('types', EntityType::class, [
             'choices' => $this->activityTypeRepository->findAllActive(),
             'class' => ActivityType::class,
-            'choice_label' => function (ActivityType $aty) {
-                return
-                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
-                    .
-                    $this->translatableStringHelper->localize($aty->getName());
-            },
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()).' > ' : '')
+            .
+            $this->translatableStringHelper->localize($aty->getName()),
             'group_by' => function (ActivityType $type) {
                 if (!$type->hasCategory()) {
                     return null;
@@ -82,6 +70,11 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         // collect all the reasons'name used in this filter in one array
@@ -102,7 +95,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if (null === $data['types'] || count($data['types']) === 0) {
+        if (null === $data['types'] || 0 === \count($data['types'])) {
             $context
                 ->buildViolation('At least one type must be chosen')
                 ->addViolation();
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
index 2f6cd8462..56285c026 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
@@ -20,12 +20,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ActivityUsersFilter implements FilterInterface
 {
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
@@ -37,8 +32,8 @@ class ActivityUsersFilter implements FilterInterface
         $orX = $qb->expr()->orX();
 
         foreach ($data['accepted_users'] as $key => $user) {
-            $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u' . $key, 'activity.users'));
-            $qb->setParameter('activity_users_filter_u' . $key, $user);
+            $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u'.$key, 'activity.users'));
+            $qb->setParameter('activity_users_filter_u'.$key, $user);
         }
 
         $qb->andWhere($orX);
@@ -57,6 +52,11 @@ class ActivityUsersFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         $users = [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByCreatorFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
similarity index 87%
rename from src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByCreatorFilter.php
rename to src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
index 322393f32..f75c5a817 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByCreatorFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -20,12 +20,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByCreatorFilter implements FilterInterface
 {
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
@@ -43,7 +38,7 @@ class ByCreatorFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -53,6 +48,11 @@ class ByCreatorFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $users = [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
similarity index 82%
rename from src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
rename to src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
index b79c2ca10..b74be2552 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -22,18 +22,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class EmergencyFilter implements FilterInterface
 {
     private const CHOICES = [
-        'activity is emergency' => true,
-        'activity is not emergency' => false,
+        'activity is emergency' => 'true',
+        'activity is not emergency' => 'false',
     ];
 
-    private const DEFAULT_CHOICE = false;
+    private const DEFAULT_CHOICE = 'false';
 
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -58,7 +53,7 @@ class EmergencyFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -68,10 +63,14 @@ class EmergencyFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_emergency' => self::DEFAULT_CHOICE];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return [
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
similarity index 90%
rename from src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php
rename to src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
index 3d69d1633..77b4ce20d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
@@ -9,12 +9,11 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickUserLocationType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -36,7 +35,7 @@ class LocationFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -47,6 +46,11 @@ class LocationFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $locations = [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
similarity index 81%
rename from src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
rename to src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
index 5fe928b6c..771dfca30 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -18,16 +18,10 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class LocationTypeFilter implements FilterInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -36,7 +30,7 @@ class LocationTypeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->join('activity.location', 'actloc');
         }
 
@@ -55,17 +49,22 @@ class LocationTypeFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_locationtype', PickLocationTypeType::class, [
             'multiple' => true,
-            //'label' => false,
+            // 'label' => false,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $types = [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
index c55d579e4..3f71add31 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -17,29 +17,15 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 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\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function count;
-use function in_array;
-
 class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    protected ActivityReasonRepository $activityReasonRepository;
-
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelper $helper,
-        ActivityReasonRepository $activityReasonRepository
-    ) {
-        $this->translatableStringHelper = $helper;
-        $this->activityReasonRepository = $activityReasonRepository;
-    }
+    public function __construct(protected TranslatableStringHelper $translatableStringHelper, protected ActivityReasonRepository $activityReasonRepository) {}
 
     public function addRole(): ?string
     {
@@ -52,7 +38,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $join = $qb->getDQLPart('join');
         $clause = $qb->expr()->in('actreasons', ':selected_activity_reasons');
 
-        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
+        if (!\in_array('actreasons', $qb->getAllAliases(), true)) {
             $qb->join('activity.reasons', 'actreasons');
         }
 
@@ -83,11 +69,16 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
-            fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+            fn (ActivityReason $r): string => '"'.$this->translatableStringHelper->localize($r->getName()).'"',
             $this->activityReasonRepository->findBy(['id' => $data['reasons']->toArray()])
         );
 
@@ -106,7 +97,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if (null === $data['reasons'] || count($data['reasons']) === 0) {
+        if (null === $data['reasons'] || 0 === \count($data['reasons'])) {
             $context
                 ->buildViolation('At least one reason must be chosen')
                 ->addViolation();
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
index e3c85fe9c..eb2312c0e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -16,42 +16,23 @@ 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\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 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\FormInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function count;
-
-class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInterface, FilterInterface
+final readonly class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    protected ActivityReasonRepository $activityReasonRepository;
-
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    protected TranslatorInterface $translator;
-
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        ActivityReasonRepository $activityReasonRepository,
-        TranslatorInterface $translator
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->activityReasonRepository = $activityReasonRepository;
-        $this->translator = $translator;
-    }
+        private TranslatableStringHelper $translatableStringHelper,
+        private ActivityReasonRepository $activityReasonRepository,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
 
     public function addRole(): ?string
     {
@@ -62,133 +43,97 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
     {
         // create a subquery for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
-        $sqb->select('person_person_having_activity.id')
+        $sqb->select('1')
             ->from(Activity::class, 'activity_person_having_activity')
-            ->join('activity_person_having_activity.person', 'person_person_having_activity');
+            ->leftJoin('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');
+            .':person_having_activity_between_date_from'
+            .' AND '
+            .':person_having_activity_between_date_to'
+            .' AND '
+            .'(person_person_having_activity.id = person.id OR person MEMBER OF activity_person_having_activity.persons)');
 
-        // add clause activity reason
-        $sqb->join('activity_person_having_activity.reasons', 'reasons_person_having_activity');
+        if (isset($data['reasons']) && [] !== $data['reasons']) {
+            // add clause activity reason
+            $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->andWhere(
+                $sqb->expr()->in(
+                    'reasons_person_having_activity',
+                    ':person_having_activity_reasons'
+                )
+            );
 
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('person.id', $sqb->getDQL());
-
-        if ($where instanceof Expr\Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
+            $qb->setParameter('person_having_activity_reasons', $data['reasons']);
         }
 
-        $qb->add('where', $where);
+        $qb->andWhere(
+            $qb->expr()->exists($sqb->getDQL())
+        );
+
         $qb->setParameter(
             'person_having_activity_between_date_from',
-            $data['date_from']
+            $this->rollingDateConverter->convert($data['date_from_rolling'])
         );
         $qb->setParameter(
             'person_having_activity_between_date_to',
-            $data['date_to']
+            $this->rollingDateConverter->convert($data['date_to_rolling'])
         );
-        $qb->setParameter('person_having_activity_reasons', $data['reasons']);
     }
 
     public function applyOn(): string
     {
-        return Declarations::PERSON_IMPLIED_IN;
+        return Declarations::PERSON_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $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_from_rolling', PickRollingDateType::class, [
+            'label' => 'export.filter.activity.person_between_dates.Implied in an activity after this date',
         ]);
 
-        $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('date_to_rolling', PickRollingDateType::class, [
+            'label' => 'export.filter.activity.person_between_dates.Implied in an activity before this date',
         ]);
 
-        $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',
-        ]);
+        if ([] !== $reasons = $this->activityReasonRepository->findAll()) {
+            $builder->add('reasons', EntityType::class, [
+                'class' => ActivityReason::class,
+                'choices' => $reasons,
+                'choice_label' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getName()),
+                'group_by' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
+                'multiple' => true,
+                'expanded' => false,
+                'label' => 'export.filter.activity.person_between_dates.Activity reasons for those activities',
+                'help' => 'export.filter.activity.person_between_dates.if no reasons',
+            ]);
+        }
+    }
 
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
-            /** @var FormInterface $filterForm */
-            $filterForm = $event->getForm()->getParent();
-            $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
-
-            if (true === $enabled) {
-                // if the filter is enabled, add some validation
-                $form = $event->getForm();
-                $date_from = $form->get('date_from')->getData();
-                $date_to = $form->get('date_to')->getData();
-
-                // check that fields are not empty
-                if (null === $date_from) {
-                    $form->get('date_from')->addError(new FormError(
-                        $this->translator->trans('This field '
-                        . 'should not be empty')
-                    ));
-                }
-
-                if (null === $date_to) {
-                    $form->get('date_to')->addError(new FormError(
-                        $this->translator->trans('This field '
-                        . 'should not be empty')
-                    ));
-                }
-
-                // check that date_from is before date_to
-                if (
-                    (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')
-                    ));
-                }
-            }
-        });
+    public function getFormDefaultData(): array
+    {
+        return [
+            'date_from_rolling' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
+            'date_to_rolling' => new RollingDate(RollingDate::T_TODAY),
+            'reasons' => [],
+        ];
     }
 
     public function describeAction($data, $format = 'string')
     {
         return [
-            'Filtered by person having an activity between %date_from% and '
-            . '%date_to% with reasons %reasons_name%',
+            [] === $data['reasons'] ?
+                'export.filter.person_between_dates.describe_action_with_no_subject'
+                : 'export.filter.person_between_dates.describe_action_with_subject',
             [
-                '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%' => $data['date_to']->format('d-m-Y'),
-                '%reasons_name%' => implode(
+                'date_from' => $this->rollingDateConverter->convert($data['date_from_rolling']),
+                'date_to' => $this->rollingDateConverter->convert($data['date_to_rolling']),
+                'reasons' => implode(
                     ', ',
                     array_map(
-                        fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+                        fn (ActivityReason $r): string => '"'.$this->translatableStringHelper->localize($r->getName()).'"',
                         $data['reasons']
                     )
                 ),
@@ -198,13 +143,15 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
 
     public function getTitle()
     {
-        return 'Filter by person having an activity in a period';
+        return 'export.filter.activity.person_between_dates.title';
     }
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if (null === $data['reasons'] || count($data['reasons']) === 0) {
-            $context->buildViolation('At least one reason must be chosen')
+        if ($this->rollingDateConverter->convert($data['date_from_rolling'])
+            >= $this->rollingDateConverter->convert($data['date_to_rolling'])) {
+            $context->buildViolation('export.filter.activity.person_between_dates.date mismatch')
+                ->setTranslationDomain('messages')
                 ->addViolation();
         }
     }
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
similarity index 88%
rename from src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
rename to src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
index 8daa7a781..640f33592 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
@@ -29,12 +29,7 @@ class SentReceivedFilter implements FilterInterface
 
     private const DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;
 
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -59,7 +54,7 @@ class SentReceivedFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -69,10 +64,14 @@ class SentReceivedFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_sentreceived' => self::DEFAULT_CHOICE];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $sentreceived = array_flip(self::CHOICES)[$data['accepted_sentreceived']];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
similarity index 88%
rename from src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
rename to src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
index 6350f3ace..6e6b745b9 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -21,12 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UserFilter implements FilterInterface
 {
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
@@ -51,7 +46,7 @@ class UserFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -62,6 +57,11 @@ class UserFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $users = [];
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php
new file mode 100644
index 000000000..d205e2d30
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php
@@ -0,0 +1,112 @@
+<?php
+
+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 Chill\ActivityBundle\Export\Filter;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UserScopeFilter implements FilterInterface
+{
+    private const PREFIX = 'acp_act_filter_user_scope';  // creator ? cfr translation
+
+    public function __construct(
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $p = self::PREFIX;
+
+        $qb
+            ->leftJoin('activity.user', "{$p}_user")  // createdBy ? cfr translation
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // scope_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
+                    )
+                )
+            )
+            ->andWhere(
+                $qb->expr()->in("{$p}_history.scope", ":{$p}_scopes")
+            )
+            ->setParameter(
+                "{$p}_scopes",
+                $data['scopes'],
+            );
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('scopes', EntityType::class, [
+                'class' => Scope::class,
+                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
+                    $s->getName()
+                ),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $scopes = [];
+
+        foreach ($data['scopes'] as $s) {
+            $scopes[] = $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        }
+
+        return ['export.filter.activity.by_creator_scope.Filtered activity by user scope: only %scopes%', [
+            '%scopes%' => implode(', ', $scopes),
+        ]];
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'scopes' => [],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.activity.by_creator_scope.Filter activity by user scope';
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
index b52ef441c..b65994b9d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
@@ -13,6 +13,7 @@ namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -22,12 +23,11 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UsersJobFilter implements FilterInterface
 {
-    private TranslatableStringHelperInterface $translatableStringHelper;
+    private const PREFIX = 'act_filter_user_job';
 
-    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -36,14 +36,25 @@ class UsersJobFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $p = self::PREFIX;
+
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act
-                JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND  activity_users_job_filter_act = activity '
+                    'SELECT 1 FROM '.Activity::class." {$p}_act "
+                    ."JOIN {$p}_act.users {$p}_user "
+                    .'JOIN '.UserJobHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE {$p}_act = activity "
+                    // job_at based on activity.date
+                    ."AND {$p}_history.startDate <= activity.date "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
+                    ."AND {$p}_history.job IN ( :{$p}_jobs )"
                 )
             )
-            ->setParameter('activity_users_job_filter_jobs', $data['jobs']);
+            ->setParameter(
+                "{$p}_jobs",
+                $data['jobs']
+            );
     }
 
     public function applyOn()
@@ -53,17 +64,18 @@ class UsersJobFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('jobs', EntityType::class, [
-            'class' => UserJob::class,
-            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
+        $builder
+            ->add('jobs', EntityType::class, [
+                'class' => UserJob::class,
+                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
-        return ['export.filter.activity.by_usersjob.Filtered activity by users job: only %jobs%', [
+        return ['export.filter.activity.by_users_job.Filtered activity by users job: only %jobs%', [
             '%jobs%' => implode(
                 ', ',
                 array_map(
@@ -74,8 +86,15 @@ class UsersJobFilter implements FilterInterface
         ]];
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'jobs' => [],
+        ];
+    }
+
     public function getTitle()
     {
-        return 'export.filter.activity.by_usersjob.Filter by users job';
+        return 'export.filter.activity.by_users_job.Filter by users job';
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
index 61b12264e..4c4a83c20 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Filter;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -23,17 +24,12 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UsersScopeFilter implements FilterInterface
 {
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
+    private const PREFIX = 'act_filter_user_scope';
 
     public function __construct(
-        ScopeRepositoryInterface $scopeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly ScopeRepositoryInterface $scopeRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -42,35 +38,47 @@ class UsersScopeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $p = self::PREFIX;
+
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . Activity::class . ' activity_users_scope_filter_act
-                JOIN activity_users_scope_filter_act.users users WHERE users.mainScope IN (:activity_users_scope_filter_scopes) AND  activity_users_scope_filter_act = activity '
+                    'SELECT 1 FROM '.Activity::class." {$p}_act "
+                    ."JOIN {$p}_act.users {$p}_user "
+                    .'JOIN '.UserScopeHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE {$p}_act = activity "
+                    // scope_at based on activity.date
+                    ."AND {$p}_history.startDate <= activity.date "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
+                    ."AND {$p}_history.scope IN ( :{$p}_scopes )"
                 )
             )
-            ->setParameter('activity_users_scope_filter_scopes', $data['scopes']);
+            ->setParameter(
+                "{$p}_scopes",
+                $data['scopes']
+            );
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('scopes', EntityType::class, [
-            'class' => Scope::class,
-            'choices' => $this->scopeRepository->findAllActive(),
-            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
+        $builder
+            ->add('scopes', EntityType::class, [
+                'class' => Scope::class,
+                'choices' => $this->scopeRepository->findAllActive(),
+                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, $format = 'string'): array
     {
-        return ['export.filter.activity.by_usersscope.Filtered activity by users scope: only %scopes%', [
+        return ['export.filter.activity.by_users_scope.Filtered activity by users scope: only %scopes%', [
             '%scopes%' => implode(
                 ', ',
                 array_map(
@@ -81,8 +89,15 @@ class UsersScopeFilter implements FilterInterface
         ]];
     }
 
-    public function getTitle()
+    public function getFormDefaultData(): array
     {
-        return 'export.filter.activity.by_usersscope.Filter by users scope';
+        return [
+            'scopes' => [],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.activity.by_users_scope.Filter by users scope';
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
index b8e03d2c7..3a0f2a318 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
@@ -32,7 +32,7 @@ class ActivityReasonCategoryType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory',
+            'data_class' => \Chill\ActivityBundle\Entity\ActivityReasonCategory::class,
         ]);
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 5dfd756f9..03a21a5b7 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -34,12 +34,8 @@ 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\CallbackTransformer;
@@ -53,45 +49,24 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
-use Symfony\Component\Security\Core\Role\Role;
-use function in_array;
-
 class ActivityType extends AbstractType
 {
-    protected AuthorizationHelper $authorizationHelper;
-
-    protected ObjectManager $om;
-
-    protected SocialActionRender $socialActionRender;
-
-    protected SocialIssueRender $socialIssueRender;
-
-    protected array $timeChoices;
-
-    protected TranslatableStringHelper $translatableStringHelper;
-
     protected User $user;
 
     public function __construct(
         TokenStorageInterface $tokenStorage,
-        AuthorizationHelper $authorizationHelper,
-        ObjectManager $om,
-        TranslatableStringHelper $translatableStringHelper,
-        array $timeChoices,
-        SocialIssueRender $socialIssueRender,
-        SocialActionRender $socialActionRender
+        protected AuthorizationHelper $authorizationHelper,
+        protected ObjectManager $om,
+        protected TranslatableStringHelper $translatableStringHelper,
+        protected array $timeChoices,
+        protected SocialIssueRender $socialIssueRender,
+        protected 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();
-        $this->authorizationHelper = $authorizationHelper;
-        $this->om = $om;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->timeChoices = $timeChoices;
-        $this->socialIssueRender = $socialIssueRender;
-        $this->socialActionRender = $socialActionRender;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
@@ -112,8 +87,7 @@ class ActivityType extends AbstractType
         /** @var \Chill\ActivityBundle\Entity\ActivityType $activityType */
         $activityType = $options['activityType'];
 
-        // TODO revoir la gestion des center au niveau du form des activité.
-        if ($options['center'] instanceof Center && null !== $options['data']->getPerson()) {
+        if (null !== $options['data']->getPerson()) {
             $builder->add('scope', ScopePickerType::class, [
                 'center' => $options['center'],
                 'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
@@ -121,16 +95,16 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
+        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod|null $accompanyingPeriod */
         $accompanyingPeriod = null;
 
         if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
             $accompanyingPeriod = $options['accompanyingPeriod'];
         }
 
-        if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
+        if ($activityType->isVisible('socialIssues') && null !== $accompanyingPeriod) {
             $builder->add('socialIssues', HiddenType::class, [
-                'required' => $activityType->getSocialIssuesVisible() === 2,
+                'required' => 2 === $activityType->getSocialIssuesVisible(),
             ]);
             $builder->get('socialIssues')
                 ->addModelTransformer(new CallbackTransformer(
@@ -156,9 +130,9 @@ class ActivityType extends AbstractType
                 ));
         }
 
-        if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
+        if ($activityType->isVisible('socialActions') && null !== $accompanyingPeriod) {
             $builder->add('socialActions', HiddenType::class, [
-                'required' => $activityType->getSocialActionsVisible() === 2,
+                'required' => 2 === $activityType->getSocialActionsVisible(),
             ]);
             $builder->get('socialActions')
                 ->addModelTransformer(new CallbackTransformer(
@@ -211,17 +185,13 @@ class ActivityType extends AbstractType
                 'required' => $activityType->isRequired('attendee'),
                 'expanded' => true,
                 'class' => ActivityPresence::class,
-                'choice_label' => function (ActivityPresence $activityPresence) {
-                    return $this->translatableStringHelper->localize($activityPresence->getName());
-                },
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('a')
-                        ->where('a.active = true');
-                },
+                'choice_label' => fn (ActivityPresence $activityPresence) => $this->translatableStringHelper->localize($activityPresence->getName()),
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('a')
+                    ->where('a.active = true'),
             ]);
         }
 
-        if ($activityType->isVisible('user') && $options['center'] instanceof Center) {
+        if ($activityType->isVisible('user')) {
             $builder->add('user', PickUserDynamicType::class, [
                 'label' => $activityType->getLabel('user'),
                 'required' => $activityType->isRequired('user'),
@@ -346,7 +316,7 @@ class ActivityType extends AbstractType
 
         if ($activityType->isVisible('location')) {
             $builder->add('location', HiddenType::class, [
-                'required' => $activityType->getLocationVisible() === 2,
+                'required' => 2 === $activityType->getLocationVisible(),
             ])
                 ->get('location')
                 ->addModelTransformer(new CallbackTransformer(
@@ -357,9 +327,7 @@ class ActivityType extends AbstractType
 
                         return (string) $location->getId();
                     },
-                    function (?string $id): ?Location {
-                        return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
-                    }
+                    fn (?string $id): ?Location => $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id])
                 ));
         }
 
@@ -399,18 +367,16 @@ 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 DateTime $data */
-                    $data = $formEvent->getData() === null ?
-                        DateTime::createFromFormat('U', '300') :
-                        $formEvent->getData();
+                    $timezoneUTC = new \DateTimeZone('GMT');
+                    /** @var \DateTime $data */
+                    $data = $formEvent->getData() ?? \DateTime::createFromFormat('U', '300');
                     $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, true)) {
+                    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(
@@ -435,8 +401,8 @@ class ActivityType extends AbstractType
 
         $resolver
             ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
-            ->setAllowedTypes('center', ['null', Center::class])
-            ->setAllowedTypes('role', [Role::class, 'string'])
+            ->setAllowedTypes('center', ['null', Center::class, 'array'])
+            ->setAllowedTypes('role', ['string'])
             ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
             ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
     }
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
index b27fa883e..8e8ae51f7 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -25,12 +25,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ActivityTypeType extends AbstractType
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -45,9 +40,7 @@ class ActivityTypeType extends AbstractType
             ])
             ->add('category', EntityType::class, [
                 'class' => ActivityTypeCategory::class,
-                'choice_label' => function (ActivityTypeCategory $activityTypeCategory) {
-                    return $this->translatableStringHelper->localize($activityTypeCategory->getName());
-                },
+                'choice_label' => fn (ActivityTypeCategory $activityTypeCategory) => $this->translatableStringHelper->localize($activityTypeCategory->getName()),
             ])
             ->add('ordering', NumberType::class, [
                 'required' => true,
@@ -63,8 +56,8 @@ class ActivityTypeType extends AbstractType
 
         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' => '',
                 ]);
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php b/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
index a951ef940..be1e372f1 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
@@ -24,30 +24,18 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
  */
 class PickActivityReasonType extends AbstractType
 {
-    private ActivityReasonRepository $activityReasonRepository;
-
-    private ActivityReasonRender $reasonRender;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
     public function __construct(
-        ActivityReasonRepository $activityReasonRepository,
-        ActivityReasonRender $reasonRender,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->activityReasonRepository = $activityReasonRepository;
-        $this->reasonRender = $reasonRender;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly ActivityReasonRepository $activityReasonRepository,
+        private readonly ActivityReasonRender $reasonRender,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
                 'class' => ActivityReason::class,
-                'choice_label' => function (ActivityReason $choice) {
-                    return $this->reasonRender->renderString($choice, []);
-                },
+                'choice_label' => fn (ActivityReason $choice) => $this->reasonRender->renderString($choice, []),
                 'group_by' => function (ActivityReason $choice): ?string {
                     if (null !== $category = $choice->getCategory()) {
                         return $this->translatableStringHelper->localize($category->getName());
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
index 96dabe008..ee1417bfb 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
@@ -23,34 +23,19 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class TranslatableActivityReasonCategoryType extends AbstractType
 {
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatableStringHelperInterface $translatableStringHelper, TranslatorInterface $translator)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
                 'class' => ActivityReasonCategory::class,
-                'choice_label' => function (ActivityReasonCategory $category) {
-                    return $this->translatableStringHelper->localize($category->getName())
-                        . (!$category->getActive() ? ' (' . $this->translator->trans('inactive') . ')' : '');
-                },
+                'choice_label' => fn (ActivityReasonCategory $category) => $this->translatableStringHelper->localize($category->getName())
+                    .(!$category->getActive() ? ' ('.$this->translator->trans('inactive').')' : ''),
             ]
         );
     }
 
-    public function getBlockPrefix()
-    {
-        return 'translatable_activity_reason_category';
-    }
-
     public function getParent()
     {
         return EntityType::class;
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
index 4a1d4bfa7..5c77e500d 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
@@ -20,17 +20,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TranslatableActivityType extends AbstractType
 {
-    protected ActivityTypeRepositoryInterface $activityTypeRepository;
-
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelperInterface $helper,
-        ActivityTypeRepositoryInterface $activityTypeRepository
-    ) {
-        $this->translatableStringHelper = $helper;
-        $this->activityTypeRepository = $activityTypeRepository;
-    }
+    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper, protected ActivityTypeRepositoryInterface $activityTypeRepository) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
@@ -39,9 +29,7 @@ class TranslatableActivityType extends AbstractType
                 'class' => ActivityType::class,
                 'active_only' => true,
                 'choices' => $this->activityTypeRepository->findAllActive(),
-                'choice_label' => function (ActivityType $type) {
-                    return $this->translatableStringHelper->localize($type->getName());
-                },
+                'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
             ]
         );
     }
diff --git a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
index 9884450ec..b4990c0e3 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -23,17 +23,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected Security $security;
-
-    protected TranslatorInterface $translator;
-
-    public function __construct(
-        Security $security,
-        TranslatorInterface $translator
-    ) {
-        $this->security = $security;
-        $this->translator = $translator;
-    }
+    public function __construct(protected Security $security, protected TranslatorInterface $translator) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
index 4b2d348d7..0afe11cfc 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -18,14 +18,9 @@ use Symfony\Component\Security\Core\Security;
 /**
  * @implements LocalMenuBuilderInterface<array>
  */
-final class AdminMenuBuilder implements LocalMenuBuilderInterface
+final readonly class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private Security $security) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
index 03a1b09ab..e76aaf5ee 100644
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -21,25 +21,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 /**
  * @implements LocalMenuBuilderInterface<array{person: Person}>
  */
-final class PersonMenuBuilder implements LocalMenuBuilderInterface
+final readonly class PersonMenuBuilder 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 __construct(private AuthorizationCheckerInterface $authorizationChecker, private TranslatorInterface $translator) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
index ab26da81d..8eb219fd2 100644
--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
@@ -16,14 +16,9 @@ use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Notification\NotificationHandlerInterface;
 
-final class ActivityNotificationHandler implements NotificationHandlerInterface
+final readonly class ActivityNotificationHandler implements NotificationHandlerInterface
 {
-    private ActivityRepository $activityRepository;
-
-    public function __construct(ActivityRepository $activityRepository)
-    {
-        $this->activityRepository = $activityRepository;
-    }
+    public function __construct(private ActivityRepository $activityRepository) {}
 
     public function getTemplate(Notification $notification, array $options = []): string
     {
@@ -40,6 +35,6 @@ final class ActivityNotificationHandler implements NotificationHandlerInterface
 
     public function supports(Notification $notification, array $options = []): bool
     {
-        return $notification->getRelatedEntityClass() === Activity::class;
+        return Activity::class === $notification->getRelatedEntityClass();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
index 185e008eb..231ad5432 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -18,65 +18,206 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Security;
 
-use function count;
-use function in_array;
-
-final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
+final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {
-    private AuthorizationHelper $authorizationHelper;
-
-    private CenterResolverDispatcherInterface $centerResolverDispatcher;
-
-    private EntityManagerInterface $em;
-
-    private ActivityRepository $repository;
-
-    private Security $security;
-
-    private TokenStorageInterface $tokenStorage;
-
     public function __construct(
-        AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcherInterface $centerResolverDispatcher,
-        TokenStorageInterface $tokenStorage,
-        ActivityRepository $repository,
-        EntityManagerInterface $em,
-        Security $security
-    ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-        $this->tokenStorage = $tokenStorage;
-        $this->repository = $repository;
-        $this->em = $em;
-        $this->security = $security;
+        private AuthorizationHelperForCurrentUserInterface $authorizationHelper,
+        private CenterResolverManagerInterface $centerResolverManager,
+        private ActivityRepository $repository,
+        private EntityManagerInterface $em,
+        private Security $security,
+        private RequestStack $requestStack,
+    ) {}
+
+    /**
+     * @throws NonUniqueResultException
+     * @throws NoResultException
+     */
+    public function countByAccompanyingPeriod(AccompanyingPeriod $period, string $role, array $filters = []): int
+    {
+        $qb = $this->buildBaseQuery($filters);
+
+        $qb
+            ->select('COUNT(a)')
+            ->andWhere('a.accompanyingPeriod = :period')->setParameter('period', $period);
+
+        return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    public function countByPerson(Person $person, string $role, array $filters = []): int
     {
-        $user = $this->security->getUser();
-        $center = $this->centerResolverDispatcher->resolveCenter($period);
+        $qb = $this->buildBaseQuery($filters);
 
-        if (0 === count($orderBy)) {
-            $orderBy = ['date' => 'DESC'];
+        $qb = $this->filterBaseQueryByPerson($qb, $person, $role);
+
+        $qb->select('COUNT(a)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, array $orderBy = ['date' => 'DESC'], array $filters = []): array
+    {
+        $qb = $this->buildBaseQuery($filters);
+
+        $qb->andWhere('a.accompanyingPeriod = :period')->setParameter('period', $period);
+
+        foreach ($orderBy as $field => $order) {
+            $qb->addOrderBy('a.'.$field, $order);
         }
 
-        $scopes = $this->authorizationHelper
-            ->getReachableCircles($user, $role, $center);
+        if (null !== $start) {
+            $qb->setFirstResult($start);
+        }
+        if (null !== $limit) {
+            $qb->setMaxResults($limit);
+        }
 
-        return $this->em->getRepository(Activity::class)
-            ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
+        return $qb->getQuery()->getResult();
+    }
+
+    public function buildBaseQuery(array $filters): QueryBuilder
+    {
+        $qb = $this->repository
+            ->createQueryBuilder('a')
+        ;
+
+        if (($filters['my_activities'] ?? false) and ($user = $this->security->getUser()) instanceof User) {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    'a.createdBy = :user',
+                    'a.user = :user',
+                    ':user MEMBER OF a.users'
+                )
+            )->setParameter('user', $user);
+        }
+
+        if ([] !== ($types = $filters['types'] ?? [])) {
+            $qb->andWhere('a.activityType IN (:types)')->setParameter('types', $types);
+        }
+
+        if ([] !== ($jobs = $filters['jobs'] ?? [])) {
+            $qb
+                ->leftJoin('a.createdBy', 'creator')
+                ->leftJoin('a.user', 'activity_u')
+                ->andWhere(
+                    $qb->expr()->orX(
+                        $qb->expr()->exists(
+                            sprintf(
+                                'SELECT 1 FROM %s ujh_creator WHERE ujh_creator.user = a.createdBy '
+                                .'AND ujh_creator.job IN (:jobs) AND a.createdAt > ujh_creator.startDate '
+                                .'AND (ujh_creator.endDate IS NULL or ujh_creator.endDate > a.date)',
+                                User\UserJobHistory::class
+                            )
+                        ),
+                        $qb->expr()->exists(
+                            sprintf(
+                                'SELECT 1 FROM %s ujh_u WHERE ujh_u.user = a.user '
+                                .'AND ujh_u.job IN (:jobs) AND a.createdAt > ujh_u.startDate '
+                                .'AND (ujh_u.endDate IS NULL or ujh_u.endDate > a.date)',
+                                User\UserJobHistory::class
+                            )
+                        ),
+                        $qb->expr()->exists(
+                            sprintf(
+                                'SELECT 1 FROM %s ujh_users WHERE ujh_users.user MEMBER OF a.users '
+                                .'AND ujh_users.job IN (:jobs) AND a.createdAt > ujh_users.startDate '
+                                .'AND (ujh_users.endDate IS NULL or ujh_users.endDate > a.date)',
+                                User\UserJobHistory::class
+                            )
+                        ),
+                    )
+                )
+                ->setParameter('jobs', $jobs);
+        }
+
+        if (null !== ($after = $filters['after'] ?? null)) {
+            $qb->andWhere('a.date >= :after')->setParameter('after', $after);
+        }
+
+        if (null !== ($before = $filters['before'] ?? null)) {
+            $qb->andWhere('a.date <= :before')->setParameter('before', $before);
+        }
+
+        return $qb;
+    }
+
+    /**
+     * @return array<ActivityType>
+     */
+    public function findActivityTypeByAssociated(AccompanyingPeriod|Person $associated): array
+    {
+        $in = $this->em->createQueryBuilder();
+        $in
+            ->select('1')
+            ->from(Activity::class, 'a');
+
+        if ($associated instanceof Person) {
+            $in = $this->filterBaseQueryByPerson($in, $associated, ActivityVoter::SEE);
+        } else {
+            $in->andWhere('a.accompanyingPeriod = :period')->setParameter('period', $associated);
+        }
+
+        // join between the embedded exist query and the main query
+        $in->andWhere('a.activityType = t');
+
+        $qb = $this->em->createQueryBuilder()->setParameters($in->getParameters());
+        $qb
+            ->select('t')
+            ->from(ActivityType::class, 't')
+            ->where(
+                $qb->expr()->exists($in->getDQL())
+            );
+
+        return $qb->getQuery()->getResult();
+    }
+
+    public function findUserJobByAssociated(AccompanyingPeriod|Person $associated): array
+    {
+        $in = $this->em->createQueryBuilder();
+        $in->select('IDENTITY(u.job)')
+            ->distinct()
+            ->from(User\UserJobHistory::class, 'u')
+            ->join(
+                Activity::class,
+                'a',
+                Join::WITH,
+                'a.createdBy = u.user OR a.user = u.user OR u.user MEMBER OF a.users AND a.date >= u.startDate ANd (u.endDate IS NULL or u.endDate > a.date)'
+            );
+
+        if ($associated instanceof Person) {
+            $in = $this->filterBaseQueryByPerson($in, $associated, ActivityVoter::SEE);
+        } else {
+            $in->andWhere('a.accompanyingPeriod = :associated');
+            $in->setParameter('associated', $associated);
+        }
+
+        $qb = $this->em->createQueryBuilder()->setParameters($in->getParameters());
+
+        $qb->select('ub', 'JSON_EXTRACT(ub.label, :lang) AS HIDDEN lang')
+            ->from(UserJob::class, 'ub')
+            ->where($qb->expr()->in('ub.id', $in->getDQL()))
+            ->setParameter('lang', $this->requestStack->getCurrentRequest()->getLocale())
+            ->orderBy('lang')
+        ;
+
+        return $qb->getQuery()->getResult();
     }
 
     public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array
@@ -159,25 +300,73 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         return $nq->getResult(AbstractQuery::HYDRATE_ARRAY);
     }
 
-    /**
-     * @param array $orderBy
-     *
-     * @return Activity[]|array
-     */
-    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = [], array $filters = []): array
     {
-        $user = $this->security->getUser();
-        $center = $this->centerResolverDispatcher->resolveCenter($person);
+        $qb = $this->buildBaseQuery($filters);
 
-        if (0 === count($orderBy)) {
-            $orderBy = ['date' => 'DESC'];
+        $qb = $this->filterBaseQueryByPerson($qb, $person, $role);
+
+        foreach ($orderBy as $field => $direction) {
+            $qb->addOrderBy('a.'.$field, $direction);
         }
 
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableCircles($user, $role, $center);
+        if (null !== $start) {
+            $qb->setFirstResult($start);
+        }
+        if (null !== $limit) {
+            $qb->setMaxResults($limit);
+        }
 
-        return $this->em->getRepository(Activity::class)
-            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
+        return $qb->getQuery()->getResult();
+    }
+
+    private function filterBaseQueryByPerson(QueryBuilder $qb, Person $person, string $role): QueryBuilder
+    {
+        $orX = $qb->expr()->orX();
+        $counter = 0;
+        foreach ($this->centerResolverManager->resolveCenters($person) as $center) {
+            $scopes = $this->authorizationHelper->getReachableScopes($role, $center);
+
+            if ([] === $scopes) {
+                continue;
+            }
+
+            $orX->add(sprintf('a.person = :person AND a.scope IN (:scopes_%d)', $counter));
+            $qb->setParameter(sprintf('scopes_%d', $counter), $scopes);
+            $qb->setParameter('person', $person);
+            ++$counter;
+        }
+
+        foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
+            if (!$this->security->isGranted(ActivityVoter::SEE, $participation->getAccompanyingPeriod())) {
+                continue;
+            }
+
+            $and = $qb->expr()->andX(
+                sprintf('a.accompanyingPeriod = :period_%d', $counter),
+                sprintf('a.date >= :participation_start_%d', $counter)
+            );
+
+            $qb
+                ->setParameter(sprintf('period_%d', $counter), $participation->getAccompanyingPeriod())
+                ->setParameter(sprintf('participation_start_%d', $counter), $participation->getStartDate());
+
+            if (null !== $participation->getEndDate()) {
+                $and->add(sprintf('a.date < :participation_end_%d', $counter));
+                $qb
+                    ->setParameter(sprintf('participation_end_%d', $counter), $participation->getEndDate());
+            }
+            $orX->add($and);
+            ++$counter;
+        }
+
+        if (0 === $orX->count()) {
+            $qb->andWhere('FALSE = TRUE');
+        } else {
+            $qb->andWhere($orX);
+        }
+
+        return $qb;
     }
 
     public function queryTimelineIndexer(string $context, array $args = []): array
@@ -189,10 +378,10 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
 
         return [
             'id' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('id'),
+                 .'.'.$metadataActivity->getColumnName('id'),
             'type' => 'activity',
             'date' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('date'),
+                 .'.'.$metadataActivity->getColumnName('date'),
             'FROM' => $from,
             'WHERE' => $where,
             'parameters' => $parameters,
@@ -205,12 +394,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
@@ -226,11 +415,10 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
 
         // acls:
         $reachableCenters = $this->authorizationHelper->getReachableCenters(
-            $this->tokenStorage->getToken()->getUser(),
             ActivityVoter::SEE
         );
 
-        if (count($reachableCenters) === 0) {
+        if (0 === \count($reachableCenters)) {
             // insert a dummy condition
             return 'FALSE = TRUE';
         }
@@ -247,16 +435,14 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
 
         foreach ($reachableCenters as $center) {
             // we pass if not in centers
-            if (!in_array($center, $args['centers'], true)) {
+            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(), ActivityVoter::SEE, $center);
+            $reachableScopes = $this->authorizationHelper->getReachableScopes(ActivityVoter::SEE, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                static function (Scope $scope) {
-                    return $scope->getId();
-                },
+                static fn (Scope $scope) => $scope->getId(),
                 $reachableScopes
             );
 
@@ -271,7 +457,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
 
             // begin loop for scopes
             $where .= ' AND (';
-            $scopesI = 0; //like scope#i
+            $scopesI = 0; // like scope#i
 
             foreach ($reachablesScopesId as $scopeId) {
                 if (0 < $scopesI) {
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
index 8cdb83524..7c51afd63 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -11,15 +11,32 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Repository;
 
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\MainBundle\Entity\UserJob;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 
 interface ActivityACLAwareRepositoryInterface
 {
     /**
-     * @return Activity[]|array
+     * Return all the activities associated to an accompanying period and that the user is allowed to apply the given role.
+     *
+     * @param array{my_activities?: bool, types?: array<ActivityType>, jobs?: array<UserJob>, after?: \DateTimeImmutable|null, before?: \DateTimeImmutable|null} $filters
+     *
+     * @return array<Activity>
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, array $orderBy = ['date' => 'DESC'], array $filters = []): array;
+
+    /**
+     * @param array{my_activities?: bool, types?: array<ActivityType>, jobs?: array<UserJob>, after?: \DateTimeImmutable|null, before?: \DateTimeImmutable|null} $filters
+     */
+    public function countByAccompanyingPeriod(AccompanyingPeriod $period, string $role, array $filters = []): int;
+
+    /**
+     * @param array{my_activities?: bool, types?: array<ActivityType>, jobs?: array<UserJob>, after?: \DateTimeImmutable|null, before?: \DateTimeImmutable|null} $filters
+     */
+    public function countByPerson(Person $person, string $role, array $filters = []): int;
 
     /**
      * Return a list of activities, simplified as array (not object).
@@ -31,7 +48,28 @@ interface ActivityACLAwareRepositoryInterface
     public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array;
 
     /**
-     * @return Activity[]|array
+     * @param array{my_activities?: bool, types?: array<ActivityType>, jobs?: array<UserJob>, after?: \DateTimeImmutable|null, before?: \DateTimeImmutable|null} $filters
+     *
+     * @return array<Activity>
      */
-    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, array $orderBy = ['date' => 'DESC'], array $filters = []): array;
+
+    /**
+     * Return a list of the type for the activities associated to person or accompanying period.
+     *
+     * @return array<ActivityType>
+     */
+    public function findActivityTypeByAssociated(AccompanyingPeriod|Person $associated): array;
+
+    /**
+     * Return a list of the user job for the activities associated to person or accompanying period.
+     *
+     * Associated mean the job:
+     * - of the creator;
+     * - of the user (activity.user)
+     * - of all the users
+     *
+     * @return array<UserJob>
+     */
+    public function findUserJobByAssociated(AccompanyingPeriod|Person $associated): array;
 }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
new file mode 100644
index 000000000..99e75f2da
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
@@ -0,0 +1,187 @@
+<?php
+
+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 Chill\ActivityBundle\Repository;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\ActivityBundle\Service\GenericDoc\Providers\AccompanyingPeriodActivityGenericDocProvider;
+use Chill\ActivityBundle\Service\GenericDoc\Providers\PersonActivityGenericDocProvider;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class ActivityDocumentACLAwareRepository implements ActivityDocumentACLAwareRepositoryInterface
+{
+    public function __construct(
+        private EntityManagerInterface $em,
+        private CenterResolverManagerInterface $centerResolverManager,
+        private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser,
+        private Security $security
+    ) {}
+
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
+    {
+        $query = $this->buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext($person, $startDate, $endDate, $content);
+
+        return $this->addFetchQueryByPersonACL($query, $person);
+    }
+
+    public function buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    {
+        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
+        $activityMetadata = $this->em->getClassMetadata(Activity::class);
+
+        $query = new FetchQuery(
+            PersonActivityGenericDocProvider::KEY,
+            sprintf('jsonb_build_object(\'id\', stored_obj.%s, \'activity_id\', activity.%s)', $storedObjectMetadata->getSingleIdentifierColumnName(), $activityMetadata->getSingleIdentifierColumnName()),
+            sprintf('stored_obj.%s', $storedObjectMetadata->getColumnName('createdAt')),
+            sprintf('%s AS stored_obj', $storedObjectMetadata->getSchemaName().'.'.$storedObjectMetadata->getTableName())
+        );
+
+        $query->addJoinClause(
+            'JOIN public.activity_storedobject activity_doc ON activity_doc.storedobject_id = stored_obj.id'
+        );
+
+        $query->addJoinClause(
+            'JOIN public.activity activity ON activity.id = activity_doc.activity_id'
+        );
+
+        $query->addWhereClause(
+            sprintf('activity.%s = ?', $activityMetadata->getSingleAssociationJoinColumnName('person')),
+            [$person->getId()],
+            [Types::INTEGER]
+        );
+
+        return $this->addWhereClauses($query, $startDate, $endDate, $content);
+    }
+
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    {
+        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
+        $activityMetadata = $this->em->getClassMetadata(Activity::class);
+
+        $query = new FetchQuery(
+            AccompanyingPeriodActivityGenericDocProvider::KEY,
+            sprintf('jsonb_build_object(\'id\', stored_obj.%s, \'activity_id\', activity.%s)', $storedObjectMetadata->getSingleIdentifierColumnName(), $activityMetadata->getSingleIdentifierColumnName()),
+            sprintf('stored_obj.%s', $storedObjectMetadata->getColumnName('createdAt')),
+            sprintf('%s AS stored_obj', $storedObjectMetadata->getSchemaName().'.'.$storedObjectMetadata->getTableName())
+        );
+
+        $query->addJoinClause(
+            'JOIN public.activity_storedobject activity_doc ON activity_doc.storedobject_id = stored_obj.id'
+        );
+
+        $query->addJoinClause(
+            'JOIN public.activity activity ON activity.id = activity_doc.activity_id'
+        );
+
+        // add documents of activities from parcours context
+        $or = [];
+        $orParams = [];
+        $orTypes = [];
+        foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
+            if (!$this->security->isGranted(ActivityVoter::SEE, $participation->getAccompanyingPeriod())) {
+                continue;
+            }
+
+            $or[] = sprintf(
+                '(activity.%s = ? AND stored_obj.%s BETWEEN ?::date AND COALESCE(?::date, \'infinity\'::date))',
+                $activityMetadata->getSingleAssociationJoinColumnName('accompanyingPeriod'),
+                $storedObjectMetadata->getColumnName('createdAt')
+            );
+            $orParams = [...$orParams, $participation->getAccompanyingPeriod()->getId(),
+                \DateTimeImmutable::createFromInterface($participation->getStartDate()),
+                null === $participation->getEndDate() ? null : \DateTimeImmutable::createFromInterface($participation->getEndDate())];
+            $orTypes = [...$orTypes, Types::INTEGER, Types::DATE_IMMUTABLE, Types::DATE_IMMUTABLE];
+        }
+
+        if ([] === $or) {
+            $query->addWhereClause('TRUE = FALSE');
+
+            return $query;
+        }
+
+        $query->addWhereClause(sprintf('(%s)', implode(' OR ', $or)), $orParams, $orTypes);
+
+        return $this->addWhereClauses($query, $startDate, $endDate, $content);
+    }
+
+    private function addWhereClauses(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    {
+        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
+
+        if (null !== $startDate) {
+            $query->addWhereClause(
+                sprintf('stored_obj.%s >= ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$startDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $endDate) {
+            $query->addWhereClause(
+                sprintf('stored_obj.%s < ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$endDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $content and '' !== $content) {
+            $query->addWhereClause(
+                'stored_obj.title ilike ?',
+                ['%'.$content.'%'],
+                [Types::STRING]
+            );
+        }
+
+        return $query;
+    }
+
+    private function addFetchQueryByPersonACL(FetchQuery $fetchQuery, Person $person): FetchQuery
+    {
+        $activityMetadata = $this->em->getClassMetadata(Activity::class);
+
+        $reachableScopes = [];
+
+        foreach ($this->centerResolverManager->resolveCenters($person) as $center) {
+            $reachableScopes = [
+                ...$reachableScopes,
+                ...$this->authorizationHelperForCurrentUser->getReachableScopes(ActivityVoter::SEE, $center),
+            ];
+        }
+
+        if ([] === $reachableScopes) {
+            $fetchQuery->addWhereClause('FALSE = TRUE');
+
+            return $fetchQuery;
+        }
+
+        $fetchQuery->addWhereClause(
+            sprintf(
+                'activity.%s IN (%s)',
+                $activityMetadata->getSingleAssociationJoinColumnName('scope'),
+                implode(', ', array_fill(0, count($reachableScopes), '?'))
+            ),
+            array_map(static fn (Scope $s) => $s->getId(), $reachableScopes),
+            array_fill(0, count($reachableScopes), Types::INTEGER)
+        );
+
+        return $fetchQuery;
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..dcd45c016
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php
@@ -0,0 +1,36 @@
+<?php
+
+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 Chill\ActivityBundle\Repository;
+
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\PersonBundle\Entity\Person;
+
+/**
+ * Gives queries usable for fetching documents, with ACL aware.
+ */
+interface ActivityDocumentACLAwareRepositoryInterface
+{
+    /**
+     * Return a fetch query for querying document's activities for a person.
+     *
+     * This method must check the rights to see a document: the user must be allowed to see the given activities
+     */
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface;
+
+    /**
+     * Return a fetch query for querying document's activities for an activity in accompanying periods, but for a given person.
+     *
+     * This method must check the rights to see a document: the user must be allowed to see the given accompanying periods
+     */
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery;
+}
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php
index 2cf9f9470..ae3296e7f 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 class ActivityPresenceRepository implements ActivityPresenceRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -34,7 +34,7 @@ class ActivityPresenceRepository implements ActivityPresenceRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php
index 228d70856..d2daa1d5d 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php
@@ -25,7 +25,7 @@ interface ActivityPresenceRepositoryInterface
     /**
      * @return array|ActivityPresence[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ActivityPresence;
 
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
index c6b69319e..47a7b35e8 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
@@ -23,15 +23,11 @@ use Symfony\Component\HttpFoundation\RequestStack;
  */
 class ActivityReasonRepository extends ServiceEntityRepository
 {
-    private RequestStack $requestStack;
-
     public function __construct(
         ManagerRegistry $registry,
-        RequestStack $requestStack
+        private readonly RequestStack $requestStack
     ) {
         parent::__construct($registry, ActivityReason::class);
-
-        $this->requestStack = $requestStack;
     }
 
     /**
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
index 5a6e16cd5..a7025d4a9 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -62,7 +62,7 @@ class ActivityRepository extends ServiceEntityRepository
             ->setParameter('period', $period);
 
         foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.' . $k, $dir);
+            $qb->addOrderBy('a.'.$k, $dir);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -90,7 +90,7 @@ class ActivityRepository extends ServiceEntityRepository
             ->setParameter('person', $person);
 
         foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.' . $k, $dir);
+            $qb->addOrderBy('a.'.$k, $dir);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
index fd5d52fce..6f7453a74 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -48,7 +48,7 @@ final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
     /**
      * @return array|ActivityType[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
index 2148a02f5..899535ad6 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php
@@ -17,7 +17,7 @@ use Doctrine\Persistence\ObjectRepository;
 interface ActivityTypeRepositoryInterface extends ObjectRepository
 {
     /**
-     * @return array|ActivityType[]
+     * @return array<ActivityType>
      */
     public function findAllActive(): array;
 }
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
index d70bd28c3..13de8dfc0 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -1,5 +1,7 @@
 // Access to Bootstrap variables and mixins
 @import '~ChillMainAssets/module/bootstrap/shared';
+@import '~ChillPersonAssets/chill/scss/mixins.scss';
+@import 'bootstrap/scss/_badge.scss';
 
 //// ACTIVITY CREATION
 // first step: select type page
@@ -96,3 +98,25 @@ li.document-list-item {
     justify-content: space-between;
     margin-bottom: 0.3rem;
 }
+
+.badge-activity-type {
+    display: inline-block;
+    background-color: #f3f3f3;
+
+    .title_label {
+        @include chill_badge(#9acd32);
+    }
+
+    .title_action {
+        padding: var(--bs-badge-padding-y) var(--bs-badge-padding-x);
+        margin-right: 1rem;
+
+        font-size: var(--bs-badge-font-size);
+        font-weight: var(--bs-badge-font-weight);
+        line-height: 1;
+        color: var(--bs-badge-color);
+        text-align: center;
+        white-space: nowrap;
+        vertical-align: baseline;
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index 8d1aba2b3..b3382c3de 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -75,7 +75,7 @@
             {% endif %}
         </div>
 
-        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+        {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
             'context': context,
             'render': 'wrap-list',
             'entity': activity,
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
index d0359e223..3cf476bbb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -8,7 +8,7 @@
 <div class="activity-edit">
 
     <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+    {% include '@ChillActivity/Activity/edit.html.twig' %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
index 91b3867c1..73eec5f62 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
@@ -24,7 +24,7 @@
 <div class="activity-edit">
 
     <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+    {% include '@ChillActivity/Activity/edit.html.twig' %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 79c946f17..fde256af0 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -80,15 +80,18 @@
 
 <div class="context-{{ context }}">
 
+    {{ filter|chill_render_filter_order_helper }}
+
     {% if activities|length == 0 %}
         <p class="chill-no-data-statement">
             {{ "There isn't any activities."|trans }}
         </p>
 
     {% else %}
+
         <div class="flex-table activity-list">
             {% for activity in activities %}
-                {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
+                {% include '@ChillActivity/Activity/_list_item.html.twig' with {
                     'context': context,
                     'recordAction': _self.recordAction(activity, context, person_id, accompanying_course_id)
                 } %}
@@ -96,4 +99,6 @@
         </div>
     {% endif %}
 
+    {{ chill_pagination(paginator) }}
+
 </div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
index bdf55d86f..e2710ea43 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
@@ -31,7 +31,7 @@
 
     <h1>{{ 'Activity list' |trans }}</h1>
 
-    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillActivity/Activity/list.html.twig' with {'context': 'accompanyingCourse'} %}
 
     {% if is_granted('CHILL_ACTIVITY_CREATE', accompanyingCourse) %}
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index 0c1afdac9..5870f124f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -46,7 +46,7 @@
 
     <h1>{{ 'Activity list' |trans }}</h1>
 
-    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
+    {% include '@ChillActivity/Activity/list.html.twig' with {'context': 'person'} %}
 
     {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
index 47a61bd86..0b098dffe 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
@@ -8,7 +8,7 @@
 <div class="activity-new">
 
     <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillActivity/Activity/new.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
index d57fc3412..dd0b91ccb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
@@ -8,7 +8,7 @@
 <div class="activity-new">
 
     <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
+    {% include '@ChillActivity/Activity/new.html.twig' with {'context': 'person'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypeAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypeAccompanyingCourse.html.twig
index 5e73db597..4bc26baea 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypeAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypeAccompanyingCourse.html.twig
@@ -5,5 +5,5 @@
 {% block title 'Activity creation'|trans %}
 
 {% block content %}
-    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
+    {% include '@ChillActivity/Activity/selectType.html.twig' %}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
index f616012e4..c3815f79d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
@@ -5,5 +5,5 @@
 {% block title 'Activity creation'|trans %}
 
 {% block content %}
-    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
+    {% include '@ChillActivity/Activity/selectType.html.twig' %}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index fca6a7658..d4beb606a 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -88,7 +88,7 @@
 
 <h2 class="chill-blue">{{ 'Concerned groups'|trans }}</h2>
 
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+{% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
     'context': context,
     'render': 'bloc',
     'badge_person': true
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
index 3486f47bc..de471a9ab 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
@@ -18,11 +18,11 @@
     {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
-{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
+{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}
 
 {% block content -%}
 <div class="activity-show">
-    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillActivity/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 721538271..36ba70c7b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
@@ -8,7 +8,7 @@
 {% if activity is not null %}
     <div class="flex-table">
         {% if is_granted('CHILL_ACTIVITY_SEE', activity) %}
-            {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
+            {% include '@ChillActivity/Activity/_list_item.html.twig' with {
                 'recordAction': _self.recordAction(activity),
                 'context': 'accompanyingCourse',
                 'itemBlocClass': 'bg-chill-llight-gray'
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index 43a8eb86b..39daee516 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -16,11 +16,11 @@
     {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
-{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
+{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}
 
 {% block content -%}
 <div class="activity-show">
-    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
+    {% include '@ChillActivity/Activity/show.html.twig' with {'context': 'person'} %}
 </div>
 {% endblock %}
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/GenericDoc/activity_document.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/GenericDoc/activity_document.html.twig
new file mode 100644
index 000000000..5b9547675
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/views/GenericDoc/activity_document.html.twig
@@ -0,0 +1,83 @@
+{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+{% import '@ChillPerson/Macro/updatedBy.html.twig' as mmm %}
+
+{% set person_id = null %}
+{% if activity.person %}
+    {% set person_id = activity.person.id %}
+{% endif %}
+
+{% set accompanying_course_id = null %}
+{% if activity.accompanyingPeriod %}
+    {% set accompanying_course_id = activity.accompanyingPeriod.id %}
+{% endif %}
+
+<div class="item-bloc activity-item{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+    <div class="item-row">
+        <div class="item-col" style="width: unset">
+            {% if document.isPending %}
+                <div class="badge text-bg-info" data-docgen-is-pending="{{ document.id }}">{{ 'docgen.Doc generation is pending'|trans }}</div>
+            {% elseif document.isFailure %}
+                <div class="badge text-bg-warning">{{ 'docgen.Doc generation failed'|trans }}</div>
+            {% endif %}
+
+            <div>
+                {% if activity.accompanyingPeriod is not null and context == 'person' %}
+                    <span class="badge bg-primary">
+                        <i class="fa fa-random"></i> {{ activity.accompanyingPeriod.id }}
+                    </span>&nbsp;
+                {% endif %}
+                <div class="badge-activity-type">
+                    <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>
+                </div>
+            </div>
+            <div class="denomination h2">
+                {{ document.title|chill_print_or_message("No title") }}
+            </div>
+            {% if document.hasTemplate %}
+                <div>
+                    <p>{{ document.template.name|localize_translatable_string }}</p>
+                </div>
+            {% endif %}
+        </div>
+
+        <div class="item-col">
+            <div class="container">
+                <div class="dates row text-end">
+                    <span>{{ document.createdAt|format_date('short') }}</span>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="item-row separator">
+        <div class="item-col item-meta">
+            {{ mmm.createdBy(document) }}
+        </div>
+        <ul class="item-col record_actions flex-shrink-1">
+            {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
+                <li>
+                    {{ document|chill_document_button_group(document.title, is_granted('CHILL_ACTIVITY_UPDATE', activity), {small: false})  }}
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_ACTIVITY_SEE', activity)%}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-show"></a>
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_activity_activity_edit', {'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-edit"></a>
+                </li>
+            {% endif %}
+        </ul>
+
+    </div>
+</div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
index 435be1958..3979be2f3 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
@@ -1,4 +1,4 @@
-{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
+{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}
 
 <div>
   <h3>{{ activity.date|format_date('long') }}<span class="activity"> / {{ 'Activity'|trans }}</span>{% if 'person' != context %} / {{ activity.person|chill_entity_render_box({'addLink': true}) }}{% endif %}</h3>
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
index 2e55f862c..27f4b07a6 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
@@ -20,9 +20,9 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const LISTS = 'CHILL_ACTIVITY_LIST';
+    final public const LISTS = 'CHILL_ACTIVITY_LIST';
 
-    public const STATS = 'CHILL_ACTIVITY_STATS';
+    final public const STATS = 'CHILL_ACTIVITY_STATS';
 
     protected VoterHelperInterface $helper;
 
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
index 15d2441d5..bf2ed78a0 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -21,12 +21,9 @@ 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 Symfony\Component\Security\Core\Security;
 
-use function in_array;
-
 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
     /**
@@ -35,7 +32,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
      *
      * It is safe for usage in template and controller
      */
-    public const CREATE = 'CHILL_ACTIVITY_CREATE';
+    final public const CREATE = 'CHILL_ACTIVITY_CREATE';
 
     /**
      * role to allow to create an activity associated win an accompanying course.
@@ -44,7 +41,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
      *
      * @internal
      */
-    public const CREATE_ACCOMPANYING_COURSE = 'CHILL_ACTIVITY_CREATE_ACCOMPANYING_COURSE';
+    final public const CREATE_ACCOMPANYING_COURSE = 'CHILL_ACTIVITY_CREATE_ACCOMPANYING_COURSE';
 
     /**
      * role to allow to create an activity associated with a person.
@@ -53,17 +50,17 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
      *
      * @internal
      */
-    public const CREATE_PERSON = 'CHILL_ACTIVITY_CREATE_PERSON';
+    final public const CREATE_PERSON = 'CHILL_ACTIVITY_CREATE_PERSON';
 
-    public const DELETE = 'CHILL_ACTIVITY_DELETE';
+    final public const DELETE = 'CHILL_ACTIVITY_DELETE';
 
-    public const FULL = 'CHILL_ACTIVITY_FULL';
+    final public const FULL = 'CHILL_ACTIVITY_FULL';
 
-    public const SEE = 'CHILL_ACTIVITY_SEE';
+    final public const SEE = 'CHILL_ACTIVITY_SEE';
 
-    public const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
+    final public const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
 
-    public const UPDATE = 'CHILL_ACTIVITY_UPDATE';
+    final public const UPDATE = 'CHILL_ACTIVITY_UPDATE';
 
     private const ALL = [
         self::CREATE,
@@ -74,15 +71,12 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
         self::FULL,
     ];
 
-    protected Security $security;
-
     protected VoterHelperInterface $voterHelper;
 
     public function __construct(
-        Security $security,
+        protected Security $security,
         VoterHelperFactoryInterface $voterHelperFactory
     ) {
-        $this->security = $security;
         $this->voterHelper = $voterHelperFactory->generate(self::class)
             ->addCheckFor(Person::class, [self::SEE, self::CREATE])
             ->addCheckFor(AccompanyingPeriod::class, [self::SEE, self::CREATE])
@@ -148,11 +142,11 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                     return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject->getAccompanyingPeriod(), $token);
                 }
             } 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)) {
+                if (\in_array($attribute, [self::UPDATE, self::CREATE, self::DELETE], true)) {
                     return false;
                 }
             }
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index ad570a8a4..46e466ae1 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -18,12 +18,14 @@ use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\DocStoreBundle\Entity\StoredObject;
-use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -39,41 +41,17 @@ class ActivityContext implements
     DocGeneratorContextWithAdminFormInterface,
     DocGeneratorContextWithPublicFormInterface
 {
-    private BaseContextData $baseContextData;
-
-    private DocumentCategoryRepository $documentCategoryRepository;
-
-    private EntityManagerInterface $em;
-
-    private NormalizerInterface $normalizer;
-
-    private PersonRenderInterface $personRender;
-
-    private PersonRepository $personRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
     public function __construct(
-        DocumentCategoryRepository $documentCategoryRepository,
-        NormalizerInterface $normalizer,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        EntityManagerInterface $em,
-        PersonRenderInterface $personRender,
-        PersonRepository $personRepository,
-        TranslatorInterface $translator,
-        BaseContextData $baseContextData
-    ) {
-        $this->documentCategoryRepository = $documentCategoryRepository;
-        $this->normalizer = $normalizer;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->em = $em;
-        $this->personRender = $personRender;
-        $this->personRepository = $personRepository;
-        $this->translator = $translator;
-        $this->baseContextData = $baseContextData;
-    }
+        private readonly NormalizerInterface $normalizer,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly EntityManagerInterface $em,
+        private readonly PersonRenderInterface $personRender,
+        private readonly PersonRepository $personRepository,
+        private readonly TranslatorInterface $translator,
+        private readonly BaseContextData $baseContextData,
+        private readonly ThirdPartyRender $thirdPartyRender,
+        private readonly ThirdPartyRepository $thirdPartyRepository
+    ) {}
 
     public function adminFormReverseTransform(array $data): array
     {
@@ -89,6 +67,8 @@ class ActivityContext implements
             'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
             'person2' => $data['person2'] ?? false,
             'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
+            'thirdParty' => $data['thirdParty'] ?? false,
+            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('thirdParty'),
         ];
     }
 
@@ -118,6 +98,14 @@ class ActivityContext implements
             ->add('person2Label', TextType::class, [
                 'label' => 'person 2 label',
                 'required' => true,
+            ])
+            ->add('thirdParty', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for thirdParty',
+            ])
+            ->add('thirdPartyLabel', TextType::class, [
+                'label' => 'docgen.thirdParty label',
+                'required' => true,
             ]);
     }
 
@@ -134,17 +122,29 @@ class ActivityContext implements
                 $builder->add($key, EntityType::class, [
                     'class' => Person::class,
                     'choices' => $persons,
-                    'choice_label' => function (Person $p) {
-                        return $this->personRender->renderString($p, []);
-                    },
+                    'choice_label' => fn (Person $p) => $this->personRender->renderString($p, []),
                     'multiple' => false,
                     'required' => false,
                     'expanded' => true,
-                    'label' => $options[$key . 'Label'],
+                    'label' => $options[$key.'Label'],
                     'placeholder' => $this->translator->trans('Any person selected'),
                 ]);
             }
         }
+
+        $thirdParties = $entity->getThirdParties();
+        if ($options['thirdParty'] ?? false) {
+            $builder->add('thirdParty', EntityType::class, [
+                'class' => ThirdParty::class,
+                'choices' => $thirdParties,
+                'choice_label' => fn (ThirdParty $p) => $this->thirdPartyRender->renderString($p, []),
+                'multiple' => false,
+                'required' => false,
+                'expanded' => true,
+                'label' => $options['thirdPartyLabel'],
+                'placeholder' => $this->translator->trans('Any third party selected'),
+            ]);
+        }
     }
 
     public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
@@ -159,6 +159,12 @@ class ActivityContext implements
             }
         }
 
+        if (null !== ($id = ($data['thirdParty'] ?? null))) {
+            $denormalized['thirdParty'] = $this->thirdPartyRepository->find($id);
+        } else {
+            $denormalized['thirdParty'] = null;
+        }
+
         return $denormalized;
     }
 
@@ -167,9 +173,11 @@ class ActivityContext implements
         $normalized = [];
 
         foreach (['mainPerson', 'person1', 'person2'] as $k) {
-            $normalized[$k] = null === $data[$k] ? null : $data[$k]->getId();
+            $normalized[$k] = ($data[$k] ?? null)?->getId();
         }
 
+        $normalized['thirdParty'] = ($data['thirdParty'] ?? null)?->getId();
+
         return $normalized;
     }
 
@@ -198,6 +206,13 @@ class ActivityContext implements
             }
         }
 
+        if ($options['thirdParty']) {
+            $data['thirdParty'] = $this->normalizer->normalize($contextGenerationData['thirdParty'], 'docgen', [
+                'docgen:expects' => ThirdParty::class,
+                'groups' => 'docgen:read',
+            ]);
+        }
+
         return $data;
     }
 
@@ -237,7 +252,7 @@ class ActivityContext implements
     {
         $options = $template->getOptions();
 
-        return $options['mainPerson'] || $options['person1'] || $options['person2'];
+        return $options['mainPerson'] || $options['person1'] || $options['person2'] || $options['thirdParty'];
     }
 
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
index b2272dd7b..221d1f4b2 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -32,13 +32,11 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use DateTime;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use function in_array;
 
 /**
  * @implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriod>
@@ -48,45 +46,17 @@ class ListActivitiesByAccompanyingPeriodContext implements
     DocGeneratorContextWithAdminFormInterface,
     DocGeneratorContextWithPublicFormInterface
 {
-    private AccompanyingPeriodContext $accompanyingPeriodContext;
-
-    private ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
-
-    private NormalizerInterface $normalizer;
-
-    private PersonRepository $personRepository;
-
-    private SocialActionRepository $socialActionRepository;
-
-    private SocialIssueRepository $socialIssueRepository;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private UserRepository $userRepository;
-
     public function __construct(
-        AccompanyingPeriodContext $accompanyingPeriodContext,
-        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
-        NormalizerInterface $normalizer,
-        PersonRepository $personRepository,
-        SocialActionRepository $socialActionRepository,
-        SocialIssueRepository $socialIssueRepository,
-        ThirdPartyRepository $thirdPartyRepository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        UserRepository $userRepository,
-    ) {
-        $this->accompanyingPeriodContext = $accompanyingPeriodContext;
-        $this->activityACLAwareRepository = $activityACLAwareRepository;
-        $this->normalizer = $normalizer;
-        $this->personRepository = $personRepository;
-        $this->socialActionRepository = $socialActionRepository;
-        $this->socialIssueRepository = $socialIssueRepository;
-        $this->thirdPartyRepository = $thirdPartyRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->userRepository = $userRepository;
-    }
+        private readonly AccompanyingPeriodContext $accompanyingPeriodContext,
+        private readonly ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
+        private readonly NormalizerInterface $normalizer,
+        private readonly PersonRepository $personRepository,
+        private readonly SocialActionRepository $socialActionRepository,
+        private readonly SocialIssueRepository $socialIssueRepository,
+        private readonly ThirdPartyRepository $thirdPartyRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly UserRepository $userRepository
+    ) {}
 
     public function adminFormReverseTransform(array $data): array
     {
@@ -140,30 +110,37 @@ class ListActivitiesByAccompanyingPeriodContext implements
         return $normalized;
     }
 
+    /**
+     * @return list
+     */
     private function filterActivitiesByUser(array $activities, User $user): array
     {
-        return array_filter(
-            $activities,
-            function ($activity) use ($user) {
-                $activityUsernames = array_map(static function ($user) {
-                    return $user['username'];
-                }, $activity['users'] ?? []);
-                return in_array($user->getUsername(), $activityUsernames, true);
-            }
+        return array_values(
+            array_filter(
+                $activities,
+                function ($activity) use ($user) {
+                    $activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []);
+
+                    return \in_array($user->getUsername(), $activityUsernames, true);
+                }
+            )
         );
     }
 
+    /**
+     * @return list
+     */
     private function filterWorksByUser(array $works, User $user): array
     {
-        return array_filter(
-            $works,
-            function ($work) use ($user) {
-                $workUsernames = array_map(static function ($user) {
-                    return $user['username'];
-                }, $work['referrers'] ?? []);
+        return array_values(
+            array_filter(
+                $works,
+                function ($work) use ($user) {
+                    $workUsernames = array_map(static fn ($user) => $user['username'], $work['referrers'] ?? []);
 
-                return in_array($user->getUsername(), $workUsernames, true);
-            }
+                    return \in_array($user->getUsername(), $workUsernames, true);
+                }
+            )
         );
     }
 
@@ -185,6 +162,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
         if ($myWorksOnly && isset($contextGenerationData['creator'])) {
             $data['course']['works'] = $this->filterWorksByUser($data['course']['works'], $contextGenerationData['creator']);
         }
+
         return $data;
     }
 
@@ -238,7 +216,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
             $activity = $row[0];
 
             $activity['date'] = $this->normalizer->normalize($activity['date'], 'docgen', [
-                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => DateTime::class,
+                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => \DateTime::class,
             ]);
 
             if (null === $activity['location']) {
@@ -251,8 +229,8 @@ class ListActivitiesByAccompanyingPeriodContext implements
                 $activity['location']['type'] = 'location';
 
                 foreach (['1', '2'] as $key) {
-                    $activity['location']['phonenumber' . $key] = $this->normalizer->normalize(
-                        $activity['location']['phonenumber' . $key],
+                    $activity['location']['phonenumber'.$key] = $this->normalizer->normalize(
+                        $activity['location']['phonenumber'.$key],
                         'docgen',
                         [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => PhoneNumber::class]
                     );
diff --git a/src/Bundle/ChillActivityBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/ActivityUsersDateQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillActivityBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/ActivityUsersDateQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..bb70d6e87
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/ActivityUsersDateQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,64 @@
+<?php
+
+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 Chill\ActivityBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class ActivityUsersDateQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'activity.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return Activity::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'activity.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'au.user_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'activity.date';
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'activity_date';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return '\'{}\'::jsonb';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'activity
+            LEFT JOIN activity_user au on activity.id = au.activity_id';
+    }
+
+    public function getWhereClause(): string
+    {
+        return 'activity.accompanyingperiod_id IS NOT NULL';
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php
new file mode 100644
index 000000000..2c6c9a691
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php
@@ -0,0 +1,107 @@
+<?php
+
+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 Chill\ActivityBundle\Service\GenericDoc\Providers;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Repository\ActivityDocumentACLAwareRepositoryInterface;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class AccompanyingPeriodActivityGenericDocProvider implements GenericDocForAccompanyingPeriodProviderInterface, GenericDocForPersonProviderInterface
+{
+    public const KEY = 'accompanying_period_activity_document';
+
+    public function __construct(
+        private EntityManagerInterface $em,
+        private Security $security,
+        private ActivityDocumentACLAwareRepositoryInterface $activityDocumentACLAwareRepository,
+    ) {}
+
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
+        $activityMetadata = $this->em->getClassMetadata(Activity::class);
+
+        $query = new FetchQuery(
+            self::KEY,
+            sprintf("jsonb_build_object('id', doc_obj.%s, 'activity_id', activity.%s)", $storedObjectMetadata->getSingleIdentifierColumnName(), $activityMetadata->getSingleIdentifierColumnName()),
+            'doc_obj.'.$storedObjectMetadata->getColumnName('createdAt'),
+            $storedObjectMetadata->getSchemaName().'.'.$storedObjectMetadata->getTableName().' AS doc_obj'
+        );
+
+        $query->addJoinClause(
+            'JOIN public.activity_storedobject activity_doc ON activity_doc.storedobject_id = doc_obj.id'
+        );
+
+        $query->addJoinClause(
+            'JOIN public.activity activity ON activity.id = activity_doc.activity_id'
+        );
+
+        $query->addWhereClause(
+            'activity.accompanyingperiod_id = ?',
+            [$accompanyingPeriod->getId()],
+            [Types::INTEGER]
+        );
+
+        if (null !== $startDate) {
+            $query->addWhereClause(
+                sprintf('doc_obj.%s >= ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$startDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $endDate) {
+            $query->addWhereClause(
+                sprintf('doc_obj.%s < ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$endDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $content) {
+            $query->addWhereClause(
+                'doc_obj.title ilike ?',
+                ['%'.$content.'%'],
+                [Types::STRING]
+            );
+        }
+
+        return $query;
+    }
+
+    public function isAllowedForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool
+    {
+        return $this->security->isGranted(ActivityVoter::SEE, $accompanyingPeriod);
+    }
+
+    public function isAllowedForPerson(Person $person): bool
+    {
+        return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
+    }
+
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        return $this->activityDocumentACLAwareRepository
+            ->buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext($person, $startDate, $endDate, $content);
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php
new file mode 100644
index 000000000..b84345375
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php
@@ -0,0 +1,44 @@
+<?php
+
+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 Chill\ActivityBundle\Service\GenericDoc\Providers;
+
+use Chill\ActivityBundle\Repository\ActivityDocumentACLAwareRepositoryInterface;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class PersonActivityGenericDocProvider implements GenericDocForPersonProviderInterface
+{
+    public const KEY = 'person_activity_document';
+
+    public function __construct(
+        private Security $security,
+        private ActivityDocumentACLAwareRepositoryInterface $personActivityDocumentACLAwareRepository,
+    ) {}
+
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        return $this->personActivityDocumentACLAwareRepository->buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(
+            $person,
+            $startDate,
+            $endDate,
+            $content
+        );
+    }
+
+    public function isAllowedForPerson(Person $person): bool
+    {
+        return $this->security->isGranted(ActivityVoter::SEE, $person);
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Renderers/AccompanyingPeriodActivityGenericDocRenderer.php b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Renderers/AccompanyingPeriodActivityGenericDocRenderer.php
new file mode 100644
index 000000000..93649cea8
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Renderers/AccompanyingPeriodActivityGenericDocRenderer.php
@@ -0,0 +1,43 @@
+<?php
+
+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 Chill\ActivityBundle\Service\GenericDoc\Renderers;
+
+use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\ActivityBundle\Service\GenericDoc\Providers\AccompanyingPeriodActivityGenericDocProvider;
+use Chill\ActivityBundle\Service\GenericDoc\Providers\PersonActivityGenericDocProvider;
+use Chill\DocStoreBundle\GenericDoc\GenericDocDTO;
+use Chill\DocStoreBundle\GenericDoc\Twig\GenericDocRendererInterface;
+use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+
+final readonly class AccompanyingPeriodActivityGenericDocRenderer implements GenericDocRendererInterface
+{
+    public function __construct(private StoredObjectRepository $objectRepository, private ActivityRepository $activityRepository) {}
+
+    public function supports(GenericDocDTO $genericDocDTO, $options = []): bool
+    {
+        return AccompanyingPeriodActivityGenericDocProvider::KEY === $genericDocDTO->key || PersonActivityGenericDocProvider::KEY === $genericDocDTO->key;
+    }
+
+    public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string
+    {
+        return '@ChillActivity/GenericDoc/activity_document.html.twig';
+    }
+
+    public function getTemplateData(GenericDocDTO $genericDocDTO, $options = []): array
+    {
+        return [
+            'activity' => $this->activityRepository->find($genericDocDTO->identifiers['activity_id']),
+            'document' => $this->objectRepository->find($genericDocDTO->identifiers['id']),
+            'context' => $genericDocDTO->getContext(),
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php b/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
index c60a8d286..aa7783d2d 100644
--- a/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
+++ b/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Templating\Entity;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\MainBundle\Templating\Entity\BoxUtilsChillEntityRenderTrait;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -38,21 +37,21 @@ class ActivityReasonRender implements ChillEntityRenderInterface
     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>' .
+            ).
+            '</span>'.
+            '</span>'.
             $this->getDefaultClosingBox();
     }
 
@@ -63,10 +62,10 @@ class ActivityReasonRender implements ChillEntityRenderInterface
         if (null !== $entity->getCategory()) {
             $category = $this->translatableStringHelper->localize(
                 $entity->getCategory()->getName()
-            ) . ' > ';
+            ).' > ';
         }
 
-        return $category .
+        return $category.
             $this->translatableStringHelper->localize(
                 $entity->getName()
             );
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
index 8e2c219f0..38aa49cdf 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
@@ -12,14 +12,12 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Controller;
 
 use Chill\ActivityBundle\Entity\ActivityType;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Role\Role;
-use function count;
-use function in_array;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityControllerTest extends WebTestCase
@@ -76,10 +74,8 @@ final class ActivityControllerTest extends WebTestCase
 
     /**
      * @dataProvider getSecuredPagesUnauthenticated
-     *
-     * @param mixed $url
      */
-    public function testAccessIsDeniedForUnauthenticated($url)
+    public function testAccessIsDeniedForUnauthenticated(mixed $url)
     {
         $client = $this->createClient();
 
@@ -194,7 +190,7 @@ final class ActivityControllerTest extends WebTestCase
 
         $crawler = $client->followRedirect();
 
-        $this->assertNotContains('January 25, 2015', $crawler->text());
+        $this->assertStringNotContainsString('January 25, 2015', $crawler->text());
     }
 
     /**
@@ -208,19 +204,19 @@ final class ActivityControllerTest extends WebTestCase
         $container = self::$kernel->getContainer();
         $em = $container->get('doctrine.orm.entity_manager');
 
-        //get the social PermissionGroup, and remove CHILL_ACTIVITY_*
+        // get the social PermissionGroup, and remove CHILL_ACTIVITY_*
         $socialPermissionGroup = $em
             ->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)
             ->findOneByName('social');
         $withoutActivityPermissionGroup = (new \Chill\MainBundle\Entity\PermissionsGroup())
             ->setName('social without activity');
-        //copy role scopes where ACTIVITY is not present
+        // copy role scopes where ACTIVITY is not present
         foreach ($socialPermissionGroup->getRoleScopes() as $roleScope) {
-            if (!strpos($roleScope->getRole(), 'ACTIVITY')) {
+            if (!strpos((string) $roleScope->getRole(), 'ACTIVITY')) {
                 $withoutActivityPermissionGroup->addRoleScope($roleScope);
             }
         }
-        //create groupCenter
+        // create groupCenter
         $groupCenter = new \Chill\MainBundle\Entity\GroupCenter();
         $groupCenter->setCenter($em->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findOneBy(['name' => 'Center A']))
@@ -228,7 +224,7 @@ final class ActivityControllerTest extends WebTestCase
         $em->persist($withoutActivityPermissionGroup);
         $em->persist($groupCenter);
 
-        //create user
+        // create user
         $faker = \Faker\Factory::create();
         $username = $faker->name;
         $user = new \Chill\MainBundle\Entity\User();
@@ -253,20 +249,17 @@ final class ActivityControllerTest extends WebTestCase
         $activities = $em->getRepository(\Chill\ActivityBundle\Entity\Activity::class)
             ->findBy(['person' => $person]);
 
-        if (count($activities) === 0) {
-            throw new RuntimeException('We need activities associated with this '
-                    . 'person. Did you forget to add fixtures ?');
+        if (0 === \count($activities)) {
+            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
+     * @return \Symfony\Component\BrowserKit\AbstractBrowser
      */
-    private function getAuthenticatedClient($username = 'center a_social')
+    private function getAuthenticatedClient(mixed $username = 'center a_social')
     {
         return self::createClient([], [
             'PHP_AUTH_USER' => $username,
@@ -289,8 +282,7 @@ final class ActivityControllerTest extends WebTestCase
             ]);
 
         if (null === $person) {
-            throw new RuntimeException('We need a person with firstname Gérard and'
-                  . ' lastname Depardieu. Did you add fixtures ?');
+            throw new \RuntimeException('We need a person with firstname Gérard and lastname Depardieu. Did you add fixtures ?');
         }
 
         return $person;
@@ -310,7 +302,7 @@ final class ActivityControllerTest extends WebTestCase
 
         $reason = $reasons[array_rand($reasons)];
 
-        if (in_array($reason->getId(), $excludeIds, true)) {
+        if (\in_array($reason->getId(), $excludeIds, true)) {
             return $this->getRandomActivityReason($excludeIds);
         }
 
@@ -344,8 +336,7 @@ final class ActivityControllerTest extends WebTestCase
             ->findOneByUsername($username);
 
         if (null === $user) {
-            throw new RuntimeException("The user with username {$username} "
-                  . 'does not exists in database. Did you add fixtures ?');
+            throw new \RuntimeException("The user with username {$username} ".'does not exists in database. Did you add fixtures ?');
         }
 
         $center = self::$kernel->getContainer()
@@ -358,32 +349,27 @@ final class ActivityControllerTest extends WebTestCase
             ->get('chill.main.security.authorization.helper')
             ->getReachableScopes(
                 $user,
-                new Role('CHILL_ACTIVITY_UPDATE'),
+                'CHILL_ACTIVITY_UPDATE',
                 $center
             );
         $reachableScopesDelete = self::$kernel->getContainer()
             ->get('chill.main.security.authorization.helper')
             ->getReachableScopes(
                 $user,
-                new Role('CHILL_ACTIVITY_DELETE'),
+                '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)
+            array_map(static fn ($s) => $s->getId(), $reachableScopesDelete),
+            array_map(static fn ($s) => $s->getId(), $reachableScopesUpdate)
         );
 
-        if (count($reachableScopesId) === 0) {
-            throw new RuntimeException('there are not scope reachable for '
-                  . 'both CHILL_ACTIVITY_UPDATE and CHILL_ACTIVITY_DELETE');
+        if (0 === \count($reachableScopesId)) {
+            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)) {
+            if (\in_array($scope->getId(), $reachableScopesId, true)) {
                 $reachableScopes[] = $scope;
             }
         }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
index 14f75e863..81378b5ef 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
@@ -15,11 +15,15 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonCategoryControllerTest extends WebTestCase
 {
-    public function testToWrite()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testToWrite(): never
     {
         $this->markTestSkipped();
     }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
index 47de677a3..ce37d3fb7 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
@@ -15,11 +15,15 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonControllerTest extends WebTestCase
 {
-    public function testToWrite()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testToWrite(): never
     {
         $this->markTestSkipped();
     }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
index b2276f427..23de2d17c 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
@@ -15,11 +15,15 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeControllerTest extends WebTestCase
 {
-    public function testToWrite()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testToWrite(): never
     {
         $this->markTestSkipped();
     }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
index 3d91c3da9..6610b64ff 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
@@ -22,6 +22,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTest extends TestCase
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
index 7f6c76332..6cb0eb299 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BySocialActionAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class BySocialActionAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -55,8 +54,8 @@ final class BySocialActionAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.socialActions', 'actsocialaction'),
+                ->leftJoin('activity.accompanyingPeriod', 'acp')
+                ->leftJoin('activity.socialActions', 'actsocialaction'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
index c8374d370..583e950a6 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
@@ -45,18 +46,16 @@ final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('count(activity.id)')
+                ->select('count(activity)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.socialIssues', 'actsocialissue'),
+                ->leftJoin('activity.accompanyingPeriod', 'acp')
+                ->leftJoin('activity.socialIssues', 'actsocialissue'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
index 31633b9a3..bb0906be6 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
@@ -20,6 +21,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
  * Add tests for ActivityTypeAggregator.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
@@ -32,7 +34,7 @@ final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.type_aggregator');
+        $this->aggregator = self::$container->get(ActivityTypeAggregator::class);
 
         $request = $this->prophesize()
             ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
@@ -57,19 +59,17 @@ final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity'),
+                ->from(Activity::class, 'activity'),
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
+                ->from(Activity::class, 'activity')
                 ->join('activity.activityType', 'acttype'),
         ];
     }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
index 06542aa41..0cd7fe14d 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
@@ -20,6 +21,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
  * Add tests for ActivityUsernAggregator.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityUserAggregatorTest extends AbstractAggregatorTest
@@ -57,16 +59,14 @@ final class ActivityUserAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity'),
+                ->from(Activity::class, 'activity'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php
similarity index 70%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php
index e3bbde25f..0558c3f2b 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php
@@ -9,15 +9,16 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator;
+use Chill\ActivityBundle\Export\Aggregator\ByThirdpartyAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
@@ -28,7 +29,7 @@ final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.bythirdparty_aggregator');
+        $this->aggregator = self::$container->get(ByThirdpartyAggregator::class);
     }
 
     public function getAggregator()
@@ -45,9 +46,7 @@ final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -55,8 +54,8 @@ final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.thirdParties', 'acttparty'),
+                ->leftJoin('activity.accompanyingPeriod', 'acp')
+                ->leftJoin('activity.thirdParties', 'acttparty'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php
similarity index 70%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php
index ff4f42ec4..3e8359ab8 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php
@@ -9,15 +9,16 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByCreatorAggregator;
+use Chill\ActivityBundle\Export\Aggregator\ByCreatorAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ByUserAggregatorTest extends AbstractAggregatorTest
@@ -28,7 +29,7 @@ final class ByUserAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.byuser_aggregator');
+        $this->aggregator = self::$container->get(ByCreatorAggregator::class);
     }
 
     public function getAggregator()
@@ -45,9 +46,7 @@ final class ByUserAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -55,8 +54,8 @@ final class ByUserAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.users', 'actusers'),
+                ->leftJoin('activity.accompanyingPeriod', 'acp')
+                ->leftJoin('activity.users', 'actusers'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php
similarity index 66%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php
index 1265804f9..49c1d746f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php
@@ -9,18 +9,19 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\CreatorScopeAggregator;
+use Chill\ActivityBundle\Export\Aggregator\CreatorScopeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
-final class UserScopeAggregatorTest extends AbstractAggregatorTest
+final class CreatorScopeAggregatorTest extends AbstractAggregatorTest
 {
     private CreatorScopeAggregator $aggregator;
 
@@ -28,7 +29,7 @@ final class UserScopeAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.userscope_aggregator');
+        $this->aggregator = self::$container->get(CreatorScopeAggregator::class);
     }
 
     public function getAggregator()
@@ -45,9 +46,7 @@ final class UserScopeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -55,8 +54,8 @@ final class UserScopeAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.user', 'actuser'),
+                ->leftJoin('activity.accompanyingPeriod', 'acp')
+                ->leftJoin('activity.user', 'actuser'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php
similarity index 76%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php
index feb5ed970..db3a3ff76 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php
@@ -9,15 +9,16 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\DateAggregator;
+use Chill\ActivityBundle\Export\Aggregator\DateAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DateAggregatorTest extends AbstractAggregatorTest
@@ -28,7 +29,7 @@ final class DateAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.date_aggregator');
+        $this->aggregator = self::$container->get(DateAggregator::class);
     }
 
     public function getAggregator()
@@ -53,9 +54,7 @@ final class DateAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -63,7 +62,7 @@ final class DateAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp'),
+                ->leftJoin('activity.accompanyingPeriod', 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php
new file mode 100644
index 000000000..69d511ace
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/JobScopeAggregatorTest.php
@@ -0,0 +1,61 @@
+<?php
+
+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 Chill\ActivityBundle\Tests\Export\Aggregator;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\JobScopeAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class JobScopeAggregatorTest extends AbstractAggregatorTest
+{
+    private JobScopeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get(JobScopeAggregator::class);
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        self::bootKernel();
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->leftJoin('activity.accompanyingPeriod', 'acp')
+                ->leftJoin('activity.user', 'actuser'),
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
similarity index 70%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
index c384eb772..663901edd 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
@@ -9,15 +9,16 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\LocationTypeAggregator;
+use Chill\ActivityBundle\Export\Aggregator\LocationTypeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationTypeAggregatorTest extends AbstractAggregatorTest
@@ -28,7 +29,7 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.locationtype_aggregator');
+        $this->aggregator = self::$container->get(LocationTypeAggregator::class);
     }
 
     public function getAggregator()
@@ -45,9 +46,7 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -55,8 +54,8 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.location', 'actloc'),
+                ->leftJoin('activity.accompanyingPeriod', 'acp')
+                ->leftJoin('activity.location', 'actloc'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
index 0a61e983f..004de0b99 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator\PersonAggregators;
 
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
@@ -18,6 +19,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
@@ -30,7 +32,7 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.reason_aggregator');
+        $this->aggregator = self::$container->get(ActivityReasonAggregator::class);
 
         $request = $this->prophesize()
             ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
@@ -56,23 +58,21 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity'),
+                ->from(Activity::class, 'activity'),
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
+                ->from(Activity::class, 'activity')
                 ->join('activity.reasons', 'actreasons'),
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
+                ->from(Activity::class, 'activity')
                 ->join('activity.reasons', 'actreasons')
                 ->join('actreasons.category', 'actreasoncat'),
         ];
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php
index 2eb2176b0..5f9b635ee 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AvgActivityDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php
index 59b4384cf..b15462912 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AvgActivityVisitDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php
index f03bbb956..46279ebd8 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountActivityTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php
index 24a5133b6..c4f91f52e 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SumActivityDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php
index 1940140ac..6bd7e9d19 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SumActivityVisitDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php
index 864ff55ba..61ae15604 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountActivityTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php
index afa3da111..f474b1fe6 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php
@@ -17,6 +17,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ListActivityTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php
index 44d327ffd..11fb84a9a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Test\Export\AbstractExportTest;
  * Test the "sum" part of StatActivityDuration.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class StatActivityDurationTest extends AbstractExportTest
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
index 72b99375b..347d7466f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php
@@ -13,25 +13,26 @@ namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeFilterTest extends AbstractFilterTest
 {
-    private ActivityTypeFilter $filter;
+    private \Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter $filter;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.filter_activitytype');
+        $this->filter = self::$container->get(\Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter::class);
     }
 
     public function getFilter()
@@ -41,19 +42,21 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(ActivityType::class, 'at')
             ->select('at')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_activitytypes' => $a,
+                'accepted_activitytypes' => new ArrayCollection([$a]),
             ];
         }
 
@@ -62,9 +65,7 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php
new file mode 100644
index 000000000..0b0c1f029
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php
@@ -0,0 +1,77 @@
+<?php
+
+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 Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ByCreatorFilter;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class ByCreatorFilterTest extends AbstractFilterTest
+{
+    private ByCreatorFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->filter = self::$container->get(ByCreatorFilter::class);
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(User::class, 'u')
+            ->select('u')
+            ->getQuery()
+            ->setMaxResults(2)
+            ->getResult();
+
+        $data = [];
+
+        foreach ($array as $a) {
+            $data[] = [
+                'accepted_users' => $a,
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        self::bootKernel();
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.users', 'actusers'),
+        ];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
index a707e1242..e6ec47666 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php
@@ -12,24 +12,25 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BySocialActionFilterTest extends AbstractFilterTest
 {
-    private BySocialActionFilter $filter;
+    private \Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter $filter;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.bysocialaction_filter');
+        $this->filter = self::$container->get(\Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter::class);
     }
 
     public function getFilter()
@@ -39,6 +40,8 @@ final class BySocialActionFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
+
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
@@ -51,7 +54,7 @@ final class BySocialActionFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_socialactions' => $a,
+                'accepted_socialactions' => new ArrayCollection([$a]),
             ];
         }
 
@@ -60,9 +63,7 @@ final class BySocialActionFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
index 5f34a8f3b..47f45ceb5 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php
@@ -15,10 +15,12 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BySocialIssueFilterTest extends AbstractFilterTest
@@ -29,7 +31,7 @@ final class BySocialIssueFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.bysocialissue_filter');
+        $this->filter = self::$container->get(BySocialIssueFilter::class);
     }
 
     public function getFilter()
@@ -39,19 +41,21 @@ final class BySocialIssueFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(SocialIssue::class, 'si')
             ->select('si')
             ->getQuery()
+            ->setMaxResults(2)
             ->getResult();
 
         $data = [];
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_socialissues' => $a,
+                'accepted_socialissues' => new ArrayCollection([$a]),
             ];
         }
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
index 8d6d6b790..4cefb136a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php
@@ -13,12 +13,13 @@ namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Filter\ActivityDateFilter;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityDateFilterTest extends AbstractFilterTest
@@ -29,7 +30,7 @@ final class ActivityDateFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.date_filter');
+        $this->filter = self::$container->get(ActivityDateFilter::class);
     }
 
     public function getFilter()
@@ -41,24 +42,22 @@ final class ActivityDateFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => DateTime::createFromFormat('Y-m-d', '2020-01-01'),
-                'date_to' => DateTime::createFromFormat('Y-m-d', '2021-01-01'),
+                'date_from' => new RollingDate(RollingDate::T_FIXED_DATE, \DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01')),
+                'date_to' => new RollingDate(RollingDate::T_FIXED_DATE, \DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01')),
             ],
         ];
     }
 
-    public function getQueryBuilders(): array
+    public function getQueryBuilders(): iterable
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
-        ];
+        yield $em->createQueryBuilder()
+            ->select('count(activity.id)')
+            ->from(Activity::class, 'activity');
+
+        self::ensureKernelShutdown();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
index 26d5248ae..3d1f1fa2d 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
@@ -14,10 +14,13 @@ namespace Chill\ActivityBundle\Tests\Export\Filter;
 use Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonFilterTest extends AbstractFilterTest
@@ -37,7 +40,7 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
 
         $request->getLocale()->willReturn('fr');
 
-        self::$container->get('request_stack')
+        self::$container->get(RequestStack::class)
             ->push($request->reveal());
     }
 
@@ -48,47 +51,42 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
-        $em = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
+        $em = self::$container
+            ->get(EntityManagerInterface::class);
 
         $reasons = $em->createQuery('SELECT reason '
-                . 'FROM ChillActivityBundle:ActivityReason reason')
+                .'FROM ChillActivityBundle:ActivityReason reason')
             ->getResult();
 
         // generate an array of 5 different combination of results
         for ($i = 0; 5 > $i; ++$i) {
-            $r[] = ['reasons' => new ArrayCollection(array_splice($reasons, ($i + 1) * -1))];
+            yield ['reasons' => new ArrayCollection(array_splice($reasons, ($i + 1) * -1))];
         }
 
-        return $r;
+        self::ensureKernelShutdown();
     }
 
-    public function getQueryBuilders()
+    public function getQueryBuilders(): iterable
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
-        $em = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
+        $em = self::$container->get(EntityManagerInterface::class);
 
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity'),
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.reasons', 'reasons'),
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category'),
-        ];
+        yield $em->createQueryBuilder()
+            ->select('count(activity.id)')
+            ->from('ChillActivityBundle:Activity', 'activity');
+        yield $em->createQueryBuilder()
+            ->select('count(activity.id)')
+            ->from('ChillActivityBundle:Activity', 'activity')
+            ->join('activity.reasons', 'reasons');
+        yield $em->createQueryBuilder()
+            ->select('count(activity.id)')
+            ->from('ChillActivityBundle:Activity', 'activity')
+            ->join('activity.reasons', 'reasons')
+            ->join('reasons.category', 'category');
+
+        self::ensureKernelShutdown();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
index 9fd1250ca..5f94b4579 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
@@ -15,10 +15,12 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Export\Filter\ActivityTypeFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeFilterTest extends AbstractFilterTest
@@ -37,8 +39,10 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public function getFormData(): iterable
     {
+        self::bootKernel();
+
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
@@ -51,25 +55,23 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
 
         foreach ($array as $a) {
             $data[] = [
-                'types' => $a,
+                'types' => new ArrayCollection([$a]),
             ];
         }
 
         return $data;
     }
 
-    public function getQueryBuilders(): array
+    public function getQueryBuilders(): iterable
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
-        ];
+        yield $em->createQueryBuilder()
+            ->select('count(activity.id)')
+            ->from(Activity::class, 'activity');
+
+        self::ensureKernelShutdown();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php
similarity index 84%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php
index 47e76e25c..d5073b625 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php
@@ -9,19 +9,20 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\ByCreatorFilter;
+use Chill\ActivityBundle\Export\Filter\ByCreatorFilter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
-final class ByUserFilterTest extends AbstractFilterTest
+final class ByCreatorFilterTest extends AbstractFilterTest
 {
     private ByCreatorFilter $filter;
 
@@ -29,7 +30,7 @@ final class ByUserFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.byuser_filter');
+        $this->filter = self::$container->get(ByCreatorFilter::class);
     }
 
     public function getFilter()
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php
similarity index 78%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php
index 5242f337a..5ef1879a7 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php
@@ -9,15 +9,16 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\EmergencyFilter;
+use Chill\ActivityBundle\Export\Filter\EmergencyFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EmergencyFilterTest extends AbstractFilterTest
@@ -28,7 +29,7 @@ final class EmergencyFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.emergency_filter');
+        $this->filter = self::$container->get(EmergencyFilter::class);
     }
 
     public function getFilter()
@@ -46,9 +47,7 @@ final class EmergencyFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php
similarity index 83%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php
index c037a28b1..bf52ceee1 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php
@@ -9,16 +9,17 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter;
+use Chill\ActivityBundle\Export\Filter\LocationTypeFilter;
 use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationTypeFilterTest extends AbstractFilterTest
@@ -29,7 +30,7 @@ final class LocationTypeFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.locationtype_filter');
+        $this->filter = self::$container->get(LocationTypeFilter::class);
     }
 
     public function getFilter()
@@ -39,12 +40,14 @@ final class LocationTypeFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(LocationType::class, 'lt')
             ->select('lt')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
@@ -60,9 +63,7 @@ final class LocationTypeFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
index b4e962ba9..6ad78579e 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php
@@ -15,10 +15,12 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityReasonFilterTest extends AbstractFilterTest
@@ -39,19 +41,21 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(ActivityReason::class, 'ar')
             ->select('ar')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
 
         foreach ($array as $a) {
             $data[] = [
-                'reasons' => $a,
+                'reasons' => new ArrayCollection([$a]),
             ];
         }
 
@@ -60,9 +64,7 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
index eb296e9a4..34a9c8303 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php
@@ -15,11 +15,11 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
@@ -40,21 +40,23 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(ActivityReason::class, 'ar')
             ->select('ar')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
 
         foreach ($array as $a) {
             $data[] = [
-                'date_from' => DateTime::createFromFormat('Y-m-d', '2021-07-01'),
-                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
-                'reasons' => $a,
+                'date_from' => \DateTime::createFromFormat('Y-m-d', '2021-07-01'),
+                'date_to' => \DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+                'reasons' => [$a],
             ];
         }
 
@@ -72,7 +74,8 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
         return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
+                ->from(Activity::class, 'activity')
+                ->join('activity.person', 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
index 762de529e..a2ea7c158 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
@@ -12,12 +12,16 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
+use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use DateTime;
-use function array_slice;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ManagerRegistry;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
@@ -35,7 +39,7 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 
         $request->getLocale()->willReturn('fr');
 
-        self::$container->get('request_stack')
+        self::$container->get(RequestStack::class)
             ->push($request->reveal());
     }
 
@@ -46,8 +50,8 @@ final 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 = [];
@@ -56,7 +60,7 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
             $data[] = [
                 'date_from' => $date_from,
                 'date_to' => $date_to,
-                'reasons' => array_slice($reasons, 0, 1 + $i),
+                'reasons' => \array_slice($reasons, 0, 1 + $i),
             ];
         }
 
@@ -65,26 +69,24 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
-        $em = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
+        $em = self::$container
+            ->get(EntityManagerInterface::class);
 
-        return [
-            $em->createQueryBuilder()
-                ->select('count(person.id)')
-                ->from('ChillPersonBundle:Person', 'person')
-                // add a fake where clause
-                ->where('person.id > 0'),
-            $em->createQueryBuilder()
-                ->select('count(person.id)')
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.person', 'person')
-                // add a fake where clause
-                ->where('person.id > 0'),
-        ];
+        yield $em->createQueryBuilder()
+            ->select('count(person.id)')
+            ->from('ChillPersonBundle:Person', 'person')
+            // add a fake where clause
+            ->where('person.id > 0');
+        yield $em->createQueryBuilder()
+            ->select('count(person.id)')
+            ->from('ChillActivityBundle:Activity', 'activity')
+            ->join('activity.person', 'person')
+            // add a fake where clause
+            ->where('person.id > 0');
+
+        self::ensureKernelShutdown();
     }
 
     /**
@@ -94,12 +96,14 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
      */
     private function getActivityReasons()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
-        return self::$kernel->getContainer()
-            ->get('chill_activity.repository.reason')
-            ->findAll();
+        $managerRegistry = self::$container->get(ManagerRegistry::class);
+        $requestStack = new RequestStack();
+        $requestStack->push(new Request());
+
+        $repository = new ActivityReasonRepository($managerRegistry, $requestStack);
+
+        return $repository->findAll();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php
similarity index 79%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php
index 6b16daa99..f368e69fa 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php
@@ -9,15 +9,16 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\SentReceivedFilter;
+use Chill\ActivityBundle\Export\Filter\SentReceivedFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SentReceivedFilterTest extends AbstractFilterTest
@@ -28,7 +29,7 @@ final class SentReceivedFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.sentreceived_filter');
+        $this->filter = self::$container->get(SentReceivedFilter::class);
     }
 
     public function getFilter()
@@ -46,9 +47,7 @@ final class SentReceivedFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php
similarity index 83%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php
index fda613d2e..ef8f4c6b2 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php
@@ -9,16 +9,17 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\UserFilter;
+use Chill\ActivityBundle\Export\Filter\UserFilter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserFilterTest extends AbstractFilterTest
@@ -29,7 +30,7 @@ final class UserFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.user_filter');
+        $this->filter = self::$container->get(UserFilter::class);
     }
 
     public function getFilter()
@@ -39,12 +40,14 @@ final class UserFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(User::class, 'u')
             ->select('u')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
@@ -60,9 +63,7 @@ final class UserFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php
similarity index 80%
rename from src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php
rename to src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php
index 5742662b2..858931327 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserScopeFilterTest.php
@@ -9,16 +9,17 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\UserScopeFilter;
+use Chill\ActivityBundle\Export\Filter\UserScopeFilter;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserScopeFilterTest extends AbstractFilterTest
@@ -29,7 +30,7 @@ final class UserScopeFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.userscope_filter');
+        $this->filter = self::$container->get(UserScopeFilter::class);
     }
 
     public function getFilter()
@@ -39,19 +40,21 @@ final class UserScopeFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(Scope::class, 's')
             ->select('s')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
 
         foreach ($array as $a) {
             $data[] = [
-                'accepted_userscope' => $a,
+                'scopes' => $a,
             ];
         }
 
@@ -60,9 +63,7 @@ final class UserScopeFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
index df0a602a4..3d1b31f08 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
@@ -13,14 +13,13 @@ namespace Chill\ActivityBundle\Tests\Form;
 
 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;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityTypeTest extends KernelTestCase
@@ -30,11 +29,6 @@ final class ActivityTypeTest extends KernelTestCase
      */
     protected $center;
 
-    /**
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
-     */
-    protected $container;
-
     /**
      * @var \Symfony\Component\Form\FormBuilderInterface
      */
@@ -85,7 +79,7 @@ final class ActivityTypeTest extends KernelTestCase
         $form = $this->formBuilder
             ->add('activity', ActivityType::class, [
                 'center' => $this->center,
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+                'role' => 'CHILL_ACTIVITY_CREATE',
             ])
             ->getForm();
 
@@ -101,7 +95,7 @@ final class ActivityTypeTest extends KernelTestCase
         $form = $this->formBuilder
             ->add('activity', ActivityType::class, [
                 'center' => $this->center,
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+                'role' => 'CHILL_ACTIVITY_CREATE',
             ])
             ->getForm();
 
@@ -145,7 +139,7 @@ final class ActivityTypeTest extends KernelTestCase
     public function testFormWithActivityHavingDifferentTime()
     {
         $activity = new Activity();
-        $activity->setDurationTime(DateTime::createFromFormat('U', 60));
+        $activity->setDurationTime(\DateTime::createFromFormat('U', 60));
 
         $builder = $this->container
             ->get('form.factory')
@@ -157,7 +151,7 @@ final class ActivityTypeTest extends KernelTestCase
         $form = $builder
             ->add('activity', ActivityType::class, [
                 'center' => $this->center,
-                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+                'role' => 'CHILL_ACTIVITY_CREATE',
             ])
             ->getForm();
 
@@ -188,9 +182,7 @@ final class ActivityTypeTest extends KernelTestCase
 
         // map all the values in an array
         $values = array_map(
-            static function ($choice) {
-                return $choice->value;
-            },
+            static fn ($choice) => $choice->value,
             $view['activity']['durationTime']->vars['choices']
         );
 
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
index 3c9777051..014c3ae9f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Form\Test\TypeTestCase;
  * Test translatableActivityReason.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class TranslatableActivityReasonTest extends TypeTestCase
@@ -34,7 +35,10 @@ final class TranslatableActivityReasonTest extends TypeTestCase
         parent::setUp();
     }
 
-    public function testSimple()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testSimple(): never
     {
         $translatableActivityReasonType = new PickActivityReasonType(
             $this->getTranslatableStringHelper()
@@ -79,15 +83,13 @@ final class TranslatableActivityReasonTest extends TypeTestCase
         $request = $prophet->prophesize();
         $translator = $prophet->prophesize();
 
-        $request->willExtend('Symfony\Component\HttpFoundation\Request');
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn($fallbackLocale);
 
-        $requestStack->willExtend('Symfony\Component\HttpFoundation\RequestStack');
-        $requestStack->getCurrentRequest()->will(static function () use ($request) {
-            return $request;
-        });
+        $requestStack->willExtend(\Symfony\Component\HttpFoundation\RequestStack::class);
+        $requestStack->getCurrentRequest()->will(static fn () => $request);
 
-        $translator->willExtend('Symfony\Component\Translation\Translator');
+        $translator->willExtend(\Symfony\Component\Translation\Translator::class);
         $translator->getFallbackLocales()->willReturn($locale);
 
         return new TranslatableStringHelper(
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
index 770b88cf4..80779d909 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\Extension\Core\Type\FormType;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class TranslatableActivityTypeTest extends KernelTestCase
@@ -27,18 +28,11 @@ final class TranslatableActivityTypeTest extends KernelTestCase
      */
     protected $builder;
 
-    /**
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
-     */
-    protected $container;
-
     protected function setUp(): void
     {
         self::bootKernel();
 
-        $this->container = self::$kernel->getContainer();
-
-        $this->builder = $this->container
+        $this->builder = self::$container
             ->get('form.factory')
             ->createBuilder(FormType::class, null, [
                 'csrf_protection' => false,
@@ -89,11 +83,9 @@ final class TranslatableActivityTypeTest extends KernelTestCase
     }
 
     /**
-     * @param mixed $active
-     *
      * @return \Chill\ActivityBundle\Entity\ActivityType
      */
-    protected function getRandomType($active = true)
+    protected function getRandomType(mixed $active = true)
     {
         $types = $this->container->get('doctrine.orm.entity_manager')
             ->getRepository(ActivityType::class)
diff --git a/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityACLAwareRepositoryTest.php b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityACLAwareRepositoryTest.php
new file mode 100644
index 000000000..88eb3e7f8
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityACLAwareRepositoryTest.php
@@ -0,0 +1,326 @@
+<?php
+
+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 Chill\ActivityBundle\Tests\Repository;
+
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepository;
+use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ActivityACLAwareRepositoryTest extends KernelTestCase
+{
+    use ProphecyTrait;
+    private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser;
+
+    private CenterResolverManagerInterface $centerResolverManager;
+
+    private ActivityRepository $activityRepository;
+
+    private EntityManagerInterface $entityManager;
+
+    private Security $security;
+
+    private RequestStack $requestStack;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->authorizationHelperForCurrentUser = self::$container->get(AuthorizationHelperForCurrentUserInterface::class);
+        $this->centerResolverManager = self::$container->get(CenterResolverManagerInterface::class);
+        $this->activityRepository = self::$container->get(ActivityRepository::class);
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+        $this->security = self::$container->get(Security::class);
+
+        $this->requestStack = $requestStack = new RequestStack();
+        $request = $this->prophesize(Request::class);
+        $request->getLocale()->willReturn('fr');
+        $request->getDefaultLocale()->willReturn('fr');
+        $requestStack->push($request->reveal());
+    }
+
+    /**
+     * @dataProvider provideDataFindByAccompanyingPeriod
+     */
+    public function testFindByAccompanyingPeriod(AccompanyingPeriod $period, User $user, string $role, ?int $start = 0, ?int $limit = 1000, array $orderBy = ['date' => 'DESC'], array $filters = []): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted($role, $period)->willReturn(true);
+        $security->getUser()->willReturn($user);
+
+        $repository = new ActivityACLAwareRepository(
+            $this->authorizationHelperForCurrentUser,
+            $this->centerResolverManager,
+            $this->activityRepository,
+            $this->entityManager,
+            $security->reveal(),
+            $this->requestStack
+        );
+
+        $actual = $repository->findByAccompanyingPeriod($period, $role, $start, $limit, $orderBy, $filters);
+
+        self::assertIsArray($actual);
+    }
+
+    /**
+     * @dataProvider provideDataFindByAccompanyingPeriod
+     */
+    public function testFindActivityTypeByAccompanyingPeriod(AccompanyingPeriod $period, User $user, string $role, ?int $start = 0, ?int $limit = 1000, array $orderBy = ['date' => 'DESC'], array $filters = []): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted($role, $period)->willReturn(true);
+        $security->getUser()->willReturn($user);
+
+        $repository = new ActivityACLAwareRepository(
+            $this->authorizationHelperForCurrentUser,
+            $this->centerResolverManager,
+            $this->activityRepository,
+            $this->entityManager,
+            $security->reveal(),
+            $this->requestStack
+        );
+
+        $actual = $repository->findActivityTypeByAssociated($period);
+
+        self::assertIsArray($actual);
+    }
+
+    /**
+     * @dataProvider provideDataFindByPerson
+     */
+    public function testFindActivityTypeByPerson(Person $person, User $user, array $centers, array $scopes, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = [], array $filters = []): void
+    {
+        $role = ActivityVoter::SEE;
+        $centerResolver = $this->prophesize(CenterResolverManagerInterface::class);
+        $centerResolver->resolveCenters($person)->willReturn($centers);
+
+        $authorizationHelper = $this->prophesize(AuthorizationHelperForCurrentUserInterface::class);
+        $authorizationHelper->getReachableScopes($role, Argument::type(Center::class))
+            ->willReturn($scopes);
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted($role, Argument::type(AccompanyingPeriod::class))->willReturn(true);
+        $security->getUser()->willReturn($user);
+
+        $repository = new ActivityACLAwareRepository(
+            $authorizationHelper->reveal(),
+            $centerResolver->reveal(),
+            $this->activityRepository,
+            $this->entityManager,
+            $security->reveal(),
+            $this->requestStack
+        );
+
+        $actual = $repository->findByPerson($person, $role, $start, $limit, $orderBy, $filters);
+
+        self::assertIsArray($actual);
+    }
+
+    /**
+     * @dataProvider provideDataFindByPerson
+     */
+    public function testFindByPerson(Person $person, User $user, array $centers, array $scopes, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = [], array $filters = []): void
+    {
+        $centerResolver = $this->prophesize(CenterResolverManagerInterface::class);
+        $centerResolver->resolveCenters($person)->willReturn($centers);
+
+        $authorizationHelper = $this->prophesize(AuthorizationHelperForCurrentUserInterface::class);
+        $authorizationHelper->getReachableScopes($role, Argument::type(Center::class))
+            ->willReturn($scopes);
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted($role, Argument::type(AccompanyingPeriod::class))->willReturn(true);
+        $security->getUser()->willReturn($user);
+
+        $repository = new ActivityACLAwareRepository(
+            $authorizationHelper->reveal(),
+            $centerResolver->reveal(),
+            $this->activityRepository,
+            $this->entityManager,
+            $security->reveal(),
+            $this->requestStack
+        );
+
+        $actual = $repository->findByPerson($person, $role, $start, $limit, $orderBy, $filters);
+
+        self::assertIsArray($actual);
+    }
+
+    public function provideDataFindByPerson(): iterable
+    {
+        $this->setUp();
+
+        /** @var Person $person */
+        if (null === $person = $this->entityManager->createQueryBuilder()
+            ->select('p')->from(Person::class, 'p')->setMaxResults(1)
+            ->getQuery()->getSingleResult()) {
+            throw new \RuntimeException('person not found');
+        }
+
+        /** @var AccompanyingPeriod $period1 */
+        if (null === $period1 = $this->entityManager
+            ->createQueryBuilder()
+            ->select('a')
+            ->from(AccompanyingPeriod::class, 'a')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult()) {
+            throw new \RuntimeException('no period found');
+        }
+
+        /** @var AccompanyingPeriod $period2 */
+        if (null === $period2 = $this->entityManager
+            ->createQueryBuilder()
+            ->select('a')
+            ->from(AccompanyingPeriod::class, 'a')
+            ->where('a.id > :pid')
+            ->setParameter('pid', $period1->getId())
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult()) {
+            throw new \RuntimeException('no second period found');
+        }
+        // add a period
+        $period1->addPerson($person);
+        $period2->addPerson($person);
+        $period1->getParticipationsContainsPerson($person)->first()->setEndDate(
+            (new \DateTime('now'))->add(new \DateInterval('P1M'))
+        );
+
+        if ([] === $types = $this->entityManager
+            ->createQueryBuilder()
+            ->select('t')
+            ->from(ActivityType::class, 't')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult()) {
+            throw new \RuntimeException('no types');
+        }
+
+        if ([] === $jobs = $this->entityManager
+            ->createQueryBuilder()
+            ->select('j')
+            ->from(UserJob::class, 'j')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult()
+        ) {
+            throw new \RuntimeException('no jobs found');
+        }
+
+        if (null === $user = $this->entityManager
+            ->createQueryBuilder()
+            ->select('u')
+            ->from(User::class, 'u')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult()
+        ) {
+            throw new \RuntimeException('no user found');
+        }
+
+        if ([] === $centers = $this->entityManager->createQueryBuilder()
+            ->select('c')->from(Center::class, 'c')->setMaxResults(2)->getQuery()
+            ->getResult()) {
+            throw new \RuntimeException('no centers found');
+        }
+
+        if ([] === $scopes = $this->entityManager->createQueryBuilder()
+            ->select('s')->from(Scope::class, 's')->setMaxResults(2)->getQuery()
+            ->getResult()) {
+            throw new \RuntimeException('no scopes found');
+        }
+
+        yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], []];
+        yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['my_activities' => true]];
+        yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['types' => $types]];
+        yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['jobs' => $jobs]];
+        yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago')]];
+        yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['before' => new \DateTimeImmutable('1 year ago')]];
+        yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago'), 'before' => new \DateTimeImmutable('1 month ago')]];
+    }
+
+    public function provideDataFindByAccompanyingPeriod(): iterable
+    {
+        $this->setUp();
+
+        if (null === $period = $this->entityManager
+            ->createQueryBuilder()
+            ->select('a')
+            ->from(AccompanyingPeriod::class, 'a')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult()) {
+            throw new \RuntimeException('no period found');
+        }
+
+        if ([] === $types = $this->entityManager
+            ->createQueryBuilder()
+            ->select('t')
+            ->from(ActivityType::class, 't')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult()) {
+            throw new \RuntimeException('no types');
+        }
+
+        if ([] === $jobs = $this->entityManager
+            ->createQueryBuilder()
+            ->select('j')
+            ->from(UserJob::class, 'j')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult()
+        ) {
+            throw new \RuntimeException('no jobs found');
+        }
+
+        if (null === $user = $this->entityManager
+            ->createQueryBuilder()
+            ->select('u')
+            ->from(User::class, 'u')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult()
+        ) {
+            throw new \RuntimeException('no user found');
+        }
+
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], []];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['my_activities' => true]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['types' => $types]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['jobs' => $jobs]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago')]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['before' => new \DateTimeImmutable('1 year ago')]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago'), 'before' => new \DateTimeImmutable('1 month ago')]];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php
new file mode 100644
index 000000000..c32714641
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Tests/Repository/ActivityDocumentACLAwareRepositoryTest.php
@@ -0,0 +1,125 @@
+<?php
+
+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 Chill\ActivityBundle\Tests\Repository;
+
+use Chill\ActivityBundle\Repository\ActivityDocumentACLAwareRepository;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ActivityDocumentACLAwareRepositoryTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private EntityManagerInterface $entityManager;
+
+    private CenterResolverManagerInterface $centerResolverManager;
+
+    private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser;
+
+    private Security $security;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+        $this->centerResolverManager = self::$container->get(CenterResolverManagerInterface::class);
+        $this->authorizationHelperForCurrentUser = self::$container->get(AuthorizationHelperForCurrentUserInterface::class);
+        $this->security = self::$container->get(Security::class);
+    }
+
+    /**
+     * @dataProvider provideDataForPerson
+     */
+    public function testBuildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, array $reachableScopes, bool $_unused, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): void
+    {
+        $authorizationHelper = $this->prophesize(AuthorizationHelperForCurrentUserInterface::class);
+        $authorizationHelper->getReachableScopes(ActivityVoter::SEE, Argument::any())
+            ->willReturn($reachableScopes);
+
+        $repository = new ActivityDocumentACLAwareRepository(
+            $this->entityManager,
+            $this->centerResolverManager,
+            $authorizationHelper->reveal(),
+            $this->security
+        );
+
+        $query = $repository->buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext($person, $startDate, $endDate, $content);
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()->fetchOne("SELECT COUNT(*) FROM ({$sql}) sq", $params, $types);
+
+        self::assertIsInt($nb);
+    }
+
+    /**
+     * @dataProvider provideDataForPerson
+     */
+    public function testBuildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, array $_unused, bool $canSeePeriod, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted(ActivityVoter::SEE, Argument::type(AccompanyingPeriod::class))
+            ->willReturn($canSeePeriod);
+
+        $repository = new ActivityDocumentACLAwareRepository(
+            $this->entityManager,
+            $this->centerResolverManager,
+            $this->authorizationHelperForCurrentUser,
+            $security->reveal()
+        );
+
+        $query = $repository->buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext($person, $startDate, $endDate, $content);
+
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()->fetchOne("SELECT COUNT(*) FROM ({$sql}) sq", $params, $types);
+
+        self::assertIsInt($nb);
+    }
+
+    public function provideDataForPerson(): iterable
+    {
+        $this->setUp();
+
+        if (null === $person = $this->entityManager->createQuery('SELECT p FROM '.Person::class.' p WHERE SIZE(p.accompanyingPeriodParticipations) > 0 ')
+            ->setMaxResults(1)
+            ->getSingleResult()) {
+            throw new \RuntimeException('no person in dtabase');
+        }
+
+        if ([] === $scopes = $this->entityManager->createQuery('SELECT s FROM '.Scope::class.' s ')->setMaxResults(5)->getResult()) {
+            throw new \RuntimeException('no scopes in database');
+        }
+
+        yield [$person, [], true, null, null, null];
+        yield [$person, $scopes, true, null, null, null];
+        yield [$person, $scopes, true, new \DateTimeImmutable('1 month ago'), null, null];
+        yield [$person, $scopes, true, new \DateTimeImmutable('1 month ago'), new \DateTimeImmutable('1 week ago'), null];
+        yield [$person, $scopes, true, new \DateTimeImmutable('1 month ago'), new \DateTimeImmutable('1 week ago'), 'content'];
+        yield [$person, $scopes, true, null, new \DateTimeImmutable('1 week ago'), 'content'];
+        yield [$person, [], true, new \DateTimeImmutable('1 month ago'), new \DateTimeImmutable('1 week ago'), 'content'];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
index a9b9e2ec7..b907363a3 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActivityVoterTest extends KernelTestCase
@@ -127,7 +128,7 @@ final class ActivityVoterTest extends KernelTestCase
     /**
      * @dataProvider dataProvider_testVoteAction
      *
-     * @param type $expectedResult
+     * @param type   $expectedResult
      * @param string $attribute
      * @param string $message
      */
@@ -156,11 +157,11 @@ final class ActivityVoterTest extends KernelTestCase
      *
      * @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');
+            ->willImplement('\\'.\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
 
         if (null === $user) {
             $token->getUser()->willReturn(null);
diff --git a/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
index 664196ad4..b7796c9ba 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
@@ -15,11 +15,15 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class TimelineProviderTest extends WebTestCase
 {
-    public function testAnActivityIsShownOnTimeline()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testAnActivityIsShownOnTimeline(): never
     {
         $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 dad597676..23a75e9fe 100644
--- a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+++ b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
@@ -19,40 +19,23 @@ 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 Symfony\Component\Security\Core\User\UserInterface;
 
-use function implode;
-use function in_array;
-use function strtr;
-
 class TimelineActivityProvider implements TimelineProviderInterface
 {
     private const SUPPORTED_CONTEXTS = ['center', 'person'];
 
-    protected ActivityACLAwareRepository $aclAwareRepository;
-
-    protected EntityManagerInterface $em;
-
-    protected AuthorizationHelperInterface $helper;
-
     protected UserInterface $user;
 
     public function __construct(
-        EntityManagerInterface $em,
-        AuthorizationHelperInterface $helper,
+        protected EntityManagerInterface $em,
+        protected AuthorizationHelperInterface $helper,
         TokenStorageInterface $storage,
-        ActivityACLAwareRepository $aclAwareRepository
+        protected ActivityACLAwareRepository $aclAwareRepository
     ) {
-        $this->em = $em;
-        $this->helper = $helper;
-        $this->aclAwareRepository = $aclAwareRepository;
-
         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();
@@ -71,10 +54,10 @@ class TimelineActivityProvider implements TimelineProviderInterface
 
         return TimelineSingleQuery::fromArray([
             'id' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('id'),
+                 .'.'.$metadataActivity->getColumnName('id'),
             'type' => 'activity',
             'date' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('date'),
+                 .'.'.$metadataActivity->getColumnName('date'),
             'FROM' => $this->getFromClausePerson(),
             'WHERE' => $where,
             'parameters' => $parameters,
@@ -100,7 +83,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
         $this->checkContext($context);
 
         return [
-            'template' => 'ChillActivityBundle:Timeline:activity_person_context.html.twig',
+            'template' => '@ChillActivity/Timeline/activity_person_context.html.twig',
             'template_data' => [
                 'activity' => $entity,
                 'context' => $context,
@@ -116,17 +99,12 @@ class TimelineActivityProvider implements TimelineProviderInterface
     /**
      * Check if the context is supported.
      *
-     * @throws LogicException if the context is not 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
-                )
-            );
+        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));
         }
     }
 
@@ -151,8 +129,8 @@ class TimelineActivityProvider implements TimelineProviderInterface
         $parameters = [];
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
-        $role = new Role('CHILL_ACTIVITY_SEE');
-        $reachableScopes = $this->helper->getReachableScopes($this->user, $role->getRole(), $person->getCenter());
+        $role = 'CHILL_ACTIVITY_SEE';
+        $reachableScopes = $this->helper->getReachableScopes($this->user, $role, $person->getCenter());
         $whereClause = ' {activity.person_id} = ? AND {activity.scope_id} IN ({scopes_ids}) ';
         $scopes_ids = [];
 
@@ -161,7 +139,8 @@ class TimelineActivityProvider implements TimelineProviderInterface
 
         // loop on reachable scopes
         foreach ($reachableScopes as $scope) {
-            if (in_array($scope->getId(), $scopes_ids, true)) {
+            /* @phpstan-ignore-next-line */
+            if (\in_array($scope->getId(), $scopes_ids, true)) {
                 continue;
             }
             $scopes_ids[] = '?';
@@ -169,13 +148,13 @@ class TimelineActivityProvider implements TimelineProviderInterface
         }
 
         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,
diff --git a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
index 393b33322..aafe5f9b5 100644
--- a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
+++ b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
@@ -18,9 +18,9 @@ use Symfony\Component\Validator\Constraint;
  */
 class ActivityValidity extends Constraint
 {
-    public const IS_REQUIRED_MESSAGE = ' is required';
+    final public const IS_REQUIRED_MESSAGE = ' is required';
 
-    public const ROOT_MESSAGE = 'For this type of activity, ';
+    final public const ROOT_MESSAGE = 'For this type of activity, ';
 
     public $noPersonsMessage = 'For this type of activity, you must add at least one person';
 
@@ -39,6 +39,6 @@ class ActivityValidity extends Constraint
 
     public function makeIsRequiredMessage(string $property)
     {
-        return self::ROOT_MESSAGE . $property . self::IS_REQUIRED_MESSAGE;
+        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
index 11b4b61e0..21ee6185e 100644
--- a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
+++ b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
@@ -18,9 +18,6 @@ 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)
@@ -33,106 +30,106 @@ class ActivityValidityValidator extends ConstraintValidator
             throw new UnexpectedValueException($activity, Activity::class);
         }
 
-        if ($activity->getActivityType()->getPersonsVisible() === 2 && count($activity->getPersons()) === 0) {
+        if (2 === $activity->getActivityType()->getPersonsVisible() && 0 === \count($activity->getPersons())) {
             $this->context
                 ->buildViolation($constraint->noPersonsMessage)
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getUsersVisible() === 2 && count($activity->getUsers()) === 0) {
+        if (2 === $activity->getActivityType()->getUsersVisible() && 0 === \count($activity->getUsers())) {
             $this->context
                 ->buildViolation($constraint->noUsersMessage)
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getThirdPartiesVisible() === 2 && count($activity->getThirdParties()) === 0) {
+        if (2 === $activity->getActivityType()->getThirdPartiesVisible() && 0 === \count($activity->getThirdParties())) {
             $this->context
                 ->buildViolation($constraint->noThirdPartiesMessage)
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getUserVisible() === 2 && null === $activity->getUser()) {
+        if (2 === $activity->getActivityType()->getUserVisible() && null === $activity->getUser()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('user'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getDateVisible() === 2 && null === $activity->getDate()) {
+        if (2 === $activity->getActivityType()->getDateVisible() && null === $activity->getDate()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('date'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getLocationVisible() === 2 && null === $activity->getLocation()) {
+        if (2 === $activity->getActivityType()->getLocationVisible() && null === $activity->getLocation()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('location'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getDurationTimeVisible() === 2 && null === $activity->getDurationTime()) {
+        if (2 === $activity->getActivityType()->getDurationTimeVisible() && null === $activity->getDurationTime()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('duration time'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getTravelTimeVisible() === 2 && null === $activity->getTravelTime()) {
+        if (2 === $activity->getActivityType()->getTravelTimeVisible() && null === $activity->getTravelTime()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('travel time'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getAttendeeVisible() === 2 && null === $activity->getAttendee()) {
+        if (2 === $activity->getActivityType()->getAttendeeVisible() && null === $activity->getAttendee()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('attendee'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getReasonsVisible() === 2 && null === $activity->getReasons()) {
+        if (2 === $activity->getActivityType()->getReasonsVisible() && null === $activity->getReasons()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('reasons'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getCommentVisible() === 2 && null === $activity->getComment()) {
+        if (2 === $activity->getActivityType()->getCommentVisible() && null === $activity->getComment()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('comment'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getSentReceivedVisible() === 2 && null === $activity->getSentReceived()) {
+        if (2 === $activity->getActivityType()->getSentReceivedVisible() && null === $activity->getSentReceived()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('sent/received'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getDocumentsVisible() === 2 && null === $activity->getDocuments()) {
+        if (2 === $activity->getActivityType()->getDocumentsVisible() && null === $activity->getDocuments()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('document'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getEmergencyVisible() === 2 && null === $activity->getEmergency()) {
+        if (2 === $activity->getActivityType()->getEmergencyVisible() && null === $activity->getEmergency()) {
             $this->context
                 ->buildViolation($constraint->makeIsRequiredMessage('emergency'))
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getSocialIssuesVisible() === 2 && $activity->getSocialIssues()->count() === 0) {
+        if (2 === $activity->getActivityType()->getSocialIssuesVisible() && 0 === $activity->getSocialIssues()->count()) {
             $this->context
                 ->buildViolation($constraint->socialIssuesMessage)
                 ->addViolation();
         }
 
-        if ($activity->getActivityType()->getSocialActionsVisible() === 2 && $activity->getSocialActions()->count() === 0) {
+        if (2 === $activity->getActivityType()->getSocialActionsVisible() && 0 === $activity->getSocialActions()->count()) {
             // check if a social action may be added
             $actions = [];
 
             foreach ($activity->getSocialIssues() as $socialIssue) {
                 /** @var SocialIssue $socialIssue */
-                $actions = array_merge($actions, $socialIssue->getRecursiveSocialActions()->toArray());
+                $actions = \array_merge($actions, $socialIssue->getRecursiveSocialActions()->toArray());
             }
 
-            if (0 < count($actions)) {
+            if (0 < \count($actions)) {
                 $this->context
                     ->buildViolation($constraint->socialActionsMessage)
                     ->addViolation();
diff --git a/src/Bundle/ChillActivityBundle/config/routes.yaml b/src/Bundle/ChillActivityBundle/config/routes.yaml
index d20f47013..e5539c753 100644
--- a/src/Bundle/ChillActivityBundle/config/routes.yaml
+++ b/src/Bundle/ChillActivityBundle/config/routes.yaml
@@ -1,22 +1,6 @@
-chill_activity_activity:
-    resource: "@ChillActivityBundle/config/routes/activity.yaml"
-    prefix:   /
-
-chill_activity_activityreason:
-    resource: "@ChillActivityBundle/config/routes/activityreason.yaml"
-    prefix:   /
-
-chill_activity_activityreasoncategory:
-    resource: "@ChillActivityBundle/config/routes/activityreasoncategory.yaml"
-    prefix:   /
-
-chill_activity_admin_index:
-    path:     /{_locale}/admin/activity
-    controller: Chill\ActivityBundle\Controller\AdminController::indexActivityAction
-
-chill_admin_activity_redirect_to_admin_index:
-    path:     /{_locale}/admin/activity_redirect_to_main
-    controller: Chill\ActivityBundle\Controller\AdminController::redirectToAdminIndexAction
+chill_activity_routes:
+    resource: '@ChillActivityBundle/Controller'
+    type: annotation
 
 chill_activity_type_admin:
     path:     /{_locale}/admin/activity/type
diff --git a/src/Bundle/ChillActivityBundle/config/routes/activity.yaml b/src/Bundle/ChillActivityBundle/config/routes/activity.yaml
deleted file mode 100644
index 179de905b..000000000
--- a/src/Bundle/ChillActivityBundle/config/routes/activity.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-chill_activity_activity_list:
-    path:     /{_locale}/activity/
-    controller: Chill\ActivityBundle\Controller\ActivityController::listAction
-
-chill_activity_activity_show:
-    path:     /{_locale}/activity/{id}/show
-    controller: Chill\ActivityBundle\Controller\ActivityController::showAction
-
-chill_activity_activity_select_type:
-    path:     /{_locale}/activity/select-type
-    controller: Chill\ActivityBundle\Controller\ActivityController::selectTypeAction
-
-chill_activity_activity_new:
-    path:     /{_locale}/activity/new
-    controller: Chill\ActivityBundle\Controller\ActivityController::newAction
-    methods:  [POST, GET]
-
-chill_activity_activity_edit:
-    path:     /{_locale}/activity/{id}/edit
-    controller: Chill\ActivityBundle\Controller\ActivityController::editAction
-    methods:  [GET, POST, PUT]
-
-chill_activity_activity_delete:
-    path:     /{_locale}/activity/{id}/delete
-    controller: Chill\ActivityBundle\Controller\ActivityController::deleteAction
-    methods:  [GET, POST, DELETE]
diff --git a/src/Bundle/ChillActivityBundle/config/routes/activityreason.yaml b/src/Bundle/ChillActivityBundle/config/routes/activityreason.yaml
deleted file mode 100644
index 59473d9f0..000000000
--- a/src/Bundle/ChillActivityBundle/config/routes/activityreason.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-chill_activity_activityreason:
-    path:     /{_locale}/admin/activityreason/
-    controller: Chill\ActivityBundle\Controller\ActivityReasonController::indexAction
-
-chill_activity_activityreason_show:
-    path:     /{_locale}/admin/activityreason/{id}/show
-    controller: Chill\ActivityBundle\Controller\ActivityReasonController::showAction
-
-chill_activity_activityreason_new:
-    path:     /{_locale}/admin/activityreason/new
-    controller: Chill\ActivityBundle\Controller\ActivityReasonController::newAction
-
-chill_activity_activityreason_create:
-    path:     /{_locale}/admin/activityreason/create
-    controller: Chill\ActivityBundle\Controller\ActivityReasonController::createAction
-    methods:  POST
-
-chill_activity_activityreason_edit:
-    path:     /{_locale}/admin/activityreason/{id}/edit
-    controller: Chill\ActivityBundle\Controller\ActivityReasonController::editAction
-
-chill_activity_activityreason_update:
-    path:     /{_locale}/admin/activityreason/{id}/update
-    controller: Chill\ActivityBundle\Controller\ActivityReasonController::updateAction
-    methods:  [POST, PUT]
-
-chill_activity_activityreason_delete:
-    path:     /{_locale}/admin/activityreason/{id}/delete
-    controller: Chill\ActivityBundle\Controller\ActivityReasonController::deleteAction
-    methods:  [POST, DELETE]
diff --git a/src/Bundle/ChillActivityBundle/config/routes/activityreasoncategory.yaml b/src/Bundle/ChillActivityBundle/config/routes/activityreasoncategory.yaml
deleted file mode 100644
index 1487a1e24..000000000
--- a/src/Bundle/ChillActivityBundle/config/routes/activityreasoncategory.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-chill_activity_activityreasoncategory:
-    path:     /{_locale}/admin/activityreasoncategory/
-    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::indexAction
-
-chill_activity_activityreasoncategory_show:
-    path:     /{_locale}/admin/activityreasoncategory/{id}/show
-    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::showAction
-
-chill_activity_activityreasoncategory_new:
-    path:     /{_locale}/admin/activityreasoncategory/new
-    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::newAction
-
-chill_activity_activityreasoncategory_create:
-    path:     /{_locale}/admin/activityreasoncategory/create
-    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::createAction
-    methods:  POST
-
-chill_activity_activityreasoncategory_edit:
-    path:     /{_locale}/admin/activityreasoncategory/{id}/edit
-    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::editAction
-
-chill_activity_activityreasoncategory_update:
-    path:     /{_locale}/admin/activityreasoncategory/{id}/update
-    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::updateAction
-    methods:  [POST, PUT]
-
-chill_activity_activityreasoncategory_delete:
-    path:     /{_locale}/admin/activityreasoncategory/{id}/delete
-    controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::deleteAction
-    methods:  [POST, DELETE]
diff --git a/src/Bundle/ChillActivityBundle/config/services.yaml b/src/Bundle/ChillActivityBundle/config/services.yaml
index 23f00ed4e..18be76ec9 100644
--- a/src/Bundle/ChillActivityBundle/config/services.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services.yaml
@@ -34,6 +34,10 @@ services:
         resource: '../Validator/Constraints/'
 
     Chill\ActivityBundle\Service\DocGenerator\:
-        autowire: true
-        autoconfigure: true
         resource: '../Service/DocGenerator/'
+
+    Chill\ActivityBundle\Service\EntityInfo\:
+        resource: '../Service/EntityInfo/'
+
+    Chill\ActivityBundle\Service\GenericDoc\:
+        resource: '../Service/GenericDoc/'
diff --git a/src/Bundle/ChillActivityBundle/config/services/export.yaml b/src/Bundle/ChillActivityBundle/config/services/export.yaml
index 09817d80e..09a5227eb 100644
--- a/src/Bundle/ChillActivityBundle/config/services/export.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/export.yaml
@@ -53,8 +53,7 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'activity_type_filter' }
 
-    chill.activity.export.date_filter:
-        class: Chill\ActivityBundle\Export\Filter\ActivityDateFilter
+    Chill\ActivityBundle\Export\Filter\ActivityDateFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_date_filter' }
 
@@ -74,52 +73,43 @@ services:
                 name: chill.export_filter
                 alias: 'activity_person_having_ac_bw_date_filter'
 
-    chill.activity.export.filter_activitytype:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter
+    Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter:
         tags:
             - { name: chill.export_filter, alias: 'accompanyingcourse_activitytype_filter' }
 
-    chill.activity.export.location_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationFilter
+    Chill\ActivityBundle\Export\Filter\LocationFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_location_filter' }
 
-    chill.activity.export.locationtype_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter
+    Chill\ActivityBundle\Export\Filter\LocationTypeFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_locationtype_filter' }
 
-    Chill\ActivityBundle\Export\Filter\ACPFilters\ByCreatorFilter:
+    Chill\ActivityBundle\Export\Filter\ByCreatorFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_bycreator_filter' }
 
-    chill.activity.export.emergency_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\EmergencyFilter
+    Chill\ActivityBundle\Export\Filter\EmergencyFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_emergency_filter' }
 
-    chill.activity.export.sentreceived_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\SentReceivedFilter
+    Chill\ActivityBundle\Export\Filter\SentReceivedFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_sentreceived_filter' }
 
-    chill.activity.export.bysocialaction_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter
+    Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_bysocialaction_filter' }
 
-    chill.activity.export.bysocialissue_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter
+    Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_bysocialissue_filter' }
 
-    chill.activity.export.user_filter: # Creator (M2O)
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\UserFilter
+    Chill\ActivityBundle\Export\Filter\UserFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_user_filter' }
 
-    chill.activity.export.userscope_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\UserScopeFilter
+    Chill\ActivityBundle\Export\Filter\UserScopeFilter:
         tags:
             - { name: chill.export_filter, alias: 'activity_userscope_filter' }
 
@@ -135,6 +125,10 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'accompanyingcourse_has_no_activity_filter' }
 
+    Chill\ActivityBundle\Export\Filter\ACPFilters\PeriodHavingActivityBetweenDatesFilter:
+        tags:
+            - { name: chill.export_filter, alias: 'period_having_activity_betw_dates_filter' }
+
     ## Aggregators
     Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator:
         tags:
@@ -144,27 +138,28 @@ services:
         tags:
             - { name: chill.export_aggregator, alias: activity_common_type_aggregator }
 
+    Chill\ActivityBundle\Export\Aggregator\ActivityLocationAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: activity_common_location_aggregator }
+
     chill.activity.export.user_aggregator:
         class: Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
         tags:
             - { name: chill.export_aggregator, alias: activity_user_aggregator }
 
-    chill.activity.export.locationtype_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\LocationTypeAggregator
+    Chill\ActivityBundle\Export\Aggregator\LocationTypeAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_locationtype_aggregator }
 
-    chill.activity.export.date_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\DateAggregator
+    Chill\ActivityBundle\Export\Aggregator\DateAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_date_aggregator }
 
-    Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByCreatorAggregator:
+    Chill\ActivityBundle\Export\Aggregator\ByCreatorAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_by_creator_aggregator }
 
-    chill.activity.export.bythirdparty_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator
+    Chill\ActivityBundle\Export\Aggregator\ByThirdpartyAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_bythirdparty_aggregator }
 
@@ -178,10 +173,14 @@ services:
         tags:
             - { name: chill.export_aggregator, alias: activity_bysocialissue_aggregator }
 
-    Chill\ActivityBundle\Export\Aggregator\ACPAggregators\CreatorScopeAggregator:
+    Chill\ActivityBundle\Export\Aggregator\CreatorScopeAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_creator_scope_aggregator }
 
+    Chill\ActivityBundle\Export\Aggregator\JobScopeAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: activity_creator_job_aggregator }
+
     Chill\ActivityBundle\Export\Aggregator\ActivityUsersAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_users_aggregator }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php b/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
index f96762748..5a050035a 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
@@ -22,7 +22,7 @@ class Version20150701091248 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -40,7 +40,7 @@ class Version20150701091248 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php b/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
index f8dc40e95..053e4ecc8 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
@@ -22,7 +22,7 @@ class Version20150702093317 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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;');
@@ -35,7 +35,7 @@ class Version20150702093317 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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;');
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php b/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
index 6509701cc..78204fa67 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
@@ -22,7 +22,7 @@ class Version20150704091347 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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;');
@@ -31,7 +31,7 @@ class Version20150704091347 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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 1531230c1..ceb0e59e6 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
@@ -25,14 +25,14 @@ class Version20160222103457 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             '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 '
-                . 'fk_55026b0c59bb1592 FOREIGN KEY (reason_id) '
-                . 'REFERENCES activityreason (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'fk_55026b0c59bb1592 FOREIGN KEY (reason_id) '
+                .'REFERENCES activityreason (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX idx_55026b0c59bb1592 ON Activity (reason_id)');
 
         // try to keep at least on activity reason...
@@ -52,29 +52,29 @@ class Version20160222103457 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             '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))'
+                .'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');
+                .'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');
+                .'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');
+                .'SELECT id, reason_id FROM activity WHERE reason_id IS NOT NULL');
 
         // remove old column
         $this->addSql('ALTER TABLE activity DROP CONSTRAINT fk_55026b0c59bb1592');
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php b/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
index ec321faa7..9be59b2b9 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
@@ -14,8 +14,6 @@ namespace Chill\Migrations\Activity;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-use function count;
-
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
@@ -49,8 +47,8 @@ final class Version20210422073711 extends AbstractMigration
             '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)");
+        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');
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php b/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
index 18711bad0..110ca24b2 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
@@ -58,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');
 
diff --git a/src/Bundle/ChillActivityBundle/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages+intl-icu.fr.yml
new file mode 100644
index 000000000..7c02e29c6
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/translations/messages+intl-icu.fr.yml
@@ -0,0 +1,11 @@
+export:
+    filter:
+        activity:
+            course_having_activity_between_date:
+                Only course having an activity between from and to: Seulement les parcours ayant reçu au moins un échange entre le {from, date, short} et le {to, date, short}
+        person_between_dates:
+            describe_action_with_no_subject: >-
+                Filtré par personne ayant eu un échange entre le {date_from, date} et le {date_to, date}
+            describe_action_with_subject: >-
+                Filtré par personne ayant eu un échange entre le {date_from, date} et le {date_to, date}, et un de ces sujets choisis: {reasons}
+
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 042fccc69..123a0d075 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -83,12 +83,20 @@ Third persons: Tiers non-pro.
 Others persons: Usagers
 Third parties: Tiers professionnels
 Users concerned: T(M)S
+
 activity:
+    date: Date de l'échange
     Insert a document: Insérer un document
     Remove a document: Supprimer le document
     comment: Commentaire
 No documents: Aucun document
 
+# activity filter in list page
+activity_filter:
+    My activities: Mes échanges (où j'interviens)
+    Types: Par type d'échange
+    Jobs: Par métier impliqué
+
 #timeline
 '%user% has done an %activity_type%': '%user% a effectué un échange de type "%activity_type%"'
 
@@ -247,11 +255,6 @@ Activities before this date: Échanges avant cette date
 "Filtered by date of activity: only between %date_from% and %date_to%": "Filtré par date de l'échange: uniquement entre %date_from% et %date_to%"
 This date should be after the date given in "Implied in an activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "échanges après cette date"
 
-Filtered by person having an activity in a period: Uniquement les usagers ayant eu un échange dans la période donnée
-Implied in an activity after this date: Impliqué dans un échange après cette date
-Implied in an activity before this date: Impliqué dans un échange avant cette date
-Filtered by person having an activity between %date_from% and %date_to% with reasons %reasons_name%: Filtré par usager associées à un échange entre %date_from% et %date_to% avec les sujets %reasons_name%
-Activity reasons for those activities: Sujets de ces échanges
 
 Filter by activity type: Filtrer les échanges par type
 
@@ -279,8 +282,6 @@ Filter activity by creator: Filtrer les échanges par créateur de l'échange
 'Filtered activity by users: only %users%': "Filtré par utilisateurs participants: uniquement %users%"
 'Filtered activity by creator: only %users%': "Filtré par créateur: uniquement %users%"
 Creators: Créateurs
-Filter activity by userscope: Filtrer les échanges par service du créateur
-'Filtered activity by userscope: only %scopes%': "Filtré par service du créateur: uniquement %scopes%"
 Accepted userscope: Services
 
 Filter acp which has no activity: Filtrer les parcours qui n’ont pas d’échange
@@ -298,10 +299,6 @@ Aggregate by activity user: Grouper les échanges par référent
 Aggregate by activity users: Grouper les échanges par utilisateurs participants
 Aggregate by activity type: Grouper les échanges par type
 Aggregate by activity reason: Grouper les échanges par sujet
-Aggregate by users scope: Grouper les échanges par service principal de l'utilisateur
-Users 's scope: Service principal des utilisateurs participants à l'échange
-Aggregate by users job: Grouper les échanges par métier des utilisateurs participants
-Users 's job: Métier des utilisateurs participants à l'échange
 
 Group activity by locationtype: Grouper les échanges par type de localisation
 Group activity by date: Grouper les échanges par date
@@ -312,7 +309,6 @@ for week: Semaine
 by year: Par année
 in year: En
 Group activity by creator: Grouper les échanges par créateur de l'échange
-Group activity by creator scope: Grouper les échanges par service du créateur de l'échange
 Group activity by linked thirdparties: Grouper les échanges par tiers impliqué
 Accepted thirdparty: Tiers impliqué
 Group activity by linked socialaction: Grouper les échanges par action liée
@@ -359,12 +355,29 @@ export:
 
     filter:
         activity:
-            by_usersjob:
+            by_users_job:
                 Filter by users job: Filtrer les échanges par métier d'au moins un utilisateur participant
                 'Filtered activity by users job: only %jobs%': 'Filtré par métier d''au moins un utilisateur participant: seulement %jobs%'
-            by_usersscope:
+            by_users_scope:
                 Filter by users scope: Filtrer les échanges par services d'au moins un utilisateur participant
                 'Filtered activity by users scope: only %scopes%': 'Filtré par service d''au moins un utilisateur participant: seulement %scopes%'
+            course_having_activity_between_date:
+                Title: Filtre les parcours ayant reçu un échange entre deux dates
+                Receiving an activity after: Ayant reçu un échange après le
+                Receiving an activity before: Ayant reçu un échange avant le
+            acp_by_activity_type:
+                'acp_containing_at_least_one_%activitytypes%': 'Parcours filtrés: uniquement ceux qui contiennent au moins un échange d''un des types suivants: %activitytypes%'
+            person_between_dates:
+                Implied in an activity after this date: Impliqué dans un échange après cette date
+                Implied in an activity before this date: Impliqué dans un échange avant cette date
+                Activity reasons for those activities: Sujets de ces échanges
+                if no reasons: Si aucun sujet n'est coché, tous les sujets seront pris en compte
+                title: Filtrer les personnes ayant été associés à un échange au cours de la période
+                date mismatch: La date de fin de la période doit être supérieure à la date du début
+            by_creator_scope:
+                Filter activity by user scope: Filtrer les échanges par service du créateur de l'échange
+                'Filtered activity by user scope: only %scopes%': "Filtré par service du créateur: uniquement %scopes%"
+
     aggregator:
         activity:
             by_sent_received:
@@ -372,3 +385,23 @@ export:
                 is sent: envoyé
                 is received: reçu
                 Group activity by sentreceived: Grouper les échanges par envoyé / reçu
+            by_location:
+                Activity Location: Localisation de l'échange
+                Title: Grouper les échanges par localisation de l'échange
+            by_user_job:
+                Users 's job: Métier des utilisateurs participants à l'échange
+                Aggregate by users job: Grouper les échanges par métier des utilisateurs participants
+            by_user_scope:
+                Users 's scope: Service principal des utilisateurs participants à l'échange
+                Aggregate by users scope: Grouper les échanges par service principal de l'utilisateur
+            by_creator_scope:
+                Group activity by creator scope: Grouper les échanges par service du créateur de l'échange
+                Calc date: Date de calcul du service du créateur de l'échange
+            by_creator_job:
+                Group activity by creator job: Grouper les échanges par service du créateur de l'échange
+                Calc date: Date de calcul du service du créateur de l'échange
+
+generic_doc:
+    filter:
+        keys:
+            accompanying_period_activity_document: Document des échanges des parcours
diff --git a/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php b/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
index 6917517b7..b0951e502 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
@@ -13,6 +13,4 @@ namespace Chill\AsideActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class ChillAsideActivityBundle extends Bundle
-{
-}
+class ChillAsideActivityBundle extends Bundle {}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
index 9144bb129..cbf0ba9ec 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
@@ -24,6 +24,6 @@ class AdminController extends AbstractController
      */
     public function indexAdminAction()
     {
-        return $this->render('ChillAsideActivityBundle:Admin:index.html.twig');
+        return $this->render('@ChillAsideActivity/Admin/index.html.twig');
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
index 009a9f2c8..602ef1204 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
@@ -23,7 +23,7 @@ class AsideActivityCategoryController extends CRUDController
 {
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var QueryBuilder $query */
+        /* @var QueryBuilder $query */
         $query->addOrderBy('e.ordering', 'ASC');
 
         return $query;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
index 8481f24eb..c29a5a6dc 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
@@ -16,26 +16,21 @@ use Chill\AsideActivityBundle\Repository\AsideActivityCategoryRepository;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
-use DateTime;
 use Symfony\Component\HttpFoundation\Request;
 
 final class AsideActivityController extends CRUDController
 {
-    private AsideActivityCategoryRepository $categoryRepository;
-
-    public function __construct(AsideActivityCategoryRepository $categoryRepository)
-    {
-        $this->categoryRepository = $categoryRepository;
-    }
+    public function __construct(private readonly AsideActivityCategoryRepository $categoryRepository) {}
 
     public function createEntity(string $action, Request $request): object
     {
         $asideActivity = new AsideActivity();
 
         $asideActivity->setAgent($this->getUser());
+        $asideActivity->setLocation($this->getUser()->getCurrentLocation());
 
         $duration = $request->query->get('duration', '300');
-        $duration = DateTime::createFromFormat('U', $duration);
+        $duration = \DateTime::createFromFormat('U', $duration);
         $asideActivity->setDuration($duration);
 
         $categoryId = $request->query->get('type', 7);
@@ -52,7 +47,7 @@ final class AsideActivityController extends CRUDController
         return $asideActivity;
     }
 
-    protected function buildQueryEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null)
+    protected function buildQueryEntities(string $action, Request $request, FilterOrderHelper $filterOrder = null)
     {
         $qb = parent::buildQueryEntities($action, $request);
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
index 6f6a11390..12c82be00 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
@@ -14,22 +14,13 @@ 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
 {
-    private UserRepository $userRepository;
-
-    public function __construct(UserRepository $userRepository)
-    {
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly UserRepository $userRepository) {}
 
     public function getDependencies(): array
     {
@@ -47,15 +38,15 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
             $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 1d15adbc1..3e6b4247a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
@@ -27,7 +27,7 @@ class LoadAsideActivityCategory extends \Doctrine\Bundle\FixturesBundle\Fixture
             $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 927de1845..056f29ba1 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
@@ -26,7 +26,7 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
 
         $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');
@@ -100,7 +100,7 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
 
     protected function prependRoute(ContainerBuilder $container)
     {
-        //declare routes for task bundle
+        // declare routes for task bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
index d01998358..241a545a8 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
@@ -14,15 +14,13 @@ 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
 {
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_aside_activity');
 
-        $treeBuilder->getRootNode('chill_aside_activity')
+        $treeBuilder->getRootNode()
             ->children()
             ->arrayNode('form')
             ->canBeEnabled()
@@ -132,9 +130,7 @@ class Configuration implements ConfigurationInterface
             ->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')
+            ->ifTrue(static fn ($data) => !\is_int($data))->thenInvalid('The value %s is not a valid integer')
             ->end()
             ->end()
             ->scalarNode('label')
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index 598988cfb..2bb8a985d 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -14,19 +14,22 @@ namespace Chill\AsideActivityBundle\Entity;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
-use DateTimeInterface;
+use Chill\MainBundle\Entity\Location;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(schema="chill_asideactivity")
  */
 class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
 {
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Assert\NotBlank
      */
     private \Chill\MainBundle\Entity\User $agent;
@@ -34,10 +37,11 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime")
      */
-    private $createdAt;
+    private ?\DateTimeInterface $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private \Chill\MainBundle\Entity\User $createdBy;
@@ -45,40 +49,45 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private ?\DateTimeInterface $date = null;
 
     /**
      * @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;
+    private ?int $id = null;
 
     /**
-     * @ORM\Column(type="string", length=100, nullable=true)
+     * @ORM\ManyToOne(targetEntity=Location::class)
+     *
+     * @ORM\JoinColumn(nullable=true)
      */
-    private $location;
+    private ?Location $location = null;
 
     /**
      * @ORM\Column(type="text", nullable=true)
      */
-    private $note;
+    private ?string $note = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
+     *
      * @ORM\JoinColumn(nullable=false)
      */
-    private $type;
+    private ?\Chill\AsideActivityBundle\Entity\AsideActivityCategory $type = null;
 
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $updatedAt;
+    private ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
@@ -90,7 +99,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this->agent;
     }
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -100,12 +109,12 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this->createdBy;
     }
 
-    public function getDate(): ?DateTimeInterface
+    public function getDate(): ?\DateTimeInterface
     {
         return $this->date;
     }
 
-    public function getDuration(): ?DateTimeInterface
+    public function getDuration(): ?\DateTimeInterface
     {
         return $this->duration;
     }
@@ -115,7 +124,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this->id;
     }
 
-    public function getLocation(): ?string
+    public function getLocation(): ?Location
     {
         return $this->location;
     }
@@ -130,7 +139,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this->type;
     }
 
-    public function getUpdatedAt(): ?DateTimeInterface
+    public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
@@ -147,7 +156,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -161,21 +170,21 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setDate(DateTimeInterface $date): self
+    public function setDate(\DateTimeInterface $date): self
     {
         $this->date = $date;
 
         return $this;
     }
 
-    public function setDuration(?DateTimeInterface $duration): self
+    public function setDuration(?\DateTimeInterface $duration): self
     {
         $this->duration = $duration;
 
         return $this;
     }
 
-    public function setLocation(?string $location): self
+    public function setLocation(?Location $location): self
     {
         $this->location = $location;
 
@@ -196,7 +205,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
index 6c12e5828..be71d73f9 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
@@ -19,24 +19,28 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(schema="chill_asideactivity")
  */
 class AsideActivityCategory
 {
     /**
      * @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
+     *
+     * @var Collection<AsideActivityCategory>
      */
-    private $children;
+    private Collection $children;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private int $id;
 
     /**
-     * @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
      * @ORM\Column(type="boolean")
      */
     private bool $isActive = true;
@@ -50,6 +54,7 @@ class AsideActivityCategory
 
     /**
      * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="children")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?AsideActivityCategory $parent = null;
@@ -114,10 +119,8 @@ class AsideActivityCategory
 
     /**
      * @Assert\Callback
-     *
-     * @param mixed $payload
      */
-    public function preventRecursiveParent(ExecutionContextInterface $context, $payload)
+    public function preventRecursiveParent(ExecutionContextInterface $context, mixed $payload)
     {
         if (!$this->hasParent()) {
             return;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php
index 32418e3c3..4271ae118 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php
@@ -20,15 +20,10 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByActivityTypeAggregator implements AggregatorInterface
 {
-    private AsideActivityCategoryRepository $asideActivityCategoryRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(AsideActivityCategoryRepository $asideActivityCategoryRepository, TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->asideActivityCategoryRepository = $asideActivityCategoryRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private readonly AsideActivityCategoryRepository $asideActivityCategoryRepository,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -51,6 +46,11 @@ class ByActivityTypeAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
new file mode 100644
index 000000000..b5ca1022b
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php
@@ -0,0 +1,73 @@
+<?php
+
+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 Chill\AsideActivityBundle\Export\Aggregator;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\LocationRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByLocationAggregator implements AggregatorInterface
+{
+    public function __construct(private readonly LocationRepository $locationRepository) {}
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // no form
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'export.aggregator.Aside activity localisation';
+            }
+            if (null === $value || '' === $value || null === $l = $this->locationRepository->find($value)) {
+                return '';
+            }
+
+            return $l->getName();
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['by_aside_activity_location_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.Group by aside activity location';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $qb->addSelect('IDENTITY(aside.location) AS by_aside_activity_location_aggregator')
+            ->addGroupBy('by_aside_activity_location_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php
index d2fe7c2f2..c3883b18a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php
@@ -12,25 +12,22 @@ declare(strict_types=1);
 namespace Chill\AsideActivityBundle\Export\Aggregator;
 
 use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-use function in_array;
-
 class ByUserJobAggregator implements AggregatorInterface
 {
-    private TranslatableStringHelperInterface $translatableStringHelper;
+    private const PREFIX = 'aside_act_agg_user_job';
 
-    private UserJobRepositoryInterface $userJobRepository;
-
-    public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->userJobRepository = $userJobRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private readonly UserJobRepositoryInterface $userJobRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -39,23 +36,40 @@ class ByUserJobAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('aside_user', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('aside.agent', 'aside_user');
-        }
+        $p = self::PREFIX;
 
         $qb
-            ->addSelect('IDENTITY(aside_user.userJob) AS aside_activity_user_job_aggregator')
-            ->addGroupBy('aside_activity_user_job_aggregator');
+            ->leftJoin('aside.agent', "{$p}_user")
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // job_at based on aside.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'aside.date'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'aside.date')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ASIDE_ACTIVITY_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // nothing to add in the form
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -79,11 +93,11 @@ class ByUserJobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['aside_activity_user_job_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
-        return 'export.aggregator.Aggregate by user job';
+        return 'export.aggregator.by_user_job.Aggregate by user job';
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php
index 6c06ee756..a99d2b75f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php
@@ -12,25 +12,22 @@ declare(strict_types=1);
 namespace Chill\AsideActivityBundle\Export\Aggregator;
 
 use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-use function in_array;
-
 class ByUserScopeAggregator implements AggregatorInterface
 {
-    private ScopeRepositoryInterface $scopeRepository;
+    private const PREFIX = 'aside_act_agg_user_scope';
 
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private readonly ScopeRepositoryInterface $scopeRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -39,23 +36,39 @@ class ByUserScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('aside_user', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('aside.agent', 'aside_user');
-        }
+        $p = self::PREFIX;
 
         $qb
-            ->addSelect('IDENTITY(aside_user.mainScope) AS aside_activity_user_scope_aggregator')
-            ->addGroupBy('aside_activity_user_scope_aggregator');
+            ->leftJoin('aside.agent', "{$p}_user")
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'aside.date'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'aside.date')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ASIDE_ACTIVITY_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // nothing to add in the form
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -79,11 +92,11 @@ class ByUserScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['aside_activity_user_scope_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
-        return 'export.aggregator.Aggregate by user scope';
+        return 'export.aggregator.by_user_scope.Aggregate by user scope';
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Declarations.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Declarations.php
index 8c808ea37..f86f78866 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Declarations.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Declarations.php
@@ -16,5 +16,5 @@ namespace Chill\AsideActivityBundle\Export;
  */
 abstract class Declarations
 {
-    public const ASIDE_ACTIVITY_TYPE = 'aside_activity';
+    final public const ASIDE_ACTIVITY_TYPE = 'aside_activity';
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php
index f3db629cb..70922b6ae 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php
@@ -18,21 +18,17 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterface
 {
-    private AsideActivityRepository $repository;
+    public function __construct(private readonly AsideActivityRepository $repository) {}
 
-    public function __construct(
-        AsideActivityRepository $repository
-    ) {
-        $this->repository = $repository;
-    }
+    public function buildForm(FormBuilderInterface $builder) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function getFormDefaultData(): array
     {
+        return [];
     }
 
     public function getAllowedFormattersTypes(): array
@@ -53,7 +49,7 @@ class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_aside_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average duration aside activities' : $value;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
index 87aad1659..6d1eed5fe 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php
@@ -18,21 +18,17 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountAsideActivity implements ExportInterface, GroupedExportInterface
 {
-    private AsideActivityRepository $repository;
+    public function __construct(private readonly AsideActivityRepository $repository) {}
 
-    public function __construct(
-        AsideActivityRepository $repository
-    ) {
-        $this->repository = $repository;
-    }
+    public function buildForm(FormBuilderInterface $builder) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function getFormDefaultData(): array
     {
+        return [];
     }
 
     public function getAllowedFormattersTypes(): array
@@ -53,15 +49,13 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            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];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
index aee168174..33155c62f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
@@ -23,55 +23,32 @@ use Chill\MainBundle\Export\Helper\DateTimeHelper;
 use Chill\MainBundle\Export\Helper\UserHelper;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Repository\LocationRepository;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use DateTimeInterface;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
-final class ListAsideActivity implements ListInterface, GroupedExportInterface
+final readonly class ListAsideActivity implements ListInterface, GroupedExportInterface
 {
-    private AsideActivityCategoryRepository $asideActivityCategoryRepository;
-
-    private CategoryRender $categoryRender;
-
-    private CenterRepositoryInterface $centerRepository;
-
-    private DateTimeHelper $dateTimeHelper;
-
-    private EntityManagerInterface $em;
-
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private UserHelper $userHelper;
-
     public function __construct(
-        EntityManagerInterface $em,
-        DateTimeHelper $dateTimeHelper,
-        UserHelper $userHelper,
-        ScopeRepositoryInterface $scopeRepository,
-        CenterRepositoryInterface $centerRepository,
-        AsideActivityCategoryRepository $asideActivityCategoryRepository,
-        CategoryRender $categoryRender,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->em = $em;
-        $this->dateTimeHelper = $dateTimeHelper;
-        $this->userHelper = $userHelper;
-        $this->scopeRepository = $scopeRepository;
-        $this->centerRepository = $centerRepository;
-        $this->asideActivityCategoryRepository = $asideActivityCategoryRepository;
-        $this->categoryRender = $categoryRender;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private EntityManagerInterface $em,
+        private DateTimeHelper $dateTimeHelper,
+        private UserHelper $userHelper,
+        private ScopeRepositoryInterface $scopeRepository,
+        private CenterRepositoryInterface $centerRepository,
+        private AsideActivityCategoryRepository $asideActivityCategoryRepository,
+        private CategoryRender $categoryRender,
+        private LocationRepository $locationRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
+        return [];
     }
 
     public function getAllowedFormattersTypes()
@@ -91,86 +68,78 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
-            case 'id':
-            case 'note':
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.' . $key;
-                    }
+        return match ($key) {
+            'id', 'note' => static function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.'.$key;
+                }
 
-                    return $value ?? '';
-                };
+                return $value ?? '';
+            },
+            'duration' => static function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.'.$key;
+                }
 
-            case 'duration':
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.' . $key;
-                    }
+                if (null === $value) {
+                    return '';
+                }
 
-                    if (null === $value) {
-                        return '';
-                    }
+                if ($value instanceof \DateTimeInterface) {
+                    return $value->format('H:i:s');
+                }
 
-                    if ($value instanceof DateTimeInterface) {
-                        return $value->format('H:i:s');
-                    }
+                return $value;
+            },
+            'createdAt', 'updatedAt', 'date' => $this->dateTimeHelper->getLabel('export.aside_activity.'.$key),
+            'agent_id', 'creator_id' => $this->userHelper->getLabel($key, $values, 'export.aside_activity.'.$key),
+            'aside_activity_type' => function ($value) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.aside_activity_type';
+                }
 
-                    return $value;
-                };
+                if (null === $value || '' === $value || null === $c = $this->asideActivityCategoryRepository->find($value)) {
+                    return '';
+                }
 
-            case 'createdAt':
-            case 'updatedAt':
-            case 'date':
-                return $this->dateTimeHelper->getLabel('export.aside_activity.' . $key);
+                return $this->categoryRender->renderString($c, []);
+            },
+            'location' => function ($value) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.location';
+                }
 
-            case 'agent_id':
-            case 'creator_id':
-                return $this->userHelper->getLabel($key, $values, 'export.aside_activity.' . $key);
+                if (null === $value || '' === $value || null === $l = $this->locationRepository->find($value)) {
+                    return '';
+                }
 
-            case 'aside_activity_type':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.aside_activity_type';
-                    }
+                return $l->getName();
+            },
+            'main_scope' => function ($value) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.main_scope';
+                }
 
-                    if (null === $value || '' === $value || null === $c = $this->asideActivityCategoryRepository->find($value)) {
-                        return '';
-                    }
+                if (null === $value || '' === $value || null === $c = $this->scopeRepository->find($value)) {
+                    return '';
+                }
 
-                    return $this->categoryRender->renderString($c, []);
-                };
+                return $this->translatableStringHelper->localize($c->getName());
+            },
+            'main_center' => function ($value) {
+                if ('_header' === $value) {
+                    return 'export.aside_activity.main_center';
+                }
 
-            case 'main_scope':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.main_scope';
-                    }
+                if (null === $value || '' === $value || null === $c = $this->centerRepository->find($value)) {
+                    /* @var Center $c */
+                    return '';
+                }
 
-                    if (null === $value || '' === $value || null === $c = $this->scopeRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->translatableStringHelper->localize($c->getName());
-                };
-
-            case 'main_center':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.main_center';
-                    }
-
-                    if (null === $value || '' === $value || null === $c = $this->centerRepository->find($value)) {
-                        /** @var Center $c */
-                        return '';
-                    }
-
-                    return $c->getName();
-                };
-
-            default:
-                throw new LogicException('this key is not supported : ' . $key);
-        }
+                return $c->getName();
+            },
+            default => throw new \LogicException('this key is not supported : '.$key),
+        };
     }
 
     public function getQueryKeys($data)
@@ -187,6 +156,7 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
             'date',
             'duration',
             'note',
+            'location',
         ];
     }
 
@@ -209,7 +179,10 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
     {
         $qb = $this->em->createQueryBuilder()
             ->from(AsideActivity::class, 'aside')
-            ->leftJoin('aside.agent', 'agent');
+            ->leftJoin('aside.agent', 'agent')
+            ->leftJoin('agent.scopeHistories', 'scopeHistories')
+            ->andWhere('scopeHistories.startDate <= aside.date AND (scopeHistories.endDate IS NULL or scopeHistories.endDate > aside.date)')
+        ;
 
         $qb
             ->addSelect('aside.id AS id')
@@ -217,11 +190,12 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
             ->addSelect('aside.updatedAt AS updatedAt')
             ->addSelect('IDENTITY(aside.agent) AS agent_id')
             ->addSelect('IDENTITY(aside.createdBy) AS creator_id')
-            ->addSelect('IDENTITY(agent.mainScope) AS main_scope')
+            ->addSelect('IDENTITY(scopeHistories.scope) AS main_scope')
             ->addSelect('IDENTITY(agent.mainCenter) AS main_center')
             ->addSelect('IDENTITY(aside.type) AS aside_activity_type')
             ->addSelect('aside.date')
             ->addSelect('aside.duration')
+            ->addSelect('IDENTITY(aside.location) AS location')
             ->addSelect('aside.note');
 
         return $qb;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php
index af17a2591..0fd318902 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php
@@ -18,21 +18,17 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumAsideActivityDuration implements ExportInterface, GroupedExportInterface
 {
-    private AsideActivityRepository $repository;
+    public function __construct(private readonly AsideActivityRepository $repository) {}
 
-    public function __construct(
-        AsideActivityRepository $repository
-    ) {
-        $this->repository = $repository;
-    }
+    public function buildForm(FormBuilderInterface $builder) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function getFormDefaultData(): array
     {
+        return [];
     }
 
     public function getAllowedFormattersTypes(): array
@@ -53,7 +49,7 @@ class SumAsideActivityDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_aside_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            throw new \LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum duration aside activities' : $value;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
index 3ad8e0e93..b78640d49 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
@@ -23,21 +23,11 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByActivityTypeFilter implements FilterInterface
 {
-    private AsideActivityCategoryRepository $asideActivityTypeRepository;
-
-    private CategoryRender $categoryRender;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
     public function __construct(
-        CategoryRender $categoryRender,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        AsideActivityCategoryRepository $asideActivityTypeRepository
-    ) {
-        $this->categoryRender = $categoryRender;
-        $this->asideActivityTypeRepository = $asideActivityTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly CategoryRender $categoryRender,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly AsideActivityCategoryRepository $asideActivityTypeRepository
+    ) {}
 
     public function addRole(): ?string
     {
@@ -77,6 +67,11 @@ class ByActivityTypeFilter implements FilterInterface
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $types = array_map(
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
index 7a1b6f4dc..8f3c9c305 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
@@ -26,17 +26,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ByDateFilter implements FilterInterface
 {
-    protected TranslatorInterface $translator;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter,
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter, protected TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -72,11 +62,9 @@ class ByDateFilter implements FilterInterface
         $builder
             ->add('date_from', PickRollingDateType::class, [
                 'label' => 'export.filter.Aside activities after this date',
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
             ])
             ->add('date_to', PickRollingDateType::class, [
                 'label' => 'export.filter.Aside activities before this date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
 
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
@@ -94,14 +82,14 @@ class ByDateFilter implements FilterInterface
                 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 (null === $date_to) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                            . 'should not be empty')
+                            .'should not be empty')
                     ));
                 }
 
@@ -112,14 +100,19 @@ class ByDateFilter implements FilterInterface
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('export.filter.This date should be after '
-                            . 'the date given in "Implied in an aside activity after '
-                            . 'this date" field')
+                            .'the date given in "Implied in an aside activity after '
+                            .'this date" field')
                     ));
                 }
             }
         });
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return ['export.filter.Filtered by aside activities between %dateFrom% and %dateTo%', [
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
new file mode 100644
index 000000000..0be041dc9
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
@@ -0,0 +1,81 @@
+<?php
+
+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 Chill\AsideActivityBundle\Export\Filter;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserLocationType;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class ByLocationFilter implements FilterInterface
+{
+    public function __construct(
+        private Security $security
+    ) {}
+
+    public function getTitle(): string
+    {
+        return 'export.filter.Filter by aside activity location';
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('locations', PickUserLocationType::class);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        $user = $this->security->getUser();
+
+        if ($user instanceof User) {
+            return [
+                'locations' => $user->getCurrentLocation(),
+            ];
+        }
+
+        return [
+            'locations' => null,
+        ];
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $locations = $data['locations']->map(fn (Location $l): string => $l->getName());
+
+        return ['export.filter.Filtered by aside activity location: only %location%', [
+            '%location%' => implode(', ', $locations),
+        ]];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $clause = $qb->expr()->in('aside.location', ':locations');
+
+        $qb->andWhere($clause);
+        $qb->setParameter('locations', $data['locations']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
index 795c813cd..8dd1a8eac 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
@@ -20,12 +20,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByUserFilter implements FilterInterface
 {
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
@@ -54,6 +49,11 @@ class ByUserFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $users = [];
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
index 86194b123..3d5bb6530 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
@@ -13,6 +13,7 @@ namespace Chill\AsideActivityBundle\Export\Filter;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -22,12 +23,11 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByUserJobFilter implements FilterInterface
 {
-    private TranslatableStringHelperInterface $translatableStringHelper;
+    private const PREFIX = 'aside_act_filter_user_job';
 
-    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -36,34 +36,46 @@ class ByUserJobFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $p = self::PREFIX;
+
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AsideActivity::class . ' aside_activity_user_job_filter_act
-                JOIN aside_activity_user_job_filter_act.agent aside_activity_user_job_filter_user WHERE aside_activity_user_job_filter_user.userJob IN (:aside_activity_user_job_filter_jobs) AND aside_activity_user_job_filter_act = aside'
+                    'SELECT 1 FROM '.AsideActivity::class." {$p}_act "
+                    ."JOIN {$p}_act.agent {$p}_user "
+                    .'JOIN '.UserJobHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE {$p}_act = aside "
+                    // job_at based on aside.date
+                    ."AND {$p}_history.startDate <= aside.date "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > aside.date) "
+                    ."AND {$p}_history.job IN ( :{$p}_jobs )"
                 )
             )
-            ->setParameter('aside_activity_user_job_filter_jobs', $data['jobs']);
+            ->setParameter(
+                "{$p}_jobs",
+                $data['jobs'],
+            );
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ASIDE_ACTIVITY_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('jobs', EntityType::class, [
-            'class' => UserJob::class,
-            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
+        $builder
+            ->add('jobs', EntityType::class, [
+                'class' => UserJob::class,
+                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, $format = 'string'): array
     {
-        return ['export.filter.Filtered aside activities by user jobs: only %jobs%', [
+        return ['export.filter.by_user_job.Filtered aside activities by user jobs: only %jobs%', [
             '%jobs%' => implode(
                 ', ',
                 array_map(
@@ -74,8 +86,15 @@ class ByUserJobFilter implements FilterInterface
         ]];
     }
 
-    public function getTitle()
+    public function getFormDefaultData(): array
     {
-        return 'export.filter.Filter by user jobs';
+        return [
+            'jobs' => [],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.by_user_job.Filter by user jobs';
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
index 4342e11eb..846814785 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
@@ -14,6 +14,7 @@ namespace Chill\AsideActivityBundle\Export\Filter;
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\AsideActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -23,17 +24,12 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByUserScopeFilter implements FilterInterface
 {
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
+    private const PREFIX = 'aside_act_filter_user_scope';
 
     public function __construct(
-        ScopeRepositoryInterface $scopeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly ScopeRepositoryInterface $scopeRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -42,35 +38,47 @@ class ByUserScopeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $p = self::PREFIX;
+
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AsideActivity::class . ' aside_activity_user_scope_filter_act
-                JOIN aside_activity_user_scope_filter_act.agent aside_activity_user_scope_filter_user WHERE aside_activity_user_scope_filter_user.mainScope IN (:aside_activity_user_scope_filter_scopes) AND  aside_activity_user_scope_filter_act = aside '
+                    'SELECT 1 FROM '.AsideActivity::class." {$p}_act "
+                    ."JOIN {$p}_act.agent {$p}_user "
+                    .'JOIN '.UserScopeHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE {$p}_act = aside "
+                    // scope_at based on aside.date
+                    ."AND {$p}_history.startDate <= aside.date "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > aside.date) "
+                    ."AND {$p}_history.scope IN ( :{$p}_scopes )"
                 )
             )
-            ->setParameter('aside_activity_user_scope_filter_scopes', $data['scopes']);
+            ->setParameter(
+                "{$p}_scopes",
+                $data['scopes'],
+            );
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ASIDE_ACTIVITY_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('scopes', EntityType::class, [
-            'class' => Scope::class,
-            'choices' => $this->scopeRepository->findAllActive(),
-            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
+        $builder
+            ->add('scopes', EntityType::class, [
+                'class' => Scope::class,
+                'choices' => $this->scopeRepository->findAllActive(),
+                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
-        return ['export.filter.Filtered aside activities by user scope: only %scopes%', [
+        return ['export.filter.by_user_scope.Filtered aside activities by user scope: only %scopes%', [
             '%scopes%' => implode(
                 ', ',
                 array_map(
@@ -81,8 +89,15 @@ class ByUserScopeFilter implements FilterInterface
         ]];
     }
 
-    public function getTitle()
+    public function getFormDefaultData(): array
     {
-        return 'export.filter.Filter by user scope';
+        return [
+            'scopes' => [],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.by_user_scope.Filter by user scope';
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
index c183fcea6..3a69be137 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
@@ -22,13 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 final class AsideActivityCategoryType extends AbstractType
 {
-    private CategoryRender $categoryRender;
-
-    public function __construct(
-        CategoryRender $categoryRender
-    ) {
-        $this->categoryRender = $categoryRender;
-    }
+    public function __construct(private readonly CategoryRender $categoryRender) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 9a95a8d09..d6fcb821c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -16,10 +16,7 @@ use Chill\AsideActivityBundle\Form\Type\PickAsideActivityCategoryType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
-use DateInterval;
-use DateTime;
-use DateTimeImmutable;
-use DateTimeZone;
+use Chill\MainBundle\Form\Type\PickUserLocationType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
@@ -29,11 +26,9 @@ use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use function in_array;
-
 final class AsideActivityFormType extends AbstractType
 {
-    private array $timeChoices;
+    private readonly array $timeChoices;
 
     public function __construct(
         ParameterBagInterface $parameterBag,
@@ -65,7 +60,7 @@ final class AsideActivityFormType extends AbstractType
                 ChillDateType::class,
                 [
                     'label' => 'date',
-                    'data' => new DateTime(),
+                    'data' => new \DateTime(),
                     'required' => true,
                 ]
             )
@@ -77,7 +72,9 @@ final class AsideActivityFormType extends AbstractType
             ->add('note', ChillTextareaType::class, [
                 'label' => 'Note',
                 'required' => false,
-            ]);
+            ])
+            ->add('location', PickUserLocationType::class)
+        ;
 
         foreach (['duration'] as $fieldName) {
             $builder->get($fieldName)
@@ -93,27 +90,19 @@ 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 DateTimeImmutable $data */
-                    $data = $formEvent->getData() === null ?
-                        DateTime::createFromFormat('U', '300') :
-                        $formEvent->getData();
+                    $timezoneUTC = new \DateTimeZone('GMT');
+                    /** @var \DateTimeImmutable $data */
+                    $data = $formEvent->getData() ?? \DateTime::createFromFormat('U', '300');
                     $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, true)) {
+                    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,
-                            [
-                                'choices' => $timeChoices,
-                                'auto_initialize' => false,
-                            ]
-                        ));
+                        $form = $builder->create($fieldName, ChoiceType::class, [...$durationTimeOptions, 'choices' => $timeChoices, 'auto_initialize' => false]);
                         $form->addModelTransformer($durationTimeTransformer);
                         $formEvent->getForm()->getParent()->add($form->getForm());
                     }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php
index 3ee392517..23923fb6c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/Type/PickAsideActivityCategoryType.php
@@ -20,13 +20,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class PickAsideActivityCategoryType extends AbstractType
 {
-    private CategoryRender $categoryRender;
-
-    public function __construct(
-        CategoryRender $categoryRender
-    ) {
-        $this->categoryRender = $categoryRender;
-    }
+    public function __construct(private readonly CategoryRender $categoryRender) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
index 8cc076a6e..43a37e068 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
@@ -14,14 +14,9 @@ namespace Chill\AsideActivityBundle\Menu;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
 
-final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
+final readonly class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private Security $security) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
index f23fcdc8a..a32d52303 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
@@ -21,19 +21,8 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    public AuthorizationCheckerInterface $authorizationChecker;
+    public function __construct(protected TranslatorInterface $translator, public AuthorizationCheckerInterface $authorizationChecker) {}
 
-    protected TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator, AuthorizationCheckerInterface $authorizationChecker)
-    {
-        $this->translator = $translator;
-        $this->authorizationChecker = $authorizationChecker;
-    }
-
-    /**
-     * @param $menuId
-     */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if ($this->authorizationChecker->isGranted('ROLE_USER')) {
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
index 918cec586..533e567b4 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 class AsideActivityCategoryRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -49,7 +49,7 @@ class AsideActivityCategoryRepository implements ObjectRepository
      *
      * @return AsideActivityCategory[]
      */
-    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);
     }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
index 5ffc73684..1e2711bfe 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -39,6 +39,9 @@
 										</span>
 									{% endif %}
 								</div>
+                                {%- if entity.location.name is defined -%}
+                                    <div><i class="fa fa-fw fa-map-marker"></i>{{ entity.location.name }}</div>
+                                {%- endif -%}
 							</div>
 							<div class="item-col" style="justify-content: flex-end;">
 								<div class="box">
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
index 75da9a444..8fb487d31 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -22,6 +22,13 @@
 
 				<dt class="inline">{{ 'Created for'|trans }}</dt>
 				<dd>{{ entity.agent }}</dd>
+                
+                <dt class="inline">{{ 'Asideactivity location'|trans }}</dt>
+                {%- if entity.location.name is defined -%}
+                    <dd>{{ entity.location.name }}</dd>
+                {%- else -%}
+                    <dd><span class="chill-no-data-statement">{{ 'No data given'|trans }}</span></dd>
+                {%- endif -%}
 
 				<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Security/AsideActivityVoter.php b/src/Bundle/ChillAsideActivityBundle/src/Security/AsideActivityVoter.php
index 6b308b5f2..e15abd439 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Security/AsideActivityVoter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Security/AsideActivityVoter.php
@@ -21,9 +21,9 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 class AsideActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const STATS = 'CHILL_ASIDE_ACTIVITY_STATS';
+    final public const STATS = 'CHILL_ASIDE_ACTIVITY_STATS';
 
-    private VoterHelperInterface $voterHelper;
+    private readonly VoterHelperInterface $voterHelper;
 
     public function __construct(
         VoterHelperFactoryInterface $voterHelperFactory
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
index 066a0ca52..2598c4e01 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
@@ -14,12 +14,11 @@ namespace Chill\AsideActivityBundle\Templating\Entity;
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @implements ChillEntityRenderInterface<AsideActivityCategory>
  */
-final class CategoryRender implements ChillEntityRenderInterface
+final readonly class CategoryRender implements ChillEntityRenderInterface
 {
     public const DEFAULT_ARGS = [
         self::SEPERATOR_KEY => ' > ',
@@ -27,15 +26,7 @@ final class CategoryRender implements ChillEntityRenderInterface
 
     public const SEPERATOR_KEY = 'default.separator';
 
-    private EngineInterface $engine;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->engine = $engine;
-    }
+    public function __construct(private TranslatableStringHelper $translatableStringHelper, private \Twig\Environment $engine) {}
 
     public function buildParents(AsideActivityCategory $asideActivityCategory)
     {
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
index 196dd5bc3..4a772775f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
@@ -15,25 +15,22 @@ 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;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AsideActivityControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    protected function setUp(): void
+    protected function tearDown(): void
     {
-        parent::setUp();
-        self::bootKernel();
-        $this->client = $this->getClientAuthenticated();
+        self::ensureKernelShutdown();
     }
 
-    public function generateAsideActivityId()
+    public function generateAsideActivityId(): iterable
     {
         self::bootKernel();
 
@@ -50,13 +47,15 @@ final class AsideActivityControllerTest extends WebTestCase
             ->getQuery()
             ->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']];
+
+        self::ensureKernelShutdown();
     }
 
     /**
@@ -64,22 +63,28 @@ final class AsideActivityControllerTest extends WebTestCase
      */
     public function testEditWithoutUsers(int $asideActivityId)
     {
-        $this->client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
+        self::ensureKernelShutdown();
+        $client = $this->getClientAuthenticated();
+        $client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
 
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
     }
 
     public function testIndexWithoutUsers()
     {
-        $this->client->request('GET', '/fr/asideactivity');
+        self::ensureKernelShutdown();
+        $client = $this->getClientAuthenticated();
+        $client->request('GET', '/fr/asideactivity');
 
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
     }
 
     public function testNewWithoutUsers()
     {
-        $this->client->request('GET', '/fr/asideactivity/new');
+        self::ensureKernelShutdown();
+        $client = $this->getClientAuthenticated();
+        $client->request('GET', '/fr/asideactivity/new');
 
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php
new file mode 100644
index 000000000..29ea8d1f6
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/ListAsideActivityTest.php
@@ -0,0 +1,43 @@
+<?php
+
+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 Chill\AsideActivityBundle\Tests\Export\Export;
+
+use Chill\AsideActivityBundle\Export\Export\ListAsideActivity;
+use Doctrine\ORM\AbstractQuery;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ListAsideActivityTest extends KernelTestCase
+{
+    private ListAsideActivity $listAsideActivity;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::bootKernel();
+        $this->listAsideActivity = self::$container->get(ListAsideActivity::class);
+    }
+
+    public function testExecuteQuery(): void
+    {
+        $qb = $this->listAsideActivity->initiateQuery([], [], [])
+            ->setMaxResults(1);
+
+        $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
+
+        self::assertIsArray($results, 'smoke test: test that the result is an array');
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml
index ddb635084..0a193b990 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml
@@ -1,12 +1,3 @@
 chill_asideactivities_controllers:
   resource: "@ChillAsideActivityBundle/Controller"
   type: annotation
-
-chill_admin_aside_activity_redirect_to_admin_index:
-  path: /{_locale}/admin/activity_redirect_to_main
-  controller: Chill\ActivityBundle\Controller\AdminController::redirectToAdminIndexAction
-  options:
-    menus:
-      admin_aside_activity:
-        order: 0
-        label: Main admin menu
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
index a29413e15..40cb120da 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
@@ -46,19 +46,27 @@ services:
       tags:
           - { name: chill.export_filter, alias: 'aside_activity_user_filter' }
 
+  Chill\AsideActivityBundle\Export\Filter\ByLocationFilter:
+      tags:
+          - { name: chill.export_filter, alias: 'aside_activity_location_filter' }
+
   ## Aggregators
 
   chill.aside_activity.export.type_aggregator:
     class: Chill\AsideActivityBundle\Export\Aggregator\ByActivityTypeAggregator
     tags:
-      - { name: chill.export_aggregator, alias: activity_type_aggregator }
+      - { name: chill.export_aggregator, alias: 'activity_type_aggregator' }
 
   chill.aside_activity.export.user_job_aggregator:
       class: Chill\AsideActivityBundle\Export\Aggregator\ByUserJobAggregator
       tags:
-          - { name: chill.export_aggregator, alias: aside_activity_user_job_aggregator }
+          - { name: chill.export_aggregator, alias: 'aside_activity_user_job_aggregator' }
 
   chill.aside_activity.export.user_scope_aggregator:
       class: Chill\AsideActivityBundle\Export\Aggregator\ByUserScopeAggregator
       tags:
-          - { name: chill.export_aggregator, alias: aside_activity_user_scope_aggregator }
+          - { name: chill.export_aggregator, alias: 'aside_activity_user_scope_aggregator' }
+
+  Chill\AsideActivityBundle\Export\Aggregator\ByLocationAggregator:
+      tags:
+          - { name: chill.export_aggregator, alias: 'aside_activity_location_aggregator' }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20230816112809.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20230816112809.php
new file mode 100644
index 000000000..bde8af1e3
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20230816112809.php
@@ -0,0 +1,39 @@
+<?php
+
+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 Chill\Migrations\AsideActivity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230816112809 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Update location attribute in asideactivity';
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX chill_asideactivity.IDX_A866DA0E64D218E');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP CONSTRAINT FK_A866DA0E64D218E');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP location_id');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ADD location VARCHAR(100) DEFAULT NULL');
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD location_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity DROP location');
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD CONSTRAINT FK_A866DA0E64D218E FOREIGN KEY (location_id) REFERENCES chill_main_location (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_A866DA0E64D218E ON chill_asideactivity.asideactivity (location_id)');
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index cc428390c..0a324d2cd 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -26,6 +26,7 @@ Users: Utilisateurs
 Emergency: Urgent
 by: "Par "
 location: Lieu
+Asideactivity location: Localisation de l'activité
 
 # Crud
 crud:
@@ -176,11 +177,13 @@ export:
         agent_id: Utilisateur
         creator_id: Créateur
         main_scope: Service principal de l'utilisateur
-        main_center: Centre principal de l'utilisteur
+        main_center: Centre principal de l'utilisateur
         aside_activity_type: Catégorie d'activité annexe
         date: Date
         duration: Durée
         note: Note
+        id: Identifiant
+        location: Localisation
 
     Exports of aside activities: Exports des activités annexes
     Count aside activities: Nombre d'activités annexes
@@ -197,15 +200,24 @@ export:
         Aside activities before this date: Actvitités annexes avant cette date
         'Filtered aside activity by user: only %users%': "Filtré par utilisateur: uniquement %users%"
         Filter aside activity by user: Filtrer par utilisateur
-        'Filtered aside activities by user jobs: only %jobs%': "Filtré par métier des utilisateurs: uniquement %jobs%"
-        Filter by user jobs: Filtrer les activités annexes par métier des utilisateurs
-        'Filtered aside activities by user scope: only %scopes%': "Filtré par service des utilisateur: uniquement %scopes%"
-        Filter by user scope: Filtrer les activités annexes par service d'utilisateur
+        by_user_job:
+            'Filtered aside activities by user jobs: only %jobs%': "Filtré par métier des utilisateurs: uniquement %jobs%"
+            Filter by user jobs: Filtrer les activités annexes par métier des utilisateurs
+        by_user_scope:
+            'Filtered aside activities by user scope: only %scopes%': "Filtré par service des utilisateurs: uniquement %scopes%"
+            Filter by user scope: Filtrer les activités annexes par service d'utilisateur
+        Filter by aside activity location: Filtrer les activités annexes par localisation
+        'Filtered by aside activity location: only %location%': "Filtré par localisation: uniquement %location%"
     aggregator:
         Group by aside activity type: Grouper les activités annexes par type d'activité
         Aside activity type: Type d'activité annexe
-        Aggregate by user job: Grouper les activités annexes par métier des utilisateurs
-        Aggregate by user scope: Grouper les activités annexes par service des utilisateurs
+        by_user_job:
+            Aggregate by user job: Grouper les activités annexes par métier des utilisateurs
+        by_user_scope:
+            Aggregate by user scope: Grouper les activités annexes par service des utilisateurs
+        Aside activity location: Localisation des activités annexe
+        Group by aside activity location: Grouper les activités annexes par localisation
+        Aside activity localisation: Localisation
 
 # ROLES
 CHILL_ASIDE_ACTIVITY_STATS: Statistiques pour les activités annexes
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
index 2662b896a..3b5a687a6 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
@@ -17,7 +17,7 @@ use Chill\BudgetBundle\Entity\Resource;
 interface CalculatorInterface
 {
     /**
-     * @param array<Charge|Resource> $elements
+     * @param array<Charge|resource> $elements
      */
     public function calculate(array $elements): ?CalculatorResult;
 
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
index 7987bdfdf..477f23189 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
@@ -11,14 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\BudgetBundle\Calculator;
 
-use Chill\BudgetBundle\Entity\AbstractElement;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Entity\Resource;
-use OutOfBoundsException;
-
-use function array_key_exists;
-use function array_keys;
-use function implode;
 
 class CalculatorManager
 {
@@ -42,7 +36,7 @@ class CalculatorManager
     }
 
     /**
-     * @param array<Resource|Charge> $elements
+     * @param array<resource|Charge> $elements
      *
      * @return CalculatorResult[]
      */
@@ -63,9 +57,8 @@ class CalculatorManager
 
     public function getCalculator(string $alias): CalculatorInterface
     {
-        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)));
+        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 380e641a6..ce31dcaaf 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
@@ -13,15 +13,15 @@ namespace Chill\BudgetBundle\Calculator;
 
 class CalculatorResult
 {
-    public const TYPE_CURRENCY = 'currency';
+    final public const TYPE_CURRENCY = 'currency';
 
-    public const TYPE_PERCENTAGE = 'percentage';
+    final public const TYPE_PERCENTAGE = 'percentage';
 
-    public const TYPE_RATE = 'rate';
+    final public const TYPE_RATE = 'rate';
 
     public $label;
 
-    public $result;
+    public float $result;
 
     public $type;
 }
diff --git a/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php b/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php
index 30bf1e68a..71f6a7076 100644
--- a/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php
+++ b/src/Bundle/ChillBudgetBundle/ChillBudgetBundle.php
@@ -20,6 +20,6 @@ class ChillBudgetBundle extends Bundle
     {
         parent::build($container);
 
-        $container->addCompilerPass(new CalculatorCompilerPass());
+        $container->addCompilerPass(new CalculatorCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
index badccf3b3..38d4d82f5 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
@@ -23,39 +23,20 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function get_class;
-
 abstract class AbstractElementController extends AbstractController
 {
-    protected LoggerInterface $chillMainLogger;
-
-    protected EntityManagerInterface $em;
-
-    protected TranslatorInterface $translator;
-
-    public function __construct(
-        EntityManagerInterface $em,
-        TranslatorInterface $translator,
-        LoggerInterface $chillMainLogger
-    ) {
-        $this->em = $em;
-        $this->translator = $translator;
-        $this->chillMainLogger = $chillMainLogger;
-    }
+    public function __construct(protected EntityManagerInterface $em, protected TranslatorInterface $translator, protected LoggerInterface $chillMainLogger) {}
 
     /**
      * Route(
      *  "{_locale}/family-members/family-members/{id}/delete",
      *  name="chill_family_members_family_members_delete"
      * ).
-     *
-     * @param mixed $template
-     * @param mixed $flashMessage
      */
-    protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage): Response
+    protected function _delete(AbstractElement $element, Request $request, mixed $template, mixed $flashMessage): Response
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::DELETE, $element, 'You are not '
-            . 'allowed to delete this item');
+            .'allowed to delete this item');
 
         $form = $this->createDeleteForm();
 
@@ -67,12 +48,12 @@ abstract class AbstractElementController extends AbstractController
             $indexPage = 'chill_budget_elements_household_index';
         }
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
-            if ($form->isValid()) {
+            if ($form->isSubmitted() && $form->isValid()) {
                 $this->chillMainLogger->notice('A budget element has been removed', [
-                    'family_element' => get_class($element),
+                    'family_element' => $element::class,
                     'by_user' => $this->getUser()->getUsername(),
                     'family_member_id' => $element->getId(),
                     'amount' => $element->getAmount(),
@@ -116,7 +97,7 @@ abstract class AbstractElementController extends AbstractController
             $indexPage = 'chill_budget_elements_household_index';
         }
 
-        $entity = null !== $element->getPerson() ? $element->getPerson() : $element->getHousehold();
+        $entity = $element->getPerson() ?? $element->getHousehold();
 
         $form = $this->createForm($this->getType(), $element);
         $form->add('submit', SubmitType::class);
@@ -141,12 +122,7 @@ abstract class AbstractElementController extends AbstractController
         ]);
     }
 
-    /**
-     * @param mixed $template
-     * @param mixed $flashMessageOnSuccess
-     * @param mixed $entity
-     */
-    protected function _new($entity, Request $request, $template, $flashMessageOnSuccess)
+    protected function _new(mixed $entity, Request $request, mixed $template, mixed $flashMessageOnSuccess)
     {
         /** @var AbstractElement $element */
         $element = $this->createNewElement();
@@ -196,10 +172,8 @@ abstract class AbstractElementController extends AbstractController
      *  "{_locale}/family-members/family-members/{id}/view",
      *  name="chill_family_members_family_members_view"
      * ).
-     *
-     * @param mixed $template
      */
-    protected function _view(AbstractElement $element, $template)
+    protected function _view(AbstractElement $element, mixed $template)
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $element);
 
diff --git a/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php b/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php
index e1989176d..642b7cc61 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php
@@ -20,7 +20,7 @@ class ChargeKindController extends CRUDController
 {
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var QueryBuilder $query */
+        /* @var QueryBuilder $query */
         $query->addOrderBy('e.ordering', 'ASC');
 
         return $query;
diff --git a/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php b/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php
index 90b8e750a..0762f8252 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php
@@ -20,7 +20,7 @@ class ResourceKindController extends CRUDController
 {
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var QueryBuilder $query */
+        /* @var QueryBuilder $query */
         $query->addOrderBy('e.ordering', 'ASC');
 
         return $query;
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
index 5d4a8b3a4..39e96d4a8 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
@@ -15,18 +15,14 @@ use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Form\ChargeType;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Request;
 
 class ChargeController extends AbstractElementController
 {
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/{id}/delete",
-     *     name="chill_budget_charge_delete"
-     * )
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/{id}/delete", name="chill_budget_charge_delete")
      */
     public function deleteAction(Request $request, Charge $charge)
     {
@@ -39,12 +35,9 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/{id}/edit",
-     *     name="chill_budget_charge_edit"
-     * )
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/{id}/edit", name="chill_budget_charge_edit")
      */
     public function editAction(Request $request, Charge $charge)
     {
@@ -57,12 +50,9 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/by-person/{id}/new",
-     *     name="chill_budget_charge_new"
-     * )
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/by-person/{id}/new", name="chill_budget_charge_new")
      */
     public function newAction(Request $request, Person $person)
     {
@@ -75,12 +65,9 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/by-household/{id}/new",
-     *     name="chill_budget_charge_household_new"
-     * )
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/by-household/{id}/new", name="chill_budget_charge_household_new")
      */
     public function newHouseholdAction(Request $request, Household $household)
     {
@@ -93,12 +80,9 @@ class ChargeController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/charge/{id}/view",
-     *     name="chill_budget_charge_view"
-     * )
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/charge/{id}/view", name="chill_budget_charge_view")
      */
     public function viewAction(Charge $charge)
     {
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
index b5db3cd30..26acbf8a5 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
@@ -12,46 +12,19 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Controller;
 
 use Chill\BudgetBundle\Calculator\CalculatorManager;
-use Chill\BudgetBundle\Entity\Charge;
-use Chill\BudgetBundle\Entity\Resource;
 use Chill\BudgetBundle\Repository\ChargeRepository;
 use Chill\BudgetBundle\Repository\ResourceRepository;
 use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\PersonBundle\Entity\Household\Household;
 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\AbstractController;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-use function array_merge;
-use function count;
 
 class ElementController extends AbstractController
 {
-    private CalculatorManager $calculator;
-
-    private ResourceRepository $resourceRepository;
-
-    private ChargeRepository $chargeRepository;
-
-    public function __construct(
-        CalculatorManager $calculator,
-        ResourceRepository $resourceRepository,
-        ChargeRepository $chargeRepository,
-    ) {
-        $this->calculator = $calculator;
-        $this->resourceRepository = $resourceRepository;
-        $this->chargeRepository = $chargeRepository;
-    }
+    public function __construct(private readonly CalculatorManager $calculator, private readonly ResourceRepository $resourceRepository, private readonly ChargeRepository $chargeRepository) {}
 
     /**
-     * @Route(
-     *     "{_locale}/budget/elements/by-person/{id}",
-     *     name="chill_budget_elements_index"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/elements/by-person/{id}", name="chill_budget_elements_index")
      */
     public function indexAction(Person $person)
     {
@@ -60,13 +33,13 @@ class ElementController extends AbstractController
         $charges = $this->chargeRepository->findAllByEntity($person);
         $resources = $this->resourceRepository->findAllByEntity($person);
 
-        $elements = array_merge($charges, $resources);
+        $elements = \array_merge($charges, $resources);
 
-        if (count($elements) > 0) {
+        if (\count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
         }
 
-        return $this->render('ChillBudgetBundle:Person:index.html.twig', [
+        return $this->render('@ChillBudget/Person/index.html.twig', [
             'person' => $person,
             'charges' => $charges,
             'resources' => $resources,
@@ -75,10 +48,7 @@ class ElementController extends AbstractController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/elements/by-household/{id}",
-     *     name="chill_budget_elements_household_index"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/elements/by-household/{id}", name="chill_budget_elements_household_index")
      */
     public function indexHouseholdAction(Household $household)
     {
@@ -87,13 +57,13 @@ class ElementController extends AbstractController
         $charges = $this->chargeRepository->findAllByEntity($household);
         $resources = $this->resourceRepository->findAllByEntity($household);
 
-        $elements = array_merge($charges, $resources);
+        $elements = \array_merge($charges, $resources);
 
-        if (count($elements) > 0) {
+        if (\count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
         }
 
-        return $this->render('ChillBudgetBundle:Household:index.html.twig', [
+        return $this->render('@ChillBudget/Household/index.html.twig', [
             'household' => $household,
             'charges' => $charges,
             'resources' => $resources,
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
index e7f1e9ff3..f67d92a43 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
@@ -15,17 +15,13 @@ use Chill\BudgetBundle\Entity\Resource;
 use Chill\BudgetBundle\Form\ResourceType;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class ResourceController extends AbstractElementController
 {
     /**
-     * @Route(
-     *     "{_locale}/budget/resource/{id}/delete",
-     *     name="chill_budget_resource_delete"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/{id}/delete", name="chill_budget_resource_delete")
      */
     public function deleteAction(Request $request, Resource $resource)
     {
@@ -38,10 +34,7 @@ class ResourceController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/resource/{id}/edit",
-     *     name="chill_budget_resource_edit"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/{id}/edit", name="chill_budget_resource_edit")
      */
     public function editAction(Request $request, Resource $resource): Response
     {
@@ -56,10 +49,7 @@ class ResourceController extends AbstractElementController
     /**
      * Create a new budget element for a person.
      *
-     * @Route(
-     *     "{_locale}/budget/resource/by-person/{id}/new",
-     *     name="chill_budget_resource_new"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/by-person/{id}/new", name="chill_budget_resource_new")
      */
     public function newAction(Request $request, Person $person): Response
     {
@@ -74,10 +64,7 @@ class ResourceController extends AbstractElementController
     /**
      * Create new budget element for a household.
      *
-     * @Route(
-     *     "{_locale}/budget/resource/by-household/{id}/new",
-     *     name="chill_budget_resource_household_new"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/by-household/{id}/new", name="chill_budget_resource_household_new")
      */
     public function newHouseholdAction(Request $request, Household $household): Response
     {
@@ -90,10 +77,7 @@ class ResourceController extends AbstractElementController
     }
 
     /**
-     * @Route(
-     *     "{_locale}/budget/resource/{id}/view",
-     *     name="chill_budget_resource_view"
-     * )
+     * @\Symfony\Component\Routing\Annotation\Route("{_locale}/budget/resource/{id}/view", name="chill_budget_resource_view")
      */
     public function viewAction(Resource $resource): Response
     {
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
index 57976f846..6a8842b64 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php
@@ -34,7 +34,7 @@ class ChillBudgetExtension extends Extension implements PrependExtensionInterfac
         $configuration = $this->getConfiguration($configs, $container);
         $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/form.yaml');
         $loader->load('services/repository.yaml');
         $loader->load('services/security.yaml');
@@ -60,7 +60,7 @@ class ChillBudgetExtension extends Extension implements PrependExtensionInterfac
      */
     public function prependRoutes(ContainerBuilder $container)
     {
-        //add routes for custom bundle
+        // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
index 64df79202..012c4eab5 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
@@ -19,7 +19,7 @@ class CalculatorCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $manager = $container->getDefinition('Chill\BudgetBundle\Calculator\CalculatorManager');
+        $manager = $container->getDefinition(\Chill\BudgetBundle\Calculator\CalculatorManager::class);
 
         foreach ($container->findTaggedServiceIds('chill_budget.calculator') as $id => $tags) {
             foreach ($tags as $tag) {
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
index 8856df22b..ff9931f2d 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
@@ -19,7 +19,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_budget');
-        $rootNode = $treeBuilder->getRootNode('chill_budget');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()
diff --git a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
index f12ba3d72..52a52c99f 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
@@ -14,8 +14,6 @@ namespace Chill\BudgetBundle\Entity;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Ramsey\Uuid\Type\Decimal;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -29,9 +27,11 @@ abstract class AbstractElement
 {
     /**
      * @ORM\Column(name="amount", type="decimal", precision=10, scale=2)
+     *
      * @Assert\GreaterThan(
      *     value=0
      * )
+     *
      * @Assert\NotNull(
      *     message="The amount cannot be empty"
      * )
@@ -41,16 +41,17 @@ abstract class AbstractElement
     /**
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private ?string $comment;
+    private ?string $comment = 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 ?DateTimeImmutable $endDate;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(
@@ -68,16 +69,17 @@ abstract class AbstractElement
 
     /**
      * @ORM\Column(name="startDate", type="datetime_immutable")
+     *
      * @Assert\Date
      */
-    private DateTimeImmutable $startDate;
+    private \DateTimeImmutable $startDate;
 
     /**
      * @ORM\Column(name="type", type="string", length=255)
      */
     private string $type = '';
 
-    /*Getters and Setters */
+    /* Getters and Setters */
 
     public function getAmount(): float
     {
@@ -89,7 +91,7 @@ abstract class AbstractElement
         return $this->comment;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -104,7 +106,7 @@ abstract class AbstractElement
         return $this->person;
     }
 
-    public function getStartDate(): DateTimeImmutable
+    public function getStartDate(): \DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -130,17 +132,17 @@ abstract class AbstractElement
         return $this;
     }
 
-    public function setComment(?string $comment = null): self
+    public function setComment(string $comment = null): self
     {
         $this->comment = $comment;
 
         return $this;
     }
 
-    public function setEndDate(?DateTimeInterface $endDate = null): self
+    public function setEndDate(\DateTimeInterface $endDate = null): self
     {
-        if ($endDate instanceof DateTime) {
-            $this->endDate = DateTimeImmutable::createFromMutable($endDate);
+        if ($endDate instanceof \DateTime) {
+            $this->endDate = \DateTimeImmutable::createFromMutable($endDate);
         } elseif (null === $endDate) {
             $this->endDate = null;
         } else {
@@ -164,10 +166,10 @@ abstract class AbstractElement
         return $this;
     }
 
-    public function setStartDate(DateTimeInterface $startDate): self
+    public function setStartDate(\DateTimeInterface $startDate): self
     {
-        if ($startDate instanceof DateTime) {
-            $this->startDate = DateTimeImmutable::createFromMutable($startDate);
+        if ($startDate instanceof \DateTime) {
+            $this->startDate = \DateTimeImmutable::createFromMutable($startDate);
         } elseif (null === $startDate) {
             $this->startDate = null;
         } else {
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Charge.php b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
index 056e4abff..d6af5cc1e 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
@@ -13,26 +13,26 @@ namespace Chill\BudgetBundle\Entity;
 
 use Chill\MainBundle\Entity\HasCentersInterface;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Charge.
  *
  * @ORM\Table(name="chill_budget.charge")
+ *
  * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ChargeRepository")
  */
 class Charge extends AbstractElement implements HasCentersInterface
 {
-    public const HELP_ASKED = 'running';
+    final public const HELP_ASKED = 'running';
 
-    public const HELP_NO = 'no';
+    final public const HELP_NO = 'no';
 
-    public const HELP_NOT_RELEVANT = 'not-relevant';
+    final public const HELP_NOT_RELEVANT = 'not-relevant';
 
-    public const HELP_YES = 'yes';
+    final public const HELP_YES = 'yes';
 
-    public const HELPS = [
+    final public const HELPS = [
         self::HELP_ASKED,
         self::HELP_NO,
         self::HELP_YES,
@@ -41,26 +41,28 @@ class Charge extends AbstractElement implements HasCentersInterface
 
     /**
      * @ORM\ManyToOne(targetEntity=ChargeKind::class, inversedBy="AbstractElement")
+     *
      * @ORM\JoinColumn
      */
     private ?ChargeKind $charge = null;
 
     /**
-     * @var string
      * @ORM\Column(name="help", type="string", nullable=true)
      */
-    private $help = self::HELP_NOT_RELEVANT;
+    private ?string $help = self::HELP_NOT_RELEVANT;
 
     /**
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     public function __construct()
     {
-        $this->setStartDate(new DateTimeImmutable('today'));
+        $this->setStartDate(new \DateTimeImmutable('today'));
     }
 
     public function getCenters(): array
diff --git a/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php b/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
index b6ebcf347..2196a0e99 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
@@ -21,14 +21,18 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table(name="chill_budget.charge_type",
  *     uniqueConstraints={@ORM\UniqueConstraint(name="charge_kind_unique_type_idx", fields={"kind"})}
  * )
+ *
  * @ORM\Entity
+ *
  * @UniqueEntity(fields={"kind"})
  */
 class ChargeKind
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -40,7 +44,9 @@ class ChargeKind
 
     /**
      * @ORM\Column(type="string", length=255, options={"default": ""}, nullable=false)
+     *
      * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
+     *
      * @Assert\Length(min=3)
      */
     private string $kind = '';
@@ -70,7 +76,7 @@ class ChargeKind
         return $this->isActive;
     }
 
-    public function getKind(): ?string
+    public function getKind(): string
     {
         return $this->kind;
     }
@@ -92,7 +98,7 @@ class ChargeKind
         return $this;
     }
 
-    public function setKind(?string $kind): self
+    public function setKind(string $kind): self
     {
         $this->kind = $kind;
 
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Resource.php b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
index 28b8645e0..c4845ed1b 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Resource.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
@@ -13,33 +13,36 @@ namespace Chill\BudgetBundle\Entity;
 
 use Chill\MainBundle\Entity\HasCentersInterface;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Resource.
  *
  * @ORM\Table(name="chill_budget.resource")
+ *
  * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ResourceRepository")
  */
 class Resource extends AbstractElement implements HasCentersInterface
 {
     /**
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ResourceKind::class, inversedBy="AbstractElement")
+     *
      * @ORM\JoinColumn
      */
     private ?ResourceKind $resource = null;
 
     public function __construct()
     {
-        $this->setStartDate(new DateTimeImmutable('today'));
+        $this->setStartDate(new \DateTimeImmutable('today'));
     }
 
     public function getCenters(): array
diff --git a/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php b/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
index 4b90be5e1..78e0e6a32 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
@@ -19,16 +19,21 @@ use Symfony\Component\Validator\Constraints as Assert;
  * Type of resource.
  *
  * @ORM\Table(name="chill_budget.resource_type", uniqueConstraints={
+ *
  *     @ORM\UniqueConstraint(name="resource_kind_unique_type_idx", fields={"kind"})
  * })
+ *
  * @ORM\Entity
+ *
  * @UniqueEntity(fields={"kind"})
  */
 class ResourceKind
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -40,7 +45,9 @@ class ResourceKind
 
     /**
      * @ORM\Column(type="string", length=255, nullable=false, options={"default": ""})
+     *
      * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
+     *
      * @Assert\Length(min=3)
      */
     private string $kind = '';
diff --git a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
index 3356057cf..2d219b62a 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
@@ -27,21 +27,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ChargeType extends AbstractType
 {
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    private ChargeKindRepository $repository;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatableStringHelperInterface $translatableStringHelper,
-        ChargeKindRepository $repository,
-        TranslatorInterface $translator
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->repository = $repository;
-        $this->translator = $translator;
-    }
+    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper, private readonly ChargeKindRepository $repository, private readonly TranslatorInterface $translator) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -52,9 +38,7 @@ class ChargeType extends AbstractType
                 'label' => 'Charge type',
                 'required' => true,
                 'placeholder' => $this->translator->trans('admin.form.Choose the type of charge'),
-                'choice_label' => function (ChargeKind $resource) {
-                    return $this->translatableStringHelper->localize($resource->getName());
-                },
+                'choice_label' => fn (ChargeKind $resource) => $this->translatableStringHelper->localize($resource->getName()),
                 'attr' => ['class' => 'select2'],
             ])
             ->add('amount', MoneyType::class)
diff --git a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
index fd859217a..ba93f1080 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
@@ -26,21 +26,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ResourceType extends AbstractType
 {
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    private ResourceKindRepository $repository;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatableStringHelperInterface $translatableStringHelper,
-        ResourceKindRepository $repository,
-        TranslatorInterface $translator
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->repository = $repository;
-        $this->translator = $translator;
-    }
+    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper, private readonly ResourceKindRepository $repository, private readonly TranslatorInterface $translator) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -51,9 +37,7 @@ class ResourceType extends AbstractType
                 'label' => 'Resource type',
                 'required' => true,
                 'placeholder' => $this->translator->trans('admin.form.Choose the type of resource'),
-                'choice_label' => function (ResourceKind $resource) {
-                    return $this->translatableStringHelper->localize($resource->getName());
-                },
+                'choice_label' => fn (ResourceKind $resource) => $this->translatableStringHelper->localize($resource->getName()),
                 'attr' => ['class' => 'select2'],
             ])
             ->add('amount', MoneyType::class)
diff --git a/src/Bundle/ChillBudgetBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/AdminMenuBuilder.php
index 894230ad9..b8b4b617c 100644
--- a/src/Bundle/ChillBudgetBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillBudgetBundle/Menu/AdminMenuBuilder.php
@@ -15,14 +15,9 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
 
-final class AdminMenuBuilder implements LocalMenuBuilderInterface
+final readonly class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private Security $security) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
index 1224c0bfe..94583b439 100644
--- a/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
@@ -20,17 +20,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HouseholdMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected AuthorizationCheckerInterface $authorizationChecker;
-
-    protected TranslatorInterface $translator;
-
-    public function __construct(
-        AuthorizationCheckerInterface $authorizationChecker,
-        TranslatorInterface $translator
-    ) {
-        $this->authorizationChecker = $authorizationChecker;
-        $this->translator = $translator;
-    }
+    public function __construct(protected AuthorizationCheckerInterface $authorizationChecker, protected TranslatorInterface $translator) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
index 7322af849..25bd6a218 100644
--- a/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
@@ -20,17 +20,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected AuthorizationCheckerInterface $authorizationChecker;
-
-    protected TranslatorInterface $translator;
-
-    public function __construct(
-        AuthorizationCheckerInterface $authorizationChecker,
-        TranslatorInterface $translator
-    ) {
-        $this->authorizationChecker = $authorizationChecker;
-        $this->translator = $translator;
-    }
+    public function __construct(protected AuthorizationCheckerInterface $authorizationChecker, protected TranslatorInterface $translator) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
index 9aaf68ddf..577be07db 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class ChargeKindRepository implements ChargeKindRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -66,7 +66,7 @@ final class ChargeKindRepository implements ChargeKindRepositoryInterface
      *
      * @return array<ChargeKind>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php
index f92851eba..7a930bea8 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php
@@ -34,12 +34,9 @@ interface ChargeKindRepositoryInterface extends ObjectRepository
     public function findAllByType(string $type): array;
 
     /**
-     * @param int|null $limit
-     * @param int|null $offset
-     *
      * @return array<ChargeKind>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ChargeKind;
 
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
index 9b89010dc..3154a772d 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
@@ -14,7 +14,6 @@ namespace Chill\BudgetBundle\Repository;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -34,7 +33,7 @@ class ChargeRepository extends ServiceEntityRepository
     /**
      * @return Charge[]
      */
-    public function findAllByEntity(Person|Household $entity): array
+    public function findAllByEntity(Household|Person $entity): array
     {
         $qb = $this->createQueryBuilder('c');
 
@@ -46,7 +45,7 @@ class ChargeRepository extends ServiceEntityRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByEntityAndDate($entity, DateTime $date, $sort = null)
+    public function findByEntityAndDate($entity, \DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
 
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
index 1f9f99753..e10913195 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class ResourceKindRepository implements ResourceKindRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -54,7 +54,7 @@ final class ResourceKindRepository implements ResourceKindRepositoryInterface
 
     public function findOneByKind(string $kind): ?ResourceKind
     {
-        return $this->repository->findOneBy(['kind' => $kind]) ;
+        return $this->repository->findOneBy(['kind' => $kind]);
     }
 
     /**
@@ -71,7 +71,7 @@ final class ResourceKindRepository implements ResourceKindRepositoryInterface
      *
      * @return list<ResourceKind>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php
index dac46ff35..d639d54ee 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php
@@ -34,12 +34,9 @@ interface ResourceKindRepositoryInterface extends ObjectRepository
     public function findAllByType(string $type): array;
 
     /**
-     * @param int|null $limit
-     * @param int|null $offset
-     *
      * @return list<ResourceKind>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ResourceKind;
 
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
index 836f13e4b..2ba95e340 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
@@ -14,9 +14,7 @@ namespace Chill\BudgetBundle\Repository;
 use Chill\BudgetBundle\Entity\Resource;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -33,9 +31,9 @@ class ResourceRepository extends ServiceEntityRepository
     }
 
     /**
-     * @return Resource[]
+     * @return resource[]
      */
-    public function findAllByEntity(Person|Household $entity): array
+    public function findAllByEntity(Household|Person $entity): array
     {
         $qb = $this->createQueryBuilder('r');
 
@@ -47,7 +45,7 @@ class ResourceRepository extends ServiceEntityRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByEntityAndDate(Person|Household $entity, DateTime $date, $sort = null)
+    public function findByEntityAndDate(Household|Person $entity, \DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
 
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
index 62f4e3e96..dde039194 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
@@ -1,4 +1,4 @@
-{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+{% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
 
 <div class="accordion" id="future_{{ entity.id }}">
     <div class="accordion-item">
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
index 70e96d96c..a1fee19ce 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
@@ -1,11 +1,12 @@
-{% macro table_elements(elements, family) %}
+{% macro table_elements(elements, type) %}
+
 <table class="table table-bordered border-dark budget-table">
     <thead>
         <tr>
-            <th class="{{ family }} el-type">{{ 'Budget element type'|trans }}</th>
-            <th class="{{ family }}">{{ 'Amount'|trans }}</th>
-            <th class="{{ family }}">{{ 'Validity period'|trans }}</th>
-            <th class="{{ family }}">&nbsp;</th>
+            <th class="{{ type }} el-type">{{ 'Budget element type'|trans }}</th>
+            <th class="{{ type }}">{{ 'Amount'|trans }}</th>
+            <th class="{{ type }}">{{ 'Validity period'|trans }}</th>
+            <th class="{{ type }}">&nbsp;</th>
         </tr>
     </thead>
     <tbody>
@@ -16,8 +17,14 @@
             <td class="el-type">
                 {% if f.isResource %}
                     {{ f.resource.name|localize_translatable_string }}
+                    {% if f.resource.getKind is same as 'other' %}
+                        : {{ f.getComment }}
+                    {% endif %}
                 {% else %}
                     {{ f.charge.name|localize_translatable_string }}
+                        {% if f.charge.getKind is same as 'other' %}
+                            : {{ f.getComment }}
+                        {% endif %}
                 {% endif %}
             </td>
             <td>{{ f.amount|format_currency('EUR') }}</td>
@@ -32,17 +39,17 @@
                 <ul class="record_actions">
                     {% if is_granted('CHILL_BUDGET_ELEMENT_SEE', f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-sm btn-show"></a>
+                            <a href="{{ path('chill_budget_' ~ type ~ '_view', { 'id': f.id } ) }}" class="btn btn-sm btn-show"></a>
                         </li>
                     {% endif %}
                     {% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-sm btn-edit"></a>
+                            <a href="{{ path('chill_budget_' ~ type ~'_edit', { 'id': f.id } ) }}" class="btn btn-sm btn-edit"></a>
                         </li>
                     {% endif %}
                     {% if is_granted('CHILL_BUDGET_ELEMENT_DELETE', f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-sm btn-delete"></a>
+                            <a href="{{ path('chill_budget_' ~ type ~ '_delete', { 'id': f.id } ) }}" class="btn btn-sm btn-delete"></a>
                         </li>
                     {% endif %}
                 </ul>
@@ -63,7 +70,7 @@
 </table>
 {% endmacro %}
 
-{% macro table_results(actualCharges, actualResources) %}
+{% macro table_results(actualCharges, actualResources, results) %}
 
 {% set totalCharges = 0 %}
 {% for c in actualCharges %}
@@ -91,6 +98,20 @@
                 {{ result|format_currency('EUR') }}
             </td>
         </tr>
+        {% for result in results %}
+            <tr>
+                <td>{{ result.label }}</td>
+                <td>
+                    {% if result.type == 'currency' %}
+                        {{ result.result|format_currency('EUR') }}
+                    {% elseif result.type == 'percentage' %}
+                        {{ result.result|round(2, 'ceil') ~ '%' }}
+                    {% else %}
+                        {{ result.result|round(2, 'common') }}
+                    {% endif %}
+                </td>
+            </tr>
+        {% endfor %}
     </tbody>
 </table>
 {% endmacro %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
index ad0a12755..72c85c459 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
@@ -1,4 +1,4 @@
-{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+{% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
 
 <div class="accordion" id="past_{{ entity.id }}">
     <div class="accordion-item">
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
index 7a97731da..abfe9a6d5 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
@@ -18,7 +18,7 @@
 
 {% block content %}
 
-{{ include('ChillMainBundle:Util:confirmation_template.html.twig',
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Remove charge'|trans,
         'confirm_question'  : confirm_question,
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
index 1df92b297..738c5e825 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
@@ -1,6 +1,6 @@
 {% extends "@ChillPerson/Household/layout.html.twig" %}
 
-{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+{% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Budget for household %household%'|trans({ '%household%' : household.id } ) %}
@@ -17,7 +17,7 @@
 {% block content %}
 <h1>{{ title }}</h1>
 
-{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+{% include '@ChillBudget/Budget/_budget.html.twig' with {
     'resources': resources,
     'charges': charges,
     'household': household
@@ -57,7 +57,7 @@
 
                         <h2 class="mt-4">{{ 'Budget for %name%'|trans({'%name%': member.firstName ~ " " ~ member.lastName }) }}</h2>
 
-                        {% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+                        {% include '@ChillBudget/Budget/_budget.html.twig' with {
                             'resources': member.getBudgetResources,
                             'charges': member.getBudgetCharges,
                             'person': member
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
index 18d04b889..aaf840f33 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
@@ -1,6 +1,6 @@
 {% extends "@ChillPerson/Person/layout.html.twig" %}
 
-{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_results %}
+{% from '@ChillBudget/Budget/_macros.html.twig' import table_results %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -25,7 +25,7 @@
 
 <div class="mt-5">
     <h3 class="subtitle">{{ 'Budget calculator'|trans }}</h3>
-    {{ table_results(charges, resources) }}
+    {{ table_results(charges, resources, results) }}
 </div>
 
 {% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
index 5c2e80e10..afcb54c42 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
@@ -18,7 +18,7 @@
 
 {% block content %}
 
-{{ include('ChillMainBundle:Util:confirmation_template.html.twig',
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Remove resource'|trans,
         'confirm_question'  : confirm_question,
diff --git a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
index 5203f9092..f2340b8b9 100644
--- a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
+++ b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
@@ -20,24 +20,22 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
-use UnexpectedValueException;
-
 class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const CREATE = 'CHILL_BUDGET_ELEMENT_CREATE';
+    final public const CREATE = 'CHILL_BUDGET_ELEMENT_CREATE';
 
-    public const DELETE = 'CHILL_BUDGET_ELEMENT_DELETE';
+    final public const DELETE = 'CHILL_BUDGET_ELEMENT_DELETE';
 
-    public const ROLES = [
+    final public const ROLES = [
         self::CREATE,
         self::DELETE,
         self::SEE,
         self::UPDATE,
     ];
 
-    public const SEE = 'CHILL_BUDGET_ELEMENT_SEE';
+    final public const SEE = 'CHILL_BUDGET_ELEMENT_SEE';
 
-    public const UPDATE = 'CHILL_BUDGET_ELEMENT_UPDATE';
+    final public const UPDATE = 'CHILL_BUDGET_ELEMENT_UPDATE';
 
     protected VoterHelperInterface $voter;
 
@@ -91,6 +89,6 @@ class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierar
             return false;
         }
 
-        throw new UnexpectedValueException('This subject is not supported, or is an element not associated with person or household');
+        throw new \UnexpectedValueException('This subject is not supported, or is an element not associated with person or household');
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
index ad2a014ed..a57f7fb29 100644
--- a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
+++ b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
@@ -20,14 +20,11 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\ResultSetMapping;
-use LogicException;
-use RuntimeException;
-use function count;
 
 /**
  * Helps to find a summary of the budget: the sum of resources and charges.
  */
-final class SummaryBudget implements SummaryBudgetInterface
+final readonly class SummaryBudget implements SummaryBudgetInterface
 {
     private const QUERY_CHARGE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, charge_id AS kind_id FROM chill_budget.charge WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY charge_id';
 
@@ -37,25 +34,7 @@ final class SummaryBudget implements SummaryBudgetInterface
 
     private const QUERY_RESOURCE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, resource_id AS kind_id FROM chill_budget.resource WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY resource_id';
 
-    private ChargeKindRepositoryInterface $chargeKindRepository;
-
-    private EntityManagerInterface $em;
-
-    private ResourceKindRepositoryInterface $resourceKindRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        EntityManagerInterface $em,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        ResourceKindRepositoryInterface $resourceKindRepository,
-        ChargeKindRepositoryInterface $chargeKindRepository
-    ) {
-        $this->em = $em;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->resourceKindRepository = $resourceKindRepository;
-        $this->chargeKindRepository = $chargeKindRepository;
-    }
+    public function __construct(private EntityManagerInterface $em, private TranslatableStringHelperInterface $translatableStringHelper, private ResourceKindRepositoryInterface $resourceKindRepository, private ChargeKindRepositoryInterface $chargeKindRepository) {}
 
     public function getSummaryForHousehold(?Household $household): array
     {
@@ -66,10 +45,8 @@ final class SummaryBudget implements SummaryBudgetInterface
             ];
         }
 
-        $personIds = $household->getCurrentPersons()->map(static function (Person $p) {
-            return $p->getId();
-        });
-        $ids = implode(', ', array_fill(0, count($personIds), '?'));
+        $personIds = $household->getCurrentPersons()->map(static fn (Person $p) => $p->getId());
+        $ids = implode(', ', array_fill(0, \count($personIds), '?'));
 
         $parameters = [...$personIds, $household->getId()];
 
@@ -127,18 +104,14 @@ final class SummaryBudget implements SummaryBudgetInterface
     {
         $keys = array_map(static fn (ChargeKind $kind) => $kind->getKind(), $this->chargeKindRepository->findAll());
 
-        return array_combine($keys, array_map(function ($kind) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->chargeKindRepository->findOneByKind($kind)->getName()), 'comment' => ''];
-        }, $keys));
+        return array_combine($keys, array_map(fn ($kind) => ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->chargeKindRepository->findOneByKind($kind)->getName()), 'comment' => ''], $keys));
     }
 
     private function getEmptyResourceArray(): array
     {
         $keys = array_map(static fn (ResourceKind $kind) => $kind->getKind(), $this->resourceKindRepository->findAll());
 
-        return array_combine($keys, array_map(function ($kind) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->resourceKindRepository->findOneByKind($kind)->getName()), 'comment' => ''];
-        }, $keys));
+        return array_combine($keys, array_map(fn ($kind) => ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->resourceKindRepository->findOneByKind($kind)->getName()), 'comment' => ''], $keys));
     }
 
     private function rowToArray(array $rows, string $kind): array
@@ -151,7 +124,7 @@ final class SummaryBudget implements SummaryBudgetInterface
                     $chargeKind = $this->chargeKindRepository->find($row['kind_id']);
 
                     if (null === $chargeKind) {
-                        throw new RuntimeException('charge kind not found: ' . $row['kind_id']);
+                        throw new \RuntimeException('charge kind not found: '.$row['kind_id']);
                     }
                     $result[$chargeKind->getKind()] = [
                         'sum' => (float) $row['sum'],
@@ -167,7 +140,7 @@ final class SummaryBudget implements SummaryBudgetInterface
                     $resourceKind = $this->resourceKindRepository->find($row['kind_id']);
 
                     if (null === $resourceKind) {
-                        throw new RuntimeException('charge kind not found: ' . $row['kind_id']);
+                        throw new \RuntimeException('charge kind not found: '.$row['kind_id']);
                     }
 
                     $result[$resourceKind->getKind()] = [
@@ -180,7 +153,7 @@ final class SummaryBudget implements SummaryBudgetInterface
                 return $result;
 
             default:
-                throw new LogicException();
+                throw new \LogicException();
         }
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Templating/BudgetElementTypeRender.php b/src/Bundle/ChillBudgetBundle/Templating/BudgetElementTypeRender.php
index 842e6be4e..26871b0f4 100644
--- a/src/Bundle/ChillBudgetBundle/Templating/BudgetElementTypeRender.php
+++ b/src/Bundle/ChillBudgetBundle/Templating/BudgetElementTypeRender.php
@@ -15,22 +15,13 @@ use Chill\BudgetBundle\Entity\ChargeKind;
 use Chill\BudgetBundle\Entity\ResourceKind;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @implements ChillEntityRenderInterface<ResourceKind|ChargeKind>
  */
-final class BudgetElementTypeRender implements ChillEntityRenderInterface
+final readonly class BudgetElementTypeRender implements ChillEntityRenderInterface
 {
-    private EngineInterface $engine;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelperInterface $translatableStringHelper, EngineInterface $engine)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->engine = $engine;
-    }
+    public function __construct(private TranslatableStringHelperInterface $translatableStringHelper, private \Twig\Environment $engine) {}
 
     public function renderBox($entity, array $options): string
     {
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
index 925506a99..52fae812e 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
@@ -15,10 +15,14 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ElementControllerTest extends WebTestCase
 {
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testIndex()
     {
         $client = self::createClient();
@@ -26,6 +30,9 @@ final class ElementControllerTest extends WebTestCase
         $crawler = $client->request('GET', '/index');
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testList()
     {
         $client = self::createClient();
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
index 7fcda6b11..7fb437e05 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php
@@ -20,15 +20,12 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionClass;
-use RuntimeException;
 
 /**
  * @internal
@@ -50,9 +47,7 @@ final class SummaryBudgetTest extends TestCase
             ],
         ]);
         $queryCharges->setParameters(Argument::type('array'))
-            ->will(static function ($args, $query) {
-                return $query;
-            });
+            ->will(static fn ($args, $query) => $query);
 
         $queryResources = $this->prophesize(AbstractQuery::class);
         $queryResources->getResult()->willReturn([
@@ -63,22 +58,20 @@ final class SummaryBudgetTest extends TestCase
             ],
         ]);
         $queryResources->setParameters(Argument::type('array'))
-            ->will(static function ($args, $query) {
-                return $query;
-            });
+            ->will(static fn ($args, $query) => $query);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->createNativeQuery(Argument::type('string'), Argument::type(Query\ResultSetMapping::class))
             ->will(static function ($args) use ($queryResources, $queryCharges) {
-                if (false !== strpos($args[0], 'chill_budget.resource')) {
+                if (str_contains((string) $args[0], 'chill_budget.resource')) {
                     return $queryResources->reveal();
                 }
 
-                if (false !== strpos($args[0], 'chill_budget.charge')) {
+                if (str_contains((string) $args[0], 'chill_budget.charge')) {
                     return $queryCharges->reveal();
                 }
 
-                throw new RuntimeException('this query does not have a stub counterpart: ' . $args[0]);
+                throw new \RuntimeException('this query does not have a stub counterpart: '.$args[0]);
             });
 
         $chargeRepository = $this->prophesize(ChargeKindRepositoryInterface::class);
@@ -100,23 +93,21 @@ final class SummaryBudgetTest extends TestCase
         $resourceRepository->findOneByKind('misc')->willReturn($misc);
 
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
-        $translatableStringHelper->localize(Argument::type('array'))->will(static function ($arg) {
-            return $arg[0]['fr'];
-        });
+        $translatableStringHelper->localize(Argument::type('array'))->will(static fn ($arg) => $arg[0]['fr']);
 
         $person = new Person();
-        $personReflection = new ReflectionClass($person);
+        $personReflection = new \ReflectionClass($person);
         $personIdReflection = $personReflection->getProperty('id');
         $personIdReflection->setAccessible(true);
         $personIdReflection->setValue($person, 1);
 
         $household = new Household();
-        $householdReflection = new ReflectionClass($household);
+        $householdReflection = new \ReflectionClass($household);
         $householdId = $householdReflection->getProperty('id');
         $householdId->setAccessible(true);
         $householdId->setValue($household, 1);
         $householdMember = (new HouseholdMember())->setPerson($person)
-            ->setStartDate(new DateTimeImmutable('1 month ago'));
+            ->setStartDate(new \DateTimeImmutable('1 month ago'));
         $household->addMember($householdMember);
 
         $summaryBudget = new SummaryBudget(
diff --git a/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php b/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php
index cfe3a0089..1d2707120 100644
--- a/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php
@@ -32,7 +32,7 @@ final class Version20221207105407 extends AbstractMigration implements Container
         return 'Use new budget admin entities';
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
diff --git a/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php
index e2042b114..f0f20181a 100644
--- a/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php
+++ b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php
@@ -21,6 +21,6 @@ class ChillCalendarBundle extends Bundle
     {
         parent::build($container);
 
-        $container->addCompilerPass(new RemoteCalendarCompilerPass());
+        $container->addCompilerPass(new RemoteCalendarCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php b/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
index 400619990..c9bf020b1 100644
--- a/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
+++ b/src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
@@ -29,22 +29,12 @@ use TheNetworg\OAuth2\Client\Provider\Azure;
 
 class AzureGrantAdminConsentAndAcquireToken extends Command
 {
-    private Azure $azure;
-
-    private ClientRegistry $clientRegistry;
-
-    private MachineTokenStorage $machineTokenStorage;
-
-    public function __construct(Azure $azure, ClientRegistry $clientRegistry, MachineTokenStorage $machineTokenStorage)
+    public function __construct(private readonly Azure $azure, private readonly ClientRegistry $clientRegistry, private readonly MachineTokenStorage $machineTokenStorage)
     {
         parent::__construct('chill:calendar:msgraph-grant-admin-consent');
-
-        $this->azure = $azure;
-        $this->clientRegistry = $clientRegistry;
-        $this->machineTokenStorage = $machineTokenStorage;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         /** @var FormatterHelper $formatter */
         $formatter = $this->getHelper('formatter');
@@ -76,8 +66,8 @@ class AzureGrantAdminConsentAndAcquireToken extends Command
 
         $output->writeln('Token information:');
         $output->writeln($token->getToken());
-        $output->writeln('Expires at: ' . $token->getExpires());
-        $output->writeln('To inspect the token content, go to https://jwt.ms/#access_token=' . urlencode($token->getToken()));
+        $output->writeln('Expires at: '.$token->getExpires());
+        $output->writeln('To inspect the token content, go to https://jwt.ms/#access_token='.urlencode($token->getToken()));
 
         return 0;
     }
diff --git a/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php b/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
index d0fdd0a02..4964f0064 100644
--- a/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
+++ b/src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
@@ -18,11 +18,11 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Command;
 
+use Chill\CalendarBundle\Exception\UserAbsenceSyncException;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\EventsOnUserSubscriptionCreator;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MapCalendarToUser;
-use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSGraphUserRepository;
-use DateInterval;
-use DateTimeImmutable;
+use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceSync;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
@@ -30,120 +30,130 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class MapAndSubscribeUserCalendarCommand extends Command
+final class MapAndSubscribeUserCalendarCommand extends Command
 {
-    private EntityManagerInterface $em;
-
-    private EventsOnUserSubscriptionCreator $eventsOnUserSubscriptionCreator;
-
-    private LoggerInterface $logger;
-
-    private MapCalendarToUser $mapCalendarToUser;
-
-    private MSGraphUserRepository $userRepository;
-
     public function __construct(
-        EntityManagerInterface $em,
-        EventsOnUserSubscriptionCreator $eventsOnUserSubscriptionCreator,
-        LoggerInterface $logger,
-        MapCalendarToUser $mapCalendarToUser,
-        MSGraphUserRepository $userRepository
+        private readonly EntityManagerInterface $em,
+        private readonly EventsOnUserSubscriptionCreator $eventsOnUserSubscriptionCreator,
+        private readonly LoggerInterface $logger,
+        private readonly MapCalendarToUser $mapCalendarToUser,
+        private readonly UserRepositoryInterface $userRepository,
+        private readonly MSUserAbsenceSync $userAbsenceSync,
     ) {
         parent::__construct('chill:calendar:msgraph-user-map-subscribe');
-
-        $this->em = $em;
-        $this->eventsOnUserSubscriptionCreator = $eventsOnUserSubscriptionCreator;
-        $this->logger = $logger;
-        $this->mapCalendarToUser = $mapCalendarToUser;
-        $this->userRepository = $userRepository;
     }
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $this->logger->info(__CLASS__ . ' execute command');
+        $this->logger->info(self::class.' execute command');
 
         $limit = 50;
         $offset = 0;
-        /** @var DateInterval $interval the interval before the end of the expiration */
-        $interval = new DateInterval('P1D');
-        $expiration = (new DateTimeImmutable('now'))->add(new DateInterval($input->getOption('subscription-duration')));
-        $total = $this->userRepository->countByMostOldSubscriptionOrWithoutSubscriptionOrData($interval);
+        /** @var \DateInterval $interval the interval before the end of the expiration */
+        $interval = new \DateInterval('P1D');
+        $expiration = (new \DateTimeImmutable('now'))->add(new \DateInterval($input->getOption('subscription-duration')));
+        $users = $this->userRepository->findAllAsArray('fr');
         $created = 0;
         $renewed = 0;
 
-        $this->logger->info(__CLASS__ . ' the number of user to get - renew', [
-            'total' => $total,
-            'expiration' => $expiration->format(DateTimeImmutable::ATOM),
+        $this->logger->info(self::class.' start user to get - renew', [
+            'expiration' => $expiration->format(\DateTimeImmutable::ATOM),
         ]);
 
-        while ($offset < $total) {
-            $users = $this->userRepository->findByMostOldSubscriptionOrWithoutSubscriptionOrData(
-                $interval,
-                $limit,
-                $offset
-            );
+        foreach ($users as $u) {
+            ++$offset;
 
-            foreach ($users as $user) {
-                if (!$this->mapCalendarToUser->hasUserId($user)) {
-                    $this->mapCalendarToUser->writeMetadata($user);
-                }
-
-                if ($this->mapCalendarToUser->hasUserId($user)) {
-                    // we first try to renew an existing subscription, if any.
-                    // if not, or if it fails, we try to create a new one
-                    if ($this->mapCalendarToUser->hasActiveSubscription($user)) {
-                        $this->logger->debug(__CLASS__ . ' renew a subscription for', [
-                            'userId' => $user->getId(),
-                            'username' => $user->getUsernameCanonical(),
-                        ]);
-
-                        ['secret' => $secret, 'id' => $id, 'expiration' => $expirationTs]
-                            = $this->eventsOnUserSubscriptionCreator->renewSubscriptionForUser($user, $expiration);
-                        $this->mapCalendarToUser->writeSubscriptionMetadata($user, $expirationTs, $id, $secret);
-
-                        if (0 !== $expirationTs) {
-                            ++$renewed;
-                        } else {
-                            $this->logger->warning(__CLASS__ . ' could not renew subscription for a user', [
-                                'userId' => $user->getId(),
-                                'username' => $user->getUsernameCanonical(),
-                            ]);
-                        }
-                    }
-
-                    if (!$this->mapCalendarToUser->hasActiveSubscription($user)) {
-                        $this->logger->debug(__CLASS__ . ' create a subscription for', [
-                            'userId' => $user->getId(),
-                            'username' => $user->getUsernameCanonical(),
-                        ]);
-
-                        ['secret' => $secret, 'id' => $id, 'expiration' => $expirationTs]
-                            = $this->eventsOnUserSubscriptionCreator->createSubscriptionForUser($user, $expiration);
-                        $this->mapCalendarToUser->writeSubscriptionMetadata($user, $expirationTs, $id, $secret);
-
-                        if (0 !== $expirationTs) {
-                            ++$created;
-                        } else {
-                            $this->logger->warning(__CLASS__ . ' could not create subscription for a user', [
-                                'userId' => $user->getId(),
-                                'username' => $user->getUsernameCanonical(),
-                            ]);
-                        }
-                    }
-                }
-
-                ++$offset;
+            if (false === $u['enabled']) {
+                continue;
             }
 
-            $this->em->flush();
-            $this->em->clear();
+            $user = $this->userRepository->find($u['id']);
+
+            if (null === $user) {
+                $this->logger->error('could not find user by id', ['uid' => $u['id']]);
+                $output->writeln('could not find user by id : '.$u['id']);
+                continue;
+            }
+
+            if (!$this->mapCalendarToUser->hasUserId($user)) {
+                $user = $this->mapCalendarToUser->writeMetadata($user);
+
+                // if user still does not have userid, continue
+                if (!$this->mapCalendarToUser->hasUserId($user)) {
+                    $this->logger->warning('user does not have a counterpart on ms api', ['userId' => $user->getId(), 'email' => $user->getEmail()]);
+                    $output->writeln(sprintf('giving up for user with email %s and id %s', $user->getEmail(), $user->getId()));
+
+                    continue;
+                }
+            }
+
+            // sync user absence
+            try {
+                $this->userAbsenceSync->syncUserAbsence($user);
+            } catch (UserAbsenceSyncException $e) {
+                $this->logger->error('could not sync user absence', ['userId' => $user->getId(), 'email' => $user->getEmail(), 'exception' => $e->getTraceAsString(), 'message' => $e->getMessage()]);
+                $output->writeln(sprintf('Could not sync user absence: id: %s and email: %s', $user->getId(), $user->getEmail()));
+                throw $e;
+            }
+
+            // we first try to renew an existing subscription, if any.
+            // if not, or if it fails, we try to create a new one
+            if ($this->mapCalendarToUser->hasActiveSubscription($user)) {
+                $this->logger->debug(self::class.' renew a subscription for', [
+                    'userId' => $user->getId(),
+                    'username' => $user->getUsernameCanonical(),
+                ]);
+
+                ['secret' => $secret, 'id' => $id, 'expiration' => $expirationTs]
+                    = $this->eventsOnUserSubscriptionCreator->renewSubscriptionForUser($user, $expiration);
+                $this->mapCalendarToUser->writeSubscriptionMetadata($user, $expirationTs, $id, $secret);
+
+                if (0 !== $expirationTs) {
+                    ++$renewed;
+                } else {
+                    $this->logger->warning(self::class.' could not renew subscription for a user', [
+                        'userId' => $user->getId(),
+                        'username' => $user->getUsernameCanonical(),
+                    ]);
+                }
+            }
+
+            if (!$this->mapCalendarToUser->hasActiveSubscription($user)) {
+                $this->logger->debug(self::class.' create a subscription for', [
+                    'userId' => $user->getId(),
+                    'username' => $user->getUsernameCanonical(),
+                ]);
+
+                ['secret' => $secret, 'id' => $id, 'expiration' => $expirationTs]
+                    = $this->eventsOnUserSubscriptionCreator->createSubscriptionForUser($user, $expiration);
+                $this->mapCalendarToUser->writeSubscriptionMetadata($user, $expirationTs, $id, $secret);
+
+                if (0 !== $expirationTs) {
+                    ++$created;
+                } else {
+                    $this->logger->warning(self::class.' could not create subscription for a user', [
+                        'userId' => $user->getId(),
+                        'username' => $user->getUsernameCanonical(),
+                    ]);
+                }
+            }
+
+            if (0 === $offset % $limit) {
+                $this->em->flush();
+                $this->em->clear();
+            }
         }
 
-        $this->logger->warning(__CLASS__ . ' process executed', [
+        $this->em->flush();
+        $this->em->clear();
+
+        $this->logger->warning(self::class.' process executed', [
             'created' => $created,
             'renewed' => $renewed,
         ]);
 
+        $output->writeln('users synchronized');
+
         return 0;
     }
 
@@ -152,7 +162,7 @@ class MapAndSubscribeUserCalendarCommand extends Command
         parent::configure();
 
         $this
-            ->setDescription('MSGraph: collect user metadata and create subscription on events for users')
+            ->setDescription('MSGraph: collect user metadata and create subscription on events for users, and sync the user absence-presence')
             ->addOption(
                 'renew-before-end-interval',
                 'r',
diff --git a/src/Bundle/ChillCalendarBundle/Command/SendShortMessageOnEligibleCalendar.php b/src/Bundle/ChillCalendarBundle/Command/SendShortMessageOnEligibleCalendar.php
index 6625a7adb..a027c1bc2 100644
--- a/src/Bundle/ChillCalendarBundle/Command/SendShortMessageOnEligibleCalendar.php
+++ b/src/Bundle/ChillCalendarBundle/Command/SendShortMessageOnEligibleCalendar.php
@@ -25,13 +25,9 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class SendShortMessageOnEligibleCalendar extends Command
 {
-    private BulkCalendarShortMessageSender $messageSender;
-
-    public function __construct(BulkCalendarShortMessageSender $messageSender)
+    public function __construct(private readonly BulkCalendarShortMessageSender $messageSender)
     {
         parent::__construct();
-
-        $this->messageSender = $messageSender;
     }
 
     public function getName()
@@ -39,7 +35,7 @@ class SendShortMessageOnEligibleCalendar extends Command
         return 'chill:calendar:send-short-messages';
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->messageSender->sendBulkMessageToEligibleCalendars();
 
diff --git a/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php b/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
index 5891a7be8..bfbdd2abd 100644
--- a/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
+++ b/src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
@@ -26,8 +26,6 @@ use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Service\ShortMessage\ShortMessageTransporterInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
-use DateInterval;
-use DateTimeImmutable;
 use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberType;
@@ -38,39 +36,18 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
-use UnexpectedValueException;
-use function count;
 
 class SendTestShortMessageOnCalendarCommand extends Command
 {
-    private ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder;
-
-    private PersonRepository $personRepository;
-
-    private PhoneNumberHelperInterface $phoneNumberHelper;
-
-    private PhoneNumberUtil $phoneNumberUtil;
-
-    private ShortMessageTransporterInterface $transporter;
-
-    private UserRepositoryInterface $userRepository;
-
     public function __construct(
-        PersonRepository $personRepository,
-        PhoneNumberUtil $phoneNumberUtil,
-        PhoneNumberHelperInterface $phoneNumberHelper,
-        ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder,
-        ShortMessageTransporterInterface $transporter,
-        UserRepositoryInterface $userRepository
+        private readonly PersonRepository $personRepository,
+        private readonly PhoneNumberUtil $phoneNumberUtil,
+        private readonly PhoneNumberHelperInterface $phoneNumberHelper,
+        private readonly ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder,
+        private readonly ShortMessageTransporterInterface $transporter,
+        private readonly UserRepositoryInterface $userRepository
     ) {
         parent::__construct();
-
-        $this->personRepository = $personRepository;
-        $this->phoneNumberUtil = $phoneNumberUtil;
-        $this->phoneNumberHelper = $phoneNumberHelper;
-        $this->messageForCalendarBuilder = $messageForCalendarBuilder;
-        $this->transporter = $transporter;
-        $this->userRepository = $userRepository;
     }
 
     public function getName()
@@ -93,20 +70,20 @@ class SendTestShortMessageOnCalendarCommand extends Command
 
         // start date
         $question = new Question('When will start the appointment ? (default: "1 hour") ', '1 hour');
-        $startDate = new DateTimeImmutable($helper->ask($input, $output, $question));
+        $startDate = new \DateTimeImmutable($helper->ask($input, $output, $question));
 
         if (false === $startDate) {
-            throw new UnexpectedValueException('could not create a date with this date and time');
+            throw new \UnexpectedValueException('could not create a date with this date and time');
         }
 
         $calendar->setStartDate($startDate);
 
         // end date
         $question = new Question('How long will last the appointment ? (default: "PT30M") ', 'PT30M');
-        $interval = new DateInterval($helper->ask($input, $output, $question));
+        $interval = new \DateInterval($helper->ask($input, $output, $question));
 
         if (false === $interval) {
-            throw new UnexpectedValueException('could not create the interval');
+            throw new \UnexpectedValueException('could not create the interval');
         }
 
         $calendar->setEndDate($calendar->getStartDate()->add($interval));
@@ -116,17 +93,17 @@ class SendTestShortMessageOnCalendarCommand extends Command
         $question
             ->setValidator(function ($answer): Person {
                 if (!is_numeric($answer)) {
-                    throw new UnexpectedValueException('the answer must be numeric');
+                    throw new \UnexpectedValueException('the answer must be numeric');
                 }
 
                 if (0 >= (int) $answer) {
-                    throw new UnexpectedValueException('the answer must be greater than zero');
+                    throw new \UnexpectedValueException('the answer must be greater than zero');
                 }
 
                 $person = $this->personRepository->find((int) $answer);
 
                 if (null === $person) {
-                    throw new UnexpectedValueException('The person is not found');
+                    throw new \UnexpectedValueException('The person is not found');
                 }
 
                 return $person;
@@ -140,17 +117,17 @@ class SendTestShortMessageOnCalendarCommand extends Command
         $question
             ->setValidator(function ($answer): User {
                 if (!is_numeric($answer)) {
-                    throw new UnexpectedValueException('the answer must be numeric');
+                    throw new \UnexpectedValueException('the answer must be numeric');
                 }
 
                 if (0 >= (int) $answer) {
-                    throw new UnexpectedValueException('the answer must be greater than zero');
+                    throw new \UnexpectedValueException('the answer must be greater than zero');
                 }
 
                 $user = $this->userRepository->find((int) $answer);
 
                 if (null === $user) {
-                    throw new UnexpectedValueException('The user is not found');
+                    throw new \UnexpectedValueException('The user is not found');
                 }
 
                 return $user;
@@ -169,13 +146,13 @@ class SendTestShortMessageOnCalendarCommand extends Command
 
         $question->setNormalizer(function ($answer): PhoneNumber {
             if (null === $answer) {
-                throw new UnexpectedValueException('The person is not found');
+                throw new \UnexpectedValueException('The person is not found');
             }
 
             $phone = $this->phoneNumberUtil->parse($answer, 'BE');
 
             if (!$this->phoneNumberUtil->isPossibleNumberForType($phone, PhoneNumberType::MOBILE)) {
-                throw new UnexpectedValueException('Phone number si not a mobile');
+                throw new \UnexpectedValueException('Phone number si not a mobile');
             }
 
             return $phone;
@@ -188,7 +165,7 @@ class SendTestShortMessageOnCalendarCommand extends Command
 
         $messages = $this->messageForCalendarBuilder->buildMessageForCalendar($calendar);
 
-        if (0 === count($messages)) {
+        if (0 === \count($messages)) {
             $output->writeln('no message to send to this user');
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
index 23f39a295..fceddf45a 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
@@ -23,6 +23,6 @@ class AdminController extends AbstractController
      */
     public function indexAdminAction()
     {
-        return $this->render('ChillCalendarBundle:Admin:index.html.twig');
+        return $this->render('@ChillCalendar/Admin/index.html.twig');
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
index 8e0e8099c..1729c215b 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
@@ -15,7 +15,6 @@ use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Serializer\Model\Collection;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -24,12 +23,7 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class CalendarAPIController extends ApiController
 {
-    private CalendarRepository $calendarRepository;
-
-    public function __construct(CalendarRepository $calendarRepository)
-    {
-        $this->calendarRepository = $calendarRepository;
-    }
+    public function __construct(private readonly CalendarRepository $calendarRepository) {}
 
     /**
      * @Route("/api/1.0/calendar/calendar/by-user/{id}.{_format}",
@@ -45,8 +39,8 @@ class CalendarAPIController extends ApiController
             throw new BadRequestHttpException('You must provide a dateFrom parameter');
         }
 
-        if (false === $dateFrom = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateFrom = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateFrom')
         )) {
             throw new BadRequestHttpException('dateFrom not parsable');
@@ -56,8 +50,8 @@ class CalendarAPIController extends ApiController
             throw new BadRequestHttpException('You must provide a dateTo parameter');
         }
 
-        if (false === $dateTo = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateTo = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateTo')
         )) {
             throw new BadRequestHttpException('dateTo not parsable');
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index eed693451..f4694614f 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -30,11 +30,8 @@ use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
-use Exception;
 use http\Exception\UnexpectedValueException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
@@ -49,57 +46,20 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class CalendarController extends AbstractController
 {
-    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
-
-    private CalendarACLAwareRepositoryInterface $calendarACLAwareRepository;
-
-    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
-
-    private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
-
-    private LoggerInterface $logger;
-
-    private PaginatorFactory $paginator;
-
-    private PersonRepository $personRepository;
-
-    private RemoteCalendarConnectorInterface $remoteCalendarConnector;
-
-    private SerializerInterface $serializer;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    private UserRepositoryInterface $userRepository;
-
     public function __construct(
-        CalendarACLAwareRepositoryInterface $calendarACLAwareRepository,
-        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
-        LoggerInterface $logger,
-        PaginatorFactory $paginator,
-        RemoteCalendarConnectorInterface $remoteCalendarConnector,
-        SerializerInterface $serializer,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        PersonRepository $personRepository,
-        AccompanyingPeriodRepository $accompanyingPeriodRepository,
-        UserRepositoryInterface $userRepository,
-        TranslatorInterface $translator
-    ) {
-        $this->calendarACLAwareRepository = $calendarACLAwareRepository;
-        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->filterOrderHelperFactory = $filterOrderHelperFactory;
-        $this->logger = $logger;
-        $this->paginator = $paginator;
-        $this->remoteCalendarConnector = $remoteCalendarConnector;
-        $this->serializer = $serializer;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->personRepository = $personRepository;
-        $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
-        $this->userRepository = $userRepository;
-        $this->translator = $translator;
-    }
+        private readonly CalendarACLAwareRepositoryInterface $calendarACLAwareRepository,
+        private readonly DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
+        private readonly LoggerInterface $logger,
+        private readonly PaginatorFactory $paginator,
+        private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector,
+        private readonly SerializerInterface $serializer,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly PersonRepository $personRepository,
+        private readonly AccompanyingPeriodRepository $accompanyingPeriodRepository,
+        private readonly UserRepositoryInterface $userRepository,
+        private readonly TranslatorInterface $translator
+    ) {}
 
     /**
      * Delete a calendar item.
@@ -119,12 +79,12 @@ class CalendarController extends AbstractController
             $view = '@ChillCalendar/Calendar/confirm_deleteByPerson.html.twig';
             $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
         } else {
-            throw new RuntimeException('nor person or accompanying period');
+            throw new \RuntimeException('nor person or accompanying period');
         }
 
         $form = $this->createDeleteForm($entity);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -175,7 +135,7 @@ class CalendarController extends AbstractController
             $view = '@ChillCalendar/Calendar/editByPerson.html.twig';
             $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
         } else {
-            throw new RuntimeException('no person nor accompanying period');
+            throw new \RuntimeException('no person nor accompanying period');
         }
 
         $form = $this->createForm(CalendarType::class, $entity)
@@ -185,7 +145,7 @@ class CalendarController extends AbstractController
         $templates = $this->docGeneratorTemplateRepository->findByEntity(Calendar::class);
 
         foreach ($templates as $template) {
-            $form->add('save_and_generate_doc_' . $template->getId(), SubmitType::class, [
+            $form->add('save_and_generate_doc_'.$template->getId(), SubmitType::class, [
                 'label' => $this->translatableStringHelper->localize($template->getName()),
             ]);
         }
@@ -202,7 +162,7 @@ class CalendarController extends AbstractController
             }
 
             foreach ($templates as $template) {
-                if ($form->get('save_and_generate_doc_' . $template->getId())->isClicked()) {
+                if ($form->get('save_and_generate_doc_'.$template->getId())->isClicked()) {
                     return $this->redirectToRoute('chill_docgenerator_generate_from_template', [
                         'entityClassName' => Calendar::class,
                         'entityId' => $entity->getId(),
@@ -364,7 +324,7 @@ class CalendarController extends AbstractController
         $form->add('save_and_upload_doc', SubmitType::class);
 
         foreach ($templates as $template) {
-            $form->add('save_and_generate_doc_' . $template->getId(), SubmitType::class, [
+            $form->add('save_and_generate_doc_'.$template->getId(), SubmitType::class, [
                 'label' => $this->translatableStringHelper->localize($template->getName()),
             ]);
         }
@@ -379,12 +339,12 @@ class CalendarController extends AbstractController
 
             if ($form->get('save_and_upload_doc')->isClicked()) {
                 return $this->redirectToRoute('chill_calendar_calendardoc_new', [
-                    'id' => $entity->getId()
+                    'id' => $entity->getId(),
                 ]);
             }
 
             foreach ($templates as $template) {
-                if ($form->get('save_and_generate_doc_' . $template->getId())->isClicked()) {
+                if ($form->get('save_and_generate_doc_'.$template->getId())->isClicked()) {
                     return $this->redirectToRoute('chill_docgenerator_generate_from_template', [
                         'entityClassName' => Calendar::class,
                         'entityId' => $entity->getId(),
@@ -429,7 +389,7 @@ class CalendarController extends AbstractController
      */
     public function showAction(Request $request, int $id): Response
     {
-        throw new Exception('not implemented');
+        throw new \Exception('not implemented');
         $view = null;
         $em = $this->getDoctrine()->getManager();
 
@@ -490,7 +450,7 @@ class CalendarController extends AbstractController
             'entity' => $entity,
             'user' => $user,
             'activityData' => $activityData,
-            //'delete_form' => $deleteForm->createView(),
+            // 'delete_form' => $deleteForm->createView(),
         ]);
     }
 
@@ -535,12 +495,12 @@ class CalendarController extends AbstractController
             'returnPath' => $request->query->get('returnPath', null),
         ];
 
-        if ($calendar->getContext() === 'accompanying_period') {
+        if ('accompanying_period' === $calendar->getContext()) {
             $routeParams['accompanying_period_id'] = $calendar->getAccompanyingPeriod()->getId();
-        } elseif ($calendar->getContext() === 'person') {
+        } elseif ('person' === $calendar->getContext()) {
             $routeParams['person_id'] = $calendar->getPerson()->getId();
         } else {
-            throw new RuntimeException('context not found for this calendar');
+            throw new \RuntimeException('context not found for this calendar');
         }
 
         return $this->redirectToRoute('chill_activity_activity_new', $routeParams);
@@ -549,7 +509,7 @@ class CalendarController extends AbstractController
     private function buildListFilterOrder(): FilterOrderHelper
     {
         $filterOrder = $this->filterOrderHelperFactory->create(self::class);
-        $filterOrder->addDateRange('startDate', null, new DateTimeImmutable('3 days ago'), null);
+        $filterOrder->addDateRange('startDate', null, new \DateTimeImmutable('3 days ago'), null);
 
         return $filterOrder->build();
     }
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
index d02e55f32..d0f5e623d 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
@@ -16,7 +16,6 @@ use Chill\CalendarBundle\Entity\CalendarDoc;
 use Chill\CalendarBundle\Form\CalendarDocCreateType;
 use Chill\CalendarBundle\Form\CalendarDocEditType;
 use Chill\CalendarBundle\Security\Voter\CalendarDocVoter;
-use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -27,41 +26,16 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Templating\EngineInterface;
-use UnexpectedValueException;
 
-class CalendarDocController
+final readonly class CalendarDocController
 {
-    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
-
-    private EngineInterface $engine;
-
-    private EntityManagerInterface $entityManager;
-
-    private FormFactoryInterface $formFactory;
-
-    private Security $security;
-
-    private SerializerInterface $serializer;
-
-    private UrlGeneratorInterface $urlGenerator;
-
     public function __construct(
-        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        EngineInterface $engine,
-        EntityManagerInterface $entityManager,
-        FormFactoryInterface $formFactory,
-        Security $security,
-        UrlGeneratorInterface $urlGenerator
-    ) {
-        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->engine = $engine;
-        $this->entityManager = $entityManager;
-        $this->formFactory = $formFactory;
-        $this->security = $security;
-        $this->urlGenerator = $urlGenerator;
-    }
+        private \Twig\Environment $engine,
+        private EntityManagerInterface $entityManager,
+        private FormFactoryInterface $formFactory,
+        private Security $security,
+        private UrlGeneratorInterface $urlGenerator,
+    ) {}
 
     /**
      * @Route("/{_locale}/calendar/calendar-doc/{id}/new", name="chill_calendar_calendardoc_new")
@@ -91,7 +65,7 @@ class CalendarDocController
                 break;
 
             default:
-                throw new UnexpectedValueException('Unsupported context');
+                throw new \UnexpectedValueException('Unsupported context');
         }
 
         $calendarDocDTO = new CalendarDoc\CalendarDocCreateDTO();
@@ -208,7 +182,7 @@ class CalendarDocController
                 break;
 
             default:
-                throw new UnexpectedValueException('Unsupported context');
+                throw new \UnexpectedValueException('Unsupported context');
         }
 
         $calendarDocEditDTO = new CalendarDoc\CalendarDocEditDTO($calendarDoc);
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
index 383e24efc..459d8f6aa 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
@@ -15,22 +15,15 @@ use Chill\CalendarBundle\Repository\CalendarRangeRepository;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Serializer\Model\Collection;
-use DateTimeImmutable;
 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;
 
 class CalendarRangeAPIController extends ApiController
 {
-    private CalendarRangeRepository $calendarRangeRepository;
-
-    public function __construct(CalendarRangeRepository $calendarRangeRepository)
-    {
-        $this->calendarRangeRepository = $calendarRangeRepository;
-    }
+    public function __construct(private readonly CalendarRangeRepository $calendarRangeRepository) {}
 
     /**
      * @Route("/api/1.0/calendar/calendar-range-available/{id}.{_format}",
@@ -40,15 +33,15 @@ class CalendarRangeAPIController extends ApiController
      */
     public function availableRanges(User $user, Request $request, string $_format): JsonResponse
     {
-        //return new JsonResponse(['ok' => true], 200, [], false);
+        // return new JsonResponse(['ok' => true], 200, [], false);
         $this->denyAccessUnlessGranted('ROLE_USER');
 
         if (!$request->query->has('dateFrom')) {
             throw new BadRequestHttpException('You must provide a dateFrom parameter');
         }
 
-        if (false === $dateFrom = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateFrom = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateFrom')
         )) {
             throw new BadRequestHttpException('dateFrom not parsable');
@@ -58,8 +51,8 @@ class CalendarRangeAPIController extends ApiController
             throw new BadRequestHttpException('You must provide a dateTo parameter');
         }
 
-        if (false === $dateTo = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateTo = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateTo')
         )) {
             throw new BadRequestHttpException('dateTo not parsable');
diff --git a/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php b/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
index 3016e1660..784a6f6ce 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
@@ -31,22 +31,10 @@ use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
-use function in_array;
 
 class InviteApiController
 {
-    private EntityManagerInterface $entityManager;
-
-    private MessageBusInterface $messageBus;
-
-    private Security $security;
-
-    public function __construct(EntityManagerInterface $entityManager, MessageBusInterface $messageBus, Security $security)
-    {
-        $this->entityManager = $entityManager;
-        $this->messageBus = $messageBus;
-        $this->security = $security;
-    }
+    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly MessageBusInterface $messageBus, private readonly Security $security) {}
 
     /**
      * Give an answer to a calendar invite.
@@ -69,7 +57,7 @@ class InviteApiController
             throw new AccessDeniedHttpException('not allowed to answer on this invitation');
         }
 
-        if (!in_array($answer, Invite::STATUSES, true)) {
+        if (!\in_array($answer, Invite::STATUSES, true)) {
             throw new BadRequestHttpException('answer not valid');
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php
index 9352e42fa..75b417e93 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php
@@ -30,17 +30,7 @@ use TheNetworg\OAuth2\Client\Token\AccessToken;
 
 class RemoteCalendarConnectAzureController
 {
-    private ClientRegistry $clientRegistry;
-
-    private OnBehalfOfUserTokenStorage $MSGraphTokenStorage;
-
-    public function __construct(
-        ClientRegistry $clientRegistry,
-        OnBehalfOfUserTokenStorage $MSGraphTokenStorage
-    ) {
-        $this->clientRegistry = $clientRegistry;
-        $this->MSGraphTokenStorage = $MSGraphTokenStorage;
-    }
+    public function __construct(private readonly ClientRegistry $clientRegistry, private readonly OnBehalfOfUserTokenStorage $MSGraphTokenStorage) {}
 
     /**
      * @Route("/{_locale}/connect/azure", name="chill_calendar_remote_connect_azure")
diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php
index 535dda2f5..e7d423abd 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php
@@ -19,22 +19,15 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage;
-use JsonException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
-use const JSON_THROW_ON_ERROR;
 
 class RemoteCalendarMSGraphSyncController
 {
-    private MessageBusInterface $messageBus;
-
-    public function __construct(MessageBusInterface $messageBus)
-    {
-        $this->messageBus = $messageBus;
-    }
+    public function __construct(private readonly MessageBusInterface $messageBus) {}
 
     /**
      * @Route("/public/incoming-hook/calendar/msgraph/events/{userId}", name="chill_calendar_remote_msgraph_incoming_webhook_events",
@@ -49,8 +42,8 @@ class RemoteCalendarMSGraphSyncController
         }
 
         try {
-            $body = json_decode($request->getContent(), true, 512, JSON_THROW_ON_ERROR);
-        } catch (JsonException $e) {
+            $body = json_decode($request->getContent(), true, 512, \JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
             throw new BadRequestHttpException('could not decode json', $e);
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php
index a95aa1a3f..673912c0a 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php
@@ -22,32 +22,19 @@ use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterfa
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
-use DateTimeImmutable;
 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\SerializerInterface;
-use function count;
 
 /**
  * Contains method to get events (Calendar) from remote calendar.
  */
 class RemoteCalendarProxyController
 {
-    private PaginatorFactory $paginatorFactory;
-
-    private RemoteCalendarConnectorInterface $remoteCalendarConnector;
-
-    private SerializerInterface $serializer;
-
-    public function __construct(PaginatorFactory $paginatorFactory, RemoteCalendarConnectorInterface $remoteCalendarConnector, SerializerInterface $serializer)
-    {
-        $this->paginatorFactory = $paginatorFactory;
-        $this->remoteCalendarConnector = $remoteCalendarConnector;
-        $this->serializer = $serializer;
-    }
+    public function __construct(private readonly PaginatorFactory $paginatorFactory, private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector, private readonly SerializerInterface $serializer) {}
 
     /**
      * @Route("api/1.0/calendar/proxy/calendar/by-user/{id}/events")
@@ -58,8 +45,8 @@ class RemoteCalendarProxyController
             throw new BadRequestHttpException('You must provide a dateFrom parameter');
         }
 
-        if (false === $dateFrom = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateFrom = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateFrom')
         )) {
             throw new BadRequestHttpException('dateFrom not parsable');
@@ -69,8 +56,8 @@ class RemoteCalendarProxyController
             throw new BadRequestHttpException('You must provide a dateTo parameter');
         }
 
-        if (false === $dateTo = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::ATOM,
+        if (false === $dateTo = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::ATOM,
             $request->query->get('dateTo')
         )) {
             throw new BadRequestHttpException('dateTo not parsable');
@@ -98,8 +85,8 @@ class RemoteCalendarProxyController
 
         // in some case, we cannot paginate: we have to fetch all the items at once. We must avoid
         // further requests by forcing the number of items returned.
-        if (count($events) > $paginator->getItemsPerPage()) {
-            $paginator->setItemsPerPage(count($events));
+        if (\count($events) > $paginator->getItemsPerPage()) {
+            $paginator->setItemsPerPage(\count($events));
         }
 
         $collection = new Collection($events, $paginator);
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php
new file mode 100644
index 000000000..2ef7365ca
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarACL.php
@@ -0,0 +1,54 @@
+<?php
+
+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 Chill\CalendarBundle\DataFixtures\ORM;
+
+use Chill\CalendarBundle\Security\Voter\CalendarVoter;
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\Entity\PermissionsGroup;
+use Chill\MainBundle\Entity\RoleScope;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadCalendarACL extends Fixture implements OrderedFixtureInterface
+{
+    public function load(ObjectManager $manager): void
+    {
+        $roleScopes = [];
+
+        foreach ([
+            CalendarVoter::CREATE,
+            CalendarVoter::DELETE,
+            CalendarVoter::DELETE,
+        ] as $role) {
+            $roleScopes[] = $r = (new RoleScope())
+                ->setRole($role);
+            $manager->persist($r);
+        }
+
+        foreach (LoadPermissionsGroup::$refs as $permissionGroupRef) {
+            /** @var PermissionsGroup $group */
+            $group = $this->getReference($permissionGroupRef);
+
+            foreach ($roleScopes as $scope) {
+                $group->addRoleScope($scope);
+            }
+        }
+
+        $manager->flush();
+    }
+
+    public function getOrder(): int
+    {
+        return 16000;
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
index 805386669..f222823bf 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Repository\UserRepository;
-use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
@@ -29,13 +28,7 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
 {
     public static array $references = [];
 
-    private UserRepository $userRepository;
-
-    public function __construct(
-        UserRepository $userRepository
-    ) {
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly UserRepository $userRepository) {}
 
     public static function getGroups(): array
     {
@@ -49,10 +42,6 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
 
     public function load(ObjectManager $manager): void
     {
-        $arr = range(-50, 50);
-
-        echo "Creating calendar range ('plage de disponibilités')\n";
-
         $users = $this->userRepository->findAll();
 
         $location = (new Location())
@@ -73,6 +62,8 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
         $manager->persist($type);
         $manager->persist($location);
 
+        $now =  new \DateTimeImmutable();
+
         $days = [
             '2021-08-23',
             '2021-08-24',
@@ -82,8 +73,12 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
             '2021-08-31',
             '2021-09-01',
             '2021-09-02',
-            (new DateTimeImmutable('tomorrow'))->format('Y-m-d'),
-            (new DateTimeImmutable('today'))->format('Y-m-d'),
+            (new \DateTimeImmutable('tomorrow'))->format('Y-m-d'),
+            (new \DateTimeImmutable('today'))->format('Y-m-d'),
+            $now->add(new \DateInterval('P7D'))->format('Y-m-d'),
+            $now->add(new \DateInterval('P8D'))->format('Y-m-d'),
+            $now->add(new \DateInterval('P9D'))->format('Y-m-d'),
+            $now->add(new \DateInterval('P10D'))->format('Y-m-d'),
         ];
 
         $hours = [
@@ -96,9 +91,9 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
         foreach ($users as $u) {
             foreach ($days as $d) {
                 foreach ($hours as $h) {
-                    $event = $d . ' ' . $h;
-                    $startEvent = new DateTimeImmutable($event);
-                    $endEvent = new DateTimeImmutable($event . ' + 1 hours');
+                    $event = $d.' '.$h;
+                    $startEvent = new \DateTimeImmutable($event);
+                    $endEvent = new \DateTimeImmutable($event.' + 1 hours');
                     $calendarRange = (new CalendarRange())
                         ->setUser($u)
                         ->setStartDate($startEvent)
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
index bc5de7f70..d7e552d5d 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
@@ -39,12 +39,12 @@ class LoadCancelReason extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($arr as $a) {
-            echo 'Creating calendar cancel reason : ' . $a['name'] . "\n";
+            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 ba325e296..f677a4283 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
@@ -46,12 +46,12 @@ class LoadInvite extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($arr as $a) {
-            echo 'Creating calendar invite : ' . $a['name']['fr'] . "\n";
+            echo 'Creating calendar invite : '.$a['name']['fr']."\n";
             $invite = (new Invite())
                 ->setStatus($a['status'])
                 ->setUser($this->getRandomUser());
             $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 c848366bb..5aa8d8507 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -31,7 +31,7 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
         $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/exports.yaml');
         $loader->load('services/controller.yml');
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
index 127b69047..a3e4ae391 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
@@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_calendar');
-        $rootNode = $treeBuilder->getRootNode('chill_calendar');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index d7f38adf0..32308a50c 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -24,28 +24,26 @@ use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\ReadableCollection;
+use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
-use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Constraints\NotBlank;
-
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use function in_array;
 
 /**
  * @ORM\Table(
  *     name="chill_calendar.calendar",
  *     uniqueConstraints={@ORM\UniqueConstraint(name="idx_calendar_remote", columns={"remoteId"}, options={"where": "remoteId <> ''"})}
  * )
+ *
  * @ORM\Entity
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "chill_calendar_calendar": Calendar::class
  * })
@@ -58,20 +56,20 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     use TrackUpdateTrait;
 
-    public const SMS_CANCEL_PENDING = 'sms_cancel_pending';
+    final public const SMS_CANCEL_PENDING = 'sms_cancel_pending';
 
-    public const SMS_PENDING = 'sms_pending';
+    final public const SMS_PENDING = 'sms_pending';
 
-    public const SMS_SENT = 'sms_sent';
+    final public const SMS_SENT = 'sms_sent';
 
-    public const STATUS_CANCELED = 'canceled';
+    final public const STATUS_CANCELED = 'canceled';
 
     /**
      * @deprecated
      */
-    public const STATUS_MOVED = 'moved';
+    final public const STATUS_MOVED = 'moved';
 
-    public const STATUS_VALID = 'valid';
+    final public const STATUS_VALID = 'valid';
 
     /**
      * a list of invite which have been added during this session.
@@ -93,6 +91,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod", inversedBy="calendars")
+     *
      * @Serializer\Groups({"calendar:read", "read"})
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
@@ -104,6 +103,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @ORM\OneToOne(targetEntity="CalendarRange", inversedBy="calendar")
+     *
      * @Serializer\Groups({"calendar:read", "read"})
      */
     private ?CalendarRange $calendarRange = null;
@@ -115,6 +115,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_")
+     *
      * @Serializer\Groups({"calendar:read", "read", "docgen:read"})
      */
     private CommentEmbeddable $comment;
@@ -125,22 +126,28 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private int $dateTimeVersion = 0;
 
     /**
-     * @var Collection<CalendarDoc::class>
+     * @var Collection<CalendarDoc>
+     *
      * @ORM\OneToMany(targetEntity=CalendarDoc::class, mappedBy="calendar", orphanRemoval=true)
      */
     private Collection $documents;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Assert\NotNull(message="calendar.An end date is required")
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
      */
     private ?int $id = null;
@@ -152,57 +159,80 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
      *     orphanRemoval=true,
      *     cascade={"persist", "remove", "merge", "detach"}
      * )
+     *
      * @ORM\JoinTable(name="chill_calendar.calendar_to_invites")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
+     * @var Collection&Selectable<int, Invite>
      */
-    private Collection $invites;
+    private Collection&Selectable $invites;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Assert\NotNull(message="calendar.A location is required")
      */
     private ?Location $location = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
+     *
      * @Assert\NotNull(message="calendar.A main user is mandatory")
      */
     private ?User $mainUser = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?Person $person = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person", inversedBy="calendars")
+     *
      * @ORM\JoinTable(name="chill_calendar.calendar_to_persons")
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
+     *
      * @Assert\Count(min=1, minMessage="calendar.At least {{ limit }} person is required.")
+     *
+     * @var Collection<Person>
      */
     private Collection $persons;
 
     /**
      * @ORM\Embedded(class=PrivateCommentEmbeddable::class, columnPrefix="privateComment_")
+     *
      * @Serializer\Groups({"calendar:read"})
      */
     private PrivateCommentEmbeddable $privateComment;
 
     /**
+     * @var Collection<ThirdParty>
+     *
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     *
      * @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties")
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
      */
     private Collection $professionals;
 
     /**
      * @ORM\Column(type="boolean", nullable=true)
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?bool $sendSMS = false;
@@ -214,21 +244,27 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light", "docgen:read"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
+     *
      * @Assert\NotNull(message="calendar.A start date is required")
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=false, options={"default": "valid"})
+     *
      * @Serializer\Groups({"calendar:read", "read", "calendar:light"})
+     *
      * @Serializer\Context(normalizationContext={"read"}, groups={"calendar:light"})
      */
     private string $status = self::STATUS_VALID;
 
     /**
      * @ORM\Column(type="boolean", nullable=true)
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?bool $urgent = false;
@@ -261,7 +297,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     public function addInvite(Invite $invite): self
     {
         if ($invite->getCalendar() instanceof Calendar && $invite->getCalendar() !== $this) {
-            throw new LogicException('Not allowed to move an invitation to another Calendar');
+            throw new \LogicException('Not allowed to move an invitation to another Calendar');
         }
 
         $this->invites[] = $invite;
@@ -317,16 +353,11 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     public function getCenters(): ?iterable
     {
-        switch ($this->getContext()) {
-            case 'person':
-                return [$this->getPerson()->getCenter()];
-
-            case 'accompanying_period':
-                return $this->getAccompanyingPeriod()->getCenters();
-
-            default:
-                throw new LogicException('context not supported: ' . $this->getContext());
-        }
+        return match ($this->getContext()) {
+            'person' => [$this->getPerson()->getCenter()],
+            'accompanying_period' => $this->getAccompanyingPeriod()->getCenters(),
+            default => throw new \LogicException('context not supported: '.$this->getContext()),
+        };
     }
 
     public function getComment(): CommentEmbeddable
@@ -339,11 +370,11 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
      */
     public function getContext(): ?string
     {
-        if ($this->getAccompanyingPeriod() !== null) {
+        if (null !== $this->getAccompanyingPeriod()) {
             return 'accompanying_period';
         }
 
-        if ($this->getPerson() !== null) {
+        if (null !== $this->getPerson()) {
             return 'person';
         }
 
@@ -366,16 +397,16 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     /**
      * @Serializer\Groups({"docgen:read"})
      */
-    public function getDuration(): ?DateInterval
+    public function getDuration(): ?\DateInterval
     {
-        if ($this->getStartDate() === null || $this->getEndDate() === null) {
+        if (null === $this->getStartDate() || null === $this->getEndDate()) {
             return null;
         }
 
         return $this->getStartDate()->diff($this->getEndDate());
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -454,7 +485,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
             $personsNotAssociated = [];
 
             foreach ($this->persons as $person) {
-                if (!in_array($person, $this->getPersonsAssociated(), true)) {
+                if (!\in_array($person, $this->getPersonsAssociated(), true)) {
                     $personsNotAssociated[] = $person;
                 }
             }
@@ -488,7 +519,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this->smsStatus;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -510,13 +541,12 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @return ReadableCollection<(int|string), User>
+     *
      * @Serializer\Groups({"calendar:read", "read"})
      */
     public function getUsers(): ReadableCollection
     {
-        return $this->getInvites()->map(static function (Invite $i) {
-            return $i->getUser();
-        });
+        return $this->getInvites()->map(static fn (Invite $i) => $i->getUser());
     }
 
     public function hasCalendarRange(): bool
@@ -561,7 +591,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     public function removeDocument(CalendarDoc $calendarDoc): self
     {
         if ($calendarDoc->getCalendar() !== $this) {
-            throw new LogicException('cannot remove document of another calendar');
+            throw new \LogicException('cannot remove document of another calendar');
         }
 
         return $this;
@@ -601,9 +631,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         }
 
         $invite = $this->invites
-            ->filter(static function (Invite $invite) use ($user) {
-                return $invite->getUser() === $user;
-            })
+            ->filter(static fn (Invite $invite) => $invite->getUser() === $user)
             ->first();
         $this->removeInvite($invite);
 
@@ -657,7 +685,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this;
     }
 
-    public function setEndDate(DateTimeImmutable $endDate): self
+    public function setEndDate(\DateTimeImmutable $endDate): self
     {
         if (null === $this->endDate || $this->endDate->getTimestamp() !== $endDate->getTimestamp()) {
             $this->increaseaDatetimeVersion();
@@ -715,7 +743,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         if (null === $this->startDate || $this->startDate->getTimestamp() !== $startDate->getTimestamp()) {
             $this->increaseaDatetimeVersion();
@@ -730,7 +758,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     {
         $this->status = $status;
 
-        if (self::STATUS_CANCELED === $status && $this->getSmsStatus() === self::SMS_SENT) {
+        if (self::STATUS_CANCELED === $status && self::SMS_SENT === $this->getSmsStatus()) {
             $this->setSmsStatus(self::SMS_CANCEL_PENDING);
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php
index 7012b64e0..5ea958fab 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php
@@ -22,6 +22,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_calendar.calendar_doc",
  * )
@@ -34,6 +35,7 @@ class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\ManyToOne(targetEntity=Calendar::class, inversedBy="documents")
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private Calendar $calendar;
@@ -45,27 +47,26 @@ class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=StoredObject::class, cascade={"persist"})
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private ?StoredObject $storedObject;
-
     /**
      * @ORM\Column(type="boolean", nullable=false, options={"default": false})
      */
     private bool $trackDateTimeVersion = false;
 
-    public function __construct(Calendar $calendar, ?StoredObject $storedObject)
+    public function __construct(Calendar $calendar, /**
+     * @ORM\ManyToOne(targetEntity=StoredObject::class, cascade={"persist"})
+     *
+     * @ORM\JoinColumn(nullable=false)
+     */
+        private ?StoredObject $storedObject)
     {
         $this->setCalendar($calendar);
-
-        $this->storedObject = $storedObject;
         $this->datetimeVersion = $calendar->getDateTimeVersion();
     }
 
@@ -112,8 +113,6 @@ class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @internal use @see{Calendar::removeDocument} instead
-     *
-     * @param Calendar $calendar
      */
     public function setCalendar(?Calendar $calendar): CalendarDoc
     {
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocCreateDTO.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocCreateDTO.php
index b7209e46f..ff4e10402 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocCreateDTO.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocCreateDTO.php
@@ -18,12 +18,14 @@ class CalendarDocCreateDTO
 {
     /**
      * @Assert\NotNull
+     *
      * @Assert\Valid
      */
     public ?StoredObject $doc = null;
 
     /**
      * @Assert\NotBlank
+     *
      * @Assert\NotNull
      */
     public ?string $title = '';
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocEditDTO.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocEditDTO.php
index ff57d9876..2e8970db6 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocEditDTO.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarDoc/CalendarDocEditDTO.php
@@ -24,6 +24,7 @@ class CalendarDocEditDTO
 
     /**
      * @Assert\NotBlank
+     *
      * @Assert\NotNull
      */
     public ?string $title = '';
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
index 14cfad98b..0c46db57c 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -27,6 +26,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  *     name="chill_calendar.calendar_range",
  *     uniqueConstraints={@ORM\UniqueConstraint(name="idx_calendar_range_remote", columns={"remoteId"}, options={"where": "remoteId <> ''"})}
  * )
+ *
  * @ORM\Entity
  */
 class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
@@ -44,37 +44,49 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
+     *
      * @Groups({"read", "write", "calendar:read"})
+     *
      * @Assert\NotNull
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Groups({"read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Location::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"read", "write", "calendar:read"})
+     *
      * @Assert\NotNull
      */
-    private ?Location $location;
+    private ?Location $location = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
+     *
      * @groups({"read", "write", "calendar:read"})
+     *
      * @Assert\NotNull
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @Groups({"read", "write", "calendar:read"})
+     *
      * @Assert\NotNull
      */
     private ?User $user = null;
@@ -84,7 +96,7 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
         return $this->calendar;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -99,7 +111,7 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
         return $this->location;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -117,7 +129,7 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
         $this->calendar = $calendar;
     }
 
-    public function setEndDate(DateTimeImmutable $endDate): self
+    public function setEndDate(\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -131,7 +143,7 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
index a262842c2..cff54e70b 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
@@ -16,37 +16,40 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="chill_calendar.cancel_reason")
+ *
  * @ORM\Entity(repositoryClass=CancelReasonRepository::class)
  */
 class CancelReason
 {
-    public const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
+    final public const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
 
-    public const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
+    final public const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
 
-    public const CANCELEDBY_USER = 'CANCELEDBY_USER';
+    final public const CANCELEDBY_USER = 'CANCELEDBY_USER';
 
     /**
      * @ORM\Column(type="boolean")
      */
-    private $active;
+    private ?bool $active = null;
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private $canceledBy;
+    private ?string $canceledBy = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
      */
-    private $name = [];
+    private array $name = [];
 
     public function getActive(): ?bool
     {
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Invite.php b/src/Bundle/ChillCalendarBundle/Entity/Invite.php
index c2d79aff2..48fe865b0 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Invite.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Invite.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
-use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
@@ -30,6 +29,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  *     name="chill_calendar.invite",
  *     uniqueConstraints={@ORM\UniqueConstraint(name="idx_calendar_invite_remote", columns={"remoteId"}, options={"where": "remoteId <> ''"})}
  * )
+ *
  * @ORM\Entity
  */
 class Invite implements TrackUpdateInterface, TrackCreationInterface
@@ -40,23 +40,23 @@ class Invite implements TrackUpdateInterface, TrackCreationInterface
 
     use TrackUpdateTrait;
 
-    public const ACCEPTED = 'accepted';
+    final public const ACCEPTED = 'accepted';
 
-    public const DECLINED = 'declined';
+    final public const DECLINED = 'declined';
 
-    public const PENDING = 'pending';
+    final public const PENDING = 'pending';
 
     /**
      * all statuses in one const.
      */
-    public const STATUSES = [
+    final public const STATUSES = [
         self::ACCEPTED,
         self::DECLINED,
         self::PENDING,
         self::TENTATIVELY_ACCEPTED,
     ];
 
-    public const TENTATIVELY_ACCEPTED = 'tentative';
+    final public const TENTATIVELY_ACCEPTED = 'tentative';
 
     /**
      * @ORM\ManyToOne(targetEntity=Calendar::class, inversedBy="invites")
@@ -65,21 +65,27 @@ class Invite implements TrackUpdateInterface, TrackCreationInterface
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups(groups={"calendar:read", "read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": "pending"})
+     *
      * @Serializer\Groups(groups={"calendar:read", "read", "docgen:read"})
      */
     private string $status = self::PENDING;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Serializer\Groups(groups={"calendar:read", "read", "docgen:read"})
      */
     private ?User $user = null;
@@ -122,7 +128,7 @@ class Invite implements TrackUpdateInterface, TrackCreationInterface
     public function setUser(?User $user): self
     {
         if ($user instanceof User && $this->user instanceof User && $user !== $this->user) {
-            throw new LogicException('Not allowed to associate an invite to a different user');
+            throw new \LogicException('Not allowed to associate an invite to a different user');
         }
 
         $this->user = $user;
diff --git a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
index 298a1ef9a..82c76eea4 100644
--- a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
+++ b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
@@ -15,16 +15,9 @@ 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)
-    {
-        $this->requestStack = $requestStack;
-    }
+    public function __construct(private readonly RequestStack $requestStack) {}
 
     public function postPersist(Activity $activity, LifecycleEventArgs $event): void
     {
@@ -38,7 +31,7 @@ class ListenToActivityCreate
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
 
-            if (array_key_exists('calendarId', $activityData)) {
+            if (\array_key_exists('calendarId', $activityData)) {
                 $calendarId = $activityData['calendarId'];
 
                 // Attach the activity to the calendar
diff --git a/src/Bundle/ChillCalendarBundle/Exception/UserAbsenceSyncException.php b/src/Bundle/ChillCalendarBundle/Exception/UserAbsenceSyncException.php
new file mode 100644
index 000000000..dd2c0b9c2
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Exception/UserAbsenceSyncException.php
@@ -0,0 +1,20 @@
+<?php
+
+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 Chill\CalendarBundle\Exception;
+
+class UserAbsenceSyncException extends \LogicException
+{
+    public function __construct(string $message = '', int $code = 20_230_706, \Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
index e1de9f399..5e2091fac 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
@@ -15,24 +15,12 @@ use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class AgentAggregator implements AggregatorInterface
+final readonly class AgentAggregator implements AggregatorInterface
 {
-    private UserRender $userRender;
-
-    private UserRepository $userRepository;
-
-    public function __construct(
-        UserRepository $userRepository,
-        UserRender $userRender
-    ) {
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-    }
+    public function __construct(private UserRepository $userRepository, private UserRender $userRender) {}
 
     public function addRole(): ?string
     {
@@ -41,7 +29,7 @@ final class AgentAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('caluser', $qb->getAllAliases(), true)) {
+        if (!\in_array('caluser', $qb->getAllAliases(), true)) {
             $qb->join('cal.mainUser', 'caluser');
         }
 
@@ -59,7 +47,12 @@ final class AgentAggregator implements AggregatorInterface
         // no form
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
index 611cb6d79..7c84653d2 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
@@ -15,24 +15,12 @@ use Chill\CalendarBundle\Export\Declarations;
 use Chill\CalendarBundle\Repository\CancelReasonRepository;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CancelReasonAggregator implements AggregatorInterface
 {
-    private CancelReasonRepository $cancelReasonRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        CancelReasonRepository $cancelReasonRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->cancelReasonRepository = $cancelReasonRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly CancelReasonRepository $cancelReasonRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -42,7 +30,7 @@ class CancelReasonAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // TODO: still needs to take into account calendars without a cancel reason somehow
-        if (!in_array('calcancel', $qb->getAllAliases(), true)) {
+        if (!\in_array('calcancel', $qb->getAllAliases(), true)) {
             $qb->join('cal.cancelReason', 'calcancel');
         }
 
@@ -60,7 +48,12 @@ class CancelReasonAggregator implements AggregatorInterface
         // no form
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
index 23292a5b0..76cbe5cd8 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
@@ -12,27 +12,22 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class JobAggregator implements AggregatorInterface
+final readonly class JobAggregator implements AggregatorInterface
 {
-    private UserJobRepository $jobRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'cal_agg_job';
 
     public function __construct(
-        UserJobRepository $jobRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->jobRepository = $jobRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private UserJobRepository $jobRepository,
+        private TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -41,12 +36,28 @@ final class JobAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('caluser', $qb->getAllAliases(), true)) {
-            $qb->join('cal.mainUser', 'caluser');
-        }
+        $p = self::PREFIX;
 
-        $qb->addSelect('IDENTITY(caluser.userJob) as job_aggregator');
-        $qb->addGroupBy('job_aggregator');
+        $qb
+            ->leftJoin('cal.mainUser', "{$p}_user")
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // job_at based on cal.startDate
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'cal.startDate'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'cal.startDate')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
     public function applyOn(): string
@@ -54,12 +65,14 @@ final class JobAggregator implements AggregatorInterface
         return Declarations::CALENDAR_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // no form
+        return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -70,7 +83,9 @@ final class JobAggregator implements AggregatorInterface
                 return '';
             }
 
-            $j = $this->jobRepository->find($value);
+            if (null === $j = $this->jobRepository->find($value)) {
+                return '';
+            }
 
             return $this->translatableStringHelper->localize(
                 $j->getLabel()
@@ -80,11 +95,11 @@ final class JobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['job_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
     {
-        return 'Group calendars by agent job';
+        return 'export.aggregator.calendar.agent_job.Group calendars by agent job';
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
index 940000f47..6481f95b4 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
@@ -14,20 +14,12 @@ namespace Chill\CalendarBundle\Export\Aggregator;
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\LocationRepository;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class LocationAggregator implements AggregatorInterface
+final readonly class LocationAggregator implements AggregatorInterface
 {
-    private LocationRepository $locationRepository;
-
-    public function __construct(
-        LocationRepository $locationRepository
-    ) {
-        $this->locationRepository = $locationRepository;
-    }
+    public function __construct(private LocationRepository $locationRepository) {}
 
     public function addRole(): ?string
     {
@@ -36,7 +28,7 @@ final class LocationAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('calloc', $qb->getAllAliases(), true)) {
+        if (!\in_array('calloc', $qb->getAllAliases(), true)) {
             $qb->join('cal.location', 'calloc');
         }
         $qb->addSelect('IDENTITY(cal.location) as location_aggregator');
@@ -53,7 +45,12 @@ final class LocationAggregator implements AggregatorInterface
         // no form
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
index 6574e3934..be9406cfa 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -15,24 +15,12 @@ use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class LocationTypeAggregator implements AggregatorInterface
+final readonly class LocationTypeAggregator implements AggregatorInterface
 {
-    private LocationTypeRepository $locationTypeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        LocationTypeRepository $locationTypeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->locationTypeRepository = $locationTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private LocationTypeRepository $locationTypeRepository, private TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -41,7 +29,7 @@ final class LocationTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('calloc', $qb->getAllAliases(), true)) {
+        if (!\in_array('calloc', $qb->getAllAliases(), true)) {
             $qb->join('cal.location', 'calloc');
         }
 
@@ -59,7 +47,12 @@ final class LocationTypeAggregator implements AggregatorInterface
         // no form
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
index 7b2a5e898..6bf65b8ef 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
@@ -13,7 +13,6 @@ namespace Chill\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -41,7 +40,12 @@ class MonthYearAggregator implements AggregatorInterface
         // No form needed
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
     {
         return static function ($value): string {
             if ('_header' === $value) {
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
index 3aff3e0d8..4998f6d1f 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
@@ -12,27 +12,22 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class ScopeAggregator implements AggregatorInterface
+final readonly class ScopeAggregator implements AggregatorInterface
 {
-    private ScopeRepository $scopeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'cal_agg_scope';
 
     public function __construct(
-        ScopeRepository $scopeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private ScopeRepository $scopeRepository,
+        private TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -41,12 +36,28 @@ final class ScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('caluser', $qb->getAllAliases(), true)) {
-            $qb->join('cal.mainUser', 'caluser');
-        }
+        $p = self::PREFIX;
 
-        $qb->addSelect('IDENTITY(caluser.mainScope) as scope_aggregator');
-        $qb->addGroupBy('scope_aggregator');
+        $qb
+            ->leftJoin('cal.mainUser', "{$p}_user")
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // scope_at based on cal.startDate
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'cal.startDate'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'cal.startDate')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
     public function applyOn(): string
@@ -54,12 +65,14 @@ final class ScopeAggregator implements AggregatorInterface
         return Declarations::CALENDAR_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // no form
+        return [];
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -70,7 +83,9 @@ final class ScopeAggregator implements AggregatorInterface
                 return '';
             }
 
-            $s = $this->scopeRepository->find($value);
+            if (null === $s = $this->scopeRepository->find($value)) {
+                return '';
+            }
 
             return $this->translatableStringHelper->localize(
                 $s->getName()
@@ -80,11 +95,11 @@ final class ScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['scope_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
     {
-        return 'Group calendars by agent scope';
+        return 'export.aggregator.calendar.agent_scope.Group calendars by agent scope';
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php
index ad5910461..e9213d3cb 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/UrgencyAggregator.php
@@ -20,21 +20,13 @@ namespace Chill\CalendarBundle\Export\Aggregator;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UrgencyAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -57,23 +49,23 @@ class UrgencyAggregator implements AggregatorInterface
         // no form
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
                 return 'Urgency';
             }
 
-            switch ($value) {
-                case true:
-                    return $this->translator->trans('is urgent');
-
-                case false:
-                    return $this->translator->trans('is not urgent');
-
-                default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
-            }
+            return match ($value) {
+                true => $this->translator->trans('is urgent'),
+                false => $this->translator->trans('is not urgent'),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
+            };
         };
     }
 
diff --git a/src/Bundle/ChillCalendarBundle/Export/Declarations.php b/src/Bundle/ChillCalendarBundle/Export/Declarations.php
index 0df90749c..a007424e5 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Declarations.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Declarations.php
@@ -16,5 +16,5 @@ namespace Chill\CalendarBundle\Export;
  */
 abstract class Declarations
 {
-    public const CALENDAR_TYPE = 'calendar';
+    final public const CALENDAR_TYPE = 'calendar';
 }
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php b/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
index f3bf79547..2e156d7a0 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
@@ -13,11 +13,11 @@ namespace Chill\CalendarBundle\Export\Export;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Closure;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -25,18 +25,18 @@ use Symfony\Component\Validator\Exception\LogicException;
 
 class CountCalendars implements ExportInterface, GroupedExportInterface
 {
-    private CalendarRepository $calendarRepository;
-
-    public function __construct(CalendarRepository $calendarRepository)
-    {
-        $this->calendarRepository = $calendarRepository;
-    }
+    public function __construct(private readonly CalendarRepository $calendarRepository) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
         // No form necessary
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -61,9 +61,7 @@ class CountCalendars implements ExportInterface, GroupedExportInterface
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -91,13 +89,14 @@ class CountCalendars implements ExportInterface, GroupedExportInterface
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->calendarRepository->createQueryBuilder('cal');
 
         $qb->select('COUNT(cal.id) AS export_result');
+        $qb->leftJoin('cal.accompanyingPeriod', 'acp');
+
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
 
         return $qb;
     }
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
index ddecba415..b69185a17 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
@@ -13,30 +13,29 @@ namespace Chill\CalendarBundle\Export\Export;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
 {
-    private CalendarRepository $calendarRepository;
-
-    public function __construct(
-        CalendarRepository $calendarRepository
-    ) {
-        $this->calendarRepository = $calendarRepository;
-    }
+    public function __construct(private readonly CalendarRepository $calendarRepository) {}
 
     public function buildForm(FormBuilderInterface $builder): void
     {
         // no form needed
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -55,15 +54,13 @@ class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            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];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -90,8 +87,10 @@ class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
     {
         $qb = $this->calendarRepository->createQueryBuilder('cal');
 
-        $qb
-            ->select('AVG(cal.endDate - cal.startDate) AS export_result');
+        $qb->select('AVG(cal.endDate - cal.startDate) AS export_result');
+        $qb->join('cal.accompanyingPeriod', 'acp');
+
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
 
         return $qb;
     }
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
index d99e73a2e..8ea23014c 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
@@ -13,30 +13,29 @@ namespace Chill\CalendarBundle\Export\Export;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
 {
-    private CalendarRepository $calendarRepository;
-
-    public function __construct(
-        CalendarRepository $calendarRepository
-    ) {
-        $this->calendarRepository = $calendarRepository;
-    }
+    public function __construct(private readonly CalendarRepository $calendarRepository) {}
 
     public function buildForm(FormBuilderInterface $builder): void
     {
         // no form needed
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -55,15 +54,13 @@ class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            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];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -90,8 +87,10 @@ class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
     {
         $qb = $this->calendarRepository->createQueryBuilder('cal');
 
-        $qb
-            ->select('SUM(cal.endDate - cal.startDate) AS export_result');
+        $qb->select('SUM(cal.endDate - cal.startDate) AS export_result');
+        $qb->join('cal.accompanyingPeriod', 'acp');
+
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
 
         return $qb;
     }
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
index 18a4b0f4b..c16c148fc 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
@@ -22,12 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class AgentFilter implements FilterInterface
 {
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
@@ -58,14 +53,17 @@ class AgentFilter implements FilterInterface
     {
         $builder->add('accepted_agents', EntityType::class, [
             'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
+            'choice_label' => fn (User $u) => $this->userRender->renderString($u, []),
             'multiple' => true,
             'expanded' => true,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $users = [];
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
index 59019ac03..90a004388 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
@@ -21,12 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class BetweenDatesFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(RollingDateConverterInterface $rollingDateConverter)
-    {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -60,12 +55,13 @@ class BetweenDatesFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('date_from', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
-            ])
-            ->add('date_to', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-            ]);
+            ->add('date_from', PickRollingDateType::class, [])
+            ->add('date_to', PickRollingDateType::class, []);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function describeAction($data, $format = 'string'): array
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
index d6c38e163..63149509f 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
@@ -20,7 +20,6 @@ namespace Chill\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -29,18 +28,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class CalendarRangeFilter implements FilterInterface
 {
     private const CHOICES = [
-        'Not made within a calendar range' => true,
-        'Made within a calendar range' => false,
+        'Not made within a calendar range' => 'true',
+        'Made within a calendar range' => 'false',
     ];
 
-    private const DEFAULT_CHOICE = false;
+    private const DEFAULT_CHOICE = 'false';
 
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -69,10 +63,14 @@ class CalendarRangeFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['hasCalendarRange' => self::DEFAULT_CHOICE];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $choice = '';
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
index 0f0f42adc..c122a298d 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
@@ -12,29 +12,22 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
-class JobFilter implements FilterInterface
+final readonly class JobFilter implements FilterInterface
 {
-    protected TranslatorInterface $translator;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'cal_filter_job';
 
     public function __construct(
-        TranslatorInterface $translator,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translator = $translator;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -43,21 +36,31 @@ class JobFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('caluser', $qb->getAllAliases(), true)) {
-            $qb->join('cal.mainUser', 'caluser');
-        }
+        $p = self::PREFIX;
 
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('caluser.userJob', ':job');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('job', $data['job']);
+        $qb
+            ->leftJoin('cal.mainUser', "{$p}_user")
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // job_at based on cal.startDate
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'cal.startDate'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'cal.startDate')
+                    )
+                )
+            )
+            ->andWhere($qb->expr()->in("{$p}_history.job", ":{$p}_job"))
+            ->setParameter(
+                "{$p}_job",
+                $data['job']
+            );
     }
 
     public function applyOn(): string
@@ -67,16 +70,15 @@ class JobFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('job', EntityType::class, [
-            'class' => UserJob::class,
-            'choice_label' => function (UserJob $j) {
-                return $this->translatableStringHelper->localize(
+        $builder
+            ->add('job', EntityType::class, [
+                'class' => UserJob::class,
+                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize(
                     $j->getLabel()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
+                ),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
     }
 
     public function describeAction($data, $format = 'string'): array
@@ -89,13 +91,20 @@ class JobFilter implements FilterInterface
             );
         }
 
-        return ['Filtered by agent job: only %jobs%', [
+        return ['export.filter.calendar.agent_job.Filtered by agent job: only %jobs%', [
             '%jobs%' => implode(', ', $userJobs),
         ]];
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'job' => [],
+        ];
+    }
+
     public function getTitle(): string
     {
-        return 'Filter calendars by agent job';
+        return 'export.filter.calendar.agent_job.Filter calendars by agent job';
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
index 4d84543a3..93edc1b3a 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
@@ -13,28 +13,23 @@ namespace Chill\CalendarBundle\Export\Filter;
 
 use Chill\CalendarBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class ScopeFilter implements FilterInterface
 {
-    protected TranslatorInterface $translator;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'cal_filter_scope';
 
     public function __construct(
-        TranslatorInterface $translator,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translator = $translator;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        protected TranslatorInterface $translator,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -43,43 +38,52 @@ class ScopeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('caluser', $qb->getAllAliases(), true)) {
-            $qb->join('cal.mainUser', 'caluser');
-        }
+        $p = self::PREFIX;
 
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('caluser.mainScope', ':scope');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('scope', $data['scope']);
+        $qb
+            ->leftJoin('cal.mainUser', "{$p}_user")
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // scope_at based on cal.startDate
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'cal.startDate'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'cal.startDate')
+                    )
+                )
+            )
+            ->andWhere($qb->expr()->in("{$p}_history.scope", ":{$p}_scope"))
+            ->setParameter(
+                "{$p}_scope",
+                $data['scope']
+            );
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::CALENDAR_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('scope', EntityType::class, [
-            'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
+        $builder
+            ->add('scope', EntityType::class, [
+                'class' => Scope::class,
+                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
                     $s->getName()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
+                ),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, $format = 'string'): array
     {
         $scopes = [];
 
@@ -89,13 +93,20 @@ class ScopeFilter implements FilterInterface
             );
         }
 
-        return ['Filtered by agent scope: only %scopes%', [
+        return ['export.filter.calendar.agent_scope.Filtered by agent scope: only %scopes%', [
             '%scopes%' => implode(', ', $scopes),
         ]];
     }
 
-    public function getTitle()
+    public function getFormDefaultData(): array
     {
-        return 'Filter calendars by agent scope';
+        return [
+            'scope' => [],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.calendar.agent_scope.Filter calendars by agent scope';
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarDocEditType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarDocEditType.php
index 34a501028..224a74f01 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarDocEditType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarDocEditType.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Form;
 
 use Chill\CalendarBundle\Entity\CalendarDoc\CalendarDocEditDTO;
-use Chill\DocStoreBundle\Form\StoredObjectType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index a2d15484f..eec0b3f9f 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -21,7 +21,6 @@ use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\PersonBundle\Form\DataTransformer\PersonsToIdDataTransformer;
 use Chill\ThirdPartyBundle\Form\DataTransformer\ThirdPartiesToIdDataTransformer;
-use DateTimeImmutable;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
@@ -32,33 +31,14 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CalendarType extends AbstractType
 {
-    private IdToCalendarRangeDataTransformer $calendarRangeDataTransformer;
-
-    private IdToLocationDataTransformer $idToLocationDataTransformer;
-
-    private IdToUserDataTransformer $idToUserDataTransformer;
-
-    private IdToUsersDataTransformer $idToUsersDataTransformer;
-
-    private ThirdPartiesToIdDataTransformer $partiesToIdDataTransformer;
-
-    private PersonsToIdDataTransformer $personsToIdDataTransformer;
-
     public function __construct(
-        PersonsToIdDataTransformer $personsToIdDataTransformer,
-        IdToUserDataTransformer $idToUserDataTransformer,
-        IdToUsersDataTransformer $idToUsersDataTransformer,
-        IdToLocationDataTransformer $idToLocationDataTransformer,
-        ThirdPartiesToIdDataTransformer $partiesToIdDataTransformer,
-        IdToCalendarRangeDataTransformer $idToCalendarRangeDataTransformer
-    ) {
-        $this->personsToIdDataTransformer = $personsToIdDataTransformer;
-        $this->idToUserDataTransformer = $idToUserDataTransformer;
-        $this->idToUsersDataTransformer = $idToUsersDataTransformer;
-        $this->idToLocationDataTransformer = $idToLocationDataTransformer;
-        $this->partiesToIdDataTransformer = $partiesToIdDataTransformer;
-        $this->calendarRangeDataTransformer = $idToCalendarRangeDataTransformer;
-    }
+        private readonly PersonsToIdDataTransformer $personsToIdDataTransformer,
+        private readonly IdToUserDataTransformer $idToUserDataTransformer,
+        private readonly IdToUsersDataTransformer $idToUsersDataTransformer,
+        private readonly IdToLocationDataTransformer $idToLocationDataTransformer,
+        private readonly ThirdPartiesToIdDataTransformer $partiesToIdDataTransformer,
+        private readonly IdToCalendarRangeDataTransformer $calendarRangeDataTransformer
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -91,42 +71,42 @@ class CalendarType extends AbstractType
         $builder->add('startDate', HiddenType::class);
         $builder->get('startDate')
             ->addModelTransformer(new CallbackTransformer(
-                static function (?DateTimeImmutable $dateTimeImmutable): string {
+                static function (?\DateTimeImmutable $dateTimeImmutable): string {
                     if (null !== $dateTimeImmutable) {
-                        $res = date_format($dateTimeImmutable, DateTimeImmutable::ATOM);
+                        $res = date_format($dateTimeImmutable, \DateTimeImmutable::ATOM);
                     } else {
                         $res = '';
                     }
 
                     return $res;
                 },
-                static function (?string $dateAsString): ?DateTimeImmutable {
+                static function (?string $dateAsString): ?\DateTimeImmutable {
                     if ('' === $dateAsString || null === $dateAsString) {
                         return null;
                     }
 
-                    return DateTimeImmutable::createFromFormat(DateTimeImmutable::ATOM, $dateAsString);
+                    return \DateTimeImmutable::createFromFormat(\DateTimeImmutable::ATOM, $dateAsString);
                 }
             ));
 
         $builder->add('endDate', HiddenType::class);
         $builder->get('endDate')
             ->addModelTransformer(new CallbackTransformer(
-                static function (?DateTimeImmutable $dateTimeImmutable): string {
+                static function (?\DateTimeImmutable $dateTimeImmutable): string {
                     if (null !== $dateTimeImmutable) {
-                        $res = date_format($dateTimeImmutable, DateTimeImmutable::ATOM);
+                        $res = date_format($dateTimeImmutable, \DateTimeImmutable::ATOM);
                     } else {
                         $res = '';
                     }
 
                     return $res;
                 },
-                static function (?string $dateAsString): ?DateTimeImmutable {
+                static function (?string $dateAsString): ?\DateTimeImmutable {
                     if ('' === $dateAsString || null === $dateAsString) {
                         return null;
                     }
 
-                    return DateTimeImmutable::createFromFormat(DateTimeImmutable::ATOM, $dateAsString);
+                    return \DateTimeImmutable::createFromFormat(\DateTimeImmutable::ATOM, $dateAsString);
                 }
             ));
 
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
index 4b9dca19f..6dd5bfa52 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -19,17 +19,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected TranslatorInterface $translator;
-
-    private Security $security;
-
-    public function __construct(
-        Security $security,
-        TranslatorInterface $translator
-    ) {
-        $this->security = $security;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly Security $security, protected TranslatorInterface $translator) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillCalendarBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/PersonMenuBuilder.php
index eccbe1ffb..e92a72bb7 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/PersonMenuBuilder.php
@@ -19,17 +19,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected TranslatorInterface $translator;
-
-    private Security $security;
-
-    public function __construct(
-        Security $security,
-        TranslatorInterface $translator
-    ) {
-        $this->security = $security;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly Security $security, protected TranslatorInterface $translator) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
index 525039910..3a062f7b8 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -18,17 +18,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    public TranslatorInterface $translator;
-
-    private Security $security;
-
-    public function __construct(
-        Security $security,
-        TranslatorInterface $translator
-    ) {
-        $this->security = $security;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly Security $security, public TranslatorInterface $translator) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
index f97cbc7b2..8f62fdcdb 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
@@ -21,7 +21,6 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
 use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostRemoveEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
@@ -30,15 +29,7 @@ use Symfony\Component\Security\Core\Security;
 
 class CalendarEntityListener
 {
-    private MessageBusInterface $messageBus;
-
-    private Security $security;
-
-    public function __construct(MessageBusInterface $messageBus, Security $security)
-    {
-        $this->messageBus = $messageBus;
-        $this->security = $security;
-    }
+    public function __construct(private readonly MessageBusInterface $messageBus, private readonly Security $security) {}
 
     public function postPersist(Calendar $calendar, PostPersistEventArgs $args): void
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
index 4df548277..8b875bdcb 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
@@ -21,7 +21,6 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\Messenger\Message\CalendarRangeMessage;
 use Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostRemoveEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
@@ -30,15 +29,7 @@ use Symfony\Component\Security\Core\Security;
 
 class CalendarRangeEntityListener
 {
-    private MessageBusInterface $messageBus;
-
-    private Security $security;
-
-    public function __construct(MessageBusInterface $messageBus, Security $security)
-    {
-        $this->messageBus = $messageBus;
-        $this->security = $security;
-    }
+    public function __construct(private readonly MessageBusInterface $messageBus, private readonly Security $security) {}
 
     public function postPersist(CalendarRange $calendarRange, PostPersistEventArgs $eventArgs): void
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php
index 4e3ae5891..7749d503c 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php
@@ -31,15 +31,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
  */
 class CalendarRangeRemoveToRemoteHandler implements MessageHandlerInterface
 {
-    private RemoteCalendarConnectorInterface $remoteCalendarConnector;
-
-    private UserRepository $userRepository;
-
-    public function __construct(RemoteCalendarConnectorInterface $remoteCalendarConnector, UserRepository $userRepository)
-    {
-        $this->remoteCalendarConnector = $remoteCalendarConnector;
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector, private readonly UserRepository $userRepository) {}
 
     public function __invoke(CalendarRangeRemovedMessage $calendarRangeRemovedMessage)
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php
index 79bcd24ee..c9fd1b939 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php
@@ -32,21 +32,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
  */
 class CalendarRangeToRemoteHandler implements MessageHandlerInterface
 {
-    private CalendarRangeRepository $calendarRangeRepository;
-
-    private EntityManagerInterface $entityManager;
-
-    private RemoteCalendarConnectorInterface $remoteCalendarConnector;
-
-    public function __construct(
-        CalendarRangeRepository $calendarRangeRepository,
-        RemoteCalendarConnectorInterface $remoteCalendarConnector,
-        EntityManagerInterface $entityManager
-    ) {
-        $this->calendarRangeRepository = $calendarRangeRepository;
-        $this->remoteCalendarConnector = $remoteCalendarConnector;
-        $this->entityManager = $entityManager;
-    }
+    public function __construct(private readonly CalendarRangeRepository $calendarRangeRepository, private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector, private readonly EntityManagerInterface $entityManager) {}
 
     public function __invoke(CalendarRangeMessage $calendarRangeMessage): void
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
index f087766ec..73e8a0c37 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
@@ -31,18 +31,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
  */
 class CalendarRemoveHandler implements MessageHandlerInterface
 {
-    private CalendarRangeRepository $calendarRangeRepository;
-
-    private RemoteCalendarConnectorInterface $remoteCalendarConnector;
-
-    private UserRepositoryInterface $userRepository;
-
-    public function __construct(RemoteCalendarConnectorInterface $remoteCalendarConnector, CalendarRangeRepository $calendarRangeRepository, UserRepositoryInterface $userRepository)
-    {
-        $this->remoteCalendarConnector = $remoteCalendarConnector;
-        $this->calendarRangeRepository = $calendarRangeRepository;
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector, private readonly CalendarRangeRepository $calendarRangeRepository, private readonly UserRepositoryInterface $userRepository) {}
 
     public function __invoke(CalendarRemovedMessage $message)
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php
index 9bcc0c434..6a1388d2e 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php
@@ -37,33 +37,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
  */
 class CalendarToRemoteHandler implements MessageHandlerInterface
 {
-    private RemoteCalendarConnectorInterface $calendarConnector;
-
-    private CalendarRangeRepository $calendarRangeRepository;
-
-    private CalendarRepository $calendarRepository;
-
-    private EntityManagerInterface $entityManager;
-
-    private InviteRepository $inviteRepository;
-
-    private UserRepository $userRepository;
-
-    public function __construct(
-        CalendarRangeRepository $calendarRangeRepository,
-        CalendarRepository $calendarRepository,
-        EntityManagerInterface $entityManager,
-        InviteRepository $inviteRepository,
-        RemoteCalendarConnectorInterface $calendarConnector,
-        UserRepository $userRepository
-    ) {
-        $this->calendarConnector = $calendarConnector;
-        $this->calendarRepository = $calendarRepository;
-        $this->calendarRangeRepository = $calendarRangeRepository;
-        $this->entityManager = $entityManager;
-        $this->userRepository = $userRepository;
-        $this->inviteRepository = $inviteRepository;
-    }
+    public function __construct(private readonly CalendarRangeRepository $calendarRangeRepository, private readonly CalendarRepository $calendarRepository, private readonly EntityManagerInterface $entityManager, private readonly InviteRepository $inviteRepository, private readonly RemoteCalendarConnectorInterface $calendarConnector, private readonly UserRepository $userRepository) {}
 
     public function __invoke(CalendarMessage $calendarMessage)
     {
@@ -89,14 +63,10 @@ class CalendarToRemoteHandler implements MessageHandlerInterface
 
         $newInvites = array_filter(
             array_map(
-                function ($id) {
-                    return $this->inviteRepository->find($id);
-                },
+                fn ($id) => $this->inviteRepository->find($id),
                 $calendarMessage->getNewInvitesIds(),
             ),
-            static function (?Invite $invite) {
-                return null !== $invite;
-            }
+            static fn (?Invite $invite) => null !== $invite
         );
 
         $this->calendarConnector->syncCalendar(
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php
index e1df3ac3d..7ca5f2c12 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php
@@ -31,18 +31,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
  */
 class InviteUpdateHandler implements MessageHandlerInterface
 {
-    private EntityManagerInterface $em;
-
-    private InviteRepository $inviteRepository;
-
-    private RemoteCalendarConnectorInterface $remoteCalendarConnector;
-
-    public function __construct(EntityManagerInterface $em, InviteRepository $inviteRepository, RemoteCalendarConnectorInterface $remoteCalendarConnector)
-    {
-        $this->em = $em;
-        $this->inviteRepository = $inviteRepository;
-        $this->remoteCalendarConnector = $remoteCalendarConnector;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly InviteRepository $inviteRepository, private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector) {}
 
     public function __invoke(InviteUpdateMessage $inviteUpdateMessage): void
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php
index 9c1e84511..7a67bee61 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php
@@ -36,48 +36,14 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
  */
 class MSGraphChangeNotificationHandler implements MessageHandlerInterface
 {
-    private CalendarRangeRepository $calendarRangeRepository;
-
-    private CalendarRangeSyncer $calendarRangeSyncer;
-
-    private CalendarRepository $calendarRepository;
-
-    private CalendarSyncer $calendarSyncer;
-
-    private EntityManagerInterface $em;
-
-    private LoggerInterface $logger;
-
-    private MapCalendarToUser $mapCalendarToUser;
-
-    private UserRepository $userRepository;
-
-    public function __construct(
-        CalendarRangeRepository $calendarRangeRepository,
-        CalendarRangeSyncer $calendarRangeSyncer,
-        CalendarRepository $calendarRepository,
-        CalendarSyncer $calendarSyncer,
-        EntityManagerInterface $em,
-        LoggerInterface $logger,
-        MapCalendarToUser $mapCalendarToUser,
-        UserRepository $userRepository
-    ) {
-        $this->calendarRangeRepository = $calendarRangeRepository;
-        $this->calendarRangeSyncer = $calendarRangeSyncer;
-        $this->calendarRepository = $calendarRepository;
-        $this->calendarSyncer = $calendarSyncer;
-        $this->em = $em;
-        $this->logger = $logger;
-        $this->mapCalendarToUser = $mapCalendarToUser;
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly CalendarRangeRepository $calendarRangeRepository, private readonly CalendarRangeSyncer $calendarRangeSyncer, private readonly CalendarRepository $calendarRepository, private readonly CalendarSyncer $calendarSyncer, private readonly EntityManagerInterface $em, private readonly LoggerInterface $logger, private readonly MapCalendarToUser $mapCalendarToUser, private readonly UserRepository $userRepository) {}
 
     public function __invoke(MSGraphChangeNotificationMessage $changeNotificationMessage): void
     {
         $user = $this->userRepository->find($changeNotificationMessage->getUserId());
 
         if (null === $user) {
-            $this->logger->warning(__CLASS__ . ' notification concern non-existent user, skipping');
+            $this->logger->warning(self::class.' notification concern non-existent user, skipping');
 
             return;
         }
@@ -86,7 +52,7 @@ class MSGraphChangeNotificationHandler implements MessageHandlerInterface
             $secret = $this->mapCalendarToUser->getSubscriptionSecret($user);
 
             if ($secret !== ($notification['clientState'] ?? -1)) {
-                $this->logger->warning(__CLASS__ . ' could not validate secret, skipping');
+                $this->logger->warning(self::class.' could not validate secret, skipping');
 
                 continue;
             }
@@ -101,7 +67,7 @@ class MSGraphChangeNotificationHandler implements MessageHandlerInterface
                 $this->calendarSyncer->handleCalendarSync($calendar, $notification, $user);
                 $this->em->flush();
             } else {
-                $this->logger->info(__CLASS__ . ' id not found in any calendar nor calendar range');
+                $this->logger->info(self::class.' id not found in any calendar nor calendar range');
             }
         }
 
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
index ec5977ad3..9bcd81c67 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
@@ -24,15 +24,13 @@ use Chill\MainBundle\Entity\User;
 
 class CalendarMessage
 {
-    public const CALENDAR_PERSIST = 'CHILL_CALENDAR_CALENDAR_PERSIST';
+    final public const CALENDAR_PERSIST = 'CHILL_CALENDAR_CALENDAR_PERSIST';
 
-    public const CALENDAR_UPDATE = 'CHILL_CALENDAR_CALENDAR_UPDATE';
+    final public const CALENDAR_UPDATE = 'CHILL_CALENDAR_CALENDAR_UPDATE';
 
-    private string $action;
+    private readonly int $byUserId;
 
-    private int $byUserId;
-
-    private int $calendarId;
+    private readonly int $calendarId;
 
     private array $newInvitesIds = [];
 
@@ -47,25 +45,22 @@ class CalendarMessage
 
     public function __construct(
         Calendar $calendar,
-        string $action,
+        private readonly string $action,
         User $byUser
     ) {
         $this->calendarId = $calendar->getId();
         $this->byUserId = $byUser->getId();
-        $this->action = $action;
         $this->previousCalendarRangeId = null !== $calendar->previousCalendarRange ?
             $calendar->previousCalendarRange->getId() : null;
         $this->previousMainUserId = null !== $calendar->previousMainUser ?
             $calendar->previousMainUser->getId() : null;
         $this->newInvitesIds = array_map(static fn (Invite $i) => $i->getId(), $calendar->newInvites);
-        $this->oldInvites = array_map(static function (Invite $i) {
-            return [
-                'inviteId' => $i->getId(),
-                'userId' => $i->getUser()->getId(),
-                'userEmail' => $i->getUser()->getEmail(),
-                'userLabel' => $i->getUser()->getLabel(),
-            ];
-        }, $calendar->oldInvites);
+        $this->oldInvites = array_map(static fn (Invite $i) => [
+            'inviteId' => $i->getId(),
+            'userId' => $i->getUser()->getId(),
+            'userEmail' => $i->getUser()->getEmail(),
+            'userLabel' => $i->getUser()->getLabel(),
+        ], $calendar->oldInvites);
     }
 
     public function getAction(): string
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeMessage.php
index 526826ff8..13669a0a2 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeMessage.php
@@ -23,19 +23,16 @@ use Chill\MainBundle\Entity\User;
 
 class CalendarRangeMessage
 {
-    public const CALENDAR_RANGE_PERSIST = 'CHILL_CALENDAR_CALENDAR_RANGE_PERSIST';
+    final public const CALENDAR_RANGE_PERSIST = 'CHILL_CALENDAR_CALENDAR_RANGE_PERSIST';
 
-    public const CALENDAR_RANGE_UPDATE = 'CHILL_CALENDAR_CALENDAR_RANGE_UPDATE';
-
-    private string $action;
+    final public const CALENDAR_RANGE_UPDATE = 'CHILL_CALENDAR_CALENDAR_RANGE_UPDATE';
 
     private ?int $byUserId = null;
 
-    private int $calendarRangeId;
+    private readonly int $calendarRangeId;
 
-    public function __construct(CalendarRange $calendarRange, string $action, ?User $byUser)
+    public function __construct(CalendarRange $calendarRange, private readonly string $action, ?User $byUser)
     {
-        $this->action = $action;
         $this->calendarRangeId = $calendarRange->getId();
 
         if (null !== $byUser) {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeRemovedMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeRemovedMessage.php
index 783484592..eb8be6838 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeRemovedMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRangeRemovedMessage.php
@@ -25,11 +25,11 @@ class CalendarRangeRemovedMessage
 {
     private ?int $byUserId = null;
 
-    private int $calendarRangeUserId;
+    private readonly int $calendarRangeUserId;
 
-    private array $remoteAttributes;
+    private readonly array $remoteAttributes;
 
-    private string $remoteId;
+    private readonly string $remoteId;
 
     public function __construct(CalendarRange $calendarRange, ?User $byUser)
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
index 65831ebe0..53dcea28c 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
@@ -27,11 +27,11 @@ class CalendarRemovedMessage
 
     private ?int $byUserId = null;
 
-    private int $calendarUserId;
+    private readonly int $calendarUserId;
 
-    private array $remoteAttributes;
+    private readonly array $remoteAttributes;
 
-    private string $remoteId;
+    private readonly string $remoteId;
 
     public function __construct(Calendar $calendar, ?User $byUser)
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/InviteUpdateMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/InviteUpdateMessage.php
index 35f78fc7d..d18ab8db1 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/InviteUpdateMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/InviteUpdateMessage.php
@@ -23,9 +23,9 @@ use Chill\MainBundle\Entity\User;
 
 class InviteUpdateMessage
 {
-    private int $byUserId;
+    private readonly int $byUserId;
 
-    private int $inviteId;
+    private readonly int $inviteId;
 
     public function __construct(Invite $invite, User $byUser)
     {
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/MSGraphChangeNotificationMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/MSGraphChangeNotificationMessage.php
index f1d3b6b04..15b8c6733 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/MSGraphChangeNotificationMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/MSGraphChangeNotificationMessage.php
@@ -20,15 +20,7 @@ namespace Chill\CalendarBundle\Messenger\Message;
 
 class MSGraphChangeNotificationMessage
 {
-    private array $content;
-
-    private int $userId;
-
-    public function __construct(array $content, int $userId)
-    {
-        $this->content = $content;
-        $this->userId = $userId;
-    }
+    public function __construct(private readonly array $content, private readonly int $userId) {}
 
     public function getContent(): array
     {
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/AddressConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/AddressConverter.php
index 8b86ba0ec..2535e23ca 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/AddressConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/AddressConverter.php
@@ -24,15 +24,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 
 class AddressConverter
 {
-    private AddressRender $addressRender;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(AddressRender $addressRender, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->addressRender = $addressRender;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly AddressRender $addressRender, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function addressToRemote(Address $address): array
     {
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
index c400b6694..080140d86 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
@@ -19,8 +19,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
@@ -30,39 +28,21 @@ use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
  */
 class EventsOnUserSubscriptionCreator
 {
-    private LoggerInterface $logger;
-
-    private MachineHttpClient $machineHttpClient;
-
-    private MapCalendarToUser $mapCalendarToUser;
-
-    private UrlGeneratorInterface $urlGenerator;
-
-    public function __construct(
-        LoggerInterface $logger,
-        MachineHttpClient $machineHttpClient,
-        MapCalendarToUser $mapCalendarToUser,
-        UrlGeneratorInterface $urlGenerator
-    ) {
-        $this->logger = $logger;
-        $this->machineHttpClient = $machineHttpClient;
-        $this->mapCalendarToUser = $mapCalendarToUser;
-        $this->urlGenerator = $urlGenerator;
-    }
+    public function __construct(private readonly LoggerInterface $logger, private readonly MachineHttpClient $machineHttpClient, private readonly MapCalendarToUser $mapCalendarToUser, private readonly UrlGeneratorInterface $urlGenerator) {}
 
     /**
+     * @return array{secret: string, id: string, expiration: int}
+     *
      * @throws ClientExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
-     *
-     * @return array<secret: string, id: string, expiration: int>
      */
-    public function createSubscriptionForUser(User $user, DateTimeImmutable $expiration): array
+    public function createSubscriptionForUser(User $user, \DateTimeImmutable $expiration): array
     {
         if (null === $userId = $this->mapCalendarToUser->getUserId($user)) {
-            throw new LogicException('no user id');
+            throw new \LogicException('no user id');
         }
 
         $subscription = [
@@ -74,7 +54,7 @@ class EventsOnUserSubscriptionCreator
             ),
             'resource' => "/users/{$userId}/calendar/events",
             'clientState' => $secret = base64_encode(openssl_random_pseudo_bytes(92, $cstrong)),
-            'expirationDateTime' => $expiration->format(DateTimeImmutable::ATOM),
+            'expirationDateTime' => $expiration->format(\DateTimeImmutable::ATOM),
         ];
 
         try {
@@ -97,26 +77,26 @@ class EventsOnUserSubscriptionCreator
     }
 
     /**
+     * @return array{secret: string, id: string, expiration: int}
+     *
      * @throws ClientExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
-     *
-     * @return array<secret: string, id: string, expiration: int>
      */
-    public function renewSubscriptionForUser(User $user, DateTimeImmutable $expiration): array
+    public function renewSubscriptionForUser(User $user, \DateTimeImmutable $expiration): array
     {
         if (null === $userId = $this->mapCalendarToUser->getUserId($user)) {
-            throw new LogicException('no user id');
+            throw new \LogicException('no user id');
         }
 
         if (null === $subscriptionId = $this->mapCalendarToUser->getActiveSubscriptionId($user)) {
-            throw new LogicException('no user id');
+            throw new \LogicException('no user id');
         }
 
         $subscription = [
-            'expirationDateTime' => $expiration->format(DateTimeImmutable::ATOM),
+            'expirationDateTime' => $expiration->format(\DateTimeImmutable::ATOM),
         ];
 
         try {
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/LocationConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/LocationConverter.php
index 396dfd931..f14683b9e 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/LocationConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/LocationConverter.php
@@ -22,12 +22,7 @@ use Chill\MainBundle\Entity\Location;
 
 class LocationConverter
 {
-    private AddressConverter $addressConverter;
-
-    public function __construct(AddressConverter $addressConverter)
-    {
-        $this->addressConverter = $addressConverter;
-    }
+    public function __construct(private readonly AddressConverter $addressConverter) {}
 
     public function locationToRemote(Location $location): array
     {
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php
deleted file mode 100644
index c523a1e92..000000000
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social 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 Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
-
-use Chill\MainBundle\Entity\User;
-use DateInterval;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query\ResultSetMapping;
-use Doctrine\ORM\Query\ResultSetMappingBuilder;
-use function strtr;
-
-/**
- * Contains classes and methods for fetching users with some calendar metadatas.
- */
-class MSGraphUserRepository
-{
-    private const MOST_OLD_SUBSCRIPTION_OR_ANY_MS_GRAPH = <<<'SQL'
-        select
-            {select}
-        from users u
-        where
-            NOT attributes ?? 'msgraph'
-            OR NOT attributes->'msgraph' ?? 'subscription_events_expiration'
-            OR (attributes->'msgraph' ?? 'subscription_events_expiration' AND (attributes->'msgraph'->>'subscription_events_expiration')::int < EXTRACT(EPOCH FROM (NOW() + :interval::interval)))
-        LIMIT :limit OFFSET :offset
-        ;
-        SQL;
-
-    private EntityManagerInterface $entityManager;
-
-    public function __construct(EntityManagerInterface $entityManager)
-    {
-        $this->entityManager = $entityManager;
-    }
-
-    public function countByMostOldSubscriptionOrWithoutSubscriptionOrData(DateInterval $interval): int
-    {
-        $rsm = new ResultSetMapping();
-        $rsm->addScalarResult('c', 'c');
-
-        $sql = strtr(self::MOST_OLD_SUBSCRIPTION_OR_ANY_MS_GRAPH, [
-            '{select}' => 'COUNT(u) AS c',
-            'LIMIT :limit OFFSET :offset' => '',
-        ]);
-
-        return $this->entityManager->createNativeQuery($sql, $rsm)->setParameters([
-            'interval' => $interval,
-        ])->getSingleScalarResult();
-    }
-
-    /**
-     * @return array|User[]
-     */
-    public function findByMostOldSubscriptionOrWithoutSubscriptionOrData(DateInterval $interval, int $limit = 50, int $offset = 0): array
-    {
-        $rsm = new ResultSetMappingBuilder($this->entityManager);
-        $rsm->addRootEntityFromClassMetadata(User::class, 'u');
-
-        return $this->entityManager->createNativeQuery(
-            strtr(self::MOST_OLD_SUBSCRIPTION_OR_ANY_MS_GRAPH, ['{select}' => $rsm->generateSelectClause()]),
-            $rsm
-        )->setParameters([
-            'interval' => $interval,
-            'limit' => $limit,
-            'offset' => $offset,
-        ])->getResult();
-    }
-}
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php
new file mode 100644
index 000000000..37e3e1996
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php
@@ -0,0 +1,65 @@
+<?php
+
+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 Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
+
+use Chill\CalendarBundle\Exception\UserAbsenceSyncException;
+use Chill\MainBundle\Entity\User;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+final readonly class MSUserAbsenceReader implements MSUserAbsenceReaderInterface
+{
+    public function __construct(
+        private HttpClientInterface $machineHttpClient,
+        private MapCalendarToUser $mapCalendarToUser,
+        private ClockInterface $clock,
+    ) {}
+
+    /**
+     * @throw UserAbsenceSyncException when the data cannot be reached or is not valid from microsoft
+     */
+    public function isUserAbsent(User $user): null|bool
+    {
+        $id = $this->mapCalendarToUser->getUserId($user);
+
+        if (null === $id) {
+            return null;
+        }
+
+        try {
+            $automaticRepliesSettings = $this->machineHttpClient
+                ->request('GET', 'users/'.$id.'/mailboxSettings/automaticRepliesSetting')
+                ->toArray(true);
+        } catch (ClientExceptionInterface|DecodingExceptionInterface|RedirectionExceptionInterface|TransportExceptionInterface $e) {
+            throw new UserAbsenceSyncException('Error receiving response for mailboxSettings', 0, $e);
+        } catch (ServerExceptionInterface $e) {
+            throw new UserAbsenceSyncException('Server error receiving response for mailboxSettings', 0, $e);
+        }
+
+        if (!array_key_exists('status', $automaticRepliesSettings)) {
+            throw new \LogicException('no key "status" on automatic replies settings: '.json_encode($automaticRepliesSettings, JSON_THROW_ON_ERROR));
+        }
+
+        return match ($automaticRepliesSettings['status']) {
+            'disabled' => false,
+            'alwaysEnabled' => true,
+            'scheduled' => RemoteEventConverter::convertStringDateWithoutTimezone($automaticRepliesSettings['scheduledStartDateTime']['dateTime']) < $this->clock->now()
+                && RemoteEventConverter::convertStringDateWithoutTimezone($automaticRepliesSettings['scheduledEndDateTime']['dateTime']) > $this->clock->now(),
+            default => throw new UserAbsenceSyncException('this status is not documented by Microsoft')
+        };
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderInterface.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderInterface.php
new file mode 100644
index 000000000..f67562e27
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+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 Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
+
+use Chill\MainBundle\Entity\User;
+
+interface MSUserAbsenceReaderInterface
+{
+    /**
+     * @throw UserAbsenceSyncException when the data cannot be reached or is not valid from microsoft
+     */
+    public function isUserAbsent(User $user): null|bool;
+}
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSync.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSync.php
new file mode 100644
index 000000000..318580ffc
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSync.php
@@ -0,0 +1,49 @@
+<?php
+
+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 Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
+
+use Chill\MainBundle\Entity\User;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Clock\ClockInterface;
+
+readonly class MSUserAbsenceSync
+{
+    public function __construct(
+        private MSUserAbsenceReaderInterface $absenceReader,
+        private ClockInterface $clock,
+        private LoggerInterface $logger,
+    ) {}
+
+    public function syncUserAbsence(User $user): void
+    {
+        $absence = $this->absenceReader->isUserAbsent($user);
+
+        if (null === $absence) {
+            return;
+        }
+
+        if ($absence === $user->isAbsent()) {
+            // nothing to do
+            return;
+        }
+
+        $this->logger->info('will change user absence', ['userId' => $user->getId()]);
+
+        if ($absence) {
+            $this->logger->debug('make user absent', ['userId' => $user->getId()]);
+            $user->setAbsenceStart($this->clock->now());
+        } else {
+            $this->logger->debug('make user present', ['userId' => $user->getId()]);
+            $user->setAbsenceStart(null);
+        }
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php
index cc1692fb7..ce490ce3f 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineHttpClient.php
@@ -19,7 +19,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
-use LogicException;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
@@ -28,22 +27,16 @@ class MachineHttpClient implements HttpClientInterface
 {
     use BearerAuthorizationTrait;
 
-    private HttpClientInterface $decoratedClient;
+    private readonly HttpClientInterface $decoratedClient;
 
-    private MachineTokenStorage $machineTokenStorage;
-
-    /**
-     * @param HttpClientInterface $decoratedClient
-     */
-    public function __construct(MachineTokenStorage $machineTokenStorage, ?HttpClientInterface $decoratedClient = null)
+    public function __construct(private readonly MachineTokenStorage $machineTokenStorage, HttpClientInterface $decoratedClient = null)
     {
         $this->decoratedClient = $decoratedClient ?? \Symfony\Component\HttpClient\HttpClient::create();
-        $this->machineTokenStorage = $machineTokenStorage;
     }
 
     /**
      * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
-     * @throws LogicException if method is not supported
+     * @throws \LogicException                                                     if method is not supported
      */
     public function request(string $method, string $url, array $options = []): ResponseInterface
     {
@@ -69,13 +62,13 @@ class MachineHttpClient implements HttpClientInterface
                 break;
 
             default:
-                throw new LogicException("Method not supported: {$method}");
+                throw new \LogicException("Method not supported: {$method}");
         }
 
         return $this->decoratedClient->request($method, $url, $options);
     }
 
-    public function stream($responses, ?float $timeout = null): ResponseStreamInterface
+    public function stream($responses, float $timeout = null): ResponseStreamInterface
     {
         return $this->decoratedClient->stream($responses, $timeout);
     }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php
index ac62d44ac..f2a0fc096 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MachineTokenStorage.php
@@ -29,15 +29,7 @@ class MachineTokenStorage
 
     private ?AccessTokenInterface $accessToken = null;
 
-    private Azure $azure;
-
-    private ChillRedis $chillRedis;
-
-    public function __construct(Azure $azure, ChillRedis $chillRedis)
-    {
-        $this->azure = $azure;
-        $this->chillRedis = $chillRedis;
-    }
+    public function __construct(private readonly Azure $azure, private readonly ChillRedis $chillRedis) {}
 
     public function getToken(): AccessTokenInterface
     {
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
index 563bd3a38..4b214e6d0 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php
@@ -19,46 +19,33 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use function array_key_exists;
 
 /**
  * Write metadata to user, which allow to find his default calendar.
  */
 class MapCalendarToUser
 {
-    public const EXPIRATION_SUBSCRIPTION_EVENT = 'subscription_events_expiration';
+    final public const EXPIRATION_SUBSCRIPTION_EVENT = 'subscription_events_expiration';
 
-    public const ID_SUBSCRIPTION_EVENT = 'subscription_events_id';
+    final public const ID_SUBSCRIPTION_EVENT = 'subscription_events_id';
 
-    public const METADATA_KEY = 'msgraph';
+    final public const METADATA_KEY = 'msgraph';
 
-    public const SECRET_SUBSCRIPTION_EVENT = 'subscription_events_secret';
+    final public const SECRET_SUBSCRIPTION_EVENT = 'subscription_events_secret';
 
-    private LoggerInterface $logger;
-
-    private HttpClientInterface $machineHttpClient;
-
-    public function __construct(
-        HttpClientInterface $machineHttpClient,
-        LoggerInterface $logger
-    ) {
-        $this->machineHttpClient = $machineHttpClient;
-        $this->logger = $logger;
-    }
+    public function __construct(private readonly HttpClientInterface $machineHttpClient, private readonly LoggerInterface $logger) {}
 
     public function getActiveSubscriptionId(User $user): string
     {
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
-            throw new LogicException('do not contains msgraph metadata');
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+            throw new \LogicException('do not contains msgraph metadata');
         }
 
-        if (!array_key_exists(self::ID_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
-            throw new LogicException('do not contains metadata for subscription id');
+        if (!\array_key_exists(self::ID_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
+            throw new \LogicException('do not contains metadata for subscription id');
         }
 
         return $user->getAttributes()[self::METADATA_KEY][self::ID_SUBSCRIPTION_EVENT];
@@ -93,12 +80,12 @@ class MapCalendarToUser
 
     public function getSubscriptionSecret(User $user): string
     {
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
-            throw new LogicException('do not contains msgraph metadata');
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+            throw new \LogicException('do not contains msgraph metadata');
         }
 
-        if (!array_key_exists(self::SECRET_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
-            throw new LogicException('do not contains secret in msgraph');
+        if (!\array_key_exists(self::SECRET_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
+            throw new \LogicException('do not contains secret in msgraph');
         }
 
         return $user->getAttributes()[self::METADATA_KEY][self::SECRET_SUBSCRIPTION_EVENT];
@@ -124,25 +111,25 @@ class MapCalendarToUser
 
     public function hasActiveSubscription(User $user): bool
     {
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
             return false;
         }
 
-        if (!array_key_exists(self::EXPIRATION_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
+        if (!\array_key_exists(self::EXPIRATION_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY])) {
             return false;
         }
 
         return $user->getAttributes()[self::METADATA_KEY][self::EXPIRATION_SUBSCRIPTION_EVENT]
-            >= (new DateTimeImmutable('now'))->getTimestamp();
+            >= (new \DateTimeImmutable('now'))->getTimestamp();
     }
 
     public function hasSubscriptionSecret(User $user): bool
     {
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
             return false;
         }
 
-        return array_key_exists(self::SECRET_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY]);
+        return \array_key_exists(self::SECRET_SUBSCRIPTION_EVENT, $user->getAttributes()[self::METADATA_KEY]);
     }
 
     public function hasUserId(User $user): bool
@@ -151,11 +138,11 @@ class MapCalendarToUser
             return false;
         }
 
-        if (!array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
+        if (!\array_key_exists(self::METADATA_KEY, $user->getAttributes())) {
             return false;
         }
 
-        return array_key_exists('id', $user->getAttributes()[self::METADATA_KEY]);
+        return \array_key_exists('id', $user->getAttributes()[self::METADATA_KEY]);
     }
 
     public function writeMetadata(User $user): User
@@ -189,8 +176,8 @@ class MapCalendarToUser
     public function writeSubscriptionMetadata(
         User $user,
         int $expiration,
-        ?string $id = null,
-        ?string $secret = null
+        string $id = null,
+        string $secret = null
     ): void {
         $user->setAttributeByDomain(self::METADATA_KEY, self::EXPIRATION_SUBSCRIPTION_EVENT, $expiration);
 
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php
index 9777bf4c0..d969a56b6 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserHttpClient.php
@@ -19,7 +19,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
-use LogicException;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 use Symfony\Contracts\HttpClient\ResponseStreamInterface;
@@ -28,17 +27,11 @@ class OnBehalfOfUserHttpClient
 {
     use BearerAuthorizationTrait;
 
-    private HttpClientInterface $decoratedClient;
+    private readonly HttpClientInterface $decoratedClient;
 
-    private OnBehalfOfUserTokenStorage $tokenStorage;
-
-    /**
-     * @param HttpClientInterface $decoratedClient
-     */
-    public function __construct(OnBehalfOfUserTokenStorage $tokenStorage, ?HttpClientInterface $decoratedClient = null)
+    public function __construct(private readonly OnBehalfOfUserTokenStorage $tokenStorage, HttpClientInterface $decoratedClient = null)
     {
         $this->decoratedClient = $decoratedClient ?? \Symfony\Component\HttpClient\HttpClient::create();
-        $this->tokenStorage = $tokenStorage;
     }
 
     public function request(string $method, string $url, array $options = []): ResponseInterface
@@ -64,13 +57,13 @@ class OnBehalfOfUserHttpClient
                 break;
 
             default:
-                throw new LogicException("Method not supported: {$method}");
+                throw new \LogicException("Method not supported: {$method}");
         }
 
         return $this->decoratedClient->request($method, $url, $options);
     }
 
-    public function stream($responses, ?float $timeout = null): ResponseStreamInterface
+    public function stream($responses, float $timeout = null): ResponseStreamInterface
     {
         return $this->decoratedClient->stream($responses, $timeout);
     }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
index 28f68e0e9..d8fff109b 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph;
 
-use LogicException;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use TheNetworg\OAuth2\Client\Provider\Azure;
 use TheNetworg\OAuth2\Client\Token\AccessToken;
@@ -28,17 +27,9 @@ use TheNetworg\OAuth2\Client\Token\AccessToken;
  */
 class OnBehalfOfUserTokenStorage
 {
-    public const MS_GRAPH_ACCESS_TOKEN = 'msgraph_access_token';
+    final public const MS_GRAPH_ACCESS_TOKEN = 'msgraph_access_token';
 
-    private Azure $azure;
-
-    private SessionInterface $session;
-
-    public function __construct(Azure $azure, SessionInterface $session)
-    {
-        $this->azure = $azure;
-        $this->session = $session;
-    }
+    public function __construct(private readonly Azure $azure, private readonly SessionInterface $session) {}
 
     public function getToken(): AccessToken
     {
@@ -46,7 +37,7 @@ class OnBehalfOfUserTokenStorage
         $token = $this->session->get(self::MS_GRAPH_ACCESS_TOKEN, null);
 
         if (null === $token) {
-            throw new LogicException('unexisting token');
+            throw new \LogicException('unexisting token');
         }
 
         if ($token->hasExpired()) {
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
index ac1de552a..94b488ddd 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
@@ -24,11 +24,7 @@ use Chill\CalendarBundle\Entity\Invite;
 use Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use DateTimeImmutable;
-use DateTimeZone;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
@@ -41,44 +37,29 @@ class RemoteEventConverter
      * valid when the remote string contains also a timezone, like in
      * lastModifiedDate.
      */
-    public const REMOTE_DATETIMEZONE_FORMAT = 'Y-m-d\\TH:i:s.u?P';
+    final public const REMOTE_DATETIMEZONE_FORMAT = 'Y-m-d\\TH:i:s.u?P';
 
     /**
      * Same as above, but sometimes the date is expressed with only 6 milliseconds.
      */
-    public const REMOTE_DATETIMEZONE_FORMAT_ALT = 'Y-m-d\\TH:i:s.uP';
+    final public const REMOTE_DATETIMEZONE_FORMAT_ALT = 'Y-m-d\\TH:i:s.uP';
 
     private const REMOTE_DATE_FORMAT = 'Y-m-d\TH:i:s.u0';
 
     private const REMOTE_DATETIME_WITHOUT_TZ_FORMAT = 'Y-m-d\TH:i:s.u?';
 
-    private DateTimeZone $defaultDateTimeZone;
+    private readonly \DateTimeZone $defaultDateTimeZone;
 
-    private EngineInterface $engine;
-
-    private LocationConverter $locationConverter;
-
-    private LoggerInterface $logger;
-
-    private PersonRenderInterface $personRender;
-
-    private DateTimeZone $remoteDateTimeZone;
-
-    private TranslatorInterface $translator;
+    private readonly \DateTimeZone $remoteDateTimeZone;
 
     public function __construct(
-        EngineInterface $engine,
-        LocationConverter $locationConverter,
-        LoggerInterface $logger,
-        PersonRenderInterface $personRender,
-        TranslatorInterface $translator
+        private readonly \Twig\Environment $engine,
+        private readonly LocationConverter $locationConverter,
+        private readonly LoggerInterface $logger,
+        private readonly PersonRenderInterface $personRender,
+        private readonly TranslatorInterface $translator
     ) {
-        $this->engine = $engine;
-        $this->locationConverter = $locationConverter;
-        $this->logger = $logger;
-        $this->translator = $translator;
-        $this->personRender = $personRender;
-        $this->defaultDateTimeZone = (new DateTimeImmutable())->getTimezone();
+        $this->defaultDateTimeZone = (new \DateTimeImmutable())->getTimezone();
         $this->remoteDateTimeZone = self::getRemoteTimeZone();
     }
 
@@ -118,12 +99,10 @@ class RemoteEventConverter
     {
         $result = array_merge(
             [
-                'subject' => '[Chill] ' .
+                'subject' => '[Chill] '.
                     implode(
                         ', ',
-                        $calendar->getPersons()->map(function (Person $p) {
-                            return $this->personRender->renderString($p, []);
-                        })->toArray()
+                        $calendar->getPersons()->map(fn (Person $p) => $this->personRender->renderString($p, []))->toArray()
                     ),
                 'start' => [
                     'dateTime' => $calendar->getStartDate()->setTimezone($this->remoteDateTimeZone)
@@ -136,7 +115,7 @@ class RemoteEventConverter
                     'timeZone' => 'UTC',
                 ],
                 'allowNewTimeProposals' => false,
-                'transactionId' => 'calendar_' . $calendar->getId(),
+                'transactionId' => 'calendar_'.$calendar->getId(),
                 'body' => [
                     'contentType' => 'text',
                     'content' => $this->engine->render(
@@ -161,9 +140,7 @@ class RemoteEventConverter
     {
         return [
             'attendees' => $calendar->getInvites()->map(
-                function (Invite $i) {
-                    return $this->buildInviteToAttendee($i);
-                }
+                fn (Invite $i) => $this->buildInviteToAttendee($i)
             )->toArray(),
         ];
     }
@@ -171,45 +148,45 @@ class RemoteEventConverter
     public function convertAvailabilityToRemoteEvent(array $event): RemoteEvent
     {
         $startDate =
-            DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone)
+            \DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone)
                 ->setTimezone($this->defaultDateTimeZone);
         $endDate =
-            DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone)
+            \DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone)
                 ->setTimezone($this->defaultDateTimeZone);
 
         return new RemoteEvent(
             uniqid('generated_'),
-            $this->translator->trans('remote_ms_graph.freebusy_statuses.' . $event['status']),
+            $this->translator->trans('remote_ms_graph.freebusy_statuses.'.$event['status']),
             '',
             $startDate,
             $endDate
         );
     }
 
-    public static function convertStringDateWithoutTimezone(string $date): DateTimeImmutable
+    public static function convertStringDateWithoutTimezone(string $date): \DateTimeImmutable
     {
-        $d = DateTimeImmutable::createFromFormat(
+        $d = \DateTimeImmutable::createFromFormat(
             self::REMOTE_DATETIME_WITHOUT_TZ_FORMAT,
             $date,
             self::getRemoteTimeZone()
         );
 
         if (false === $d) {
-            throw new RuntimeException("could not convert string date to datetime: {$date}");
+            throw new \RuntimeException("could not convert string date to datetime: {$date}");
         }
 
-        return $d->setTimezone((new DateTimeImmutable())->getTimezone());
+        return $d->setTimezone((new \DateTimeImmutable())->getTimezone());
     }
 
-    public static function convertStringDateWithTimezone(string $date): DateTimeImmutable
+    public static function convertStringDateWithTimezone(string $date): \DateTimeImmutable
     {
-        $d = DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT, $date);
+        $d = \DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT, $date);
 
         if (false === $d) {
-            throw new RuntimeException("could not convert string date to datetime: {$date}");
+            throw new \RuntimeException("could not convert string date to datetime: {$date}");
         }
 
-        $d->setTimezone((new DateTimeImmutable())->getTimezone());
+        $d->setTimezone((new \DateTimeImmutable())->getTimezone());
 
         return $d;
     }
@@ -217,10 +194,10 @@ class RemoteEventConverter
     public function convertToRemote(array $event): RemoteEvent
     {
         $startDate =
-            DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone)
+            \DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['start']['dateTime'], $this->remoteDateTimeZone)
                 ->setTimezone($this->defaultDateTimeZone);
         $endDate =
-            DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone)
+            \DateTimeImmutable::createFromFormat(self::REMOTE_DATE_FORMAT, $event['end']['dateTime'], $this->remoteDateTimeZone)
                 ->setTimezone($this->defaultDateTimeZone);
 
         return new RemoteEvent(
@@ -233,26 +210,22 @@ class RemoteEventConverter
         );
     }
 
-    public function getLastModifiedDate(array $event): DateTimeImmutable
+    public function getLastModifiedDate(array $event): \DateTimeImmutable
     {
-        $date = DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT, $event['lastModifiedDateTime']);
+        $date = \DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT, $event['lastModifiedDateTime']);
 
         if (false === $date) {
-            $date = DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT_ALT, $event['lastModifiedDateTime']);
+            $date = \DateTimeImmutable::createFromFormat(self::REMOTE_DATETIMEZONE_FORMAT_ALT, $event['lastModifiedDateTime']);
         }
 
         if (false === $date) {
-            $this->logger->error(self::class . ' Could not convert lastModifiedDate', [
+            $this->logger->error(self::class.' Could not convert lastModifiedDate', [
                 'actual' => $event['lastModifiedDateTime'],
                 'format' => self::REMOTE_DATETIMEZONE_FORMAT,
                 'format_alt' => self::REMOTE_DATETIMEZONE_FORMAT_ALT,
             ]);
 
-            throw new RuntimeException(sprintf(
-                'could not convert lastModifiedDate: %s, expected format: %s',
-                $event['lastModifiedDateTime'],
-                self::REMOTE_DATETIMEZONE_FORMAT . ' and ' . self::REMOTE_DATETIMEZONE_FORMAT_ALT
-            ));
+            throw new \RuntimeException(sprintf('could not convert lastModifiedDate: %s, expected format: %s', $event['lastModifiedDateTime'], self::REMOTE_DATETIMEZONE_FORMAT.' and '.self::REMOTE_DATETIMEZONE_FORMAT_ALT));
         }
 
         return $date;
@@ -266,9 +239,9 @@ class RemoteEventConverter
         return 'Y-m-d\TH:i:s';
     }
 
-    public static function getRemoteTimeZone(): DateTimeZone
+    public static function getRemoteTimeZone(): \DateTimeZone
     {
-        return new DateTimeZone('UTC');
+        return new \DateTimeZone('UTC');
     }
 
     private function buildInviteToAttendee(Invite $invite): array
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php
index a9227282d..1dffe198c 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarRangeSyncer.php
@@ -24,30 +24,15 @@ use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteEventConverter;
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 class CalendarRangeSyncer
 {
-    private EntityManagerInterface $em;
-
-    private LoggerInterface $logger;
-
-    private HttpClientInterface $machineHttpClient;
-
     /**
      * @param MachineHttpClient $machineHttpClient
      */
-    public function __construct(
-        EntityManagerInterface $em,
-        LoggerInterface $logger,
-        HttpClientInterface $machineHttpClient
-    ) {
-        $this->em = $em;
-        $this->logger = $logger;
-        $this->machineHttpClient = $machineHttpClient;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly LoggerInterface $logger, private readonly HttpClientInterface $machineHttpClient) {}
 
     public function handleCalendarRangeSync(CalendarRange $calendarRange, array $notification, User $user): void
     {
@@ -59,7 +44,7 @@ class CalendarRangeSyncer
                 }
                 $calendarRange->preventEnqueueChanges = true;
 
-                $this->logger->info(__CLASS__ . ' remove a calendar range because deleted on remote calendar');
+                $this->logger->info(self::class.' remove a calendar range because deleted on remote calendar');
                 $this->em->remove($calendarRange);
 
                 break;
@@ -71,7 +56,7 @@ class CalendarRangeSyncer
                         $notification['resource']
                     )->toArray();
                 } catch (ClientExceptionInterface $clientException) {
-                    $this->logger->warning(__CLASS__ . ' could not retrieve event from ms graph. Already deleted ?', [
+                    $this->logger->warning(self::class.' could not retrieve event from ms graph. Already deleted ?', [
                         'calendarRangeId' => $calendarRange->getId(),
                         'remoteEventId' => $notification['resource'],
                     ]);
@@ -82,7 +67,7 @@ class CalendarRangeSyncer
                 $lastModified = RemoteEventConverter::convertStringDateWithTimezone($new['lastModifiedDateTime']);
 
                 if ($calendarRange->getRemoteAttributes()['lastModifiedDateTime'] === $lastModified->getTimestamp()) {
-                    $this->logger->info(__CLASS__ . ' change key is equals. Source is probably a local update', [
+                    $this->logger->info(self::class.' change key is equals. Source is probably a local update', [
                         'calendarRangeId' => $calendarRange->getId(),
                         'remoteEventId' => $notification['resource'],
                     ]);
@@ -104,7 +89,7 @@ class CalendarRangeSyncer
                 break;
 
             default:
-                throw new RuntimeException('This changeType is not suppored: ' . $notification['changeType']);
+                throw new \RuntimeException('This changeType is not suppored: '.$notification['changeType']);
         }
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
index c5a640f32..9b4daf626 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
@@ -23,44 +23,21 @@ use Chill\CalendarBundle\Entity\Invite;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteEventConverter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use function in_array;
 
 class CalendarSyncer
 {
-    private LoggerInterface $logger;
-
-    private HttpClientInterface $machineHttpClient;
-
-    private UserRepositoryInterface $userRepository;
-
-    public function __construct(LoggerInterface $logger, HttpClientInterface $machineHttpClient, UserRepositoryInterface $userRepository)
-    {
-        $this->logger = $logger;
-        $this->machineHttpClient = $machineHttpClient;
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly LoggerInterface $logger, private readonly HttpClientInterface $machineHttpClient, private readonly UserRepositoryInterface $userRepository) {}
 
     public function handleCalendarSync(Calendar $calendar, array $notification, User $user): void
     {
-        switch ($notification['changeType']) {
-            case 'deleted':
-                $this->handleDeleteCalendar($calendar, $notification, $user);
-
-                break;
-
-            case 'updated':
-                $this->handleUpdateCalendar($calendar, $notification, $user);
-
-                break;
-
-            default:
-                throw new RuntimeException('this change type is not supported: ' . $notification['changeType']);
-        }
+        match ($notification['changeType']) {
+            'deleted' => $this->handleDeleteCalendar($calendar, $notification, $user),
+            'updated' => $this->handleUpdateCalendar($calendar, $notification, $user),
+            default => throw new \RuntimeException('this change type is not supported: '.$notification['changeType']),
+        };
     }
 
     private function handleDeleteCalendar(Calendar $calendar, array $notification, User $user): void
@@ -79,7 +56,7 @@ class CalendarSyncer
                 $notification['resource']
             )->toArray();
         } catch (ClientExceptionInterface $clientException) {
-            $this->logger->warning(__CLASS__ . ' could not retrieve event from ms graph. Already deleted ?', [
+            $this->logger->warning(self::class.' could not retrieve event from ms graph. Already deleted ?', [
                 'calendarId' => $calendar->getId(),
                 'remoteEventId' => $notification['resource'],
             ]);
@@ -96,7 +73,7 @@ class CalendarSyncer
         );
 
         if ($calendar->getRemoteAttributes()['lastModifiedDateTime'] === $lastModified->getTimestamp()) {
-            $this->logger->info(__CLASS__ . ' change key is equals. Source is probably a local update', [
+            $this->logger->info(self::class.' change key is equals. Source is probably a local update', [
                 'calendarRangeId' => $calendar->getId(),
                 'remoteEventId' => $notification['resource'],
             ]);
@@ -137,7 +114,7 @@ class CalendarSyncer
             }
 
             $email = $attendee['emailAddress']['address'];
-            $emails[] = strtolower($email);
+            $emails[] = strtolower((string) $email);
             $user = $this->userRepository->findOneByUsernameOrEmail($email);
 
             if (null === $user) {
@@ -150,38 +127,17 @@ class CalendarSyncer
 
             $invite = $calendar->getInviteForUser($user);
 
-            switch ($status) {
-                // possible cases: none, organizer, tentativelyAccepted, accepted, declined, notResponded.
-                case 'none':
-                case 'notResponded':
-                    $invite->setStatus(Invite::PENDING);
-
-                    break;
-
-                case 'tentativelyAccepted':
-                    $invite->setStatus(Invite::TENTATIVELY_ACCEPTED);
-
-                    break;
-
-                case 'accepted':
-                    $invite->setStatus(Invite::ACCEPTED);
-
-                    break;
-
-                case 'declined':
-                    $invite->setStatus(Invite::DECLINED);
-
-                    break;
-
-                default:
-                    throw new LogicException('should not happens, not implemented: ' . $status);
-
-                    break;
-            }
+            match ($status) {
+                'none', 'notResponded' => $invite->setStatus(Invite::PENDING),
+                'tentativelyAccepted' => $invite->setStatus(Invite::TENTATIVELY_ACCEPTED),
+                'accepted' => $invite->setStatus(Invite::ACCEPTED),
+                'declined' => $invite->setStatus(Invite::DECLINED),
+                default => throw new \LogicException('should not happens, not implemented: '.$status),
+            };
         }
 
         foreach ($calendar->getUsers() as $user) {
-            if (!in_array(strtolower($user->getEmailCanonical()), $emails, true)) {
+            if (!\in_array(strtolower($user->getEmailCanonical()), $emails, true)) {
                 $calendar->removeUser($user);
             }
         }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
index d14ebaa02..768ad2a44 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
@@ -28,8 +28,6 @@ use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteEventConverter;
 use Chill\CalendarBundle\Repository\CalendarRangeRepository;
 use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -38,62 +36,14 @@ use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_key_exists;
-use function count;
 
 class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
 {
     private array $cacheScheduleTimeForUser = [];
 
-    private CalendarRangeRepository $calendarRangeRepository;
+    public function __construct(private readonly CalendarRepository $calendarRepository, private readonly CalendarRangeRepository $calendarRangeRepository, private readonly HttpClientInterface $machineHttpClient, private readonly MapCalendarToUser $mapCalendarToUser, private readonly LoggerInterface $logger, private readonly OnBehalfOfUserTokenStorage $tokenStorage, private readonly OnBehalfOfUserHttpClient $userHttpClient, private readonly RemoteEventConverter $remoteEventConverter, private readonly TranslatorInterface $translator, private readonly UrlGeneratorInterface $urlGenerator, private readonly Security $security) {}
 
-    private CalendarRepository $calendarRepository;
-
-    private LoggerInterface $logger;
-
-    private HttpClientInterface $machineHttpClient;
-
-    private MapCalendarToUser $mapCalendarToUser;
-
-    private RemoteEventConverter $remoteEventConverter;
-
-    private OnBehalfOfUserTokenStorage $tokenStorage;
-
-    private TranslatorInterface $translator;
-
-    private UrlGeneratorInterface $urlGenerator;
-
-    private OnBehalfOfUserHttpClient $userHttpClient;
-
-    private Security $security;
-
-    public function __construct(
-        CalendarRepository $calendarRepository,
-        CalendarRangeRepository $calendarRangeRepository,
-        HttpClientInterface $machineHttpClient,
-        MapCalendarToUser $mapCalendarToUser,
-        LoggerInterface $logger,
-        OnBehalfOfUserTokenStorage $tokenStorage,
-        OnBehalfOfUserHttpClient $userHttpClient,
-        RemoteEventConverter $remoteEventConverter,
-        TranslatorInterface $translator,
-        UrlGeneratorInterface $urlGenerator,
-        Security $security
-    ) {
-        $this->calendarRepository = $calendarRepository;
-        $this->calendarRangeRepository = $calendarRangeRepository;
-        $this->machineHttpClient = $machineHttpClient;
-        $this->mapCalendarToUser = $mapCalendarToUser;
-        $this->logger = $logger;
-        $this->remoteEventConverter = $remoteEventConverter;
-        $this->tokenStorage = $tokenStorage;
-        $this->translator = $translator;
-        $this->urlGenerator = $urlGenerator;
-        $this->userHttpClient = $userHttpClient;
-        $this->security = $security;
-    }
-
-    public function countEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): int
+    public function countEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): int
     {
         $userId = $this->mapCalendarToUser->getUserId($user);
 
@@ -104,7 +54,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $data = $this->userHttpClient->request(
                 'GET',
-                'users/' . $userId . '/calendarView',
+                'users/'.$userId.'/calendarView',
                 [
                     'query' => [
                         'startDateTime' => $startDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat()),
@@ -116,7 +66,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             )->toArray();
         } catch (ClientExceptionInterface $e) {
             if (403 === $e->getResponse()->getStatusCode()) {
-                return count($this->getScheduleTimesForUser($user, $startDate, $endDate));
+                return \count($this->getScheduleTimesForUser($user, $startDate, $endDate));
             }
 
             $this->logger->error('Could not get list of event on MSGraph', [
@@ -153,6 +103,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             $this->logger->debug('mark user ready for msgraph calendar as he does not have any mapping', [
                 'userId' => $user->getId(),
             ]);
+
             return true;
         }
 
@@ -160,14 +111,14 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
     }
 
     /**
+     * @return array|\Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent[]
+     *
      * @throws \Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface
      * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
-     *
-     * @return array|\Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent[]
      */
-    public function listEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array
+    public function listEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array
     {
         $userId = $this->mapCalendarToUser->getUserId($user);
 
@@ -178,7 +129,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $bareEvents = $this->userHttpClient->request(
                 'GET',
-                'users/' . $userId . '/calendarView',
+                'users/'.$userId.'/calendarView',
                 [
                     'query' => [
                         'startDateTime' => $startDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat()),
@@ -190,23 +141,17 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
                 ]
             )->toArray();
 
-            $ids = array_map(static function ($item) {
-                return $item['id'];
-            }, $bareEvents['value']);
+            $ids = array_map(static fn ($item) => $item['id'], $bareEvents['value']);
             $existingIdsInRange = $this->calendarRangeRepository->findRemoteIdsPresent($ids);
             $existingIdsInCalendar = $this->calendarRepository->findRemoteIdsPresent($ids);
 
             return array_values(
                 array_map(
-                    function ($item) {
-                        return $this->remoteEventConverter->convertToRemote($item);
-                    },
+                    fn ($item) => $this->remoteEventConverter->convertToRemote($item),
                     // filter all event to keep only the one not in range
                     array_filter(
                         $bareEvents['value'],
-                        static function ($item) use ($existingIdsInRange, $existingIdsInCalendar) {
-                            return ((!$existingIdsInRange[$item['id']]) ?? true) && ((!$existingIdsInCalendar[$item['id']]) ?? true);
-                        }
+                        static fn ($item) => ((!$existingIdsInRange[$item['id']]) ?? true) && ((!$existingIdsInCalendar[$item['id']]) ?? true)
                     )
                 )
             );
@@ -224,7 +169,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         }
     }
 
-    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, CalendarRange $associatedCalendarRange = null): void
     {
         if ('' === $remoteId) {
             return;
@@ -274,7 +219,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
                     $calendar->getRemoteId(),
                     $this->translator->trans('remote_ms_graph.cancel_event_because_main_user_is_%label%', ['%label%' => $calendar->getMainUser()]),
                     $previousMainUser,
-                    'calendar_' . $calendar->getRemoteId()
+                    'calendar_'.$calendar->getRemoteId()
                 );
                 $this->createCalendarOnRemote($calendar);
             } else {
@@ -352,7 +297,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
                 break;
 
             default:
-                throw new Exception('not supported');
+                throw new \Exception('not supported');
         }
 
         try {
@@ -365,7 +310,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             $this->logger->warning('could not update calendar range to remote', [
                 'exception' => $e->getTraceAsString(),
                 'content' => $e->getResponse()->getContent(),
-                'calendarRangeId' => 'invite_' . $invite->getId(),
+                'calendarRangeId' => 'invite_'.$invite->getId(),
             ]);
 
             throw $e;
@@ -407,7 +352,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             'id' => $id,
             'lastModifiedDateTime' => $lastModified,
             'changeKey' => $changeKey
-        ] = $this->createOnRemote($eventData, $calendar->getMainUser(), 'calendar_' . $calendar->getId());
+        ] = $this->createOnRemote($eventData, $calendar->getMainUser(), 'calendar_'.$calendar->getId());
 
         if (null === $id) {
             return;
@@ -442,7 +387,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $event = $this->machineHttpClient->request(
                 'POST',
-                'users/' . $userId . '/calendar/events',
+                'users/'.$userId.'/calendar/events',
                 [
                     'json' => $eventData,
                 ]
@@ -486,7 +431,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         ] = $this->createOnRemote(
             $eventData,
             $calendarRange->getUser(),
-            'calendar_range_' . $calendarRange->getId()
+            'calendar_range_'.$calendarRange->getId()
         );
 
         $calendarRange->setRemoteId($id)
@@ -509,7 +454,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         $userId = $this->mapCalendarToUser->getUserId($user);
 
         if ('' === $iCalUid = ($event['iCalUId'] ?? '')) {
-            throw new Exception('no iCalUid for this event');
+            throw new \Exception('no iCalUid for this event');
         }
 
         try {
@@ -527,8 +472,8 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             throw $clientException;
         }
 
-        if (1 !== count($events['value'])) {
-            throw new Exception('multiple events found with same iCalUid');
+        if (1 !== \count($events['value'])) {
+            throw new \Exception('multiple events found with same iCalUid');
         }
 
         return $events['value'][0]['id'];
@@ -539,19 +484,13 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         $userId = $this->mapCalendarToUser->getUserId($user);
 
         if (null === $userId) {
-            throw new Exception(
-                sprintf(
-                    'no remote calendar for this user: %s, remoteid: %s',
-                    $user->getId(),
-                    $remoteId
-                )
-            );
+            throw new \Exception(sprintf('no remote calendar for this user: %s, remoteid: %s', $user->getId(), $remoteId));
         }
 
         try {
             return $this->machineHttpClient->request(
                 'GET',
-                'users/' . $userId . '/calendar/events/' . $remoteId
+                'users/'.$userId.'/calendar/events/'.$remoteId
             )->toArray();
         } catch (ClientExceptionInterface $e) {
             $this->logger->warning('Could not get event from calendar', [
@@ -562,11 +501,11 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         }
     }
 
-    private function getScheduleTimesForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): array
+    private function getScheduleTimesForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): array
     {
         $userId = $this->mapCalendarToUser->getUserId($user);
 
-        if (array_key_exists($userId, $this->cacheScheduleTimeForUser)) {
+        if (\array_key_exists($userId, $this->cacheScheduleTimeForUser)) {
             return $this->cacheScheduleTimeForUser[$userId];
         }
 
@@ -581,17 +520,17 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         $body = [
             'schedules' => [$user->getEmailCanonical()],
             'startTime' => [
-                'dateTime' => ($startDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat())),
+                'dateTime' => $startDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat()),
                 'timeZone' => 'UTC',
             ],
             'endTime' => [
-                'dateTime' => ($endDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat())),
+                'dateTime' => $endDate->setTimezone(RemoteEventConverter::getRemoteTimeZone())->format(RemoteEventConverter::getRemoteDateTimeSimpleFormat()),
                 'timeZone' => 'UTC',
             ],
         ];
 
         try {
-            $response = $this->userHttpClient->request('POST', 'users/' . $userId . '/calendar/getSchedule', [
+            $response = $this->userHttpClient->request('POST', 'users/'.$userId.'/calendar/getSchedule', [
                 'json' => $body,
             ])->toArray();
         } catch (ClientExceptionInterface $e) {
@@ -604,9 +543,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         }
 
         $this->cacheScheduleTimeForUser[$userId] = array_map(
-            function ($item) {
-                return $this->remoteEventConverter->convertAvailabilityToRemoteEvent($item);
-            },
+            fn ($item) => $this->remoteEventConverter->convertAvailabilityToRemoteEvent($item),
             $response['value'][0]['scheduleItems']
         );
 
@@ -618,7 +555,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         $eventDatas = [];
         $eventDatas[] = $this->remoteEventConverter->calendarToEvent($calendar);
 
-        if (0 < count($newInvites)) {
+        if (0 < \count($newInvites)) {
             // it seems that invitaiton are always send, even if attendee changes are mixed with other datas
             // $eventDatas[] = $this->remoteEventConverter->calendarToEventAttendeesOnly($calendar);
         }
@@ -632,7 +569,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
                 $calendar->getRemoteId(),
                 $eventData,
                 $calendar->getMainUser(),
-                'calendar_' . $calendar->getId()
+                'calendar_'.$calendar->getId()
             );
 
             $calendar->addRemoteAttributes([
@@ -663,7 +600,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $event = $this->machineHttpClient->request(
                 'PATCH',
-                'users/' . $userId . '/calendar/events/' . $remoteId,
+                'users/'.$userId.'/calendar/events/'.$remoteId,
                 [
                     'json' => $eventData,
                 ]
@@ -691,9 +628,9 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $this->machineHttpClient->request(
                 'DELETE',
-                'users/' . $userId . '/calendar/events/' . $remoteId
+                'users/'.$userId.'/calendar/events/'.$remoteId
             );
-        } catch (ClientExceptionInterface $e) {
+        } catch (ClientExceptionInterface) {
             $this->logger->warning('could not remove event from calendar', [
                 'event_remote_id' => $remoteId,
                 'user_id' => $user->getId(),
@@ -718,7 +655,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $event = $this->machineHttpClient->request(
                 'GET',
-                'users/' . $userId . '/calendar/events/' . $calendarRange->getRemoteId()
+                'users/'.$userId.'/calendar/events/'.$calendarRange->getRemoteId()
             )->toArray();
         } catch (ClientExceptionInterface $e) {
             $this->logger->warning('Could not get event from calendar', [
@@ -745,7 +682,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         try {
             $event = $this->machineHttpClient->request(
                 'PATCH',
-                'users/' . $userId . '/calendar/events/' . $calendarRange->getRemoteId(),
+                'users/'.$userId.'/calendar/events/'.$calendarRange->getRemoteId(),
                 [
                     'json' => $eventData,
                 ]
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php
index 211810abf..b4e2a5d3a 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/NullRemoteCalendarConnector.php
@@ -22,20 +22,18 @@ use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\Entity\Invite;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use LogicException;
 use Symfony\Component\HttpFoundation\Response;
 
 class NullRemoteCalendarConnector implements RemoteCalendarConnectorInterface
 {
-    public function countEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): int
+    public function countEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): int
     {
         return 0;
     }
 
     public function getMakeReadyResponse(string $returnPath): Response
     {
-        throw new LogicException('As this connector is always ready, this method should not be called');
+        throw new \LogicException('As this connector is always ready, this method should not be called');
     }
 
     public function isReady(): bool
@@ -43,28 +41,18 @@ class NullRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         return true;
     }
 
-    public function listEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array
+    public function listEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array
     {
         return [];
     }
 
-    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void
-    {
-    }
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, CalendarRange $associatedCalendarRange = null): void {}
 
-    public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void
-    {
-    }
+    public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void {}
 
-    public function syncCalendar(Calendar $calendar, string $action, ?CalendarRange $previousCalendarRange, ?User $previousMainUser, ?array $oldInvites, ?array $newInvites): void
-    {
-    }
+    public function syncCalendar(Calendar $calendar, string $action, ?CalendarRange $previousCalendarRange, ?User $previousMainUser, ?array $oldInvites, ?array $newInvites): void {}
 
-    public function syncCalendarRange(CalendarRange $calendarRange): void
-    {
-    }
+    public function syncCalendarRange(CalendarRange $calendarRange): void {}
 
-    public function syncInvite(Invite $invite): void
-    {
-    }
+    public function syncInvite(Invite $invite): void {}
 }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
index e3ef89ca4..53d2c8602 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
@@ -23,12 +23,11 @@ use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\Entity\Invite;
 use Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\Response;
 
 interface RemoteCalendarConnectorInterface
 {
-    public function countEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate): int;
+    public function countEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): int;
 
     /**
      * Return a response, more probably a RedirectResponse, where the user
@@ -46,9 +45,9 @@ interface RemoteCalendarConnectorInterface
     /**
      * @return array|RemoteEvent[]
      */
-    public function listEventsForUser(User $user, DateTimeImmutable $startDate, DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array;
+    public function listEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array;
 
-    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void;
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, CalendarRange $associatedCalendarRange = null): void;
 
     public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void;
 
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
index f56735de7..c52fc2866 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
@@ -23,10 +23,11 @@ use Chill\CalendarBundle\Command\MapAndSubscribeUserCalendarCommand;
 use Chill\CalendarBundle\Controller\RemoteCalendarConnectAzureController;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MachineHttpClient;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MachineTokenStorage;
+use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceReaderInterface;
+use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceSync;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraphRemoteCalendarConnector;
 use Chill\CalendarBundle\RemoteCalendar\Connector\NullRemoteCalendarConnector;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -37,17 +38,13 @@ class RemoteCalendarCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         $config = $container->getParameter('chill_calendar');
-        $connector = null;
 
-        if (!$config['remote_calendars_sync']['enabled']) {
-            $connector = NullRemoteCalendarConnector::class;
-        }
-
-        if ($config['remote_calendars_sync']['microsoft_graph']['enabled']) {
+        if (true === $config['remote_calendars_sync']['microsoft_graph']['enabled']) {
             $connector = MSGraphRemoteCalendarConnector::class;
 
-            $container->setAlias(HttpClientInterface::class . ' $machineHttpClient', MachineHttpClient::class);
+            $container->setAlias(HttpClientInterface::class.' $machineHttpClient', MachineHttpClient::class);
         } else {
+            $connector = NullRemoteCalendarConnector::class;
             // remove services which cannot be loaded
             $container->removeDefinition(MapAndSubscribeUserCalendarCommand::class);
             $container->removeDefinition(AzureGrantAdminConsentAndAcquireToken::class);
@@ -55,16 +52,14 @@ class RemoteCalendarCompilerPass implements CompilerPassInterface
             $container->removeDefinition(MachineTokenStorage::class);
             $container->removeDefinition(MachineHttpClient::class);
             $container->removeDefinition(MSGraphRemoteCalendarConnector::class);
+            $container->removeDefinition(MSUserAbsenceReaderInterface::class);
+            $container->removeDefinition(MSUserAbsenceSync::class);
         }
 
         if (!$container->hasAlias(Azure::class) && $container->hasDefinition('knpu.oauth2.client.azure')) {
             $container->setAlias(Azure::class, 'knpu.oauth2.provider.azure');
         }
 
-        if (null === $connector) {
-            throw new RuntimeException('Could not configure remote calendar');
-        }
-
         foreach ([
             NullRemoteCalendarConnector::class,
             MSGraphRemoteCalendarConnector::class, ] as $serviceId) {
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php
index 13c4a1c6a..40d1d1435 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php
@@ -18,45 +18,31 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\RemoteCalendar\Model;
 
-use DateTimeImmutable;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 class RemoteEvent
 {
-    public string $description;
-
-    /**
-     * @Serializer\Groups({"read"})
-     */
-    public DateTimeImmutable $endDate;
-
-    /**
-     * @Serializer\Groups({"read"})
-     */
-    public string $id;
-
-    /**
-     * @Serializer\Groups({"read"})
-     */
-    public bool $isAllDay;
-
-    /**
-     * @Serializer\Groups({"read"})
-     */
-    public DateTimeImmutable $startDate;
-
-    /**
-     * @Serializer\Groups({"read"})
-     */
-    public string $title;
-
-    public function __construct(string $id, string $title, string $description, DateTimeImmutable $startDate, DateTimeImmutable $endDate, bool $isAllDay = false)
-    {
-        $this->id = $id;
-        $this->title = $title;
-        $this->description = $description;
-        $this->startDate = $startDate;
-        $this->endDate = $endDate;
-        $this->isAllDay = $isAllDay;
-    }
+    public function __construct(
+        /**
+         * @Serializer\Groups({"read"})
+         */
+        public string $id,
+        /**
+         * @Serializer\Groups({"read"})
+         */
+        public string $title,
+        public string $description,
+        /**
+         * @Serializer\Groups({"read"})
+         */
+        public \DateTimeImmutable $startDate,
+        /**
+         * @Serializer\Groups({"read"})
+         */
+        public \DateTimeImmutable $endDate,
+        /**
+         * @Serializer\Groups({"read"})
+         */
+        public bool $isAllDay = false
+    ) {}
 }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php
index 7c6ef4e13..8f490f376 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php
@@ -23,25 +23,14 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 
 class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
 {
-    private AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
+    public function __construct(private readonly AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository, private readonly EntityManagerInterface $em) {}
 
-    private EntityManagerInterface $em;
-
-    public function __construct(
-        AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
-        EntityManagerInterface $em
-    ) {
-        $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
-        $this->em = $em;
-    }
-
-    public function buildQueryByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): QueryBuilder
+    public function buildQueryByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->em->createQueryBuilder();
         $qb->from(Calendar::class, 'c');
@@ -64,7 +53,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
         return $qb;
     }
 
-    public function buildQueryByAccompanyingPeriodIgnoredByDates(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): QueryBuilder
+    public function buildQueryByAccompanyingPeriodIgnoredByDates(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->em->createQueryBuilder();
         $qb->from(Calendar::class, 'c');
@@ -90,7 +79,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
     /**
      * Base implementation. The list of allowed accompanying period is retrieved "manually" from @see{AccompanyingPeriodACLAwareRepository}.
      */
-    public function buildQueryByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): QueryBuilder
+    public function buildQueryByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->em->createQueryBuilder()
             ->from(Calendar::class, 'c');
@@ -114,7 +103,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
     /**
      * Base implementation. The list of allowed accompanying period is retrieved "manually" from @see{AccompanyingPeriodACLAwareRepository}.
      */
-    public function buildQueryByPersonIgnoredByDates(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): QueryBuilder
+    public function buildQueryByPersonIgnoredByDates(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->em->createQueryBuilder()
             ->from(Calendar::class, 'c');
@@ -135,14 +124,14 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
         return $qb;
     }
 
-    public function countByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int
+    public function countByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int
     {
         $qb = $this->buildQueryByAccompanyingPeriod($period, $startDate, $endDate)->select('count(c)');
 
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function countByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int
+    public function countByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int
     {
         return $this->buildQueryByPerson($person, $startDate, $endDate)
             ->select('COUNT(c)')
@@ -150,14 +139,14 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
             ->getSingleScalarResult();
     }
 
-    public function countIgnoredByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int
+    public function countIgnoredByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int
     {
         $qb = $this->buildQueryByAccompanyingPeriodIgnoredByDates($period, $startDate, $endDate)->select('count(c)');
 
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function countIgnoredByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int
+    public function countIgnoredByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int
     {
         return $this->buildQueryByPersonIgnoredByDates($person, $startDate, $endDate)
             ->select('COUNT(c)')
@@ -168,12 +157,12 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
     /**
      * @return array|Calendar[]
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array
     {
         $qb = $this->buildQueryByAccompanyingPeriod($period, $startDate, $endDate)->select('c');
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('c.' . $sort, $order);
+            $qb->addOrderBy('c.'.$sort, $order);
         }
 
         if (null !== $offset) {
@@ -187,13 +176,13 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
         return $qb->getQuery()->getResult();
     }
 
-    public function findByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
+    public function findByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array
     {
         $qb = $this->buildQueryByPerson($person, $startDate, $endDate)
             ->select('c');
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('c.' . $sort, $order);
+            $qb->addOrderBy('c.'.$sort, $order);
         }
 
         if (null !== $offset) {
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php
index 70fb02590..f6d1b5c17 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepositoryInterface.php
@@ -21,33 +21,32 @@ namespace Chill\CalendarBundle\Repository;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 
 interface CalendarACLAwareRepositoryInterface
 {
-    public function countByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int;
+    public function countByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int;
 
     /**
      * Return the number or calendars associated with a person. See condition on @see{self::findByPerson}.
      */
-    public function countByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int;
+    public function countByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int;
 
     /**
      * Return the number or calendars associated with an accompanyign period which **does not** match the date conditions.
      */
-    public function countIgnoredByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int;
+    public function countIgnoredByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int;
 
     /**
      * Return the number or calendars associated with a person which **does not** match the date conditions.
      *
      * See condition on @see{self::findByPerson}.
      */
-    public function countIgnoredByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate): int;
+    public function countIgnoredByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate): int;
 
     /**
      * @return array|Calendar[]
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array;
 
     /**
      * Return all the calendars which are associated with a person, either on @see{Calendar::person} or within.
@@ -59,5 +58,5 @@ interface CalendarACLAwareRepositoryInterface
      *
      * @return array|Calendar[]
      */
-    public function findByPerson(Person $person, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
+    public function findByPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?array $orderBy = [], int $offset = null, int $limit = null): array;
 }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
index bd1074b5f..fb71717d0 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 class CalendarDocRepository implements ObjectRepository, CalendarDocRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -35,7 +35,7 @@ class CalendarDocRepository implements ObjectRepository, CalendarDocRepositoryIn
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepositoryInterface.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepositoryInterface.php
index d2b1951df..6d86fd943 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepositoryInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepositoryInterface.php
@@ -25,7 +25,7 @@ interface CalendarDocRepositoryInterface
     /**
      * @return array|CalendarDoc[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null);
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null);
 
     public function findOneBy(array $criteria): ?CalendarDoc;
 
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
index dc3405b7e..a707ccde9 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
@@ -13,28 +13,23 @@ namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use function count;
 
 class CalendarRangeRepository implements ObjectRepository
 {
-    private EntityManagerInterface $em;
+    private readonly EntityRepository $repository;
 
-    private EntityRepository $repository;
-
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(private readonly EntityManagerInterface $em)
     {
-        $this->em = $entityManager;
-        $this->repository = $entityManager->getRepository(CalendarRange::class);
+        $this->repository = $em->getRepository(CalendarRange::class);
     }
 
-    public function countByAvailableRangesForUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to): int
+    public function countByAvailableRangesForUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): int
     {
         return $this->buildQueryAvailableRangesForUser($user, $from, $to)
             ->select('COUNT(cr)')
@@ -57,7 +52,7 @@ class CalendarRangeRepository implements ObjectRepository
     /**
      * @return array|CalendarRange[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -67,10 +62,10 @@ class CalendarRangeRepository implements ObjectRepository
      */
     public function findByAvailableRangesForUser(
         User $user,
-        DateTimeImmutable $from,
-        DateTimeImmutable $to,
-        ?int $limit = null,
-        ?int $offset = null
+        \DateTimeImmutable $from,
+        \DateTimeImmutable $to,
+        int $limit = null,
+        int $offset = null
     ): array {
         $qb = $this->buildQueryAvailableRangesForUser($user, $from, $to);
 
@@ -101,7 +96,7 @@ class CalendarRangeRepository implements ObjectRepository
      */
     public function findRemoteIdsPresent(array $remoteIds): array
     {
-        if (0 === count($remoteIds)) {
+        if (0 === \count($remoteIds)) {
             return [];
         }
 
@@ -116,7 +111,7 @@ class CalendarRangeRepository implements ObjectRepository
 
         $remoteIdsStr = implode(
             ', ',
-            array_fill(0, count($remoteIds), '((?))')
+            array_fill(0, \count($remoteIds), '((?))')
         );
 
         $rsm = new ResultSetMapping();
@@ -146,7 +141,7 @@ class CalendarRangeRepository implements ObjectRepository
         return CalendarRange::class;
     }
 
-    private function buildQueryAvailableRangesForUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to): QueryBuilder
+    private function buildQueryAvailableRangesForUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('cr');
 
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
index 4fd9b8a29..486493b21 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -14,20 +14,18 @@ namespace Chill\CalendarBundle\Repository;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use function count;
 
 class CalendarRepository implements ObjectRepository
 {
-    private EntityManagerInterface $em;
+    private readonly EntityManagerInterface $em;
 
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -40,7 +38,7 @@ class CalendarRepository implements ObjectRepository
         return $this->repository->count(['accompanyingPeriod' => $period]);
     }
 
-    public function countByUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to): int
+    public function countByUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): int
     {
         return $this->buildQueryByUser($user, $from, $to)
             ->select('COUNT(c)')
@@ -48,7 +46,7 @@ class CalendarRepository implements ObjectRepository
             ->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -69,7 +67,7 @@ class CalendarRepository implements ObjectRepository
     /**
      * @return array|Calendar[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -77,7 +75,7 @@ class CalendarRepository implements ObjectRepository
     /**
      * @return array|Calendar[]
      */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->findBy(
             [
@@ -89,7 +87,7 @@ class CalendarRepository implements ObjectRepository
         );
     }
 
-    public function findByNotificationAvailable(DateTimeImmutable $startDate, DateTimeImmutable $endDate, ?int $limit = null, ?int $offset = null): array
+    public function findByNotificationAvailable(\DateTimeImmutable $startDate, \DateTimeImmutable $endDate, int $limit = null, int $offset = null): array
     {
         $qb = $this->queryByNotificationAvailable($startDate, $endDate)->select('c');
 
@@ -107,7 +105,7 @@ class CalendarRepository implements ObjectRepository
     /**
      * @return array|Calendar[]
      */
-    public function findByUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to, ?int $limit = null, ?int $offset = null): array
+    public function findByUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to, int $limit = null, int $offset = null): array
     {
         $qb = $this->buildQueryByUser($user, $from, $to)->select('c');
 
@@ -138,13 +136,13 @@ class CalendarRepository implements ObjectRepository
      */
     public function findRemoteIdsPresent(array $remoteIds): array
     {
-        if (0 === count($remoteIds)) {
+        if (0 === \count($remoteIds)) {
             return [];
         }
 
         $remoteIdsStr = implode(
             ', ',
-            array_fill(0, count($remoteIds), '((?))')
+            array_fill(0, \count($remoteIds), '((?))')
         );
 
         $sql = "SELECT
@@ -183,7 +181,7 @@ class CalendarRepository implements ObjectRepository
         return Calendar::class;
     }
 
-    private function buildQueryByUser(User $user, DateTimeImmutable $from, DateTimeImmutable $to): QueryBuilder
+    private function buildQueryByUser(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('c');
 
@@ -202,7 +200,7 @@ class CalendarRepository implements ObjectRepository
             ]);
     }
 
-    private function queryByNotificationAvailable(DateTimeImmutable $startDate, DateTimeImmutable $endDate): QueryBuilder
+    private function queryByNotificationAvailable(\DateTimeImmutable $startDate, \DateTimeImmutable $endDate): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('c');
 
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index f0bd8fe88..c6f163aa3 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 class InviteRepository implements ObjectRepository
 {
-    private EntityRepository $entityRepository;
+    private readonly EntityRepository $entityRepository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
     /**
      * @return array|Invite[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
     {
         return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/fixtures.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services/fixtures.yml
index 2bef0bdc4..c57011511 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/config/services/fixtures.yml
+++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/fixtures.yml
@@ -1,13 +1,10 @@
 ---
 services:
-  Chill\CalendarBundle\DataFixtures\ORM\LoadCancelReason:
-    tags:
-        - { 'name': doctrine.fixture.orm } 
-  Chill\CalendarBundle\DataFixtures\ORM\LoadInvite:
-    tags:
-        - { 'name': doctrine.fixture.orm } 
-  Chill\CalendarBundle\DataFixtures\ORM\LoadCalendarRange:
-    autowire: true
-    autoconfigure: true
-    tags:
-        - { 'name': doctrine.fixture.orm } 
\ No newline at end of file
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Chill\CalendarBundle\DataFixtures\ORM\:
+        resource: './../../../DataFixtures/ORM'
+        tags:
+            - { 'name': doctrine.fixture.orm }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/chill/chill.js b/src/Bundle/ChillCalendarBundle/Resources/public/chill/chill.js
new file mode 100644
index 000000000..56a8ce563
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/chill.js
@@ -0,0 +1 @@
+import './scss/badge.scss';
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/badge.scss
new file mode 100644
index 000000000..ffcda8f0f
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/badge.scss
@@ -0,0 +1,25 @@
+@import '~ChillPersonAssets/chill/scss/mixins.scss';
+@import '~ChillMainAssets/module/bootstrap/shared';
+
+.badge-calendar {
+    display: inline-block;
+    background-color: #f3f3f3;
+
+    .title_label {
+        @include chill_badge($chill-l-gray);
+    }
+
+    .title_action {
+        padding: var(--bs-badge-padding-y) var(--bs-badge-padding-x);
+        margin-right: 1rem;
+
+        font-size: var(--bs-badge-font-size);
+        font-weight: var(--bs-badge-font-weight);
+        line-height: 1;
+        color: var(--bs-badge-color);
+        text-align: center;
+        white-space: nowrap;
+        vertical-align: baseline;
+    }
+}
+
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar.scss b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar.scss
index a2c0c4b89..ce54b0fa8 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar.scss
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar.scss
@@ -17,4 +17,4 @@ span.calendarRangeItems {
         text-decoration: none;
         padding: 3px;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
index 2c3cde01a..9e87af8ef 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -69,7 +69,7 @@
                     or calendar.users|length > 0 %}
                     <div class="item-row details separator">
                         <div class="item-col">
-                            {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+                            {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
                                 'context': calendar.context == 'person' ?  'calendar_person' : 'calendar_accompanyingCourse',
                                 'render': 'wrap-list',
                                 'entity': calendar
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
index a167d5c18..728509909 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="calendar-edit">
 
-    {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillCalendar/Calendar/edit.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByPerson.html.twig
index fc5319849..47d29d9bd 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByPerson.html.twig
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="calendar-edit">
 
-    {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'person'} %}
+    {% include '@ChillCalendar/Calendar/edit.html.twig' with {'context': 'person'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
index 0e2170c20..3b3a92847 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
@@ -6,7 +6,7 @@
 <div class="calendar-edit">
 
     <div id="calendar"></div> {# <=== vue component #}
-    {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'user'} %}
+    {% include '@ChillCalendar/Calendar/edit.html.twig' with {'context': 'user'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
index 43fe6cb04..4c206c706 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
@@ -8,7 +8,7 @@
 <div class="calendar-new">
 
     <div id="calendar"></div> {# <=== vue component #}
-    {% include 'ChillCalendarBundle:Calendar:new.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillCalendar/Calendar/new.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByPerson.html.twig
index b561e6aa7..a8d851656 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByPerson.html.twig
@@ -8,7 +8,7 @@
 <div class="calendar-new">
 
     <div id="calendar"></div> {# <=== vue component #}
-    {% include 'ChillCalendarBundle:Calendar:new.html.twig' with {'context': 'person'} %}
+    {% include '@ChillCalendar/Calendar/new.html.twig' with {'context': 'person'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index d48844f67..df1cbb2df 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -15,7 +15,7 @@
 </dl>
 
 <h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': 'calendar_' ~ context, 'render': 'bloc' } %}
+{% include '@ChillActivity/Activity/concernedGroups.html.twig' with {'context': 'calendar_' ~ context, 'render': 'bloc' } %}
 
 
 <h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig
index fa0dd01af..b056ba998 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig
@@ -7,7 +7,7 @@
 {% block content -%}
 <div class="calendar-show">
 
-    {% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillCalendar/Calendar/show.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock content %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig
index b8e172030..536ccc03a 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig
@@ -5,7 +5,7 @@
 {% block content -%}
 <div class="calendar-show">
 
-    {% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'user'} %}
+    {% include '@ChillCalendar/Calendar/show.html.twig' with {'context': 'user'} %}
 
 </div>
 {% endblock content %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/GenericDoc/calendar_document.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/GenericDoc/calendar_document.html.twig
new file mode 100644
index 000000000..facf5be50
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/GenericDoc/calendar_document.html.twig
@@ -0,0 +1,75 @@
+{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+{% import '@ChillPerson/Macro/updatedBy.html.twig' as mmm %}
+
+{% set c = document.calendar %}
+
+<div class="item-bloc">
+    <div class="item-row">
+        <div class="item-col" style="width: unset">
+            {% if document.storedObject.isPending %}
+                <div class="badge text-bg-info" data-docgen-is-pending="{{ document.storedObject.id }}">{{ 'docgen.Doc generation is pending'|trans }}</div>
+            {% elseif document.storedObject.isFailure %}
+                <div class="badge text-bg-warning">{{ 'docgen.Doc generation failed'|trans }}</div>
+            {% endif %}
+
+            <div>
+                {% if c.accompanyingPeriod is not null and context == 'person' %}
+                    <span class="badge bg-primary">
+                        <i class="fa fa-random"></i> {{ c.accompanyingPeriod.id }}
+                    </span>&nbsp;
+                {% endif %}
+
+                <span class="badge-calendar">
+                    <span class="title_label"></span>
+                    <span class="title_action">
+                        {{ 'Calendar'|trans }}
+                        {% if c.endDate.diff(c.startDate).days >= 1 %}
+                            {{ c.startDate|format_datetime('short', 'short') }}
+                            - {{ c.endDate|format_datetime('short', 'short') }}
+                        {% else %}
+                            {{ c.startDate|format_datetime('short', 'short') }}
+                            - {{ c.endDate|format_datetime('none', 'short') }}
+                        {% endif %}
+                    </span>
+                </span>
+            </div>
+
+            <div class="denomination h2">
+                {{ document.storedObject.title|chill_print_or_message("No title") }}
+            </div>
+            {% if document.storedObject.hasTemplate %}
+                <div>
+                    <p>{{ document.storedObject.template.name|localize_translatable_string }}</p>
+                </div>
+            {% endif %}
+        </div>
+
+        <div class="item-col">
+            <div class="container">
+                <div class="dates row text-end">
+                    <span>{{ document.storedObject.createdAt|format_date('short') }}</span>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="item-row separator">
+        <div class="item-col item-meta">
+            {{ mmm.createdBy(document) }}
+        </div>
+        <ul class="item-col record_actions flex-shrink-1">
+            {% if is_granted('CHILL_CALENDAR_DOC_SEE', document) %}
+                <li>
+                    {{ document.storedObject|chill_document_button_group(document.storedObject.title, is_granted('CHILL_CALENDAR_CALENDAR_EDIT', c)) }}
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', c) %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', {'id': c.id, 'docId': document.id}) }}" class="btn btn-edit"></a>
+                </li>
+            {% endif %}
+        </ul>
+
+    </div>
+</div>
diff --git a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarDocVoter.php b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarDocVoter.php
index 452286e85..a0e653cb1 100644
--- a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarDocVoter.php
+++ b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarDocVoter.php
@@ -15,47 +15,34 @@ use Chill\CalendarBundle\Entity\CalendarDoc;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function in_array;
 
 class CalendarDocVoter extends Voter
 {
-    public const EDIT = 'CHILL_CALENDAR_DOC_EDIT';
+    final public const EDIT = 'CHILL_CALENDAR_DOC_EDIT';
 
-    public const SEE = 'CHILL_CALENDAR_DOC_SEE';
+    final public const SEE = 'CHILL_CALENDAR_DOC_SEE';
 
     private const ALL = [
         'CHILL_CALENDAR_DOC_EDIT',
         'CHILL_CALENDAR_DOC_SEE',
     ];
 
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private readonly Security $security) {}
 
     protected function supports($attribute, $subject): bool
     {
-        return in_array($attribute, self::ALL, true) && $subject instanceof CalendarDoc;
+        return \in_array($attribute, self::ALL, true) && $subject instanceof CalendarDoc;
     }
 
     /**
      * @param CalendarDoc $subject
-     * @param mixed $attribute
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
-        switch ($attribute) {
-            case self::EDIT:
-                return $this->security->isGranted(CalendarVoter::EDIT, $subject->getCalendar());
-
-            case self::SEE:
-                return $this->security->isGranted(CalendarVoter::SEE, $subject->getCalendar());
-
-            default:
-                throw new UnexpectedValueException('Attribute not supported: ' . $attribute);
-        }
+        return match ($attribute) {
+            self::EDIT => $this->security->isGranted(CalendarVoter::EDIT, $subject->getCalendar()),
+            self::SEE => $this->security->isGranted(CalendarVoter::SEE, $subject->getCalendar()),
+            default => throw new \UnexpectedValueException('Attribute not supported: '.$attribute),
+        };
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
index 0e2be1d0f..8f4c3a065 100644
--- a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
+++ b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
@@ -20,41 +20,31 @@ namespace Chill\CalendarBundle\Security\Voter;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
 use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use LogicException;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security;
 
 class CalendarVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const CREATE = 'CHILL_CALENDAR_CALENDAR_CREATE';
+    final public const CREATE = 'CHILL_CALENDAR_CALENDAR_CREATE';
 
-    public const DELETE = 'CHILL_CALENDAR_CALENDAR_DELETE';
+    final public const DELETE = 'CHILL_CALENDAR_CALENDAR_DELETE';
 
-    public const EDIT = 'CHILL_CALENDAR_CALENDAR_EDIT';
+    final public const EDIT = 'CHILL_CALENDAR_CALENDAR_EDIT';
 
-    public const SEE = 'CHILL_CALENDAR_CALENDAR_SEE';
+    final public const SEE = 'CHILL_CALENDAR_CALENDAR_SEE';
 
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    private CenterResolverManagerInterface $centerResolverManager;
-
-    private Security $security;
-
-    private VoterHelperInterface $voterHelper;
+    private readonly VoterHelperInterface $voterHelper;
 
     public function __construct(
-        Security $security,
-        VoterHelperFactoryInterface $voterHelperFactory
+        private readonly Security $security,
+        VoterHelperFactoryInterface $voterHelperFactory,
     ) {
-        $this->security = $security;
         $this->voterHelper = $voterHelperFactory
             ->generate(self::class)
             ->addCheckFor(AccompanyingPeriod::class, [self::SEE, self::CREATE])
@@ -99,7 +89,7 @@ class CalendarVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
             switch ($attribute) {
                 case self::SEE:
                 case self::CREATE:
-                    if ($subject->getStep() === AccompanyingPeriod::STEP_DRAFT) {
+                    if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
                         return false;
                     }
 
@@ -129,6 +119,6 @@ class CalendarVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
             }
         }
 
-        throw new LogicException('attribute or not implemented');
+        throw new \LogicException('attribute or not implemented');
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php b/src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php
index 36ca66d05..72aa806e6 100644
--- a/src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php
+++ b/src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php
@@ -24,7 +24,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 
 class InviteVoter extends Voter
 {
-    public const ANSWER = 'CHILL_CALENDAR_INVITE_ANSWER';
+    final public const ANSWER = 'CHILL_CALENDAR_INVITE_ANSWER';
 
     protected function supports($attribute, $subject): bool
     {
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
index cabb7dcce..087f5ea86 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
@@ -29,45 +29,19 @@ 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 function count;
 
-final class CalendarContext implements CalendarContextInterface
+final readonly class CalendarContext implements CalendarContextInterface
 {
-    private BaseContextData $baseContextData;
-
-    private EntityManagerInterface $entityManager;
-
-    private NormalizerInterface $normalizer;
-
-    private PersonRender $personRender;
-
-    private PersonRepository $personRepository;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    private ThirdPartyRender $thirdPartyRender;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
     public function __construct(
-        BaseContextData $baseContextData,
-        EntityManagerInterface $entityManager,
-        NormalizerInterface $normalizer,
-        PersonRender $personRender,
-        PersonRepository $personRepository,
-        ThirdPartyRender $thirdPartyRender,
-        ThirdPartyRepository $thirdPartyRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->baseContextData = $baseContextData;
-        $this->entityManager = $entityManager;
-        $this->normalizer = $normalizer;
-        $this->personRender = $personRender;
-        $this->personRepository = $personRepository;
-        $this->thirdPartyRender = $thirdPartyRender;
-        $this->thirdPartyRepository = $thirdPartyRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private BaseContextData $baseContextData,
+        private EntityManagerInterface $entityManager,
+        private NormalizerInterface $normalizer,
+        private PersonRender $personRender,
+        private PersonRepository $personRepository,
+        private ThirdPartyRender $thirdPartyRender,
+        private ThirdPartyRepository $thirdPartyRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function adminFormReverseTransform(array $data): array
     {
@@ -147,8 +121,6 @@ final class CalendarContext implements CalendarContextInterface
         }
     }
 
-    /**
-     */
     public function getData(DocGeneratorTemplate $template, mixed $entity, array $contextGenerationData = []): array
     {
         $options = $this->getOptions($template);
@@ -198,7 +170,7 @@ final class CalendarContext implements CalendarContextInterface
         if ($options['askMainPerson']) {
             $data['mainPerson'] = null;
 
-            if (1 === count($entity->getPersons())) {
+            if (1 === \count($entity->getPersons())) {
                 $data['mainPerson'] = $entity->getPersons()->first();
             }
         }
@@ -206,7 +178,7 @@ final class CalendarContext implements CalendarContextInterface
         if ($options['askThirdParty']) {
             $data['thirdParty'] = null;
 
-            if (1 === count($entity->getProfessionals())) {
+            if (1 === \count($entity->getProfessionals())) {
                 $data['thirdParty'] = $entity->getProfessionals()->first();
             }
         }
diff --git a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
index 527203003..09a333f3f 100644
--- a/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
@@ -12,17 +12,11 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\DocGenerator;
 
 use Chill\CalendarBundle\Entity\Calendar;
-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 Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * @extends DocGeneratorContextWithPublicFormInterface<Calendar>
  * @extends DocGeneratorContextWithAdminFormInterface<Calendar>
  */
-interface CalendarContextInterface extends DocGeneratorContextWithPublicFormInterface, DocGeneratorContextWithAdminFormInterface
-{
-}
+interface CalendarContextInterface extends DocGeneratorContextWithPublicFormInterface, DocGeneratorContextWithAdminFormInterface {}
diff --git a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
new file mode 100644
index 000000000..5e4e7de83
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
@@ -0,0 +1,191 @@
+<?php
+
+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 Chill\CalendarBundle\Service\GenericDoc\Providers;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CalendarDoc;
+use Chill\CalendarBundle\Security\Voter\CalendarVoter;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\MappingException;
+use Service\GenericDoc\Providers\AccompanyingPeriodCalendarGenericDocProviderTest;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @see AccompanyingPeriodCalendarGenericDocProviderTest
+ */
+final readonly class AccompanyingPeriodCalendarGenericDocProvider implements GenericDocForAccompanyingPeriodProviderInterface, GenericDocForPersonProviderInterface
+{
+    public const KEY = 'accompanying_period_calendar_document';
+
+    public function __construct(
+        private Security $security,
+        private EntityManagerInterface $em
+    ) {}
+
+    /**
+     * @throws MappingException
+     */
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
+        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
+        $calendarMetadata = $this->em->getClassMetadata(Calendar::class);
+
+        $query = new FetchQuery(
+            self::KEY,
+            sprintf("jsonb_build_object('id', cd.%s)", $classMetadata->getColumnName('id')),
+            'cd.'.$storedObjectMetadata->getColumnName('createdAt'),
+            $classMetadata->getSchemaName().'.'.$classMetadata->getTableName().' AS cd'
+        );
+        $query->addJoinClause(
+            sprintf(
+                'JOIN %s doc_store ON doc_store.%s = cd.%s',
+                $storedObjectMetadata->getSchemaName().'.'.$storedObjectMetadata->getTableName(),
+                $storedObjectMetadata->getColumnName('id'),
+                $classMetadata->getSingleAssociationJoinColumnName('storedObject')
+            )
+        );
+
+        $query->addJoinClause(
+            sprintf(
+                'JOIN %s calendar ON calendar.%s = cd.%s',
+                $calendarMetadata->getSchemaName().'.'.$calendarMetadata->getTableName(),
+                $calendarMetadata->getColumnName('id'),
+                $classMetadata->getSingleAssociationJoinColumnName('calendar')
+            )
+        );
+
+        $query->addWhereClause(
+            sprintf(
+                'calendar.%s = ?',
+                $calendarMetadata->getAssociationMapping('accompanyingPeriod')['joinColumns'][0]['name']
+            ),
+            [$accompanyingPeriod->getId()],
+            [Types::INTEGER]
+        );
+
+        return $query;
+    }
+
+    public function isAllowedForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool
+    {
+        return $this->security->isGranted(CalendarVoter::SEE, $accompanyingPeriod);
+    }
+
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
+        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
+        $calendarMetadata = $this->em->getClassMetadata(Calendar::class);
+
+        $query = new FetchQuery(
+            self::KEY,
+            sprintf("jsonb_build_object('id', cd.%s)", $classMetadata->getColumnName('id')),
+            'cd.'.$storedObjectMetadata->getColumnName('createdAt'),
+            $classMetadata->getSchemaName().'.'.$classMetadata->getTableName().' AS cd'
+        );
+        $query->addJoinClause(
+            sprintf(
+                'JOIN %s doc_store ON doc_store.%s = cd.%s',
+                $storedObjectMetadata->getSchemaName().'.'.$storedObjectMetadata->getTableName(),
+                $storedObjectMetadata->getColumnName('id'),
+                $classMetadata->getSingleAssociationJoinColumnName('storedObject')
+            )
+        );
+
+        $query->addJoinClause(
+            sprintf(
+                'JOIN %s calendar ON calendar.%s = cd.%s',
+                $calendarMetadata->getSchemaName().'.'.$calendarMetadata->getTableName(),
+                $calendarMetadata->getColumnName('id'),
+                $classMetadata->getSingleAssociationJoinColumnName('calendar')
+            )
+        );
+
+        // get the documents associated with accompanying periods in which person participates
+        $or = [];
+        $orParams = [];
+        $orTypes = [];
+        foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
+            if (!$this->security->isGranted(CalendarVoter::SEE, $participation->getAccompanyingPeriod())) {
+                continue;
+            }
+
+            $or[] = sprintf(
+                '(calendar.%s = ? AND cd.%s BETWEEN ?::date AND COALESCE(?::date, \'infinity\'::date))',
+                $calendarMetadata->getSingleAssociationJoinColumnName('accompanyingPeriod'),
+                $storedObjectMetadata->getColumnName('createdAt')
+            );
+            $orParams = [...$orParams, $participation->getAccompanyingPeriod()->getId(),
+                \DateTimeImmutable::createFromInterface($participation->getStartDate()),
+                null === $participation->getEndDate() ? null : \DateTimeImmutable::createFromInterface($participation->getEndDate())];
+            $orTypes = [...$orTypes, Types::INTEGER, Types::DATE_IMMUTABLE, Types::DATE_IMMUTABLE];
+        }
+
+        if ([] === $or) {
+            $query->addWhereClause('TRUE = FALSE');
+
+            return $query;
+        }
+
+        $query->addWhereClause(implode(' OR ', $or), $orParams, $orTypes);
+
+        return $this->addWhereClausesToQuery($query, $startDate, $endDate, $content);
+    }
+
+    public function isAllowedForPerson(Person $person): bool
+    {
+        // check that the person is allowed to see an accompanying period. If yes, the
+        // ACL on each accompanying period will be checked when the query is build
+        return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
+    }
+
+    private function addWhereClausesToQuery(FetchQuery $query, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): FetchQuery
+    {
+        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
+
+        if (null !== $startDate) {
+            $query->addWhereClause(
+                sprintf('doc_store.%s >= ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$startDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $endDate) {
+            $query->addWhereClause(
+                sprintf('doc_store.%s < ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$endDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $content) {
+            $query->addWhereClause(
+                sprintf('doc_store.%s ilike ?', $storedObjectMetadata->getColumnName('title')),
+                ['%'.$content.'%'],
+                [Types::STRING]
+            );
+        }
+
+        return $query;
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/PersonCalendarGenericDocProvider.php b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/PersonCalendarGenericDocProvider.php
new file mode 100644
index 000000000..49e890ca0
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/PersonCalendarGenericDocProvider.php
@@ -0,0 +1,119 @@
+<?php
+
+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 Chill\CalendarBundle\Service\GenericDoc\Providers;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CalendarDoc;
+use Chill\CalendarBundle\Security\Voter\CalendarVoter;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\MappingException;
+use Service\GenericDoc\Providers\PersonCalendarGenericDocProviderTest;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * Provide calendar documents for calendar associated to persons.
+ *
+ * @see PersonCalendarGenericDocProviderTest
+ */
+final readonly class PersonCalendarGenericDocProvider implements GenericDocForPersonProviderInterface
+{
+    public const KEY = 'person_calendar_document';
+
+    public function __construct(
+        private Security $security,
+        private EntityManagerInterface $em
+    ) {}
+
+    private function addWhereClausesToQuery(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    {
+        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
+
+        if (null !== $startDate) {
+            $query->addWhereClause(
+                sprintf('doc_store.%s >= ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$startDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $endDate) {
+            $query->addWhereClause(
+                sprintf('doc_store.%s < ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$endDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $content) {
+            $query->addWhereClause(
+                sprintf('doc_store.%s ilike ?', $storedObjectMetadata->getColumnName('title')),
+                ['%'.$content.'%'],
+                [Types::STRING]
+            );
+        }
+
+        return $query;
+    }
+
+    /**
+     * @throws MappingException
+     */
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
+        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
+        $calendarMetadata = $this->em->getClassMetadata(Calendar::class);
+
+        $query = new FetchQuery(
+            self::KEY,
+            sprintf("jsonb_build_object('id', cd.%s)", $classMetadata->getColumnName('id')),
+            'cd.'.$storedObjectMetadata->getColumnName('createdAt'),
+            $classMetadata->getSchemaName().'.'.$classMetadata->getTableName().' AS cd'
+        );
+        $query->addJoinClause(
+            sprintf(
+                'JOIN %s doc_store ON doc_store.%s = cd.%s',
+                $storedObjectMetadata->getSchemaName().'.'.$storedObjectMetadata->getTableName(),
+                $storedObjectMetadata->getColumnName('id'),
+                $classMetadata->getSingleAssociationJoinColumnName('storedObject')
+            )
+        );
+
+        $query->addJoinClause(
+            sprintf(
+                'JOIN %s calendar ON calendar.%s = cd.%s',
+                $calendarMetadata->getSchemaName().'.'.$calendarMetadata->getTableName(),
+                $calendarMetadata->getColumnName('id'),
+                $classMetadata->getSingleAssociationJoinColumnName('calendar')
+            )
+        );
+
+        $query->addWhereClause(
+            sprintf('calendar.%s = ?', $calendarMetadata->getSingleAssociationJoinColumnName('person')),
+            [$person->getId()],
+            [Types::INTEGER]
+        );
+
+        return $this->addWhereClausesToQuery($query, $startDate, $endDate, $content);
+    }
+
+    public function isAllowedForPerson(Person $person): bool
+    {
+        return $this->security->isGranted(CalendarVoter::SEE, $person);
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Renderers/AccompanyingPeriodCalendarGenericDocRenderer.php b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Renderers/AccompanyingPeriodCalendarGenericDocRenderer.php
new file mode 100644
index 000000000..123afc164
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Renderers/AccompanyingPeriodCalendarGenericDocRenderer.php
@@ -0,0 +1,41 @@
+<?php
+
+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 Chill\CalendarBundle\Service\GenericDoc\Renderers;
+
+use Chill\CalendarBundle\Repository\CalendarDocRepository;
+use Chill\CalendarBundle\Service\GenericDoc\Providers\AccompanyingPeriodCalendarGenericDocProvider;
+use Chill\CalendarBundle\Service\GenericDoc\Providers\PersonCalendarGenericDocProvider;
+use Chill\DocStoreBundle\GenericDoc\GenericDocDTO;
+use Chill\DocStoreBundle\GenericDoc\Twig\GenericDocRendererInterface;
+
+final readonly class AccompanyingPeriodCalendarGenericDocRenderer implements GenericDocRendererInterface
+{
+    public function __construct(private CalendarDocRepository $repository) {}
+
+    public function supports(GenericDocDTO $genericDocDTO, $options = []): bool
+    {
+        return AccompanyingPeriodCalendarGenericDocProvider::KEY === $genericDocDTO->key || PersonCalendarGenericDocProvider::KEY === $genericDocDTO->key;
+    }
+
+    public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string
+    {
+        return '@ChillCalendar/GenericDoc/calendar_document.html.twig';
+    }
+
+    public function getTemplateData(GenericDocDTO $genericDocDTO, $options = []): array
+    {
+        return [
+            'document' => $this->repository->find($genericDocDTO->identifiers['id']),
+            'context' => $genericDocDTO->getContext(),
+        ];
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php
index a35fffce0..9a4a92a94 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/BulkCalendarShortMessageSender.php
@@ -19,38 +19,20 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 class BulkCalendarShortMessageSender
 {
-    private EntityManagerInterface $em;
-
-    private LoggerInterface $logger;
-
-    private MessageBusInterface $messageBus;
-
-    private ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder;
-
-    private CalendarForShortMessageProvider $provider;
-
-    public function __construct(CalendarForShortMessageProvider $provider, EntityManagerInterface $em, LoggerInterface $logger, MessageBusInterface $messageBus, ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder)
-    {
-        $this->provider = $provider;
-        $this->em = $em;
-        $this->logger = $logger;
-        $this->messageBus = $messageBus;
-        $this->messageForCalendarBuilder = $messageForCalendarBuilder;
-    }
+    public function __construct(private readonly CalendarForShortMessageProvider $provider, private readonly EntityManagerInterface $em, private readonly LoggerInterface $logger, private readonly MessageBusInterface $messageBus, private readonly ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder) {}
 
     public function sendBulkMessageToEligibleCalendars()
     {
         $countCalendars = 0;
         $countSms = 0;
 
-        foreach ($this->provider->getCalendars(new DateTimeImmutable('now')) as $calendar) {
+        foreach ($this->provider->getCalendars(new \DateTimeImmutable('now')) as $calendar) {
             $smses = $this->messageForCalendarBuilder->buildMessageForCalendar($calendar);
 
             foreach ($smses as $sms) {
@@ -59,13 +41,13 @@ class BulkCalendarShortMessageSender
             }
 
             $this->em
-                ->createQuery('UPDATE ' . Calendar::class . ' c SET c.smsStatus = :smsStatus WHERE c.id = :id')
+                ->createQuery('UPDATE '.Calendar::class.' c SET c.smsStatus = :smsStatus WHERE c.id = :id')
                 ->setParameters(['smsStatus' => Calendar::SMS_SENT, 'id' => $calendar->getId()])
                 ->execute();
             ++$countCalendars;
             $this->em->refresh($calendar);
         }
 
-        $this->logger->info(__CLASS__ . 'a bulk of messages was sent', ['count_calendars' => $countCalendars, 'count_sms' => $countSms]);
+        $this->logger->info(self::class.'a bulk of messages was sent', ['count_calendars' => $countCalendars, 'count_sms' => $countSms]);
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php
index 2316a5408..31b870ed4 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php
@@ -20,27 +20,11 @@ namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Repository\CalendarRepository;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
-use function count;
 
 class CalendarForShortMessageProvider
 {
-    private CalendarRepository $calendarRepository;
-
-    private EntityManagerInterface $em;
-
-    private RangeGeneratorInterface $rangeGenerator;
-
-    public function __construct(
-        CalendarRepository $calendarRepository,
-        EntityManagerInterface $em,
-        RangeGeneratorInterface $rangeGenerator
-    ) {
-        $this->calendarRepository = $calendarRepository;
-        $this->em = $em;
-        $this->rangeGenerator = $rangeGenerator;
-    }
+    public function __construct(private readonly CalendarRepository $calendarRepository, private readonly EntityManagerInterface $em, private readonly RangeGeneratorInterface $rangeGenerator) {}
 
     /**
      * Generate calendars instance.
@@ -49,7 +33,7 @@ class CalendarForShortMessageProvider
      *
      * @return iterable|Calendar[]
      */
-    public function getCalendars(DateTimeImmutable $at): iterable
+    public function getCalendars(\DateTimeImmutable $at): iterable
     {
         $range = $this->rangeGenerator->generateRange($at);
 
@@ -76,6 +60,6 @@ class CalendarForShortMessageProvider
 
             $calendars = $this->calendarRepository
                 ->findByNotificationAvailable($startDate, $endDate, $batchSize, $offset);
-        } while (count($calendars) === $batchSize);
+        } while (\count($calendars) === $batchSize);
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php
index 7d6da3ef0..b79118cf0 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultRangeGenerator.php
@@ -18,9 +18,7 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
-use DateInterval;
 use Monolog\DateTimeImmutable;
-use UnexpectedValueException;
 
 /**
  * * Lundi => Envoi des rdv du mardi et mercredi.
@@ -33,7 +31,7 @@ class DefaultRangeGenerator implements RangeGeneratorInterface
 {
     public function generateRange(\DateTimeImmutable $date): ?array
     {
-        $onMidnight = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $date->format('Y-m-d') . ' 00:00:00');
+        $onMidnight = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $date->format('Y-m-d').' 00:00:00');
 
         switch ($dow = (int) $onMidnight->format('w')) {
             case 6: // Saturday
@@ -42,32 +40,32 @@ class DefaultRangeGenerator implements RangeGeneratorInterface
 
             case 1: // Monday
                 // send for Tuesday and Wednesday
-                $startDate = $onMidnight->add(new DateInterval('P1D'));
-                $endDate = $startDate->add(new DateInterval('P2D'));
+                $startDate = $onMidnight->add(new \DateInterval('P1D'));
+                $endDate = $startDate->add(new \DateInterval('P2D'));
 
                 break;
 
             case 2: // tuesday
             case 3: // wednesday
-                $startDate = $onMidnight->add(new DateInterval('P2D'));
-                $endDate = $startDate->add(new DateInterval('P1D'));
+                $startDate = $onMidnight->add(new \DateInterval('P2D'));
+                $endDate = $startDate->add(new \DateInterval('P1D'));
 
                 break;
 
             case 4: // thursday
-                $startDate = $onMidnight->add(new DateInterval('P2D'));
-                $endDate = $startDate->add(new DateInterval('P2D'));
+                $startDate = $onMidnight->add(new \DateInterval('P2D'));
+                $endDate = $startDate->add(new \DateInterval('P2D'));
 
                 break;
 
             case 5: // friday
-                $startDate = $onMidnight->add(new DateInterval('P3D'));
-                $endDate = $startDate->add(new DateInterval('P1D'));
+                $startDate = $onMidnight->add(new \DateInterval('P3D'));
+                $endDate = $startDate->add(new \DateInterval('P1D'));
 
                 break;
 
             default:
-                throw new UnexpectedValueException('a day of a week should not have the value: ' . $dow);
+                throw new \UnexpectedValueException('a day of a week should not have the value: '.$dow);
         }
 
         return ['startDate' => $startDate, 'endDate' => $endDate];
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
index cd61a8624..880c9950f 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
@@ -20,17 +20,10 @@ namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\MainBundle\Service\ShortMessage\ShortMessage;
-use Symfony\Component\Templating\EngineInterface;
 
 class DefaultShortMessageForCalendarBuilder implements ShortMessageForCalendarBuilderInterface
 {
-    private EngineInterface $engine;
-
-    public function __construct(
-        EngineInterface $engine
-    ) {
-        $this->engine = $engine;
-    }
+    public function __construct(private readonly \Twig\Environment $engine) {}
 
     public function buildMessageForCalendar(Calendar $calendar): array
     {
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php
index 357e264d9..a96664907 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/RangeGeneratorInterface.php
@@ -18,12 +18,10 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
-use DateTimeImmutable;
-
 interface RangeGeneratorInterface
 {
     /**
-     * @return ?array{startDate: DateTimeImmutable, endDate: DateTimeImmutable} when return is null, then no ShortMessage must be send
+     * @return ?array{startDate: \DateTimeImmutable, endDate: \DateTimeImmutable} when return is null, then no ShortMessage must be send
      */
-    public function generateRange(DateTimeImmutable $date): ?array;
+    public function generateRange(\DateTimeImmutable $date): ?array;
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
index f53fe1dea..80d01ada5 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
@@ -11,28 +11,35 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Tests\Controller;
 
+use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function random_int;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarControllerTest extends WebTestCase
 {
+    use PrepareClientTrait;
+
+    private KernelBrowser $client;
+
     /**
      * Setup before each test method (see phpunit doc).
      */
     protected function setUp(): void
     {
-        self::bootKernel();
-        $this->client = self::createClient([], [
-            'PHP_AUTH_USER' => 'center a_social',
-            'PHP_AUTH_PW' => 'password',
-        ]);
+        $this->client = $this->getClientAuthenticated();
+    }
+
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
     }
 
     public function provideAccompanyingPeriod(): iterable
@@ -42,18 +49,38 @@ final class CalendarControllerTest extends WebTestCase
 
         $nb = $em->createQueryBuilder()
             ->from(AccompanyingPeriod::class, 'ac')
-            ->select('COUNT(ac) AS nb')
+            ->join('ac.participations', 'acp')
+            ->join('acp.person', 'person')
+            ->join('person.centerCurrent', 'pc')
+            ->join('pc.center', 'center')
+            ->where('center.name LIKE :n')
+            ->setParameter('n', 'Center A')
+            ->join('ac.scopes', 's')
+            ->andWhere('JSON_EXTRACT(s.name,\'fr\') LIKE :s')
+            ->setParameter('s', 'social')
+            ->select('COUNT(DISTINCT ac) AS nb')
             ->getQuery()
             ->getSingleScalarResult();
 
         yield [$em->createQueryBuilder()
             ->from(AccompanyingPeriod::class, 'ac')
             ->select('ac.id')
-            ->setFirstResult(random_int(0, $nb))
+            ->join('ac.participations', 'acp')
+            ->join('acp.person', 'person')
+            ->join('person.centerCurrent', 'pc')
+            ->join('pc.center', 'center')
+            ->where('center.name LIKE :n')
+            ->setParameter('n', 'Center A')
+            ->join('ac.scopes', 's')
+            ->andWhere('JSON_EXTRACT(s.name,\'fr\') LIKE :s')
+            ->setParameter('s', 'social')
+            ->setFirstResult(\random_int(0, $nb - 1))
             ->setMaxResults(1)
             ->getQuery()
             ->getSingleScalarResult(),
         ];
+
+        self::ensureKernelShutdown();
     }
 
     /**
@@ -63,7 +90,7 @@ final class CalendarControllerTest extends WebTestCase
     {
         $this->client->request(
             Request::METHOD_GET,
-            sprintf('/fr/calendar/calendar/?accompanying_period_id=%d', $accompanyingPeriodId)
+            sprintf('/fr/calendar/calendar/by-period/%d', $accompanyingPeriodId)
         );
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php
index e805f71aa..0c53f2b8d 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php
@@ -23,6 +23,7 @@ use Symfony\Component\Messenger\Transport\InMemoryTransport;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RemoteCalendarMSGraphSyncControllerTest extends WebTestCase
@@ -48,9 +49,9 @@ final class RemoteCalendarMSGraphSyncControllerTest extends WebTestCase
         }
         JSON;
 
-    protected function setUp(): void
+    protected function tearDown(): void
     {
-        self::bootKernel();
+        self::ensureKernelShutdown();
     }
 
     public function testSendNotification(): void
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarDocTest.php b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarDocTest.php
index fa6132b03..98306b10c 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarDocTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarDocTest.php
@@ -18,6 +18,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarDocTest extends TestCase
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php
index e37436ad3..1cedea31c 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Entity/CalendarTest.php
@@ -24,6 +24,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarTest extends TestCase
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php
index 6746282a4..ae1aa6663 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgentAggregatorTest extends AbstractAggregatorTest
@@ -33,7 +34,7 @@ final class AgentAggregatorTest extends AbstractAggregatorTest
 
     protected function setUp(): void
     {
-        parent::setUp();
+        self::bootKernel();
 
         $this->aggregator = self::$container->get('chill.calendar.export.agent_aggregator');
     }
@@ -52,17 +53,14 @@ final class AgentAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
-                ->join('cal.mainUser', 'caluser'),
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php
index 956a81174..0cc1ba58a 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CancelReasonAggregatorTest extends AbstractAggregatorTest
@@ -33,7 +34,7 @@ final class CancelReasonAggregatorTest extends AbstractAggregatorTest
 
     protected function setUp(): void
     {
-        parent::setUp();
+        self::bootKernel();
 
         $this->aggregator = self::$container->get('chill.calendar.export.cancel_reason_aggregator');
     }
@@ -52,17 +53,14 @@ final class CancelReasonAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
-                ->join('cal.cancelReason', 'calcancel'),
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php
index b389b1536..50949c3e3 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JobAggregatorTest extends AbstractAggregatorTest
@@ -33,7 +34,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest
 
     protected function setUp(): void
     {
-        parent::setUp();
+        self::bootKernel();
 
         $this->aggregator = self::$container->get('chill.calendar.export.job_aggregator');
     }
@@ -52,17 +53,14 @@ final class JobAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
-                ->join('cal.user', 'caluser'),
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php
index 50ee456e5..c46f9d6da 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationAggregatorTest extends AbstractAggregatorTest
@@ -33,7 +34,7 @@ final class LocationAggregatorTest extends AbstractAggregatorTest
 
     protected function setUp(): void
     {
-        parent::setUp();
+        self::bootKernel();
 
         $this->aggregator = self::$container->get('chill.calendar.export.location_aggregator');
     }
@@ -52,17 +53,14 @@ final class LocationAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
-                ->join('cal.location', 'calloc'),
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
index 55dcf317f..fcf4e2709 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationTypeAggregatorTest extends AbstractAggregatorTest
@@ -33,7 +34,7 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest
 
     protected function setUp(): void
     {
-        parent::setUp();
+        self::bootKernel();
 
         $this->aggregator = self::$container->get('chill.calendar.export.location_type_aggregator');
     }
@@ -52,17 +53,14 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
-                ->join('cal.location', 'calloc'),
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php
index 8e016b54c..7c50a0b52 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MonthYearAggregatorTest extends AbstractAggregatorTest
@@ -33,7 +34,7 @@ final class MonthYearAggregatorTest extends AbstractAggregatorTest
 
     protected function setUp(): void
     {
-        parent::setUp();
+        self::bootKernel();
 
         $this->aggregator = self::$container->get('chill.calendar.export.month_aggregator');
     }
@@ -52,9 +53,7 @@ final class MonthYearAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php
index fa816f4a5..77ffc0bf1 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php
@@ -25,6 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeAggregatorTest extends AbstractAggregatorTest
@@ -33,7 +34,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
 
     protected function setUp(): void
     {
-        parent::setUp();
+        self::bootKernel();
 
         $this->aggregator = self::$container->get('chill.calendar.export.scope_aggregator');
     }
@@ -52,17 +53,14 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(cal.id)')
-                ->from(Calendar::class, 'cal')
-                ->join('cal.user', 'caluser'),
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php
index d5ec9b22d..3d4efdd83 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php
@@ -26,6 +26,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgentFilterTest extends AbstractFilterTest
@@ -50,8 +51,9 @@ final class AgentFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public function getFormData(): iterable
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
@@ -63,26 +65,25 @@ final class AgentFilterTest extends AbstractFilterTest
         $data = [];
 
         foreach ($array as $a) {
-            $data[] = [
+            yield [
                 'accepted_agents' => $a,
             ];
         }
 
-        return $data;
+        self::ensureKernelShutdown();
     }
 
-    public function getQueryBuilders(): array
+    public function getQueryBuilders(): iterable
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
-        return [
-            $em->createQueryBuilder()
-                ->select('cal.id')
-                ->from(Calendar::class, 'cal'),
-        ];
+        yield $em->createQueryBuilder()
+            ->select('cal.id')
+            ->from(Calendar::class, 'cal')
+        ;
+
+        self::ensureKernelShutdown();
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php
index 85db16c72..4a7751433 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php
@@ -20,12 +20,13 @@ namespace Chill\CalendarBundle\Tests\Export\Filter;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Export\Filter\BetweenDatesFilter;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BetweenDatesFilterTest extends AbstractFilterTest
@@ -54,17 +55,15 @@ final class BetweenDatesFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
-                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-06-01'),
+                'date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
+                'date_to' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php
index 61cb47120..e4bf1ac3b 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php
@@ -22,10 +22,12 @@ use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Export\Filter\JobFilter;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JobFilterTest extends AbstractFilterTest
@@ -50,40 +52,35 @@ final class JobFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public function getFormData(): iterable
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(UserJob::class, 'uj')
             ->select('uj')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'job' => $a,
-            ];
-        }
-
-        return $data;
+        return [
+            [
+                'job' => new ArrayCollection($array),
+            ],
+        ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('cal.id')
-                ->from(Calendar::class, 'cal')
-                ->join('cal.user', 'caluser'),
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php
index a6ab9ed7b..194a6cca7 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php
@@ -22,10 +22,12 @@ use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Export\Filter\ScopeFilter;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeFilterTest extends AbstractFilterTest
@@ -52,38 +54,33 @@ final class ScopeFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(Scope::class, 's')
             ->select('s')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'scope' => $a,
-            ];
-        }
-
-        return $data;
+        return [
+            [
+                'scope' => new ArrayCollection($array),
+            ],
+        ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('cal.id')
-                ->from(Calendar::class, 'cal')
-                ->join('cal.user', 'caluser'),
+                ->from(Calendar::class, 'cal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
index 80b2f8c45..0d1202b67 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php
@@ -24,26 +24,29 @@ use Chill\CalendarBundle\Form\CalendarType;
 use Chill\CalendarBundle\Form\DataTransformer\IdToCalendarRangeDataTransformer;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper;
 use Chill\MainBundle\Form\DataTransformer\IdToLocationDataTransformer;
 use Chill\MainBundle\Form\DataTransformer\IdToUserDataTransformer;
 use Chill\MainBundle\Form\DataTransformer\IdToUsersDataTransformer;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\DataTransformer\PersonsToIdDataTransformer;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Form\DataTransformer\ThirdPartiesToIdDataTransformer;
-use DateTimeImmutable;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Doctrine\Common\Collections\Collection;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionProperty;
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\TypeTestCase;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarTypeTest extends TypeTestCase
@@ -70,7 +73,7 @@ final class CalendarTypeTest extends TypeTestCase
         $this->idToUserDataTransformer = $this->buildSingleToIdDataTransformer(IdToUserDataTransformer::class, User::class);
         $this->idToUsersDataTransformer = $this->buildMultiToIdDataTransformer(IdToUsersDataTransformer::class, User::class);
         $this->idToLocationDataTransformer = $this->buildSingleToIdDataTransformer(IdToLocationDataTransformer::class, Location::class);
-        $this->partiesToIdDataTransformer = $this->buildMultiToIdDataTransformer(ThirdPartiesToIdDataTransformer::class, ThirdParty::class);
+        $this->partiesToIdDataTransformer = $this->buildMultiToIdDataTransformerThirdParties();
         $this->calendarRangeDataTransformer = $this->buildSingleToIdDataTransformer(IdToCalendarRangeDataTransformer::class, CalendarRange::class);
         $tokenStorage = $this->prophesize(TokenStorageInterface::class);
         $token = $this->prophesize(TokenInterface::class);
@@ -86,9 +89,9 @@ final class CalendarTypeTest extends TypeTestCase
         $formData = [
             'mainUser' => '1',
             'users' => '2,3',
-            'professionnals' => '4,5',
-            'startDate' => '2022-05-05 14:00:00',
-            'endDate' => '2022-05-05 14:30:00',
+            'professionnals' => '646',
+            'startDate' => '2022-05-05T14:00:00+0200',
+            'endDate' => '2022-05-05T14:30:00+0200',
             'persons' => '7',
             'calendarRange' => '8',
             'location' => '9',
@@ -97,9 +100,9 @@ final class CalendarTypeTest extends TypeTestCase
 
         $calendar = new Calendar();
         $calendar->setMainUser(new class () extends User {
-            public function getId()
+            public function getId(): ?int
             {
-                return '1';
+                return 1;
             }
         });
 
@@ -108,24 +111,18 @@ final class CalendarTypeTest extends TypeTestCase
         $form->submit($formData);
 
         $this->assertTrue($form->isSynchronized());
-        $this->assertEquals(DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-05-05 14:00:00'), $calendar->getStartDate());
-        $this->assertEquals(DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-05-05 14:30:00'), $calendar->getEndDate());
+        $this->assertEquals(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-05-05 14:00:00'), $calendar->getStartDate());
+        $this->assertEquals(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-05-05 14:30:00'), $calendar->getEndDate());
         $this->assertEquals(7, $calendar->getPersons()->first()->getId());
         $this->assertEquals(8, $calendar->getCalendarRange()->getId());
         $this->assertEquals(9, $calendar->getLocation()->getId());
         $this->assertEquals(true, $calendar->getSendSMS());
-        $this->assertContains(2, $calendar->getUsers()->map(static function (User $u) {
-            return $u->getId();
-        }));
-        $this->assertContains(3, $calendar->getUsers()->map(static function (User $u) {
-            return $u->getId();
-        }));
+        $this->assertContains(2, $calendar->getUsers()->map(static fn (User $u) => $u->getId()));
+        $this->assertContains(3, $calendar->getUsers()->map(static fn (User $u) => $u->getId()));
     }
 
     protected function getExtensions()
     {
-        $parents = parent::getExtensions();
-
         $calendarType = new CalendarType(
             $this->personsToIdDataTransformer,
             $this->idToUserDataTransformer,
@@ -136,37 +133,44 @@ final class CalendarTypeTest extends TypeTestCase
         );
         $commentType = new CommentType($this->tokenStorage);
 
+        $user = $this->prophesize(User::class);
+        $user->getId()->willReturn(1);
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn($user->reveal());
+        $privateCommentDataMapper = new PrivateCommentDataMapper($security->reveal());
+        $privateCommentType = new PrivateCommentType($privateCommentDataMapper);
+
         return array_merge(
             parent::getExtensions(),
-            [new PreloadedExtension([$calendarType, $commentType], [])]
+            [new PreloadedExtension([$calendarType, $commentType, $privateCommentType], [])]
         );
     }
 
+    private function buildMultiToIdDataTransformerThirdParties(): ThirdPartiesToIdDataTransformer
+    {
+        $repository = $this->prophesize(ThirdPartyRepository::class);
+        $repository->findOneBy(Argument::type('array'))->willReturn(new ThirdParty());
+
+        return new ThirdPartiesToIdDataTransformer($repository->reveal());
+    }
+
     private function buildMultiToIdDataTransformer(
         string $classTransformer,
         string $objClass
     ) {
         $transformer = $this->prophesize($classTransformer);
         $transformer->transform(Argument::type('array'))
-            ->will(static function ($args) {
-                return implode(
-                    ',',
-                    array_map(static function ($p) {
-                        return $p->getId();
-                    }, $args[0])
-                );
-            });
+            ->will(static fn ($args) => implode(
+                ',',
+                array_map(static fn ($p) => $p->getId(), $args[0])
+            ));
         $transformer->transform(Argument::exact(null))
             ->willReturn([]);
         $transformer->transform(Argument::type(Collection::class))
-            ->will(static function ($args) {
-                return implode(
-                    ',',
-                    array_map(static function ($p) {
-                        return $p->getId();
-                    }, $args[0]->toArray())
-                );
-            });
+            ->will(static fn ($args) => implode(
+                ',',
+                array_map(static fn ($p) => $p->getId(), $args[0]->toArray())
+            ));
         $transformer->reverseTransform(Argument::type('string'))
             ->will(static function ($args) use ($objClass) {
                 if (null === $args[0]) {
@@ -176,13 +180,13 @@ final class CalendarTypeTest extends TypeTestCase
                 return array_map(
                     static function ($id) use ($objClass) {
                         $obj = new $objClass();
-                        $reflectionProperty = new ReflectionProperty($objClass, 'id');
+                        $reflectionProperty = new \ReflectionProperty($objClass, 'id');
                         $reflectionProperty->setAccessible(true);
                         $reflectionProperty->setValue($obj, (int) $id);
 
                         return $obj;
                     },
-                    explode(',', $args[0])
+                    explode(',', (string) $args[0])
                 );
             });
 
@@ -195,9 +199,7 @@ final class CalendarTypeTest extends TypeTestCase
     ) {
         $transformer = $this->prophesize($classTransformer);
         $transformer->transform(Argument::type('object'))
-            ->will(static function ($args) {
-                return (string) $args[0]->getId();
-            });
+            ->will(static fn ($args) => (string) $args[0]->getId());
         $transformer->transform(Argument::exact(null))
             ->willReturn('');
         $transformer->reverseTransform(Argument::type('string'))
@@ -206,7 +208,7 @@ final class CalendarTypeTest extends TypeTestCase
                     return null;
                 }
                 $obj = new $class();
-                $reflectionProperty = new ReflectionProperty($class, 'id');
+                $reflectionProperty = new \ReflectionProperty($class, 'id');
                 $reflectionProperty->setAccessible(true);
                 $reflectionProperty->setValue($obj, (int) $args[0]);
 
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
index 485146939..eca929875 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/AddressConverterTest.php
@@ -27,10 +27,10 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressConverterTest extends TestCase
@@ -61,11 +61,9 @@ final class AddressConverterTest extends TestCase
 
     private function buildAddressConverter(): AddressConverter
     {
-        $engine = $this->prophesize(EngineInterface::class);
+        $engine = $this->prophesize(\Twig\Environment::class);
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
-        $translatableStringHelper->localize(Argument::type('array'))->will(static function ($args): string {
-            return ($args[0] ?? ['fr' => 'not provided'])['fr'] ?? 'not provided';
-        });
+        $translatableStringHelper->localize(Argument::type('array'))->will(static fn ($args): string => ($args[0] ?? ['fr' => 'not provided'])['fr'] ?? 'not provided');
 
         $addressRender = new AddressRender($engine->reveal(), $translatableStringHelper->reveal());
 
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php
index 92280f6c1..9f7df0c2c 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarRangeSyncerTest.php
@@ -22,7 +22,6 @@ use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteToLocalSync\CalendarRangeSyncer;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -33,6 +32,7 @@ use Symfony\Component\HttpClient\Response\MockResponse;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarRangeSyncerTest extends TestCase
@@ -228,8 +228,8 @@ final class CalendarRangeSyncerTest extends TestCase
         $calendarRange = new CalendarRange();
         $calendarRange
             ->setUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2020-01-01 15:00:00'))
-            ->setEndDate(new DateTimeImmutable('2020-01-01 15:30:00'))
+            ->setStartDate(new \DateTimeImmutable('2020-01-01 15:00:00'))
+            ->setEndDate(new \DateTimeImmutable('2020-01-01 15:30:00'))
             ->addRemoteAttributes([
                 'lastModifiedDateTime' => 0,
                 'changeKey' => 'abc',
@@ -244,11 +244,11 @@ final class CalendarRangeSyncerTest extends TestCase
 
         $this->assertStringContainsString(
             '2022-06-10T15:30:00',
-            $calendarRange->getStartDate()->format(DateTimeImmutable::ATOM)
+            $calendarRange->getStartDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertStringContainsString(
             '2022-06-10T17:30:00',
-            $calendarRange->getEndDate()->format(DateTimeImmutable::ATOM)
+            $calendarRange->getEndDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertTrue($calendarRange->preventEnqueueChanges);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php
index 6ccd7a35e..8f6cb9335 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/CalendarSyncerTest.php
@@ -24,8 +24,6 @@ use Chill\CalendarBundle\Entity\Invite;
 use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\RemoteToLocalSync\CalendarSyncer;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
-use DateTimeImmutable;
-use DateTimeZone;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -35,6 +33,7 @@ use Symfony\Component\HttpClient\Response\MockResponse;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarSyncerTest extends TestCase
@@ -362,9 +361,9 @@ final class CalendarSyncerTest extends TestCase
         parent::setUp();
 
         // all tests should run when timezone = +02:00
-        $brussels = new DateTimeZone('Europe/Brussels');
+        $brussels = new \DateTimeZone('Europe/Brussels');
 
-        if (7200 === $brussels->getOffset(new DateTimeImmutable())) {
+        if (7200 === $brussels->getOffset(new \DateTimeImmutable())) {
             date_default_timezone_set('Europe/Brussels');
         } else {
             date_default_timezone_set('Europe/Moscow');
@@ -403,8 +402,8 @@ final class CalendarSyncerTest extends TestCase
         $calendar = new Calendar();
         $calendar
             ->setMainUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2022-06-11 14:30:00'))
-            ->setEndDate(new DateTimeImmutable('2022-06-11 15:30:00'))
+            ->setStartDate(new \DateTimeImmutable('2022-06-11 14:30:00'))
+            ->setEndDate(new \DateTimeImmutable('2022-06-11 15:30:00'))
             ->addUser($userA)
             ->addUser($userB)
             ->setCalendarRange(new CalendarRange())
@@ -480,13 +479,14 @@ final class CalendarSyncerTest extends TestCase
         $calendar = new Calendar();
         $calendar
             ->setMainUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2020-01-01 10:00:00'))
-            ->setEndDate(new DateTimeImmutable('2020-01-01 12:00:00'))
+            ->setStartDate(new \DateTimeImmutable('2020-01-01 10:00:00'))
+            ->setEndDate(new \DateTimeImmutable('2020-01-01 12:00:00'))
             ->setCalendarRange(new CalendarRange())
             ->addRemoteAttributes([
                 'lastModifiedDateTime' => 0,
                 'changeKey' => 'abcd',
             ]);
+        $previousVersion = $calendar->getDateTimeVersion();
         $notification = json_decode(self::NOTIF_UPDATE, true);
 
         $calendarSyncer->handleCalendarSync(
@@ -497,14 +497,14 @@ final class CalendarSyncerTest extends TestCase
 
         $this->assertStringContainsString(
             '2022-06-10T15:30:00',
-            $calendar->getStartDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getStartDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertStringContainsString(
             '2022-06-10T17:30:00',
-            $calendar->getEndDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getEndDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertTrue($calendar->preventEnqueueChanges);
-        $this->assertEquals(Calendar::STATUS_MOVED, $calendar->getStatus());
+        $this->assertGreaterThan($previousVersion, $calendar->getDateTimeVersion());
     }
 
     public function testHandleNotMovedCalendar(): void
@@ -523,8 +523,8 @@ final class CalendarSyncerTest extends TestCase
         $calendar = new Calendar();
         $calendar
             ->setMainUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2022-06-10 15:30:00'))
-            ->setEndDate(new DateTimeImmutable('2022-06-10 17:30:00'))
+            ->setStartDate(new \DateTimeImmutable('2022-06-10 15:30:00'))
+            ->setEndDate(new \DateTimeImmutable('2022-06-10 17:30:00'))
             ->setCalendarRange(new CalendarRange())
             ->addRemoteAttributes([
                 'lastModifiedDateTime' => 0,
@@ -540,11 +540,11 @@ final class CalendarSyncerTest extends TestCase
 
         $this->assertStringContainsString(
             '2022-06-10T15:30:00',
-            $calendar->getStartDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getStartDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertStringContainsString(
             '2022-06-10T17:30:00',
-            $calendar->getEndDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getEndDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertTrue($calendar->preventEnqueueChanges);
         $this->assertEquals(Calendar::STATUS_VALID, $calendar->getStatus());
@@ -567,8 +567,8 @@ final class CalendarSyncerTest extends TestCase
         $calendar = new Calendar();
         $calendar
             ->setMainUser($user = new User())
-            ->setStartDate(new DateTimeImmutable('2020-01-01 10:00:00'))
-            ->setEndDate(new DateTimeImmutable('2020-01-01 12:00:00'))
+            ->setStartDate(new \DateTimeImmutable('2020-01-01 10:00:00'))
+            ->setEndDate(new \DateTimeImmutable('2020-01-01 12:00:00'))
             ->setCalendarRange(new CalendarRange())
             ->addRemoteAttributes([
                 'lastModifiedDateTime' => 0,
@@ -584,11 +584,11 @@ final class CalendarSyncerTest extends TestCase
 
         $this->assertStringContainsString(
             '2020-01-01T10:00:00',
-            $calendar->getStartDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getStartDate()->format(\DateTimeImmutable::ATOM)
         );
         $this->assertStringContainsString(
             '2020-01-01T12:00:00',
-            $calendar->getEndDate()->format(DateTimeImmutable::ATOM)
+            $calendar->getEndDate()->format(\DateTimeImmutable::ATOM)
         );
 
         $this->assertEquals(Calendar::STATUS_VALID, $calendar->getStatus());
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php
index 604b707c0..55dfe427c 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/LocationConverterTest.php
@@ -30,6 +30,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationConverterTest extends TestCase
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php
new file mode 100644
index 000000000..4307f32a3
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReaderTest.php
@@ -0,0 +1,176 @@
+<?php
+
+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 Chill\CalendarBundle\Tests\RemoteCalendar\Connector\MSGraph;
+
+use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MapCalendarToUser;
+use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceReader;
+use Chill\MainBundle\Entity\User;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class MSUserAbsenceReaderTest extends TestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @dataProvider provideDataTestUserAbsence
+     */
+    public function testUserAbsenceReader(string $mockResponse, bool $expected, string $message): void
+    {
+        $user = new User();
+        $client = new MockHttpClient([new MockResponse($mockResponse)]);
+        $mapUser = $this->prophesize(MapCalendarToUser::class);
+        $mapUser->getUserId($user)->willReturn('1234');
+        $clock = new MockClock(new \DateTimeImmutable('2023-07-07T12:00:00'));
+
+        $absenceReader = new MSUserAbsenceReader($client, $mapUser->reveal(), $clock);
+
+        self::assertEquals($expected, $absenceReader->isUserAbsent($user), $message);
+    }
+
+    public function testIsUserAbsentWithoutRemoteId(): void
+    {
+        $user = new User();
+        $client = new MockHttpClient();
+
+        $mapUser = $this->prophesize(MapCalendarToUser::class);
+        $mapUser->getUserId($user)->willReturn(null);
+        $clock = new MockClock(new \DateTimeImmutable('2023-07-07T12:00:00'));
+
+        $absenceReader = new MSUserAbsenceReader($client, $mapUser->reveal(), $clock);
+
+        self::assertNull($absenceReader->isUserAbsent($user), 'when no user found, absence should be null');
+    }
+
+    public function provideDataTestUserAbsence(): iterable
+    {
+        // contains data that was retrieved from microsoft graph api on 2023-07-06
+
+        yield [
+            <<<'JSON'
+            {
+              "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('4feb0ae3-7ffb-48dd-891e-c86b2cdeefd4')/mailboxSettings/automaticRepliesSetting",
+              "status": "disabled",
+              "externalAudience": "none",
+              "internalReplyMessage": "Je suis en congé.",
+              "externalReplyMessage": "",
+              "scheduledStartDateTime": {
+                "dateTime": "2023-07-06T12:00:00.0000000",
+                "timeZone": "UTC"
+              },
+              "scheduledEndDateTime": {
+                "dateTime": "2023-07-07T12:00:00.0000000",
+                "timeZone": "UTC"
+              }
+            }
+            JSON,
+            false,
+            'User is present',
+        ];
+
+        yield [
+            <<<'JSON'
+               {
+                  "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('4feb0ae3-7ffb-48dd-891e-c86b2cdeefd4')/mailboxSettings/automaticRepliesSetting",
+                  "status": "scheduled",
+                  "externalAudience": "none",
+                  "internalReplyMessage": "Je suis en congé.",
+                  "externalReplyMessage": "",
+                  "scheduledStartDateTime": {
+                    "dateTime": "2023-07-06T11:00:00.0000000",
+                    "timeZone": "UTC"
+                  },
+                  "scheduledEndDateTime": {
+                    "dateTime": "2023-07-21T11:00:00.0000000",
+                    "timeZone": "UTC"
+                  }
+                }
+            JSON,
+            true,
+            'User is absent with absence scheduled, we are within this period',
+        ];
+
+        yield [
+            <<<'JSON'
+               {
+                  "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('4feb0ae3-7ffb-48dd-891e-c86b2cdeefd4')/mailboxSettings/automaticRepliesSetting",
+                  "status": "scheduled",
+                  "externalAudience": "none",
+                  "internalReplyMessage": "Je suis en congé.",
+                  "externalReplyMessage": "",
+                  "scheduledStartDateTime": {
+                    "dateTime": "2023-07-08T11:00:00.0000000",
+                    "timeZone": "UTC"
+                  },
+                  "scheduledEndDateTime": {
+                    "dateTime": "2023-07-21T11:00:00.0000000",
+                    "timeZone": "UTC"
+                  }
+                }
+            JSON,
+            false,
+            'User is present: absence is scheduled for later',
+        ];
+
+        yield [
+            <<<'JSON'
+               {
+                  "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('4feb0ae3-7ffb-48dd-891e-c86b2cdeefd4')/mailboxSettings/automaticRepliesSetting",
+                  "status": "scheduled",
+                  "externalAudience": "none",
+                  "internalReplyMessage": "Je suis en congé.",
+                  "externalReplyMessage": "",
+                  "scheduledStartDateTime": {
+                    "dateTime": "2023-07-05T11:00:00.0000000",
+                    "timeZone": "UTC"
+                  },
+                  "scheduledEndDateTime": {
+                    "dateTime": "2023-07-06T11:00:00.0000000",
+                    "timeZone": "UTC"
+                  }
+                }
+            JSON,
+            false,
+            'User is present: absence is past',
+        ];
+
+        yield [
+            <<<'JSON'
+                {
+                  "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('4feb0ae3-7ffb-48dd-891e-c86b2cdeefd4')/mailboxSettings/automaticRepliesSetting",
+                  "status": "alwaysEnabled",
+                  "externalAudience": "none",
+                  "internalReplyMessage": "Je suis en congé.",
+                  "externalReplyMessage": "",
+                  "scheduledStartDateTime": {
+                    "dateTime": "2023-07-06T12:00:00.0000000",
+                    "timeZone": "UTC"
+                  },
+                  "scheduledEndDateTime": {
+                    "dateTime": "2023-07-07T12:00:00.0000000",
+                    "timeZone": "UTC"
+                  }
+                }
+            JSON,
+            true,
+            'User is absent: absence is always enabled',
+        ];
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSyncTest.php b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSyncTest.php
new file mode 100644
index 000000000..244c7e468
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Tests/RemoteCalendar/Connector/MSGraph/MSUserAbsenceSyncTest.php
@@ -0,0 +1,68 @@
+<?php
+
+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 Chill\CalendarBundle\Tests\RemoteCalendar\Connector\MSGraph;
+
+use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceReaderInterface;
+use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSUserAbsenceSync;
+use Chill\MainBundle\Entity\User;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Log\NullLogger;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class MSUserAbsenceSyncTest extends TestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @dataProvider provideDataTestSyncUserAbsence
+     */
+    public function testSyncUserAbsence(User $user, ?bool $absenceFromMicrosoft, bool $expectedAbsence, ?\DateTimeImmutable $expectedAbsenceStart, string $message): void
+    {
+        $userAbsenceReader = $this->prophesize(MSUserAbsenceReaderInterface::class);
+        $userAbsenceReader->isUserAbsent($user)->willReturn($absenceFromMicrosoft);
+
+        $clock = new MockClock(new \DateTimeImmutable('2023-07-01T12:00:00'));
+
+        $syncer = new MSUserAbsenceSync($userAbsenceReader->reveal(), $clock, new NullLogger());
+
+        $syncer->syncUserAbsence($user);
+
+        self::assertEquals($expectedAbsence, $user->isAbsent(), $message);
+        self::assertEquals($expectedAbsenceStart, $user->getAbsenceStart(), $message);
+    }
+
+    public function provideDataTestSyncUserAbsence(): iterable
+    {
+        yield [new User(), false, false, null, 'user present remains present'];
+        yield [new User(), true, true, new \DateTimeImmutable('2023-07-01T12:00:00'), 'user present becomes absent'];
+
+        $user = new User();
+        $user->setAbsenceStart($abs = new \DateTimeImmutable('2023-07-01T12:00:00'));
+        yield [$user, true, true, $abs, 'user absent remains absent'];
+
+        $user = new User();
+        $user->setAbsenceStart($abs = new \DateTimeImmutable('2023-07-01T12:00:00'));
+        yield [$user, false, false, null, 'user absent becomes present'];
+
+        yield [new User(), null, false, null, 'user not syncable: presence do not change'];
+
+        $user = new User();
+        $user->setAbsenceStart($abs = new \DateTimeImmutable('2023-07-01T12:00:00'));
+        yield [$user, null, true, $abs, 'user not syncable: absence do not change'];
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Repository/CalendarACLAwareRepositoryTest.php b/src/Bundle/ChillCalendarBundle/Tests/Repository/CalendarACLAwareRepositoryTest.php
index 0fb4a662b..8d3101c5b 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Repository/CalendarACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Repository/CalendarACLAwareRepositoryTest.php
@@ -15,13 +15,13 @@ use Chill\CalendarBundle\Repository\CalendarACLAwareRepository;
 use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarACLAwareRepositoryTest extends KernelTestCase
@@ -51,7 +51,7 @@ final class CalendarACLAwareRepositoryTest extends KernelTestCase
             $this->entityManager
         );
 
-        $count = $calendarRepository->countByPerson($person, new DateTimeImmutable('yesterday'), new DateTimeImmutable('tomorrow'));
+        $count = $calendarRepository->countByPerson($person, new \DateTimeImmutable('yesterday'), new \DateTimeImmutable('tomorrow'));
 
         $this->assertIsInt($count);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Serializer/Normalizer/CalendarNormalizerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Serializer/Normalizer/CalendarNormalizerTest.php
index 2a0975206..03ba7f164 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Serializer/Normalizer/CalendarNormalizerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Serializer/Normalizer/CalendarNormalizerTest.php
@@ -16,12 +16,12 @@ use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarNormalizerTest extends KernelTestCase
@@ -41,8 +41,8 @@ final class CalendarNormalizerTest extends KernelTestCase
             ->setComment(
                 $comment = new CommentEmbeddable()
             )
-            ->setStartDate(DateTimeImmutable::createFromFormat(DateTimeImmutable::ATOM, '2020-10-15T15:00:00+0000'))
-            ->setEndDate(DateTimeImmutable::createFromFormat(DateTimeImmutable::ATOM, '2020-15-15T15:30:00+0000'))
+            ->setStartDate(\DateTimeImmutable::createFromFormat(\DateTimeImmutable::ATOM, '2020-10-15T15:00:00+0000'))
+            ->setEndDate(\DateTimeImmutable::createFromFormat(\DateTimeImmutable::ATOM, '2020-15-15T15:30:00+0000'))
             ->addPerson(new Person())
             ->addPerson(new Person())
             ->addUser(new User())
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
index cbb4ea3af..506baa98b 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php
@@ -19,8 +19,10 @@ use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
@@ -31,11 +33,10 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use function array_key_exists;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarContextTest extends TestCase
@@ -83,13 +84,13 @@ final class CalendarContextTest extends TestCase
         // so, we expect the call to be twice for each method
         $formBuilder->add('thirdParty', EntityType::class, Argument::type('array'))
             ->should(static function ($calls, $object, $method) use ($tp1, $tp2) {
-                if (2 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the $builder->add should be called exactly 2, %d receivved', count($calls)));
+                if (2 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the $builder->add should be called exactly 2, %d receivved', \count($calls)));
                 }
 
                 $opts = $calls[0]->getArguments()[2];
 
-                if (!array_key_exists('label', $opts)) {
+                if (!\array_key_exists('label', $opts)) {
                     throw new FailedPredictionException('the $builder->add should have a label key');
                 }
 
@@ -103,13 +104,13 @@ final class CalendarContextTest extends TestCase
             });
         $formBuilder->add('mainPerson', EntityType::class, Argument::type('array'))
             ->should(static function ($calls, $object, $method) use ($p1) {
-                if (2 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the $builder->add should be called exactly 2, %d receivved', count($calls)));
+                if (2 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the $builder->add should be called exactly 2, %d receivved', \count($calls)));
                 }
 
                 $opts = $calls[0]->getArguments()[2];
 
-                if (!array_key_exists('label', $opts)) {
+                if (!\array_key_exists('label', $opts)) {
                     throw new FailedPredictionException('the $builder->add should have a label key');
                 }
 
@@ -176,7 +177,7 @@ final class CalendarContextTest extends TestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->persist(Argument::type(CalendarDoc::class))->should(
             static function ($calls, $object, $method) use ($storedObject) {
-                if (1 !== count($calls)) {
+                if (1 !== \count($calls)) {
                     throw new FailedPredictionException('the persist method should be called once');
                 }
 
@@ -187,7 +188,7 @@ final class CalendarContextTest extends TestCase
                     throw new FailedPredictionException('the stored object is not correct');
                 }
 
-                if ($calendarDoc->getStoredObject()->getTitle() !== 'blabla') {
+                if ('blabla' !== $calendarDoc->getStoredObject()->getTitle()) {
                     throw new FailedPredictionException('the doc title should be the one provided');
                 }
 
@@ -201,8 +202,8 @@ final class CalendarContextTest extends TestCase
     }
 
     private function buildCalendarContext(
-        ?EntityManagerInterface $entityManager = null,
-        ?NormalizerInterface $normalizer = null
+        EntityManagerInterface $entityManager = null,
+        NormalizerInterface $normalizer = null
     ): CalendarContext {
         $baseContext = $this->prophesize(BaseContextData::class);
         $baseContext->getData(null)->willReturn(['base_context' => 'data']);
@@ -210,9 +211,15 @@ final class CalendarContextTest extends TestCase
         $personRender = $this->prophesize(PersonRender::class);
         $personRender->renderString(Argument::type(Person::class), [])->willReturn('person name');
 
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $personRepository->find(Argument::type('int'))->willReturn(new Person());
+
         $thirdPartyRender = $this->prophesize(ThirdPartyRender::class);
         $thirdPartyRender->renderString(Argument::type(ThirdParty::class), [])->willReturn('third party name');
 
+        $thirdPartyRepository = $this->prophesize(ThirdPartyRepository::class);
+        $thirdPartyRepository->find(Argument::type('int'))->willReturn(new ThirdParty());
+
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
         $translatableStringHelper->localize(Argument::type('array'))->willReturn('blabla');
 
@@ -229,7 +236,9 @@ final class CalendarContextTest extends TestCase
             $entityManager,
             $normalizer,
             $personRender->reveal(),
+            $personRepository->reveal(),
             $thirdPartyRender->reveal(),
+            $thirdPartyRepository->reveal(),
             $translatableStringHelper->reveal()
         );
     }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php
index 0c190f51d..308c17237 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/BulkCalendarShortMessageSenderTest.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 
-use ArrayIterator;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Service\ShortMessageNotification\BulkCalendarShortMessageSender;
 use Chill\CalendarBundle\Service\ShortMessageNotification\CalendarForShortMessageProvider;
@@ -27,20 +26,18 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Service\ShortMessage\ShortMessage;
 use Chill\MainBundle\Test\PrepareUserTrait;
 use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use libphonenumber\PhoneNumberUtil;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Log\NullLogger;
-use stdClass;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BulkCalendarShortMessageSenderTest extends KernelTestCase
@@ -79,26 +76,26 @@ final class BulkCalendarShortMessageSenderTest extends KernelTestCase
         $calendar
             ->addPerson($this->getRandomPerson($em))
             ->setMainUser($user = $this->prepareUser([]))
-            ->setStartDate(new DateTimeImmutable('now'))
-            ->setEndDate($calendar->getStartDate()->add(new DateInterval('PT30M')))
+            ->setStartDate(new \DateTimeImmutable('now'))
+            ->setEndDate($calendar->getStartDate()->add(new \DateInterval('PT30M')))
             ->setSendSMS(true);
 
         $user->setUsername(uniqid());
-        $user->setEmail(uniqid() . '@gmail.com');
+        $user->setEmail(uniqid().'@gmail.com');
         $calendar->getPersons()->first()->setAcceptSMS(true);
 
         // hack to prevent side effect with messages
         $calendar->preventEnqueueChanges = true;
 
         $em->persist($user);
-        //$this->toDelete[] = [User::class, $user->getId()];
+        // $this->toDelete[] = [User::class, $user->getId()];
         $em->persist($calendar);
-        //$this->toDelete[] = [Calendar::class, $calendar->getId()];
+        // $this->toDelete[] = [Calendar::class, $calendar->getId()];
         $em->flush();
 
         $provider = $this->prophesize(CalendarForShortMessageProvider::class);
-        $provider->getCalendars(Argument::type(DateTimeImmutable::class))
-            ->willReturn(new ArrayIterator([$calendar]));
+        $provider->getCalendars(Argument::type(\DateTimeImmutable::class))
+            ->willReturn(new \ArrayIterator([$calendar]));
 
         $messageBuilder = $this->prophesize(ShortMessageForCalendarBuilderInterface::class);
         $messageBuilder->buildMessageForCalendar(Argument::type(Calendar::class))
@@ -114,7 +111,7 @@ final class BulkCalendarShortMessageSenderTest extends KernelTestCase
 
         $bus = $this->prophesize(MessageBusInterface::class);
         $bus->dispatch(Argument::type(ShortMessage::class))
-            ->willReturn(new Envelope(new stdClass()))
+            ->willReturn(new Envelope(new \stdClass()))
             ->shouldBeCalledTimes(1);
 
         $bulk = new BulkCalendarShortMessageSender(
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
index f3e35ef93..47af7d68e 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php
@@ -23,15 +23,14 @@ use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\CalendarBundle\Service\ShortMessageNotification\CalendarForShortMessageProvider;
 use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultRangeGenerator;
 use Chill\CalendarBundle\Service\ShortMessageNotification\RangeGeneratorInterface;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CalendarForShortMessageProviderTest extends TestCase
@@ -42,13 +41,13 @@ final class CalendarForShortMessageProviderTest extends TestCase
     {
         $calendarRepository = $this->prophesize(CalendarRepository::class);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
         )->shouldBeCalledTimes(0);
         $rangeGenerator = $this->prophesize(RangeGeneratorInterface::class);
-        $rangeGenerator->generateRange(Argument::type(DateTimeImmutable::class))->willReturn(null);
+        $rangeGenerator->generateRange(Argument::type(\DateTimeImmutable::class))->willReturn(null);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldNotBeCalled();
@@ -59,30 +58,26 @@ final class CalendarForShortMessageProviderTest extends TestCase
             $rangeGenerator->reveal()
         );
 
-        $calendars = iterator_to_array($provider->getCalendars(new DateTimeImmutable('now')));
+        $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
 
-        $this->assertEquals(0, count($calendars));
+        $this->assertEquals(0, \count($calendars));
     }
 
     public function testGetCalendars()
     {
         $calendarRepository = $this->prophesize(CalendarRepository::class);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
-        )->will(static function ($args) {
-            return array_fill(0, $args[2], new Calendar());
-        })->shouldBeCalledTimes(1);
+        )->will(static fn ($args) => array_fill(0, $args[2], new Calendar()))->shouldBeCalledTimes(1);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::not(0)
-        )->will(static function ($args) {
-            return array_fill(0, $args[2] - 1, new Calendar());
-        })->shouldBeCalledTimes(1);
+        )->will(static fn ($args) => array_fill(0, $args[2] - 1, new Calendar()))->shouldBeCalledTimes(1);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldBeCalled();
@@ -93,10 +88,10 @@ final class CalendarForShortMessageProviderTest extends TestCase
             new DefaultRangeGenerator()
         );
 
-        $calendars = iterator_to_array($provider->getCalendars(new DateTimeImmutable('now')));
+        $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
 
-        $this->assertGreaterThan(1, count($calendars));
-        $this->assertLessThan(100, count($calendars));
+        $this->assertGreaterThan(1, \count($calendars));
+        $this->assertLessThan(100, \count($calendars));
         $this->assertContainsOnly(Calendar::class, $calendars);
     }
 
@@ -104,21 +99,17 @@ final class CalendarForShortMessageProviderTest extends TestCase
     {
         $calendarRepository = $this->prophesize(CalendarRepository::class);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
-        )->will(static function ($args) {
-            return array_fill(0, 1, new Calendar());
-        })->shouldBeCalledTimes(1);
+        )->will(static fn ($args) => array_fill(0, 1, new Calendar()))->shouldBeCalledTimes(1);
         $calendarRepository->findByNotificationAvailable(
-            Argument::type(DateTimeImmutable::class),
-            Argument::type(DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
+            Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::not(0)
-        )->will(static function ($args) {
-            return [];
-        })->shouldBeCalledTimes(1);
+        )->will(static fn ($args) => [])->shouldBeCalledTimes(1);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldBeCalled();
@@ -129,9 +120,9 @@ final class CalendarForShortMessageProviderTest extends TestCase
             new DefaultRangeGenerator()
         );
 
-        $calendars = iterator_to_array($provider->getCalendars(new DateTimeImmutable('now')));
+        $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
 
-        $this->assertEquals(1, count($calendars));
+        $this->assertEquals(1, \count($calendars));
         $this->assertContainsOnly(Calendar::class, $calendars);
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php
index de2b97963..552595414 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultRangeGeneratorTest.php
@@ -19,12 +19,11 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultRangeGenerator;
-use DateTimeImmutable;
-use Iterator;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DefaultRangeGeneratorTest extends TestCase
@@ -36,46 +35,46 @@ final class DefaultRangeGeneratorTest extends TestCase
      * * Jeudi => envoi des rdv du samedi et dimanche
      * * Vendredi => Envoi des rdv du lundi.
      */
-    public function generateData(): Iterator
+    public function generateData(): \Iterator
     {
         yield [
-            new DateTimeImmutable('2022-06-13 10:45:00'),
-            new DateTimeImmutable('2022-06-14 00:00:00'),
-            new DateTimeImmutable('2022-06-16 00:00:00'),
+            new \DateTimeImmutable('2022-06-13 10:45:00'),
+            new \DateTimeImmutable('2022-06-14 00:00:00'),
+            new \DateTimeImmutable('2022-06-16 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-14 15:45:00'),
-            new DateTimeImmutable('2022-06-16 00:00:00'),
-            new DateTimeImmutable('2022-06-17 00:00:00'),
+            new \DateTimeImmutable('2022-06-14 15:45:00'),
+            new \DateTimeImmutable('2022-06-16 00:00:00'),
+            new \DateTimeImmutable('2022-06-17 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-15 13:45:18'),
-            new DateTimeImmutable('2022-06-17 00:00:00'),
-            new DateTimeImmutable('2022-06-18 00:00:00'),
+            new \DateTimeImmutable('2022-06-15 13:45:18'),
+            new \DateTimeImmutable('2022-06-17 00:00:00'),
+            new \DateTimeImmutable('2022-06-18 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-16 01:30:55'),
-            new DateTimeImmutable('2022-06-18 00:00:00'),
-            new DateTimeImmutable('2022-06-20 00:00:00'),
+            new \DateTimeImmutable('2022-06-16 01:30:55'),
+            new \DateTimeImmutable('2022-06-18 00:00:00'),
+            new \DateTimeImmutable('2022-06-20 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-17 21:30:55'),
-            new DateTimeImmutable('2022-06-20 00:00:00'),
-            new DateTimeImmutable('2022-06-21 00:00:00'),
+            new \DateTimeImmutable('2022-06-17 21:30:55'),
+            new \DateTimeImmutable('2022-06-20 00:00:00'),
+            new \DateTimeImmutable('2022-06-21 00:00:00'),
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-18 21:30:55'),
+            new \DateTimeImmutable('2022-06-18 21:30:55'),
             null,
             null,
         ];
 
         yield [
-            new DateTimeImmutable('2022-06-19 21:30:55'),
+            new \DateTimeImmutable('2022-06-19 21:30:55'),
             null,
             null,
         ];
@@ -84,7 +83,7 @@ final class DefaultRangeGeneratorTest extends TestCase
     /**
      * @dataProvider generateData
      */
-    public function testGenerateRange(DateTimeImmutable $date, ?DateTimeImmutable $startDate, ?DateTimeImmutable $endDate)
+    public function testGenerateRange(\DateTimeImmutable $date, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate)
     {
         $generator = new DefaultRangeGenerator();
 
@@ -94,8 +93,8 @@ final class DefaultRangeGeneratorTest extends TestCase
             $this->assertNull($actualStartDate);
             $this->assertNull($actualEndDate);
         } else {
-            $this->assertEquals($startDate->format(DateTimeImmutable::ATOM), $actualStartDate->format(DateTimeImmutable::ATOM));
-            $this->assertEquals($endDate->format(DateTimeImmutable::ATOM), $actualEndDate->format(DateTimeImmutable::ATOM));
+            $this->assertEquals($startDate->format(\DateTimeImmutable::ATOM), $actualStartDate->format(\DateTimeImmutable::ATOM));
+            $this->assertEquals($endDate->format(\DateTimeImmutable::ATOM), $actualEndDate->format(\DateTimeImmutable::ATOM));
         }
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php
index 6d42540cc..222d3a451 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilderTest.php
@@ -23,17 +23,15 @@ use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultShortMessageFor
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
-use DateInterval;
-use DateTimeImmutable;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DefaultShortMessageForCalendarBuilderTest extends TestCase
@@ -51,8 +49,8 @@ final class DefaultShortMessageForCalendarBuilderTest extends TestCase
     {
         $calendar = new Calendar();
         $calendar
-            ->setStartDate(new DateTimeImmutable('now'))
-            ->setEndDate($calendar->getStartDate()->add(new DateInterval('PT30M')))
+            ->setStartDate(new \DateTimeImmutable('now'))
+            ->setEndDate($calendar->getStartDate()->add(new \DateInterval('PT30M')))
             ->setMainUser($user = new User())
             ->addPerson($person = new Person())
             ->setSendSMS(false);
@@ -64,7 +62,7 @@ final class DefaultShortMessageForCalendarBuilderTest extends TestCase
             ->setMobilenumber($this->phoneNumberUtil->parse('+32470123456', 'BE'))
             ->setAcceptSMS(false);
 
-        $engine = $this->prophesize(EngineInterface::class);
+        $engine = $this->prophesize(\Twig\Environment::class);
         $engine->render(Argument::exact('@ChillCalendar/CalendarShortMessage/short_message.txt.twig'), Argument::withKey('calendar'))
             ->willReturn('message content')
             ->shouldBeCalledTimes(1);
diff --git a/src/Bundle/ChillCalendarBundle/chill.webpack.config.js b/src/Bundle/ChillCalendarBundle/chill.webpack.config.js
index e82210087..9d45a3142 100644
--- a/src/Bundle/ChillCalendarBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillCalendarBundle/chill.webpack.config.js
@@ -1,6 +1,8 @@
 // this file loads all assets from the Chill calendar bundle
 module.exports = function(encore, entries) {
 
+    entries.push(__dirname + '/Resources/public/chill/chill.js');
+
     encore.addAliases({
         ChillCalendarAssets: __dirname + '/Resources/public'
     });
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index eb02be280..d157683e0 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -43,6 +43,7 @@ crud:
         title_edit: Modifier le motif d'annulation
 
 chill_calendar:
+    Document: Document d'un rendez-vous
     form:
         The main user is mandatory. He will organize the appointment.: L'utilisateur principal est obligatoire. Il est l'organisateur de l'événement.
     Create for referrer: Créer pour le référent
@@ -65,6 +66,7 @@ chill_calendar:
     Document outdated: La date et l'heure du rendez-vous ont été modifiés après la création du document
 
 
+
 remote_ms_graph:
     freebusy_statuses:
         busy: Occupé
@@ -97,24 +99,32 @@ Get the sum of appointment durations according to various filters: Calcule la so
 
 'Filtered by agent: only %agents%': "Filtré par agents: uniquement %agents%"
 Filter calendars by agent: Filtrer les rendez-vous par agents
-Filter calendars by agent job: Filtrer les rendez-vous par métiers des agents
-'Filtered by agent job: only %jobs%': 'Filtré par métiers des agents: uniquement les %jobs%'
-Filter calendars by agent scope: Filtrer les rendez-vous par services des agents
-'Filtered by agent scope: only %scopes%': 'Filtré par services des agents: uniquement les services %scopes%'
 Filter calendars between certain dates: Filtrer les rendez-vous par date du rendez-vous
 'Filtered by calendars between %dateFrom% and %dateTo%': 'Filtré par rendez-vous entre %dateFrom% et %dateTo%'
 'Filtered by calendar range: only %calendarRange%': 'Filtré par rendez-vous par plage de disponibilité: uniquement les %calendarRange%'
 Filter by calendar range: Filtrer par rendez-vous dans une plage de disponibilité ou non
 
 Group calendars by agent: Grouper les rendez-vous par agent
-Group calendars by agent job: Grouper les rendez-vous par métier de l'agent
-Group calendars by agent scope: Grouper les rendez-vous par service de l'agent
 Group calendars by location type: Grouper les rendez-vous par type de localisation
 Group calendars by location: Grouper les rendez-vous par lieu de rendez-vous
 Group calendars by cancel reason: Grouper les rendez-vous par motif d'annulation
 Group calendars by month and year: Grouper les rendez-vous par mois et année
 Group calendars by urgency: Grouper les rendez-vous par urgent ou non
 
+export:
+    aggregator.calendar:
+        agent_job:
+            Group calendars by agent job: Grouper les rendez-vous par métier de l'agent
+        agent_scope:
+            Group calendars by agent scope: Grouper les rendez-vous par service de l'agent
+    filter.calendar:
+        agent_job:
+            Filter calendars by agent job: Filtrer les rendez-vous par métiers des agents (utilisateurs principaux)
+            'Filtered by agent job: only %jobs%': 'Filtré par métiers des agents (utilisateurs principaux): uniquement les %jobs%'
+        agent_scope:
+            Filter calendars by agent scope: Filtrer les rendez-vous par services des agents (utilisateurs principaux)
+            'Filtered by agent scope: only %scopes%': 'Filtré par services des agents (utilisateurs principaux): uniquement les services %scopes%'
+
 Scope: Service
 Job: Métier
 Location type: Type de localisation
@@ -145,3 +155,9 @@ CHILL_CALENDAR_CALENDAR_EDIT: Modifier les rendez-vous
 CHILL_CALENDAR_CALENDAR_DELETE: Supprimer les rendez-vous
 CHILL_CALENDAR_CALENDAR_SEE: Voir les rendez-vous
 
+
+generic_doc:
+    filter:
+        keys:
+            accompanying_period_calendar_document: Document des rendez-vous des parcours
+            person_calendar_document: Document des rendez-vous de l'usager
diff --git a/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php b/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php
index 4167efd2e..5d32ed7e9 100644
--- a/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php
+++ b/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php
@@ -19,6 +19,6 @@ class ChillCustomFieldsBundle extends Bundle
     public function build(\Symfony\Component\DependencyInjection\ContainerBuilder $container)
     {
         parent::build($container);
-        $container->addCompilerPass(new CustomFieldCompilerPass());
+        $container->addCompilerPass(new CustomFieldCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
index c8c8ad4fc..08425bcf0 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
@@ -15,7 +15,6 @@ 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;
@@ -26,55 +25,26 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Yaml\Exception\ParseException;
 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.
  */
 class CreateFieldsOnGroupCommand extends Command
 {
-    public const ARG_DELETE = 'delete';
+    final 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;
+    final public const ARG_PATH = 'path';
 
     /**
      * CreateFieldsOnGroupCommand constructor.
-     *
-     * @param $availableLanguages
-     * @param $customizablesEntities
      */
     public function __construct(
-        CustomFieldProvider $customFieldProvider,
-        EntityManager $entityManager,
-        ValidatorInterface $validator,
-        $availableLanguages,
-        $customizablesEntities
+        private readonly CustomFieldProvider $customFieldProvider,
+        private readonly EntityManager $entityManager,
+        private readonly ValidatorInterface $validator,
+        private $availableLanguages,
+        private $customizablesEntities
     ) {
-        $this->customFieldProvider = $customFieldProvider;
-        $this->entityManager = $entityManager;
-        $this->validator = $validator;
-        $this->availableLanguages = $availableLanguages;
-        $this->customizablesEntities = $customizablesEntities;
         parent::__construct();
     }
 
@@ -109,10 +79,7 @@ class CreateFieldsOnGroupCommand extends Command
         }
     }
 
-    /**
-     * @return int|void|null
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $helper = $this->getHelperSet()->get('question');
 
@@ -122,9 +89,9 @@ class CreateFieldsOnGroupCommand extends Command
             ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findAll();
 
-        if (count($customFieldsGroups) === 0) {
+        if (0 === \count($customFieldsGroups)) {
             $output->writeln('<error>There aren\'t any CustomFieldsGroup recorded'
-                . ' Please create at least one.</error>');
+                .' Please create at least one.</error>');
         }
 
         $table = new Table($output);
@@ -147,7 +114,7 @@ class CreateFieldsOnGroupCommand extends Command
                     }
                 }
 
-                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);
@@ -162,6 +129,8 @@ class CreateFieldsOnGroupCommand extends Command
         );
 
         $fields = $this->_addFields($customFieldsGroup, $fieldsInput, $output);
+
+        return 0;
     }
 
     private function _addFields(CustomFieldsGroup $group, $values, OutputInterface $output)
@@ -171,12 +140,11 @@ class CreateFieldsOnGroupCommand extends Command
         $languages = $this->availableLanguages;
 
         foreach ($values['fields'] as $slug => $field) {
-            //check the cf type exists
+            // check the cf type exists
             $cfType = $this->customFieldProvider->getCustomFieldByType($field['type']);
 
             if (null === $cfType) {
-                throw new RuntimeException('the type ' . $field['type'] . ' '
-                    . 'does not exists');
+                throw new \RuntimeException('the type '.$field['type'].' does not exists');
             }
 
             $cf = new CustomField();
@@ -187,23 +155,21 @@ class CreateFieldsOnGroupCommand extends Command
                 ->setType($field['type'])
                 ->setCustomFieldsGroup($group);
 
-            //add to table
+            // add to table
             $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';
+                // todo replace with service to find lang when available
+                $names[] = $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>');
+                    .$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);
             }
         }
 
@@ -215,13 +181,13 @@ class CreateFieldsOnGroupCommand extends Command
         $parser = new Parser();
 
         if (!file_exists($path)) {
-            throw new RuntimeException('file does not exist');
+            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);
+            throw new \RuntimeException('The yaml file is not valid', 0, $ex);
         }
 
         return $values;
@@ -231,7 +197,7 @@ class CreateFieldsOnGroupCommand extends Command
     {
         $rows = [];
         $languages = $this->availableLanguages;
-        //gather entitites and create an array to access them easily
+        // gather entitites and create an array to access them easily
         $customizableEntities = [];
 
         foreach ($this->customizablesEntities as $entry) {
@@ -241,17 +207,15 @@ class CreateFieldsOnGroupCommand extends Command
         array_walk(
             $customFieldsGroups,
             static function (CustomFieldsGroup $customFieldGroup, $key) use ($languages, &$rows, $customizableEntities) {
-                //set id and entity
+                // 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';
+                    // todo replace with service to find lang when available
+                    $row[] = $customFieldGroup->getName()[$lang] ?? 'Not available in this language';
                 }
                 $rows[] = $row;
             }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
index 1813dd7b3..eda55bb87 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\CustomFieldsBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Class AdminController
@@ -19,8 +21,11 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
  */
 class AdminController extends AbstractController
 {
-    public function indexAction()
+    /**
+     * @Route("/{_locale}/admin/customfield/", name="customfield_section")
+     */
+    public function indexAction(): Response
     {
-        return $this->render('ChillCustomFieldsBundle:Admin:layout.html.twig');
+        return $this->render('@ChillCustomFields/Admin/layout.html.twig');
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
index 25e4d2359..3bba08b01 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
@@ -17,6 +17,7 @@ use Chill\CustomFieldsBundle\Form\CustomFieldType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Class CustomFieldController.
@@ -25,6 +26,8 @@ class CustomFieldController extends AbstractController
 {
     /**
      * Creates a new CustomField entity.
+     *
+     * @Route("/{_locale}/admin/customfield/new", name="customfield_new")
      */
     public function createAction(Request $request)
     {
@@ -32,7 +35,7 @@ class CustomFieldController extends AbstractController
         $form = $this->createCreateForm($entity, $request->query->get('type', null));
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
@@ -40,16 +43,13 @@ class CustomFieldController extends AbstractController
             $this->addFlash('success', $this->get('translator')
                 ->trans('The custom field has been created'));
 
-            return $this->redirect($this->generateUrl(
-                'customfieldsgroup_show',
-                ['id' => $entity->getCustomFieldsGroup()->getId()]
-            ));
+            return $this->redirectToRoute('customfieldsgroup_show', ['id' => $entity->getCustomFieldsGroup()->getId()]);
         }
 
         $this->addFlash('error', $this->get('translator')
             ->trans('The custom field form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:new.html.twig', [
+        return $this->render('@ChillCustomFields/CustomField/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -58,9 +58,9 @@ class CustomFieldController extends AbstractController
     /**
      * Displays a form to edit an existing CustomField entity.
      *
-     * @param mixed $id
+     * @Route("/{_locale}/admin/customfield/edit", name="customfield_edit")
      */
-    public function editAction($id)
+    public function editAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -72,7 +72,7 @@ class CustomFieldController extends AbstractController
 
         $editForm = $this->createEditForm($entity, $entity->getType());
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:edit.html.twig', [
+        return $this->render('@ChillCustomFields/CustomField/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -80,12 +80,14 @@ class CustomFieldController extends AbstractController
 
     /**
      * Displays a form to create a new CustomField entity.
+     *
+     * @Route("/{_locale}/admin/customfield/new", name="customfield_new")
      */
     public function newAction(Request $request)
     {
         $entity = new CustomField();
 
-        //add the custom field group if defined in URL
+        // add the custom field group if defined in URL
         $cfGroupId = $request->query->get('customFieldsGroup', null);
 
         if (null !== $cfGroupId) {
@@ -94,47 +96,25 @@ class CustomFieldController extends AbstractController
                 ->find($cfGroupId);
 
             if (!$cfGroup) {
-                throw $this->createNotFoundException('CustomFieldsGroup with id '
-                      . $cfGroupId . ' is not found !');
+                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', [
+        return $this->render('@ChillCustomFields/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
+     * @Route("/{_locale}/admin/customfield/update", name="customfield_update")
      */
-    public function updateAction(Request $request, $id)
+    public function updateAction(Request $request, mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -147,19 +127,19 @@ class CustomFieldController extends AbstractController
         $editForm = $this->createEditForm($entity, $entity->getType());
         $editForm->handleRequest($request);
 
-        if ($editForm->isValid()) {
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
             $this->addFlash('success', $this->get('translator')
                 ->trans('The custom field has been updated'));
 
-            return $this->redirect($this->generateUrl('customfield_edit', ['id' => $id]));
+            return $this->redirectToRoute('customfield_edit', ['id' => $id]);
         }
 
         $this->addFlash('error', $this->get('translator')
             ->trans('The custom field form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:edit.html.twig', [
+        return $this->render('@ChillCustomFields/CustomField/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -168,13 +148,9 @@ class CustomFieldController extends AbstractController
     /**
      * 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)
+    private function createCreateForm(CustomField $entity, mixed $type)
     {
         $form = $this->createForm(CustomFieldType::class, $entity, [
             'action' => $this->generateUrl(
@@ -195,11 +171,10 @@ class CustomFieldController extends AbstractController
      * 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)
+    private function createEditForm(CustomField $entity, mixed $type)
     {
         $form = $this->createForm(CustomFieldType::class, $entity, [
             'action' => $this->generateUrl('customfield_update', ['id' => $entity->getId()]),
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
index 4f180549a..829ca5c55 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
@@ -25,37 +25,23 @@ 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\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 /**
  * Class CustomFieldsGroupController.
  */
 class CustomFieldsGroupController extends AbstractController
 {
-    /**
-     * @var CustomFieldProvider
-     */
-    private $customfieldProvider;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
     /**
      * CustomFieldsGroupController constructor.
      */
-    public function __construct(
-        CustomFieldProvider $customFieldProvider,
-        TranslatorInterface $translator
-    ) {
-        $this->customfieldProvider = $customFieldProvider;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly CustomFieldProvider $customFieldProvider, private readonly TranslatorInterface $translator) {}
 
     /**
      * Creates a new CustomFieldsGroup entity.
+     *
+     * @Route("/{_locale}/admin/customfieldsgroup/create", name="customfieldsgroup_create")
      */
     public function createAction(Request $request)
     {
@@ -63,7 +49,7 @@ class CustomFieldsGroupController extends AbstractController
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
@@ -71,13 +57,13 @@ class CustomFieldsGroupController extends AbstractController
             $this->addFlash('success', $this->translator
                 ->trans('The custom fields group has been created'));
 
-            return $this->redirect($this->generateUrl('customfieldsgroup_show', ['id' => $entity->getId()]));
+            return $this->redirectToRoute('customfieldsgroup_show', ['id' => $entity->getId()]);
         }
 
         $this->addFlash('error', $this->translator
             ->trans('The custom fields group form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:new.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -86,9 +72,9 @@ class CustomFieldsGroupController extends AbstractController
     /**
      * Displays a form to edit an existing CustomFieldsGroup entity.
      *
-     * @param mixed $id
+     * @Route("/{_locale}/admin/customfieldsgroup/{id}/edit", name="customfieldsgroup_edit")
      */
-    public function editAction($id)
+    public function editAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -100,7 +86,7 @@ class CustomFieldsGroupController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:edit.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -108,6 +94,8 @@ class CustomFieldsGroupController extends AbstractController
 
     /**
      * Lists all CustomFieldsGroup entities.
+     *
+     * @Route("/{_locale}/admin/customfieldsgroup/", name="customfieldsgroup")
      */
     public function indexAction()
     {
@@ -119,12 +107,12 @@ class CustomFieldsGroupController extends AbstractController
         $makeDefaultFormViews = [];
 
         foreach ($cfGroups as $group) {
-            if (!in_array($group->getId(), $defaultGroups, true)) {
+            if (!\in_array($group->getId(), $defaultGroups, true)) {
                 $makeDefaultFormViews[$group->getId()] = $this->createMakeDefaultForm($group)->createView();
             }
         }
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:index.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/index.html.twig', [
             'entities' => $cfGroups,
             'default_groups' => $defaultGroups,
             'make_default_forms' => $makeDefaultFormViews,
@@ -133,6 +121,8 @@ class CustomFieldsGroupController extends AbstractController
 
     /**
      * Set the CustomField Group with id $cFGroupId as default.
+     *
+     * @Route("/{_locale}/admin/customfieldsgroup/makedefault", name="customfieldsgroup_makedefault")
      */
     public function makeDefaultAction(Request $request)
     {
@@ -146,9 +136,7 @@ class CustomFieldsGroupController extends AbstractController
         $cFGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->findOneById($cFGroupId);
 
         if (!$cFGroup) {
-            throw $this
-                ->createNotFoundException('customFieldsGroup not found with '
-                        . "id {$cFGroupId}");
+            throw $this->createNotFoundException('customFieldsGroup not found with '."id {$cFGroupId}");
         }
 
         $cFDefaultGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class)
@@ -173,18 +161,20 @@ class CustomFieldsGroupController extends AbstractController
         $this->addFlash('success', $this->translator
             ->trans('The default custom fields group has been changed'));
 
-        return $this->redirect($this->generateUrl('customfieldsgroup'));
+        return $this->redirectToRoute('customfieldsgroup');
     }
 
     /**
      * Displays a form to create a new CustomFieldsGroup entity.
+     *
+     * @Route("/{_locale}/admin/customfieldsgroup/new", name="customfieldsgroup_new")
      */
     public function newAction()
     {
         $entity = new CustomFieldsGroup();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:new.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -217,20 +207,20 @@ class CustomFieldsGroupController extends AbstractController
 
         $this->get('twig.loader')
             ->addPath(
-                __DIR__ . '/../Tests/Fixtures/App/app/Resources/views/',
+                __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', [
+                return $this->render('@ChillCustomFields/CustomFieldsGroup/render_for_test.html.twig', [
                     'fields' => $form->getData(),
                     'customFieldsGroup' => $entity,
                 ]);
             }
 
-            //dump($form->getData());
-            //dump(json_enccode($form->getData()));
+            // dump($form->getData());
+            // dump(json_enccode($form->getData()));
         }
 
         return $this
@@ -242,9 +232,9 @@ class CustomFieldsGroupController extends AbstractController
     /**
      * Finds and displays a CustomFieldsGroup entity.
      *
-     * @param mixed $id
+     * @Route("/{_locale}/admin/customfieldsgroup/{id}/show", name="customfieldsgroup/show")
      */
-    public function showAction($id)
+    public function showAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -256,7 +246,7 @@ class CustomFieldsGroupController extends AbstractController
 
         $options = $this->getOptionsAvailable($entity->getEntity());
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:show.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/show.html.twig', [
             'entity' => $entity,
             'create_field_form' => $this->createCreateFieldForm($entity)->createView(),
             'options' => $options,
@@ -266,9 +256,9 @@ class CustomFieldsGroupController extends AbstractController
     /**
      * Edits an existing CustomFieldsGroup entity.
      *
-     * @param mixed $id
+     * @Route("/{_locale}/admin/customfieldsgroup/{id}/update", name="customfieldsgroup/update")
      */
-    public function updateAction(Request $request, $id)
+    public function updateAction(Request $request, mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -281,19 +271,19 @@ class CustomFieldsGroupController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isValid()) {
+        if ($editForm->isSubmitted() && $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]));
+            return $this->redirectToRoute('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', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -303,8 +293,7 @@ class CustomFieldsGroupController extends AbstractController
     {
         $fieldChoices = [];
 
-        foreach ($this->customfieldProvider->getAllFields()
-              as $key => $customType) {
+        foreach ($this->customFieldProvider->getAllFields() as $key => $customType) {
             $fieldChoices[$key] = $customType->getName();
         }
 
@@ -370,11 +359,9 @@ class CustomFieldsGroupController extends AbstractController
     /**
      * create a form to make the group default.
      *
-     * @param CustomFieldsGroup $group
-     *
      * @return \Symfony\Component\Form\Form
      */
-    private function createMakeDefaultForm(?CustomFieldsGroup $group = null)
+    private function createMakeDefaultForm(CustomFieldsGroup $group = null)
     {
         return $this->createFormBuilder($group, [
             'method' => 'POST',
@@ -396,8 +383,8 @@ class CustomFieldsGroupController extends AbstractController
         $em = $this->getDoctrine()->getManager();
 
         $customFieldsGroupIds = $em->createQuery('SELECT g.id FROM '
-                . 'ChillCustomFieldsBundle:CustomFieldsDefaultGroup d '
-                . 'JOIN d.customFieldsGroup g')
+                .'ChillCustomFieldsBundle:CustomFieldsDefaultGroup d '
+                .'JOIN d.customFieldsGroup g')
             ->getResult(Query::HYDRATE_SCALAR);
 
         $result = [];
@@ -418,7 +405,7 @@ class CustomFieldsGroupController extends AbstractController
     private function getOptionsAvailable($entity)
     {
         $options = $this->getParameter('chill_custom_fields.'
-              . 'customizables_entities');
+              .'customizables_entities');
 
         foreach ($options as $key => $definition) {
             if ($definition['class'] === $entity) {
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
index 7876dd026..8fd91f27d 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
@@ -18,54 +18,32 @@ use Chill\CustomFieldsBundle\Form\Type\ChoicesType;
 use Chill\CustomFieldsBundle\Form\Type\ChoiceWithOtherType;
 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;
+use Twig\Environment;
 
 class CustomFieldChoice extends AbstractCustomField
 {
-    public const ALLOW_OTHER = 'other';
+    final public const ALLOW_OTHER = 'other';
 
-    public const CHOICES = 'choices';
+    final public const CHOICES = 'choices';
 
-    public const EXPANDED = 'expanded';
+    final public const EXPANDED = 'expanded';
 
-    public const MULTIPLE = 'multiple';
+    final public const MULTIPLE = 'multiple';
 
-    public const OTHER_VALUE_LABEL = 'otherValueLabel';
-
-    private $defaultLocales;
-
-    /**
-     * @var TwigEngine
-     */
-    private $templating;
-
-    /**
-     * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation
-     */
-    private $translatableStringHelper;
+    final public const OTHER_VALUE_LABEL = 'otherValueLabel';
 
     /**
      * CustomFieldChoice constructor.
      */
     public function __construct(
-        TranslatorInterface $translator,
-        TwigEngine $templating,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->defaultLocales = $translator->getFallbackLocales();
-        $this->templating = $templating;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly Environment $templating,
+        /**
+         * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation
+         */
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function allowOtherChoice(CustomField $cf)
     {
@@ -74,7 +52,7 @@ class CustomFieldChoice extends AbstractCustomField
 
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
-        //prepare choices
+        // prepare choices
         $choices = [];
         $customFieldOptions = $customField->getOptions();
 
@@ -84,7 +62,7 @@ class CustomFieldChoice extends AbstractCustomField
             }
         }
 
-        //prepare $options
+        // prepare $options
         $options = [
             'multiple' => $customFieldOptions[self::MULTIPLE],
             'choices' => array_combine(array_values($choices), array_keys($choices)),
@@ -92,11 +70,11 @@ class CustomFieldChoice extends AbstractCustomField
             'label' => $this->translatableStringHelper->localize($customField->getName()),
         ];
 
-        //if allow_other = true
+        // if 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]
                 );
@@ -112,8 +90,8 @@ class CustomFieldChoice extends AbstractCustomField
                     )
                     ->addModelTransformer(new CustomFieldDataTransformer($this, $customField))
             );
-        } else { //if allow_other = false
-            //we add the 'expanded' to options
+        } else { // if allow_other = false
+            // we add the 'expanded' to options
             $options['expanded'] = $customFieldOptions[self::EXPANDED];
 
             $builder->add(
@@ -177,7 +155,7 @@ class CustomFieldChoice extends AbstractCustomField
         return $serialized;
     }
 
-    public function extractOtherValue(CustomField $cf, ?array $data = null)
+    public function extractOtherValue(CustomField $cf, array $data = null)
     {
         return $data['_other'];
     }
@@ -198,7 +176,7 @@ class CustomFieldChoice extends AbstractCustomField
             if ($this->allowOtherChoice($cf)) {
                 $labels = $cf->getOptions()[self::OTHER_VALUE_LABEL];
 
-                if (!is_array($labels) || count($labels) === 0) {
+                if (!\is_array($labels) || 0 === \count($labels)) {
                     $labels['back'] = 'other value';
                 }
                 $choices['_other'] = $this->translatableStringHelper
@@ -223,12 +201,12 @@ class CustomFieldChoice extends AbstractCustomField
      *
      * 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
+     * @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)
+    public function isChecked(CustomField $cf, $choiceSlug, array|string $data)
     {
         if (null === $data) {
             return false;
@@ -236,10 +214,10 @@ class CustomFieldChoice extends AbstractCustomField
 
         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)['_choices'], true);
             }
 
-            return in_array($choiceSlug, $this->deserialize($data, $cf), true);
+            return \in_array($choiceSlug, $this->deserialize($data, $cf), true);
         }
 
         if ($cf->getOptions()[self::ALLOW_OTHER]) {
@@ -256,9 +234,9 @@ class CustomFieldChoice extends AbstractCustomField
         }
 
         // if multiple choice OR multiple/single choice with other
-        if (is_array($value)) {
+        if (\is_array($value)) {
             // if allow other
-            if (array_key_exists('_choices', $value)) {
+            if (\array_key_exists('_choices', $value)) {
                 if (null === $value['_choices']) {
                     return true;
                 }
@@ -266,7 +244,7 @@ class CustomFieldChoice extends AbstractCustomField
                 return empty($value['_choices']);
             }   // we do not have 'allow other'
 
-            if (count($value) === 1) {
+            if (1 === \count($value)) {
                 return empty($value[0]);
             }
 
@@ -275,7 +253,7 @@ class CustomFieldChoice extends AbstractCustomField
 
         return empty($value);
 
-        throw LogicException('This case is not expected.');
+        throw \LogicException('This case is not expected.');
     }
 
     public function isMultiple(CustomField $cf)
@@ -286,23 +264,20 @@ class CustomFieldChoice extends AbstractCustomField
     /**
      * @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];
+        // extract the data. They are under a _choice key if they are stored with allow_other
+        $data = $value['_choices'] ?? $value;
+        $selected = (\is_array($data)) ? $data : [$data];
         $choices = $customField->getOptions()[self::CHOICES];
 
-        if (in_array('_other', $selected, true)) {
+        if (\in_array('_other', $selected, true)) {
             $choices[] = ['name' => $value['_other'], 'slug' => '_other'];
         }
 
-        $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice.html.twig';
+        $template = '@ChillCustomFields/CustomFieldsRendering/choice.html.twig';
 
         if ('csv' === $documentType) {
             $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice.csv.twig';
@@ -316,7 +291,6 @@ class CustomFieldChoice extends AbstractCustomField
                     'selected' => $selected,
                     'multiple' => $customField->getOptions()[self::MULTIPLE],
                     'expanded' => $customField->getOptions()[self::EXPANDED],
-                    'locales' => $this->defaultLocales,
                 ]
             );
     }
@@ -330,15 +304,14 @@ class CustomFieldChoice extends AbstractCustomField
      * deserialized the data from the database to a multiple
      * field.
      *
-     * @param mixed $serialized
      * @param bool $allowOther
      */
-    private function deserializeToMultiple($serialized, $allowOther)
+    private function deserializeToMultiple(mixed $serialized, $allowOther)
     {
         $value = $this->guessValue($serialized);
 
         // set in an array : we want a multiple
-        $fixedValue = is_array($value) ? $value : [$value];
+        $fixedValue = \is_array($value) ? $value : [$value];
 
         if ($allowOther) {
             return $this->deserializeWithAllowOther($serialized, $fixedValue);
@@ -352,9 +325,9 @@ class CustomFieldChoice extends AbstractCustomField
         $value = $this->guessValue($serialized);
 
         // set in a single value. We must have a single string
-        $fixedValue = is_array($value) ?
+        $fixedValue = \is_array($value) ?
                 // check if the array has an element, if not replace by empty string
-                count($value) > 0 ? end($value) : ''
+                \count($value) > 0 ? end($value) : ''
                 :
                 $value;
 
@@ -380,29 +353,24 @@ class CustomFieldChoice extends AbstractCustomField
      *
      * If the value had an 'allow_other' = true option, the returned value
      * **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
      */
-    private function guessValue($value)
+    private function guessValue(null|array|string $value)
     {
         if (null === $value) {
             return null;
         }
 
-        if (!is_array($value)) {
+        if (!\is_array($value)) {
             return $value;
         }
         // we have a field with "allow other"
-        if (array_key_exists('_choices', $value)) {
+        if (\array_key_exists('_choices', $value)) {
             return $value['_choices'];
         }
+
         // we have a field with "multiple"
         return $value;
 
-        throw LogicException('This case is not expected.');
+        throw \LogicException('This case is not expected.');
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
index 218bd5415..a535f805e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
@@ -15,14 +15,12 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
 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 Twig\Environment;
 
 /**
  * Create a custom date number.
@@ -33,32 +31,21 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  */
 class CustomFieldDate extends AbstractCustomField
 {
-    public const DATE_FORMAT = DateTime::RFC3339;
+    final public const DATE_FORMAT = \DateTime::RFC3339;
 
-    public const FORMAT = 'format';
+    final public const FORMAT = 'format';
 
-    public const MAX = 'max';
+    final public const MAX = 'max';
 
     /**
      * key for the minimal value of the field.
      */
-    public const MIN = 'min';
+    final public const MIN = 'min';
 
-    /**
-     * @var TwigEngine
-     */
-    private $templating;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    public function __construct(TwigEngine $templating, TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->templating = $templating;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private readonly Environment $templating,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
@@ -81,8 +68,8 @@ class CustomFieldDate extends AbstractCustomField
     {
         $validatorFunction = static function ($value, ExecutionContextInterface $context) {
             try {
-                $date = new DateTime($value);
-            } catch (Exception $e) {
+                $date = new \DateTime($value);
+            } catch (\Exception) {
                 $context->buildViolation('The expression "%expression%" is invalid', [
                     '%expression%' => $value,
                 ])
@@ -117,7 +104,7 @@ class CustomFieldDate extends AbstractCustomField
             return null;
         }
 
-        return DateTime::createFromFormat(self::DATE_FORMAT, $serialized);
+        return \DateTime::createFromFormat(self::DATE_FORMAT, $serialized);
     }
 
     public function getName()
@@ -139,7 +126,7 @@ class CustomFieldDate extends AbstractCustomField
 
             default:
                 $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:date.'
-                        . $documentType . '.twig';
+                        .$documentType.'.twig';
 
                 return $this->templating
                     ->render($template, [
@@ -175,7 +162,7 @@ class CustomFieldDate extends AbstractCustomField
         // add required
         $fieldOptions['required'] = false;
 
-        //add label
+        // add label
         $fieldOptions['label'] = $this->translatableStringHelper->localize($customField->getName());
 
         // add constraints if required
@@ -186,8 +173,8 @@ class CustomFieldDate extends AbstractCustomField
                         return;
                     }
 
-                    $value = DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
-                    $after = new DateTime($options[self::MIN]);
+                    $value = \DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
+                    $after = new \DateTime($options[self::MIN]);
 
                     if ($value < $after) {
                         $context
@@ -207,8 +194,8 @@ class CustomFieldDate extends AbstractCustomField
                         return;
                     }
 
-                    $value = DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
-                    $before = new DateTime($options[self::MAX]);
+                    $value = \DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
+                    $before = new \DateTime($options[self::MAX]);
 
                     if ($value > $before) {
                         $context
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
index 43902a7e3..ff89c04d2 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
@@ -21,7 +21,7 @@ interface CustomFieldInterface
      * user.
      *
      * @param \Chill\CustomFieldsBundle\CustomField\FormBuilderInterface $builder
-     * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
+     * @param \Chill\CustomFieldsBundle\CustomField\CustomField          $customField
      *
      * @return \Symfony\Component\Form\FormTypeInterface the form type
      */
@@ -42,7 +42,6 @@ interface CustomFieldInterface
      * value which may be used in the process.
      *
      * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
-     * @param mixed $serialized
      */
     public function deserialize($serialized, CustomField $customField);
 
@@ -58,9 +57,8 @@ interface CustomFieldInterface
     /**
      * Return a repsentation of the value of the CustomField.
      *
-     * @param mixed $value the raw value, **not deserialized** (= as stored in the db)
+     * @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
      */
@@ -69,7 +67,6 @@ interface CustomFieldInterface
     /**
      * Transform the value into a format that can be stored in DB.
      *
-     * @param mixed $value
      * @param \Chill\CustomFieldsBundle\CustomField\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 41c8b4694..885a02f2d 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
@@ -17,34 +17,18 @@ use Chill\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice\OptionReposi
 use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
 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;
-
 class CustomFieldLongChoice extends AbstractCustomField
 {
-    public const KEY = 'key';
-
-    private OptionRepository $optionRepository;
-
-    private TwigEngine $templating;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    final public const KEY = 'key';
 
     public function __construct(
-        OptionRepository $optionRepository,
-        TranslatableStringHelper $translatableStringHelper,
-        TwigEngine $twigEngine
-    ) {
-        $this->optionRepository = $optionRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->templating = $twigEngine;
-    }
+        private readonly OptionRepository $optionRepository,
+        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly \Twig\Environment $templating,
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
@@ -54,13 +38,11 @@ class CustomFieldLongChoice extends AbstractCustomField
             false,
             true
         );
-        //create a local copy of translatable string helper
+        // create a local copy of translatable string helper
         $translatableStringHelper = $this->translatableStringHelper;
         $builder->add($customField->getSlug(), Select2ChoiceType::class, [
             'choices' => $entries,
-            'choice_label' => static function (Option $option) use ($translatableStringHelper) {
-                return $translatableStringHelper->localize($option->getText());
-            },
+            'choice_label' => static fn (Option $option) => $translatableStringHelper->localize($option->getText()),
             'choice_value' => static fn (Option $key): ?int => null === $key ? null : $key->getId(),
             'multiple' => false,
             'expanded' => false,
@@ -83,7 +65,7 @@ class CustomFieldLongChoice extends AbstractCustomField
 
     public function buildOptionsForm(FormBuilderInterface $builder)
     {
-        //create a selector between different keys
+        // create a selector between different keys
         $keys = $this->optionRepository->getKeys();
         $choices = [];
 
@@ -115,7 +97,7 @@ class CustomFieldLongChoice extends AbstractCustomField
     {
         $option = $this->deserialize($value, $customField);
         $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice_long.'
-                . $documentType . '.twig';
+                .$documentType.'.twig';
 
         return $this->templating
             ->render($template, [
@@ -130,9 +112,7 @@ class CustomFieldLongChoice extends AbstractCustomField
         }
 
         if (!$value instanceof Option) {
-            throw new LogicException('the value should be an instance of '
-                    . 'Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option, '
-                    . is_object($value) ? get_class($value) : gettype($value) . ' given');
+            throw new \LogicException('the value should be an instance of Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option, '.\is_object($value) ? $value::class : \gettype($value).' given');
         }
 
         // we place the id in array, to allow in the future multiple select
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
index 82b35f9f5..979d96540 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
@@ -13,13 +13,13 @@ namespace Chill\CustomFieldsBundle\CustomFields;
 
 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;
+use Twig\Environment;
 
 /**
  * Create a custom field number.
@@ -28,41 +28,30 @@ use Symfony\Component\Validator\Constraints\LessThanOrEqual;
  */
 class CustomFieldNumber extends AbstractCustomField
 {
-    public const MAX = 'max';
+    final public const MAX = 'max';
 
     /**
      * key for the minimal value of the field.
      */
-    public const MIN = 'min';
+    final public const MIN = 'min';
 
-    public const POST_TEXT = 'post_text';
+    final public const POST_TEXT = 'post_text';
 
-    public const SCALE = 'scale';
+    final public const SCALE = 'scale';
 
-    /**
-     * @var TwigEngine
-     */
-    private $templating;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    public function __construct(TwigEngine $templating, TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->templating = $templating;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private readonly Environment $templating,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
         $options = $customField->getOptions();
 
-        //select the type depending to the SCALE
+        // select the type depending to the SCALE
         $type = (0 === $options[self::SCALE] || null === $options[self::SCALE]) ?
                 IntegerType::class : NumberType::class;
-        //'integer' : 'number';
+        // 'integer' : 'number';
 
         $fieldOptions = $this->prepareFieldOptions($customField, $type);
 
@@ -107,7 +96,7 @@ 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
@@ -142,7 +131,7 @@ class CustomFieldNumber extends AbstractCustomField
         // add required
         $fieldOptions['required'] = false;
 
-        //add label
+        // add label
         $fieldOptions['label'] = $this->translatableStringHelper->localize($customField->getName());
 
         // add constraints if required
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
index 0a6efc2bc..f95048e21 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
@@ -13,43 +13,23 @@ namespace Chill\CustomFieldsBundle\CustomFields;
 
 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 function array_key_exists;
+use Twig\Environment;
 
 class CustomFieldText extends AbstractCustomField
 {
-    public const MAX_LENGTH = 'maxLength';
+    final public const MAX_LENGTH = 'maxLength';
 
-    public const MULTIPLE_CF_INLINE = 'multipleCFInline';
-
-    private $requestStack;
-
-    /**
-     * @var TwigEngine
-     */
-    private $templating;
-
-    /**
-     * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation
-     */
-    private $translatableStringHelper;
+    final public const MULTIPLE_CF_INLINE = 'multipleCFInline';
 
     public function __construct(
-        RequestStack $requestStack,
-        TwigEngine $templating,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->requestStack = $requestStack;
-        $this->templating = $templating;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly Environment $templating,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     /**
      * Create a form according to the maxLength option.
@@ -67,7 +47,7 @@ class CustomFieldText extends AbstractCustomField
         $attrArray = [];
 
         if (
-            array_key_exists(self::MULTIPLE_CF_INLINE, $options)
+            \array_key_exists(self::MULTIPLE_CF_INLINE, $options)
             && $options[self::MULTIPLE_CF_INLINE]
         ) {
             $attrArray['class'] = 'multiple-cf-inline';
@@ -106,7 +86,7 @@ class CustomFieldText extends AbstractCustomField
 
     public function render($value, CustomField $customField, $documentType = 'html')
     {
-        $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:text.html.twig';
+        $template = '@ChillCustomFields/CustomFieldsRendering/text.html.twig';
 
         if ('csv' === $documentType) {
             $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:text.csv.twig';
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
index b22b84029..302e04350 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
@@ -14,40 +14,25 @@ namespace Chill\CustomFieldsBundle\CustomFields;
 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 Twig\Environment;
 
 class CustomFieldTitle extends AbstractCustomField
 {
-    public const TYPE = 'type';
+    final public const TYPE = 'type';
 
-    public const TYPE_SUBTITLE = 'subtitle';
+    final public const TYPE_SUBTITLE = 'subtitle';
 
-    public const TYPE_TITLE = 'title';
-
-    private $requestStack;
-
-    /**
-     * @var TwigEngine
-     */
-    private $templating;
-
-    /**
-     * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation
-     */
-    private $translatableStringHelper;
+    final public const TYPE_TITLE = 'title';
 
     public function __construct(
-        RequestStack $requestStack,
-        TwigEngine $templating,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->requestStack = $requestStack;
-        $this->templating = $templating;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly Environment $templating,
+        /**
+         * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation
+         */
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
@@ -95,7 +80,7 @@ class CustomFieldTitle extends AbstractCustomField
     {
         return $this->templating
             ->render(
-                'ChillCustomFieldsBundle:CustomFieldsRendering:title.html.twig',
+                '@ChillCustomFields/CustomFieldsRendering/title.html.twig',
                 [
                     'title' => $customField->getName(),
                     'type' => $customField->getOptions()[self::TYPE],
diff --git a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
index 0edc2457a..f95991b7c 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
@@ -37,7 +37,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
      */
     public $fakerNl;
 
-    private $counter = 0;
+    private int $counter = 0;
 
     public function __construct()
     {
@@ -73,7 +73,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
             ->setText($text)
             ->setParent($parent)
             ->setActive(true)
-            ->setInternalKey($parent->getKey() . '-' . $this->counter);
+            ->setInternalKey($parent->getKey().'-'.$this->counter);
     }
 
     private function loadingCompanies(ObjectManager $manager)
@@ -103,8 +103,8 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
                 ->setKey('company');
             $manager->persist($parent);
 
-            //Load children
-            $expected_nb_children = mt_rand(10, 50);
+            // Load children
+            $expected_nb_children = random_int(10, 50);
 
             for ($i = 0; $i < $expected_nb_children; ++$i) {
                 $companyName = $this->fakerFr->company;
@@ -143,8 +143,8 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
                 ->setKey('word');
             $manager->persist($parent);
 
-            //Load children
-            $expected_nb_children = mt_rand(10, 50);
+            // Load children
+            $expected_nb_children = random_int(10, 50);
 
             for ($i = 0; $i < $expected_nb_children; ++$i) {
                 $manager->persist($this->createChildOption($parent, [
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
index a90f770a4..724fd01ca 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
@@ -29,15 +29,15 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
         $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');
         $loader->load('services/menu.yaml');
 
-        //add at least a blank array at 'customizable_entities' options
-        //$customizable_entities = (isset($config['customizables_entities'])
+        // add at least a blank array at 'customizable_entities' options
+        // $customizable_entities = (isset($config['customizables_entities'])
         //        && $config['customizables_entities'] !== FALSE)
         //        ? $config['customizables_entities'] : array();
 
@@ -59,12 +59,12 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
         // add form layout to twig resources
         $twigConfig = [
             'form_themes' => [
-                'ChillCustomFieldsBundle:Form:fields.html.twig',
+                '@ChillCustomFields/Form/fields.html.twig',
             ],
         ];
         $container->prependExtensionConfig('twig', $twigConfig);
 
-        //add routes for custom bundle
+        // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
index d0db269a2..e68fdd2c4 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
@@ -25,7 +25,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_custom_fields');
-        $rootNode = $treeBuilder->getRootNode('chill_custom_fields');
+        $rootNode = $treeBuilder->getRootNode();
 
         $classInfo = 'The class which may receive custom fields';
         $nameInfo = 'The name which will appears in the user interface. May be translatable';
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
index 0cf1a67eb..6e68a248a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\DependencyInjection;
 
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -21,8 +20,7 @@ class CustomFieldCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill.custom_field.provider')) {
-            throw new LogicException('service chill.custom_field.provider '
-                    . 'is not defined.');
+            throw new \LogicException('service chill.custom_field.provider is not defined.');
         }
 
         $definition = $container->getDefinition(
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
index d9f43ed3b..b75d23e5e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
@@ -17,39 +17,37 @@ use Doctrine\ORM\Mapping as ORM;
  * CustomField.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="customfield")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class CustomField
 {
-    public const ONE_TO_MANY = 2;
+    final public const ONE_TO_MANY = 2;
 
-    public const ONE_TO_ONE = 1;
+    final public const ONE_TO_ONE = 1;
 
     /**
-     * @var bool
-     *
      * @ORM\Column(type="boolean")
      */
-    private $active = true;
+    private bool $active = true;
 
     /**
-     * @var CustomFieldsGroup
-     *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup",
      * inversedBy="customFields")
      */
-    private $customFieldGroup;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $customFieldGroup = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @var array
@@ -59,39 +57,29 @@ class CustomField
     private $name;
 
     /**
-     * @var array
-     *
      * @ORM\Column(type="json")
      */
-    private $options = [];
+    private array $options = [];
 
     /**
-     * @var float
-     *
      * @ORM\Column(type="float")
      */
-    private $ordering;
+    private ?float $ordering = null;
 
     /**
-     * @var bool
-     *
      * @ORM\Column(type="boolean")
      */
-    private $required = false;
+    private false $required = false;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255)
      */
-    private $slug;
+    private ?string $slug = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255)
      */
-    private $type;
+    private ?string $type = null;
 
     /**
      * Get customFieldGroup.
@@ -222,11 +210,9 @@ class CustomField
     /**
      * Set customFieldGroup.
      *
-     * @param CustomFieldsGroup $customFieldGroup
-     *
      * @return CustomField
      */
-    public function setCustomFieldsGroup(?CustomFieldsGroup $customFieldGroup = null)
+    public function setCustomFieldsGroup(CustomFieldsGroup $customFieldGroup = null)
     {
         $this->customFieldGroup = $customFieldGroup;
 
@@ -281,8 +267,6 @@ class CustomField
     }
 
     /**
-     * @param $slug
-     *
      * @return $this
      */
     public function setSlug($slug)
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
index 08233886d..b6f371c8e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
@@ -11,67 +11,71 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity(
  * repositoryClass="Chill\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice\OptionRepository")
+ *
  * @ORM\Table(name="custom_field_long_choice_options")
  */
 class Option
 {
     /**
-     * @var bool
      * @ORM\Column(type="boolean")
      */
-    private $active = true;
+    private bool $active = true;
 
     /**
-     * @var Collection
+     * @var Collection<Option>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option",
      * mappedBy="parent")
      */
-    private $children;
+    private Collection $children;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var string
      * @ORM\Column(type="string", length=50, name="internal_key")
      */
-    private $internalKey = '';
+    private string $internalKey = '';
 
     /**
-     * @var string
      * @ORM\Column(type="string", length=15)
      */
-    private $key;
+    private ?string $key = null;
 
     /**
-     * @var Option
      * @ORM\ManyToOne(
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option",
      * inversedBy="children")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
-    private $parent;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option $parent = null;
 
     /**
      * A json representation of text (multilingual).
      *
-     * @var array
      * @ORM\Column(type="json")
      */
-    private $text;
+    private ?array $text = null;
+
+    public function __construct()
+    {
+        $this->children = new ArrayCollection();
+    }
 
     /**
      * @return bool
@@ -146,8 +150,6 @@ class Option
     }
 
     /**
-     * @param $active
-     *
      * @return $this
      */
     public function setActive($active)
@@ -158,8 +160,6 @@ class Option
     }
 
     /**
-     * @param $internal_key
-     *
      * @return $this
      */
     public function setInternalKey($internal_key)
@@ -170,8 +170,6 @@ class Option
     }
 
     /**
-     * @param $key
-     *
      * @return $this
      */
     public function setKey($key)
@@ -184,7 +182,7 @@ class Option
     /**
      * @return $this
      */
-    public function setParent(?Option $parent = null)
+    public function setParent(Option $parent = null)
     {
         $this->parent = $parent;
         $this->key = $parent->getKey();
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
index 15e37b5f7..fbf100a95 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
@@ -17,6 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
  * CustomFieldsDefaultGroup.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="customfieldsdefaultgroup",
  *     uniqueConstraints={@ORM\UniqueConstraint(
@@ -27,30 +28,26 @@ use Doctrine\ORM\Mapping as ORM;
 class CustomFieldsDefaultGroup
 {
     /**
-     * @var CustomFieldsGroup
-     *
      * @ORM\ManyToOne(
      * targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup")
      *
      *     sf4 check: option inversedBy="customFields" return inconsistent error mapping !!
      */
-    private $customFieldsGroup;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $customFieldsGroup = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255)
      */
-    private $entity;
+    private ?string $entity = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * Get customFieldsGroup.
@@ -85,7 +82,7 @@ class CustomFieldsDefaultGroup
     /**
      * Set customFieldsGroup.
      *
-     * @param CustomFieldsGroup $customFieldsGroup     *
+     * @param CustomFieldsGroup $customFieldsGroup *
      *
      * @return CustomFieldsDefaultGroup
      */
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
index 46a48f4b5..9d2be4979 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
  * CustomFieldGroup.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="customfieldsgroup")
  */
 class CustomFieldsGroup
@@ -26,39 +27,36 @@ class CustomFieldsGroup
     /**
      * 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;
+    private ?array $activeCustomFields = null;
 
     /**
      * The custom fields of the group.
      * The custom fields are asc-ordered regarding to their property "ordering".
      *
-     * @var Collection
+     * @var Collection<CustomField>
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomField",
      * mappedBy="customFieldGroup")
+     *
      * @ORM\OrderBy({"ordering": "ASC"})
      */
-    private $customFields;
+    private Collection $customFields;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255)
      */
-    private $entity;
+    private ?string $entity = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @var array
@@ -68,11 +66,9 @@ class CustomFieldsGroup
     private $name;
 
     /**
-     * @var array
-     *
      * @ORM\Column(type="json")
      */
-    private $options = [];
+    private array $options = [];
 
     /**
      * CustomFieldsGroup constructor.
@@ -96,10 +92,8 @@ class CustomFieldsGroup
 
     /**
      * Get all the custom.
-     *
-     * @return Collection
      */
-    public function getActiveCustomFields()
+    public function getActiveCustomFields(): array
     {
         if (null === $this->activeCustomFields) {
             $this->activeCustomFields = [];
@@ -144,15 +138,11 @@ class CustomFieldsGroup
 
     /**
      * Get name.
-     *
-     * @param mixed|null $language
-     *
-     * @return array
      */
-    public function getName($language = null)
+    public function getName(string $language = null): array|string
     {
-        //TODO set this in a service, PLUS twig function
-        if ($language) {
+        // TODO set this in a service, PLUS twig function
+        if (null !== $language) {
             if (isset($this->name[$language])) {
                 return $this->name[$language];
             }
diff --git a/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php b/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
index 328eda36a..e57473746 100644
--- a/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
+++ b/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
@@ -18,12 +18,10 @@ class OptionRepository extends EntityRepository
 {
     /**
      * @param string $key
-     * @param mixed $includeParents
-     * @param mixed $active
      *
      * @return Option[]
      */
-    public function findFilteredByKey($key, $includeParents = true, $active = true)
+    public function findFilteredByKey($key, mixed $includeParents = true, mixed $active = true)
     {
         $qb = $this->createQueryBuilder('option');
         $qb->where('option.key = :key');
@@ -57,8 +55,6 @@ class OptionRepository extends EntityRepository
             ->getQuery()
             ->getScalarResult();
 
-        return array_map(static function ($r) {
-            return $r['key'];
-        }, $keys);
+        return array_map(static fn ($r) => $r['key'], $keys);
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
index aa1d1b7e1..9ffc157cc 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
@@ -16,7 +16,6 @@ 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;
@@ -30,30 +29,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CustomFieldType extends AbstractType
 {
-    /**
-     * @var CustomFieldProvider
-     */
-    private $customFieldProvider;
-
-    /**
-     * @var ObjectManager
-     */
-    private $om;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    public function __construct(
-        CustomFieldProvider $compiler,
-        ObjectManager $om,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->customFieldProvider = $compiler;
-        $this->om = $om;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly CustomFieldProvider $customFieldProvider, private readonly ObjectManager $om, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -70,23 +46,21 @@ class CustomFieldType extends AbstractType
         if ('entity' === $options['group_widget']) {
             $builder->add('customFieldsGroup', EntityType::class, [
                 'class' => 'ChillCustomFieldsBundle:CustomFieldsGroup',
-                'choice_label' => function ($g) {
-                    return $this->translatableStringHelper->localize($g->getName());
-                },
+                'choice_label' => fn ($g) => $this->translatableStringHelper->localize($g->getName()),
             ]);
         } elseif ('hidden' === $options['group_widget']) {
             $builder->add('customFieldsGroup', HiddenType::class);
             $builder->get('customFieldsGroup')
                 ->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, [
                 'required' => false,
-                //'expanded' => TRUE,
+                // 'expanded' => TRUE,
                 'label' => 'Required field',
             ])
             ->add('type', HiddenType::class, ['data' => $options['type']])
@@ -119,7 +93,7 @@ class CustomFieldType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\CustomFieldsBundle\Entity\CustomField',
+            'data_class' => \Chill\CustomFieldsBundle\Entity\CustomField::class,
         ]);
 
         $resolver->setRequired(['type', 'group_widget'])
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
index 8eda50464..8cf3ea182 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
@@ -21,29 +21,20 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function count;
-
 class CustomFieldsGroupType extends AbstractType
 {
-    private $customizableEntities; //TODO : add comment about this variable
+    public function __construct(
+        private readonly array $customizableEntities,
+        // TODO : add comment about this variable
+        private readonly TranslatorInterface $translator
+    ) {}
 
-    /**
-     * @var \Symfony\Component\Translation\TranslatorInterface
-     */
-    private $translator;
-
-    public function __construct(array $customizableEntities, TranslatorInterface $translator)
-    {
-        $this->customizableEntities = $customizableEntities;
-        $this->translator = $translator;
-    }
-
-    //TODO : details about the function
+    // TODO : details about the function
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        //prepare translation
+        // prepare translation
         $entities = [];
-        $customizableEntities = []; //TODO : change name too close than $this->customizableEntities
+        $customizableEntities = []; // TODO : change name too close than $this->customizableEntities
 
         foreach ($this->customizableEntities as $key => $definition) {
             $entities[$definition['class']] = $this->translator->trans($definition['name']);
@@ -62,14 +53,14 @@ class CustomFieldsGroupType extends AbstractType
                 $form = $event->getForm();
                 $group = $event->getData();
 
-                //stop the function if entity is not set
-                if ($group->getEntity() === null) {
+                // stop the function if entity is not set
+                if (null === $group->getEntity()) {
                     return;
                 }
 
                 $optionBuilder = null;
 
-                if (count($customizableEntities[$group->getEntity()]['options']) > 0) {
+                if (\count($customizableEntities[$group->getEntity()]['options']) > 0) {
                     $optionBuilder = $builder
                         ->getFormFactory()
                         ->createBuilderForProperty(CustomFieldsGroup::class, 'options')
@@ -101,12 +92,4 @@ class CustomFieldsGroupType extends AbstractType
             'data_class' => CustomFieldsGroup::class,
         ]);
     }
-
-    /**
-     * @return string
-     */
-    public function getBlockPrefix()
-    {
-        return 'custom_fields_group';
-    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php
index cb626c214..ee5f8b386 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php
@@ -17,20 +17,7 @@ use Symfony\Component\Form\DataTransformerInterface;
 
 class CustomFieldDataTransformer implements DataTransformerInterface
 {
-    /**
-     * @var \Chill\CustomFieldsBundle\Entity\CustomField
-     */
-    private $customField;
-
-    private $customFieldDefinition;
-
-    public function __construct(
-        CustomFieldInterface $customFieldDefinition,
-        CustomField $customField
-    ) {
-        $this->customFieldDefinition = $customFieldDefinition;
-        $this->customField = $customField;
-    }
+    public function __construct(private readonly CustomFieldInterface $customFieldDefinition, private readonly CustomField $customField) {}
 
     public function reverseTransform($value)
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
index 8e41e0537..180ac0a8a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
@@ -16,54 +16,32 @@ use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
-use function gettype;
-
 class CustomFieldsGroupToIdTransformer implements DataTransformerInterface
 {
-    /**
-     * @var ObjectManager
-     */
-    private $om;
-
-    public function __construct(ObjectManager $om)
-    {
-        $this->om = $om;
-    }
+    public function __construct(private readonly ObjectManager $om) {}
 
     /**
      * Transforms a string (id) to an object (CustomFieldsGroup).
      *
-     * @param  string $id
+     * @param string $id
      *
-     * @throws TransformationFailedException if object (report) is not found.
-     *
-     * @return CustomFieldsGroup|null
+     * @throws TransformationFailedException if object (report) is not found
      */
-    public function reverseTransform($id)
+    public function reverseTransform($id): ?CustomFieldsGroup
     {
         if (!$id) {
             return null;
         }
 
         if ($id instanceof CustomFieldsGroup) {
-            throw new TransformationFailedException(
-                'The transformation failed: the expected argument on '
-                  . 'reverseTransform is an object of type int,'
-                  . 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup, '
-                  . 'given'
-            );
+            throw new TransformationFailedException('The transformation failed: the expected argument on reverseTransform is an object of type int,Chill\CustomFieldsBundle\Entity\CustomFieldsGroup, given');
         }
 
         $customFieldsGroup = $this->om
             ->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;
@@ -72,7 +50,7 @@ class CustomFieldsGroupToIdTransformer implements DataTransformerInterface
     /**
      * Transforms an custom_field_group to a string (id).
      *
-     * @param  CustomFieldsGroup|null $customFieldsGroup
+     * @param CustomFieldsGroup|null $customFieldsGroup
      *
      * @return string
      */
@@ -83,14 +61,7 @@ class CustomFieldsGroupToIdTransformer implements DataTransformerInterface
         }
 
         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
-            ));
+            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 6bd12a07a..9f2fa3a9e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
@@ -15,32 +15,22 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\DataTransformerInterface;
 
-use function array_key_exists;
-
-use const JSON_THROW_ON_ERROR;
-
 /**
  * Not in use ? Deprecated ?
  */
 class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
 {
-    private array $customField;
+    private readonly array $customField;
 
-    private ObjectManager $om;
-
-    public function __construct(ObjectManager $om)
+    public function __construct(private readonly ObjectManager $om)
     {
-        $this->om = $om;
-
         $customFields = $this->om
             ->getRepository(CustomField::class)
             ->findAll();
 
         // @TODO: in the array_map callback, CustomField::getLabel() does not exist. What do we do here?
         $customFieldsLablels = array_map(
-            static function ($e) {
-                return $e->getLabel();
-            },
+            static fn ($e) => $e->getLabel(),
             $customFields
         );
 
@@ -64,23 +54,23 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
         echo "<br> - - 9 - <br>";
          */
 
-        //var_dump($customFieldsArray);
+        // var_dump($customFieldsArray);
 
         $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 (str_starts_with((string) $type, 'ManyToOne')) {
                     // 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) {
+                    // $entityClass = substr($type, 10, -1);
+                    // echo $entityClasss;
+                    if (str_starts_with((string) $type, 'ManyToOnePersist')) {
                         // PEUT ETRE A FAIRE SI SEULEMENT $value->getId() ne renvoie rien...
                         //
                         //
@@ -106,9 +96,9 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
             }
         }
 
-        //echo json_encode($customFieldsArrayRet);
+        // echo json_encode($customFieldsArrayRet);
 
-        return json_encode($customFieldsArrayRet);
+        return json_encode($customFieldsArrayRet, \JSON_THROW_ON_ERROR);
     }
 
     public function transform($customFieldsJSON)
@@ -118,7 +108,7 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
         if (null === $customFieldsJSON) {
             $customFieldsArray = [];
         } else {
-            $customFieldsArray = json_decode($customFieldsJSON, true, 512, JSON_THROW_ON_ERROR);
+            $customFieldsArray = json_decode((string) $customFieldsJSON, true, 512, \JSON_THROW_ON_ERROR);
         }
 
         $customFieldsArrayRet = [];
@@ -126,18 +116,18 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
         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, 'ManyToOnePersist') === 0) {
-                        $entityClass = substr($type, 17, -1);
+                if (str_starts_with((string) $type, 'ManyToOne')) {
+                    if (str_starts_with((string) $type, 'ManyToOnePersist')) {
+                        $entityClass = substr((string) $type, 17, -1);
                     } else {
-                        $entityClass = substr($type, 10, -1);
+                        $entityClass = substr((string) $type, 10, -1);
                     }
 
                     $customFieldsArrayRet[$key] = $this->om
-                        ->getRepository('ChillCustomFieldsBundle:' . $entityClass)
+                        ->getRepository('ChillCustomFieldsBundle:'.$entityClass)
                         ->findOneById($value);
                     $traited = true;
                 } elseif ('ManyToMany(Adress)' === $type) {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
index 14ddf0472..2d801beec 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
@@ -16,8 +16,6 @@ use Symfony\Component\Form\FormInterface;
 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.
@@ -30,8 +28,8 @@ abstract class PostTextExtension extends AbstractTypeExtension
 {
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        if (array_key_exists('post_text', $options)) {
-            //set the post text variable to the view
+        if (\array_key_exists('post_text', $options)) {
+            // set the post text variable to the view
             $view->vars['post_text'] = $options['post_text'];
         }
     }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php
index 92034f7ee..da17c573d 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php
@@ -18,8 +18,8 @@ use Symfony\Component\Form\Extension\Core\Type\IntegerType;
  */
 class PostTextIntegerExtension extends PostTextExtension
 {
-    public function getExtendedType()
+    public static function getExtendedTypes(): iterable
     {
-        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 e89e33eff..1303744ce 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php
@@ -18,8 +18,8 @@ use Symfony\Component\Form\Extension\Core\Type\NumberType;
  */
 class PostTextNumberExtension extends PostTextExtension
 {
-    public function getExtendedType()
+    public static function getExtendedTypes(): iterable
     {
-        return NumberType::class;
+        return [NumberType::class];
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
index 6325ef50e..8d0c049f0 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
@@ -22,16 +22,16 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
  */
 class ChoiceWithOtherType extends AbstractType
 {
-    private $otherValueLabel = 'Other value';
+    private string $otherValueLabel = 'Other value';
 
     /** (non-PHPdoc).
      * @see \Symfony\Component\Form\AbstractType::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        //add an 'other' entry in choices array
+        // add an 'other' entry in choices array
         $options['choices'][$this->otherValueLabel] = '_other';
-        //ChoiceWithOther must always be expanded
+        // ChoiceWithOther must always be expanded
         $options['expanded'] = true;
         // adding a default value for choice
         $options['empty_data'] = null;
@@ -53,9 +53,4 @@ class ChoiceWithOtherType extends AbstractType
                 'multiple' => false,
             ]);
     }
-
-    public function getBlockPrefix()
-    {
-        return 'choice_with_other';
-    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
index 071363451..c50bd856e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
@@ -38,7 +38,7 @@ class ChoicesListType extends AbstractType
                 $formData = $form->getData();
 
                 if (null === $formData['slug']) {
-                    $slug = uniqid(mt_rand(), true);
+                    $slug = uniqid(random_int(0, mt_getrandmax()), true);
 
                     $data['slug'] = $slug;
                     $event->setData($data);
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
index 5b1d39529..6da8a9a71 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
@@ -24,14 +24,8 @@ class CustomFieldType extends AbstractType
      */
     private $customFieldCompiler;
 
-    /**
-     * @var ObjectManager
-     */
-    private $om;
-
-    public function __construct(ObjectManager $om, CustomFieldProvider $compiler)
+    public function __construct(private readonly ObjectManager $om, CustomFieldProvider $compiler)
     {
-        $this->om = $om;
         $this->customFieldCompiler = $compiler;
     }
 
@@ -49,11 +43,6 @@ class CustomFieldType extends AbstractType
     {
         $resolver
             ->setRequired(['group'])
-            ->addAllowedTypes('group', ['Chill\CustomFieldsBundle\Entity\CustomFieldsGroup']);
-    }
-
-    public function getBlockPrefix()
-    {
-        return 'custom_field';
+            ->addAllowedTypes('group', [\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class]);
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php
index fa462737e..5d5377a15 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php
@@ -16,9 +16,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class CustomFieldsTitleType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-    }
+    public function buildForm(FormBuilderInterface $builder, array $options) {}
 
     public function getBlockPrefix()
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
index c8bf19481..8f6e896bf 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
@@ -32,29 +32,17 @@ class LinkedCustomFieldsType extends AbstractType
      * The name for the choice field.
      *
      * Extracted from builder::getName
-     *
-     * @var string
      */
-    private $choiceName = 'choice';
+    private string $choiceName = 'choice';
 
     /**
      * 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 = [];
+    private array $options = [];
 
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $helper)
-    {
-        $this->translatableStringHelper = $helper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     /**
      * append Choice on POST_SET_DATA event.
@@ -99,7 +87,7 @@ class LinkedCustomFieldsType extends AbstractType
 
         $builder->addEventListener(
             FormEvents::POST_SET_DATA,
-            [$this, 'appendChoice']
+            $this->appendChoice(...)
         );
     }
 
@@ -120,7 +108,7 @@ class LinkedCustomFieldsType extends AbstractType
      */
     private function getRootForm(FormInterface $form)
     {
-        if ($form->getParent() === null) {
+        if (null === $form->getParent()) {
             return $form;
         }
 
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
index 30198f1a2..aad28a2b2 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\Service;
 
-use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -39,14 +38,14 @@ class CustomFieldProvider implements ContainerAwareInterface
     /**
      * @var array The services indexes by the type
      */
-    private $servicesByType = [];
+    private array $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
-     * add this type)
+     * @param type $type        The type of the service (that is used in the form to
+     *                          add this type)
      */
     public function addCustomField($serviceName, $type)
     {
@@ -56,7 +55,7 @@ class CustomFieldProvider implements ContainerAwareInterface
     /**
      * Get all the custom fields known by the provider.
      *
-     * @return array Array of the known custom fields indexed by the type.
+     * @return array array of the known custom fields indexed by the type
      */
     public function getAllFields()
     {
@@ -77,8 +76,7 @@ class CustomFieldProvider implements ContainerAwareInterface
             return $this->servicesByType[$type];
         }
 
-        throw new LogicException('the custom field with type ' . $type . ' '
-                . 'is not found');
+        throw new \LogicException('the custom field with type '.$type.' is not found');
     }
 
     /**
@@ -86,10 +84,10 @@ class CustomFieldProvider implements ContainerAwareInterface
      *
      * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
      */
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         if (null === $container) {
-            throw new LogicException('container should not be null');
+            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 67afdec85..320f36544 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
@@ -22,34 +22,19 @@ use Doctrine\ORM\EntityManagerInterface;
  */
 class CustomFieldsHelper
 {
-    /**
-     * @var EntityManagerInterface The entity manager
-     */
-    private $em;
-
-    /** @var CustomFieldProvider Provider of all the declared custom
-     * fields */
-    private $provider;
-
     /**
      * Constructor.
      *
-     * @param EntityManagerInterface $em The entity manager
-     * @param CustomFieldProvider $provider The customfield provider that
-     * contains all the declared custom fields
+     * @param EntityManagerInterface $em       The entity manager
+     * @param CustomFieldProvider    $provider The customfield provider that
+     *                                         contains all the declared custom fields
      */
-    public function __construct(
-        EntityManagerInterface $em,
-        CustomFieldProvider $provider
-    ) {
-        $this->em = $em;
-        $this->provider = $provider;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly CustomFieldProvider $provider) {}
 
     public function isEmptyValue(array $fields, CustomField $customField)
     {
         $slug = $customField->getSlug();
-        $rawValue = (isset($fields[$slug])) ? $fields[$slug] : null;
+        $rawValue = $fields[$slug] ?? null;
         $customFieldType = $this->provider->getCustomFieldByType($customField->getType());
 
         $deserializedValue = $customFieldType->deserialize($rawValue, $customField);
@@ -60,18 +45,18 @@ class CustomFieldsHelper
     /**
      * 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').
+     * @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')
+     *
+     * @return The representation of the value the customField
      *
      * @throws CustomFieldsHelperException if slug is missing
-     *
-     * @return The representation of the value the customField.
      */
     public function renderCustomField(array $fields, CustomField $customField, $documentType = 'html')
     {
         $slug = $customField->getSlug();
-        $rawValue = (isset($fields[$slug])) ? $fields[$slug] : null;
+        $rawValue = $fields[$slug] ?? null;
         $customFieldType = $this->provider->getCustomFieldByType($customField->getType());
 
         return $customFieldType->render($rawValue, $customField, $documentType);
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
index f1d143c92..e442b0f0c 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\Service;
 
-use Exception;
-
-class CustomFieldsHelperException extends Exception
+class CustomFieldsHelperException extends \Exception
 {
     public static function customFieldsGroupNotFound($entity)
     {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
index ead01ee8f..6d3d889a8 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
@@ -13,9 +13,7 @@ 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 Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -24,29 +22,16 @@ use Twig\TwigFunction;
  * * chill_custom_field_widget : to render the value of the custom field,
  * * chill_custom_field_label : to render the label of the custom field,.
  */
-class CustomFieldRenderingTwig extends AbstractExtension implements ContainerAwareInterface
+class CustomFieldRenderingTwig extends AbstractExtension
 {
-    /**
-     * @var Container The container
-     */
-    private $container;
-
-    /**
-     * @var CustomFieldsHelper
-     */
-    private $customFieldsHelper;
-
     /**
      * @var array The default parameters
      */
-    private $defaultParams = [
-        'label_layout' => 'ChillCustomFieldsBundle:CustomField:render_label.html.twig',
+    private array $defaultParams = [
+        'label_layout' => '@ChillCustomFields/CustomField/render_label.html.twig',
     ];
 
-    public function __construct(CustomFieldsHelper $customFieldsHelper)
-    {
-        $this->customFieldsHelper = $customFieldsHelper;
-    }
+    public function __construct(private readonly CustomFieldsHelper $customFieldsHelper) {}
 
     /**
      * (non-PHPdoc).
@@ -56,26 +41,18 @@ class CustomFieldRenderingTwig extends AbstractExtension implements ContainerAwa
     public function getFunctions()
     {
         return [
-            new TwigFunction('chill_custom_field_widget', [
-                $this,
-                'renderWidget',
-            ], [
+            new TwigFunction('chill_custom_field_widget', $this->renderWidget(...), [
                 'is_safe' => [
                     'html',
                 ],
             ]),
-            new TwigFunction('chill_custom_field_label', [
-                $this,
-                'renderLabel',
-            ], [
+            new TwigFunction('chill_custom_field_label', $this->renderLabel(...), [
                 'is_safe' => [
                     'html',
                 ],
+                'needs_environment' => true,
             ]),
-            new TwigFunction('chill_custom_field_is_empty', [
-                $this,
-                'isEmptyValue',
-            ]),
+            new TwigFunction('chill_custom_field_is_empty', $this->isEmptyValue(...)),
         ];
     }
 
@@ -97,16 +74,15 @@ class CustomFieldRenderingTwig extends AbstractExtension implements ContainerAwa
      * 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'
+     * @param array       $params      The parameters for rendering. Currently, 'label_layout' allow to choose a different label. Default is '@ChillCustomFields/CustomField/render_label.html.twig'
      *
-     * @return string HTML representation of the custom field label.
+     * @return string HTML representation of the custom field label
      */
-    public function renderLabel(CustomField $customField, array $params = [])
+    public function renderLabel(Environment $env, CustomField $customField, array $params = [])
     {
         $resolvedParams = array_merge($this->defaultParams, $params);
 
-        return $this->container->get('templating')
-            ->render($resolvedParams['label_layout'], ['customField' => $customField]);
+        return $env->render($resolvedParams['label_layout'], ['customField' => $customField]);
     }
 
     /**
@@ -114,9 +90,9 @@ class CustomFieldRenderingTwig extends AbstractExtension implements ContainerAwa
      *
      * 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 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)
      *
      * @return string HTML representation of the custom field value, as described in the CustomFieldInterface. Is HTML safe
      */
@@ -125,14 +101,4 @@ class CustomFieldRenderingTwig extends AbstractExtension implements ContainerAwa
         return $this->customFieldsHelper
             ->renderCustomField($fields, $customField, $documentType);
     }
-
-    /**
-     * (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 1291f0849..57add2733 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
@@ -11,9 +11,7 @@ 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 Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -22,18 +20,13 @@ use Twig\TwigFunction;
  * * chill_custom_fields_group_widget : to render the value of a custom field
  * *   group.
  */
-class CustomFieldsGroupRenderingTwig extends AbstractExtension implements ContainerAwareInterface
+final class CustomFieldsGroupRenderingTwig extends AbstractExtension
 {
-    /**
-     * @var Container The container
-     */
-    private $container;
-
     /**
      * @var array The default parameters
      */
-    private $defaultParams = [
-        'layout' => 'ChillCustomFieldsBundle:CustomFieldsGroup:render.html.twig',
+    private array $defaultParams = [
+        'layout' => '@ChillCustomFields/CustomFieldsGroup/render.html.twig',
         'show_empty' => true,
     ];
 
@@ -53,13 +46,11 @@ class CustomFieldsGroupRenderingTwig extends AbstractExtension implements Contai
     public function getFunctions()
     {
         return [
-            new TwigFunction('chill_custom_fields_group_widget', [
-                $this,
-                'renderWidget',
-            ], [
+            new TwigFunction('chill_custom_fields_group_widget', $this->renderWidget(...), [
                 'is_safe' => [
                     'html',
                 ],
+                'needs_environment' => true,
             ]),
         ];
     }
@@ -77,35 +68,25 @@ class CustomFieldsGroupRenderingTwig extends AbstractExtension implements Contai
      *
      * The presentation of the value  is influenced by the document type.
      *
-     * @param array $fields The array raw, as stored in the db
+     * @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 :
-     *  - layout : allow to choose a different layout by default :
-     *             ChillCustomFieldsBundle:CustomFieldsGroup:render.html.twig
+     * @param string            $documentType     The type of the document (csv, html)
+     * @param array             $params           The parameters for rendering :
+     *                                            - layout : allow to choose a different layout by default :
+     *
+     *             @ChillCustomFields/CustomFieldsGroup/render.html.twig
      *  - show_empty : force show empty field
      *
      * @return string HTML representation of the custom field group value, as described in
-     * the CustomFieldInterface. Is HTML safe
+     *                the CustomFieldInterface. Is HTML safe
      */
-    public function renderWidget(array $fields, $customFielsGroup, $documentType = 'html', array $params = [])
+    public function renderWidget(Environment $env, array $fields, $customFielsGroup, $documentType = 'html', array $params = [])
     {
         $resolvedParams = array_merge($this->defaultParams, $params);
 
-        return $this->container->get('templating')
-            ->render($resolvedParams['layout'], [
-                'cFGroup' => $customFielsGroup,
-                'cFData' => $fields,
-                'show_empty' => $resolvedParams['show_empty'], ]);
-    }
-
-    /**
-     * (non-PHPdoc).
-     *
-     * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
-     */
-    public function setContainer(?ContainerInterface $container = null)
-    {
-        $this->container = $container;
+        return $env->render($resolvedParams['layout'], [
+            'cFGroup' => $customFielsGroup,
+            'cFData' => $fields,
+            'show_empty' => $resolvedParams['show_empty'], ]);
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
index 925c6305e..ef5936997 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * Test the option Customizables_entities.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ConfigCustomizablesEntitiesTest extends KernelTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
index d3d096a38..f844ad2d5 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldControllerTest_TODO extends WebTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
index 067fe7de6..ac2b94483 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
@@ -16,10 +16,14 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsGroupControllerTest extends WebTestCase
 {
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testCompleteScenario()
     {
         self::bootKernel(['environment' => 'test_customizable_entities_test_not_empty_config']);
@@ -29,7 +33,7 @@ final class CustomFieldsGroupControllerTest extends WebTestCase
             'PHP_AUTH_PW' => 'olala',
         ]);
 
-        //create the entity
+        // create the entity
         $this->createCustomFieldsGroup($client);
 
         // Edit the entity
@@ -52,7 +56,7 @@ final class CustomFieldsGroupControllerTest extends WebTestCase
         // Fill in the form and submit it
         $form = $crawler->selectButton('Créer')->form([
             'custom_fields_group[name][fr]' => 'Test',
-            'custom_fields_group[entity]' => 'Chill\PersonBundle\Entity\Person',
+            'custom_fields_group[entity]' => \Chill\PersonBundle\Entity\Person::class,
         ]);
 
         $crawler = $client->submit($form);
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
index 35a9ee82b..6c6e424da 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
@@ -33,13 +33,13 @@ trait CustomFieldTestHelper
     {
         $kernel = static::$kernel;
 
-        //check a kernel is accessible
-        $customFieldsGroup = $this->createMock('Chill\CustomFieldsBundle\Entity\CustomFieldsGroup');
+        // check a kernel is accessible
+        $customFieldsGroup = $this->createMock(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class);
         $customFieldsGroup->expects($this->once())
             ->method('getActiveCustomFields')
             ->will($this->returnValue([$field]));
 
-        $request = $this->createMock('Symfony\Component\HttpFoundation\Request');
+        $request = $this->createMock(\Symfony\Component\HttpFoundation\Request::class);
         $request->expects($this->any())
             ->method('getLocale')
             ->will($this->returnValue($locale));
@@ -55,7 +55,7 @@ trait CustomFieldTestHelper
             ->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
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
index 5b905cb4d..35d9ca3a3 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
@@ -23,6 +23,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * - deserialize
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsChoiceTest extends KernelTestCase
@@ -32,10 +33,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      */
     private $cfChoice;
 
-    /**
-     * @var \Chill\CustomFieldsBundle\Service\CustomFieldProvider
-     */
-    private $cfProvider;
+    private ?object $cfProvider = null;
 
     protected function setUp(): void
     {
@@ -132,6 +130,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      * This test does not covers the case when the selected value is `_other`
      *
      * @param type $data
+     *
      * @dataProvider serializedRepresentationDataProvider
      */
     public function testDeserializeMultipleChoiceWithOther($data)
@@ -217,6 +216,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      * **without** an "allow_other" field.
      *
      * @param type $data
+     *
      * @dataProvider serializedRepresentationDataProvider
      */
     public function testDeserializeMultipleChoiceWithoutOther($data)
@@ -264,7 +264,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $deserialized = $this->cfChoice->deserialize($data, $customField);
         $this->assertSame([null], $deserialized);
 
-        //from single
+        // from single
         $data = ['_other' => null, '_choices' => null];
         $deserialized = $this->cfChoice->deserialize($data, $customField);
         $this->assertSame([null], $deserialized);
@@ -277,6 +277,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      * If the value is in _other, the _other value should be in the _other field.
      *
      * @param type $data
+     *
      * @dataProvider serializedRepresentationDataProvider
      */
     public function testDeserializeSingleChoiceWithOther($data)
@@ -314,8 +315,8 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $deserialized = $this->cfChoice->deserialize($data, $customField);
         $this->assertSame(['_other' => 'something', '_choices' => '_other'], $deserialized);
 
-        //test with null data
-        //from a single to a single :
+        // 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);
@@ -343,11 +344,11 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $this->assertSame(['_other' => '', '_choices' => null], $deserialized);
     }
 
-    /////////////////////////////////////////
+    // ///////////////////////////////////////
     //
     // test function deserialize
     //
-    ////////////////////////////////////////
+    // //////////////////////////////////////
 
     /**
      * Test if the representation of the data is deserialized to a single text.
@@ -355,6 +356,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      * If the value is in _other, the _other value should not be returned.
      *
      * @param type $data
+     *
      * @dataProvider serializedRepresentationDataProvider
      */
     public function testDeserializeSingleChoiceWithoutOther($data)
@@ -400,7 +402,7 @@ final class CustomFieldsChoiceTest extends KernelTestCase
      *
      * @param mixed $data deserialized data
      */
-    public function testIsEmptyValueEmpty($data)
+    public function testIsEmptyValueEmpty(mixed $data)
     {
         $customField = $this->generateCustomField([
             CustomFieldChoice::ALLOW_OTHER => false,
@@ -412,19 +414,17 @@ final class CustomFieldsChoiceTest extends KernelTestCase
         $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)
+    public function testIsEmptyValueNotEmpty(mixed $data)
     {
         $customField = $this->generateCustomField([
             CustomFieldChoice::ALLOW_OTHER => false,
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
index 6fb81af49..235631e24 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
@@ -11,23 +11,19 @@ declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\Tests\CustomFields;
 
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber;
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Symfony\Component\Form\FormBuilderInterface;
-use function count;
 
 /**
  * Test CustomFieldsNumber.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
 {
-    /**
-     * @var CustomFieldNumber
-     */
-    private $customFieldNumber;
+    private ?object $customFieldNumber = null;
 
     /**
      * @var FormBuilderInterface
@@ -73,7 +69,7 @@ final class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\
 
         $this->assertTrue($form->isSynchronized());
         $this->assertFalse($form->isValid());
-        $this->assertEquals(1, count($form['default']->getErrors()));
+        $this->assertEquals(1, \count($form['default']->getErrors()));
     }
 
     public function testCreateInvalidFormValueLowerThanMinimum()
@@ -93,7 +89,7 @@ final class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\
 
         $this->assertTrue($form->isSynchronized());
         $this->assertFalse($form->isValid());
-        $this->assertEquals(1, count($form['default']->getErrors()));
+        $this->assertEquals(1, \count($form['default']->getErrors()));
     }
 
     public function testCreateValidForm()
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
index cc1b4db64..87722c1bd 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
@@ -18,16 +18,14 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsTextTest extends WebTestCase
 {
     use CustomFieldTestHelper;
 
-    /**
-     * @var \Chill\CustomFieldsBundle\Service\CustomFieldProvider
-     */
-    private $customFieldProvider;
+    private ?object $customFieldProvider = null;
 
     protected function setUp(): void
     {
@@ -41,11 +39,11 @@ final class CustomFieldsTextTest extends WebTestCase
         $customField = $this->customFieldProvider->getCustomFieldByType('text');
 
         $this->assertInstanceOf(
-            'Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface',
+            \Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface::class,
             $customField
         );
         $this->assertInstanceOf(
-            'Chill\CustomFieldsBundle\CustomFields\CustomFieldText',
+            \Chill\CustomFieldsBundle\CustomFields\CustomFieldText::class,
             $customField
         );
     }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
index 087b232ee..d6327829a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\Extension\Core\Type\IntegerType;
  * Test the post-text extension.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PostTextIntegerExtensionTest extends KernelTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
index 2d04c8bc4..4a905ae1b 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\Extension\Core\Type\NumberType;
  * Test the post-text extension.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PostTextNumberExtensionTest extends KernelTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
index b72a3138d..0ef952f59 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\HttpFoundation\Response;
  * Test that routes are correctly loaded.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class RoutingLoaderTest extends WebTestCase
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
index 186c8ce67..310e64b62 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
@@ -12,26 +12,20 @@ declare(strict_types=1);
 namespace Chill\CustomFields\Tests\Service;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * Tests for custom fields helper.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsHelperTest extends KernelTestCase
 {
-    /**
-     * @var CustomFieldsHelper
-     */
-    private $cfHelper;
+    private ?object $cfHelper = null;
 
-    /**
-     * @var CustomField
-     */
-    private $randomCFText;
+    private \Chill\CustomFieldsBundle\Entity\CustomField $randomCFText;
 
     protected function setUp(): void
     {
@@ -58,7 +52,7 @@ final class CustomFieldsHelperTest extends KernelTestCase
 
         $this->assertFalse($this->cfHelper->isEmptyValue($data, $this->randomCFText));
 
-        //empty value
+        // empty value
         $data = [
             $this->randomCFText->getSlug() => '',
         ];
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
index 420e79dff..04376b84a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
@@ -12,27 +12,20 @@ declare(strict_types=1);
 namespace Chill\CustomFields\Tests\Templating\Twig;
 
 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.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldRenderingTwigTest extends KernelTestCase
 {
-    /**
-     * @var CustomFieldProvider
-     */
-    private $cfProvider;
+    private ?object $cfProvider = null;
 
-    /**
-     * @var CustomFieldRenderingTwig
-     */
-    private $cfRendering;
+    private ?object $cfRendering = null;
 
     protected function setUp(): void
     {
@@ -46,7 +39,7 @@ final class CustomFieldRenderingTwigTest extends KernelTestCase
         // set locale to fr
         $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
-        $request->willExtend('Symfony\Component\HttpFoundation\Request');
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
         self::$kernel->getContainer()->get('request_stack')
             ->push($request->reveal());
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
index 7ffa31db5..07da58cbc 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
@@ -13,8 +13,6 @@ namespace Chill\CustomFields\Tests\Templating\Twig;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
-use Chill\CustomFieldsBundle\Templating\Twig\CustomFieldsGroupRenderingTwig;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
@@ -22,19 +20,14 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * the `chill_custom_fields_group_widget`.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CustomFieldsGroupRenderingTwigTest extends KernelTestCase
 {
-    /**
-     * @var CustomFieldProvider
-     */
-    private $cfProvider;
+    private ?object $cfProvider = null;
 
-    /**
-     * @var CustomFieldsGroupRenderingTwig
-     */
-    private $cfRendering;
+    private ?object $cfRendering = null;
 
     protected function setUp(): void
     {
@@ -48,7 +41,7 @@ final class CustomFieldsGroupRenderingTwigTest extends KernelTestCase
         // set locale to fr
         $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
-        $request->willExtend('Symfony\Component\HttpFoundation\Request');
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
         self::$kernel->getContainer()->get('request_stack')
             ->push($request->reveal());
@@ -99,12 +92,9 @@ final class CustomFieldsGroupRenderingTwigTest extends KernelTestCase
     }
 
     /**
-     * @param mixed $slug
-     * @param mixed $name
-     *
      * @return CustomField
      */
-    private function getSimpleCustomFieldText($slug, $name)
+    private function getSimpleCustomFieldText(mixed $slug, mixed $name)
     {
         return (new CustomField())
             ->setSlug($slug)
diff --git a/src/Bundle/ChillCustomFieldsBundle/config/routes.yaml b/src/Bundle/ChillCustomFieldsBundle/config/routes.yaml
index 687518af4..018c8122f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/config/routes.yaml
+++ b/src/Bundle/ChillCustomFieldsBundle/config/routes.yaml
@@ -1,7 +1,3 @@
-chill_customfields_customfieldsgroup:
-    resource: "@ChillCustomFieldsBundle/config/routes/customfieldsgroup.yaml"
-    prefix:   /
-
-chill_customfields_customfield:
-    resource: "@ChillCustomFieldsBundle/config/routes/customfield.yaml"
-    prefix:   /
+chill_customfields_controller:
+    resource: "./../Controller"
+    type: annotation
diff --git a/src/Bundle/ChillCustomFieldsBundle/config/routes/customfield.yaml b/src/Bundle/ChillCustomFieldsBundle/config/routes/customfield.yaml
deleted file mode 100644
index a000b2a3a..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/config/routes/customfield.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-customfield_section:
-    path:     /{_locale}/admin/customfield/
-    defaults: { _controller: "ChillCustomFieldsBundle:Admin:index" }
-
-customfield_new:
-    path:     /{_locale}/admin/customfield/new
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomField:new" }
-
-customfield_create:
-    path:     /{_locale}/admin/customfield/create
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomField:create" }
-    methods:  [POST]
-
-customfield_edit:
-    path:     /{_locale}/admin/customfield/{id}/edit
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomField:edit" }
-
-customfield_update:
-    path:     /{_locale}/admin/customfield/{id}/update
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomField:update" }
-    methods:  [POST, PUT]
diff --git a/src/Bundle/ChillCustomFieldsBundle/config/routes/customfieldsgroup.yaml b/src/Bundle/ChillCustomFieldsBundle/config/routes/customfieldsgroup.yaml
deleted file mode 100644
index 9c34f8d44..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/config/routes/customfieldsgroup.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-customfieldsgroup:
-    path:     /{_locale}/admin/customfieldsgroup/
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomFieldsGroup:index" }
-
-customfieldsgroup_show:
-    path:     /{_locale}/admin/customfieldsgroup/{id}/show
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomFieldsGroup:show" }
-
-customfieldsgroup_makedefault:
-    path:     /{_locale}/admin/customfieldsgroup/make_default
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomFieldsGroup:makeDefault" }
-
-customfieldsgroup_new:
-    path:     /{_locale}/admin/customfieldsgroup/new
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomFieldsGroup:new" }
-
-customfieldsgroup_create:
-    path:     /{_locale}/admin/customfieldsgroup/create
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomFieldsGroup:create" }
-    methods:  POST
-
-customfieldsgroup_edit:
-    path:     /{_locale}/admin/customfieldsgroup/{id}/edit
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomFieldsGroup:edit" }
-
-customfieldsgroup_update:
-    path:     /{_locale}/admin/customfieldsgroup/{id}/update
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomFieldsGroup:update" }
-    methods:  [POST, PUT]
-
-customfieldsgroup_delete:
-    path:     /{_locale}/admin/customfieldsgroup/{id}/delete
-    defaults: { _controller: "ChillCustomFieldsBundle:CustomFieldsGroup:delete" }
-    methods:  [POST, DELETE]
diff --git a/src/Bundle/ChillCustomFieldsBundle/config/services.yaml b/src/Bundle/ChillCustomFieldsBundle/config/services.yaml
index e1822e2cb..d27323a0a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/config/services.yaml
+++ b/src/Bundle/ChillCustomFieldsBundle/config/services.yaml
@@ -35,23 +35,20 @@ services:
         tags:
             - { name: 'form.type', alias: 'custom_field' }
 
-    chill.custom_field.text:
-        class: Chill\CustomFieldsBundle\CustomFields\CustomFieldText
-        arguments:
-            - "@request_stack"
-            - "@templating"
-            - "@chill.main.helper.translatable_string"
+    Chill\CustomFieldsBundle\CustomFields\CustomFieldText:
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: 'chill.custom_field', type: 'text' }
+    chill.custom_field.text: '@Chill\CustomFieldsBundle\CustomFields\CustomFieldText'
 
     chill.custom_field.number:
         class: Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber
-        arguments:
-            - "@templating"
-            - "@chill.main.helper.translatable_string"
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: 'chill.custom_field', type: 'number' }
-            
+
     chill.form_extension.post_text_integer:
         class: Chill\CustomFieldsBundle\Form\Extension\PostTextIntegerExtension
         tags:
@@ -62,14 +59,12 @@ services:
         tags:
             - { name: form.type_extension, extended_type: Symfony\Component\Form\Extension\Core\Type\NumberType }
 
-    chill.custom_field.choice:
-        class: Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice
-        arguments:
-            - "@translator.default"
-            - "@templating"
-            - "@chill.main.helper.translatable_string"
+    Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice:
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: 'chill.custom_field', type: 'choice' }
+    chill.custom_field.choice: '@Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice'
 
     chill.custom_field.custom_fields_group_linked_custom_fields:
         class: Chill\CustomFieldsBundle\Form\Type\LinkedCustomFieldsType
@@ -85,18 +80,15 @@ services:
 
     chill.custom_field.title:
         class: Chill\CustomFieldsBundle\CustomFields\CustomFieldTitle
-        arguments:
-            - "@request_stack"
-            - "@templating"
-            - "@chill.main.helper.translatable_string"
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: 'chill.custom_field', type: 'title' }
-            
+
     chill.custom_field.date:
         class: Chill\CustomFieldsBundle\CustomFields\CustomFieldDate
-        arguments:
-            - "@templating"
-            - "@chill.main.helper.translatable_string"
+        autoconfigure: true
+        autowire: true
         tags:
             - { name: 'chill.custom_field', type: 'date' }
 
@@ -110,15 +102,11 @@ services:
         class: Chill\CustomFieldsBundle\Templating\Twig\CustomFieldRenderingTwig
         arguments:
             - "@chill.custom_field.helper"
-        calls:
-            - [setContainer, ["@service_container"]]
         tags:
             - { name: twig.extension }
 
     chill.custom_field.twig.custom_fields_group_rendering:
         class: Chill\CustomFieldsBundle\Templating\Twig\CustomFieldsGroupRenderingTwig
-        calls:
-            - [setContainer, ["@service_container"]]
         arguments:
             - "%chill_custom_fields.show_empty_values%"
         tags:
@@ -126,10 +114,11 @@ services:
 
     chill.custom_field.custom_field_long_choice:
         class: Chill\CustomFieldsBundle\CustomFields\CustomFieldLongChoice
+        autowire: true
+        autoconfigure: true
         arguments:
             - "@chill.custom_field.custom_field_long_choice_option_repository"
             - "@chill.main.helper.translatable_string"
-            - "@templating"
         tags:
             - { name: 'chill.custom_field', type: 'long_choice' }
 
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
index cd14e83de..c8804c378 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
@@ -22,7 +22,7 @@ class Version20151210155904 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE CustomField DROP required');
     }
@@ -30,7 +30,7 @@ class Version20151210155904 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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 d06a8af07..1f3211aa3 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
@@ -22,7 +22,7 @@ class Version20151210205610 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -31,19 +31,19 @@ class Version20151210205610 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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, '
-                . 'parent_id INT DEFAULT NULL, '
-                . 'key VARCHAR(15) NOT NULL, '
-                . 'text jsonb NOT NULL, '
-                . 'active boolean NOT NULL,'
-                . 'internal_key VARCHAR(50) NOT NULL DEFAULT \'\', '
-                . 'PRIMARY KEY(id))');
+                .'parent_id INT DEFAULT NULL, '
+                .'key VARCHAR(15) NOT NULL, '
+                .'text jsonb NOT NULL, '
+                .'active boolean NOT NULL,'
+                .'internal_key VARCHAR(50) NOT NULL DEFAULT \'\', '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_14BBB8E0727ACA70 ON custom_field_long_choice_options (parent_id)');
         $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');
+                .'FOREIGN KEY (parent_id) REFERENCES custom_field_long_choice_options (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
index 11fb58028..afcf6fab1 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
@@ -14,17 +14,12 @@ namespace Chill\DocGeneratorBundle\Context;
 use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 
-final class ContextManager implements ContextManagerInterface
+final readonly class ContextManager implements ContextManagerInterface
 {
     /**
-     * @var DocGeneratorContextInterface[]|iterable
+     * @param \Chill\DocGeneratorBundle\Context\DocGeneratorContextInterface[] $contexts
      */
-    private iterable $contexts;
-
-    public function __construct(iterable $contexts)
-    {
-        $this->contexts = $contexts;
-    }
+    public function __construct(private iterable $contexts) {}
 
     public function getContextByDocGeneratorTemplate(DocGeneratorTemplate $docGeneratorTemplate): DocGeneratorContextInterface
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php
index 488906457..68fb598d8 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php
@@ -17,12 +17,12 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 interface ContextManagerInterface
 {
     /**
-     * @throws ContextNotFoundException When the context is not found.
+     * @throws ContextNotFoundException when the context is not found
      */
     public function getContextByDocGeneratorTemplate(DocGeneratorTemplate $docGeneratorTemplate): DocGeneratorContextInterface;
 
     /**
-     * @throws ContextNotFoundException When the context is not found.
+     * @throws ContextNotFoundException when the context is not found
      */
     public function getContextByKey(string $searchedKey): DocGeneratorContextInterface;
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
index 732d4b796..998375d5d 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
@@ -15,6 +15,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * @template T of object
+ *
  * @extends DocGeneratorContextInterface<T>
  */
 interface DocGeneratorContextWithAdminFormInterface extends DocGeneratorContextInterface
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
index 496524206..e69337993 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
@@ -16,6 +16,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * @template T of object
+ *
  * @extends DocGeneratorContextInterface<T>
  */
 interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContextInterface
@@ -28,7 +29,7 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, mixed $entity): void;
 
     /**
-     * Fill the form with initial data
+     * Fill the form with initial data.
      *
      * @param T $entity
      */
@@ -42,14 +43,14 @@ interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContext
     public function hasPublicForm(DocGeneratorTemplate $template, mixed $entity): bool;
 
     /**
-     * Transform the data from the form into serializable data, storable into messenger's message
+     * Transform the data from the form into serializable data, storable into messenger's message.
      *
      * @param T $entity
      */
     public function contextGenerationDataNormalize(DocGeneratorTemplate $template, mixed $entity, array $data): array;
 
     /**
-     * Reverse the data from the messenger's message into data usable for doc's generation
+     * Reverse the data from the messenger's message into data usable for doc's generation.
      *
      * @param T $entity
      */
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
index c1e5cabe8..66912787f 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Context\Exception;
 
-use RuntimeException;
-
-class ContextNotFoundException extends RuntimeException
+class ContextNotFoundException extends \RuntimeException
 {
     public function __construct($contextName)
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
index 53d498eb9..210e1a3ee 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
@@ -11,16 +11,10 @@ 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
+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)));
+        parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, get_debug_type($value)));
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
index c365b5e06..ecb896080 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
@@ -22,12 +22,7 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class AdminDocGeneratorTemplateController extends CRUDController
 {
-    private ContextManager $contextManager;
-
-    public function __construct(ContextManager $contextManager)
-    {
-        $this->contextManager = $contextManager;
-    }
+    public function __construct(private readonly ContextManager $contextManager) {}
 
     public function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = [])
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index ef2d2d585..c9e1873b2 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -15,16 +15,13 @@ 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\Repository\DocGeneratorTemplateRepository;
 use Chill\DocGeneratorBundle\Service\Generator\GeneratorInterface;
 use Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage;
 use Chill\DocStoreBundle\Entity\StoredObject;
-use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Doctrine\ORM\EntityManagerInterface;
-use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
@@ -37,39 +34,10 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
-use function strlen;
-use const JSON_PRETTY_PRINT;
 
 final class DocGeneratorTemplateController extends AbstractController
 {
-    private ContextManager $contextManager;
-
-    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
-
-    private EntityManagerInterface $entityManager;
-
-    private GeneratorInterface $generator;
-
-    private MessageBusInterface $messageBus;
-
-    private PaginatorFactory $paginatorFactory;
-
-    public function __construct(
-        ContextManager $contextManager,
-        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        GeneratorInterface $generator,
-        MessageBusInterface $messageBus,
-        PaginatorFactory $paginatorFactory,
-        EntityManagerInterface $entityManager
-    ) {
-        $this->contextManager = $contextManager;
-        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->generator = $generator;
-        $this->messageBus = $messageBus;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->entityManager = $entityManager;
-    }
+    public function __construct(private readonly ContextManager $contextManager, private readonly DocGeneratorTemplateRepository $docGeneratorTemplateRepository, private readonly GeneratorInterface $generator, private readonly MessageBusInterface $messageBus, private readonly PaginatorFactory $paginatorFactory, private readonly EntityManagerInterface $entityManager) {}
 
     /**
      * @Route(
@@ -181,10 +149,7 @@ final class DocGeneratorTemplateController extends AbstractController
         try {
             $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
         } catch (ContextNotFoundException $e) {
-            throw new NotFoundHttpException(
-                'Context not found.',
-                $e
-            );
+            throw new NotFoundHttpException('Context not found.', $e);
         }
 
         $entity = $this
@@ -193,9 +158,7 @@ final class DocGeneratorTemplateController extends AbstractController
             ->find($entityId);
 
         if (null === $entity) {
-            throw new NotFoundHttpException(
-                sprintf('Entity with classname %s and id %s is not found', $context->getEntityClass(), $entityId)
-            );
+            throw new NotFoundHttpException(sprintf('Entity with classname %s and id %s is not found', $context->getEntityClass(), $entityId));
         }
 
         $contextGenerationData = [
@@ -256,7 +219,7 @@ final class DocGeneratorTemplateController extends AbstractController
         // if is test, render the data or generate the doc
         if ($isTest && isset($form) && $form['show_data']->getData()) {
             return $this->render('@ChillDocGenerator/Generator/debug_value.html.twig', [
-                'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), JSON_PRETTY_PRINT),
+                'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), \JSON_PRETTY_PRINT),
             ]);
         }
         if ($isTest) {
@@ -276,7 +239,7 @@ final class DocGeneratorTemplateController extends AbstractController
                     'Content-Transfer-Encoding', 'binary',
                     'Content-Type' => 'application/vnd.oasis.opendocument.text',
                     'Content-Disposition' => 'attachment; filename="generated.odt"',
-                    'Content-Length' => strlen($generated),
+                    'Content-Length' => \strlen($generated),
                 ],
             );
         }
diff --git a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
index a52381f36..97d436c5e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
@@ -15,7 +15,6 @@ 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;
 
@@ -55,13 +54,11 @@ class LoadDocGeneratorTemplate extends AbstractFixture
         ];
 
         foreach ($templates as $template) {
-            echo '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))
-                ->setCreatedAt(new DateTime('today'))
+                ->setCreatedAt(new \DateTime('today'))
                 ->setType($template['file']['type']);
 
             $manager->persist($newStoredObj);
diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
index 9edca1675..e3f45a7fd 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
@@ -30,7 +30,7 @@ class ChillDocGeneratorExtension extends Extension implements PrependExtensionIn
         $config = $this->processConfiguration($configuration, $configs);
         $container->setParameter('chill_doc_generator', $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/controller.yaml');
         $loader->load('services/fixtures.yaml');
diff --git a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
index a2f67fc39..2438e66d9 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
@@ -17,7 +17,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_docgen_template")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "docgen_template": DocGeneratorTemplate::class
  * })
@@ -41,6 +43,7 @@ class DocGeneratorTemplate
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?string $description = null;
@@ -59,14 +62,18 @@ class DocGeneratorTemplate
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read"})
      */
     private int $id;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
index b5bd10d16..1b87ef926 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
@@ -24,12 +24,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class DocGeneratorTemplateType extends AbstractType
 {
-    private ContextManager $contextManager;
-
-    public function __construct(ContextManager $contextManager)
-    {
-        $this->contextManager = $contextManager;
-    }
+    public function __construct(private readonly ContextManager $contextManager) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -61,12 +56,8 @@ class DocGeneratorTemplateType extends AbstractType
             $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);
-                    }
+                    static fn (array $data) => $context->adminFormTransform($data),
+                    static fn (array $data) => $context->adminFormReverseTransform($data)
                 ));
             $context->buildAdminForm($sub);
             $builder->add($sub);
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
index 4d802d2ca..a408ec8e6 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
@@ -13,5 +13,5 @@ namespace Chill\DocGeneratorBundle\GeneratorDriver;
 
 interface DriverInterface
 {
-    public function generateFromString(string $template, string $resourceType, array $data, ?string $templateName = null): string;
+    public function generateFromString(string $template, string $resourceType, array $data, string $templateName = null): string;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
index b6a70372b..9fa6f6654 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
@@ -11,21 +11,15 @@ 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
+class TemplateException extends \RuntimeException
 {
-    private array $errors;
-
-    public function __construct(array $errors, $code = 0, ?Throwable $previous = null)
+    public function __construct(private readonly array $errors, $code = 0, \Throwable $previous = null)
     {
         parent::__construct('Error while generating document from template', $code, $previous);
-        $this->errors = $errors;
     }
 
     public function getErrors(): array
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
index 0f62931b4..547af44c9 100644
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
@@ -20,31 +20,24 @@ use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Throwable;
 
 final class RelatorioDriver implements DriverInterface
 {
-    private HttpClientInterface $client;
-
-    private LoggerInterface $logger;
-
-    private string $url;
+    private readonly string $url;
 
     public function __construct(
-        HttpClientInterface $client,
+        private readonly HttpClientInterface $client,
         ParameterBagInterface $parameterBag,
-        LoggerInterface $logger
+        private readonly LoggerInterface $logger
     ) {
-        $this->client = $client;
-        $this->logger = $logger;
         $this->url = $parameterBag->get('chill_doc_generator')['driver']['relatorio']['url'];
     }
 
-    public function generateFromString(string $template, string $resourceType, array $data, ?string $templateName = null): string
+    public function generateFromString(string $template, string $resourceType, array $data, string $templateName = null): string
     {
         $form = new FormDataPart(
             [
-                'variables' => json_encode($data),
+                'variables' => json_encode($data, JSON_THROW_ON_ERROR),
                 'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType),
             ]
         );
@@ -61,7 +54,7 @@ final class RelatorioDriver implements DriverInterface
             $content = $e->getResponse()->getContent(false);
 
             if (400 === $e->getResponse()->getStatusCode()) {
-                $content = json_decode($content, true);
+                $content = json_decode($content, true, 512, JSON_THROW_ON_ERROR);
                 $this->logger->error('relatorio: template error', [
                     'error' => $content['message'] ?? '_not defined',
                 ]);
@@ -90,7 +83,7 @@ final class RelatorioDriver implements DriverInterface
             ]);
 
             throw $e;
-        } catch (Throwable $exception) {
+        } catch (\Throwable $exception) {
             $this
                 ->logger
                 ->error(
diff --git a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
index b325e6e12..8796b8e39 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
@@ -18,15 +18,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 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 __construct(private readonly TranslatorInterface $translator, private readonly Security $security) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
index c00dc7474..85486c2ce 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
@@ -19,14 +19,11 @@ use Symfony\Component\HttpFoundation\RequestStack;
 
 final class DocGeneratorTemplateRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
-    private RequestStack $requestStack;
-
-    public function __construct(EntityManagerInterface $entityManager, RequestStack $requestStack)
+    public function __construct(EntityManagerInterface $entityManager, private readonly RequestStack $requestStack)
     {
         $this->repository = $entityManager->getRepository(DocGeneratorTemplate::class);
-        $this->requestStack = $requestStack;
     }
 
     public function countByEntity(string $entity): int
@@ -61,7 +58,7 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
      *
      * @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);
     }
@@ -88,7 +85,7 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?DocGeneratorTemplate
+    public function findOneBy(array $criteria, array $orderBy = null): ?DocGeneratorTemplate
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig
index 35fa6e319..42d7d7a12 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title 'docgen.Generate a document'|trans %}
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
index 51527bbef..bcf73abd0 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
@@ -12,10 +12,7 @@ declare(strict_types=1);
 namespace Chill\DocGeneratorBundle\Serializer\Encoder;
 
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
-
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-use function array_keys;
-use function is_array;
 
 class DocGenEncoder implements EncoderInterface
 {
@@ -38,21 +35,21 @@ class DocGenEncoder implements EncoderInterface
 
     private function canonicalizeKey(string $path, string $key): string
     {
-        return '' === $path ? $key : $path . '_' . $key;
+        return '' === $path ? $key : $path.'_'.$key;
     }
 
     private function isAssociative(array $data)
     {
-        $keys = array_keys($data);
+        $keys = \array_keys($data);
 
-        return array_keys($keys) !== $keys;
+        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)) {
+                if (\is_array($value)) {
                     $this->recusiveEncoding($value, $result, $this->canonicalizeKey($path, $key));
                 } else {
                     $result[$this->canonicalizeKey($path, $key)] = $value;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
index 49e0d4c3f..4614c7850 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
@@ -14,25 +14,11 @@ namespace Chill\DocGeneratorBundle\Serializer\Helper;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-use function array_merge;
-use function is_array;
-
 class NormalizeNullValueHelper
 {
-    private ?string $discriminatorType = null;
+    public function __construct(private readonly NormalizerInterface $normalizer, private readonly ?string $discriminatorType = null, private readonly ?string $discriminatorValue = 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 = [], ?ClassMetadata $classMetadata = null)
+    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [], ClassMetadata $classMetadata = null)
     {
         $data = [];
         $data['isNull'] = true;
@@ -45,27 +31,13 @@ class NormalizeNullValueHelper
             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(
-                            $this->getContextForAttribute($key, $context, $classMetadata),
-                            ['docgen:expects' => $class]
-                        ));
-
-                        break;
-                }
+                $data[$key] = match ($class) {
+                    'array', 'bool', 'double', 'float', 'int', 'resource', 'string', 'null' => '',
+                    default => $this->normalizer->normalize(null, $format, \array_merge(
+                        $this->getContextForAttribute($key, $context, $classMetadata),
+                        ['docgen:expects' => $class]
+                    )),
+                };
             }
         }
 
@@ -82,10 +54,10 @@ class NormalizeNullValueHelper
 
         if (null !== $attributeMetadata) {
             /** @var \Symfony\Component\Serializer\Mapping\AttributeMetadata $attributeMetadata */
-            $initialContext = array_merge(
+            $initialContext = \array_merge(
                 $initialContext,
                 $attributeMetadata->getNormalizationContextForGroups(
-                    is_array($initialContext['groups']) ? $initialContext['groups'] : [$initialContext['groups']]
+                    \is_array($initialContext['groups']) ? $initialContext['groups'] : [$initialContext['groups']]
                 )
             );
         }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
index 196018a03..55c53c1d9 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
@@ -11,8 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Serializer\Normalizer;
 
-use ArrayObject;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ReadableCollection;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -25,10 +25,10 @@ class CollectionDocGenNormalizer implements ContextAwareNormalizerInterface, Nor
     use NormalizerAwareTrait;
 
     /**
-     * @param Collection $object
+     * @param Collection  $object
      * @param string|null $format
      *
-     * @return array|ArrayObject|bool|float|int|string|void|null
+     * @return array|\ArrayObject|bool|float|int|string|void|null
      */
     public function normalize($object, $format = null, array $context = [])
     {
@@ -51,7 +51,9 @@ class CollectionDocGenNormalizer implements ContextAwareNormalizerInterface, Nor
             return false;
         }
 
-        return $data instanceof Collection
-            || (null === $data && Collection::class === ($context['docgen:expects'] ?? null));
+        return $data instanceof ReadableCollection
+            || (null === $data && Collection::class === ($context['docgen:expects'] ?? null))
+            || (null === $data && ReadableCollection::class === ($context['docgen:expects'] ?? null))
+        ;
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
index 3807ee9ee..a748c4e22 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
@@ -13,8 +13,7 @@ namespace Chill\DocGeneratorBundle\Serializer\Normalizer;
 
 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use ReflectionClass;
-use RuntimeException;
+use Doctrine\Common\Collections\ReadableCollection;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
@@ -27,32 +26,17 @@ 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;
+    private readonly PropertyAccessor $propertyAccess;
 
     public function __construct(
-        ClassMetadataFactoryInterface $classMetadataFactory,
-        TranslatableStringHelperInterface $translatableStringHelper
+        private readonly ClassMetadataFactoryInterface $classMetadataFactory,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
     ) {
-        $this->classMetadataFactory = $classMetadataFactory;
         $this->propertyAccess = PropertyAccess::createPropertyAccessor();
-        $this->translatableStringHelper = $translatableStringHelper;
     }
 
     public function normalize($object, $format = null, array $context = [])
@@ -60,27 +44,22 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
         $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');
+            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'] ?? []))
-            ));
+            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) ? $object::class : '(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]]
+        $expectedGroups = \array_key_exists(AbstractNormalizer::GROUPS, $context) ?
+            \is_array($context[AbstractNormalizer::GROUPS]) ? $context[AbstractNormalizer::GROUPS] : [$context[AbstractNormalizer::GROUPS]]
             : [];
-        $attributes = array_filter(
+        $attributes = \array_filter(
             $metadata->getAttributesMetadata(),
             static function (AttributeMetadata $a) use ($expectedGroups) {
                 foreach ($a->getGroups() as $g) {
-                    if (in_array($g, $expectedGroups, true)) {
+                    if (\in_array($g, $expectedGroups, true)) {
                         return true;
                     }
                 }
@@ -98,10 +77,10 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
 
     public function supportsNormalization($data, $format = null): bool
     {
-        return 'docgen' === $format && (is_object($data) || null === $data);
+        return 'docgen' === $format && (\is_object($data) || null === $data);
     }
 
-    private function getExpectedType(AttributeMetadata $attribute, ReflectionClass $reflection): string
+    private function getExpectedType(AttributeMetadata $attribute, \ReflectionClass $reflection): string
     {
         $type = null;
 
@@ -109,57 +88,55 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
             // 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()
-                    ));
+                    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()))) {
+            } 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()
-                    ));
+                    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()))) {
+            } 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()
-                    ));
+                    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()
-                    ));
+                    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);
+        } 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()
-            ));
+        if ($type instanceof \ReflectionNamedType) {
+            return $type->getName();
+        }
+        if ($type instanceof \ReflectionIntersectionType) {
+            foreach (array_map(fn (\ReflectionNamedType $t) => $t->getName(), $type->getTypes()) as $classString) {
+                if (ReadableCollection::class === $classString) {
+                    return ReadableCollection::class;
+                }
+
+                $class = new \ReflectionClass($classString);
+
+                if ($class->implementsInterface(ReadableCollection::class)) {
+                    return ReadableCollection::class;
+                }
+            }
+
+            throw new \LogicException(sprintf('The automatic normalization of intersection types is not supported, unless a %s is contained in the intersected types', ReadableCollection::class));
+        } elseif (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();
+        throw new \LogicException(sprintf('The automatic normalization of %s is not supported', $type::class));
     }
 
     /**
@@ -199,16 +176,13 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
         return $normalizer->normalize($keys, $format, $context, $metadata);
     }
 
-    /**
-     * @param mixed $format
-     */
-    private function normalizeNullOutputValue($format, array $context, AttributeMetadata $attribute, ReflectionClass $reflection)
+    private function normalizeNullOutputValue(mixed $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)) {
+                if (\in_array('is-translatable', $attribute->getNormalizationContextForGroups(['docgen:read']), true)) {
                     return '';
                 }
 
@@ -228,7 +202,7 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
                 return $this->normalizer->normalize(
                     null,
                     $format,
-                    array_merge(
+                    \array_merge(
                         $context,
                         ['docgen:expects' => $type]
                     )
@@ -237,13 +211,11 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
     }
 
     /**
-     * @param $object
-     * @param $format
      * @param array|AttributeMetadata[] $attributes
      *
-     * @throws ExceptionInterface
-     *
      * @return array
+     *
+     * @throws ExceptionInterface
      */
     private function normalizeObject($object, $format, array $context, array $expectedGroups, ClassMetadata $metadata, array $attributes)
     {
@@ -260,10 +232,10 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
             /** @var AttributeMetadata $attribute */
             $value = $this->propertyAccess->getValue($object, $attribute->getName());
             $key = $attribute->getSerializedName() ?? $attribute->getName();
-            $objectContext = array_merge(
+            $objectContext = \array_merge(
                 $context,
                 $attribute->getNormalizationContextForGroups(
-                    is_array($context['groups']) ? $context['groups'] : [$context['groups']]
+                    \is_array($context['groups']) ? $context['groups'] : [$context['groups']]
                 )
             );
             $isTranslatable = $objectContext['is-translatable'] ?? false;
@@ -271,20 +243,28 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
             if ($isTranslatable) {
                 $data[$key] = $this->translatableStringHelper
                     ->localize($value);
+            } elseif ($value instanceof ReadableCollection) {
+                // when normalizing collection, we should not preserve keys (to ensure that the result is a list)
+                // this is why we make call to the normalizer again to use the CollectionDocGenNormalizer
+                $data[$key] =
+                    $this->normalizer->normalize($value, $format, \array_merge(
+                        $objectContext,
+                        $attribute->getNormalizationContextForGroups($expectedGroups)
+                    ));
             } elseif (is_iterable($value)) {
                 $arr = [];
 
                 foreach ($value as $k => $v) {
                     $arr[$k] =
-                        $this->normalizer->normalize($v, $format, array_merge(
+                        $this->normalizer->normalize($v, $format, \array_merge(
                             $objectContext,
                             $attribute->getNormalizationContextForGroups($expectedGroups)
                         ));
                 }
                 $data[$key] = $arr;
-            } elseif (is_object($value)) {
+            } elseif (\is_object($value)) {
                 $data[$key] =
-                    $this->normalizer->normalize($value, $format, array_merge(
+                    $this->normalizer->normalize($value, $format, \array_merge(
                         $objectContext,
                         $attribute->getNormalizationContextForGroups($expectedGroups)
                     ));
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php b/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
index 5aed8554b..1eada4e52 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php
@@ -13,20 +13,13 @@ namespace Chill\DocGeneratorBundle\Service\Context;
 
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class BaseContextData
 {
-    private NormalizerInterface $normalizer;
+    public function __construct(private readonly NormalizerInterface $normalizer) {}
 
-    public function __construct(NormalizerInterface $normalizer)
-    {
-        $this->normalizer = $normalizer;
-    }
-
-    public function getData(?User $user = null): array
+    public function getData(User $user = null): array
     {
         $data = [];
 
@@ -35,11 +28,11 @@ class BaseContextData
             'docgen',
             ['docgen:expects' => User::class, 'groups' => ['docgen:read']]
         );
-        $data['createdAt'] = $this->normalizer->normalize(new DateTimeImmutable(), 'docgen', [
-            'docgen:expects' => DateTimeImmutable::class, 'groups' => ['docgen:read'],
+        $data['createdAt'] = $this->normalizer->normalize(new \DateTimeImmutable(), 'docgen', [
+            'docgen:expects' => \DateTimeImmutable::class, 'groups' => ['docgen:read'],
         ]);
-        $data['createdAtDate'] = $this->normalizer->normalize(new DateTimeImmutable('today'), 'docgen', [
-            'docgen:expects' => DateTimeImmutable::class, 'groups' => ['docgen:read'],
+        $data['createdAtDate'] = $this->normalizer->normalize(new \DateTimeImmutable('today'), 'docgen', [
+            'docgen:expects' => \DateTimeImmutable::class, 'groups' => ['docgen:read'],
         ]);
         $data['location'] = $this->normalizer->normalize(
             $user instanceof User ? $user->getCurrentLocation() : null,
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
index e2e09f349..4918223f5 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php
@@ -25,48 +25,29 @@ use Symfony\Component\HttpFoundation\File\File;
 
 class Generator implements GeneratorInterface
 {
-    private ContextManagerInterface $contextManager;
-
-    private DriverInterface $driver;
-
-    private EntityManagerInterface $entityManager;
-
-    private LoggerInterface $logger;
-
-    private StoredObjectManagerInterface $storedObjectManager;
-
     private const LOG_PREFIX = '[docgen generator] ';
 
-    public function __construct(
-        ContextManagerInterface $contextManager,
-        DriverInterface $driver,
-        EntityManagerInterface $entityManager,
-        LoggerInterface $logger,
-        StoredObjectManagerInterface $storedObjectManager
-    ) {
-        $this->contextManager = $contextManager;
-        $this->driver = $driver;
-        $this->entityManager = $entityManager;
-        $this->logger = $logger;
-        $this->storedObjectManager = $storedObjectManager;
-    }
+    public function __construct(private readonly ContextManagerInterface $contextManager, private readonly DriverInterface $driver, private readonly EntityManagerInterface $entityManager, private readonly LoggerInterface $logger, private readonly StoredObjectManagerInterface $storedObjectManager) {}
 
     /**
      * @template T of File|null
      * @template B of bool
-     * @param B $isTest
+     *
+     * @param B                      $isTest
      * @param (B is true ? T : null) $testFile
+     *
      * @psalm-return (B is true ? string : null)
+     *
      * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
      */
     public function generateDocFromTemplate(
         DocGeneratorTemplate $template,
-        int                  $entityId,
-        array                $contextGenerationDataNormalized,
-        ?StoredObject        $destinationStoredObject = null,
-        bool                 $isTest = false,
-        ?File                $testFile = null,
-        ?User                $creator = null
+        int $entityId,
+        array $contextGenerationDataNormalized,
+        StoredObject $destinationStoredObject = null,
+        bool $isTest = false,
+        File $testFile = null,
+        User $creator = null
     ): ?string {
         if ($destinationStoredObject instanceof StoredObject && StoredObject::STATUS_PENDING !== $destinationStoredObject->getStatus()) {
             $this->logger->info(self::LOG_PREFIX.'Aborting generation of an already generated document');
@@ -75,7 +56,7 @@ class Generator implements GeneratorInterface
 
         $this->logger->info(self::LOG_PREFIX.'Starting generation of a document', [
             'entity_id' => $entityId,
-            'destination_stored_object' => $destinationStoredObject === null ? null : $destinationStoredObject->getId()
+            'destination_stored_object' => null === $destinationStoredObject ? null : $destinationStoredObject->getId(),
         ]);
 
         $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
@@ -129,12 +110,13 @@ class Generator implements GeneratorInterface
             $this->logger->info(self::LOG_PREFIX.'Finished generation of a document', [
                 'is_test' => true,
                 'entity_id' => $entityId,
-                'destination_stored_object' => $destinationStoredObject === null ? null : $destinationStoredObject->getId()
+                'destination_stored_object' => null === $destinationStoredObject ? null : $destinationStoredObject->getId(),
             ]);
+
             return $generatedResource;
         }
 
-        /** @var StoredObject $destinationStoredObject */
+        /* @var StoredObject $destinationStoredObject */
         $destinationStoredObject
             ->setType($template->getFile()->getType())
             ->setFilename(sprintf('%s_odt', uniqid('doc_', true)))
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
index 4360413b4..2c91942bc 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorException.php
@@ -11,19 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
-use RuntimeException;
-use Throwable;
-
-class GeneratorException extends RuntimeException
+class GeneratorException extends \RuntimeException
 {
     /**
-     * @var list<string>
+     * @param string[] $errors
      */
-    private array $errors;
-
-    public function __construct(array $errors = [], ?Throwable $previous = null)
+    public function __construct(private readonly array $errors = [], \Throwable $previous = null)
     {
-        $this->errors = $errors;
         parent::__construct(
             'Could not generate the document',
             15252,
@@ -31,9 +25,6 @@ class GeneratorException extends RuntimeException
         );
     }
 
-    /**
-     * @return array
-     */
     public function getErrors(): array
     {
         return $this->errors;
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
index dcef8f99d..64d99f801 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/GeneratorInterface.php
@@ -21,18 +21,21 @@ interface GeneratorInterface
     /**
      * @template T of File|null
      * @template B of bool
-     * @param B $isTest
+     *
+     * @param B                      $isTest
      * @param (B is true ? T : null) $testFile
+     *
      * @psalm-return (B is true ? string : null)
+     *
      * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface|\Throwable
      */
     public function generateDocFromTemplate(
         DocGeneratorTemplate $template,
-        int                  $entityId,
-        array                $contextGenerationDataNormalized,
-        ?StoredObject        $destinationStoredObject = null,
-        bool                 $isTest = false,
-        ?File                $testFile = null,
-        ?User                $creator = null
+        int $entityId,
+        array $contextGenerationDataNormalized,
+        StoredObject $destinationStoredObject = null,
+        bool $isTest = false,
+        File $testFile = null,
+        User $creator = null
     ): ?string;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
index 37540a2f8..fc955362e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/ObjectReadyException.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
-use RuntimeException;
-
-class ObjectReadyException extends RuntimeException
+class ObjectReadyException extends \RuntimeException
 {
     public function __construct()
     {
-        parent::__construct('object is already ready', 6698856);
+        parent::__construct('object is already ready', 6_698_856);
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
index 9cca0bcda..a252755ea 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Generator/RelatedEntityNotFoundException.php
@@ -11,15 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Service\Generator;
 
-use RuntimeException;
-
-class RelatedEntityNotFoundException extends RuntimeException
+class RelatedEntityNotFoundException extends \RuntimeException
 {
-    public function __construct(string $relatedEntityClass, int $relatedEntityId, ?\Throwable $previous = null)
+    public function __construct(string $relatedEntityClass, int $relatedEntityId, \Throwable $previous = null)
     {
         parent::__construct(
             sprintf('Related entity not found: %s, %s', $relatedEntityClass, $relatedEntityId),
-            99876652,
+            99_876_652,
             $previous
         );
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
index 5f20a3e69..54889f518 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
@@ -24,56 +24,16 @@ use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-final class OnGenerationFails implements EventSubscriberInterface
+final readonly class OnGenerationFails implements EventSubscriberInterface
 {
-    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
-
-    private EntityManagerInterface $entityManager;
-
-    private LoggerInterface $logger;
-
-    private MailerInterface $mailer;
-
-    private StoredObjectRepository $storedObjectRepository;
-
-    private TranslatorInterface $translator;
-
-    private UserRepositoryInterface $userRepository;
-
     public const LOG_PREFIX = '[docgen failed] ';
 
-    /**
-     * @param DocGeneratorTemplateRepository $docGeneratorTemplateRepository
-     * @param EntityManagerInterface $entityManager
-     * @param LoggerInterface $logger
-     * @param MailerInterface $mailer
-     * @param StoredObjectRepository $storedObjectRepository
-     * @param TranslatorInterface $translator
-     * @param UserRepositoryInterface $userRepository
-     */
-    public function __construct(
-        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        EntityManagerInterface $entityManager,
-        LoggerInterface $logger,
-        MailerInterface $mailer,
-        StoredObjectRepository $storedObjectRepository,
-        TranslatorInterface $translator,
-        UserRepositoryInterface $userRepository
-    ) {
-        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->entityManager = $entityManager;
-        $this->logger = $logger;
-        $this->mailer = $mailer;
-        $this->storedObjectRepository = $storedObjectRepository;
-        $this->translator = $translator;
-        $this->userRepository = $userRepository;
-    }
-
+    public function __construct(private DocGeneratorTemplateRepository $docGeneratorTemplateRepository, private EntityManagerInterface $entityManager, private LoggerInterface $logger, private MailerInterface $mailer, private StoredObjectRepository $storedObjectRepository, private TranslatorInterface $translator, private UserRepositoryInterface $userRepository) {}
 
     public static function getSubscribedEvents()
     {
         return [
-            WorkerMessageFailedEvent::class => 'onMessageFailed'
+            WorkerMessageFailedEvent::class => 'onMessageFailed',
         ];
     }
 
@@ -95,7 +55,7 @@ final class OnGenerationFails implements EventSubscriberInterface
             'entity_id' => $message->getEntityId(),
             'template_id' => $message->getTemplateId(),
             'creator_id' => $message->getCreatorId(),
-            'throwable_class' => get_class($event->getThrowable()),
+            'throwable_class' => $event->getThrowable()::class,
         ]);
 
         $this->markObjectAsFailed($message);
@@ -121,11 +81,13 @@ final class OnGenerationFails implements EventSubscriberInterface
 
         if (null === $creator = $this->userRepository->find($creatorId)) {
             $this->logger->error(self::LOG_PREFIX.'Creator not found with given id', ['creator_id', $creatorId]);
+
             return;
         }
 
         if (null === $creator->getEmail() || '' === $creator->getEmail()) {
             $this->logger->info(self::LOG_PREFIX.'Creator does not have any email', ['user' => $creator->getUsernameCanonical()]);
+
             return;
         }
 
@@ -143,6 +105,7 @@ final class OnGenerationFails implements EventSubscriberInterface
 
         if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
             $this->logger->info(self::LOG_PREFIX.'Template not found', ['template_id' => $message->getTemplateId()]);
+
             return;
         }
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
index 49c3430ad..f6723c617 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
@@ -22,50 +22,24 @@ use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
 /**
- * Handle the request of document generation
+ * Handle the request of document generation.
  */
 class RequestGenerationHandler implements MessageHandlerInterface
 {
-    private StoredObjectRepository $storedObjectRepository;
-
-    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
-
-    private EntityManagerInterface $entityManager;
-
-    private Generator $generator;
-
-    private LoggerInterface $logger;
-
-    private UserRepositoryInterface $userRepository;
-
-    public const AUTHORIZED_TRIALS = 5;
+    final public const AUTHORIZED_TRIALS = 5;
 
     private const LOG_PREFIX = '[docgen message handler] ';
 
-    public function __construct(
-        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        EntityManagerInterface $entityManager,
-        Generator $generator,
-        LoggerInterface $logger,
-        StoredObjectRepository $storedObjectRepository,
-        UserRepositoryInterface $userRepository
-    ) {
-        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->entityManager = $entityManager;
-        $this->generator = $generator;
-        $this->logger = $logger;
-        $this->storedObjectRepository = $storedObjectRepository;
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly DocGeneratorTemplateRepository $docGeneratorTemplateRepository, private readonly EntityManagerInterface $entityManager, private readonly Generator $generator, private readonly LoggerInterface $logger, private readonly StoredObjectRepository $storedObjectRepository, private readonly UserRepositoryInterface $userRepository) {}
 
     public function __invoke(RequestGenerationMessage $message)
     {
         if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) {
-            throw new \RuntimeException('template not found: ' . $message->getTemplateId());
+            throw new \RuntimeException('template not found: '.$message->getTemplateId());
         }
 
         if (null === $destinationStoredObject = $this->storedObjectRepository->find($message->getDestinationStoredObjectId())) {
-            throw new \RuntimeException('destination stored object not found : ' . $message->getDestinationStoredObjectId());
+            throw new \RuntimeException('destination stored object not found : '.$message->getDestinationStoredObjectId());
         }
 
         if ($destinationStoredObject->getGenerationTrialsCounter() >= self::AUTHORIZED_TRIALS) {
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
index e8734e62b..092073817 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php
@@ -17,30 +17,24 @@ use Chill\MainBundle\Entity\User;
 
 class RequestGenerationMessage
 {
-    private int $creatorId;
+    private readonly int $creatorId;
 
-    private int $templateId;
+    private readonly int $templateId;
 
-    private int $entityId;
+    private readonly int $destinationStoredObjectId;
 
-    private int $destinationStoredObjectId;
-
-    private array $contextGenerationData;
-
-    private \DateTimeImmutable $createdAt;
+    private readonly \DateTimeImmutable $createdAt;
 
     public function __construct(
         User $creator,
         DocGeneratorTemplate $template,
-        int $entityId,
+        private readonly int $entityId,
         StoredObject $destinationStoredObject,
-        array $contextGenerationData
+        private readonly array $contextGenerationData
     ) {
         $this->creatorId = $creator->getId();
         $this->templateId = $template->getId();
-        $this->entityId = $entityId;
         $this->destinationStoredObjectId = $destinationStoredObject->getId();
-        $this->contextGenerationData = $contextGenerationData;
         $this->createdAt = new \DateTimeImmutable('now');
     }
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
index 58208b045..a5aa1e9e9 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DocGenEncoderTest extends TestCase
@@ -116,11 +117,8 @@ final class DocGenEncoderTest extends TestCase
 
     /**
      * @dataProvider generateEncodeData
-     *
-     * @param mixed $expected
-     * @param mixed $data
      */
-    public function testEncode($expected, $data, string $msg)
+    public function testEncode(mixed $expected, mixed $data, string $msg)
     {
         $generated = $this->encoder->encode($data, 'docgen');
         $this->assertEquals($expected, $generated, $msg);
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/CollectionDocGenNormalizerTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/CollectionDocGenNormalizerTest.php
new file mode 100644
index 000000000..610135b04
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/CollectionDocGenNormalizerTest.php
@@ -0,0 +1,53 @@
+<?php
+
+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 Chill\DocGeneratorBundle\tests\Serializer\Normalizer;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Criteria;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class CollectionDocGenNormalizerTest extends KernelTestCase
+{
+    private NormalizerInterface $normalizer;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+    }
+
+    public function testNormalizeFilteredArray(): void
+    {
+        $coll = new ArrayCollection([
+            (object) ['v' => 'foo'],
+            (object) ['v' => 'bar'],
+            (object) ['v' => 'baz'],
+        ]);
+
+        // filter to get non continuous indexes
+        $criteria = new Criteria();
+        $criteria->where(Criteria::expr()->neq('v', 'bar'));
+
+        $filtered = $coll->matching($criteria);
+        $normalized = $this->normalizer->normalize($filtered, 'docgen', []);
+
+        self::assertIsArray($normalized);
+        self::assertArrayHasKey(0, $normalized);
+        self::assertArrayHasKey(1, $normalized);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
index 3250d4d5a..a1756b325 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
@@ -13,6 +13,10 @@ namespace Chill\DocGeneratorBundle\tests\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ReadableCollection;
+use Doctrine\Common\Collections\Selectable;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
@@ -20,6 +24,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DocGenObjectNormalizerTest extends KernelTestCase
@@ -28,7 +33,6 @@ final class DocGenObjectNormalizerTest extends KernelTestCase
 
     protected function setUp(): void
     {
-        parent::setUp();
         self::bootKernel();
 
         $this->normalizer = self::$container->get(NormalizerInterface::class);
@@ -135,7 +139,7 @@ final class DocGenObjectNormalizerTest extends KernelTestCase
         $this->assertEquals($expected, $actual, 'test normalization for a null scope');
     }
 
-    public function testNormalizeNullObjectWithObjectEmbedded()
+    public function testNormalizeNullObjectWithObjectEmbedded(): never
     {
         $this->markTestIncomplete('test to implement');
         $normalized = $this->normalizer->normalize(null, 'docgen', [
@@ -154,7 +158,7 @@ final class DocGenObjectNormalizerTest extends KernelTestCase
         $this->assertEquals($expected, $normalized, 'test normalization for a null user');
     }
 
-    public function testNormalizeWithNullValueEmbedded()
+    public function testNormalizeWithNullValueEmbedded(): never
     {
         $this->markTestIncomplete('test to write');
         $user = new User();
@@ -171,12 +175,71 @@ final class DocGenObjectNormalizerTest extends KernelTestCase
 
         $this->assertEquals($expected, $normalized, 'test normalization fo an user with null center');
     }
+
+    public function testIntersectionTypeForReadableCollection(): void
+    {
+        $value = new TestableWithIntersectionReadableCollection();
+
+        $normalized = $this->normalizer->normalize($value, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => TestableWithIntersectionReadableCollection::class]);
+
+        self::assertIsArray($normalized);
+        self::assertIsArray($normalized['collection']);
+        self::assertCount(2, $normalized['collection']);
+
+        self::assertEquals(
+            ['baz' => 'bloup', 'isNull' => false],
+            $normalized['collection'][0]
+        );
+        self::assertEquals(
+            ['baz' => 'bloup', 'isNull' => false],
+            $normalized['collection'][1]
+        );
+    }
+
+    public function testIntersectionTypeForReadableCollectionWithNullValue(): void
+    {
+        $normalized = $this->normalizer->normalize(null, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => TestableWithIntersectionReadableCollection::class]);
+
+        self::assertIsArray($normalized);
+        self::assertIsArray($normalized['collection']);
+        self::assertCount(0, $normalized['collection']);
+    }
+
+    public function testIntersectionTypeForCollection(): void
+    {
+        $value = new TestableWithCollection();
+
+        $normalized = $this->normalizer->normalize($value, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => TestableWithCollection::class]);
+
+        self::assertIsArray($normalized);
+        self::assertIsArray($normalized['collection']);
+        self::assertCount(2, $normalized['collection']);
+
+        self::assertEquals(
+            ['baz' => 'bloup', 'isNull' => false],
+            $normalized['collection'][0]
+        );
+        self::assertEquals(
+            ['baz' => 'bloup', 'isNull' => false],
+            $normalized['collection'][1]
+        );
+    }
+
+    public function testIntersectionTypeForCollectionWithNullValue(): void
+    {
+        $normalized = $this->normalizer->normalize(null, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => TestableWithCollection::class]);
+
+        self::assertIsArray($normalized);
+        self::assertIsArray($normalized['collection']);
+        self::assertCount(0, $normalized['collection']);
+    }
 }
 
 class TestableParentClass
 {
     /**
      * @Serializer\Groups("docgen:read")
+     *
      * @Serializer\Context(normalizationContext={"groups": "docgen:read:foo"}, groups={"docgen:read"})
      */
     public ?TestableChildClass $child;
@@ -215,3 +278,29 @@ class TestableClassWithBool
         return true;
     }
 }
+
+class TestableWithIntersectionReadableCollection
+{
+    /**
+     * @Serializer\Groups("docgen:read")
+     */
+    public ReadableCollection&Selectable $collection;
+
+    public function __construct()
+    {
+        $this->collection = new ArrayCollection([new TestableChildClass(), new TestableChildClass()]);
+    }
+}
+
+class TestableWithCollection
+{
+    /**
+     * @Serializer\Groups("docgen:read")
+     */
+    public Collection&Selectable $collection;
+
+    public function __construct()
+    {
+        $this->collection = new ArrayCollection([new TestableChildClass(), new TestableChildClass()]);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
index 3734df03a..7ce52dee0 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
@@ -15,11 +15,11 @@ use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\MainBundle\Entity\User;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BaseContextDataTest extends KernelTestCase
@@ -28,7 +28,6 @@ final class BaseContextDataTest extends KernelTestCase
 
     protected function setUp(): void
     {
-        parent::setUp();
         self::bootKernel();
     }
 
@@ -46,12 +45,9 @@ final class BaseContextDataTest extends KernelTestCase
 
     public function testGenerateWithUser()
     {
-        $security = $this->prophesize(Security::class);
-        $security->getUser()->willReturn(new User());
+        $context = $this->buildBaseContext();
 
-        $context = $this->buildBaseContext($security->reveal());
-
-        $actual = $context->getData();
+        $actual = $context->getData(new User());
 
         $this->assertIsArray($actual);
         $this->assertArrayHasKey('creator', $actual);
@@ -60,11 +56,9 @@ final class BaseContextDataTest extends KernelTestCase
     }
 
     private function buildBaseContext(
-        ?Security $security = null,
-        ?NormalizerInterface $normalizer = null
+        NormalizerInterface $normalizer = null
     ): BaseContextData {
         return new BaseContextData(
-            $security ?? self::$container->get(Security::class),
             $normalizer ?? self::$container->get(NormalizerInterface::class)
         );
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
index ea23d94b5..2272f343e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/Generator/GeneratorTest.php
@@ -28,6 +28,7 @@ use Psr\Log\NullLogger;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class GeneratorTest extends TestCase
@@ -71,7 +72,6 @@ class GeneratorTest extends TestCase
         $storedObjectManager->read($templateStoredObject)->willReturn('template');
         $storedObjectManager->write($destinationStoredObject, 'generated')->shouldBeCalled();
 
-
         $generator = new Generator(
             $contextManagerInterface->reveal(),
             $driver->reveal(),
diff --git a/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php b/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php
index 81c71f45f..8dcbe72c3 100644
--- a/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php
+++ b/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php
@@ -11,8 +11,21 @@ declare(strict_types=1);
 
 namespace Chill\DocStoreBundle;
 
+use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
+use Chill\DocStoreBundle\GenericDoc\Twig\GenericDocRendererInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class ChillDocStoreBundle extends Bundle
 {
+    public function build(ContainerBuilder $container)
+    {
+        $container->registerForAutoconfiguration(GenericDocForAccompanyingPeriodProviderInterface::class)
+            ->addTag('chill_doc_store.generic_doc_accompanying_period_provider');
+        $container->registerForAutoconfiguration(GenericDocForPersonProviderInterface::class)
+            ->addTag('chill_doc_store.generic_doc_person_provider');
+        $container->registerForAutoconfiguration(GenericDocRendererInterface::class)
+            ->addTag('chill_doc_store.generic_doc_renderer');
+    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
index 794e85462..31c80158e 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
@@ -20,14 +20,18 @@ class AdminController extends AbstractController
 {
     /**
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/document", name="chill_docstore_admin", options={null})
      */
     public function indexAction()
     {
-        return $this->render('ChillDocStoreBundle:Admin:layout.html.twig');
+        return $this->render('@ChillDocStore/Admin/layout.html.twig');
     }
 
     /**
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/document_redirect_to_main", name="chill_docstore_admin_redirect_to_admin_index", options={null})
      */
     public function redirectToAdminIndexAction()
     {
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
index 1bc3db221..44feb5a47 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
@@ -13,12 +13,9 @@ namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\DocStoreBundle\Form\AccompanyingCourseDocumentType;
-use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
-use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -33,32 +30,14 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class DocumentAccompanyingCourseController extends AbstractController
 {
-    protected AuthorizationHelper $authorizationHelper;
-
-    protected EventDispatcherInterface $eventDispatcher;
-
-    protected TranslatorInterface $translator;
-
-    private AccompanyingCourseDocumentRepository $courseRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
     /**
      * DocumentAccompanyingCourseController constructor.
      */
     public function __construct(
-        TranslatorInterface $translator,
-        EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper,
-        PaginatorFactory $paginatorFactory,
-        AccompanyingCourseDocumentRepository $courseRepository
-    ) {
-        $this->translator = $translator;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->courseRepository = $courseRepository;
-    }
+        protected TranslatorInterface $translator,
+        protected EventDispatcherInterface $eventDispatcher,
+        protected AuthorizationHelper $authorizationHelper
+    ) {}
 
     /**
      * @Route("/{id}/delete", name="chill_docstore_accompanying_course_document_delete")
@@ -82,11 +61,11 @@ class DocumentAccompanyingCourseController extends AbstractController
                 return $this->redirect($request->query->get('returnPath'));
             }
 
-            return $this->redirectToRoute('accompanying_course_document_index', ['course' => $course->getId()]);
+            return $this->redirectToRoute('chill_docstore_generic-doc_by-period_index', ['id' => $course->getId()]);
         }
 
         return $this->render(
-            'ChillDocStoreBundle:AccompanyingCourseDocument:delete.html.twig',
+            '@ChillDocStore/AccompanyingCourseDocument/delete.html.twig',
             [
                 'document' => $document,
                 'delete_form' => $form->createView(),
@@ -103,7 +82,7 @@ class DocumentAccompanyingCourseController extends AbstractController
         $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::UPDATE, $document);
 
         $document->setUser($this->getUser());
-        $document->setDate(new DateTime('Now'));
+        $document->setDate(new \DateTime('Now'));
 
         $form = $this->createForm(
             AccompanyingCourseDocumentType::class,
@@ -127,7 +106,7 @@ class DocumentAccompanyingCourseController extends AbstractController
         }
 
         return $this->render(
-            'ChillDocStoreBundle:AccompanyingCourseDocument:edit.html.twig',
+            '@ChillDocStore/AccompanyingCourseDocument/edit.html.twig',
             [
                 'document' => $document,
                 'form' => $form->createView(),
@@ -136,40 +115,6 @@ class DocumentAccompanyingCourseController extends AbstractController
         );
     }
 
-    /**
-     * @Route("/", name="accompanying_course_document_index", methods="GET")
-     */
-    public function index(AccompanyingPeriod $course): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        if (null === $course) {
-            throw $this->createNotFoundException('Accompanying period not found');
-        }
-
-        $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::SEE, $course);
-
-        $total = $this->courseRepository->countByCourse($course);
-        $pagination = $this->paginatorFactory->create($total);
-
-        $documents = $this->courseRepository
-            ->findBy(
-                ['course' => $course],
-                ['date' => 'DESC', 'id' => 'DESC'],
-                $pagination->getItemsPerPage(),
-                $pagination->getCurrentPageFirstItemNumber()
-            );
-
-        return $this->render(
-            'ChillDocStoreBundle:AccompanyingCourseDocument:index.html.twig',
-            [
-                'documents' => $documents,
-                'accompanyingCourse' => $course,
-                'pagination' => $pagination,
-            ]
-        );
-    }
-
     /**
      * @Route("/new", name="accompanying_course_document_new", methods="GET|POST")
      */
@@ -182,7 +127,7 @@ class DocumentAccompanyingCourseController extends AbstractController
         $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);
 
@@ -202,14 +147,14 @@ class DocumentAccompanyingCourseController extends AbstractController
 
             $this->addFlash('success', $this->translator->trans('The document is successfully registered'));
 
-            return $this->redirectToRoute('accompanying_course_document_index', ['course' => $course->getId()]);
+            return $this->redirectToRoute('chill_docstore_generic-doc_by-period_index', ['id' => $course->getId()]);
         }
 
         if ($form->isSubmitted() && !$form->isValid()) {
             $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
-        return $this->render('ChillDocStoreBundle:AccompanyingCourseDocument:new.html.twig', [
+        return $this->render('@ChillDocStore/AccompanyingCourseDocument/new.html.twig', [
             'document' => $document,
             'form' => $form->createView(),
             'accompanyingCourse' => $course,
@@ -224,7 +169,7 @@ class DocumentAccompanyingCourseController extends AbstractController
         $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::SEE_DETAILS, $document);
 
         return $this->render(
-            'ChillDocStoreBundle:AccompanyingCourseDocument:show.html.twig',
+            '@ChillDocStore/AccompanyingCourseDocument/show.html.twig',
             ['document' => $document, 'accompanyingCourse' => $course]
         );
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
index ef6bb0c0c..fc58dff18 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
@@ -27,11 +27,8 @@ 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
+    public function delete(Request $request, mixed $bundleId, mixed $idInsideBundle): Response
     {
         $em = $this->getDoctrine()->getManager();
         $documentCategory = $em
@@ -40,7 +37,7 @@ class DocumentCategoryController extends AbstractController
                 ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle]
             );
 
-        if ($this->isCsrfTokenValid('delete' . $bundleId . $idInsideBundle, $request->request->get('_token'))) {
+        if ($this->isCsrfTokenValid('delete'.$bundleId.$idInsideBundle, $request->request->get('_token'))) {
             $em->remove($documentCategory);
             $em->flush();
         }
@@ -50,11 +47,8 @@ class DocumentCategoryController extends AbstractController
 
     /**
      * @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
+    public function edit(Request $request, mixed $bundleId, mixed $idInsideBundle): Response
     {
         $em = $this->getDoctrine()->getManager();
         $documentCategory = $em
@@ -74,7 +68,7 @@ class DocumentCategoryController extends AbstractController
                 'idInsideBundle' => $documentCategory->getIdInsideBundle(), ]);
         }
 
-        return $this->render('ChillDocStoreBundle:DocumentCategory:edit.html.twig', [
+        return $this->render('@ChillDocStore/DocumentCategory/edit.html.twig', [
             'document_category' => $documentCategory,
             'form' => $form->createView(),
         ]);
@@ -82,14 +76,14 @@ class DocumentCategoryController extends AbstractController
 
     /**
      * @Route("/", name="document_category_index", methods="GET")
-     */
+     * @Route("/", name="chill_docstore_category_admin", methods="GET")     */
     public function index(): Response
     {
         $em = $this->getDoctrine()->getManager();
         $categories = $em->getRepository(DocumentCategory::class)->findAll();
 
         return $this->render(
-            'ChillDocStoreBundle:DocumentCategory:index.html.twig',
+            '@ChillDocStore/DocumentCategory/index.html.twig',
             [
                 'document_categories' => $categories,
             ]
@@ -128,7 +122,7 @@ class DocumentCategoryController extends AbstractController
             return $this->redirectToRoute('document_category_index');
         }
 
-        return $this->render('ChillDocStoreBundle:DocumentCategory:new.html.twig', [
+        return $this->render('@ChillDocStore/DocumentCategory/new.html.twig', [
             'document_category' => $documentCategory,
             'form' => $form->createView(),
         ]);
@@ -136,11 +130,8 @@ 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
+    public function show(mixed $bundleId, mixed $idInsideBundle): Response
     {
         $em = $this->getDoctrine()->getManager();
         $documentCategory = $em
@@ -150,7 +141,7 @@ class DocumentCategoryController extends AbstractController
             );
 
         return $this->render(
-            'ChillDocStoreBundle:DocumentCategory:show.html.twig',
+            '@ChillDocStore/DocumentCategory/show.html.twig',
             ['document_category' => $documentCategory]
         );
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
index 6fcb6a8e5..73fffa1c4 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -13,14 +13,11 @@ namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Form\PersonDocumentType;
-use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
-use Chill\MainBundle\Pagination\PaginatorFactory;
 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\Form\Extension\Core\Type\FormType;
@@ -39,32 +36,14 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class DocumentPersonController extends AbstractController
 {
-    protected AuthorizationHelper $authorizationHelper;
-
-    protected EventDispatcherInterface $eventDispatcher;
-
-    protected TranslatorInterface $translator;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository;
-
     /**
      * DocumentPersonController constructor.
      */
     public function __construct(
-        TranslatorInterface $translator,
-        EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper,
-        PaginatorFactory $paginatorFactory,
-        PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository
-    ) {
-        $this->translator = $translator;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->personDocumentACLAwareRepository = $personDocumentACLAwareRepository;
-    }
+        protected TranslatorInterface $translator,
+        protected EventDispatcherInterface $eventDispatcher,
+        protected AuthorizationHelper $authorizationHelper
+    ) {}
 
     /**
      * @Route("/{id}/delete", name="chill_docstore_person_document_delete")
@@ -88,11 +67,11 @@ class DocumentPersonController extends AbstractController
                 return $this->redirect($request->query->get('returnPath'));
             }
 
-            return $this->redirectToRoute('person_document_index', ['person' => $person->getId()]);
+            return $this->redirectToRoute('chill_docstore_generic-doc_by-person_index', ['id' => $person->getId()]);
         }
 
         return $this->render(
-            'ChillDocStoreBundle:PersonDocument:delete.html.twig',
+            '@ChillDocStore/PersonDocument/delete.html.twig',
             [
                 'document' => $document,
                 'delete_form' => $form->createView(),
@@ -110,7 +89,7 @@ class DocumentPersonController extends AbstractController
         $this->denyAccessUnlessGranted('CHILL_PERSON_DOCUMENT_UPDATE', $document);
 
         $document->setUser($this->getUser());
-        $document->setDate(new DateTime('Now'));
+        $document->setDate(new \DateTime('Now'));
 
         $form = $this->createForm(
             PersonDocumentType::class,
@@ -131,7 +110,7 @@ class DocumentPersonController extends AbstractController
                 'element_id' => $document->getId(),
                 'action' => 'update',
             ]);
-            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+            $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
             return $this->redirectToRoute(
                 'person_document_edit',
@@ -148,10 +127,10 @@ class DocumentPersonController extends AbstractController
             'element_id' => $document->getId(),
             'action' => 'edit',
         ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         return $this->render(
-            'ChillDocStoreBundle:PersonDocument:edit.html.twig',
+            '@ChillDocStore/PersonDocument/edit.html.twig',
             [
                 'document' => $document,
                 'form' => $form->createView(),
@@ -160,45 +139,6 @@ class DocumentPersonController extends AbstractController
         );
     }
 
-    /**
-     * @Route("/", name="person_document_index", methods="GET")
-     */
-    public function index(Person $person): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        if (null === $person) {
-            throw $this->createNotFoundException('Person not found');
-        }
-
-        $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
-
-        $total = $this->personDocumentACLAwareRepository->countByPerson($person);
-        $pagination = $this->paginatorFactory->create($total);
-
-        $documents = $this->personDocumentACLAwareRepository->findByPerson(
-            $person,
-            ['date' => 'DESC', 'id' => 'DESC'],
-            $pagination->getItemsPerPage(),
-            $pagination->getCurrentPageFirstItemNumber()
-        );
-
-        $event = new PrivacyEvent($person, [
-            'element_class' => PersonDocument::class,
-            'action' => 'index',
-        ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-
-        return $this->render(
-            'ChillDocStoreBundle:PersonDocument:index.html.twig',
-            [
-                'documents' => $documents,
-                'person' => $person,
-                'pagination' => $pagination,
-            ]
-        );
-    }
-
     /**
      * @Route("/new", name="person_document_new", methods="GET|POST")
      */
@@ -213,7 +153,7 @@ 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, [
             'role' => 'CHILL_PERSON_DOCUMENT_CREATE',
@@ -233,14 +173,14 @@ class DocumentPersonController extends AbstractController
 
             $this->addFlash('success', $this->translator->trans('The document is successfully registered'));
 
-            return $this->redirectToRoute('person_document_index', ['person' => $person->getId()]);
+            return $this->redirectToRoute('chill_docstore_generic-doc_by-person_index', ['id' => $person->getId()]);
         }
 
         if ($form->isSubmitted() && !$form->isValid()) {
             $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
-        return $this->render('ChillDocStoreBundle:PersonDocument:new.html.twig', [
+        return $this->render('@ChillDocStore/PersonDocument/new.html.twig', [
             'document' => $document,
             'form' => $form->createView(),
             'person' => $person,
@@ -260,10 +200,10 @@ class DocumentPersonController extends AbstractController
             'element_id' => $document->getId(),
             'action' => 'show',
         ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         return $this->render(
-            'ChillDocStoreBundle:PersonDocument:show.html.twig',
+            '@ChillDocStore/PersonDocument/show.html.twig',
             ['document' => $document, 'person' => $person]
         );
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
new file mode 100644
index 000000000..e615c3b00
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php
@@ -0,0 +1,92 @@
+<?php
+
+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 Chill\DocStoreBundle\Controller;
+
+use Chill\DocStoreBundle\GenericDoc\Manager;
+use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class GenericDocForAccompanyingPeriodController
+{
+    public function __construct(
+        private FilterOrderHelperFactory $filterOrderHelperFactory,
+        private Manager $manager,
+        private PaginatorFactory $paginator,
+        private Security $security,
+        private \Twig\Environment $twig,
+    ) {}
+
+    /**
+     * @throws \Doctrine\DBAL\Exception
+     *
+     * @Route("/{_locale}/doc-store/generic-doc/by-period/{id}/index", name="chill_docstore_generic-doc_by-period_index")
+     */
+    public function list(AccompanyingPeriod $accompanyingPeriod): Response
+    {
+        if (!$this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $accompanyingPeriod)) {
+            throw new AccessDeniedHttpException('not allowed to see the documents for accompanying period');
+        }
+
+        $filterBuilder = $this->filterOrderHelperFactory
+            ->create(self::class)
+            ->addSearchBox()
+            ->addDateRange('dateRange', 'generic_doc.filter.date-range');
+
+        if ([] !== $places = $this->manager->placesForAccompanyingPeriod($accompanyingPeriod)) {
+            $filterBuilder->addCheckbox('places', $places, [], array_map(
+                static fn (string $k) => 'generic_doc.filter.keys.'.$k,
+                $places
+            ));
+        }
+
+        $filter = $filterBuilder
+            ->build();
+
+        ['to' => $endDate, 'from' => $startDate] = $filter->getDateRangeData('dateRange');
+        $content = $filter->getQueryString();
+
+        $nb = $this->manager->countDocForAccompanyingPeriod(
+            $accompanyingPeriod,
+            $startDate,
+            $endDate,
+            $content,
+            $filter->hasCheckBox('places') ? array_values($filter->getCheckboxData('places')) : []
+        );
+        $paginator = $this->paginator->create($nb);
+
+        $documents = $this->manager->findDocForAccompanyingPeriod(
+            $accompanyingPeriod,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage(),
+            $startDate,
+            $endDate,
+            $content,
+            $filter->hasCheckBox('places') ? array_values($filter->getCheckboxData('places')) : []
+        );
+
+        return new Response($this->twig->render(
+            '@ChillDocStore/GenericDoc/accompanying_period_list.html.twig',
+            [
+                'accompanyingCourse' => $accompanyingPeriod,
+                'pagination' => $paginator,
+                'documents' => iterator_to_array($documents),
+                'filter' => $filter,
+            ]
+        ));
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
new file mode 100644
index 000000000..f6fecae04
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php
@@ -0,0 +1,92 @@
+<?php
+
+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 Chill\DocStoreBundle\Controller;
+
+use Chill\DocStoreBundle\GenericDoc\Manager;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class GenericDocForPerson
+{
+    public function __construct(
+        private FilterOrderHelperFactory $filterOrderHelperFactory,
+        private Manager $manager,
+        private PaginatorFactory $paginator,
+        private Security $security,
+        private \Twig\Environment $twig,
+    ) {}
+
+    /**
+     * @throws \Doctrine\DBAL\Exception
+     *
+     * @Route("/{_locale}/doc-store/generic-doc/by-person/{id}/index", name="chill_docstore_generic-doc_by-person_index")
+     */
+    public function list(Person $person): Response
+    {
+        if (!$this->security->isGranted(PersonDocumentVoter::SEE, $person)) {
+            throw new AccessDeniedHttpException('not allowed to see the documents for person');
+        }
+
+        $filterBuilder = $this->filterOrderHelperFactory
+            ->create(self::class)
+            ->addSearchBox()
+            ->addDateRange('dateRange', 'generic_doc.filter.date-range');
+
+        if ([] !== $places = $this->manager->placesForPerson($person)) {
+            $filterBuilder->addCheckbox('places', $places, [], array_map(
+                static fn (string $k) => 'generic_doc.filter.keys.'.$k,
+                $places
+            ));
+        }
+
+        $filter = $filterBuilder
+            ->build();
+
+        ['to' => $endDate, 'from' => $startDate] = $filter->getDateRangeData('dateRange');
+        $content = $filter->getQueryString();
+
+        $nb = $this->manager->countDocForPerson(
+            $person,
+            $startDate,
+            $endDate,
+            $content,
+            $filter->hasCheckBox('places') ? array_values($filter->getCheckboxData('places')) : []
+        );
+        $paginator = $this->paginator->create($nb);
+
+        $documents = $this->manager->findDocForPerson(
+            $person,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage(),
+            $startDate,
+            $endDate,
+            $content,
+            $filter->hasCheckBox('places') ? array_values($filter->getCheckboxData('places')) : []
+        );
+
+        return new Response($this->twig->render(
+            '@ChillDocStore/GenericDoc/person_list.html.twig',
+            [
+                'person' => $person,
+                'pagination' => $paginator,
+                'documents' => iterator_to_array($documents),
+                'filter' => $filter,
+            ]
+        ));
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php
index a11556e42..5a4b90474 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php
@@ -20,12 +20,7 @@ use Symfony\Component\Security\Core\Security;
 
 class StoredObjectApiController
 {
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private readonly Security $security) {}
 
     /**
      * @Route("/api/1.0/doc-store/stored-object/{uuid}/is-ready")
diff --git a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
index d52926626..1217c2a12 100644
--- a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
+++ b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
@@ -19,8 +19,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function in_array;
-
 /**
  * Adding acl for person document.
  */
@@ -40,10 +38,10 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 printf("processing scope %s \n", $scope->getName()['en']);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             printf("denying power on administrative \n");
 
                             break 2; // we do not want any power on administrative
@@ -53,7 +51,7 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        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
@@ -64,7 +62,7 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
 
                 printf(
                     'Adding Person report acl to %s '
-                        . "permission group, scope '%s' \n",
+                        ."permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );
diff --git a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
index 8651e0352..f57e675dd 100644
--- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
+++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
@@ -32,7 +32,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $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');
@@ -89,7 +89,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
 
     protected function prependRoute(ContainerBuilder $container)
     {
-        //declare routes for task bundle
+        // declare routes for task bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
index d2c56d8d1..466158783 100644
--- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
@@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_doc_store');
-        $rootNode = $treeBuilder->getRootNode('chill_doc_store');
+        $rootNode = $treeBuilder->getRootNode();
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
index d0613f9a3..0fe1231a7 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
@@ -18,16 +18,27 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_doc.accompanyingcourse_document")
  */
 class AccompanyingCourseDocument extends Document implements HasScopesInterface, HasCentersInterface
 {
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?AccompanyingPeriod $course = null;
 
+    /**
+     * @ORM\Id
+     *
+     * @ORM\GeneratedValue
+     *
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
     public function getCenters(): ?iterable
     {
         return $this->course->getCenters();
@@ -38,6 +49,11 @@ class AccompanyingCourseDocument extends Document implements HasScopesInterface,
         return $this->course;
     }
 
+    public function getId()
+    {
+        return $this->id;
+    }
+
     public function getScopes(): iterable
     {
         if (null === $this->course) {
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/Document.php b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
index 2345aef61..e4990b1b8 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/Document.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
@@ -16,8 +16,6 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
-use Chill\MainBundle\Entity\User;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
@@ -32,82 +30,73 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @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 $category;
+    private ?\Chill\DocStoreBundle\Entity\DocumentCategory $category = null;
 
     /**
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private ?\DateTimeInterface $date = null;
 
     /**
      * @ORM\Column(type="text")
      */
-    private $description = '';
-
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private $id;
+    private string $description = '';
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity="Chill\DocStoreBundle\Entity\StoredObject",
      *     cascade={"persist"}
      * )
+     *
      * @Assert\Valid
+     *
      * @Assert\NotNull(
      *     message="Upload a document"
      * )
      */
-    private $object;
+    private ?\Chill\DocStoreBundle\Entity\StoredObject $object = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate")
      */
-    private $template;
+    private ?\Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate $template = null;
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Assert\Length(
      *     min=2, max=250
      * )
      */
-    private $title;
+    private string $title = '';
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     *
-     * @var \Chill\PersonBundle\Entity\user The user who encoded the exif_read_data
      */
-    private $user;
+    private ?\Chill\MainBundle\Entity\User $user = null;
 
     public function getCategory(): ?DocumentCategory
     {
         return $this->category;
     }
 
-    public function getDate(): ?DateTimeInterface
+    public function getDate(): ?\DateTimeInterface
     {
         return $this->date;
     }
 
-    public function getDescription(): ?string
+    public function getDescription(): string
     {
         return $this->description;
     }
 
-    public function getId()
-    {
-        return $this->id;
-    }
-
     public function getObject(): ?StoredObject
     {
         return $this->object;
@@ -118,7 +107,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
         return $this->template;
     }
 
-    public function getTitle(): ?string
+    public function getTitle(): string
     {
         return $this->title;
     }
@@ -135,7 +124,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setDate(DateTimeInterface $date): self
+    public function setDate(\DateTimeInterface $date): self
     {
         $this->date = $date;
 
@@ -149,7 +138,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setObject(?StoredObject $object = null)
+    public function setObject(StoredObject $object = null)
     {
         $this->object = $object;
 
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
index 3d9cc3220..a6c19584d 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
@@ -15,43 +15,45 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table("chill_doc.document_category")
+ *
  * @ORM\Entity
  */
 class DocumentCategory
 {
-    /**
-     * @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\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;
+    private ?string $documentClass = null;
 
     /**
      * @ORM\Column(type="json")
      */
     private $name;
 
-    public function __construct($bundleId, $idInsideBundle)
-    {
-        $this->bundleId = $bundleId;
-        $this->idInsideBundle = $idInsideBundle;
-    }
+    /**
+     * @param string $bundleId
+     * @param int    $idInsideBundle
+     */
+    public function __construct(
+        /**
+         * @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="integer", name="id_inside_bundle")
+         *
+         * @var int The id which is unique inside the bundle
+         */
+        private $idInsideBundle
+    ) {}
 
     public function getBundleId() // ::class BundleClass (FQDN)
     {
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
index 1124cbbfd..659395034 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
@@ -19,10 +19,20 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table("chill_doc.person_document")
+ *
  * @ORM\Entity
  */
 class PersonDocument extends Document implements HasCenterInterface, HasScopeInterface
 {
+    /**
+     * @ORM\Id
+     *
+     * @ORM\GeneratedValue
+     *
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
@@ -33,13 +43,18 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
      *
      * @var \Chill\MainBundle\Entity\Scope The document's center
      */
-    private $scope;
+    private ?\Chill\MainBundle\Entity\Scope $scope = null;
 
     public function getCenter()
     {
         return $this->getPerson()->getCenter();
     }
 
+    public function getId()
+    {
+        return $this->id;
+    }
+
     public function getPerson(): Person
     {
         return $this->person;
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index e83d3b3fc..2ee60d80a 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -17,8 +17,6 @@ use ChampsLibres\WopiLib\Contract\Entity\Document;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
-use DateTime;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
@@ -28,7 +26,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * Represent a document stored in an object store.
  *
  * @ORM\Entity
+ *
  * @ORM\Table("chill_doc.stored_object")
+ *
  * @AsyncFileExists(
  *     message="The file is not stored properly"
  * )
@@ -36,57 +36,68 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 class StoredObject implements AsyncFileInterface, Document, TrackCreationInterface
 {
     use TrackCreationTrait;
-    public const STATUS_READY = "ready";
-    public const STATUS_PENDING = "pending";
-    public const STATUS_FAILURE = "failure";
+    final public const STATUS_READY = 'ready';
+    final public const STATUS_PENDING = 'pending';
+    final public const STATUS_FAILURE = 'failure';
 
     /**
      * @ORM\Column(type="json", name="datas")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private array $datas = [];
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private string $filename = '';
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "write"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @var int[]
+     *
      * @ORM\Column(type="json", name="iv")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private array $iv = [];
 
     /**
      * @ORM\Column(type="json", name="key")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private array $keyInfos = [];
 
     /**
      * @ORM\Column(type="text", name="title")
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private string $title = '';
 
     /**
      * @ORM\Column(type="text", name="type", options={"default": ""})
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private string $type = '';
 
     /**
      * @ORM\Column(type="uuid", unique=true)
+     *
      * @Serializer\Groups({"read", "write"})
      */
     private UuidInterface $uuid;
@@ -94,13 +105,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     /**
      * @ORM\ManyToOne(targetEntity=DocGeneratorTemplate::class)
      */
-    private ?DocGeneratorTemplate $template;
-
-    /**
-     * @ORM\Column(type="text", options={"default": "ready"})
-     * @Serializer\Groups({"read"})
-     */
-    private string $status;
+    private ?DocGeneratorTemplate $template = null;
 
     /**
      * Store the number of times a generation has been tryied for this StoredObject.
@@ -115,26 +120,31 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     /**
      * @param StoredObject::STATUS_* $status
      */
-    public function __construct(string $status = "ready")
-    {
+    public function __construct(/**
+     * @ORM\Column(type="text", options={"default": "ready"})
+     *
+     * @Serializer\Groups({"read"})
+     */
+        private string $status = 'ready'
+    ) {
         $this->uuid = Uuid::uuid4();
-        $this->status = $status;
     }
 
     public function addGenerationTrial(): self
     {
-        $this->generationTrialsCounter++;
+        ++$this->generationTrialsCounter;
 
         return $this;
     }
 
     /**
      * @Serializer\Groups({"read", "write"})
+     *
      * @deprecated
      */
-    public function getCreationDate(): DateTime
+    public function getCreationDate(): \DateTime
     {
-        return DateTime::createFromImmutable($this->createdAt);
+        return \DateTime::createFromImmutable($this->createdAt);
     }
 
     public function getDatas(): array
@@ -168,7 +178,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     }
 
     /**
-     * @deprecated Use method "getFilename()".
+     * @deprecated use method "getFilename()"
      */
     public function getObjectName()
     {
@@ -205,9 +215,10 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
 
     /**
      * @Serializer\Groups({"write"})
+     *
      * @deprecated
      */
-    public function setCreationDate(DateTime $creationDate): self
+    public function setCreationDate(\DateTime $creationDate): self
     {
         $this->createdAt = \DateTimeImmutable::createFromMutable($creationDate);
 
@@ -279,6 +290,7 @@ class StoredObject implements AsyncFileInterface, Document, TrackCreationInterfa
     public function setTemplate(?DocGeneratorTemplate $template): StoredObject
     {
         $this->template = $template;
+
         return $this;
     }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php b/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php
index 4836b57ee..68a978e80 100644
--- a/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php
+++ b/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php
@@ -11,12 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\DocStoreBundle\Exception;
 
-use Exception;
-use Throwable;
-
-final class StoredObjectManagerException extends Exception
+final class StoredObjectManagerException extends \Exception
 {
-    public static function errorDuringHttpRequest(Throwable $exception): self
+    public static function errorDuringHttpRequest(\Throwable $exception): self
     {
         return new self('Error during HTTP request.', 500, $exception);
     }
@@ -33,7 +30,7 @@ final class StoredObjectManagerException extends Exception
         return new self(sprintf('Unable to decrypt content (reason: %s).', $message));
     }
 
-    public static function unableToGetResponseContent(Throwable $exception): self
+    public static function unableToGetResponseContent(\Throwable $exception): self
     {
         return new self('Unable to get content from response.', 500, $exception);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
index f77083390..0fced39d3 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
@@ -68,18 +68,14 @@ class AccompanyingCourseDocumentType extends AbstractType
                 'error_bubbling' => true,
             ])
             ->add('date', ChillDateType::class)
-            //TODO : adapt to using AccompanyingCourseDocument categories. Currently there are none...
+            // TODO : adapt to using AccompanyingCourseDocument categories. Currently there are none...
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
-                '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()) : '';
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('c')
+                    ->where('c.documentClass = :docClass')
+                    ->setParameter('docClass', AccompanyingCourseDocument::class),
+                'choice_label' => fn ($entity = null) => $entity ? $this->translatableStringHelper->localize($entity->getName()) : '',
             ]);
     }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
index d42bb90d5..f3506d631 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
@@ -26,7 +26,7 @@ class DocumentCategoryType extends AbstractType
     {
         // TODO faire un service dans CHillMain
         foreach ($kernelBundles as $key => $value) {
-            if (substr($key, 0, 5) === 'Chill') {
+            if (str_starts_with((string) $key, 'Chill')) {
                 $this->chillBundlesFlipped[$value] = $key;
             }
         }
diff --git a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
index c87cc4e73..0addd53cc 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -30,25 +30,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonDocumentType extends AbstractType
 {
-    private CenterResolverDispatcher $centerResolverDispatcher;
-
-    private ParameterBagInterface $parameterBag;
-
-    private ScopeResolverDispatcher $scopeResolverDispatcher;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelperInterface $translatableStringHelper,
-        ScopeResolverDispatcher $scopeResolverDispatcher,
-        ParameterBagInterface $parameterBag,
-        CenterResolverDispatcher $centerResolverDispatcher
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
-        $this->parameterBag = $parameterBag;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-    }
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly ScopeResolverDispatcher $scopeResolverDispatcher, private readonly ParameterBagInterface $parameterBag, private readonly CenterResolverDispatcher $centerResolverDispatcher) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -67,14 +49,10 @@ class PersonDocumentType extends AbstractType
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.documentClass = :docClass')
-                        ->setParameter('docClass', PersonDocument::class);
-                },
-                'choice_label' => function ($entity = null) {
-                    return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('c')
+                    ->where('c.documentClass = :docClass')
+                    ->setParameter('docClass', PersonDocument::class),
+                'choice_label' => fn ($entity = null) => $entity ? $this->translatableStringHelper->localize($entity->getName()) : '',
             ]);
 
         if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
diff --git a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
index 664e7a2aa..77484208f 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
@@ -21,9 +21,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 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.
  */
@@ -57,20 +54,20 @@ class StoredObjectType extends AbstractType
         $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(...)
             ));
     }
 
@@ -84,18 +81,13 @@ class StoredObjectType extends AbstractType
             ->setAllowedTypes('has_title', ['bool']);
     }
 
-    public function getBlockPrefix()
-    {
-        return 'stored_object';
-    }
-
     public function reverseTransform($value)
     {
         if (null === $value) {
             return null;
         }
 
-        return json_decode($value, true);
+        return \json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
     }
 
     public function reverseTransformObject($object)
@@ -120,7 +112,7 @@ class StoredObjectType extends AbstractType
             return null;
         }
 
-        return json_encode($object);
+        return \json_encode($object, JSON_THROW_ON_ERROR);
     }
 
     public function transformObject($object = null)
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php
new file mode 100644
index 000000000..80eeaf372
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQuery.php
@@ -0,0 +1,218 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc;
+
+use Doctrine\DBAL\Types\Types;
+
+class FetchQuery implements FetchQueryInterface
+{
+    /**
+     * @var list<string>
+     */
+    private array $joins = [];
+
+    /**
+     * @var list<list<mixed>>
+     */
+    private array $joinParams = [];
+
+    /**
+     * @var array<list<Types::*>>
+     */
+    private array $joinTypes = [];
+
+    /**
+     * @var array<string>
+     */
+    private array $wheres = [];
+
+    /**
+     * @var array<list<mixed>>
+     */
+    private array $whereParams = [];
+
+    /**
+     * @var array<list<Types::*>>
+     */
+    private array $whereTypes = [];
+
+    public function __construct(
+        private readonly string $selectKeyString,
+        private readonly string $selectIdentifierJsonB,
+        private readonly string $selectDate,
+        private string $from = '',
+        private array $selectIdentifierParams = [],
+        private array $selectIdentifierTypes = [],
+        private array $selectDateParams = [],
+        private array $selectDateTypes = [],
+    ) {}
+
+    public function addJoinClause(string $sql, array $params = [], array $types = []): int
+    {
+        $this->joins[] = $sql;
+        $this->joinParams[] = $params;
+        $this->joinTypes[] = $types;
+
+        return count($this->joins) - 1;
+    }
+
+    public function addWhereClause(string $sql, array $params = [], array $types = []): int
+    {
+        $this->wheres[] = $sql;
+        $this->whereParams[] = $params;
+        $this->whereTypes[] = $types;
+
+        return count($this->wheres) - 1;
+    }
+
+    public function removeWhereClause(int $index): void
+    {
+        if (!array_key_exists($index, $this->wheres)) {
+            throw new \UnexpectedValueException('this index does not exists');
+        }
+
+        unset($this->wheres[$index], $this->whereParams[$index], $this->whereTypes[$index]);
+    }
+
+    public function removeJoinClause(int $index): void
+    {
+        if (!array_key_exists($index, $this->joins)) {
+            throw new \UnexpectedValueException('this index does not exists');
+        }
+
+        unset($this->joins[$index], $this->joinParams[$index], $this->joinTypes[$index]);
+    }
+
+    public function getSelectKeyString(): string
+    {
+        return $this->selectKeyString;
+    }
+
+    public function getSelectIdentifierJsonB(): string
+    {
+        return $this->selectIdentifierJsonB;
+    }
+
+    public function getSelectIdentifierParams(): array
+    {
+        return $this->selectIdentifierParams;
+    }
+
+    public function getSelectIdentifiersTypes(): array
+    {
+        return $this->selectIdentifierTypes;
+    }
+
+    public function getSelectDate(): string
+    {
+        return $this->selectDate;
+    }
+
+    public function getSelectDateTypes(): array
+    {
+        return $this->selectDateTypes;
+    }
+
+    public function getSelectDateParams(): array
+    {
+        return $this->selectDateParams;
+    }
+
+    public function getFromQuery(): string
+    {
+        return $this->from.' '.implode(' ', $this->joins);
+    }
+
+    public function getFromQueryParams(): array
+    {
+        $result = [];
+
+        foreach ($this->joinParams as $params) {
+            $result = [...$result, ...$params];
+        }
+
+        return $result;
+    }
+
+    public function getFromQueryTypes(): array
+    {
+        $result = [];
+
+        foreach ($this->joinTypes as $types) {
+            $result = [...$result, ...$types];
+        }
+
+        return $result;
+    }
+
+    public function getWhereQuery(): string
+    {
+        return implode(' AND ', $this->wheres);
+    }
+
+    public function getWhereQueryParams(): array
+    {
+        $result = [];
+
+        foreach ($this->whereParams as $params) {
+            $result = [...$result, ...$params];
+        }
+
+        return $result;
+    }
+
+    public function getWhereQueryTypes(): array
+    {
+        $result = [];
+
+        foreach ($this->whereTypes as $types) {
+            $result = [...$result, ...$types];
+        }
+
+        return $result;
+    }
+
+    public function setSelectIdentifierParams(array $selectIdentifierParams): self
+    {
+        $this->selectIdentifierParams = $selectIdentifierParams;
+
+        return $this;
+    }
+
+    public function setSelectDateParams(array $selectDateParams): self
+    {
+        $this->selectDateParams = $selectDateParams;
+
+        return $this;
+    }
+
+    public function setFrom(string $from): self
+    {
+        $this->from = $from;
+
+        return $this;
+    }
+
+    public function setSelectIdentifierTypes(array $selectIdentifierTypes): self
+    {
+        $this->selectIdentifierTypes = $selectIdentifierTypes;
+
+        return $this;
+    }
+
+    public function setSelectDateTypes(array $selectDateTypes): self
+    {
+        $this->selectDateTypes = $selectDateTypes;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryInterface.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryInterface.php
new file mode 100644
index 000000000..e46795457
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryInterface.php
@@ -0,0 +1,67 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc;
+
+use Doctrine\DBAL\Types\Types;
+
+interface FetchQueryInterface
+{
+    public function getSelectKeyString(): string;
+
+    public function getSelectIdentifierJsonB(): string;
+
+    /**
+     * @return list<mixed>
+     */
+    public function getSelectIdentifierParams(): array;
+
+    /**
+     * @return list<Types::*>
+     */
+    public function getSelectIdentifiersTypes(): array;
+
+    public function getSelectDate(): string;
+
+    /**
+     * @return list<mixed>
+     */
+    public function getSelectDateParams(): array;
+
+    /**
+     * @return list<Types::*>
+     */
+    public function getSelectDateTypes(): array;
+
+    public function getFromQuery(): string;
+
+    /**
+     * @return list<mixed>
+     */
+    public function getFromQueryParams(): array;
+
+    /**
+     * @return list<Types::*>
+     */
+    public function getFromQueryTypes(): array;
+
+    public function getWhereQuery(): string;
+
+    /**
+     * @return list<mixed>
+     */
+    public function getWhereQueryParams(): array;
+
+    /**
+     * @return list<Types::*>
+     */
+    public function getWhereQueryTypes(): array;
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryToSqlBuilder.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryToSqlBuilder.php
new file mode 100644
index 000000000..174a5014d
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/FetchQueryToSqlBuilder.php
@@ -0,0 +1,56 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc;
+
+use Doctrine\DBAL\Types\Types;
+
+final readonly class FetchQueryToSqlBuilder
+{
+    private const SQL = <<<'SQL'
+        SELECT
+            '{{ key }}' AS key,
+            {{ identifiers }} AS identifiers,
+            {{ date }}::date AS doc_date
+        FROM {{ from }}
+        {{ where }}
+    SQL;
+
+    /**
+     * @return array{sql: string, params: list<mixed>, types: list<Types::*>}
+     */
+    public function toSql(FetchQueryInterface $query): array
+    {
+        $sql = strtr(self::SQL, [
+            '{{ key }}' => $query->getSelectKeyString(),
+            '{{ identifiers }}' => $query->getSelectIdentifierJsonB(),
+            '{{ date }}' => $query->getSelectDate(),
+            '{{ from }}' => $query->getFromQuery(),
+            '{{ where }}' => '' === ($w = $query->getWhereQuery()) ? '' : 'WHERE '.$w,
+        ]);
+
+        $params = [
+            ...$query->getSelectIdentifierParams(),
+            ...$query->getSelectDateParams(),
+            ...$query->getFromQueryParams(),
+            ...$query->getWhereQueryParams(),
+        ];
+
+        $types = [
+            ...$query->getSelectIdentifiersTypes(),
+            ...$query->getSelectDateTypes(),
+            ...$query->getFromQueryTypes(),
+            ...$query->getWhereQueryTypes(),
+        ];
+
+        return ['sql' => $sql, 'params' => $params, 'types' => $types];
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocDTO.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocDTO.php
new file mode 100644
index 000000000..7307f0d6a
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocDTO.php
@@ -0,0 +1,30 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+
+final readonly class GenericDocDTO
+{
+    public function __construct(
+        public string $key,
+        public array $identifiers,
+        public \DateTimeImmutable $docDate,
+        public AccompanyingPeriod|Person $linked,
+    ) {}
+
+    public function getContext(): string
+    {
+        return $this->linked instanceof AccompanyingPeriod ? 'accompanying-period' : 'person';
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php
new file mode 100644
index 000000000..9ceec5438
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForAccompanyingPeriodProviderInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+
+interface GenericDocForAccompanyingPeriodProviderInterface
+{
+    public function buildFetchQueryForAccompanyingPeriod(
+        AccompanyingPeriod $accompanyingPeriod,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        string $origin = null
+    ): FetchQueryInterface;
+
+    /**
+     * Return true if the user is allowed to see some documents for this provider.
+     */
+    public function isAllowedForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool;
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForPersonProviderInterface.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForPersonProviderInterface.php
new file mode 100644
index 000000000..815459f20
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/GenericDocForPersonProviderInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc;
+
+use Chill\PersonBundle\Entity\Person;
+
+interface GenericDocForPersonProviderInterface
+{
+    public function buildFetchQueryForPerson(
+        Person $person,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        string $origin = null
+    ): FetchQueryInterface;
+
+    /**
+     * Return true if the user is allowed to see some documents for this provider.
+     */
+    public function isAllowedForPerson(Person $person): bool;
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Manager.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Manager.php
new file mode 100644
index 000000000..bfeddc8dc
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Manager.php
@@ -0,0 +1,226 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Types\Types;
+
+final readonly class Manager
+{
+    private FetchQueryToSqlBuilder $builder;
+
+    public function __construct(
+        /**
+         * @var iterable<GenericDocForAccompanyingPeriodProviderInterface>
+         */
+        private iterable $providersForAccompanyingPeriod,
+
+        /**
+         * @var iterable<GenericDocForPersonProviderInterface>
+         */
+        private iterable $providersForPerson,
+        private Connection $connection,
+    ) {
+        $this->builder = new FetchQueryToSqlBuilder();
+    }
+
+    /**
+     * @param list<string> $places
+     *
+     * @throws Exception
+     */
+    public function countDocForAccompanyingPeriod(
+        AccompanyingPeriod $accompanyingPeriod,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        array $places = []
+    ): int {
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($accompanyingPeriod, $startDate, $endDate, $content, $places);
+
+        return $this->countDoc($sql, $params, $types);
+    }
+
+    private function countDoc(string $sql, array $params, array $types): int
+    {
+        if ('' === $sql) {
+            return 0;
+        }
+
+        $countSql = "SELECT count(*) AS c FROM ({$sql}) AS sq";
+        $result = $this->connection->executeQuery($countSql, $params, $types);
+
+        $number = $result->fetchOne();
+
+        if (false === $number) {
+            throw new \UnexpectedValueException('number of documents failed to load');
+        }
+
+        return $number;
+    }
+
+    public function countDocForPerson(
+        Person $person,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        array $places = []
+    ): int {
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($person, $startDate, $endDate, $content, $places);
+
+        return $this->countDoc($sql, $params, $types);
+    }
+
+    /**
+     * @param list<string> $places places to search. When empty, search in all places
+     *
+     * @return iterable<GenericDocDTO>
+     *
+     * @throws Exception
+     */
+    public function findDocForAccompanyingPeriod(
+        AccompanyingPeriod $accompanyingPeriod,
+        int $offset = 0,
+        int $limit = 20,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        array $places = []
+    ): iterable {
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($accompanyingPeriod, $startDate, $endDate, $content, $places);
+
+        return $this->findDocs($accompanyingPeriod, $sql, $params, $types, $offset, $limit);
+    }
+
+    /**
+     * @throws \JsonException
+     * @throws Exception
+     */
+    private function findDocs(AccompanyingPeriod|Person $linked, string $sql, array $params, array $types, int $offset, int $limit): iterable
+    {
+        if ('' === $sql) {
+            return [];
+        }
+
+        $runSql = "{$sql} ORDER BY doc_date DESC LIMIT ? OFFSET ?";
+        $runParams = [...$params, ...[$limit, $offset]];
+        $runTypes = [...$types, ...[Types::INTEGER, Types::INTEGER]];
+
+        foreach ($this->connection->iterateAssociative($runSql, $runParams, $runTypes) as $row) {
+            yield new GenericDocDTO(
+                $row['key'],
+                json_decode((string) $row['identifiers'], true, 512, JSON_THROW_ON_ERROR),
+                new \DateTimeImmutable($row['doc_date']),
+                $linked,
+            );
+        }
+    }
+
+    /**
+     * @param list<string> $places places to search. When empty, search in all places
+     *
+     * @return iterable<GenericDocDTO>
+     */
+    public function findDocForPerson(
+        Person $person,
+        int $offset = 0,
+        int $limit = 20,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        array $places = []
+    ): iterable {
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($person, $startDate, $endDate, $content, $places);
+
+        return $this->findDocs($person, $sql, $params, $types, $offset, $limit);
+    }
+
+    public function placesForPerson(Person $person): array
+    {
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($person);
+
+        return $this->places($sql, $params, $types);
+    }
+
+    public function placesForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): array
+    {
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = $this->buildUnionQuery($accompanyingPeriod);
+
+        return $this->places($sql, $params, $types);
+    }
+
+    private function places(string $sql, array $params, array $types): array
+    {
+        if ('' === $sql) {
+            return [];
+        }
+
+        $runSql = "SELECT DISTINCT key FROM ({$sql}) AS sq ORDER BY key";
+
+        $keys = [];
+
+        foreach ($this->connection->iterateAssociative($runSql, $params, $types) as $k) {
+            $keys[] = $k['key'];
+        }
+
+        return $keys;
+    }
+
+    /**
+     * @param list<string> $places places to search. When empty, search in all places
+     */
+    private function buildUnionQuery(
+        AccompanyingPeriod|Person $linked,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        array $places = [],
+    ): array {
+        $queries = [];
+
+        if ($linked instanceof AccompanyingPeriod) {
+            foreach ($this->providersForAccompanyingPeriod as $provider) {
+                if (!$provider->isAllowedForAccompanyingPeriod($linked)) {
+                    continue;
+                }
+                $queries[] = $provider->buildFetchQueryForAccompanyingPeriod($linked, $startDate, $endDate, $content);
+            }
+        } else {
+            foreach ($this->providersForPerson as $provider) {
+                if (!$provider->isAllowedForPerson($linked)) {
+                    continue;
+                }
+                $queries[] = $provider->buildFetchQueryForPerson($linked, $startDate, $endDate, $content);
+            }
+        }
+        $sql = [];
+        $params = [];
+        $types = [];
+
+        foreach ($queries as $query) {
+            if ([] !== $places and !in_array($query->getSelectKeyString(), $places, true)) {
+                continue;
+            }
+
+            ['sql' => $q, 'params' => $p, 'types' => $t] = $this->builder->toSql($query);
+
+            $sql[] = $q;
+            $params = [...$params, ...$p];
+            $types = [...$types, ...$t];
+        }
+
+        return ['sql' => implode(' UNION ', $sql), 'params' => $params, 'types' => $types];
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php
new file mode 100644
index 000000000..40130e3cc
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProvider.php
@@ -0,0 +1,144 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc\Providers;
+
+use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
+use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class AccompanyingCourseDocumentGenericDocProvider implements GenericDocForAccompanyingPeriodProviderInterface, GenericDocForPersonProviderInterface
+{
+    public const KEY = 'accompanying_course_document';
+
+    public function __construct(
+        private Security $security,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $classMetadata = $this->entityManager->getClassMetadata(AccompanyingCourseDocument::class);
+
+        $query = new FetchQuery(
+            self::KEY,
+            sprintf('jsonb_build_object(\'id\', %s)', $classMetadata->getIdentifierColumnNames()[0]),
+            $classMetadata->getColumnName('date'),
+            $classMetadata->getSchemaName().'.'.$classMetadata->getTableName()
+        );
+
+        $query->addWhereClause(
+            sprintf('%s = ?', $classMetadata->getSingleAssociationJoinColumnName('course')),
+            [$accompanyingPeriod->getId()],
+            [Types::INTEGER]
+        );
+
+        return $this->addWhereClause($query, $startDate, $endDate, $content);
+    }
+
+    public function isAllowedForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool
+    {
+        return $this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $accompanyingPeriod);
+    }
+
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $classMetadata = $this->entityManager->getClassMetadata(AccompanyingCourseDocument::class);
+
+        $query = new FetchQuery(
+            self::KEY,
+            sprintf('jsonb_build_object(\'id\', %s)', $classMetadata->getIdentifierColumnNames()[0]),
+            $classMetadata->getColumnName('date'),
+            $classMetadata->getSchemaName().'.'.$classMetadata->getTableName().' AS acc_course_document'
+        );
+
+        $atLeastOne = false;
+        $or = [];
+        $orParams = [];
+        $orTypes = [];
+
+        foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
+            if (!$this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $participation->getAccompanyingPeriod())) {
+                continue;
+            }
+
+            $atLeastOne = true;
+
+            $or[] = sprintf(
+                "(acc_course_document.%s = ? AND acc_course_document.%s BETWEEN ? AND COALESCE(?, 'infinity'::date))",
+                $classMetadata->getSingleAssociationJoinColumnName('course'),
+                $classMetadata->getColumnName('date')
+            );
+            $orParams = [...$orParams, $participation->getAccompanyingPeriod()->getId(), $participation->getStartDate(), $participation->getEndDate()];
+            $orTypes = [...$orTypes, Types::INTEGER, Types::DATE_MUTABLE, Types::DATE_MUTABLE];
+        }
+
+        if (!$atLeastOne) {
+            // there aren't any period allowed to be seen. Add an unreachable condition
+            $query->addWhereClause('TRUE = FALSE');
+
+            return $query;
+        }
+
+        $query->addWhereClause('('.implode(' OR ', $or).')', $orParams, $orTypes);
+
+        return $this->addWhereClause($query, $startDate, $endDate, $content);
+    }
+
+    public function isAllowedForPerson(Person $person): bool
+    {
+        return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
+    }
+
+    private function addWhereClause(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    {
+        $classMetadata = $this->entityManager->getClassMetadata(AccompanyingCourseDocument::class);
+
+        if (null !== $startDate) {
+            $query->addWhereClause(
+                sprintf('? <= %s', $classMetadata->getColumnName('date')),
+                [$startDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $endDate) {
+            $query->addWhereClause(
+                sprintf('? >= %s', $classMetadata->getColumnName('date')),
+                [$endDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $content and '' !== $content) {
+            $query->addWhereClause(
+                sprintf(
+                    '(%s ilike ? OR %s ilike ?)',
+                    $classMetadata->getColumnName('title'),
+                    $classMetadata->getColumnName('description')
+                ),
+                ['%'.$content.'%', '%'.$content.'%'],
+                [Types::STRING, Types::STRING]
+            );
+        }
+
+        return $query;
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/PersonDocumentGenericDocProvider.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/PersonDocumentGenericDocProvider.php
new file mode 100644
index 000000000..5f4728297
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Providers/PersonDocumentGenericDocProvider.php
@@ -0,0 +1,63 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc\Providers;
+
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
+use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class PersonDocumentGenericDocProvider implements GenericDocForPersonProviderInterface, GenericDocForAccompanyingPeriodProviderInterface
+{
+    public const KEY = 'person_document';
+
+    public function __construct(
+        private Security $security,
+        private PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository,
+    ) {}
+
+    public function buildFetchQueryForPerson(
+        Person $person,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null,
+        string $origin = null
+    ): FetchQueryInterface {
+        return $this->personDocumentACLAwareRepository->buildFetchQueryForPerson(
+            $person,
+            $startDate,
+            $endDate,
+            $content
+        );
+    }
+
+    public function isAllowedForPerson(Person $person): bool
+    {
+        return $this->security->isGranted(PersonDocumentVoter::SEE, $person);
+    }
+
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        return $this->personDocumentACLAwareRepository->buildFetchQueryForAccompanyingPeriod($accompanyingPeriod, $startDate, $endDate, $content);
+    }
+
+    public function isAllowedForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool
+    {
+        // we assume that the user is allowed to see at least one person of the course
+        // this will be double checked when running the query
+        return true;
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Renderer/AccompanyingCourseDocumentGenericDocRenderer.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Renderer/AccompanyingCourseDocumentGenericDocRenderer.php
new file mode 100644
index 000000000..70175ee1b
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Renderer/AccompanyingCourseDocumentGenericDocRenderer.php
@@ -0,0 +1,58 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc\Renderer;
+
+use Chill\DocStoreBundle\GenericDoc\GenericDocDTO;
+use Chill\DocStoreBundle\GenericDoc\Providers\PersonDocumentGenericDocProvider;
+use Chill\DocStoreBundle\GenericDoc\Twig\GenericDocRendererInterface;
+use Chill\DocStoreBundle\GenericDoc\Providers\AccompanyingCourseDocumentGenericDocProvider;
+use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
+use Chill\DocStoreBundle\Repository\PersonDocumentRepository;
+
+final readonly class AccompanyingCourseDocumentGenericDocRenderer implements GenericDocRendererInterface
+{
+    public function __construct(
+        private AccompanyingCourseDocumentRepository $accompanyingCourseDocumentRepository,
+        private PersonDocumentRepository $personDocumentRepository,
+    ) {}
+
+    public function supports(GenericDocDTO $genericDocDTO, $options = []): bool
+    {
+        return AccompanyingCourseDocumentGenericDocProvider::KEY === $genericDocDTO->key
+            || PersonDocumentGenericDocProvider::KEY === $genericDocDTO->key;
+    }
+
+    public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string
+    {
+        return '@ChillDocStore/List/list_item.html.twig';
+    }
+
+    public function getTemplateData(GenericDocDTO $genericDocDTO, $options = []): array
+    {
+        if (AccompanyingCourseDocumentGenericDocProvider::KEY === $genericDocDTO->key) {
+            return [
+                'document' => $doc = $this->accompanyingCourseDocumentRepository->find($genericDocDTO->identifiers['id']),
+                'accompanyingCourse' => $doc->getCourse(),
+                'options' => $options,
+                'context' => $genericDocDTO->getContext(),
+            ];
+        }
+
+        // this is a person
+        return [
+            'document' => $doc = $this->personDocumentRepository->find($genericDocDTO->identifiers['id']),
+            'person' => $doc->getPerson(),
+            'options' => $options,
+            'context' => $genericDocDTO->getContext(),
+        ];
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtension.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtension.php
new file mode 100644
index 000000000..2420cc424
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtension.php
@@ -0,0 +1,28 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc\Twig;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
+final class GenericDocExtension extends AbstractExtension
+{
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('chill_generic_doc_render', [GenericDocExtensionRuntime::class, 'renderGenericDoc'], [
+                'needs_environment' => true,
+                'is_safe' => ['html'],
+            ]),
+        ];
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php
new file mode 100644
index 000000000..e64838b41
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocExtensionRuntime.php
@@ -0,0 +1,48 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc\Twig;
+
+use Chill\DocStoreBundle\GenericDoc\GenericDocDTO;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
+use Twig\Extension\RuntimeExtensionInterface;
+
+final readonly class GenericDocExtensionRuntime implements RuntimeExtensionInterface
+{
+    public function __construct(
+        /**
+         * @var list<GenericDocRendererInterface>
+         */
+        private iterable $renderers,
+    ) {}
+
+    /**
+     * @throws RuntimeError
+     * @throws SyntaxError
+     * @throws LoaderError
+     */
+    public function renderGenericDoc(Environment $twig, GenericDocDTO $genericDocDTO, array $options = []): string
+    {
+        foreach ($this->renderers as $renderer) {
+            if ($renderer->supports($genericDocDTO)) {
+                return $twig->render(
+                    $renderer->getTemplate($genericDocDTO, $options),
+                    $renderer->getTemplateData($genericDocDTO, $options),
+                );
+            }
+        }
+
+        throw new \LogicException('no renderer found');
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocRendererInterface.php b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocRendererInterface.php
new file mode 100644
index 000000000..cdd28ac70
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/GenericDoc/Twig/GenericDocRendererInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+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 Chill\DocStoreBundle\GenericDoc\Twig;
+
+use Chill\DocStoreBundle\GenericDoc\GenericDocDTO;
+
+interface GenericDocRendererInterface
+{
+    public function supports(GenericDocDTO $genericDocDTO, $options = []): bool;
+
+    public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string;
+
+    public function getTemplateData(GenericDocDTO $genericDocDTO, $options = []): array;
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
index 41d31ced3..485c95078 100644
--- a/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
@@ -15,40 +15,20 @@ 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
+final readonly class MenuBuilder implements LocalMenuBuilderInterface
 {
-    private Security $security;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        Security $security,
-        TranslatorInterface $translator
-    ) {
-        $this->security = $security;
-        $this->translator = $translator;
-    }
+    public function __construct(private Security $security, private TranslatorInterface $translator) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        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");
-        }
+        match ($menuId) {
+            'accompanyingCourse' => $this->buildMenuAccompanyingCourse($menu, $parameters),
+            'person' => $this->buildMenuPerson($menu, $parameters),
+            default => throw new \LogicException("this menuid {$menuId} is not implemented"),
+        };
     }
 
     public static function getMenuIds(): array
@@ -62,9 +42,9 @@ final class MenuBuilder implements LocalMenuBuilderInterface
 
         if ($this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $course)) {
             $menu->addChild($this->translator->trans('Documents'), [
-                'route' => 'accompanying_course_document_index',
+                'route' => 'chill_docstore_generic-doc_by-period_index',
                 'routeParameters' => [
-                    'course' => $course->getId(),
+                    'id' => $course->getId(),
                 ],
             ])
                 ->setExtras([
@@ -80,9 +60,9 @@ final class MenuBuilder implements LocalMenuBuilderInterface
 
         if ($this->security->isGranted(PersonDocumentVoter::SEE, $person)) {
             $menu->addChild($this->translator->trans('Documents'), [
-                'route' => 'person_document_index',
+                'route' => 'chill_docstore_generic-doc_by-person_index',
                 'routeParameters' => [
-                    'person' => $person->getId(),
+                    'id' => $person->getId(),
                 ],
             ])
                 ->setExtras([
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
index de1958f36..6c6e93fd7 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
@@ -20,13 +20,10 @@ use Doctrine\Persistence\ObjectRepository;
 
 class AccompanyingCourseDocumentRepository implements ObjectRepository
 {
-    private EntityManagerInterface $em;
+    private readonly EntityRepository $repository;
 
-    private EntityRepository $repository;
-
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(private readonly EntityManagerInterface $em)
     {
-        $this->em = $em;
         $this->repository = $em->getRepository(AccompanyingCourseDocument::class);
     }
 
@@ -58,7 +55,7 @@ class AccompanyingCourseDocumentRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
index 40d134200..166749f71 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
@@ -21,19 +21,13 @@ use Doctrine\Persistence\ObjectRepository;
  */
 class DocumentCategoryRepository implements ObjectRepository
 {
-    private EntityManagerInterface $em;
+    private readonly EntityRepository $repository;
 
-    private EntityRepository $repository;
-
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(private readonly EntityManagerInterface $em)
     {
-        $this->em = $em;
         $this->repository = $em->getRepository(DocumentCategory::class);
     }
 
-    /**
-     * @param mixed $id
-     */
     public function find($id): ?DocumentCategory
     {
         return $this->repository->find($id);
@@ -47,7 +41,7 @@ class DocumentCategoryRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
index 23dcc4e0b..385e8f398 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
@@ -12,31 +12,29 @@ declare(strict_types=1);
 namespace Chill\DocStoreBundle\Repository;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\DocStoreBundle\GenericDoc\Providers\PersonDocumentGenericDocProvider;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Security\Core\Security;
 
-class PersonDocumentACLAwareRepository implements PersonDocumentACLAwareRepositoryInterface
+final readonly class PersonDocumentACLAwareRepository implements PersonDocumentACLAwareRepositoryInterface
 {
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    private CenterResolverDispatcher $centerResolverDispatcher;
-
-    private EntityManagerInterface $em;
-
-    private Security $security;
-
-    public function __construct(EntityManagerInterface $em, AuthorizationHelperInterface $authorizationHelper, CenterResolverDispatcher $centerResolverDispatcher, Security $security)
-    {
-        $this->em = $em;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-        $this->security = $security;
-    }
+    public function __construct(
+        private EntityManagerInterface $em,
+        private CenterResolverManagerInterface $centerResolverManager,
+        private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser,
+        private Security $security,
+    ) {}
 
     public function buildQueryByPerson(Person $person): QueryBuilder
     {
@@ -49,6 +47,127 @@ class PersonDocumentACLAwareRepository implements PersonDocumentACLAwareReposito
         return $qb;
     }
 
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
+    {
+        $query = $this->buildBaseFetchQueryForPerson($person, $startDate, $endDate, $content);
+
+        return $this->addFetchQueryByPersonACL($query, $person);
+    }
+
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $period, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
+    {
+        $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
+        $participationMetadata = $this->em->getClassMetadata(AccompanyingPeriodParticipation::class);
+
+        $query = new FetchQuery(
+            PersonDocumentGenericDocProvider::KEY,
+            sprintf('jsonb_build_object(\'id\', person_document.%s)', $personDocMetadata->getSingleIdentifierColumnName()),
+            sprintf('person_document.%s', $personDocMetadata->getColumnName('date')),
+            sprintf('%s AS person_document', $personDocMetadata->getSchemaName().'.'.$personDocMetadata->getTableName())
+        );
+
+        $query->addJoinClause(
+            sprintf(
+                'JOIN %s AS participation ON participation.%s = person_document.%s '.
+                'AND person_document.%s BETWEEN participation.%s AND COALESCE(participation.%s, \'infinity\'::date)',
+                $participationMetadata->getTableName(),
+                $participationMetadata->getSingleAssociationJoinColumnName('person'),
+                $personDocMetadata->getSingleAssociationJoinColumnName('person'),
+                $personDocMetadata->getColumnName('date'),
+                $participationMetadata->getColumnName('startDate'),
+                $participationMetadata->getColumnName('endDate')
+            )
+        );
+
+        $query->addWhereClause(
+            sprintf('participation.%s = ?', $participationMetadata->getSingleAssociationJoinColumnName('accompanyingPeriod')),
+            [$period->getId()],
+            [Types::INTEGER]
+        );
+
+        // can we see the document for this person ?
+        $orPersonId = [];
+        foreach ($period->getParticipations() as $participation) {
+            if (!$this->security->isGranted(PersonDocumentVoter::SEE, $participation->getPerson())) {
+                continue;
+            }
+            $orPersonId[] = $participation->getPerson()->getId();
+        }
+
+        if ([] === $orPersonId) {
+            $query->addWhereClause('FALSE = TRUE');
+
+            return $query;
+        }
+
+        $query->addWhereClause(
+            sprintf(
+                'participation.%s IN (%s)',
+                $participationMetadata->getSingleAssociationJoinColumnName('person'),
+                implode(', ', array_fill(0, count($orPersonId), '?'))
+            ),
+            $orPersonId,
+            array_fill(0, count($orPersonId), Types::INTEGER)
+        );
+
+        return $this->addFilterClauses($query, $startDate, $endDate, $content);
+    }
+
+    public function buildBaseFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    {
+        $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
+
+        $query = new FetchQuery(
+            PersonDocumentGenericDocProvider::KEY,
+            sprintf('jsonb_build_object(\'id\', person_document.%s)', $personDocMetadata->getSingleIdentifierColumnName()),
+            sprintf('person_document.%s', $personDocMetadata->getColumnName('date')),
+            sprintf('%s AS person_document', $personDocMetadata->getSchemaName().'.'.$personDocMetadata->getTableName())
+        );
+
+        $query->addWhereClause(
+            sprintf('person_document.%s = ?', $personDocMetadata->getSingleAssociationJoinColumnName('person')),
+            [$person->getId()],
+            [Types::INTEGER]
+        );
+
+        return $this->addFilterClauses($query, $startDate, $endDate, $content);
+    }
+
+    private function addFilterClauses(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    {
+        $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
+
+        if (null !== $startDate) {
+            $query->addWhereClause(
+                sprintf('? <= %s', $personDocMetadata->getColumnName('date')),
+                [$startDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $endDate) {
+            $query->addWhereClause(
+                sprintf('? >= %s', $personDocMetadata->getColumnName('date')),
+                [$endDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $content and '' !== $content) {
+            $query->addWhereClause(
+                sprintf(
+                    '(%s ilike ? OR %s ilike ?)',
+                    $personDocMetadata->getColumnName('title'),
+                    $personDocMetadata->getColumnName('description')
+                ),
+                ['%'.$content.'%', '%'.$content.'%'],
+                [Types::STRING, Types::STRING]
+            );
+        }
+
+        return $query;
+    }
+
     public function countByPerson(Person $person): int
     {
         $qb = $this->buildQueryByPerson($person)->select('COUNT(d)');
@@ -65,7 +184,7 @@ class PersonDocumentACLAwareRepository implements PersonDocumentACLAwareReposito
         $this->addACL($qb, $person);
 
         foreach ($orderBy as $field => $order) {
-            $qb->addOrderBy('d.' . $field, $order);
+            $qb->addOrderBy('d.'.$field, $order);
         }
 
         $qb->setFirstResult($offset)->setMaxResults($limit);
@@ -75,16 +194,58 @@ class PersonDocumentACLAwareRepository implements PersonDocumentACLAwareReposito
 
     private function addACL(QueryBuilder $qb, Person $person): void
     {
-        $center = $this->centerResolverDispatcher->resolveCenter($person);
+        $reachableScopes = [];
 
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableScopes(
-                $this->security->getUser(),
-                PersonDocumentVoter::SEE,
-                $center
-            );
+        foreach ($this->centerResolverManager->resolveCenters($person) as $center) {
+            $reachableScopes = [
+                ...$reachableScopes,
+                ...$this->authorizationHelperForCurrentUser
+                    ->getReachableScopes(
+                        PersonDocumentVoter::SEE,
+                        $center
+                    ),
+            ];
+        }
+
+        if ([] === $reachableScopes) {
+            $qb->andWhere("'FALSE' = 'TRUE'");
+
+            return;
+        }
 
         $qb->andWhere($qb->expr()->in('d.scope', ':scopes'))
             ->setParameter('scopes', $reachableScopes);
     }
+
+    private function addFetchQueryByPersonACL(FetchQuery $fetchQuery, Person $person): FetchQuery
+    {
+        $personDocMetadata = $this->em->getClassMetadata(PersonDocument::class);
+
+        $reachableScopes = [];
+
+        foreach ($this->centerResolverManager->resolveCenters($person) as $center) {
+            $reachableScopes = [
+                ...$reachableScopes,
+                ...$this->authorizationHelperForCurrentUser->getReachableScopes(PersonDocumentVoter::SEE, $center),
+            ];
+        }
+
+        if ([] === $reachableScopes) {
+            $fetchQuery->addWhereClause('FALSE = TRUE');
+
+            return $fetchQuery;
+        }
+
+        $fetchQuery->addWhereClause(
+            sprintf(
+                'person_document.%s IN (%s)',
+                $personDocMetadata->getSingleAssociationJoinColumnName('scope'),
+                implode(', ', array_fill(0, count($reachableScopes), '?'))
+            ),
+            array_map(static fn (Scope $s) => $s->getId(), $reachableScopes),
+            array_fill(0, count($reachableScopes), Types::INTEGER)
+        );
+
+        return $fetchQuery;
+    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
index 6c4bd2e9a..4bb55ce50 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
@@ -11,11 +11,33 @@ declare(strict_types=1);
 
 namespace Chill\DocStoreBundle\Repository;
 
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 
 interface PersonDocumentACLAwareRepositoryInterface
 {
+    /**
+     * @deprecated use fetch query for listing and counting person documents
+     */
     public function countByPerson(Person $person): int;
 
+    /**
+     * @deprecated use fetch query for listing and counting person documents
+     */
     public function findByPerson(Person $person, array $orderBy = [], int $limit = 20, int $offset = 0): array;
+
+    public function buildFetchQueryForPerson(
+        Person $person,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null
+    ): FetchQueryInterface;
+
+    public function buildFetchQueryForAccompanyingPeriod(
+        AccompanyingPeriod $period,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null
+    ): FetchQueryInterface;
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentRepository.php
new file mode 100644
index 000000000..4dfeb74fe
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentRepository.php
@@ -0,0 +1,56 @@
+<?php
+
+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 Chill\DocStoreBundle\Repository;
+
+use Chill\DocStoreBundle\Entity\PersonDocument;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+/**
+ * @template ObjectRepository<PersonDocument::class>
+ */
+readonly class PersonDocumentRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(
+        private EntityManagerInterface $entityManager
+    ) {
+        $this->repository = $this->entityManager->getRepository($this->getClassName());
+    }
+
+    public function find($id): ?PersonDocument
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll()
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?PersonDocument
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return PersonDocument::class;
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
index 82e658620..92644c97d 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class StoredObjectRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -44,7 +44,7 @@ final class StoredObjectRepository implements ObjectRepository
      *
      * @return array<int, StoredObject>
      */
-    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);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
index aa99a223f..be482cf7e 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
@@ -44,3 +44,9 @@ async function download_and_open(event: Event): Promise<void> {
 }
 
 </script>
+
+<style scoped lang="sass">
+i.fa::before {
+   color: var(--bs-dropdown-link-hover-color);
+}
+</style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
index f05d1e91c..0248ef30b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
@@ -1,51 +1,96 @@
 <template>
-  <a :class="props.classes" @click="download_and_open($event)">
-    <i class="fa fa-download"></i>
-    Télécharger
-  </a>
+    <a v-if="!state.is_ready" :class="props.classes" @click="download_and_open($event)">
+        <i class="fa fa-download"></i>
+        Télécharger
+    </a>
+    <a v-else :class="props.classes" target="_blank" :type="props.storedObject.type" :download="buildDocumentName()" :href="state.href_url" ref="open_button">
+        <i class="fa fa-external-link"></i>
+        Ouvrir
+    </a>
 </template>
 
 <script lang="ts" setup>
-import {reactive} from "vue";
+import {reactive, ref, nextTick, onMounted} from "vue";
 import {build_download_info_link, download_and_decrypt_doc} from "./helpers";
 import mime from "mime";
 import {StoredObject} from "../../types";
 
 interface DownloadButtonConfig {
-  storedObject: StoredObject,
-  classes: {[k: string]: boolean},
-  filename?: string,
+    storedObject: StoredObject,
+    classes: { [k: string]: boolean },
+    filename?: string,
 }
 
 interface DownloadButtonState {
-  content: null|string
+    is_ready: boolean,
+    is_running: boolean,
+    href_url: string,
 }
 
 const props = defineProps<DownloadButtonConfig>();
-const state: DownloadButtonState = reactive({content: null});
+const state: DownloadButtonState = reactive({is_ready: false, is_running: false, href_url: "#"});
+
+const open_button = ref<HTMLAnchorElement | null>(null);
+
+function buildDocumentName(): string {
+    const document_name = props.filename || 'document';
+    const ext = mime.getExtension(props.storedObject.type);
+
+    if (null !== ext) {
+        return document_name + '.' + ext;
+    }
+
+    return document_name;
+}
 
 async function download_and_open(event: Event): Promise<void> {
-  const button = event.target as HTMLAnchorElement;
+    const button = event.target as HTMLAnchorElement;
 
-  if (null === state.content) {
-    event.preventDefault();
+    if (state.is_running) {
+        console.log('state is running, aborting');
+        return;
+    }
+
+    state.is_running = true;
+
+    if (state.is_ready) {
+        console.log('state is ready. This should not happens');
+        return;
+    }
 
     const urlInfo = build_download_info_link(props.storedObject.filename);
+    let raw;
 
-    const raw = await download_and_decrypt_doc(urlInfo, props.storedObject.keyInfos, new Uint8Array(props.storedObject.iv));
-    state.content = window.URL.createObjectURL(raw);
-
-    button.href = window.URL.createObjectURL(raw);
-    button.type = props.storedObject.type;
-
-    button.download = props.filename || 'document';
-
-    const ext = mime.getExtension(props.storedObject.type);
-    if (null !== ext) {
-      button.download = button.download + '.' + ext;
+    try {
+        raw = await download_and_decrypt_doc(urlInfo, props.storedObject.keyInfos, new Uint8Array(props.storedObject.iv));
+    } catch (e) {
+        console.error("error while downloading and decrypting document");
+        console.error(e);
+        throw e;
     }
-  }
 
-  button.click();
+    console.log('document downloading (and decrypting) successfully');
+
+    console.log('creating the url')
+    state.href_url = window.URL.createObjectURL(raw);
+    console.log('url created', state.href_url);
+    state.is_running = false;
+    state.is_ready = true;
+    console.log('new button marked as ready');
+    console.log('will click on button');
+
+    console.log('openbutton is now', open_button.value);
+
+    await nextTick();
+    console.log('next tick actions');
+    console.log('openbutton after next tick', open_button.value);
+    open_button.value?.click();
+    console.log('open button should have been clicked');
 }
 </script>
+
+<style scoped lang="sass">
+i.fa::before {
+   color: var(--bs-dropdown-link-hover-color);
+}
+</style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
index d68f60f86..ea244192e 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
@@ -40,5 +40,8 @@ async function beforeLeave(event: Event): Promise<true> {
 </script>
 
 <style scoped lang="sass">
+i.fa::before {
+   color: var(--bs-dropdown-link-hover-color);
+}
 </style>
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
index 5b61a108d..c0b0fa940 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
@@ -149,16 +149,21 @@ async function download_and_decrypt_doc(urlGenerator: string, keyData: JsonWebKe
    }
 
    if (iv.length === 0) {
+     console.log('returning document immediatly');
      return rawResponse.blob();
    }
 
+   console.log('start decrypting doc');
+
    const rawBuffer = await rawResponse.arrayBuffer();
 
    try {
      const key = await window.crypto.subtle
        .importKey('jwk', keyData, { name: algo }, false, ['decrypt']);
+     console.log('key created');
      const decrypted = await window.crypto.subtle
        .decrypt({ name: algo, iv: iv }, key, rawBuffer);
+     console.log('doc decrypted');
 
      return Promise.resolve(new Blob([decrypted]));
    } catch (e) {
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
index c9bb608cf..d6f23d09d 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig
@@ -31,8 +31,8 @@
         'title'             : 'Delete document ?'|trans,
         'display_content'   : block('docdescription'),
         'confirm_question'  : 'Are you sure you want to remove this document ?'|trans,
-        'cancel_route'      : 'accompanying_course_document_index',
-        'cancel_parameters' : {'course' : accompanyingCourse.id, 'id': document.id},
+        'cancel_route'      : 'chill_docstore_generic-doc_by-period_index',
+        'cancel_parameters' : {'id' : accompanyingCourse.id},
         'form'              : delete_form
     } ) }}
 {% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
index 0ca5661fc..326814502 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
@@ -21,7 +21,7 @@
 
 	<ul class="record_actions sticky-form-buttons">
 		<li class="cancel">
-			<a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
+			<a href="{{ chill_return_path_or('chill_docstore_generic-doc_by-period_index', {'id': accompanyingCourse.id}) }}" class="btn btn-cancel">
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
@@ -31,7 +31,7 @@
             </li>
         {% endif %}
         <li class="edit">
-            <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
+            <button class="btn btn-save">{{ 'Save'|trans }}</button>
 		</li>
 	</ul>
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
deleted file mode 100644
index 7a013260c..000000000
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
-
-{% set activeRouteKey = '' %}
-
-{% block title %}
-	{{ 'Documents' }}
-{% endblock %}
-
-{% block js %}
-	{{ parent() }}
-    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
-    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
-    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
-{% endblock %}
-
-{% block css %}
-	{{ parent() }}
-    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
-    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
-    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
-{% endblock %}
-
-{% block content %}
-<div class="document-list">
-	<h1>{{ 'Documents' }}</h1>
-
-	{% if documents|length == 0 %}
-            <p class="chill-no-data-statement">{{ 'No documents'|trans }}</p>
-    {% else %}
-		<div class="flex-table chill-task-list">
-			{% for document in documents %}
-				{% include '@ChillDocStore/List/list_item.html.twig' %}
-			{% endfor %}
-		</div>
-    {% endif %}
-
-	{{ chill_pagination(pagination) }}
-
-	<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 sticky-form-buttons">
-			<li class="create">
-				<a href="{{ path('accompanying_course_document_new', {'course': accompanyingCourse.id}) }}" class="btn btn-create">
-					{{ 'Create'|trans }}
-				</a>
-			</li>
-		</ul>
-	{% endif %}
-
-</div>
-{% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig
index 01be1a5d7..3fb692c78 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig
@@ -25,7 +25,7 @@
 
 	<ul class="record_actions sticky-form-buttons">
 		<li class="cancel">
-			<a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
+			<a href="{{ chill_return_path_or('chill_docstore_generic-doc_by-period_index', {'id': accompanyingCourse.id}) }}" class="btn btn-cancel">
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
index 3c62451a9..9590dbb78 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
@@ -46,7 +46,7 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
+            <a href="{{ chill_return_path_or('chill_docstore_generic-doc_by-period_index', {'id': accompanyingCourse.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Button/button_group.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Button/button_group.html.twig
index f83cafd51..2babe1ad9 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Button/button_group.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Button/button_group.html.twig
@@ -1,5 +1,5 @@
 {%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
-<div
+<div class="d-inline-flex"
     data-download-buttons
     data-stored-object="{{ document_json|json_encode|escape('html_attr') }}"
     data-can-edit="{{ can_edit ? '1' : '0' }}"
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
index 42f98596e..1889df97f 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
@@ -6,7 +6,7 @@
     <h1>{{ 'Document category edit'|trans }}</h1>
 
     {# DISABLED
-        {{ include('ChillDocStoreBundle:DocumentCategory:_form.html.twig', {'button_label': 'Update'}) }}
+        {{ include('@ChillDocStore/DocumentCategory/_form.html.twig', {'button_label': 'Update'}) }}
     #}
 
     {{ form_start(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
index f670609e9..481a9c0f9 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
@@ -6,7 +6,7 @@
     <h1>{{ 'Create new DocumentCategory' | trans }}</h1>
 
     {# DISABLED
-        {{ include('ChillDocStoreBundle:DocumentCategory:_form.html.twig') }}
+        {{ include('@ChillDocStore/DocumentCategory/_form.html.twig') }}
     #}
 
     {{ form_start(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
index 30a7d856b..8890d1321 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
@@ -36,7 +36,7 @@
                class="btn btn-edit">{{ 'Edit' | trans }}</a>
         </li>
         <li>
-            {{ include('ChillDocStoreBundle:DocumentCategory:_delete_form.html.twig') }}
+            {{ include('@ChillDocStore/DocumentCategory/_delete_form.html.twig') }}
         </li>
     </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/GenericDoc/accompanying_period_list.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/GenericDoc/accompanying_period_list.html.twig
new file mode 100644
index 000000000..b22c7d00f
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/GenericDoc/accompanying_period_list.html.twig
@@ -0,0 +1,54 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}
+    {{ 'Documents' }}
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
+{% endblock %}
+
+{% block content %}
+    <div class="document-list">
+        <h1>{{ 'Documents' }}</h1>
+
+        {{ filter|chill_render_filter_order_helper }}
+
+        {% if documents|length == 0 %}
+            <p class="chill-no-data-statement">{{ 'No documents'|trans }}</p>
+        {% else %}
+            <div class="flex-table chill-task-list">
+                {% for document in documents %}
+                    {{ document|chill_generic_doc_render }}
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        {{ chill_pagination(pagination) }}
+
+        <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 sticky-form-buttons">
+                <li class="create">
+                    <a href="{{ path('accompanying_course_document_new', {'course': accompanyingCourse.id}) }}" class="btn btn-create">
+                        {{ 'Create'|trans }}
+                    </a>
+                </li>
+            </ul>
+        {% endif %}
+
+    </div>
+{% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/GenericDoc/person_list.html.twig
similarity index 95%
rename from src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
rename to src/Bundle/ChillDocStoreBundle/Resources/views/GenericDoc/person_list.html.twig
index 8d201605e..a4aa4fbbc 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/GenericDoc/person_list.html.twig
@@ -44,12 +44,14 @@
 <div class="col-md-10 col-xxl">
 	<h1>{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
 
+    {{ filter|chill_render_filter_order_helper }}
+
 	{% if documents|length == 0 %}
             <p class="chill-no-data-statement">{{ 'No documents'|trans }}</p>
     {% else %}
 		<div class="flex-table chill-task-list">
 			{% for document in documents %}
-				{% include 'ChillDocStoreBundle:List:list_item.html.twig' %}
+                {{ document|chill_generic_doc_render }}
 			{% endfor %}
 		</div>
     {% endif %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
index 8dea4bbe7..58504b095 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -10,8 +10,23 @@
             {% elseif document.object.isFailure %}
                 <div class="badge text-bg-warning">{{ 'docgen.Doc generation failed'|trans }}</div>
             {% endif %}
+
+            {% if context == 'person' and accompanyingCourse is defined %}
+                <div>
+                    <span class="badge bg-primary">
+                        <i class="fa fa-random"></i> {{ accompanyingCourse.id }}
+                    </span>&nbsp;
+                </div>
+                {% elseif context == 'accompanying-period' and person is defined %}
+                    <div>
+                    <span class="badge bg-primary">
+                        {{  'Document from person %name%'|trans({ '%name%': document.person|chill_entity_render_string }) }}
+                    </span>&nbsp;
+                    </div>
+
+                {% endif %}
             <div class="denomination h2">
-                {{ document.title }}
+                {{ document.title|chill_print_or_message("No title") }}
             </div>
             {% if document.object.type is not empty %}
                 <div>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
index bfdd87dc3..41c229faa 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
@@ -36,8 +36,8 @@
         'title'             : 'Delete document ?'|trans,
         'display_content'   : block('docdescription'),
         'confirm_question'  : 'Are you sure you want to remove this document ?'|trans,
-        'cancel_route'      : 'person_document_index',
-        'cancel_parameters' : {'person' : person.id, 'id': document.id},
+        'cancel_route'      : 'chill_docstore_generic-doc_by-person_index',
+        'cancel_parameters' : {'id' : person.id},
         'form'              : delete_form
     } ) }}
 {% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
index 416a35e35..17ce9d774 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
@@ -38,7 +38,7 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ chill_return_path_or('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
+            <a href="{{ chill_return_path_or('chill_docstore_generic-doc_by-person_index', {'id': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
index 3187714a6..faf8895e7 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
@@ -42,7 +42,7 @@
 
 	<ul class="record_actions sticky-form-buttons">
 		<li class="cancel">
-			<a href="{{ chill_return_path_or('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
+			<a href="{{ chill_return_path_or('chill_docstore_generic-doc_by-person_index', {'id': person.id}) }}" class="btn btn-cancel">
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
index c276e067e..1c0aa5e64 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
@@ -63,7 +63,7 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
+            <a href="{{ chill_return_path_or('chill_docstore_generic-doc_by-person_index', {'id': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
index 0ef1d4d49..5febc7e42 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
@@ -23,33 +23,25 @@ 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
 {
-    public const CREATE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE';
+    final public const CREATE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE';
 
-    public const DELETE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE';
+    final public const DELETE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE';
 
-    public const SEE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE';
+    final public const SEE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE';
 
-    public const SEE_DETAILS = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS';
+    final public const SEE_DETAILS = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS';
 
-    public const UPDATE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE';
-
-    protected LoggerInterface $logger;
-
-    protected Security $security;
+    final public const UPDATE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE';
 
     protected VoterHelperInterface $voterHelper;
 
     public function __construct(
-        LoggerInterface $logger,
-        Security $security,
+        protected LoggerInterface $logger,
+        protected Security $security,
         VoterHelperFactoryInterface $voterHelperFactory
     ) {
-        $this->logger = $logger;
-        $this->security = $security;
         $this->voterHelper = $voterHelperFactory
             ->generate(self::class)
             ->addCheckFor(AccompanyingCourseDocument::class, $this->getRoles())
@@ -102,7 +94,7 @@ class AccompanyingCourseDocumentVoter extends AbstractChillVoter implements Prov
 
             if (
                 AccompanyingPeriod::STEP_CLOSED === $subject->getCourse()->getStep()
-                && in_array($attribute, [self::CREATE, self::DELETE, self::UPDATE], true)
+                && \in_array($attribute, [self::CREATE, self::DELETE, self::UPDATE], true)
             ) {
                 return false;
             }
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
index 059a2c7d9..21c08e9fd 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
@@ -25,29 +25,23 @@ use Symfony\Component\Security\Core\Security;
 
 class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const CREATE = 'CHILL_PERSON_DOCUMENT_CREATE';
+    final public const CREATE = 'CHILL_PERSON_DOCUMENT_CREATE';
 
-    public const DELETE = 'CHILL_PERSON_DOCUMENT_DELETE';
+    final public const DELETE = 'CHILL_PERSON_DOCUMENT_DELETE';
 
-    public const SEE = 'CHILL_PERSON_DOCUMENT_SEE';
+    final public const SEE = 'CHILL_PERSON_DOCUMENT_SEE';
 
-    public const SEE_DETAILS = 'CHILL_PERSON_DOCUMENT_SEE_DETAILS';
+    final public const SEE_DETAILS = 'CHILL_PERSON_DOCUMENT_SEE_DETAILS';
 
-    public const UPDATE = 'CHILL_PERSON_DOCUMENT_UPDATE';
-
-    protected LoggerInterface $logger;
-
-    protected Security $security;
+    final public const UPDATE = 'CHILL_PERSON_DOCUMENT_UPDATE';
 
     protected VoterHelperInterface $voterHelper;
 
     public function __construct(
-        LoggerInterface $logger,
-        Security $security,
+        protected LoggerInterface $logger,
+        protected Security $security,
         VoterHelperFactoryInterface $voterHelperFactory
     ) {
-        $this->logger = $logger;
-        $this->security = $security;
         $this->voterHelper = $voterHelperFactory
             ->generate(self::class)
             ->addCheckFor(PersonDocument::class, $this->getRoles())
@@ -82,7 +76,7 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
     }
 
     /**
-     * @param string $attribute
+     * @param string         $attribute
      * @param PersonDocument $subject
      *
      * @return bool
diff --git a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
index c9829d3ee..2c96f7faa 100644
--- a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
+++ b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
@@ -15,19 +15,12 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\StoredObjectRepository;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
-use function array_key_exists;
-use function is_array;
 
 class StoredObjectDenormalizer implements DenormalizerInterface
 {
     use ObjectToPopulateTrait;
 
-    private StoredObjectRepository $storedObjectRepository;
-
-    public function __construct(StoredObjectRepository $storedObjectRepository)
-    {
-        $this->storedObjectRepository = $storedObjectRepository;
-    }
+    public function __construct(private readonly StoredObjectRepository $storedObjectRepository) {}
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
@@ -42,11 +35,11 @@ class StoredObjectDenormalizer implements DenormalizerInterface
 
     public function supportsDenormalization($data, $type, $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;
         }
 
diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
index a1ef42ff1..34df98fa2 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php
@@ -15,39 +15,21 @@ use Base64Url\Base64Url;
 use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
-use DateTimeImmutable;
-use DateTimeInterface;
-use DateTimeZone;
-use RuntimeException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
-use Throwable;
-use function array_key_exists;
-use const OPENSSL_RAW_DATA;
 
 final class StoredObjectManager implements StoredObjectManagerInterface
 {
     private const ALGORITHM = 'AES-256-CBC';
 
-    private HttpClientInterface $client;
-
     private array $inMemory = [];
 
-    private TempUrlGeneratorInterface $tempUrlGenerator;
+    public function __construct(private readonly HttpClientInterface $client, private readonly TempUrlGeneratorInterface $tempUrlGenerator) {}
 
-    public function __construct(
-        HttpClientInterface $client,
-        TempUrlGeneratorInterface $tempUrlGenerator
-    ) {
-        $this->client = $client;
-        $this->tempUrlGenerator = $tempUrlGenerator;
-    }
-
-    public function getLastModified(StoredObject $document): DateTimeInterface
+    public function getLastModified(StoredObject $document): \DateTimeInterface
     {
         if ($this->hasCache($document)) {
             $response = $this->getResponseFromCache($document);
@@ -79,7 +61,7 @@ final class StoredObjectManager implements StoredObjectManagerInterface
 
         try {
             $data = $response->getContent();
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
             throw StoredObjectManagerException::unableToGetResponseContent($e);
         }
 
@@ -92,7 +74,7 @@ final class StoredObjectManager implements StoredObjectManagerInterface
             self::ALGORITHM,
             // TODO: Why using this library and not use base64_decode() ?
             Base64Url::decode($document->getKeyInfos()['k']),
-            OPENSSL_RAW_DATA,
+            \OPENSSL_RAW_DATA,
             pack('C*', ...$document->getIv())
         );
 
@@ -115,7 +97,7 @@ final class StoredObjectManager implements StoredObjectManagerInterface
                 self::ALGORITHM,
                 // TODO: Why using this library and not use base64_decode() ?
                 Base64Url::decode($document->getKeyInfos()['k']),
-                OPENSSL_RAW_DATA,
+                \OPENSSL_RAW_DATA,
                 pack('C*', ...$document->getIv())
             )
             : $clearContent;
@@ -140,24 +122,23 @@ final class StoredObjectManager implements StoredObjectManagerInterface
             throw StoredObjectManagerException::errorDuringHttpRequest($exception);
         }
 
-        if ($response->getStatusCode() !== Response::HTTP_CREATED) {
+        if (Response::HTTP_CREATED !== $response->getStatusCode()) {
             throw StoredObjectManagerException::invalidStatusCode($response->getStatusCode());
         }
     }
 
-    private function extractLastModifiedFromResponse(ResponseInterface $response): DateTimeImmutable
+    private function extractLastModifiedFromResponse(ResponseInterface $response): \DateTimeImmutable
     {
         $lastModifiedString = (($response->getHeaders()['last-modified'] ?? [])[0] ?? '');
 
-        $date = DateTimeImmutable::createFromFormat(
-            DateTimeImmutable::RFC7231,
+        $date = \DateTimeImmutable::createFromFormat(
+            \DateTimeImmutable::RFC7231,
             $lastModifiedString,
-            new DateTimeZone('GMT')
+            new \DateTimeZone('GMT')
         );
 
         if (false === $date) {
-            throw new RuntimeException('the date from remote storage could not be parsed: '
-                . $lastModifiedString);
+            throw new \RuntimeException('the date from remote storage could not be parsed: '.$lastModifiedString);
         }
 
         return $date;
@@ -178,11 +159,11 @@ final class StoredObjectManager implements StoredObjectManagerInterface
                         )
                         ->url
                 );
-        } catch (Throwable $e) {
+        } catch (\Throwable $e) {
             throw StoredObjectManagerException::errorDuringHttpRequest($e);
         }
 
-        if ($response->getStatusCode() !== Response::HTTP_OK) {
+        if (Response::HTTP_OK !== $response->getStatusCode()) {
             throw StoredObjectManagerException::invalidStatusCode($response->getStatusCode());
         }
 
@@ -200,7 +181,7 @@ final class StoredObjectManager implements StoredObjectManagerInterface
 
     private function hasCache(StoredObject $document): bool
     {
-        return array_key_exists($document->getUuid()->toString(), $this->inMemory);
+        return \array_key_exists($document->getUuid()->toString(), $this->inMemory);
     }
 
     private function hasKeysAndIv(StoredObject $storedObject): bool
diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php
index caafb3937..cee6586ea 100644
--- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php
@@ -12,26 +12,25 @@ declare(strict_types=1);
 namespace Chill\DocStoreBundle\Service;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
-use DateTimeInterface;
 
 interface StoredObjectManagerInterface
 {
-    public function getLastModified(StoredObject $document): DateTimeInterface;
+    public function getLastModified(StoredObject $document): \DateTimeInterface;
 
     /**
      * Get the content of a StoredObject.
      *
-     * @param StoredObject $document The document.
+     * @param StoredObject $document the document
      *
-     * @return string The retrieved content in clear.
+     * @return string the retrieved content in clear
      */
     public function read(StoredObject $document): string;
 
     /**
      * Set the content of a StoredObject.
      *
-     * @param StoredObject $document The document.
-     * @param $clearContent The content to store in clear.
+     * @param StoredObject $document     the document
+     * @param              $clearContent The content to store in clear
      */
     public function write(StoredObject $document, string $clearContent): void;
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
index ec1df1465..5f7a3c7df 100644
--- a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
+++ b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
@@ -18,9 +18,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Twig\Environment;
 use Twig\Extension\RuntimeExtensionInterface;
 
-use function in_array;
-
-final class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
+final readonly class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
 {
     public const SUPPORTED_MIMES = [
         'image/svg+xml',
@@ -122,15 +120,7 @@ final class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
 
     private const TEMPLATE_BUTTON_GROUP = '@ChillDocStore/Button/button_group.html.twig';
 
-    private DiscoveryInterface $discovery;
-
-    private NormalizerInterface $normalizer;
-
-    public function __construct(DiscoveryInterface $discovery, NormalizerInterface $normalizer)
-    {
-        $this->discovery = $discovery;
-        $this->normalizer = $normalizer;
-    }
+    public function __construct(private DiscoveryInterface $discovery, private NormalizerInterface $normalizer) {}
 
     /**
      * return true if the document is editable.
@@ -140,7 +130,7 @@ final class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
      */
     public function isEditable(StoredObject $document): bool
     {
-        return in_array($document->getType(), self::SUPPORTED_MIMES, true);
+        return \in_array($document->getType(), self::SUPPORTED_MIMES, true);
     }
 
     /**
@@ -150,18 +140,18 @@ final class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
      * @throws \Twig\Error\RuntimeError
      * @throws \Twig\Error\SyntaxError
      */
-    public function renderButtonGroup(Environment $environment, StoredObject $document, ?string $title = null, bool $canEdit = true, array $options = []): string
+    public function renderButtonGroup(Environment $environment, StoredObject $document, string $title = null, bool $canEdit = true, array $options = []): string
     {
         return $environment->render(self::TEMPLATE_BUTTON_GROUP, [
             'document' => $document,
             'document_json' => $this->normalizer->normalize($document, 'json', [AbstractNormalizer::GROUPS => ['read']]),
             'title' => $title,
             'can_edit' => $canEdit,
-            'options' => array_merge(self::DEFAULT_OPTIONS_TEMPLATE_BUTTON_GROUP, $options),
+            'options' => [...self::DEFAULT_OPTIONS_TEMPLATE_BUTTON_GROUP, ...$options],
         ]);
     }
 
-    public function renderEditButton(Environment $environment, StoredObject $document, ?array $options = null): string
+    public function renderEditButton(Environment $environment, StoredObject $document, array $options = null): string
     {
         return $environment->render(self::TEMPLATE, [
             'document' => $document,
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php
new file mode 100644
index 000000000..0994e86e0
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/FetchQueryToSqlBuilderTest.php
@@ -0,0 +1,86 @@
+<?php
+
+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 Chill\DocStoreBundle\Tests\GenericDoc;
+
+use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Doctrine\DBAL\Types\Types;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class FetchQueryToSqlBuilderTest extends KernelTestCase
+{
+    public function testToSql(): void
+    {
+        $query = new FetchQuery(
+            'test',
+            'jsonb_build_object(\'id\', a.column)',
+            'a.datecolumn',
+            'my_table a'
+        );
+        $query->addJoinClause('LEFT JOIN other b ON a.id = b.foreign_id', ['foo'], [Types::STRING]);
+        $index = $query->addJoinClause('LEFT JOIN other c ON a.id = c.foreign_id', ['bar'], [Types::STRING]);
+        $query->addJoinClause('LEFT JOIN other d ON a.id = d.foreign_id', ['bar_baz'], [Types::STRING]);
+        $query->removeJoinClause($index);
+        $query->addWhereClause('b.item = ?', ['baz'], [Types::STRING]);
+        $index = $query->addWhereClause('b.cancel', ['foz'], [Types::STRING]);
+        $query->removeWhereClause($index);
+
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $filteredSql =
+            implode(' ', array_filter(
+                explode(' ', str_replace("\n", '', $sql)),
+                fn (string $tok) => '' !== $tok
+            ))
+        ;
+
+        self::assertEquals(
+            "SELECT 'test' AS key, jsonb_build_object('id', a.column) AS identifiers, ".
+            'a.datecolumn::date AS doc_date FROM my_table a LEFT JOIN other b ON a.id = b.foreign_id LEFT JOIN other d ON a.id = d.foreign_id WHERE b.item = ?',
+            $filteredSql
+        );
+        self::assertEquals(['foo', 'bar_baz', 'baz'], $params);
+        self::assertEquals([Types::STRING, Types::STRING, Types::STRING], $types);
+    }
+
+    public function testToSqlWithoutWhere(): void
+    {
+        $query = new FetchQuery(
+            'test',
+            'jsonb_build_object(\'id\', a.column)',
+            'a.datecolumn',
+            'my_table a'
+        );
+
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $filteredSql =
+            implode(' ', array_filter(
+                explode(' ', str_replace("\n", '', $sql)),
+                fn (string $tok) => '' !== $tok
+            ))
+        ;
+
+        self::assertEquals(
+            "SELECT 'test' AS key, jsonb_build_object('id', a.column) AS identifiers, ".
+            'a.datecolumn::date AS doc_date FROM my_table a',
+            $filteredSql
+        );
+        self::assertEquals([], $params);
+        self::assertEquals([], $types);
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/ManagerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/ManagerTest.php
new file mode 100644
index 000000000..1b22a4d2e
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/ManagerTest.php
@@ -0,0 +1,217 @@
+<?php
+
+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 Chill\DocStoreBundle\Tests\GenericDoc;
+
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocDTO;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
+use Chill\DocStoreBundle\GenericDoc\Manager;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ManagerTest extends KernelTestCase
+{
+    use ProphecyTrait;
+    private EntityManagerInterface $em;
+
+    private Connection $connection;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->em = self::$container->get(EntityManagerInterface::class);
+        $this->connection = self::$container->get(Connection::class);
+    }
+
+    public function testCountByAccompanyingPeriod(): void
+    {
+        $period = $this->em->createQuery('SELECT a FROM '.AccompanyingPeriod::class.' a')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $period) {
+            throw new \UnexpectedValueException('period not found');
+        }
+
+        $manager = new Manager(
+            [new SimpleGenericDocAccompanyingPeriodProvider()],
+            [new SimpleGenericDocPersonProvider()],
+            $this->connection,
+        );
+
+        $nb = $manager->countDocForAccompanyingPeriod($period);
+
+        self::assertIsInt($nb);
+    }
+
+    public function testCountByPerson(): void
+    {
+        $person = $this->em->createQuery('SELECT a FROM '.Person::class.' a')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $person) {
+            throw new \UnexpectedValueException('person found');
+        }
+
+        $manager = new Manager(
+            [new SimpleGenericDocAccompanyingPeriodProvider()],
+            [new SimpleGenericDocPersonProvider()],
+            $this->connection,
+        );
+
+        $nb = $manager->countDocForPerson($person);
+
+        self::assertIsInt($nb);
+    }
+
+    public function testFindDocByAccompanyingPeriod(): void
+    {
+        $period = $this->em->createQuery('SELECT a FROM '.AccompanyingPeriod::class.' a')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $period) {
+            throw new \UnexpectedValueException('period not found');
+        }
+
+        $manager = new Manager(
+            [new SimpleGenericDocAccompanyingPeriodProvider()],
+            [new SimpleGenericDocPersonProvider()],
+            $this->connection,
+        );
+
+        foreach ($manager->findDocForAccompanyingPeriod($period) as $doc) {
+            self::assertInstanceOf(GenericDocDTO::class, $doc);
+        }
+    }
+
+    public function testFindDocByPerson(): void
+    {
+        $person = $this->em->createQuery('SELECT a FROM '.Person::class.' a')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $person) {
+            throw new \UnexpectedValueException('person not found');
+        }
+
+        $manager = new Manager(
+            [new SimpleGenericDocAccompanyingPeriodProvider()],
+            [new SimpleGenericDocPersonProvider()],
+            $this->connection,
+        );
+
+        foreach ($manager->findDocForPerson($person) as $doc) {
+            self::assertInstanceOf(GenericDocDTO::class, $doc);
+        }
+    }
+
+    public function testPlacesForPerson(): void
+    {
+        $person = $this->em->createQuery('SELECT a FROM '.Person::class.' a')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $person) {
+            throw new \UnexpectedValueException('person not found');
+        }
+
+        $manager = new Manager(
+            [new SimpleGenericDocAccompanyingPeriodProvider()],
+            [new SimpleGenericDocPersonProvider()],
+            $this->connection,
+        );
+
+        $places = $manager->placesForPerson($person);
+
+        self::assertEquals(['dummy_person_doc'], $places);
+    }
+
+    public function testPlacesForAccompanyingPeriod(): void
+    {
+        $period = $this->em->createQuery('SELECT a FROM '.AccompanyingPeriod::class.' a')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $period) {
+            throw new \UnexpectedValueException('period not found');
+        }
+
+        $manager = new Manager(
+            [new SimpleGenericDocAccompanyingPeriodProvider()],
+            [new SimpleGenericDocPersonProvider()],
+            $this->connection,
+        );
+
+        $places = $manager->placesForAccompanyingPeriod($period);
+
+        self::assertEquals(['accompanying_course_document_dummy'], $places);
+    }
+}
+
+final readonly class SimpleGenericDocAccompanyingPeriodProvider implements GenericDocForAccompanyingPeriodProviderInterface
+{
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $query = new FetchQuery(
+            'accompanying_course_document_dummy',
+            sprintf('jsonb_build_object(\'id\', %s)', 'id'),
+            'd',
+            '(VALUES (1, \'2023-05-01\'::date), (2, \'2023-05-01\'::date)) AS sq (id, d)',
+        );
+
+        $query->addWhereClause('d > ?', [new \DateTimeImmutable('2023-01-01')], [Types::DATE_IMMUTABLE]);
+
+        return $query;
+    }
+
+    public function isAllowedForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool
+    {
+        return true;
+    }
+}
+
+final readonly class SimpleGenericDocPersonProvider implements GenericDocForPersonProviderInterface
+{
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $query = new FetchQuery(
+            'dummy_person_doc',
+            sprintf('jsonb_build_object(\'id\', %s)', 'id'),
+            'd',
+            '(VALUES (1, \'2023-05-01\'::date), (2, \'2023-05-01\'::date)) AS sq (id, d)',
+        );
+
+        $query->addWhereClause('d > ?', [new \DateTimeImmutable('2023-01-01')], [Types::DATE_IMMUTABLE]);
+
+        return $query;
+    }
+
+    public function isAllowedForPerson(Person $person): bool
+    {
+        return true;
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProviderTest.php b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProviderTest.php
new file mode 100644
index 000000000..edbe59c13
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/AccompanyingCourseDocumentGenericDocProviderTest.php
@@ -0,0 +1,79 @@
+<?php
+
+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 Chill\DocStoreBundle\Tests\GenericDoc\Providers;
+
+use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
+use Chill\DocStoreBundle\GenericDoc\Providers\AccompanyingCourseDocumentGenericDocProvider;
+use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AccompanyingCourseDocumentGenericDocProviderTest extends KernelTestCase
+{
+    use ProphecyTrait;
+    private EntityManagerInterface $entityManager;
+
+    public function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+    }
+
+    /**
+     * @dataProvider provideSearchArguments
+     */
+    public function testWithoutAnyArgument(?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, string $content = null): void
+    {
+        $period = $this->entityManager->createQuery('SELECT a FROM '.AccompanyingPeriod::class.' a')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $period) {
+            throw new \UnexpectedValueException('period not found');
+        }
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted(AccompanyingCourseDocumentVoter::SEE, $period)
+            ->willReturn(true);
+
+        $provider = new AccompanyingCourseDocumentGenericDocProvider(
+            $security->reveal(),
+            $this->entityManager
+        );
+
+        $query = $provider->buildFetchQueryForAccompanyingPeriod($period, $startDate, $endDate, $content);
+
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()->executeQuery('SELECT COUNT(*) FROM ('.$sql.') AS sq', $params, $types)
+            ->fetchOne();
+
+        self::assertIsInt($nb);
+    }
+
+    public function provideSearchArguments(): iterable
+    {
+        yield [null, null, null];
+        yield [new \DateTimeImmutable('1 month ago'), null, null];
+        yield [new \DateTimeImmutable('1 month ago'), new \DateTimeImmutable('now'), null];
+        yield [null, null, 'test'];
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/PersonDocumentGenericDocProviderTest.php b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/PersonDocumentGenericDocProviderTest.php
new file mode 100644
index 000000000..6ac8d71eb
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Tests/GenericDoc/Providers/PersonDocumentGenericDocProviderTest.php
@@ -0,0 +1,85 @@
+<?php
+
+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 Chill\DocStoreBundle\Tests\GenericDoc\Providers;
+
+use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
+use Chill\DocStoreBundle\GenericDoc\Providers\PersonDocumentGenericDocProvider;
+use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonDocumentGenericDocProviderTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private EntityManagerInterface $entityManager;
+
+    private PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+        $this->personDocumentACLAwareRepository = self::$container->get(PersonDocumentACLAwareRepositoryInterface::class);
+    }
+
+    /**
+     * @dataProvider provideDataBuildFetchQueryForPerson
+     *
+     * @throws \Doctrine\DBAL\Exception
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function testBuildFetchQueryForPerson(?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): void
+    {
+        $security = $this->prophesize(Security::class);
+        $person = $this->entityManager->createQuery('SELECT a FROM '.Person::class.' a')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $person) {
+            throw new \UnexpectedValueException('person found');
+        }
+
+        $provider = new PersonDocumentGenericDocProvider(
+            $security->reveal(),
+            $this->personDocumentACLAwareRepository
+        );
+
+        $query = $provider->buildFetchQueryForPerson($person, $startDate, $endDate, $content);
+
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()
+            ->fetchOne("SELECT COUNT(*) AS nb FROM ({$sql}) AS sq", $params, $types);
+
+        self::assertIsInt($nb, 'Test that the query is syntactically correct');
+    }
+
+    public function provideDataBuildFetchQueryForPerson(): iterable
+    {
+        yield [null, null, null];
+        yield [new \DateTimeImmutable('1 year ago'), null, null];
+        yield [null, new \DateTimeImmutable('1 year ago'), null];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), null];
+        yield [null, null, 'test'];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), 'test'];
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php
new file mode 100644
index 000000000..6dfd521a1
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Repository/PersonDocumentACLAwareRepositoryTest.php
@@ -0,0 +1,154 @@
+<?php
+
+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 Chill\DocStoreBundle\Tests\Repository;
+
+use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
+use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepository;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonDocumentACLAwareRepositoryTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private EntityManagerInterface $entityManager;
+
+    private ScopeRepositoryInterface $scopeRepository;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+        $this->scopeRepository = self::$container->get(ScopeRepositoryInterface::class);
+    }
+
+    /**
+     * @dataProvider provideDataBuildFetchQueryForPerson
+     *
+     * @throws \Doctrine\DBAL\Exception
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function testBuildFetchQueryForPerson(\DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): void
+    {
+        $centerManager = $this->prophesize(CenterResolverManagerInterface::class);
+        $centerManager->resolveCenters(Argument::type(Person::class))
+            ->willReturn([new Center()]);
+
+        $scopes = $this->scopeRepository->findAll();
+        $authorizationHelper = $this->prophesize(AuthorizationHelperForCurrentUserInterface::class);
+        $authorizationHelper->getReachableScopes(PersonDocumentVoter::SEE, Argument::any())->willReturn($scopes);
+
+        $repository = new PersonDocumentACLAwareRepository(
+            $this->entityManager,
+            $centerManager->reveal(),
+            $authorizationHelper->reveal(),
+            $this->prophesize(Security::class)->reveal()
+        );
+
+        $person = $this->entityManager->createQuery('SELECT p FROM '.Person::class.' p')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $person) {
+            throw new \RuntimeException('person not exists in database');
+        }
+
+        $query = $repository->buildFetchQueryForPerson($person, $startDate, $endDate, $content);
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()
+            ->fetchOne("SELECT COUNT(*) FROM ({$sql}) AS sq", $params, $types);
+
+        self::assertIsInt($nb, 'test that the query could be executed');
+    }
+
+    /**
+     * @dataProvider provideDateForFetchQueryForAccompanyingPeriod
+     */
+    public function testBuildFetchQueryForAccompanyingPeriod(
+        AccompanyingPeriod $period,
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null
+    ): void {
+        $centerManager = $this->prophesize(CenterResolverManagerInterface::class);
+        $centerManager->resolveCenters(Argument::type(Person::class))
+            ->willReturn([new Center()]);
+
+        $scopes = $this->scopeRepository->findAll();
+        $authorizationHelper = $this->prophesize(AuthorizationHelperForCurrentUserInterface::class);
+        $authorizationHelper->getReachableScopes(PersonDocumentVoter::SEE, Argument::any())->willReturn($scopes);
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted(PersonDocumentVoter::SEE, Argument::type(Person::class))->willReturn(true);
+
+        $repository = new PersonDocumentACLAwareRepository(
+            $this->entityManager,
+            $centerManager->reveal(),
+            $authorizationHelper->reveal(),
+            $security->reveal()
+        );
+
+        $query = $repository->buildFetchQueryForAccompanyingPeriod($period, $startDate, $endDate, $content);
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()
+            ->fetchOne("SELECT COUNT(*) FROM ({$sql}) AS sq", $params, $types);
+
+        self::assertIsInt($nb, 'test that the query could be executed');
+    }
+
+    public function provideDateForFetchQueryForAccompanyingPeriod(): iterable
+    {
+        $this->setUp();
+
+        if (null === $period = $this->entityManager->createQuery(
+            'SELECT p FROM '.AccompanyingPeriod::class.' p WHERE SIZE(p.participations) > 0'
+        )
+            ->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no course found');
+        }
+
+        yield [$period, null, null, null];
+        yield [$period, new \DateTimeImmutable('1 year ago'), null, null];
+        yield [$period, null, new \DateTimeImmutable('1 year ago'), null];
+        yield [$period, new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), null];
+        yield [$period, null, null, 'test'];
+        yield [$period, new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), 'test'];
+    }
+
+    public function provideDataBuildFetchQueryForPerson(): iterable
+    {
+        yield [null, null, null];
+        yield [new \DateTimeImmutable('1 year ago'), null, null];
+        yield [null, new \DateTimeImmutable('1 year ago'), null];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), null];
+        yield [null, null, 'test'];
+        yield [new \DateTimeImmutable('2 years ago'), new \DateTimeImmutable('1 year ago'), 'test'];
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php
index 354a301e8..bf659ba9b 100644
--- a/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php
@@ -16,9 +16,7 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
 use Chill\DocStoreBundle\Service\StoredObjectManager;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
-use Generator;
 use PHPUnit\Framework\TestCase;
-use stdClass;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
@@ -32,7 +30,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
  */
 final class StoredObjectManagerTest extends TestCase
 {
-    public function getDataProvider(): Generator
+    public function getDataProvider(): \Generator
     {
         /* HAPPY SCENARIO */
 
@@ -92,7 +90,7 @@ final class StoredObjectManagerTest extends TestCase
     /**
      * @dataProvider getDataProvider
      */
-    public function testRead(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null)
+    public function testRead(StoredObject $storedObject, string $encodedContent, string $clearContent, string $exceptionClass = null)
     {
         if (null !== $exceptionClass) {
             $this->expectException($exceptionClass);
@@ -106,7 +104,7 @@ final class StoredObjectManagerTest extends TestCase
     /**
      * @dataProvider getDataProvider
      */
-    public function testWrite(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null)
+    public function testWrite(StoredObject $storedObject, string $encodedContent, string $clearContent, string $exceptionClass = null)
     {
         if (null !== $exceptionClass) {
             $this->expectException($exceptionClass);
@@ -144,7 +142,6 @@ final class StoredObjectManagerTest extends TestCase
 
                     case 'https://example.com/error_during_http_request.txt':
                         throw new TransportException('error_during_http_request.txt');
-
                     case 'https://example.com/invalid_statuscode.txt':
                         return new MockResponse($encodedContent, ['http_code' => 404]);
                 }
@@ -166,12 +163,10 @@ final class StoredObjectManagerTest extends TestCase
 
     private function getTempUrlGenerator(StoredObject $storedObject): TempUrlGeneratorInterface
     {
-        $response = new stdClass();
+        $response = new \stdClass();
         $response->url = $storedObject->getFilename();
 
-        $tempUrlGenerator = $this
-            ->getMockBuilder(TempUrlGeneratorInterface::class)
-            ->getMock();
+        $tempUrlGenerator = $this->createMock(TempUrlGeneratorInterface::class);
 
         $tempUrlGenerator
             ->method('generate')
diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
index c538bd107..9d1b619f9 100644
--- a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
@@ -22,19 +22,16 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandlerInterface
 {
-    private EntityRepository $repository;
-
-    private TranslatorInterface $translator;
+    private readonly EntityRepository $repository;
 
     /**
      * TODO: injecter le repository directement.
      */
     public function __construct(
         EntityManagerInterface $em,
-        TranslatorInterface $translator
+        private readonly TranslatorInterface $translator
     ) {
         $this->repository = $em->getRepository(AccompanyingCourseDocument::class);
-        $this->translator = $translator;
     }
 
     public function getDeletionRoles(): array
@@ -46,14 +43,11 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
 
     public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
     {
-        $course = $this->getRelatedEntity($entityWorkflow)
-            ->getCourse();
+        $course = $this->getRelatedEntity($entityWorkflow)?->getCourse();
         $persons = [];
 
         if (null !== $course) {
-            $persons = $course->getCurrentParticipations()->map(static function (AccompanyingPeriodParticipation $participation) {
-                return $participation->getPerson();
-            })->toArray();
+            $persons = $course->getCurrentParticipations()->map(static fn (AccompanyingPeriodParticipation $participation) => $participation->getPerson())->toArray();
         }
 
         return [
@@ -70,7 +64,7 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         }
 
         return $this->translator->trans('workflow.Document (n°%doc%)', ['%doc%' => $entityWorkflow->getRelatedEntityId()])
-            . ' - ' . $doc->getTitle();
+            .' - '.$doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingCourseDocument
@@ -125,7 +119,7 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
-        return $entityWorkflow->getRelatedEntityClass() === AccompanyingCourseDocument::class;
+        return AccompanyingCourseDocument::class === $entityWorkflow->getRelatedEntityClass();
     }
 
     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
diff --git a/src/Bundle/ChillDocStoreBundle/config/routes.yaml b/src/Bundle/ChillDocStoreBundle/config/routes.yaml
index 7f04ebadb..c02dc76ab 100644
--- a/src/Bundle/ChillDocStoreBundle/config/routes.yaml
+++ b/src/Bundle/ChillDocStoreBundle/config/routes.yaml
@@ -1,27 +1,3 @@
 app:
     resource: "@ChillDocStoreBundle/Controller/"
     type:     annotation
-
-## ADMIN SECTION
-chill_docstore_admin:
-    path:     /{_locale}/admin/document
-    controller: Chill\DocStoreBundle\Controller\AdminController::indexAction
-    options:
-        menus:
-            admin_section:
-                order: 2200
-                label: "Documents configuration menu"
-                icons: ['calendar']
-
-chill_docstore_admin_redirect_to_admin_index:
-    path:     /{_locale}/admin/document_redirect_to_main
-    controller: Chill\DocStoreBundle\Controller\AdminController::redirectToAdminIndexAction
-    options:
-        menus:
-            admin_docstore:
-                order: 0
-                label: Main admin menu
-
-chill_docstore_category_admin:
-    path:     /{_locale}/admin/document/category
-    controller: Chill\DocStoreBundle\Controller\DocumentCategoryController::indexAction
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/config/services.yaml b/src/Bundle/ChillDocStoreBundle/config/services.yaml
index 860495677..04fc3ace3 100644
--- a/src/Bundle/ChillDocStoreBundle/config/services.yaml
+++ b/src/Bundle/ChillDocStoreBundle/config/services.yaml
@@ -2,46 +2,72 @@ parameters:
 #    cl_chill_person.example.class: Chill\PersonBundle\Example
 
 services:
-  Chill\DocStoreBundle\Repository\:
-    autowire: true
-    autoconfigure: true
-    resource: "../Repository/"
+    Chill\DocStoreBundle\Repository\:
+        autowire: true
+        autoconfigure: true
+        resource: "../Repository/"
 
-  Chill\DocStoreBundle\Form\DocumentCategoryType:
-    class: Chill\DocStoreBundle\Form\DocumentCategoryType
-    arguments: ["%kernel.bundles%"]
-    tags:
-      - { name: form.type }
+    Chill\DocStoreBundle\Form\DocumentCategoryType:
+        class: Chill\DocStoreBundle\Form\DocumentCategoryType
+        arguments: [ "%kernel.bundles%" ]
+        tags:
+            - { name: form.type }
 
-  Chill\DocStoreBundle\Form\PersonDocumentType:
-    class: Chill\DocStoreBundle\Form\PersonDocumentType
-    autowire: true
-    autoconfigure: true
-    # arguments:
-    #   - "@chill.main.helper.translatable_string"
-    tags:
-      - { name: form.type, alias: chill_docstorebundle_form_document }
+    Chill\DocStoreBundle\Form\PersonDocumentType:
+        class: Chill\DocStoreBundle\Form\PersonDocumentType
+        autowire: true
+        autoconfigure: true
+        # arguments:
+        #   - "@chill.main.helper.translatable_string"
+        tags:
+            - { name: form.type, alias: chill_docstorebundle_form_document }
 
-  Chill\DocStoreBundle\Security\Authorization\:
-    resource: "./../Security/Authorization"
-    autowire: true
-    autoconfigure: true
-    tags:
-      - { name: chill.role }
+    Chill\DocStoreBundle\Security\Authorization\:
+        resource: "./../Security/Authorization"
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.role }
 
-  Chill\DocStoreBundle\Workflow\:
-      resource: './../Workflow/'
-      autoconfigure: true
-      autowire: true
+    Chill\DocStoreBundle\Workflow\:
+        resource: './../Workflow/'
+        autoconfigure: true
+        autowire: true
 
-  Chill\DocStoreBundle\Serializer\Normalizer\:
-      autowire: true
-      resource: '../Serializer/Normalizer/'
-      tags:
-          - { name: 'serializer.normalizer', priority: 16 }
+    Chill\DocStoreBundle\Serializer\Normalizer\:
+        autowire: true
+        resource: '../Serializer/Normalizer/'
+        tags:
+            - { name: 'serializer.normalizer', priority: 16 }
 
-  Chill\DocStoreBundle\Service\:
-      autowire: true
-      autoconfigure: true
-      resource: '../Service/'
+    Chill\DocStoreBundle\Service\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Service/'
 
+    Chill\DocStoreBundle\GenericDoc\Manager:
+        autowire: true
+        autoconfigure: true
+        arguments:
+            $providersForAccompanyingPeriod: !tagged_iterator chill_doc_store.generic_doc_accompanying_period_provider
+            $providersForPerson: !tagged_iterator chill_doc_store.generic_doc_person_provider
+
+    Chill\DocStoreBundle\GenericDoc\Twig\GenericDocExtension:
+        autoconfigure: true
+        autowire: true
+
+    Chill\DocStoreBundle\GenericDoc\Twig\GenericDocExtensionRuntime:
+        autoconfigure: true
+        autowire: true
+        arguments:
+            $renderers: !tagged_iterator chill_doc_store.generic_doc_renderer
+
+    Chill\DocStoreBundle\GenericDoc\Providers\:
+        autowire: true
+        autoconfigure: true
+        resource: '../GenericDoc/Providers/'
+
+    Chill\DocStoreBundle\GenericDoc\Renderer\:
+        autowire: true
+        autoconfigure: true
+        resource: '../GenericDoc/Renderer/'
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
index 917e82186..b9a0bf336 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
@@ -21,14 +21,14 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SCHEMA chill_doc');
         $this->addSql('CREATE SEQUENCE chill_doc.person_document_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
index 02ff4c72b..c18778788 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
@@ -21,7 +21,7 @@ final class Version20180606133338 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_doc.person_document DROP CONSTRAINT FK_41DA53C232D562B');
         $this->addSql('DROP SEQUENCE chill_doc.stored_object_id_seq CASCADE');
@@ -32,7 +32,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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))');
diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
index 1d06c58e4..ffabdaa59 100644
--- a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
@@ -18,10 +18,19 @@ No document found: Aucun document trouvé
 The document is successfully registered: Le document est enregistré
 The document is successfully updated: Le document est mis à jour
 Any description: Aucune description
+Document from person %name%: Document de l'usager %name%
+See the document: Voir le document
 
 document:
     Any title: Aucun titre
 
+generic_doc:
+    filter:
+        keys:
+            accompanying_course_document: Document du parcours
+            person_document: Documents de l'usager
+        date-range: Date du document
+
 # delete
 Delete document ?: Supprimer le document ?
 Are you sure you want to remove this document ?: Êtes-vous sûr·e de vouloir supprimer ce document ?
diff --git a/src/Bundle/ChillEventBundle/ChillEventBundle.php b/src/Bundle/ChillEventBundle/ChillEventBundle.php
index d5a1b43cf..9754f397f 100644
--- a/src/Bundle/ChillEventBundle/ChillEventBundle.php
+++ b/src/Bundle/ChillEventBundle/ChillEventBundle.php
@@ -13,6 +13,4 @@ namespace Chill\EventBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class ChillEventBundle extends Bundle
-{
-}
+class ChillEventBundle extends Bundle {}
diff --git a/src/Bundle/ChillEventBundle/Controller/AdminController.php b/src/Bundle/ChillEventBundle/Controller/AdminController.php
index 88c5aeb9a..3434df9e5 100644
--- a/src/Bundle/ChillEventBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillEventBundle/Controller/AdminController.php
@@ -27,6 +27,6 @@ class AdminController extends AbstractController
      */
     public function indexAdminAction()
     {
-        return $this->render('ChillEventBundle:Admin:index.html.twig');
+        return $this->render('@ChillEvent/Admin/index.html.twig');
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php
index 93ce62f43..0abdff8dd 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -37,11 +37,8 @@ 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\Contracts\Translation\TranslatorInterface;
 
-use function count;
-
 /**
  * Class EventController.
  */
@@ -90,11 +87,9 @@ class EventController extends AbstractController
     }
 
     /**
-     * @param $event_id
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{event_id}/delete", name="chill_event__event_delete", requirements={"event_id"="\d+"}, methods={"GET", "DELETE"})
      */
-    public function deleteAction($event_id, Request $request)
+    public function deleteAction($event_id, Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
     {
         $em = $this->getDoctrine()->getManager();
         $event = $em->getRepository(\Chill\EventBundle\Entity\Event::class)->findOneBy([
@@ -110,7 +105,7 @@ class EventController extends AbstractController
 
         $form = $this->createDeleteForm($event_id);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -134,7 +129,7 @@ class EventController extends AbstractController
             }
         }
 
-        return $this->render('ChillEventBundle:Event:confirm_delete.html.twig', [
+        return $this->render('@ChillEvent/Event/confirm_delete.html.twig', [
             'event_id' => $event->getId(),
             'delete_form' => $form->createView(),
         ]);
@@ -143,9 +138,9 @@ class EventController extends AbstractController
     /**
      * Displays a form to edit an existing Event entity.
      *
-     * @param $event_id
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{event_id}/edit", name="chill_event__event_edit")
      */
     public function editAction($event_id)
     {
@@ -159,7 +154,7 @@ class EventController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillEventBundle:Event:edit.html.twig', [
+        return $this->render('@ChillEvent/Event/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -168,11 +163,11 @@ class EventController extends AbstractController
     /**
      * List events subscriptions for a person.
      *
-     * @param $person_id
+     * @return \Symfony\Component\HttpFoundation\Response
      *
      * @throws \Doctrine\ORM\NonUniqueResultException
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{person_id}/list", name="chill_event__list_by_person", methods={"GET"})
      */
     public function listByPersonAction($person_id)
     {
@@ -188,7 +183,7 @@ class EventController extends AbstractController
 
         $reachablesCircles = $this->authorizationHelper->getReachableCircles(
             $this->getUser(),
-            new Role(EventVoter::SEE),
+            EventVoter::SEE,
             $person->getCenter()
         );
 
@@ -207,11 +202,11 @@ class EventController extends AbstractController
             'element_class' => Participation::class,
             'action' => 'list',
         ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $privacyEvent);
+        $this->eventDispatcher->dispatch($privacyEvent, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         $addEventParticipationByPersonForm = $this->createAddEventParticipationByPersonForm($person);
 
-        return $this->render('ChillEventBundle:Event:listByPerson.html.twig', [
+        return $this->render('@ChillEvent/Event/listByPerson.html.twig', [
             'participations' => $participations,
             'person' => $person,
             'paginator' => $paginator,
@@ -219,6 +214,9 @@ class EventController extends AbstractController
         ]);
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/most_recent", name="chill_event_list_most_recent", options={null})
+     */
     public function mostRecentIndexAction()
     {
         return $this->redirectToRoute('chill_main_search', [
@@ -229,9 +227,9 @@ class EventController extends AbstractController
     /**
      * Displays a form to create a new Event entity.
      *
-     * @param Center $center
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/new", name="chill_event__event_new", methods={"GET", "POST"})
      */
     public function newAction(?Center $center, Request $request)
     {
@@ -254,10 +252,10 @@ class EventController extends AbstractController
             $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->redirectToRoute('chill_event__event_show', ['event_id' => $entity->getId()]);
         }
 
-        return $this->render('ChillEventBundle:Event:new.html.twig', [
+        return $this->render('@ChillEvent/Event/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -265,17 +263,19 @@ class EventController extends AbstractController
 
     /**
      * First step of new Event form.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/new/pick-center", name="chill_event__event_new_pickcenter", options={null})
      */
     public function newPickCenterAction()
     {
-        $role = new Role('CHILL_EVENT_CREATE');
+        $role = 'CHILL_EVENT_CREATE';
 
         /**
          * @var Center $centers
          */
-        $centers = $this->authorizationHelper->getReachableCenters($this->getUser(), (string) $role);
+        $centers = $this->authorizationHelper->getReachableCenters($this->getUser(), $role);
 
-        if (count($centers) === 1) {
+        if (1 === \count($centers)) {
             return $this->redirectToRoute('chill_event__event_new', [
                 'center_id' => $centers[0]->getId(),
             ]);
@@ -300,7 +300,7 @@ class EventController extends AbstractController
             ])
             ->getForm();
 
-        return $this->render('ChillEventBundle:Event:newPickCenter.html.twig', [
+        return $this->render('@ChillEvent/Event/newPickCenter.html.twig', [
             'form' => $form->createView(),
         ]);
     }
@@ -310,9 +310,11 @@ class EventController extends AbstractController
      *
      * @ParamConverter("event", options={"id": "event_id"})
      *
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws \PhpOffice\PhpSpreadsheet\Exception
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{event_id}/show", name="chill_event__event_show")
      */
     public function showAction(Event $event, Request $request)
     {
@@ -334,7 +336,7 @@ class EventController extends AbstractController
             return $exportParticipationsList['response'];
         }
 
-        return $this->render('ChillEventBundle:Event:show.html.twig', [
+        return $this->render('@ChillEvent/Event/show.html.twig', [
             'event' => $event,
             'form_add_participation_by_person' => $addParticipationByPersonForm->createView(),
             'form_export' => $exportParticipationsList['form']->createView(),
@@ -344,11 +346,9 @@ class EventController extends AbstractController
     /**
      * Edits an existing Event entity.
      *
-     * @param $event_id
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/event/{event_id}/update", name="chill_event__event_update", methods={"POST", "PUT"})
      */
-    public function updateAction(Request $request, $event_id)
+    public function updateAction(Request $request, $event_id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -367,10 +367,10 @@ class EventController extends AbstractController
             $this->addFlash('success', $this->get('translator')
                 ->trans('The event was updated'));
 
-            return $this->redirect($this->generateUrl('chill_event__event_edit', ['event_id' => $event_id]));
+            return $this->redirectToRoute('chill_event__event_edit', ['event_id' => $event_id]);
         }
 
-        return $this->render('ChillEventBundle:Event:edit.html.twig', [
+        return $this->render('@ChillEvent/Event/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -398,7 +398,7 @@ class EventController extends AbstractController
             );
 
         $builder->add('event_id', PickEventType::class, [
-            'role' => new Role('CHILL_EVENT_CREATE'),
+            'role' => 'CHILL_EVENT_CREATE',
             'centers' => $person->getCenter(),
         ]);
 
@@ -445,7 +445,7 @@ class EventController extends AbstractController
             );
 
         $builder->add('person_id', PickPersonType::class, [
-            'role' => new Role('CHILL_EVENT_CREATE'),
+            'role' => 'CHILL_EVENT_CREATE',
             'centers' => $event->getCenter(),
         ]);
 
@@ -487,9 +487,9 @@ class EventController extends AbstractController
     }
 
     /**
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     *
      * @return Spreadsheet
+     *
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
     protected function createExportSpreadsheet(Event $event)
     {
@@ -510,7 +510,7 @@ class EventController extends AbstractController
             'A5' => 'Circle',
             'B5' => $event->getCircle()->getName()[$trans],
             'A6' => 'Moderator',
-            'B6' => $event->getModerator() ? $event->getModerator()->getUsernameCanonical() : null,
+            'B6' => null !== $event->getModerator() ? $event->getModerator()->getUsernameCanonical() : null,
         ];
 
         foreach ($headerValues as $k => $value) {
@@ -521,14 +521,14 @@ class EventController extends AbstractController
         $columnLetter = 'A';
 
         foreach ($columnNames as $columnName) {
-            $sheet->setCellValue($columnLetter . '8', $columnName);
+            $sheet->setCellValue($columnLetter.'8', $columnName);
             ++$columnLetter;
         }
 
         $columnValues = [];
 
         foreach ($event->getParticipations() as $participation) {
-            /** @var Participation $participation */
+            /* @var Participation $participation */
             $columnValues[] = [
                 $participation->getPerson()->getId(),
                 $participation->getPerson()->getFirstname(),
@@ -547,7 +547,7 @@ class EventController extends AbstractController
             $columnLetter = 'A';
 
             foreach ($columnValue as $value) {
-                $sheet->setCellValue($columnLetter . $i, $value);
+                $sheet->setCellValue($columnLetter.$i, $value);
                 ++$columnLetter;
             }
             ++$i;
@@ -557,9 +557,9 @@ class EventController extends AbstractController
     }
 
     /**
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     *
      * @return array
+     *
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
      */
     protected function exportParticipationsList(Event $event, Request $request)
     {
@@ -569,7 +569,7 @@ class EventController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $data = $form->getData();
             $format = $data['format'];
-            $filename = 'export_event' . $event->getId() . '_participations.' . $format;
+            $filename = 'export_event'.$event->getId().'_participations.'.$format;
 
             $spreadsheet = $this->createExportSpreadsheet($event);
 
@@ -598,7 +598,7 @@ class EventController extends AbstractController
 
             $response = new StreamedResponse();
             $response->headers->set('Content-Type', $contentType);
-            $response->headers->set('Content-Disposition', 'attachment;filename="' . $filename . '"');
+            $response->headers->set('Content-Disposition', 'attachment;filename="'.$filename.'"');
             $response->setPrivate();
             $response->headers->addCacheControlDirective('no-cache', true);
             $response->headers->addCacheControlDirective('must-revalidate', true);
@@ -624,7 +624,7 @@ class EventController extends AbstractController
         $form = $this->createForm(EventType::class, $entity, [
             'method' => 'POST',
             'center' => $entity->getCenter(),
-            'role' => new Role('CHILL_EVENT_CREATE'),
+            'role' => 'CHILL_EVENT_CREATE',
         ]);
 
         $form->add('submit', SubmitType::class, ['label' => 'Create']);
@@ -633,8 +633,6 @@ class EventController extends AbstractController
     }
 
     /**
-     * @param $event_id
-     *
      * @return \Symfony\Component\Form\FormInterface
      */
     private function createDeleteForm($event_id)
@@ -659,7 +657,7 @@ class EventController extends AbstractController
             'action' => $this->generateUrl('chill_event__event_update', ['event_id' => $entity->getId()]),
             'method' => 'PUT',
             'center' => $entity->getCenter(),
-            'role' => new Role('CHILL_EVENT_CREATE'),
+            'role' => 'CHILL_EVENT_CREATE',
         ]);
 
         $form->remove('center');
diff --git a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
index 2e9a45f6f..b96fb9cb9 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
@@ -24,6 +24,8 @@ class EventTypeController extends AbstractController
 {
     /**
      * Creates a new EventType entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/create", name="chill_eventtype_admin_create", methods={"POST"})
      */
     public function createAction(Request $request)
     {
@@ -31,18 +33,15 @@ class EventTypeController extends AbstractController
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl(
-                'chill_eventtype_admin',
-                ['id' => $entity->getId()]
-            ));
+            return $this->redirectToRoute('chill_eventtype_admin', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillEventBundle:EventType:new.html.twig', [
+        return $this->render('@ChillEvent/EventType/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -51,14 +50,14 @@ class EventTypeController extends AbstractController
     /**
      * Deletes a EventType entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/{id}/delete", name="chill_eventtype_admin_delete", methods={"POST", "DELETE"})
      */
-    public function deleteAction(Request $request, $id)
+    public function deleteAction(Request $request, mixed $id)
     {
         $form = $this->createDeleteForm($id);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $entity = $em->getRepository(\Chill\EventBundle\Entity\EventType::class)->find($id);
 
@@ -70,15 +69,15 @@ class EventTypeController extends AbstractController
             $em->flush();
         }
 
-        return $this->redirect($this->generateUrl('chill_eventtype_admin'));
+        return $this->redirectToRoute('chill_eventtype_admin');
     }
 
     /**
      * Displays a form to edit an existing EventType entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/{id}/edit", name="chill_eventtype_admin_edit")
      */
-    public function editAction($id)
+    public function editAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -91,7 +90,7 @@ class EventTypeController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:EventType:edit.html.twig', [
+        return $this->render('@ChillEvent/EventType/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -100,6 +99,8 @@ class EventTypeController extends AbstractController
 
     /**
      * Lists all EventType entities.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/", name="chill_eventtype_admin", options={null})
      */
     public function indexAction()
     {
@@ -107,20 +108,22 @@ class EventTypeController extends AbstractController
 
         $entities = $em->getRepository(\Chill\EventBundle\Entity\EventType::class)->findAll();
 
-        return $this->render('ChillEventBundle:EventType:index.html.twig', [
+        return $this->render('@ChillEvent/EventType/index.html.twig', [
             'entities' => $entities,
         ]);
     }
 
     /**
      * Displays a form to create a new EventType entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/new", name="chill_eventtype_admin_new")
      */
     public function newAction()
     {
         $entity = new EventType();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillEventBundle:EventType:new.html.twig', [
+        return $this->render('@ChillEvent/EventType/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -129,9 +132,9 @@ class EventTypeController extends AbstractController
     /**
      * Finds and displays a EventType entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/{id}/show", name="chill_eventtype_admin_show")
      */
-    public function showAction($id)
+    public function showAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -143,7 +146,7 @@ class EventTypeController extends AbstractController
 
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:EventType:show.html.twig', [
+        return $this->render('@ChillEvent/EventType/show.html.twig', [
             'entity' => $entity,
             'delete_form' => $deleteForm->createView(),
         ]);
@@ -152,9 +155,9 @@ class EventTypeController extends AbstractController
     /**
      * Edits an existing EventType entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/event_type/{id}/update", name="chill_eventtype_admin_update", methods={"POST", "PUT"})
      */
-    public function updateAction(Request $request, $id)
+    public function updateAction(Request $request, mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -168,16 +171,13 @@ class EventTypeController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isValid()) {
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl(
-                'chill_eventtype_admin',
-                ['id' => $id]
-            ));
+            return $this->redirectToRoute('chill_eventtype_admin', ['id' => $id]);
         }
 
-        return $this->render('ChillEventBundle:EventType:edit.html.twig', [
+        return $this->render('@ChillEvent/EventType/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -210,7 +210,7 @@ class EventTypeController extends AbstractController
      *
      * @return \Symfony\Component\Form\Form The form
      */
-    private function createDeleteForm($id)
+    private function createDeleteForm(mixed $id)
     {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl(
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index dafbc8b8a..bc98f11ee 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -11,14 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Controller;
 
-use ArrayIterator;
 use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
 use Chill\EventBundle\Form\ParticipationType;
 use Chill\EventBundle\Security\Authorization\ParticipationVoter;
-use LogicException;
+use Doctrine\Common\Collections\Collection;
 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;
@@ -26,35 +24,25 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-use function count;
-
 /**
  * Class ParticipationController.
  */
 class ParticipationController extends AbstractController
 {
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    private $logger;
-
     /**
      * ParticipationController constructor.
      */
-    public function __construct(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
+    public function __construct(private readonly LoggerInterface $logger) {}
 
     /**
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/create", name="chill_event_participation_create")
      */
-    public function createAction(Request $request)
+    public function createAction(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         // test the request is correct
         try {
             $this->testRequest($request);
-        } catch (RuntimeException $ex) {
+        } catch (\RuntimeException $ex) {
             $this->logger->warning($ex->getMessage());
 
             return (new Response())
@@ -78,7 +66,7 @@ class ParticipationController extends AbstractController
         return (new Response())
             ->setStatusCode(Response::HTTP_BAD_REQUEST)
             ->setContent("You must provide either 'person_id' or "
-                        . "'persons_ids' argument in query");
+                        ."'persons_ids' argument in query");
     }
 
     /**
@@ -113,9 +101,7 @@ class ParticipationController extends AbstractController
                     [
                         'event_id' => current($participations)->getEvent()->getId(),
                         'persons_ids' => implode(',', array_map(
-                            static function (Participation $p) {
-                                return $p->getPerson()->getId();
-                            },
+                            static fn (Participation $p) => $p->getPerson()->getId(),
                             $participations
                         )),
                     ]
@@ -166,10 +152,7 @@ class ParticipationController extends AbstractController
         return $form;
     }
 
-    /**
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
-     */
-    public function createMultiple(Request $request)
+    public function createMultiple(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $participations = $this->handleRequest($request, new Participation(), true);
 
@@ -203,16 +186,13 @@ class ParticipationController extends AbstractController
             ]);
         }
 
-        return $this->render('ChillEventBundle:Participation:new.html.twig', [
+        return $this->render('@ChillEvent/Participation/new.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
         ]);
     }
 
-    /**
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
-     */
-    public function createSingle(Request $request)
+    public function createSingle(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $participation = $this->handleRequest($request, new Participation(), false);
 
@@ -244,7 +224,7 @@ class ParticipationController extends AbstractController
             ]);
         }
 
-        return $this->render('ChillEventBundle:Participation:new.html.twig', [
+        return $this->render('@ChillEvent/Participation/new.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
         ]);
@@ -253,9 +233,9 @@ class ParticipationController extends AbstractController
     /**
      * @param int $participation_id
      *
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{participation_id}/delete", name="chill_event_participation_delete", requirements={"participation_id"="\d+"}, methods={"GET", "DELETE"})
      */
-    public function deleteAction($participation_id, Request $request)
+    public function deleteAction($participation_id, Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $em = $this->getDoctrine()->getManager();
         $participation = $em->getRepository(\Chill\EventBundle\Entity\Participation::class)->findOneBy([
@@ -271,7 +251,7 @@ class ParticipationController extends AbstractController
 
         $form = $this->createDeleteForm($participation_id);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -290,7 +270,7 @@ class ParticipationController extends AbstractController
             }
         }
 
-        return $this->render('ChillEventBundle:Participation:confirm_delete.html.twig', [
+        return $this->render('@ChillEvent/Participation/confirm_delete.html.twig', [
             'event_id' => $event->getId(),
             'delete_form' => $form->createView(),
         ]);
@@ -299,8 +279,10 @@ class ParticipationController extends AbstractController
     /**
      * 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\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
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{participation_id}/edit", name="chill_event_participation_edit")
      */
     public function editAction(int $participation_id): Response
     {
@@ -321,7 +303,7 @@ class ParticipationController extends AbstractController
 
         $form = $this->createEditForm($participation);
 
-        return $this->render('ChillEventBundle:Participation:edit.html.twig', [
+        return $this->render('@ChillEvent/Participation/edit.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
         ]);
@@ -332,9 +314,9 @@ class ParticipationController extends AbstractController
      *
      * @param int $event_id
      *
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{event_id}/edit_multiple", name="chill_event_participation_edit_multiple")
      */
-    public function editMultipleAction($event_id)
+    public function editMultipleAction($event_id): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $event = $this->getDoctrine()->getRepository(\Chill\EventBundle\Entity\Event::class)
             ->find($event_id);
@@ -345,13 +327,13 @@ class ParticipationController extends AbstractController
 
         // check for ACL, on Event level and on Participation Level
         $this->denyAccessUnlessGranted('CHILL_EVENT_SEE', $event, 'You are not allowed '
-                . 'to see this event');
+                .'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()
+                'You are not allowed to update participation with id '.$participation->getId()
             );
         }
 
@@ -375,7 +357,7 @@ class ParticipationController extends AbstractController
 
         $form = $this->createEditFormMultiple($event->getParticipations(), $event);
 
-        return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', [
+        return $this->render('@ChillEvent/Participation/edit-multiple.html.twig', [
             'event' => $event,
             'participations' => $event->getParticipations(),
             'form' => $form->createView(),
@@ -389,14 +371,14 @@ class ParticipationController extends AbstractController
      * 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
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/new", name="chill_event_participation_new")
      */
-    public function newAction(Request $request)
+    public function newAction(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         // test the request is correct
         try {
             $this->testRequest($request);
-        } catch (RuntimeException $ex) {
+        } catch (\RuntimeException $ex) {
             $this->logger->warning($ex->getMessage());
 
             return (new Response())
@@ -420,9 +402,12 @@ class ParticipationController extends AbstractController
         return (new Response())
             ->setStatusCode(Response::HTTP_BAD_REQUEST)
             ->setContent("You must provide either 'person_id' or "
-                        . "'persons_ids' argument in query");
+                        ."'persons_ids' argument in query");
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{participation_id}/update", name="chill_event_participation_update", methods={"POST"})
+     */
     public function updateAction(int $participation_id, Request $request): Response
     {
         /** @var Participation $participation */
@@ -458,13 +443,16 @@ class ParticipationController extends AbstractController
             ]);
         }
 
-        return $this->render('ChillEventBundle:Participation:edit.html.twig', [
+        return $this->render('@ChillEvent/Participation/edit.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
         ]);
     }
 
-    public function updateMultipleAction($event_id, Request $request)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/{event_id}/update_multiple", name="chill_event_participation_update_multiple", methods={"POST"})
+     */
+    public function updateMultipleAction(mixed $event_id, Request $request)
     {
         /** @var \Chill\EventBundle\Entity\Event $event */
         $event = $this->getDoctrine()->getRepository(\Chill\EventBundle\Entity\Event::class)
@@ -475,13 +463,13 @@ class ParticipationController extends AbstractController
         }
 
         $this->denyAccessUnlessGranted('CHILL_EVENT_SEE', $event, 'You are not allowed '
-                . 'to see this event');
+                .'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()
+                'You are not allowed to update participation with id '.$participation->getId()
             );
         }
 
@@ -493,7 +481,7 @@ class ParticipationController extends AbstractController
             $this->getDoctrine()->getManager()->flush();
 
             $this->addFlash('success', $this->get('translator')->trans('The participations '
-                    . 'have been successfully updated.'));
+                    .'have been successfully updated.'));
 
             return $this->redirectToRoute(
                 'chill_event__event_show',
@@ -501,7 +489,7 @@ class ParticipationController extends AbstractController
             );
         }
 
-        return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', [
+        return $this->render('@ChillEvent/Participation/edit-multiple.html.twig', [
             'event' => $event,
             'participations' => $event->getParticipations(),
             'form' => $form->createView(),
@@ -511,7 +499,7 @@ class ParticipationController extends AbstractController
     /**
      * @return \Symfony\Component\Form\FormInterface
      */
-    protected function createEditFormMultiple(ArrayIterator $participations, Event $event)
+    protected function createEditFormMultiple(Collection $participations, Event $event)
     {
         $form = $this->createForm(
             \Symfony\Component\Form\Extension\Core\Type\FormType::class,
@@ -548,21 +536,20 @@ class ParticipationController extends AbstractController
      * 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|Participation[] return one single participation if $multiple == 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,
         bool $multiple = false
-    ) {
+    ): array|\Chill\EventBundle\Entity\Participation {
         $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__);
+            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:
@@ -573,7 +560,7 @@ class ParticipationController extends AbstractController
                 ->find($event_id);
 
             if (null === $event) {
-                throw $this->createNotFoundException('The event with id ' . $event_id . ' is not found');
+                throw $this->createNotFoundException('The event with id '.$event_id.' is not found');
             }
 
             $this->denyAccessUnlessGranted(
@@ -590,19 +577,19 @@ class ParticipationController extends AbstractController
         $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'));
+            : explode(',', (string) $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;
+            $participation = \count($persons_ids) > 1 ? clone $participation : $participation;
 
             if (null !== $person_id) {
                 $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)
                     ->find($person_id);
 
                 if (null === $person) {
-                    throw $this->createNotFoundException('The person with id ' . $person_id . ' is not found');
+                    throw $this->createNotFoundException('The person with id '.$person_id.' is not found');
                 }
 
                 $this->denyAccessUnlessGranted(
@@ -631,15 +618,14 @@ class ParticipationController extends AbstractController
      *
      * 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)
+    protected function newMultiple(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         $participations = $this->handleRequest($request, new Participation(), true);
         $ignoredParticipations = $newParticipations = [];
 
         foreach ($participations as $participation) {
+            /* @var Participation $participation */
             // check for authorization
             $this->denyAccessUnlessGranted(
                 ParticipationVoter::CREATE,
@@ -648,20 +634,14 @@ class ParticipationController extends AbstractController
             );
 
             // 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();
-                        }
-                    );
+            $peopleParticipating ??= $participation->getEvent()->getParticipations()->map(
+                static fn (Participation $p) => $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();
-                        }
+                        static fn (Participation $p) => $p->getPerson()->getId() === $participation->getPerson()->getId()
                     )->first();
             } else {
                 $newParticipations[] = $participation;
@@ -674,7 +654,7 @@ class ParticipationController extends AbstractController
             // 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.'
+                    .'the event: they are maybe already participating.'
             ));
 
             return $this->redirectToRoute('chill_event__event_show', [
@@ -682,12 +662,12 @@ class ParticipationController extends AbstractController
             ]);
         }
 
-        if (count($newParticipations) > 1) {
+        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',
+                '@ChillEvent/Participation/new-multiple.html.twig',
                 [
                     'form' => $form->createView(),
                     'participations' => $newParticipations,
@@ -700,7 +680,7 @@ class ParticipationController extends AbstractController
         $form = $this->createCreateForm($participation);
 
         return $this->render(
-            'ChillEventBundle:Participation:new.html.twig',
+            '@ChillEvent/Participation/new.html.twig',
             [
                 'form' => $form->createView(),
                 'participation' => $participation,
@@ -729,7 +709,7 @@ class ParticipationController extends AbstractController
 
         $form = $this->createCreateForm($participation, $returnPath);
 
-        return $this->render('ChillEventBundle:Participation:new.html.twig', [
+        return $this->render('@ChillEvent/Participation/new.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
             'ignored_participations' => [], // this is required, see self::newMultiple
@@ -743,7 +723,7 @@ class ParticipationController extends AbstractController
      * - `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
+     * @throws \RuntimeException if an error is detected
      */
     protected function testRequest(Request $request)
     {
@@ -752,28 +732,24 @@ class ParticipationController extends AbstractController
 
         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");
+            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 ','");
+            if (!preg_match('/^([0-9]{1,},{0,1}){1,}[0-9]{0,}$/', (string) $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');
+        if (false === $request->query->has('event_id')) {
+            throw new \RuntimeException('You must provide an event_id');
         }
     }
 
     /**
-     * @param $participation_id
-     *
      * @return \Symfony\Component\Form\FormInterface
      */
     private function createDeleteForm($participation_id)
diff --git a/src/Bundle/ChillEventBundle/Controller/RoleController.php b/src/Bundle/ChillEventBundle/Controller/RoleController.php
index 9ffe0d2d0..1b2ad2b25 100644
--- a/src/Bundle/ChillEventBundle/Controller/RoleController.php
+++ b/src/Bundle/ChillEventBundle/Controller/RoleController.php
@@ -24,6 +24,8 @@ class RoleController extends AbstractController
 {
     /**
      * Creates a new Role entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/create", name="chill_event_admin_role_create", methods={"POST"})
      */
     public function createAction(Request $request)
     {
@@ -31,18 +33,15 @@ class RoleController extends AbstractController
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl(
-                'chill_event_admin_role',
-                ['id' => $entity->getId()]
-            ));
+            return $this->redirectToRoute('chill_event_admin_role', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillEventBundle:Role:new.html.twig', [
+        return $this->render('@ChillEvent/Role/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -51,14 +50,14 @@ class RoleController extends AbstractController
     /**
      * Deletes a Role entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/{id}/delete", name="chill_event_admin_role_delete", methods={"POST", "DELETE"})
      */
-    public function deleteAction(Request $request, $id)
+    public function deleteAction(Request $request, mixed $id)
     {
         $form = $this->createDeleteForm($id);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $entity = $em->getRepository(\Chill\EventBundle\Entity\Role::class)->find($id);
 
@@ -70,15 +69,15 @@ class RoleController extends AbstractController
             $em->flush();
         }
 
-        return $this->redirect($this->generateUrl('chill_event_admin_role'));
+        return $this->redirectToRoute('chill_event_admin_role');
     }
 
     /**
      * Displays a form to edit an existing Role entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/{id}/edit", name="chill_event_admin_role_edit")
      */
-    public function editAction($id)
+    public function editAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -91,7 +90,7 @@ class RoleController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:Role:edit.html.twig', [
+        return $this->render('@ChillEvent/Role/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -100,6 +99,8 @@ class RoleController extends AbstractController
 
     /**
      * Lists all Role entities.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/", name="chill_event_admin_role", options={null})
      */
     public function indexAction()
     {
@@ -107,20 +108,22 @@ class RoleController extends AbstractController
 
         $entities = $em->getRepository(\Chill\EventBundle\Entity\Role::class)->findAll();
 
-        return $this->render('ChillEventBundle:Role:index.html.twig', [
+        return $this->render('@ChillEvent/Role/index.html.twig', [
             'entities' => $entities,
         ]);
     }
 
     /**
      * Displays a form to create a new Role entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/new", name="chill_event_admin_role_new")
      */
     public function newAction()
     {
         $entity = new Role();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillEventBundle:Role:new.html.twig', [
+        return $this->render('@ChillEvent/Role/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -129,9 +132,9 @@ class RoleController extends AbstractController
     /**
      * Finds and displays a Role entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/{id}/show", name="chill_event_admin_role_show")
      */
-    public function showAction($id)
+    public function showAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -143,7 +146,7 @@ class RoleController extends AbstractController
 
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:Role:show.html.twig', [
+        return $this->render('@ChillEvent/Role/show.html.twig', [
             'entity' => $entity,
             'delete_form' => $deleteForm->createView(),
         ]);
@@ -152,9 +155,9 @@ class RoleController extends AbstractController
     /**
      * Edits an existing Role entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/role/{id}/update", name="chill_event_admin_role_update", methods={"POST", "PUT"})
      */
-    public function updateAction(Request $request, $id)
+    public function updateAction(Request $request, mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -168,16 +171,13 @@ class RoleController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isValid()) {
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl(
-                'chill_event_admin_role',
-                ['id' => $id]
-            ));
+            return $this->redirectToRoute('chill_event_admin_role', ['id' => $id]);
         }
 
-        return $this->render('ChillEventBundle:Role:edit.html.twig', [
+        return $this->render('@ChillEvent/Role/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -210,7 +210,7 @@ class RoleController extends AbstractController
      *
      * @return \Symfony\Component\Form\Form The form
      */
-    private function createDeleteForm($id)
+    private function createDeleteForm(mixed $id)
     {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl('chill_event_admin_role_delete', ['id' => $id]))
diff --git a/src/Bundle/ChillEventBundle/Controller/StatusController.php b/src/Bundle/ChillEventBundle/Controller/StatusController.php
index 2b8d97ee6..90bb7c1f2 100644
--- a/src/Bundle/ChillEventBundle/Controller/StatusController.php
+++ b/src/Bundle/ChillEventBundle/Controller/StatusController.php
@@ -24,6 +24,8 @@ class StatusController extends AbstractController
 {
     /**
      * Creates a new Status entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/create", name="chill_event_admin_status_create", methods={"POST"})
      */
     public function createAction(Request $request)
     {
@@ -31,15 +33,15 @@ class StatusController extends AbstractController
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_event_admin_status', ['id' => $entity->getId()]));
+            return $this->redirectToRoute('chill_event_admin_status', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillEventBundle:Status:new.html.twig', [
+        return $this->render('@ChillEvent/Status/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -48,14 +50,14 @@ class StatusController extends AbstractController
     /**
      * Deletes a Status entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/{id}/delete", name="chill_event_admin_status_delete", methods={"POST", "DELETE"})
      */
-    public function deleteAction(Request $request, $id)
+    public function deleteAction(Request $request, mixed $id)
     {
         $form = $this->createDeleteForm($id);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $entity = $em->getRepository(\Chill\EventBundle\Entity\Status::class)->find($id);
 
@@ -67,15 +69,15 @@ class StatusController extends AbstractController
             $em->flush();
         }
 
-        return $this->redirect($this->generateUrl('chill_event_admin_status'));
+        return $this->redirectToRoute('chill_event_admin_status');
     }
 
     /**
      * Displays a form to edit an existing Status entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/{id}/edit", name="chill_event_admin_status_edit")
      */
-    public function editAction($id)
+    public function editAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -88,7 +90,7 @@ class StatusController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:Status:edit.html.twig', [
+        return $this->render('@ChillEvent/Status/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -97,6 +99,8 @@ class StatusController extends AbstractController
 
     /**
      * Lists all Status entities.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/", name="chill_event_admin_status", options={null})
      */
     public function indexAction()
     {
@@ -104,20 +108,22 @@ class StatusController extends AbstractController
 
         $entities = $em->getRepository(\Chill\EventBundle\Entity\Status::class)->findAll();
 
-        return $this->render('ChillEventBundle:Status:index.html.twig', [
+        return $this->render('@ChillEvent/Status/index.html.twig', [
             'entities' => $entities,
         ]);
     }
 
     /**
      * Displays a form to create a new Status entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/new", name="chill_event_admin_status_new")
      */
     public function newAction()
     {
         $entity = new Status();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillEventBundle:Status:new.html.twig', [
+        return $this->render('@ChillEvent/Status/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -126,9 +132,9 @@ class StatusController extends AbstractController
     /**
      * Finds and displays a Status entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/{id}/show", name="chill_event_admin_status_show")
      */
-    public function showAction($id)
+    public function showAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -140,7 +146,7 @@ class StatusController extends AbstractController
 
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:Status:show.html.twig', [
+        return $this->render('@ChillEvent/Status/show.html.twig', [
             'entity' => $entity,
             'delete_form' => $deleteForm->createView(),
         ]);
@@ -149,9 +155,9 @@ class StatusController extends AbstractController
     /**
      * Edits an existing Status entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/event/status/{id}/update", name="chill_event_admin_status_update", methods={"POST", "PUT"})
      */
-    public function updateAction(Request $request, $id)
+    public function updateAction(Request $request, mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -165,13 +171,13 @@ class StatusController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isValid()) {
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_event_admin_status', ['id' => $id]));
+            return $this->redirectToRoute('chill_event_admin_status', ['id' => $id]);
         }
 
-        return $this->render('ChillEventBundle:Status:edit.html.twig', [
+        return $this->render('@ChillEvent/Status/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -204,7 +210,7 @@ class StatusController extends AbstractController
      *
      * @return \Symfony\Component\Form\Form The form
      */
-    private function createDeleteForm($id)
+    private function createDeleteForm(mixed $id)
     {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl('chill_event_admin_status_delete', ['id' => $id]))
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
index ed38faf01..71b07a123 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
@@ -43,7 +43,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
         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))
+                ->setName($this->faker->words(random_int(2, 4), true))
                 ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)]))
                 ->setCenter($center)
                 ->setCircle(
@@ -75,7 +75,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
 
             /** @var \Chill\PersonBundle\Entity\Person $person */
             foreach ($people as $person) {
-                $nb = mt_rand(0, 3);
+                $nb = random_int(0, 3);
 
                 for ($i = 0; $i < $nb; ++$i) {
                     $event = $events[array_rand($events)];
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
index 26a3144bf..87e676730 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
@@ -18,8 +18,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function in_array;
-
 /**
  * Add roles to existing groups.
  */
@@ -37,10 +35,10 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
 
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             break 2; // we do not want any power on administrative
                         }
 
@@ -48,7 +46,7 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
                         }
 
@@ -57,10 +55,10 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
 
                 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",
+                        .'& 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']
                 );
diff --git a/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php b/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
index c3d723652..07c431f2f 100644
--- a/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
+++ b/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
@@ -30,7 +30,7 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
         $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');
@@ -70,7 +70,7 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
      */
     protected function prependRoute(ContainerBuilder $container)
     {
-        //add routes for custom bundle
+        // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
diff --git a/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
index b36f7b6a9..fe42ad99a 100644
--- a/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
@@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_event');
-        $rootNode = $treeBuilder->getRootNode('chill_event');
+        $rootNode = $treeBuilder->getRootNode();
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for
diff --git a/src/Bundle/ChillEventBundle/Entity/Event.php b/src/Bundle/ChillEventBundle/Entity/Event.php
index 6ac9c1508..5ecc97afd 100644
--- a/src/Bundle/ChillEventBundle/Entity/Event.php
+++ b/src/Bundle/ChillEventBundle/Entity/Event.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Entity;
 
-use ArrayIterator;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
@@ -21,69 +20,65 @@ use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Traversable;
 
 /**
  * Class Event.
  *
  * @ORM\Entity(repositoryClass="Chill\EventBundle\Repository\EventRepository")
+ *
  * @ORM\Table(name="chill_event_event")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Event implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var Center
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
      */
-    private $center;
+    private ?\Chill\MainBundle\Entity\Center $center = null;
 
     /**
-     * @var Scope
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
-    private $circle;
+    private ?\Chill\MainBundle\Entity\Scope $circle = null;
 
     /**
-     * @var DateTime
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private ?\DateTime $date;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var User
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private $moderator;
+    private ?\Chill\MainBundle\Entity\User $moderator = null;
 
     /**
-     * @var string
      * @ORM\Column(type="string", length=150)
      */
-    private $name;
+    private ?string $name = null;
 
     /**
-     * @var Participation
+     * @var Collection<Participation>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\EventBundle\Entity\Participation",
      * mappedBy="event")
      */
-    private $participations;
+    private Collection $participations;
 
     /**
-     * @var EventType
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\EventType")
      */
-    private $type;
+    private ?\Chill\EventBundle\Entity\EventType $type = null;
 
     /**
      * Event constructor.
@@ -124,7 +119,7 @@ class Event implements HasCenterInterface, HasScopeInterface
     /**
      * Get date.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getDate()
     {
@@ -141,10 +136,7 @@ class Event implements HasCenterInterface, HasScopeInterface
         return $this->id;
     }
 
-    /**
-     * @return int
-     */
-    public function getModerator()
+    public function getModerator(): null|User
     {
         return $this->moderator;
     }
@@ -160,27 +152,23 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * @return ArrayIterator|Collection|Traversable
+     * @return Collection<int, Participation>
      */
-    public function getParticipations()
+    public function getParticipations(): Collection
     {
-        return $this->getParticipationsOrdered();
+        return new ArrayCollection(iterator_to_array($this->getParticipationsOrdered()));
     }
 
     /**
      * Sort Collection of Participations.
-     *
-     * @return ArrayIterator|Traversable
      */
-    public function getParticipationsOrdered()
+    public function getParticipationsOrdered(): \ArrayIterator|\Traversable
     {
-        $iterator = $this->participations->getIterator();
+        $iterator = iterator_to_array($this->participations->getIterator());
 
-        $iterator->uasort(static function ($first, $second) {
-            return strnatcasecmp($first->getPerson()->getFirstName(), $second->getPerson()->getFirstName());
-        });
+        uasort($iterator, static fn ($first, $second) => strnatcasecmp((string) $first->getPerson()->getFirstName(), (string) $second->getPerson()->getFirstName()));
 
-        return $iterator;
+        return new \ArrayIterator($iterator);
     }
 
     /**
@@ -234,19 +222,14 @@ class Event implements HasCenterInterface, HasScopeInterface
      *
      * @return Event
      */
-    public function setDate(DateTime $date)
+    public function setDate(\DateTime $date)
     {
         $this->date = $date;
 
         return $this;
     }
 
-    /**
-     * @param int $moderator
-     *
-     * @return Event
-     */
-    public function setModerator($moderator)
+    public function setModerator(User $moderator): self
     {
         $this->moderator = $moderator;
 
diff --git a/src/Bundle/ChillEventBundle/Entity/EventType.php b/src/Bundle/ChillEventBundle/Entity/EventType.php
index e661a9839..5eef8dc42 100644
--- a/src/Bundle/ChillEventBundle/Entity/EventType.php
+++ b/src/Bundle/ChillEventBundle/Entity/EventType.php
@@ -19,47 +19,51 @@ use Doctrine\ORM\Mapping as ORM;
  * Class EventType.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_event_event_type")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class EventType
 {
     /**
-     * @var bool
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", nullable=false)
      */
-    private $active;
+    private bool $active = true;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @var array
+     *
      * @ORM\Column(type="json")
      */
     private $name;
 
     /**
-     * @var Collection
+     * @var Collection<Role>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\EventBundle\Entity\Role",
      * mappedBy="type")
      */
-    private $roles;
+    private Collection $roles;
 
     /**
-     * @var Collection
+     * @var Collection<Status>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\EventBundle\Entity\Status",
      * mappedBy="type")
      */
-    private $statuses;
+    private Collection $statuses;
 
     /**
      * Constructor.
diff --git a/src/Bundle/ChillEventBundle/Entity/Participation.php b/src/Bundle/ChillEventBundle/Entity/Participation.php
index 38c849535..8dda85c99 100644
--- a/src/Bundle/ChillEventBundle/Entity/Participation.php
+++ b/src/Bundle/ChillEventBundle/Entity/Participation.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Entity;
 
-use ArrayAccess;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
@@ -19,70 +18,63 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
-use RuntimeException;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-use function in_array;
-
 /**
  * Class Participation.
  *
  * @ORM\Entity(
  * repositoryClass="Chill\EventBundle\Repository\ParticipationRepository")
+ *
  * @ORM\Table(name="chill_event_participation")
+ *
  * @ORM\HasLifecycleCallbacks
  */
-class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterface
+class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var Event
      * @ORM\ManyToOne(
      *     targetEntity="Chill\EventBundle\Entity\Event",
      * inversedBy="participations")
      */
-    private $event;
+    private ?\Chill\EventBundle\Entity\Event $event = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var DateTime
      * @ORM\Column(type="datetime")
      */
-    private $lastUpdate;
+    private ?\DateTime $lastUpdate = null;
 
     /**
-     * @var Person
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
-     * @var Role
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\Role")
      */
-    private $role;
+    private ?\Chill\EventBundle\Entity\Role $role = null;
 
     /**
-     * @var Status
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\Status")
      */
-    private $status;
+    private ?\Chill\EventBundle\Entity\Status $status = null;
 
     /**
      * @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.');
+        if (null === $this->getEvent()) {
+            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();
@@ -90,10 +82,8 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
 
     /**
      * Get event.
-     *
-     * @return Event
      */
-    public function getEvent()
+    public function getEvent(): null|Event
     {
         return $this->event;
     }
@@ -111,7 +101,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * Get lastUpdate.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getLastUpdate()
     {
@@ -130,10 +120,8 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
 
     /**
      * Get role.
-     *
-     * @return Role
      */
-    public function getRole()
+    public function getRole(): null|Role
     {
         return $this->role;
     }
@@ -143,9 +131,8 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
      */
     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.');
+        if (null === $this->getEvent()) {
+            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();
@@ -153,10 +140,8 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
 
     /**
      * Get status.
-     *
-     * @return Status
      */
-    public function getStatus()
+    public function getStatus(): null|Status
     {
         return $this->status;
     }
@@ -169,7 +154,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
      */
     public function isConsistent(ExecutionContextInterface $context)
     {
-        if ($this->getEvent() === null || $this->getRole() === null || $this->getStatus() === null) {
+        if (null === $this->getEvent() || null === $this->getRole() || null === $this->getStatus()) {
             return;
         }
 
@@ -192,46 +177,28 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
         }
     }
 
-    /**
-     * @param mixed $offset
-     *
-     * @return bool
-     */
-    public function offsetExists($offset): bool
+    public function offsetExists(mixed $offset): bool
     {
-        return in_array($offset, [
+        return \in_array($offset, [
             'person', 'role', 'status', 'event',
         ], true);
     }
 
     /**
-     * @param mixed $offset
-     *
      * @return Event|Person|Role|Status
      */
-    public function offsetGet($offset): mixed
+    public function offsetGet(mixed $offset): mixed
     {
-        switch ($offset) {
-            case 'person':
-                return $this->getPerson();
-            case 'role':
-                return $this->getRole();
-            case 'status':
-                return $this->getStatus();
-            case 'event':
-                return $this->getEvent();
-            default:
-                throw new \LogicException("this offset does not exists : " . $offset);
-        }
+        return match ($offset) {
+            'person' => $this->getPerson(),
+            'role' => $this->getRole(),
+            'status' => $this->getStatus(),
+            'event' => $this->getEvent(),
+            default => throw new \LogicException('this offset does not exists : '.$offset),
+        };
     }
 
-    /**
-     * @param mixed $offset
-     * @param mixed $value
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value): void
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         switch ($offset) {
             case 'person':
@@ -256,10 +223,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
         }
     }
 
-    /**
-     * @param mixed $offset
-     */
-    public function offsetUnset($offset): void
+    public function offsetUnset(mixed $offset): void
     {
         $this->offsetSet($offset, null);
     }
@@ -267,11 +231,9 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * Set event.
      *
-     * @param Event $event
-     *
      * @return Participation
      */
-    public function setEvent(?Event $event = null)
+    public function setEvent(Event $event = null)
     {
         if ($this->event !== $event) {
             $this->update();
@@ -285,11 +247,9 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * Set person.
      *
-     * @param Person $person
-     *
      * @return Participation
      */
-    public function setPerson(?Person $person = null)
+    public function setPerson(Person $person = null)
     {
         if ($person !== $this->person) {
             $this->update();
@@ -303,11 +263,9 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * Set role.
      *
-     * @param Role $role
-     *
      * @return Participation
      */
-    public function setRole(?Role $role = null)
+    public function setRole(Role $role = null)
     {
         if ($role !== $this->role) {
             $this->update();
@@ -320,11 +278,9 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * 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();
@@ -342,7 +298,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
      */
     protected function update()
     {
-        $this->lastUpdate = new DateTime('now');
+        $this->lastUpdate = new \DateTime('now');
 
         return $this;
     }
diff --git a/src/Bundle/ChillEventBundle/Entity/Role.php b/src/Bundle/ChillEventBundle/Entity/Role.php
index b508cda43..3d2264d2f 100644
--- a/src/Bundle/ChillEventBundle/Entity/Role.php
+++ b/src/Bundle/ChillEventBundle/Entity/Role.php
@@ -17,39 +17,40 @@ use Doctrine\ORM\Mapping as ORM;
  * Class Role.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_event_role")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Role
 {
     /**
-     * @var bool
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", nullable=false)
      */
-    private $active;
+    private bool $active = true;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @var array
+     *
      * @ORM\Column(type="json")
      */
     private $name;
 
     /**
-     * @var EventType
      * @ORM\ManyToOne(
      *     targetEntity="Chill\EventBundle\Entity\EventType",
      * inversedBy="roles")
      */
-    private $type;
+    private ?\Chill\EventBundle\Entity\EventType $type = null;
 
     /**
      * Get active.
@@ -122,11 +123,9 @@ class Role
     /**
      * Set type.
      *
-     * @param EventType $type
-     *
      * @return Role
      */
-    public function setType(?EventType $type = null)
+    public function setType(EventType $type = null)
     {
         $this->type = $type;
 
diff --git a/src/Bundle/ChillEventBundle/Entity/Status.php b/src/Bundle/ChillEventBundle/Entity/Status.php
index c0955fd41..22fe8e3ed 100644
--- a/src/Bundle/ChillEventBundle/Entity/Status.php
+++ b/src/Bundle/ChillEventBundle/Entity/Status.php
@@ -17,39 +17,40 @@ use Doctrine\ORM\Mapping as ORM;
  * Class Status.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_event_status")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Status
 {
     /**
-     * @var bool
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", nullable=false)
      */
-    private $active;
+    private bool $active = true;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @var array
+     *
      * @ORM\Column(type="json")
      */
     private $name;
 
     /**
-     * @var EventType
      * @ORM\ManyToOne(
      *     targetEntity="Chill\EventBundle\Entity\EventType",
      * inversedBy="statuses")
      */
-    private $type;
+    private ?\Chill\EventBundle\Entity\EventType $type = null;
 
     /**
      * Get active.
@@ -122,11 +123,9 @@ class Status
     /**
      * Set type.
      *
-     * @param EventType $type
-     *
      * @return Status
      */
-    public function setType(?EventType $type = null)
+    public function setType(EventType $type = null)
     {
         $this->type = $type;
 
diff --git a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
index 30a00ebb9..7507550c2 100644
--- a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+++ b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
@@ -13,14 +13,9 @@ namespace Chill\EventBundle\Form\ChoiceLoader;
 
 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.
  */
@@ -46,7 +41,7 @@ class EventChoiceLoader implements ChoiceLoaderInterface
      */
     public function __construct(
         EntityRepository $eventRepository,
-        ?array $centers = null
+        array $centers = null
     ) {
         $this->eventRepository = $eventRepository;
 
@@ -62,9 +57,7 @@ class EventChoiceLoader implements ChoiceLoaderInterface
     {
         return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
             $this->lazyLoadedEvents,
-            static function (Event $p) use ($value) {
-                return call_user_func($value, $p);
-            }
+            static fn (Event $p) => \call_user_func($value, $p)
         );
     }
 
@@ -86,9 +79,9 @@ class EventChoiceLoader implements ChoiceLoaderInterface
 
             if (
                 $this->hasCenterFilter()
-                && !in_array($event->getCenter(), $this->centers, true)
+                && !\in_array($event->getCenter(), $this->centers, true)
             ) {
-                throw new RuntimeException('chosen an event not in correct center');
+                throw new \RuntimeException('chosen an event not in correct center');
             }
 
             $choices[] = $event;
@@ -113,7 +106,7 @@ class EventChoiceLoader implements ChoiceLoaderInterface
                 continue;
             }
 
-            $id = call_user_func($value, $choice);
+            $id = \call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedEvents[$id] = $choice;
         }
@@ -126,6 +119,6 @@ class EventChoiceLoader implements ChoiceLoaderInterface
      */
     protected function hasCenterFilter()
     {
-        return count($this->centers) > 0;
+        return \count($this->centers) > 0;
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/EventType.php b/src/Bundle/ChillEventBundle/Form/EventType.php
index fec26c373..a06999d2b 100644
--- a/src/Bundle/ChillEventBundle/Form/EventType.php
+++ b/src/Bundle/ChillEventBundle/Form/EventType.php
@@ -19,7 +19,6 @@ use Chill\MainBundle\Form\Type\UserPickerType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Role\Role;
 
 class EventType extends AbstractType
 {
@@ -54,18 +53,18 @@ class EventType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\EventBundle\Entity\Event',
+            'data_class' => \Chill\EventBundle\Entity\Event::class,
         ]);
         $resolver
             ->setRequired(['center', 'role'])
             ->setAllowedTypes('center', Center::class)
-            ->setAllowedTypes('role', Role::class);
+            ->setAllowedTypes('role', 'string');
     }
 
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'chill_eventbundle_event';
     }
diff --git a/src/Bundle/ChillEventBundle/Form/EventTypeType.php b/src/Bundle/ChillEventBundle/Form/EventTypeType.php
index 9f971f55d..4b09daef0 100644
--- a/src/Bundle/ChillEventBundle/Form/EventTypeType.php
+++ b/src/Bundle/ChillEventBundle/Form/EventTypeType.php
@@ -14,7 +14,6 @@ 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;
 
 class EventTypeType extends AbstractType
 {
@@ -28,15 +27,15 @@ class EventTypeType extends AbstractType
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'chill_eventbundle_eventtype';
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(\Symfony\Component\OptionsResolver\OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\EventBundle\Entity\EventType',
+            'data_class' => \Chill\EventBundle\Entity\EventType::class,
         ]);
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/ParticipationType.php b/src/Bundle/ChillEventBundle/Form/ParticipationType.php
index 998dc91a3..af1854954 100644
--- a/src/Bundle/ChillEventBundle/Form/ParticipationType.php
+++ b/src/Bundle/ChillEventBundle/Form/ParticipationType.php
@@ -15,7 +15,7 @@ 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 Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -25,17 +25,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
  *
  * If the `event` option is defined, the role will be restricted
  */
-class ParticipationType extends AbstractType
+final class ParticipationType extends AbstractType
 {
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillEventBundle/Form/RoleType.php b/src/Bundle/ChillEventBundle/Form/RoleType.php
index e4e55faca..8b9f27be2 100644
--- a/src/Bundle/ChillEventBundle/Form/RoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/RoleType.php
@@ -13,23 +13,14 @@ namespace Chill\EventBundle\Form;
 
 use Chill\EventBundle\Entity\EventType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-class RoleType extends AbstractType
+final class RoleType extends AbstractType
 {
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -38,24 +29,22 @@ class RoleType extends AbstractType
             ->add('active')
             ->add('type', EntityType::class, [
                 'class' => EventType::class,
-                'choice_label' => function (EventType $e) {
-                    return $this->translatableStringHelper->localize($e->getName());
-                },
+                'choice_label' => fn (EventType $e) => $this->translatableStringHelper->localize($e->getName()),
             ]);
     }
 
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'chill_eventbundle_role';
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(\Symfony\Component\OptionsResolver\OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\EventBundle\Entity\Role',
+            'data_class' => \Chill\EventBundle\Entity\Role::class,
         ]);
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/StatusType.php b/src/Bundle/ChillEventBundle/Form/StatusType.php
index e70011d22..7e8c8c1b9 100644
--- a/src/Bundle/ChillEventBundle/Form/StatusType.php
+++ b/src/Bundle/ChillEventBundle/Form/StatusType.php
@@ -15,7 +15,6 @@ 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;
 
 class StatusType extends AbstractType
 {
@@ -30,15 +29,15 @@ class StatusType extends AbstractType
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'chill_eventbundle_status';
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(\Symfony\Component\OptionsResolver\OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\EventBundle\Entity\Status',
+            'data_class' => \Chill\EventBundle\Entity\Status::class,
         ]);
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
index 4e8179f10..2b85a60c8 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
@@ -18,67 +18,32 @@ use Chill\EventBundle\Search\EventSearch;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use RuntimeException;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Finder\Exception\AccessDeniedException;
 use Symfony\Component\Form\AbstractType;
 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\Role\Role;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function in_array;
-use function is_array;
-
 /**
  * Class PickEventType.
  */
-class PickEventType extends AbstractType
+final class PickEventType extends AbstractType
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-
-    /**
-     * @var EventRepository
-     */
-    protected $eventRepository;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    /**
-     * @var UrlGeneratorInterface
-     */
-    protected $urlGenerator;
-
-    /**
-     * @var User
-     */
-    protected $user;
-
     /**
      * PickEventType constructor.
      */
     public function __construct(
-        EventRepository $eventRepository,
-        TokenStorageInterface $tokenStorage,
-        AuthorizationHelper $authorizationHelper,
-        UrlGeneratorInterface $urlGenerator,
-        TranslatorInterface $translator
-    ) {
-        $this->eventRepository = $eventRepository;
-        $this->user = $tokenStorage->getToken()->getUser();
-        $this->authorizationHelper = $authorizationHelper;
-        $this->urlGenerator = $urlGenerator;
-        $this->translator = $translator;
-    }
+        private readonly EventRepository $eventRepository,
+        private readonly AuthorizationHelperInterface $authorizationHelper,
+        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly TranslatorInterface $translator,
+        private readonly Security $security
+    ) {}
 
     public function buildView(\Symfony\Component\Form\FormView $view, \Symfony\Component\Form\FormInterface $form, array $options)
     {
@@ -103,22 +68,18 @@ class PickEventType extends AbstractType
             ->setDefault('centers', null);
         $resolver
             ->setDefined('role')
-            ->addAllowedTypes('role', [Role::class, 'null'])
+            ->addAllowedTypes('role', ['string', '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();
-            },
+            'choice_label' => static fn (Event $e) => $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()];
-            },
+            'choice_attr' => static fn (Event $e) => ['data-center' => $e->getCenter()->getId()],
             'choiceloader' => function (Options $options) {
                 $centers = $this->filterCenters($options);
 
@@ -127,10 +88,7 @@ class PickEventType extends AbstractType
         ]);
     }
 
-    /**
-     * @return string|null
-     */
-    public function getParent()
+    public function getParent(): ?string
     {
         return EntityType::class;
     }
@@ -140,17 +98,21 @@ class PickEventType extends AbstractType
      */
     protected function filterCenters(Options $options)
     {
+        $user = $this->security->getUser();
+
+        if (!$user instanceof User) {
+            return [];
+        }
+
         // option role
         if (null === $options['role']) {
             $centers = array_map(
-                static function (GroupCenter $g) {
-                    return $g->getCenter();
-                },
-                $this->user->getGroupCenters()->toArray()
+                static fn (GroupCenter $g) => $g->getCenter(),
+                $user->getGroupCenters()->toArray()
             );
         } else {
             $centers = $this->authorizationHelper->getReachableCenters(
-                $this->user,
+                $user,
                 (string) $options['role']->getRole()
             );
         }
@@ -161,21 +123,18 @@ class PickEventType extends AbstractType
             $selectedCenters = $centers;
         } else {
             $selectedCenters = [];
-            $optionsCenters = is_array($options['centers']) ?
+            $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);
+                    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();
-                        },
+                    !\in_array($c->getId(), array_map(
+                        static fn (Center $c) => $c->getId(),
                         $centers
                     ), true)
                 ) {
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php b/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
index eacdc78f1..d027c05cf 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
@@ -39,16 +39,10 @@ class PickEventTypeType extends AbstractType
         $resolver->setDefaults(
             [
                 'class' => EventType::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('et')
-                        ->where('et.active = true');
-                },
-                'choice_label' => static function (EventType $t) use ($helper) {
-                    return $helper->localize($t->getName());
-                },
-                'choice_attrs' => static function (EventType $t) {
-                    return ['data-link-category' => $t->getId()];
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('et')
+                    ->where('et.active = true'),
+                'choice_label' => static fn (EventType $t) => $helper->localize($t->getName()),
+                'choice_attrs' => static fn (EventType $t) => ['data-link-category' => $t->getId()],
             ]
         );
     }
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
index 95864056a..c8d69c119 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
@@ -13,8 +13,8 @@ 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 Chill\EventBundle\Repository\RoleRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -26,32 +26,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 /**
  * Allow to pick a choice amongst different choices.
  */
-class PickRoleType extends AbstractType
+final class PickRoleType extends AbstractType
 {
-    /**
-     * @var EntityRepository
-     */
-    protected $roleRepository;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        TranslatorInterface $translator,
-        EntityRepository $roleRepository
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-        $this->roleRepository = $roleRepository;
-    }
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly TranslatorInterface $translator,
+        private readonly RoleRepository $roleRepository
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -76,13 +57,11 @@ class PickRoleType extends AbstractType
                         $form = $event->getForm();
                         $name = $form->getName();
                         $config = $form->getConfig();
-                        $type = $config->getType()->getName();
+                        $type = $config->getType()->getBlockPrefix();
                         $options = $config->getOptions();
 
                         $form->getParent()->add($name, $type, array_replace($options, [
-                            'group_by' => function (Role $r) {
-                                return $this->translatableStringHelper->localize($r->getType()->getName());
-                            },
+                            'group_by' => fn (Role $r) => $this->translatableStringHelper->localize($r->getType()->getName()),
                         ]));
                     }
                 }
@@ -111,17 +90,13 @@ class PickRoleType extends AbstractType
             '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') . ')');
-            },
+            'choice_attr' => static fn (Role $r) => [
+                'data-event-type' => $r->getType()->getId(),
+                'data-link-category' => $r->getType()->getId(),
+            ],
+            'choice_label' => static fn (Role $r) => $translatableStringHelper->localize($r->getName()).
+                      (true === $r->getActive() ? '' :
+                            ' ('.$translator->trans('unactive').')'),
         ]);
     }
 
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
index 4d96ed95d..3f4ab3624 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
@@ -13,8 +13,8 @@ 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 Chill\EventBundle\Repository\StatusRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -31,32 +31,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  * - event_type : restricts to a certain event type. Default null (= all event types)
  * - active_only: restricts to active type only. Default true
  */
-class PickStatusType extends AbstractType
+final class PickStatusType extends AbstractType
 {
-    /**
-     * @var EntityRepository
-     */
-    protected $statusRepository;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        TranslatorInterface $translator,
-        EntityRepository $statusRepository
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-        $this->statusRepository = $statusRepository;
-    }
+    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper, protected TranslatorInterface $translator, protected StatusRepository $statusRepository) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -79,12 +56,10 @@ class PickStatusType extends AbstractType
                     $form = $event->getForm();
                     $name = $form->getName();
                     $config = $form->getConfig();
-                    $type = $config->getType()->getName();
+                    $type = $config->getType()->getBlockPrefix();
                     $options = $config->getOptions();
                     $form->getParent()->add($name, $type, array_replace($options, [
-                        'group_by' => function (Status $s) {
-                            return $this->translatableStringHelper->localize($s->getType()->getName());
-                        },
+                        'group_by' => fn (Status $s) => $this->translatableStringHelper->localize($s->getType()->getName()),
                     ]));
                 }
             );
@@ -112,17 +87,13 @@ class PickStatusType extends AbstractType
             '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') . ')');
-            },
+            'choice_attr' => static fn (Status $s) => [
+                'data-event-type' => $s->getType()->getId(),
+                'data-link-category' => $s->getType()->getId(),
+            ],
+            'choice_label' => static fn (Status $s) => $translatableStringHelper->localize($s->getName()).
+                      (true === $s->getActive() ? '' :
+                            ' ('.$translator->trans('unactive').')'),
         ]);
     }
 
diff --git a/src/Bundle/ChillEventBundle/Repository/EventRepository.php b/src/Bundle/ChillEventBundle/Repository/EventRepository.php
index d24841d5c..7406748b4 100644
--- a/src/Bundle/ChillEventBundle/Repository/EventRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/EventRepository.php
@@ -11,11 +11,17 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Repository;
 
-use Doctrine\ORM\EntityRepository;
+use Chill\EventBundle\Entity\Event;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 
 /**
  * Class EventRepository.
  */
-class EventRepository extends EntityRepository
+class EventRepository extends ServiceEntityRepository
 {
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Event::class);
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php b/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
index cc4bd6f51..7c0c13edf 100644
--- a/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
@@ -11,23 +11,26 @@ declare(strict_types=1);
 
 namespace Chill\EventBundle\Repository;
 
-use Doctrine\ORM\EntityRepository;
+use Chill\EventBundle\Entity\Participation;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 
 /**
  * Class ParticipationRepository.
  */
-class ParticipationRepository extends EntityRepository
+class ParticipationRepository extends ServiceEntityRepository
 {
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Participation::class);
+    }
+
     /**
      * Count number of participations per person.
      *
-     * @param $person_id
-     *
      * @throws \Doctrine\ORM\NonUniqueResultException
-     *
-     * @return mixed
      */
-    public function countByPerson($person_id)
+    public function countByPerson($person_id): int
     {
         return $this->createQueryBuilder('p')
             ->select('COUNT (p.id)')
@@ -39,13 +42,6 @@ class ParticipationRepository extends EntityRepository
 
     /**
      * 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)
     {
diff --git a/src/Bundle/ChillEventBundle/Repository/RoleRepository.php b/src/Bundle/ChillEventBundle/Repository/RoleRepository.php
new file mode 100644
index 000000000..fa0524a6d
--- /dev/null
+++ b/src/Bundle/ChillEventBundle/Repository/RoleRepository.php
@@ -0,0 +1,24 @@
+<?php
+
+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 Chill\EventBundle\Repository;
+
+use Chill\EventBundle\Entity\Role;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+class RoleRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Role::class);
+    }
+}
diff --git a/src/Bundle/ChillEventBundle/Repository/StatusRepository.php b/src/Bundle/ChillEventBundle/Repository/StatusRepository.php
new file mode 100644
index 000000000..644281bdb
--- /dev/null
+++ b/src/Bundle/ChillEventBundle/Repository/StatusRepository.php
@@ -0,0 +1,24 @@
+<?php
+
+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 Chill\EventBundle\Repository;
+
+use Chill\EventBundle\Entity\Status;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+class StatusRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Status::class);
+    }
+}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
index 8d5f49da8..4bdb1f0f8 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
@@ -1,12 +1,21 @@
 <h2>{{ 'Event search'|trans }}</h2>
 
-<p>{% transchoice total with { '%pattern%' : pattern } %}%total% events match the search %pattern%{% endtranschoice %}</p>
+<p>
+    {{ 'total events match the search'|trans({'total' : total}) }}&nbsp;:
+    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
+        <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
+    </a>
+</p>
 
+<style>
+    table.events td:last-child {
+        width: 15em;
+    }
+</style>
 {% if events|length > 0 %}
 
     <p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + events|length, '%total%' : total } ) }}</p>
-
-    <table class="table events">
+    <table class="table table-bordered border-dark align-middle events">
         <thead>
         <tr>
             <th class="chill-red">{{ 'Name'|trans }}</th>
@@ -25,7 +34,7 @@
                     <ul class="record_actions">
                         <li>
                             {# {% if is_granted('CHILL_EVENT_SEE_DETAILS', event) %} #}
-                            <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-dark">
+                            <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-view">
                                 {{ 'See'|trans }}
                             </a>
                             {# {% endif %} #}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
index ef2dae85c..ec9ebf76a 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
@@ -24,7 +24,7 @@
 {% block content %}
 <h2>{{ 'Events participation' |trans }}</h2>
 
-<table class="table table-striped table-bordered mt-3 events">
+<table class="table table-striped table-bordered border-dark align-middle mt-3 events">
     <thead>
         <tr>
             <th class="chill-green">{{ 'Date'|trans }}</th>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
index a10d754e6..71c68002a 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
@@ -18,10 +18,10 @@
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } }) }}
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-submit' } }) }}
         </li>
     </ul>
-            
+
     {{ form_end(form) }}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
index 4ce92a200..f6b84cf68 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
@@ -1,14 +1,14 @@
 {% extends '@ChillEvent/layout.html.twig' %}
 
 {% block title 'Event : %label%'|trans({ '%label%' : event.name } ) %}
-    
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}    
+
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block event_content -%}
 <div class="col-10">
     <h1>{{ 'Details of an event'|trans }}</h1>
 
-    <table class="table record_properties">
+    <table class="table table-bordered border-dark align-middle">
         <tbody>
             <tr>
                 <th>{{ 'Name'|trans }}</th>
@@ -33,7 +33,7 @@
 
         </tbody>
     </table>
-            
+
     <ul class="record_actions">
 
         {% set returnPath = app.request.get('return_path') %}
@@ -64,13 +64,13 @@
         </li>
 
     </ul>
-            
+
     <h2>{{ 'Participations'|trans }}</h2>
     {% set count = event.participations|length %}
-    <p>{% transchoice count %}%count% participations to this event{% endtranschoice %}</p>
-    
+    <p>{{ 'count participations to this event'|trans({'count': count}) }}</p>
+
     {% if count > 0 %}
-        <table class="table">
+        <table class="table table-bordered border-dark align-middle">
             <thead>
                 <tr>
                     <th>{{ 'Person'|trans }}</th>
@@ -108,10 +108,10 @@
             {% endfor %}
             </tbody>
         </table>
-            
-            
+
+
     {% endif %}
-        
+
     <ul class="record_actions">
         {% if count > 0 %}
             <li><a href="{{ path('chill_event_participation_edit_multiple', { 'event_id' : event.id } ) }}" class="btn btn-edit">{{ 'Edit all the participations'|trans }}</a></li>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
index 205b8791b..151a9ec0c 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
index 9c62697f3..aeef9c19d 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
index 4c0823cdc..3474ddd01 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
index 0dbd66b17..d50a97f15 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/_ignored_participations.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/_ignored_participations.html.twig
index 0d54dd624..9451f3c2b 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/_ignored_participations.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/_ignored_participations.html.twig
@@ -1,4 +1,4 @@
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% if ignored_participations|length > 0 %}
     <p>{% transchoice ignored_participations|length %}The following people have been ignored because they are already participating on the event{% endtranschoice %}&nbsp;:</p>
@@ -7,4 +7,4 @@
             <li>{{ person_macro.render(p.person) }}</li>
         {% endfor %}
     </ul>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
index f0f522a3d..a01c51e49 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillEvent/layout.html.twig' %}
 
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block event_content -%}
 <div class="col-10">
@@ -18,11 +18,11 @@
             </tr>
         </tbody>
     </table>
-            
+
     <h2 class="mt-5">{{ 'Participations'|trans }}</h2>
-    
+
     {{ form_start(form) }}
-    
+
      <table class="table">
             <thead>
                 <tr>
@@ -47,7 +47,7 @@
                 {% endfor %}
             </tbody>
      </table>
-            
+
     <ul class="record_actions">
         <li>
             <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-cancel">
@@ -58,7 +58,7 @@
             {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
         </li>
     </ul>
-    
+
     {{ form_end(form) }}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
index db716b3dc..d1995b625 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillEvent/layout.html.twig' %}
 
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block event_content -%}
 <div class="col-10">
@@ -22,7 +22,7 @@
             </tr>
         </tbody>
     </table>
-    
+
     {{ form_start(form) }}
     {{ form_row(form.role) }}
     {{ form_row(form.status) }}
@@ -41,7 +41,7 @@
             {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
         </li>
     </ul>
-    
+
     {{ form_end(form) }}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
index 224b7265f..a9451a755 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillEvent/layout.html.twig' %}
 
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block title 'Participation creation'|trans %}
 
@@ -27,7 +27,7 @@
         </tbody>
     </table>
 
-    {% include 'ChillEventBundle:Participation:_ignored_participations.html.twig' with ignored_participations %}
+    {% include '@ChillEvent/Participation/_ignored_participations.html.twig' with ignored_participations %}
 
     {{ form_start(form) }}
     <table class="table">
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
index 3fbea8b68..8374f04ea 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillEvent/layout.html.twig' %}
 
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block title 'Participation creation'|trans %}
 
@@ -20,17 +20,17 @@
             </tr>
         </tbody>
     </table>
-            
-    {% include 'ChillEventBundle:Participation:_ignored_participations.html.twig' with ignored_participations %}
-    
+
+    {% include '@ChillEvent/Participation/_ignored_participations.html.twig' with ignored_participations %}
+
     {{ form_start(form) }}
-    
+
     {{ form_errors(form) }}
-    
+
     {{ form_row(form.role) }}
     {{ form_row(form.status) }}
-    
-    
+
+
 
     <ul class="record_actions">
         <li class="cancel">
@@ -42,7 +42,7 @@
             {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
         </li>
     </ul>
-    
+
     {{ form_end(form) }}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
index 0c9d61795..41ad81b90 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
     <h1>{{ 'Role edit'|trans }}</h1>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
index 091b2f6ac..6010576bc 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
index 03681f30c..15363c02c 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
index 68a15958f..9fe7e3adf 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
index 3d00a66fa..00ee2d25c 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
index 144a80e51..114e2a1b1 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
index 03ba1de3a..0e0b788ad 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
index 0e0a75069..ce0aaae98 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
index 2750b285f..2e4de23e6 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
@@ -1,4 +1,4 @@
-{% import 'ChillEventBundle:EventReason:macro.html.twig' as m %}
+{% import '@ChillEvent/EventReason/macro.html.twig' as m %}
 
 {% if "now"|date('U') > event.date|date('U') %}
     {% set boolDate = 'past' %}
diff --git a/src/Bundle/ChillEventBundle/Search/EventSearch.php b/src/Bundle/ChillEventBundle/Search/EventSearch.php
index a7ac22592..57cb9e9c5 100644
--- a/src/Bundle/ChillEventBundle/Search/EventSearch.php
+++ b/src/Bundle/ChillEventBundle/Search/EventSearch.php
@@ -12,16 +12,13 @@ declare(strict_types=1);
 namespace Chill\EventBundle\Search;
 
 use Chill\EventBundle\Entity\Event;
+use Chill\EventBundle\Repository\EventRepository;
 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;
+use Symfony\Component\Security\Core\Security;
 
 /**
  * Search within Events.
@@ -38,46 +35,15 @@ use function count;
  */
 class EventSearch extends AbstractSearch
 {
-    public const NAME = 'event_regular';
-
-    /**
-     * @var EntityRepository
-     */
-    private $er;
-
-    /**
-     * @var AuthorizationHelper
-     */
-    private $helper;
-
-    /**
-     * @var PaginatorFactory
-     */
-    private $paginationFactory;
-
-    /**
-     * @var TemplatingEngine
-     */
-    private $templating;
-
-    /**
-     * @var \Chill\MainBundle\Entity\User
-     */
-    private $user;
+    final public const NAME = 'event_regular';
 
     public function __construct(
-        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;
-    }
+        private readonly Security $security,
+        private readonly EventRepository $eventRepository,
+        private readonly AuthorizationHelper $authorizationHelper,
+        private readonly \Twig\Environment $templating,
+        private readonly PaginatorFactory $paginatorFactory
+    ) {}
 
     public function getOrder()
     {
@@ -97,11 +63,11 @@ class EventSearch extends AbstractSearch
         $format = 'html'
     ) {
         $total = $this->count($terms);
-        $paginator = $this->paginationFactory->create($total);
+        $paginator = $this->paginatorFactory->create($total);
 
         if ('html' === $format) {
             return $this->templating->render(
-                'ChillEventBundle:Event:list.html.twig',
+                '@ChillEvent/Event/list.html.twig',
                 [
                     'events' => $this->search($terms, $start, $limit, $options),
                     'pattern' => $this->recomposePattern($terms, $this->getAvailableTerms(), $terms['_domain']),
@@ -120,7 +86,7 @@ class EventSearch extends AbstractSearch
         foreach ($search as $item) {
             $results[] = [
                 'id' => $item->getId(),
-                'text' => $item->getDate()->format('d/m/Y, H:i') . ' → ' .
+                'text' => $item->getDate()->format('d/m/Y, H:i').' → '.
                           // $item->getType()->getName()['fr'] . ':  ' .    // display the type of event
                           $item->getName(),
             ];
@@ -140,10 +106,12 @@ class EventSearch extends AbstractSearch
     protected function composeQuery(QueryBuilder &$qb, $terms)
     {
         // add security clauses
-        $reachableCenters = $this->helper
-            ->getReachableCenters($this->user, 'CHILL_EVENT_SEE');
+        $reachableCenters = $this->authorizationHelper->getReachableCenters(
+            $this->security->getUser(),
+            'CHILL_EVENT_SEE'
+        );
 
-        if (count($reachableCenters) === 0) {
+        if (0 === \count($reachableCenters)) {
             // add a clause to block all events
             $where = $qb->expr()->isNull('e.center');
             $qb->andWhere($where);
@@ -152,17 +120,18 @@ class EventSearch extends AbstractSearch
             $orWhere = $qb->expr()->orX();
 
             foreach ($reachableCenters as $center) {
-                $circles = $this->helper->getReachableScopes(
-                    $this->user,
+                ++$n;
+                $circles = $this->authorizationHelper->getReachableScopes(
+                    $this->security->getUser(),
                     'CHILL_EVENT_SEE',
                     $center
                 );
                 $where = $qb->expr()->andX(
-                    $qb->expr()->eq('e.center', ':center_' . $n),
-                    $qb->expr()->in('e.circle', ':circle_' . $n)
+                    $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->setParameter('center_'.$n, $center);
+                $qb->setParameter('circle_'.$n, $circles);
                 $orWhere->add($where);
             }
 
@@ -177,7 +146,7 @@ class EventSearch extends AbstractSearch
             $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);
         }
 
@@ -210,7 +179,7 @@ class EventSearch extends AbstractSearch
 
     protected function count(array $terms)
     {
-        $qb = $this->er->createQueryBuilder('e');
+        $qb = $this->eventRepository->createQueryBuilder('e');
         $qb->select('COUNT(e)');
         $this->composeQuery($qb, $terms);
 
@@ -224,7 +193,7 @@ class EventSearch extends AbstractSearch
 
     protected function search(array $terms, $start, $limit, $options)
     {
-        $qb = $this->er->createQueryBuilder('e');
+        $qb = $this->eventRepository->createQueryBuilder('e');
         $qb->select('e');
         $this->composeQuery($qb, $terms)
             ->setMaxResults($limit)
diff --git a/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php b/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
index ade1b48de..c88f2804a 100644
--- a/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
@@ -21,30 +21,26 @@ 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 function count;
-use function in_array;
 
 /**
  * Description of EventVoter.
  */
 class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const CREATE = 'CHILL_EVENT_CREATE';
+    final public const CREATE = 'CHILL_EVENT_CREATE';
 
-    public const ROLES = [
+    final public const ROLES = [
         self::SEE,
         self::SEE_DETAILS,
         self::CREATE,
         self::UPDATE,
     ];
 
-    public const SEE = 'CHILL_EVENT_SEE';
+    final public const SEE = 'CHILL_EVENT_SEE';
 
-    public const SEE_DETAILS = 'CHILL_EVENT_SEE_DETAILS';
+    final public const SEE_DETAILS = 'CHILL_EVENT_SEE_DETAILS';
 
-    public const UPDATE = 'CHILL_EVENT_UPDATE';
+    final public const UPDATE = 'CHILL_EVENT_UPDATE';
 
     /**
      * @var AccessDecisionManagerInterface
@@ -90,14 +86,14 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter
 
     public function supports($attribute, $subject)
     {
-        return ($subject instanceof Event && in_array($attribute, self::ROLES, true))
-            || ($subject instanceof Person && in_array($attribute, [self::CREATE, self::SEE], true))
+        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 Event  $subject
      *
      * @return bool
      */
@@ -119,9 +115,9 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter
 
         // subject is null. We check that at least one center is reachable
         $centers = $this->authorizationHelper
-            ->getReachableCenters($token->getUser(), new Role($attribute));
+            ->getReachableCenters($token->getUser(), $attribute);
 
-        return count($centers) > 0;
+        return \count($centers) > 0;
 
         if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
             return false;
diff --git a/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php b/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
index 12c01ca60..ad2e90377 100644
--- a/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
@@ -21,27 +21,23 @@ 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 function count;
-use function in_array;
 
 class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const CREATE = 'CHILL_EVENT_PARTICIPATION_CREATE';
+    final public const CREATE = 'CHILL_EVENT_PARTICIPATION_CREATE';
 
-    public const ROLES = [
+    final public const ROLES = [
         self::SEE,
         self::SEE_DETAILS,
         self::CREATE,
         self::UPDATE,
     ];
 
-    public const SEE = 'CHILL_EVENT_PARTICIPATION_SEE';
+    final public const SEE = 'CHILL_EVENT_PARTICIPATION_SEE';
 
-    public const SEE_DETAILS = 'CHILL_EVENT_PARTICIPATION_SEE_DETAILS';
+    final public const SEE_DETAILS = 'CHILL_EVENT_PARTICIPATION_SEE_DETAILS';
 
-    public const UPDATE = 'CHILL_EVENT_PARTICIPATION_UPDATE';
+    final public const UPDATE = 'CHILL_EVENT_PARTICIPATION_UPDATE';
 
     /**
      * @var AccessDecisionManagerInterface
@@ -87,13 +83,13 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
 
     public function supports($attribute, $subject)
     {
-        return ($subject instanceof Participation && in_array($attribute, self::ROLES, true))
-            || ($subject instanceof Person && in_array($attribute, [self::CREATE, self::SEE], true))
+        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 string        $attribute
      * @param Participation $subject
      *
      * @return bool
@@ -116,9 +112,9 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
 
         // subject is null. We check that at least one center is reachable
         $centers = $this->authorizationHelper
-            ->getReachableCenters($token->getUser(), new Role($attribute));
+            ->getReachableCenters($token->getUser(), $attribute);
 
-        return count($centers) > 0;
+        return \count($centers) > 0;
 
         if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
             return false;
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
index 01f5e1b1a..4af365b75 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
@@ -15,11 +15,15 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EventControllerTest extends WebTestCase
 {
-    public function testSkipped()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testSkipped(): never
     {
         $this->markTestSkipped();
     }
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
index 23394d43c..0fd2e38d5 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
@@ -15,11 +15,15 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EventTypeControllerTest extends WebTestCase
 {
-    public function testSkipped()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testSkipped(): never
     {
         $this->markTestSkipped();
     }
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
index fa1ecabbe..6532f76ac 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
@@ -13,18 +13,18 @@ namespace Chill\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use function count;
-use function in_array;
 
 /**
  * Test the creation of participation controller.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ParticipationControllerTest extends WebTestCase
 {
     /**
-     * @var \Symfony\Component\BrowserKit\Client
+     * @var \Symfony\Component\BrowserKit\AbstractBrowser
      */
     protected $client;
 
@@ -42,7 +42,7 @@ final class ParticipationControllerTest extends WebTestCase
      *
      * @var int[]
      */
-    private $personsIdsCache = [];
+    private array $personsIdsCache = [];
 
     protected function setUp(): void
     {
@@ -83,7 +83,7 @@ final class ParticipationControllerTest extends WebTestCase
             400,
             $this->client->getResponse()->getStatusCode(),
             'Test that /fr/event/participation/create fail if '
-                . 'both person_id and persons_ids are missing'
+                .'both person_id and persons_ids are missing'
         );
 
         // having both person_id and persons_ids
@@ -103,7 +103,7 @@ final class ParticipationControllerTest extends WebTestCase
             400,
             $this->client->getResponse()->getStatusCode(),
             'test that /fr/event/participation/create fail if both person_id and '
-                . 'persons_ids are set'
+                .'persons_ids are set'
         );
 
         // missing event_id
@@ -141,7 +141,7 @@ final class ParticipationControllerTest extends WebTestCase
         /** @var \Chill\EventBundle\Entity\Event $event */
         $event = $this->getRandomEventWithMultipleParticipations();
 
-        $crawler = $this->client->request('GET', '/fr/event/participation/' . $event->getId() .
+        $crawler = $this->client->request('GET', '/fr/event/participation/'.$event->getId().
                 '/edit_multiple');
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
@@ -157,7 +157,7 @@ final class ParticipationControllerTest extends WebTestCase
         ]);
 
         $this->assertTrue($this->client->getResponse()
-            ->isRedirect('/fr/event/event/' . $event->getId() . '/show'));
+            ->isRedirect('/fr/event/event/'.$event->getId().'/show'));
     }
 
     public function testNewActionWrongParameters()
@@ -177,7 +177,7 @@ final class ParticipationControllerTest extends WebTestCase
             400,
             $this->client->getResponse()->getStatusCode(),
             'Test that /fr/event/participation/new fail if '
-                . 'both person_id and persons_ids are missing'
+                .'both person_id and persons_ids are missing'
         );
 
         // having both person_id and persons_ids
@@ -197,7 +197,7 @@ final class ParticipationControllerTest extends WebTestCase
             400,
             $this->client->getResponse()->getStatusCode(),
             'test that /fr/event/participation/new fail if both person_id and '
-                . 'persons_ids are set'
+                .'persons_ids are set'
         );
 
         // missing event_id
@@ -239,9 +239,7 @@ final class ParticipationControllerTest extends WebTestCase
         $this->personsIdsCache = array_merge(
             $this->personsIdsCache,
             $event->getParticipations()->map(
-                static function ($p) {
-                    return $p->getPerson()->getId();
-                }
+                static fn ($p) => $p->getPerson()->getId()
             )
                 ->toArray()
         );
@@ -287,11 +285,11 @@ final class ParticipationControllerTest extends WebTestCase
         $crawler = $this->client->followRedirect();
 
         $span1 = $crawler->filter('table td span.entity-person a:contains("'
-                . $person1->getFirstName() . '"):contains("' . $person1->getLastname() . '")');
-        $this->assertGreaterThan(0, count($span1));
+                .$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() . '")');
-        $this->assertGreaterThan(0, count($span2));
+                .$person2->getFirstName().'"):contains("'.$person2->getLastname().'")');
+        $this->assertGreaterThan(0, \count($span2));
 
         // as the container has reloaded, reload the event
         $event = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class)->find($event->getId());
@@ -305,9 +303,7 @@ final class ParticipationControllerTest extends WebTestCase
         $event = $this->getRandomEventWithMultipleParticipations();
 
         $persons_id = implode(',', $event->getParticipations()->map(
-            static function ($p) {
-                return $p->getPerson()->getId();
-            }
+            static fn ($p) => $p->getPerson()->getId()
         )->toArray());
 
         $crawler = $this->client->request(
@@ -333,9 +329,7 @@ final class ParticipationControllerTest extends WebTestCase
         $nbParticipations = $event->getParticipations()->count();
         // get the persons_id participating on this event
         $persons_id = $event->getParticipations()->map(
-            static function ($p) {
-                return $p->getPerson()->getId();
-            }
+            static fn ($p) => $p->getPerson()->getId()
         )->toArray();
         // exclude the existing persons_ids from the new person
         $this->personsIdsCache = array_merge($this->personsIdsCache, $persons_id);
@@ -344,10 +338,7 @@ final class ParticipationControllerTest extends WebTestCase
         $newPerson = $this->getRandomPerson();
 
         // build the `persons_ids` parameter
-        $persons_ids_string = implode(',', array_merge(
-            $persons_id,
-            [$newPerson->getId()]
-        ));
+        $persons_ids_string = implode(',', [...$persons_id, $newPerson->getId()]);
 
         $crawler = $this->client->request(
             'GET',
@@ -366,8 +357,8 @@ final class ParticipationControllerTest extends WebTestCase
 
         // 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() . '")');
+        $ul = $crawler->filter('ul:contains("'.$firstPerson->getLastName().'")'
+                .':contains("'.$firstPerson->getFirstName().'")');
 
         $this->assertEquals(
             1,
@@ -440,9 +431,9 @@ final class ParticipationControllerTest extends WebTestCase
         $crawler = $this->client->followRedirect();
 
         $span = $crawler->filter('table td span.entity-person a:contains("'
-                . $person->getFirstName() . '"):contains("' . $person->getLastname() . '")');
+                .$person->getFirstName().'"):contains("'.$person->getLastname().'")');
 
-        $this->assertGreaterThan(0, count($span));
+        $this->assertGreaterThan(0, \count($span));
 
         // as the container has reloaded, reload the event
         $event = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class)->find($event->getId());
@@ -452,21 +443,16 @@ final class ParticipationControllerTest extends WebTestCase
     }
 
     /**
-     * @param mixed $centerName
-     * @param mixed $circleName
-     *
      * @return \Chill\EventBundle\Entity\Event
      */
-    protected function getRandomEvent($centerName = 'Center A', $circleName = 'social')
+    protected function getRandomEvent(mixed $centerName = 'Center A', mixed $circleName = 'social')
     {
         $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findByName($centerName);
 
         $circles = $this->em->getRepository(\Chill\MainBundle\Entity\Scope::class)
             ->findAll();
-        array_filter($circles, static function ($circle) use ($circleName) {
-            return in_array($circleName, $circle->getName(), true);
-        });
+        array_filter($circles, static fn ($circle) => \in_array($circleName, $circle->getName(), true));
         $circle = $circles[0];
 
         $events = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class)
@@ -479,7 +465,7 @@ final class ParticipationControllerTest extends WebTestCase
      * Return a random event only if he has more than one participation.
      *
      * @param string $centerName
-     * @param type $circleName
+     * @param type   $circleName
      *
      * @return \Chill\EventBundle\Entity\Event
      */
@@ -517,7 +503,7 @@ final class ParticipationControllerTest extends WebTestCase
 
         $person = $persons[array_rand($persons)];
 
-        if (in_array($person->getId(), $this->personsIdsCache, true)) {
+        if (\in_array($person->getId(), $this->personsIdsCache, true)) {
             return $this->getRandomPerson($centerName); // we try another time
         }
         $this->personsIdsCache[] = $person->getId();
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
index 937bf8e49..03f6f4600 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
@@ -15,11 +15,15 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RoleControllerTest extends WebTestCase
 {
-    public function testSkipped()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testSkipped(): never
     {
         $this->markTestSkipped();
     }
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
index 04a6e6270..1cc00f9e5 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
@@ -15,11 +15,15 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class StatusControllerTest extends WebTestCase
 {
-    public function testSkipped()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testSkipped(): never
     {
         $this->markTestSkipped();
     }
diff --git a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
index 131d6051d..c37566fe7 100644
--- a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
@@ -15,12 +15,12 @@ use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Search\EventSearch;
 use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function in_array;
 
 /**
  * Test the EventSearch class.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class EventSearchTest extends WebTestCase
@@ -33,7 +33,7 @@ final class EventSearchTest extends WebTestCase
     protected $centerA;
 
     /**
-     * @var \Symfony\Component\BrowserKit\Client
+     * @var \Symfony\Component\BrowserKit\AbstractBrowser
      */
     protected $client;
 
@@ -150,9 +150,9 @@ final class EventSearchTest extends WebTestCase
             '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');
+        /** @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'));
 
@@ -164,7 +164,7 @@ final class EventSearchTest extends WebTestCase
         // 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) {
+        if (0 === $crawler->selectLink('Voir tous les résultats')->count()) {
             return;
         }
 
@@ -178,7 +178,7 @@ final class EventSearchTest extends WebTestCase
             $this->assertLessThanOrEqual($dateTo, $date);
         }
 
-        //iterate on pagination
+        // 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'));
@@ -196,8 +196,8 @@ final class EventSearchTest extends WebTestCase
         $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');
+        /** @var \DateTime $dateFrom the date from in DateTime */
+        $dateFrom = \DateTime::createFromFormat('Y-m-d', '2016-05-30');
 
         $dates = $this->iterateOnRowsToFindDate($crawler->filter('tr'));
 
@@ -214,7 +214,7 @@ final class EventSearchTest extends WebTestCase
             $this->assertGreaterThanOrEqual($dateFrom, $date);
         }
 
-        //iterate on pagination
+        // 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'));
@@ -232,8 +232,8 @@ final class EventSearchTest extends WebTestCase
             'q' => '@events date:2016-05-30',
         ]);
 
-        /** @var DateTime $dateFrom the date from in DateTime */
-        $dateTo = DateTime::createFromFormat('Y-m-d', '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'));
 
@@ -241,7 +241,7 @@ final class EventSearchTest extends WebTestCase
             $this->assertLessThanOrEqual($dateTo, $date);
         }
 
-        if ($crawler->selectLink('Voir tous les résultats')->count() === 0) {
+        if (0 === $crawler->selectLink('Voir tous les résultats')->count()) {
             return;
         }
 
@@ -254,7 +254,7 @@ final class EventSearchTest extends WebTestCase
             $this->assertLessThanOrEqual($dateTo, $date);
         }
 
-        //iterate on pagination
+        // iterate on pagination
         $crawlerAllResults->filter('.pagination a')->each(function ($a, $i) {
             $page = $this->client->click($a->link());
             $dates = $this->iterateOnRowsToFindDate($page->filter('tr'));
@@ -307,7 +307,7 @@ final class EventSearchTest extends WebTestCase
     {
         $event1 = (new Event())
             ->setCenter($this->centerA)
-            ->setDate(new DateTime('2016-05-30'))
+            ->setDate(new \DateTime('2016-05-30'))
             ->setName('Printemps européen')
             ->setType($this->eventType)
             ->setCircle($this->getCircle());
@@ -316,7 +316,7 @@ final class EventSearchTest extends WebTestCase
 
         $event2 = (new Event())
             ->setCenter($this->centerA)
-            ->setDate(new DateTime('2016-06-24'))
+            ->setDate(new \DateTime('2016-06-24'))
             ->setName('Hiver de la droite')
             ->setType($this->eventType)
             ->setCircle($this->getCircle());
@@ -338,7 +338,7 @@ final class EventSearchTest extends WebTestCase
 
         /** @var \Chill\MainBundle\Entity\Scope $circle */
         foreach ($circles as $circle) {
-            if (in_array($name, $circle->getName(), true)) {
+            if (\in_array($name, $circle->getName(), true)) {
                 return $circle;
             }
         }
@@ -348,7 +348,7 @@ final class EventSearchTest extends WebTestCase
      * 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.
      *
-     * @return DateTime[]
+     * @return \DateTime[]
      */
     private function iterateOnRowsToFindDate(\Symfony\Component\DomCrawler\Crawler $trs)
     {
@@ -373,10 +373,10 @@ final class EventSearchTest extends WebTestCase
                 // get the second node, which should contains a date
                 $tdDate = $tr->filter('td')->eq(1);
                 // transform the date, which should be in french, into a DateTime object
-                $parts = explode(' ', $tdDate->text());
+                $parts = explode(' ', (string) $tdDate->text());
 
-                return DateTime::createFromFormat('Y-m-d', $parts[2] .
-                        '-' . $months[$parts[1]] . '-' . $parts[0]);
+                return \DateTime::createFromFormat('Y-m-d', $parts[2].
+                        '-'.$months[$parts[1]].'-'.$parts[0]);
             }
         });
 
diff --git a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
index c1ae84b95..9e35a6757 100644
--- a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
+++ b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
@@ -20,12 +20,8 @@ use Chill\MainBundle\Timeline\TimelineSingleQuery;
 use Chill\PersonBundle\Entity\Person;
 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.
  */
@@ -58,7 +54,7 @@ class TimelineEventProvider implements TimelineProviderInterface
         $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();
     }
@@ -66,9 +62,9 @@ class TimelineEventProvider implements TimelineProviderInterface
     /**
      * @param string $context
      *
-     * @throws \Doctrine\ORM\Mapping\MappingException
-     *
      * @return array|string[]
+     *
+     * @throws \Doctrine\ORM\Mapping\MappingException
      */
     public function fetchQuery($context, array $args)
     {
@@ -79,9 +75,9 @@ class TimelineEventProvider implements TimelineProviderInterface
         $metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person');
 
         return TimelineSingleQuery::fromArray([
-            'id' => $metadataEvent->getTableName() . '.' . $metadataEvent->getColumnName('id'),
+            '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' => [],
@@ -106,7 +102,7 @@ class TimelineEventProvider implements TimelineProviderInterface
     }
 
     /**
-     * @param Event $entity
+     * @param Event  $entity
      * @param string $context
      *
      * @return array|mixed[]
@@ -116,7 +112,7 @@ class TimelineEventProvider implements TimelineProviderInterface
         $this->checkContext($context);
 
         return [
-            'template' => 'ChillEventBundle:Timeline:event_person_context.html.twig',
+            'template' => '@ChillEvent/Timeline/event_person_context.html.twig',
             'template_data' => [
                 'event' => $entity,
                 'person' => $args['person'],
@@ -140,20 +136,19 @@ class TimelineEventProvider implements TimelineProviderInterface
      *
      * @param string $context
      *
-     * @throws LogicException if the context is not supported
+     * @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");
+            throw new \LogicException("The context '{$context}' is not supported. Currently only 'person' is supported");
         }
     }
 
     /**
-     * @throws \Doctrine\ORM\Mapping\MappingException
-     *
      * @return string
+     *
+     * @throws \Doctrine\ORM\Mapping\MappingException
      */
     private function getFromClause(
         ClassMetadata $metadataEvent,
@@ -164,23 +159,23 @@ class TimelineEventProvider implements TimelineProviderInterface
         $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'];
     }
 
     /**
-     * @throws \Doctrine\ORM\Mapping\MappingException
-     *
      * @return string
+     *
+     * @throws \Doctrine\ORM\Mapping\MappingException
      */
     private function getWhereClause(
         ClassMetadata $metadataEvent,
@@ -193,7 +188,7 @@ class TimelineEventProvider implements TimelineProviderInterface
         $reachableCenters = $this->helper->getReachableCenters($this->user, $role);
         $associationMapping = $metadataParticipation->getAssociationMapping('person');
 
-        if (count($reachableCenters) === 0) {
+        if (0 === \count($reachableCenters)) {
             return 'FALSE = TRUE';
         }
 
@@ -208,22 +203,20 @@ class TimelineEventProvider implements TimelineProviderInterface
 
         foreach ($reachableCenters as $center) {
             $reachableCircleId = array_map(
-                static function (Scope $scope) {
-                    return $scope->getId();
-                },
+                static fn (Scope $scope) => $scope->getId(),
                 $this->helper->getReachableCircles($this->user, $role, $person->getCenter())
             );
             $centerAndScopeLines[] = sprintf(
                 '(%s = %d AND %s IN (%s))',
-                $metadataPerson->getTableName() . '.' .
+                $metadataPerson->getTableName().'.'.
                 $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'],
                 $center->getId(),
-                $metadataEvent->getTableName() . '.' .
+                $metadataEvent->getTableName().'.'.
                 $metadataEvent->getAssociationMapping('circle')['joinColumns'][0]['name'],
                 implode(',', $reachableCircleId)
             );
         }
-        $whereClause .= ' AND (' . implode(' OR ', $centerAndScopeLines) . ')';
+        $whereClause .= ' AND ('.implode(' OR ', $centerAndScopeLines).')';
 
         return $whereClause;
     }
diff --git a/src/Bundle/ChillEventBundle/config/routes.yaml b/src/Bundle/ChillEventBundle/config/routes.yaml
index afa6bbe2b..8583a8d2d 100644
--- a/src/Bundle/ChillEventBundle/config/routes.yaml
+++ b/src/Bundle/ChillEventBundle/config/routes.yaml
@@ -1,42 +1,3 @@
-chill_event_event:
-    resource: "@ChillEventBundle/config/routes/event.yaml"
-    prefix:    /{_locale}/event/event
-
-chill_event_participation:
-    resource: "@ChillEventBundle/config/routes/participation.yaml"
-    prefix:   /{_locale}/event/participation
-
-
-## ADMIN
-
-chill_event_admin_index:
-    path:     /{_locale}/admin/event
-    controller: Chill\EventBundle\Controller\AdminController::indexAdminAction
-    # options:
-    #     menus:
-    #         admin_section:
-    #             order: 2100
-    #             label: "Events"
-    #             icons: ['calendar']
-
-# chill_event_admin_redirect_to_admin_index:
-#     path:     /{_locale}/admin/event_redirect_to_main
-#     controller: Chill\EventBundle\Controller\AdminController::redirectToAdminIndexAction
-#     options:
-#         menus:
-#             admin_events:
-#                 order: 0
-#                 label: Main admin menu
-
-chill_event_admin_status:
-    resource: "@ChillEventBundle/config/routes/status.yaml"
-    prefix:   /{_locale}/admin/event/status
-
-chill_event_admin_role:
-    resource: "@ChillEventBundle/config/routes/role.yaml"
-    prefix:   /{_locale}/admin/event/role
-
-chill_event_admin_event_type:
-    resource: "@ChillEventBundle/config/routes/eventtype.yaml"
-    prefix:   /{_locale}/admin/event/event_type
-
+chill_event_controllers:
+    resource: "@ChillEventBundle/Controller"
+    type: annotation
diff --git a/src/Bundle/ChillEventBundle/config/routes/event.yaml b/src/Bundle/ChillEventBundle/config/routes/event.yaml
deleted file mode 100644
index 99dd6447c..000000000
--- a/src/Bundle/ChillEventBundle/config/routes/event.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-chill_event_list_most_recent:
-    path:    most_recent
-    controller: Chill\EventBundle\Controller\EventController::mostRecentIndexAction
-    options:
-        menus:
-            section:
-                order: 90
-                label: Events
-                icons: [calendar]
-
-chill_event__event_show:
-    path:     /{event_id}/show
-    controller: Chill\EventBundle\Controller\EventController::showAction
-
-chill_event__event_new_pickcenter:
-    path:     /new/pick-center
-    controller: Chill\EventBundle\Controller\EventController::newPickCenterAction
-    options:
-        menus:
-            section:
-                order: 11
-                label: Add an event
-                icons: [plus, calendar-o]
-
-chill_event__event_new:
-    path:     /new
-    controller: Chill\EventBundle\Controller\EventController::newAction
-    methods:  [ GET, POST ]
-
-chill_event__event_edit:
-    path:     /{event_id}/edit
-    controller: Chill\EventBundle\Controller\EventController::editAction
-
-chill_event__event_update:
-    path:     /{event_id}/update
-    controller: Chill\EventBundle\Controller\EventController::updateAction
-    methods:  [POST, PUT]
-
-chill_event__list_by_person:
-    path:     /{person_id}/list
-    controller: Chill\EventBundle\Controller\EventController::listByPersonAction
-    methods: [ GET ]
-
-chill_event__event_delete:
-    path:   /{event_id}/delete
-    requirements:
-        event_id: \d+
-    controller: Chill\EventBundle\Controller\EventController::deleteAction
-    methods: [ GET, DELETE ]
\ No newline at end of file
diff --git a/src/Bundle/ChillEventBundle/config/routes/eventtype.yaml b/src/Bundle/ChillEventBundle/config/routes/eventtype.yaml
deleted file mode 100644
index cbde13ce6..000000000
--- a/src/Bundle/ChillEventBundle/config/routes/eventtype.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-chill_eventtype_admin:
-    path:     /
-    controller: Chill\EventBundle\Controller\EventTypeController::indexAction
-    options:
-        menus:
-            admin_events:
-                order: 90
-                label: "Event types"
-
-chill_eventtype_admin_show:
-    path:     /{id}/show
-    controller: Chill\EventBundle\Controller\EventTypeController::showAction
-
-chill_eventtype_admin_new:
-    path:     /new
-    controller: Chill\EventBundle\Controller\EventTypeController::newAction
-
-chill_eventtype_admin_create:
-    path:     /create
-    controller: Chill\EventBundle\Controller\EventTypeController::createAction
-    methods:  POST
-
-chill_eventtype_admin_edit:
-    path:     /{id}/edit
-    controller: Chill\EventBundle\Controller\EventTypeController::editAction
-
-chill_eventtype_admin_update:
-    path:     /{id}/update
-    controller: Chill\EventBundle\Controller\EventTypeController::updateAction
-    methods:  [POST, PUT]
-
-chill_eventtype_admin_delete:
-    path:     /{id}/delete
-    controller: Chill\EventBundle\Controller\EventTypeController::deleteAction
-    methods:  [POST, DELETE]
diff --git a/src/Bundle/ChillEventBundle/config/routes/participation.yaml b/src/Bundle/ChillEventBundle/config/routes/participation.yaml
deleted file mode 100644
index eb11c72a9..000000000
--- a/src/Bundle/ChillEventBundle/config/routes/participation.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-chill_event_participation_new:
-    path: /new
-    controller: Chill\EventBundle\Controller\ParticipationController::newAction
-    
-chill_event_participation_create:
-    path: /create
-    controller: Chill\EventBundle\Controller\ParticipationController::createAction
-    
-chill_event_participation_edit:
-    path: /{participation_id}/edit
-    controller: Chill\EventBundle\Controller\ParticipationController::editAction
-    
-chill_event_participation_update:
-    path: /{participation_id}/update
-    controller: Chill\EventBundle\Controller\ParticipationController::updateAction
-    methods: [POST]
-    
-chill_event_participation_edit_multiple:
-    path: /{event_id}/edit_multiple
-    controller: Chill\EventBundle\Controller\ParticipationController::editMultipleAction
-    
-chill_event_participation_update_multiple:
-    path: /{event_id}/update_multiple
-    controller: Chill\EventBundle\Controller\ParticipationController::updateMultipleAction
-    methods: [POST]
-
-chill_event_participation_delete:
-    path:     /{participation_id}/delete
-    requirements:
-        participation_id:  \d+
-    controller: Chill\EventBundle\Controller\ParticipationController::deleteAction
-    methods: [ GET, DELETE ]
-
diff --git a/src/Bundle/ChillEventBundle/config/routes/role.yaml b/src/Bundle/ChillEventBundle/config/routes/role.yaml
deleted file mode 100644
index 5da3c9f98..000000000
--- a/src/Bundle/ChillEventBundle/config/routes/role.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-chill_event_admin_role:
-    path:     /
-    controller: Chill\EventBundle\Controller\RoleController::indexAction
-    options:
-        menus:
-            admin_events:
-                order: 110
-                label: "Event roles"
-
-chill_event_admin_role_show:
-    path:     /{id}/show
-    controller: Chill\EventBundle\Controller\RoleController::showAction
-
-chill_event_admin_role_new:
-    path:     /new
-    controller: Chill\EventBundle\Controller\RoleController::newAction
-
-chill_event_admin_role_create:
-    path:     /create
-    controller: Chill\EventBundle\Controller\RoleController::createAction
-    methods:  POST
-
-chill_event_admin_role_edit:
-    path:     /{id}/edit
-    controller: Chill\EventBundle\Controller\RoleController::editAction
-
-chill_event_admin_role_update:
-    path:     /{id}/update
-    controller: Chill\EventBundle\Controller\RoleController::updateAction
-    methods:  [POST, PUT]
-
-chill_event_admin_role_delete:
-    path:     /{id}/delete
-    controller: Chill\EventBundle\Controller\RoleController::deleteAction
-    methods:  [POST, DELETE]
diff --git a/src/Bundle/ChillEventBundle/config/routes/status.yaml b/src/Bundle/ChillEventBundle/config/routes/status.yaml
deleted file mode 100644
index 200d79733..000000000
--- a/src/Bundle/ChillEventBundle/config/routes/status.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-chill_event_admin_status:
-    path:     /
-    controller: Chill\EventBundle\Controller\StatusController::indexAction
-    options:
-        menus:
-            admin_events:
-                order: 100
-                label: "Event status"
-
-chill_event_admin_status_show:
-    path:     /{id}/show
-    controller: Chill\EventBundle\Controller\StatusController::showAction
-
-chill_event_admin_status_new:
-    path:     /new
-    controller: Chill\EventBundle\Controller\StatusController::newAction
-
-chill_event_admin_status_create:
-    path:     /create
-    controller: Chill\EventBundle\Controller\StatusController::createAction
-    methods:  POST
-
-chill_event_admin_status_edit:
-    path:     /{id}/edit
-    controller: Chill\EventBundle\Controller\StatusController::editAction
-
-chill_event_admin_status_update:
-    path:     /{id}/update
-    controller: Chill\EventBundle\Controller\StatusController::updateAction
-    methods:  [POST, PUT]
-
-chill_event_admin_status_delete:
-    path:     /{id}/delete
-    controller: Chill\EventBundle\Controller\StatusController::deleteAction
-    methods:  [POST, DELETE]
diff --git a/src/Bundle/ChillEventBundle/config/services/controller.yaml b/src/Bundle/ChillEventBundle/config/services/controller.yaml
index bb4cf7c46..0ba2fac8e 100644
--- a/src/Bundle/ChillEventBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillEventBundle/config/services/controller.yaml
@@ -2,7 +2,7 @@ services:
 
     Chill\EventBundle\Controller\EventController:
         arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $eventDispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
             $formFactoryInterface: '@Symfony\Component\Form\FormFactoryInterface'
             $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
diff --git a/src/Bundle/ChillEventBundle/config/services/forms.yaml b/src/Bundle/ChillEventBundle/config/services/forms.yaml
index 6f61531ce..8c81c3e63 100644
--- a/src/Bundle/ChillEventBundle/config/services/forms.yaml
+++ b/src/Bundle/ChillEventBundle/config/services/forms.yaml
@@ -1,49 +1,33 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.event.form.type.pick_event_type:
         class: Chill\EventBundle\Form\Type\PickEventTypeType
-        arguments:
-            - "@chill.main.helper.translatable_string"
         tags:
             - { name: form.type }
 
     chill.event.form.participation_type:
         class: Chill\EventBundle\Form\ParticipationType
-        arguments:
-            - "@chill.main.helper.translatable_string"
         tags:
             - { name: form.type }
-            
+
     chill.event.form.pick_role_type:
         class: Chill\EventBundle\Form\Type\PickRoleType
-        arguments:
-            - "@chill.main.helper.translatable_string"
-            - "@translator"
-            - "@chill_event.repository.role"
         tags:
             - { name: form.type }
-            
+
     chill.event.form.pick_status_type:
         class: Chill\EventBundle\Form\Type\PickStatusType
-        arguments:
-            - "@chill.main.helper.translatable_string"
-            - "@translator"
-            - "@chill_event.repository.status"
         tags:
             - { name: form.type }
-            
+
     chill.event.form.role_type:
         class: Chill\EventBundle\Form\RoleType
-        arguments:
-            - "@chill.main.helper.translatable_string"
         tags:
             - { name: form.type }
 
     Chill\EventBundle\Form\Type\PickEventType:
-        arguments:
-            $eventRepository: "@chill_event.repository.event"
-            $tokenStorage: "@security.token_storage"
-            $authorizationHelper: "@chill.main.security.authorization.helper"
-            $urlGenerator: '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
         tags:
             - { name: form.type }
diff --git a/src/Bundle/ChillEventBundle/config/services/repositories.yaml b/src/Bundle/ChillEventBundle/config/services/repositories.yaml
index 4d627f625..ef3bf6154 100644
--- a/src/Bundle/ChillEventBundle/config/services/repositories.yaml
+++ b/src/Bundle/ChillEventBundle/config/services/repositories.yaml
@@ -1,25 +1,5 @@
 services:
-
-    chill_event.repository.event:
-        class: Chill\EventBundle\Repository\EventRepository
-        factory: ['@doctrine.orm.entity_manager', getRepository]
-        arguments:
-            - 'Chill\EventBundle\Entity\Event'
-
-    chill_event.repository.participation:
-            class: Chill\EventBundle\Repository\ParticipationRepository
-            factory: ['@doctrine.orm.entity_manager', getRepository]
-            arguments:
-                - 'Chill\EventBundle\Entity\Participation'
-
-    chill_event.repository.role:
-        class: Doctrine\ORM\EntityRepository
-        factory: ['@doctrine.orm.entity_manager', getRepository]
-        arguments:
-            - 'Chill\EventBundle\Entity\Role'
-            
-    chill_event.repository.status:
-        class: Doctrine\ORM\EntityRepository
-        factory: ['@doctrine.orm.entity_manager', getRepository]
-        arguments:
-            - 'Chill\EventBundle\Entity\Status'
+    Chill\EventBundle\Repository\:
+        resource: './../../Repository'
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillEventBundle/config/services/search.yaml b/src/Bundle/ChillEventBundle/config/services/search.yaml
index 2df3db26f..2d0869300 100644
--- a/src/Bundle/ChillEventBundle/config/services/search.yaml
+++ b/src/Bundle/ChillEventBundle/config/services/search.yaml
@@ -1,12 +1,7 @@
 services:
-    chill_event.search_events:
-        class: Chill\EventBundle\Search\EventSearch
-        arguments:
-            - "@security.token_storage"
-            - "@chill_event.repository.event"
-            - "@chill.main.security.authorization.helper"
-            - "@templating"
-            - "@chill_main.paginator_factory"
+    Chill\EventBundle\Search\EventSearch:
+        autoconfigure: true
+        autowire: true
         tags:
             - { name: chill.search, alias: 'event_regular' }
-    
+
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php b/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
index ab7669cc2..4689fe413 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
@@ -22,7 +22,7 @@ class Version20160318111334 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -51,7 +51,7 @@ class Version20160318111334 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -59,37 +59,37 @@ class Version20160318111334 extends AbstractMigration
         $this->addSql('CREATE SEQUENCE chill_event_event_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_event_participation_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_event_event_type ('
-                . 'id INT NOT NULL, name JSON NOT NULL, '
-                . 'active BOOLEAN NOT NULL, PRIMARY KEY(id))');
+                .'id INT NOT NULL, name JSON NOT NULL, '
+                .'active BOOLEAN NOT NULL, PRIMARY KEY(id))');
         $this->addSql('CREATE TABLE chill_event_role ('
-                . 'id INT NOT NULL, '
-                . 'type_id INT DEFAULT NULL, '
-                . 'name JSON NOT NULL, '
-                . 'active BOOLEAN NOT NULL, '
-                . 'PRIMARY KEY(id))');
+                .'id INT NOT NULL, '
+                .'type_id INT DEFAULT NULL, '
+                .'name JSON NOT NULL, '
+                .'active BOOLEAN NOT NULL, '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_AA714E54C54C8C93 ON chill_event_role (type_id)');
         $this->addSql('CREATE TABLE chill_event_status (id INT NOT NULL, '
-                . 'type_id INT DEFAULT NULL, '
-                . 'name JSON NOT NULL, '
-                . 'active BOOLEAN NOT NULL, '
-                . 'PRIMARY KEY(id))');
+                .'type_id INT DEFAULT NULL, '
+                .'name JSON NOT NULL, '
+                .'active BOOLEAN NOT NULL, '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_A6CC85D0C54C8C93 ON chill_event_status (type_id)');
         $this->addSql('CREATE TABLE chill_event_event ('
-                . 'id INT NOT NULL, '
-                . 'name VARCHAR(150) NOT NULL, '
-                . 'date DATE NOT NULL, '
-                . 'center_id INT DEFAULT NULL, '
-                . 'type_id INT DEFAULT NULL, '
-                . 'circle_id INT DEFAULT NULL, '
-                . 'PRIMARY KEY(id))');
+                .'id INT NOT NULL, '
+                .'name VARCHAR(150) NOT NULL, '
+                .'date DATE NOT NULL, '
+                .'center_id INT DEFAULT NULL, '
+                .'type_id INT DEFAULT NULL, '
+                .'circle_id INT DEFAULT NULL, '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE TABLE chill_event_participation ('
-                . 'id INT NOT NULL, '
-                . 'event_id INT DEFAULT NULL, '
-                . 'person_id INT DEFAULT NULL, '
-                . 'role_id INT DEFAULT NULL, '
-                . 'status_id INT DEFAULT NULL, '
-                . 'lastUpdate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, '
-                . 'PRIMARY KEY(id))');
+                .'id INT NOT NULL, '
+                .'event_id INT DEFAULT NULL, '
+                .'person_id INT DEFAULT NULL, '
+                .'role_id INT DEFAULT NULL, '
+                .'status_id INT DEFAULT NULL, '
+                .'lastUpdate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, '
+                .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_4E7768AC71F7E88B ON chill_event_participation (event_id)');
         $this->addSql('CREATE INDEX IDX_4E7768AC217BBB47 ON chill_event_participation (person_id)');
         $this->addSql('CREATE INDEX IDX_4E7768ACD60322AC ON chill_event_participation (role_id)');
@@ -99,44 +99,44 @@ class Version20160318111334 extends AbstractMigration
         $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) '
-              . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_FA320FC85932F377 FOREIGN KEY (center_id) '
+              .'REFERENCES centers (id) '
+              .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_event '
-              . 'ADD CONSTRAINT FK_FA320FC870EE2FF6 FOREIGN KEY (circle_id) '
-              . 'REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_FA320FC870EE2FF6 FOREIGN KEY (circle_id) '
+              .'REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_event '
-              . 'ADD CONSTRAINT FK_FA320FC8C54C8C93 FOREIGN KEY (type_id) '
-              . 'REFERENCES chill_event_event_type (id) '
-              . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_FA320FC8C54C8C93 FOREIGN KEY (type_id) '
+              .'REFERENCES chill_event_event_type (id) '
+              .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_role '
-                . 'ADD CONSTRAINT FK_AA714E54C54C8C93 FOREIGN KEY (type_id) '
-                . 'REFERENCES chill_event_event_type (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_AA714E54C54C8C93 FOREIGN KEY (type_id) '
+                .'REFERENCES chill_event_event_type (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_status '
-                . 'ADD CONSTRAINT FK_A6CC85D0C54C8C93 '
-                . 'FOREIGN KEY (type_id) '
-                . 'REFERENCES chill_event_event_type (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_A6CC85D0C54C8C93 '
+                .'FOREIGN KEY (type_id) '
+                .'REFERENCES chill_event_event_type (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_participation '
-                . 'ADD CONSTRAINT FK_4E7768AC71F7E88B '
-                . 'FOREIGN KEY (event_id) '
-                . 'REFERENCES chill_event_event (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_4E7768AC71F7E88B '
+                .'FOREIGN KEY (event_id) '
+                .'REFERENCES chill_event_event (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_participation '
-                . 'ADD CONSTRAINT FK_4E7768AC217BBB47 '
-                . 'FOREIGN KEY (person_id) '
-                . 'REFERENCES Person (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_4E7768AC217BBB47 '
+                .'FOREIGN KEY (person_id) '
+                .'REFERENCES Person (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_participation '
-                . 'ADD CONSTRAINT FK_4E7768ACD60322AC '
-                . 'FOREIGN KEY (role_id) '
-                . 'REFERENCES chill_event_role (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_4E7768ACD60322AC '
+                .'FOREIGN KEY (role_id) '
+                .'REFERENCES chill_event_role (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_participation '
-                . 'ADD CONSTRAINT FK_4E7768AC6BF700BD '
-                . 'FOREIGN KEY (status_id) '
-                . 'REFERENCES chill_event_status (id) '
-                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'ADD CONSTRAINT FK_4E7768AC6BF700BD '
+                .'FOREIGN KEY (status_id) '
+                .'REFERENCES chill_event_status (id) '
+                .'NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php b/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
index b28a758ff..bc004119e 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
@@ -21,7 +21,7 @@ final class Version20190110140538 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -29,7 +29,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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 1ab430f00..c0ced1044 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
@@ -22,7 +22,7 @@ final class Version20190115140042 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC8D0AFA354');
         $this->addSql('DROP INDEX IDX_FA320FC8D0AFA354');
@@ -32,7 +32,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php b/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
index 64764ac5b..f9d64da75 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
@@ -22,7 +22,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -31,7 +31,7 @@ final class Version20190201143121 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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 users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
diff --git a/src/Bundle/ChillEventBundle/translations/messages+int-icu.fr.yml b/src/Bundle/ChillEventBundle/translations/messages+int-icu.fr.yml
new file mode 100644
index 000000000..1dac8969e
--- /dev/null
+++ b/src/Bundle/ChillEventBundle/translations/messages+int-icu.fr.yml
@@ -0,0 +1,13 @@
+total events match the search: >-
+    { total, plural,
+        =0 {Aucun événement ne correspond aux termes de recherche}
+        one {Un événement correspond aux termes de recherche}
+        other {# événements correspondent aux termes de recherche}
+    }
+
+count participations to this event: >-
+    { count, plural,
+        =0 {Aucun participant à l'événement}
+        one {Un participant à l'événement}
+        other {# participants à l'événement}
+    }
diff --git a/src/Bundle/ChillEventBundle/translations/messages.fr.yml b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
index 8810c040a..9be54f11d 100644
--- a/src/Bundle/ChillEventBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
@@ -11,7 +11,6 @@ Participation: Participation
 Participations: Participations
 Status: Statut
 Last update: Dernière mise à jour
-'%count% participations to this event': '{0} Aucun participant à l''événement | {1} Un participant à l''événement | ]1,Inf] %count% participants à l''événement'
 Moderator: Animateur
 
 #CRUD event
@@ -30,7 +29,7 @@ The event was created: L'événement a été créé
 
 #crud participation
 Edit all the participations: Modifier toutes les participations
-Edit the participation: Modifier la participation
+Edit the participation: Modifier la participation à l'événement
 Participation Edit: Modifier une participation
 Add a participation: Ajouter un participant
 Participation creation: Ajouter une participation
@@ -54,7 +53,6 @@ Are you sure you want to remove that event ?: Êtes-vous certain de vouloir supp
 
 #search
 Event search: Recherche d'événements
-'%total% events match the search %pattern%' : '{0} Aucun événement ne correspond aux termes de recherche "%pattern%" | {1} Un événement a été trouvé par la recherche "%pattern%" | ]1,Inf] %total% événements correspondent aux termes de recherche "%pattern%".'
 
 CHILL_EVENT_UPDATE: Modifier un événement
 CHILL_EVENT_CREATE: Créer un événement
diff --git a/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php b/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php
index 73a9713bd..e69de29bb 100644
--- a/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php
+++ b/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php
@@ -1,18 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class ChillAMLIFamilyMembersBundle extends Bundle
-{
-}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php b/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php
deleted file mode 100644
index 1d6ecae67..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Config;
-
-use function count;
-
-class ConfigRepository
-{
-    /**
-     * @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 hasFamilialSituation(): bool
-    {
-        return count($this->familialSituations) > 0;
-    }
-
-    public function hasProfessionalSituation(): bool
-    {
-        return count($this->professionalSituations) > 0;
-    }
-
-    private function normalizeConfig($config)
-    {
-        $els = [];
-
-        foreach ($config as $definition) {
-            $els[$definition['key']] = $this->normalizeLabel($definition['labels']);
-        }
-
-        return $els;
-    }
-
-    private function normalizeLabel($labels)
-    {
-        $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
deleted file mode 100644
index a6358a23d..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Controller;
-
-use Chill\FamilyMembersBundle\Entity\FamilyMember;
-use Chill\FamilyMembersBundle\Form\FamilyMemberType;
-use Chill\FamilyMembersBundle\Repository\FamilyMemberRepository;
-use Chill\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\Contracts\Translation\TranslatorInterface;
-
-class FamilyMemberController extends AbstractController
-{
-    protected LoggerInterface $chillMainLogger;
-
-    protected TranslatorInterface $translator;
-
-    private EntityManagerInterface $em;
-
-    private FamilyMemberRepository $familyMemberRepository;
-
-    public function __construct(
-        EntityManagerInterface $entityManager,
-        TranslatorInterface $translator,
-        LoggerInterface $chillMainLogger,
-        FamilyMemberRepository $familyMemberRepository
-    ) {
-        $this->em = $entityManager;
-        $this->translator = $translator;
-        $this->chillMainLogger = $chillMainLogger;
-        $this->familyMemberRepository = $familyMemberRepository;
-    }
-
-    /**
-     * @Route(
-     *     "{_locale}/family-members/family-members/{id}/delete",
-     *     name="chill_family_members_family_members_delete"
-     * )
-     */
-    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();
-
-        if ($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-
-            if ($form->isValid()) {
-                $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(),
-                ]);
-
-                $this->em->remove($familyMember);
-                $this->em->flush();
-
-                $this->addFlash('success', $this->translator
-                    ->trans('The family member has been successfully removed.'));
-
-                return $this->redirectToRoute('chill_family_members_family_members_index', [
-                    'id' => $familyMember->getPerson()->getId(),
-                ]);
-            }
-        }
-
-        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:confirm_delete.html.twig', [
-            'familyMember' => $familyMember,
-            'delete_form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * @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() && $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', [
-            '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
deleted file mode 100644
index db4407b7b..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/ChillAMLIFamilyMembersExtension.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\DependencyInjection;
-
-use Chill\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.
- *
- * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
- */
-class ChillAMLIFamilyMembersExtension extends Extension implements PrependExtensionInterface
-{
-    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->load('services/config.yml');
-        $loader->load('services/form.yml');
-        $loader->load('services/controller.yml');
-        $loader->load('services/security.yml');
-        $loader->load('services/menu.yml');
-        $loader->load('services/templating.yml');
-    }
-
-    public function prepend(ContainerBuilder $container)
-    {
-        $this->prependAuthorization($container);
-        $this->prependRoutes($container);
-    }
-
-    /** (non-PHPdoc).
-     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
-     */
-    public function prependRoutes(ContainerBuilder $container)
-    {
-        //add routes for custom bundle
-        $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
deleted file mode 100644
index d2c09d7fa..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\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
-{
-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder('chill_amli_family_members');
-        $rootNode = $treeBuilder->getRootNode('chill_amli_family_members');
-
-        $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();
-
-        return $treeBuilder;
-    }
-}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php b/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
deleted file mode 100644
index 2d8ff8040..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Entity;
-
-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
- */
-abstract class AbstractFamilyMember implements HasCenterInterface
-{
-    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 date_immutable|null
-     *
-     * @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 $endDate;
-
-    /**
-     * @var string
-     * @ORM\Column(name="familial_situation", type="string", length=200, nullable=true)
-     */
-    private $familialSituation;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="firstname", type="string", length=255)
-     */
-    private $firstname = '';
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="gender", type="string", length=20)
-     */
-    private $gender = '';
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="lastname", type="string", length=255)
-     */
-    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
-     *
-     * @ORM\Column(name="professionnalSituation", type="text")
-     */
-    private $professionnalSituation = '';
-
-    /**
-     * @var DateTimeImmutable
-     *
-     * @ORM\Column(name="startDate", type="datetime_immutable")
-     * @Assert\NotNull
-     * @Assert\Date
-     */
-    private $startDate;
-
-    public function __construct()
-    {
-        $this->setStartDate(new DateTimeImmutable('now'));
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Get lastname.
-     *
-     * @return string
-     */
-    public function getLastname()
-    {
-        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.
-     *
-     * @param string $firstname
-     *
-     * @return FamilyMember
-     */
-    public function setFirstname($firstname)
-    {
-        $this->firstname = (string) $firstname;
-
-        return $this;
-    }
-
-    /**
-     * Set gender.
-     *
-     * @param string $gender
-     *
-     * @return FamilyMember
-     */
-    public function setGender($gender)
-    {
-        $this->gender = (string) $gender;
-
-        return $this;
-    }
-
-    /**
-     * Set lastname.
-     *
-     * @param string $lastname
-     *
-     * @return FamilyMember
-     */
-    public function setLastname($lastname)
-    {
-        $this->lastname = (string) $lastname;
-
-        return $this;
-    }
-
-    /**
-     * Set link.
-     *
-     * @param string $link
-     *
-     * @return FamilyMember
-     */
-    public function setLink($link)
-    {
-        $this->link = (string) $link;
-
-        return $this;
-    }
-
-    /**
-     * @param MaritalStatus $maritalStatus
-     *
-     * @return $this
-     */
-    public function setMaritalStatus(?MaritalStatus $maritalStatus = null)
-    {
-        $this->maritalStatus = $maritalStatus;
-
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function setPerson(Person $person)
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
-    /**
-     * Set professionnalSituation.
-     *
-     * @param string $professionnalSituation
-     *
-     * @return FamilyMember
-     */
-    public function setProfessionnalSituation($professionnalSituation)
-    {
-        $this->professionnalSituation = (string) $professionnalSituation;
-
-        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;
-        }
-
-        return $this;
-    }
-}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php b/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php
deleted file mode 100644
index a87e894f7..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * FamilyMember.
- *
- * @ORM\Table(name="chill_family.family_member")
- * @ORM\Entity(repositoryClass="Chill\FamilyMembersBundle\Repository\FamilyMemberRepository")
- */
-class FamilyMember extends AbstractFamilyMember
-{
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php b/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
deleted file mode 100644
index e082ef9c9..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Form;
-
-use Chill\FamilyMembersBundle\Config\ConfigRepository;
-use Chill\FamilyMembersBundle\Entity\FamilyMember;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-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,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->configRepository = $configRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('lastname', TextType::class, [
-                'label' => 'Last name',
-            ])
-            ->add('firstname', TextType::class, [
-                'label' => 'First name',
-            ])
-            ->add('gender', GenderType::class)
-            ->add('birthdate', ChillDateType::class, [
-                'required' => false,
-            ])
-            ->add('link', ChoiceType::class, [
-                'choices' => $this->buildChoices($this->configRepository->getLinksLabels()),
-                'placeholder' => 'Choose a link',
-                'label' => 'Relationship',
-            ])
-            ->add('maritalStatus', Select2MaritalStatusType::class, [
-                'required' => false,
-            ]);
-
-        if ($this->configRepository->hasProfessionalSituation()) {
-            $builder
-                ->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()
-                    ),
-                ]);
-        }
-
-        if ($options['show_start_date']) {
-            $builder
-                ->add('startDate', ChillDateType::class, [
-                    'label' => 'Arrival date in the family',
-                ]);
-        }
-
-        if ($options['show_end_date']) {
-            $builder
-                ->add('endDate', ChillDateType::class, [
-                    'required' => false,
-                    'label' => 'Departure date of the family',
-                ]);
-        }
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $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');
-    }
-
-    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
deleted file mode 100644
index f6bcf5859..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMembersType.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-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 Chill\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)
-    {
-        $resolver->setDefaults([
-            'entry_type' => FamilyMemberType::class,
-            'entry_options' => [
-                'show_start_date' => true,
-                'show_end_date' => true,
-            ],
-            'allow_add' => true,
-            'allow_delete' => true,
-            'button_add_label' => 'Ajouter un membre',
-            'button_remove_label' => 'Enlever ce membre',
-        ]);
-    }
-
-    public function getParent()
-    {
-        return ChillCollectionType::class;
-    }
-}
diff --git a/src/Bundle/ChillFamilyMembersBundle/LICENSE b/src/Bundle/ChillFamilyMembersBundle/LICENSE
deleted file mode 100644
index 2def0e883..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-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.
-
-    <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
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
deleted file mode 100644
index 4b73c3229..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Menu;
-
-use Chill\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class UserMenuBuilder implements LocalMenuBuilderInterface
-{
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    public function __construct(
-        AuthorizationCheckerInterface $authorizationChecker,
-        TranslatorInterface $translator
-    ) {
-        $this->authorizationChecker = $authorizationChecker;
-        $this->translator = $translator;
-    }
-
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        /** @var \Chill\PersonBundle\Entity\Person $person */
-        $person = $parameters['person'];
-
-        if ($this->authorizationChecker->isGranted(FamilyMemberVoter::SHOW, $person)) {
-            $menu->addChild(
-                $this->translator->trans('Family memberships'),
-                [
-                    'route' => 'chill_family_members_family_members_index',
-                    'routeParameters' => ['id' => $person->getId()],
-                ]
-            )
-                ->setExtra('order', 450);
-        }
-    }
-
-    public static function getMenuIds(): array
-    {
-        return ['person'];
-    }
-}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php b/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php
deleted file mode 100644
index 41fe4e8e9..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Repository;
-
-use Chill\FamilyMembersBundle\Entity\FamilyMember;
-use Chill\PersonBundle\Entity\Person;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @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 ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        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/config/routing.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/config/routing.yml
deleted file mode 100644
index 192619957..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/config/routing.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-chill_amli_familymembers_controllers:
-    resource: "@ChillAMLIFamilyMembersBundle/Controller"
-    type: annotation
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/config.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/config.yml
deleted file mode 100644
index ae7981f58..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/config.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-    Chill\AMLI\FamilyMembersBundle\Config\ConfigRepository:
-        arguments:
-            $links: '%chill_family_members.links%'
-            $professionnalSituations: '%chill_family_members.professionnal_situations%'
-            $familialSituations: '%chill_family_members.familial_situations%'
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/controller.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/controller.yml
deleted file mode 100644
index 8d9cf565a..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/controller.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-services:
-    Chill\AMLI\FamilyMembersBundle\Controller\:
-        autowire: true
-        resource: '../../../Controller'
-        tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/form.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/form.yml
deleted file mode 100644
index 01319d3b0..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/form.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-services:
-    Chill\AMLI\FamilyMembersBundle\Form\FamilyMemberType:
-        arguments:
-            $configRepository: '@Chill\AMLI\FamilyMembersBundle\Config\ConfigRepository'
-            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-        tags:
-            - { name: 'form.type' }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/menu.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/menu.yml
deleted file mode 100644
index 9deb3ec16..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/menu.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-services:
-    Chill\AMLI\FamilyMembersBundle\Menu\UserMenuBuilder:
-        arguments:
-            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
-        tags:
-            - { name: 'chill.menu_builder' }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/security.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/security.yml
deleted file mode 100644
index 6d5ab890c..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/security.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-services:
-    Chill\AMLI\FamilyMembersBundle\Security\Voter\FamilyMemberVoter:
-        arguments:
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-        tags:
-            - { name: chill.role }
-            - { name: security.voter }
\ No newline at end of file
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/templating.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/templating.yml
deleted file mode 100644
index 8bddc24df..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/templating.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-services:
-    Chill\AMLI\FamilyMembersBundle\Templating\Twig:
-        arguments:
-            $configRepository: '@Chill\AMLI\FamilyMembersBundle\Config\ConfigRepository'
-            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-        tags:
-            - { name: 'twig.extension' }
\ No newline at end of file
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php b/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php
deleted file mode 100644
index 5ed56135d..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-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 Application\Migrations;
-
-use Doctrine\DBAL\Migrations\AbstractMigration;
-use Doctrine\DBAL\Schema\Schema;
-
-/**
- * create schema for chill_family.
- */
-final class Version20180522142023 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_family CASCADE');
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA chill_family');
-        $this->addSql('CREATE SEQUENCE chill_family.family_member_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE chill_family.family_member (id INT NOT NULL, person_id INT DEFAULT NULL, lastname VARCHAR(255) NOT NULL, firstname VARCHAR(255) NOT NULL, gender VARCHAR(20) NOT NULL, birthdate DATE DEFAULT NULL, professionnalSituation TEXT NOT NULL, link VARCHAR(255) NOT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, maritalStatus_id VARCHAR(7) DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE INDEX IDX_A61F4A49217BBB47 ON chill_family.family_member (person_id)');
-        $this->addSql('CREATE INDEX IDX_A61F4A49D7D03CE3 ON chill_family.family_member (maritalStatus_id)');
-        $this->addSql('COMMENT ON COLUMN chill_family.family_member.birthdate IS \'(DC2Type:date_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_family.family_member.startDate IS \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_family.family_member.endDate IS \'(DC2Type:datetime_immutable)\'');
-        $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');
-    }
-}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/translations/messages.fr.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/translations/messages.fr.yml
deleted file mode 100644
index 43d2143d5..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/translations/messages.fr.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-Family memberships: Membres du ménage
-
-Professionnal situation: Situation professionnelle
-Link: Lien de parenté
-Relationship: Lien de parenté
-Choose a link: Choisissez un lien
-Familial situation: Situation familiale
-Arrival date in the family: Date d'arrivée dans le ménage
-Departure date of the family: Date de départ du ménage
-
-Family members for %name%: Membre du ménage de %name%
-Family member "%membersName%" for %name%: Membre du ménage "%membersName%" de "%name%"
-Actual family members: Membre du ménage actuellement
-Future family members: Futurs membres du ménage
-Past family members: Anciens membres du ménage
-Member since %startDate% until %endDate%: Membre depuis le %startDate% et jusqu'au %endDate%
-Member since %startDate%: Membre depuis le %startDate%
-family membership link: Lien de parenté
-family membership period: Période d'appartenance
-
-Create new family membership: Ajouter un nouveau membre
-There isn't any family member: Aucun membre du ménage enregistré
-New family members for %name%: Nouveau membre du ménage de %name%
-Edit family members for %name%: Modifier le membre du ménage de %name%
-Family member created: Le membre du ménage a été ajouté
-Family member updated: Le membre du ménage a été mis à jour 
-Remove family membership: Supprimer le membre du ménage
-"Are you sure you want to remove the family membership \"%members_name%\" associated to \"%name%\" ?": "Êtes-vous sûr de vouloir supprimer le membre \"%members_name%\" du ménage associé à \"%name%\" ?"
-The family member has been successfully removed.: Le membre du ménage a été supprimé
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/translations/validators.fr.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/translations/validators.fr.yml
deleted file mode 100644
index 0ce0505a8..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/translations/validators.fr.yml
+++ /dev/null
@@ -1 +0,0 @@
-"The membership's end date should be after the start date": La date de fin doit être située après la date de début
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig
deleted file mode 100644
index 2137cf54f..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
-
-{% set activeRouteKey = '' %}
-{% set person = familyMember.person %}
-
-{% block title  'Remove family membership'|trans %}
-
-{% block content %}
-
-{{ include('ChillMainBundle:Util:confirmation_template.html.twig',
-    {
-        'title'             : 'Remove family membership'|trans,
-        'confirm_question'  : 'Are you sure you want to remove the family membership "%members_name%" associated to "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname, '%members_name%': familyMember.firstname ~ ' ' ~ familyMember.lastname } ),
-        'cancel_route'      : 'chill_family_members_family_members_index',
-        'cancel_parameters' : { 'id' : familyMember.person.id },
-        'form'              : delete_form
-    } ) }}
-
-{% endblock %}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
deleted file mode 100644
index b084e293a..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
-
-{% set activeRouteKey = '' %}
-{% set title = 'Edit family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
-{% block title title %}
-
-{% block content %}
-<h1>{{ title }}</h1>
-
-{{ form_start(form) }}
-
-{{ form_row(form.firstname) }}
-{{ form_row(form.lastname) }}
-{{ form_row(form.birthdate) }}
-{{ form_row(form.link) }}
-{{ form_row(form.gender) }}
-{% if form.familialSituation is defined %}
-{{ form_row(form.familialSituation) }}
-{% endif %}
-{% if form.professionnalSituation is defined -%}
-{{ form_row(form.professionnalSituation) }}
-{% endif -%}
-{{ form_row(form.maritalStatus) }}
-{{ form_row(form.startDate) }}
-{{ form_row(form.endDate) }}
-
-<ul class="record_actions sticky-form-buttons">
-    <li class="cancel">
-        <a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-edit' }, 'label': 'Edit' } ) }}
-    </li>
-</ul>
-       
-{{ form_end(form) }}
-{% endblock %}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
deleted file mode 100644
index 2e339c0d1..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig
+++ /dev/null
@@ -1,124 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
-
-{% set activeRouteKey = '' %}
-{% set title = 'Family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
-{% block title title %}
-    
-    
-{% set actualFamilyMembers = [] %}
-{% set futureFamilyMembers = [] %}
-{% set pastFamilyMembers   = [] %}
-
-{% for f in familyMembers %}
-    {% if f.startDate|date('U') <= 'now'|date('U') %}
-        {% if f.endDate is null or f.endDate|date('U') >= 'now'|date('U') %}
-            {% set actualFamilyMembers = actualFamilyMembers|merge([ f ]) %}
-        {% else %}
-            {% set pastFamilyMembers = pastFamilyMembers|merge([ f ]) %}
-        {% endif %}
-    {% else %}
-        {% set futureFamilyMembers = futureFamilyMembers|merge([ f ]) %}
-    {% endif %}
-{% endfor %}
-
-
-{% macro table(familyMembers) %}
-<table>
-    <thead>
-        <tr>
-            <th>{{ 'Name'|trans }}</th>
-            <th>{{ 'birthdate'|trans }}</th>
-            <th>{{ 'family membership link'|trans }}</th>
-            <th>{{ 'family membership period'|trans }}</th>
-            <th>&nbsp;</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for f in familyMembers %}
-        <tr>
-            <td>
-                {% set name = f.firstName ~ ' ' ~ f.lastName %}
-                {% if name is not empty %}
-                    {{ name }}
-                {% else %}
-                    <span class="chill-no-data-statement">{{ 'name unknown'|trans }}</span>
-                {% endif %}
-            </td>
-            <td>
-                {% if f.birthdate is not null %}
-                    {{ f.birthdate|format_date('long') }}
-                {% else %}
-                    <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-                {% endif %}
-            </td>
-            <td>
-                {{ f.link|chill_family_member_link_display }}
-            </td>
-            <td>
-                {% if f.endDate is not null %}
-                    {{ 'Member since %startDate% until %endDate%'|trans( { '%startDate%': f.startDate|format_date('long'), '%endDate%': f.endDate|format_date('long') } ) }}
-                {% else %}
-                    {{ 'Member since %startDate%'|trans( { '%startDate%': f.startDate|format_date('long') } ) }}
-                {% endif %}
-            </td>
-            <td>
-                <ul class="record_actions">
-                    {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::SHOW'), f) %}
-                        <li>
-                            <a href="{{ path('chill_family_members_family_members_view', { 'id': f.id } ) }}" class="btn btn-show"></a>
-                        </li>
-                    {% endif %}
-                    {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::UPDATE'), f) %}
-                        <li>
-                            <a href="{{ path('chill_family_members_family_members_edit', { 'id': f.id } ) }}" class="btn btn-edit"></a>
-                        </li>
-                    {% endif %}
-                    {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::DELETE'), f) %}
-                        <li>
-                            <a href="{{ path('chill_family_members_family_members_delete', { 'id': f.id } ) }}" class="btn btn-delete"></a>
-                        </li>
-                    {% endif %}
-                </ul>
-            </td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
-{% endmacro %}
-
-{% import _self as m %}
-
-{% block content %}
-<h1>{{ title }}</h1>
-
-{% if familyMembers|length == 0 %}
-    <p><span class="chill-no-data-statement">{{ "There isn't any family member"|trans }}</span></p>
-{% else %}
-    {% if actualFamilyMembers|length > 0 %}
-        <h2>{{ 'Actual family members'|trans }}</h2>
-
-        {{ m.table(actualFamilyMembers) }}
-    {% endif %}
-    
-    {% if futureFamilyMembers|length > 0 %}
-        <h2>{{ 'Future family members'|trans }}</h2>
-
-        {{ m.table(futureFamilyMembers) }}
-    {% endif %}
-    
-    {% if pastFamilyMembers|length > 0 %}
-        <h2>{{ 'Past family members'|trans }}</h2>
-
-        {{ m.table(pastFamilyMembers) }}
-    {% endif %}
-{% endif %}
-
-{% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::CREATE'), person) %}
-    <ul class="record_actions">
-        <li>
-            <a class="btn btn-create" href="{{ path('chill_family_members_family_members_new', { 'id': person.id} ) }}">{{ 'Create new family membership'|trans }}</a>
-        </li>
-    </ul>
-{% endif %}
-
-{% endblock %}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
deleted file mode 100644
index fef2b0051..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
-
-{% set activeRouteKey = '' %}
-{% set title = 'New family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
-{% block title title %}
-
-{% block content %}
-<h1>{{ title }}</h1>
-
-{{ form_start(form) }}
-
-{{ form_row(form.firstname) }}
-{{ form_row(form.lastname) }}
-{{ form_row(form.birthdate) }}
-{{ form_row(form.link) }}
-{{ form_row(form.gender) }}
-{% if form.familialSituation is defined %}
-{{ form_row(form.familialSituation) }}
-{% endif %}
-{% if form.professionnalSituation is defined -%}
-{{ form_row(form.professionnalSituation) }}
-{% endif -%}
-{{ form_row(form.maritalStatus) }}
-{{ form_row(form.startDate) }}
-{{ form_row(form.endDate) }}
-
-<ul class="record_actions sticky-form-buttons">
-    <li class="cancel">
-        <a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
-    </li>
-</ul>
-       
-{{ form_end(form) }}
-{% endblock %}
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig b/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
deleted file mode 100644
index 1c60b491c..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig
+++ /dev/null
@@ -1,86 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
-
-{% set activeRouteKey = '' %}
-{% set person = familyMember.person %}
-{% set title = 'Family member "%membersName%" for %name%'|trans({ '%membersName%': familyMember.firstName ~ ' ' ~ familyMember.lastName, '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
-
-{% block title title %}
-
-{% block content %}
-<h1>{{ title }}</h1>
-
-<dl class="chill_view_data">
-    <dt>{{ 'Name'|trans }}</dt>
-    <dd>{{ familyMember.firstName ~ ' ' ~ familyMember.lastName }}</dd>
-
-    <dt>{{ 'family membership link'|trans }}</dt>
-    <dd>{{ familyMember.link|chill_family_member_link_display }}</dd>
-
-    <dt>{{ 'family membership period'|trans }}</dt>
-    <dd>
-        {% if familyMember.endDate is not null %}
-            {{ 'Member since %startDate% until %endDate%'|trans( { '%startDate%': familyMember.startDate|format_date('long'), '%endDate%': familyMember.endDate|format_date('long') } ) }}
-        {% else %}
-            {{ 'Member since %startDate%'|trans( { '%startDate%': familyMember.startDate|format_date('long') } ) }}
-        {% endif %}
-    </dd>
-
-    <dt>{{ 'Birthdate'|trans }}</dt>
-    <dd>
-        {%- if familyMember.birthdate is not null -%}
-        {{ familyMember.birthdate|format_date('long') }}
-        {%- else -%}
-        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-        {%- endif -%}
-    </dd>
-
-    <dt>{{ 'Gender'|trans }}</dt>
-    <dd>
-        {%- if familyMember.gender is not null -%}
-        {{ familyMember.gender|trans }}
-        {%- else -%}
-        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-        {%- endif -%}
-    </dd>
-
-    <dt>{{ 'Marital status'|trans }}</dt>
-    <dd>
-        {%- if familyMember.maritalStatus is not null -%}
-        {{ familyMember.maritalStatus.name|localize_translatable_string }}
-        {%- else -%}
-        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-        {%- endif -%}
-    </dd>
-
-    {% if chill_family_members_has_professionnal_situation() %}
-    <dt>{{ 'Professionnal situation'|trans }}</dt>
-    <dd>
-        {%- if familyMember.professionnalSituation is not empty -%}
-        {{ familyMember.professionnalSituation|chill_family_member_professional_situation_display }}
-        {%- else -%}
-        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-        {%- endif -%}
-    </dd>
-    {% endif %}
-    
-    {% if chill_family_members_has_familial_situation() %}
-    <dt>{{ 'Familial situation'|trans }}</dt>
-    <dd>
-        {{ familyMember.familialSituation|chill_family_member_familial_situation_display|chill_print_or_message('Not given') }}
-    </dd>
-    {% endif %}
-</dl>
-
-<ul class="record_actions sticky-form-buttons">
-    <li class="cancel">
-        <a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::UPDATE'), familyMember) %}
-        <li>
-            <a href="{{ path('chill_family_members_family_members_edit', { 'id': familyMember.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
-        </li>
-    {% endif %}
-</ul>
-{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php b/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
deleted file mode 100644
index 027597cc9..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Security\Voter;
-
-use Chill\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
-{
-    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,
-    ];
-
-    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;
-    }
-
-    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
deleted file mode 100644
index a2bed6319..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Templating/Twig.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Templating;
-
-use Chill\FamilyMembersBundle\Config\ConfigRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-use Twig\TwigFunction;
-
-class Twig extends AbstractExtension
-{
-    /**
-     * @var ConfigRepository
-     */
-    protected $configRepository;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    public function __construct(
-        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']]),
-        ];
-    }
-
-    public function getFunctions()
-    {
-        return [
-            new TwigFunction('chill_family_members_has_professionnal_situation', [$this, 'hasProfessionnalSituation']),
-            new TwigFunction('chill_family_members_has_familial_situation', [$this, 'hasFamilialSituation']),
-        ];
-    }
-
-    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
deleted file mode 100644
index 3e17aa838..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/Tests/Controller/FamilyMemberControllerTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-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 Chill\FamilyMembersBundle\Tests\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-
-/**
- * @internal
- * @coversNothing
- */
-final class FamilyMemberControllerTest extends WebTestCase
-{
-    public function testEdit()
-    {
-        $client = self::createClient();
-
-        $crawler = $client->request('GET', '/edit');
-    }
-
-    public function testIndex()
-    {
-        $client = self::createClient();
-
-        $crawler = $client->request('GET', '/index');
-    }
-
-    public function testNew()
-    {
-        $client = self::createClient();
-
-        $crawler = $client->request('GET', '/new');
-    }
-}
diff --git a/src/Bundle/ChillFamilyMembersBundle/composer.json b/src/Bundle/ChillFamilyMembersBundle/composer.json
deleted file mode 100644
index 7c6607b55..000000000
--- a/src/Bundle/ChillFamilyMembersBundle/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "chill-project/family-members",
-    "description": "This bundle extend chill for recording family members into a file",
-    "type": "symfony-bundle",
-    "license": "AGPL-3.0-or-later",
-    "keywords" : ["chill", "social work"],
-    "homepage" : "https://framagit.org/Chill-project/Chill-FamilyMembers",
-    "autoload": {
-        "psr-4": { "Chill\\AMLI\\FamilyMembersBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors": [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop"
-        }
-    ],
-    "require": {
-    },
-    "require-dev": {
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Test/Fixtures/App/app/"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}
diff --git a/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php b/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
index 891cf8072..c3c7b9dc1 100644
--- a/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
@@ -38,10 +38,10 @@ class CRUDControllerCompilerPass implements CompilerPassInterface
     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)) {
@@ -51,7 +51,7 @@ class CRUDControllerCompilerPass implements CompilerPassInterface
 
             // add the "addMethodCall"
             $container->getDefinition($controllerClass)
-                ->addMethodCall('setCrudConfig', ['%' . $param . '%']);
+                ->addMethodCall('setCrudConfig', ['%'.$param.'%']);
         } else {
             $controller = new Definition($controllerClass);
 
@@ -59,7 +59,7 @@ 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 4bc9b4d79..cfbe52218 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
@@ -23,8 +23,6 @@ use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_merge;
-
 abstract class AbstractCRUDController extends AbstractController
 {
     /**
@@ -36,11 +34,8 @@ abstract class AbstractCRUDController extends AbstractController
 
     /**
      * get the role given from the config.
-     *
-     * @param mixed $entity
-     * @param mixed $_format
      */
-    protected function getRoleFor(string $action, Request $request, $entity, $_format): string
+    protected function getRoleFor(string $action, Request $request, mixed $entity, mixed $_format): string
     {
         $actionConfig = $this->getActionConfig($action);
 
@@ -52,14 +47,12 @@ abstract class AbstractCRUDController extends AbstractController
             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()));
+        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()));
     }
 
     public static function getSubscribedServices(): array
     {
-        return array_merge(
+        return \array_merge(
             parent::getSubscribedServices(),
             [
                 'chill_main.paginator_factory' => PaginatorFactory::class,
@@ -132,10 +125,8 @@ abstract class AbstractCRUDController extends AbstractController
      *
      * 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
+    protected function countEntities(string $action, Request $request, mixed $_format): int
     {
         return $this->buildQueryEntities($action, $request)
             ->select('COUNT(e)')
@@ -150,9 +141,7 @@ abstract class AbstractCRUDController extends AbstractController
         return new $class();
     }
 
-    protected function customizeQuery(string $action, Request $request, $query): void
-    {
-    }
+    protected function customizeQuery(string $action, Request $request, $query): void {}
 
     protected function getActionConfig(string $action)
     {
@@ -160,7 +149,7 @@ abstract class AbstractCRUDController extends AbstractController
     }
 
     /**
-     * @return string The crud name.
+     * @return string the crud name
      */
     protected function getCrudName(): string
     {
@@ -171,10 +160,8 @@ abstract class AbstractCRUDController extends AbstractController
      * 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
+    protected function getEntity(mixed $action, string $id, Request $request): object
     {
         $e = $this
             ->getDoctrine()
@@ -205,10 +192,8 @@ abstract class AbstractCRUDController extends AbstractController
 
     /**
      * Get the result of the query.
-     *
-     * @param mixed $query
      */
-    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query)
+    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, mixed $query)
     {
         return $query->getQuery()->getResult();
     }
@@ -220,41 +205,32 @@ abstract class AbstractCRUDController extends AbstractController
 
     /**
      * Called on post check ACL.
-     *
-     * @param mixed $entity
      */
-    protected function onPostCheckACL(string $action, Request $request, string $_format, $entity): ?Response
+    protected function onPostCheckACL(string $action, Request $request, string $_format, mixed $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
+    protected function onPostFetchEntity(string $action, Request $request, mixed $entity, mixed $_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
+    protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, mixed $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
+    protected function onPostIndexFetchQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, mixed $entities): ?Response
     {
         return null;
     }
@@ -274,11 +250,8 @@ abstract class AbstractCRUDController extends AbstractController
 
     /**
      * 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)
+    protected function orderQuery(string $action, mixed $query, Request $request, PaginatorInterface $paginator, mixed $_format)
     {
         return $query;
     }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
index 645f7525c..345da5bc5 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
@@ -13,9 +13,6 @@ 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\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -24,39 +21,22 @@ 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
 {
     /**
      * Base method for handling api action.
      *
-     * @param mixed $id
-     * @param string $_format
-     *
      * @return void
      */
-    public function entityApi(Request $request, $id, ?string $_format = 'json'): Response
+    public function entityApi(Request $request, mixed $id, ?string $_format = 'json'): Response
     {
-        switch ($request->getMethod()) {
-            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);
-
-            case Request::METHOD_DELETE:
-                return $this->entityDelete('_entity', $request, $id, $_format);
-
-            default:
-                throw new BadRequestHttpException('This method is not implemented');
-        }
+        return match ($request->getMethod()) {
+            Request::METHOD_GET, Request::METHOD_HEAD => $this->entityGet('_entity', $request, $id, $_format),
+            Request::METHOD_PUT, Request::METHOD_PATCH => $this->entityPut('_entity', $request, $id, $_format),
+            Request::METHOD_POST => $this->entityPostAction('_entity', $request, $id),
+            Request::METHOD_DELETE => $this->entityDelete('_entity', $request, $id, $_format),
+            default => throw new BadRequestHttpException('This method is not implemented'),
+        };
     }
 
     public function entityDelete($action, Request $request, $id, string $_format): Response
@@ -64,8 +44,7 @@ class ApiController extends AbstractCRUDController
         $entity = $this->getEntity($action, $id, $request);
 
         if (null === $entity) {
-            throw $this->createNotFoundException(sprintf('The %s with id %s '
-                . 'is not found', $this->getCrudName(), $id));
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $request, $_format, $entity);
@@ -115,13 +94,10 @@ class ApiController extends AbstractCRUDController
 
     public function entityPost(Request $request, $_format): Response
     {
-        switch ($request->getMethod()) {
-            case Request::METHOD_POST:
-                return $this->entityPostAction('_entity', $request, $_format);
-
-            default:
-                throw new BadRequestHttpException('This method is not implemented');
-        }
+        return match ($request->getMethod()) {
+            Request::METHOD_POST => $this->entityPostAction('_entity', $request, $_format),
+            default => throw new BadRequestHttpException('This method is not implemented'),
+        };
     }
 
     public function entityPut($action, Request $request, $id, string $_format): Response
@@ -135,8 +111,7 @@ class ApiController extends AbstractCRUDController
         }
 
         if (null === $entity) {
-            throw $this->createNotFoundException(sprintf('The %s with id %s '
-                . 'is not found', $this->getCrudName(), $id));
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $request, $_format, $entity);
@@ -199,14 +174,10 @@ class ApiController extends AbstractCRUDController
      */
     public function indexApi(Request $request, string $_format)
     {
-        switch ($request->getMethod()) {
-            case Request::METHOD_GET:
-            case REQUEST::METHOD_HEAD:
-                return $this->indexApiAction('_index', $request, $_format);
-
-            default:
-                throw $this->createNotFoundException('This method is not supported');
-        }
+        return match ($request->getMethod()) {
+            Request::METHOD_GET, REQUEST::METHOD_HEAD => $this->indexApiAction('_index', $request, $_format),
+            default => throw $this->createNotFoundException('This method is not supported'),
+        };
     }
 
     public function onBeforeSerialize(string $action, Request $request, $_format, $entity): ?Response
@@ -234,15 +205,15 @@ class ApiController extends AbstractCRUDController
      *
      * @param string action
      * @param mixed id
-     * @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 $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
+     * @param bool   $forcePersist      force to persist the created element (only for POST request)
+     *
      * @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
+    protected function addRemoveSomething(string $action, mixed $id, Request $request, string $_format, string $property, string $postedDataType, array $postedDataContext = [], bool $forcePersist = false): Response
     {
         $entity = $this->getEntity($action, $id, $request);
 
@@ -273,27 +244,16 @@ class ApiController extends AbstractCRUDController
         try {
             $postedData = $this->getSerializer()->deserialize($request->getContent(), $postedDataType, $_format, $postedDataContext);
         } catch (\Symfony\Component\Serializer\Exception\UnexpectedValueException $e) {
-            throw new BadRequestHttpException(sprintf('Unable to deserialize posted ' .
-                'data: %s', $e->getMessage()), $e, 0);
+            throw new BadRequestHttpException(sprintf('Unable to deserialize posted data: %s', $e->getMessage()), $e, 0);
         }
 
-        switch ($request->getMethod()) {
-            case Request::METHOD_DELETE:
-                // oups... how to use property accessor to remove element ?
-                /* @phpstan-ignore-next-line as we do not find a simpler way to do this */
-                $entity->{'remove' . ucfirst($property)}($postedData);
-
-                break;
-
-            case Request::METHOD_POST:
-                /* @phpstan-ignore-next-line as we do not find a simpler way to do this */
-                $entity->{'add' . ucfirst($property)}($postedData);
-
-                break;
-
-            default:
-                throw new BadRequestHttpException('this method is not supported');
-        }
+        match ($request->getMethod()) {
+            /* @phpstan-ignore-next-line */
+            Request::METHOD_DELETE => $entity->{'remove'.\ucfirst($property)}($postedData),
+            /* @phpstan-ignore-next-line */
+            Request::METHOD_POST => $entity->{'add'.\ucfirst($property)}($postedData),
+            default => throw new BadRequestHttpException('this method is not supported'),
+        };
 
         $errors = $this->validate($action, $request, $_format, $entity, [$postedData]);
 
@@ -308,7 +268,7 @@ class ApiController extends AbstractCRUDController
             return $this->json($errors, 422);
         }
 
-        if ($forcePersist && $request->getMethod() === Request::METHOD_POST) {
+        if ($forcePersist && Request::METHOD_POST === $request->getMethod()) {
             $this->getDoctrine()->getManager()->persist($postedData);
         }
 
@@ -320,20 +280,16 @@ class ApiController extends AbstractCRUDController
             return $response;
         }
 
-        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.');
+        return match ($request->getMethod()) {
+            Request::METHOD_DELETE => $this->json('', Response::HTTP_OK),
+            Request::METHOD_POST => $this->json(
+                $postedData,
+                Response::HTTP_OK,
+                [],
+                $this->getContextForSerializationPostAlter($action, $request, $_format, $entity, [$postedData])
+            ),
+            default => throw new \Exception('Unable to handle such request method.'),
+        };
     }
 
     /**
@@ -349,7 +305,7 @@ class ApiController extends AbstractCRUDController
             $default[AbstractNormalizer::OBJECT_TO_POPULATE] = $entity;
         }
 
-        $context = array_merge(
+        $context = \array_merge(
             $default,
             $this->getContextForSerialization($action, $request, $_format, $entity)
         );
@@ -372,11 +328,8 @@ class ApiController extends AbstractCRUDController
      * 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
+    protected function entityGet(string $action, Request $request, mixed $id, mixed $_format = 'html'): Response
     {
         $entity = $this->getEntity($action, $id, $request);
 
@@ -474,18 +427,11 @@ class ApiController extends AbstractCRUDController
 
     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');
-        }
+        return match ($request->getMethod()) {
+            Request::METHOD_GET => ['groups' => ['read']],
+            Request::METHOD_PUT, Request::METHOD_PATCH, Request::METHOD_POST => ['groups' => ['write']],
+            default => throw new \LogicException('get context for serialization is not implemented for this method'),
+        };
     }
 
     /**
@@ -493,15 +439,12 @@ class ApiController extends AbstractCRUDController
      * 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
+    protected function getContextForSerializationPostAlter(string $action, Request $request, string $_format, mixed $entity, array $more = []): array
     {
         return ['groups' => ['read']];
     }
 
-
     protected function getSerializer(): SerializerInterface
     {
         return $this->get('serializer');
@@ -531,9 +474,8 @@ class ApiController extends AbstractCRUDController
      * 4.  Serialize the entities in a Collection, using `SerializeCollection`
      *
      * @param string $action
-     * @param mixed $_format
      */
-    protected function indexApiAction($action, Request $request, $_format)
+    protected function indexApiAction($action, Request $request, mixed $_format)
     {
         $this->onPreIndex($action, $request, $_format);
 
@@ -611,10 +553,8 @@ class ApiController extends AbstractCRUDController
 
     /**
      * Serialize collections.
-     *
-     * @param mixed $entities
      */
-    protected function serializeCollection(string $action, Request $request, string $_format, PaginatorInterface $paginator, $entities): Response
+    protected function serializeCollection(string $action, Request $request, string $_format, PaginatorInterface $paginator, mixed $entities): Response
     {
         $model = new Collection($entities, $paginator);
 
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index 9e6555025..39cef87b7 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -19,7 +19,6 @@ 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;
@@ -30,9 +29,6 @@ use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function array_merge;
-
 class CRUDController extends AbstractController
 {
     /**
@@ -47,9 +43,6 @@ class CRUDController extends AbstractController
         return new Response($parameter);
     }
 
-    /**
-     * @param $id
-     */
     public function delete(Request $request, $id): Response
     {
         return $this->deleteAction('delete', $request, $id);
@@ -59,27 +52,23 @@ class CRUDController extends AbstractController
      * BAse method for edit action.
      *
      * IMplemented by the method formEditAction, with action as 'edit'
-     *
-     * @param mixed $id
      */
-    public function edit(Request $request, $id): Response
+    public function edit(Request $request, mixed $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
+    public function getContextForSerialization(string $action, Request $request, mixed $entity, string $_format): array
     {
         return [];
     }
 
     public static function getSubscribedServices(): array
     {
-        return array_merge(
+        return \array_merge(
             parent::getSubscribedServices(),
             [
                 'chill_main.paginator_factory' => PaginatorFactory::class,
@@ -122,10 +111,8 @@ class CRUDController extends AbstractController
      * 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
+    public function view(Request $request, mixed $id): Response
     {
         return $this->viewAction('view', $request, $id);
     }
@@ -184,11 +171,9 @@ class CRUDController extends AbstractController
      * 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)
+    protected function checkACL(string $action, mixed $entity)
     {
         $this->denyAccessUnlessGranted($this->getRoleFor($action), $entity);
     }
@@ -196,7 +181,7 @@ class CRUDController extends AbstractController
     /**
      * Count the number of entities.
      */
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    protected function countEntities(string $action, Request $request, FilterOrderHelper $filterOrder = null): int
     {
         return $this->buildQueryEntities($action, $request)
             ->select('COUNT(e)')
@@ -224,13 +209,10 @@ class CRUDController extends AbstractController
      *
      * 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
+    protected function createFormFor(string $action, mixed $entity, string $formClass = null, array $formOptions = []): FormInterface
     {
-        $formClass = $formClass ?? $this->getFormClassFor($action);
+        $formClass ??= $this->getFormClassFor($action);
 
         $form = $this->createForm($formClass, $entity, $formOptions);
 
@@ -242,16 +224,11 @@ class CRUDController extends AbstractController
     /**
      * Customize the form created by createFormFor.
      */
-    protected function customizeForm(string $action, FormInterface $form)
-    {
-    }
+    protected function customizeForm(string $action, FormInterface $form) {}
 
-    protected function customizeQuery(string $action, Request $request, $query): void
-    {
-    }
+    protected function customizeQuery(string $action, Request $request, $query): void {}
 
     /**
-     * @param $id
      * @param null $formClass
      */
     protected function deleteAction(string $action, Request $request, $id, $formClass = null): Response
@@ -267,13 +244,7 @@ class CRUDController extends AbstractController
         }
 
         if (null === $entity) {
-            throw $this->createNotFoundException(
-                sprintf(
-                    'The %s with id %s is not found',
-                    $this->getCrudName(),
-                    $id
-                )
-            );
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $entity);
@@ -312,7 +283,7 @@ 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()]);
         }
 
         if ($form->isSubmitted()) {
@@ -333,8 +304,6 @@ class CRUDController extends AbstractController
 
     /**
      * Duplicate an entity.
-     *
-     * @return mixed
      */
     protected function duplicateEntity(string $action, Request $request)
     {
@@ -431,7 +400,7 @@ 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()]);
         }
 
         if ($form->isSubmitted()) {
@@ -486,23 +455,16 @@ class CRUDController extends AbstractController
      * 6.  Launch rendering, the parameter is fetch using `getTemplateFor`
      *     The parameters may be personnalized using `generateTemplateParameter`.
      *
-     * @param mixed $id
-     * @param string $formClass
+     * @param class-string $formClass
      *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    protected function formEditAction(string $action, Request $request, $id, ?string $formClass = null, array $formOptions = []): Response
+    protected function formEditAction(string $action, Request $request, mixed $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
-                )
-            );
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $entity);
@@ -537,7 +499,7 @@ class CRUDController extends AbstractController
                 return $result;
             }
 
-            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index');
+            return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index');
         }
 
         if ($form->isSubmitted()) {
@@ -572,29 +534,15 @@ class CRUDController extends AbstractController
      * Generate a success message when a form could be flushed successfully.
      *
      * @param string $action
-     * @param mixed $entity
      */
-    protected function generateFormSuccessMessage($action, $entity): string
+    protected function generateFormSuccessMessage($action, mixed $entity): string
     {
-        switch ($action) {
-            case 'edit':
-                $msg = 'crud.edit.success';
-
-                break;
-
-            case 'new':
-                $msg = 'crud.new.success';
-
-                break;
-
-            case 'delete':
-                $msg = 'crud.delete.success';
-
-                break;
-
-            default:
-                $msg = 'crud.default.success';
-        }
+        $msg = match ($action) {
+            'edit' => 'crud.edit.success',
+            'new' => 'crud.new.success',
+            'delete' => 'crud.delete.success',
+            default => 'crud.default.success',
+        };
 
         return $this->getTranslator()->trans($msg);
     }
@@ -602,13 +550,11 @@ class CRUDController extends AbstractController
     /**
      * Customize template parameters.
      *
-     * @param mixed $entity
-     *
      * @return array
      */
     protected function generateTemplateParameter(
         string $action,
-        $entity,
+        mixed $entity,
         Request $request,
         array $defaultTemplateParameters = []
     ) {
@@ -617,8 +563,6 @@ class CRUDController extends AbstractController
 
     /**
      *  Include services.
-     *
-     * @return mixed
      */
     protected function getActionConfig(string $action)
     {
@@ -652,11 +596,8 @@ class CRUDController extends AbstractController
      * get the instance of the entity with the given id.
      *
      * @param string $id
-     * @param mixed $action
-     *
-     * @return object
      */
-    protected function getEntity($action, $id, Request $request): ?object
+    protected function getEntity(mixed $action, $id, Request $request): ?object
     {
         return $this->getDoctrine()
             ->getRepository($this->getEntityClass())
@@ -709,15 +650,13 @@ class CRUDController extends AbstractController
 
     /**
      * Get the result of the query.
-     *
-     * @return mixed
      */
     protected function getQueryResult(
         string $action,
         Request $request,
         int $totalItems,
         PaginatorInterface $paginator,
-        ?FilterOrderHelper $filterOrder = null
+        FilterOrderHelper $filterOrder = null
     ) {
         $query = $this->queryEntities($action, $request, $paginator, $filterOrder);
 
@@ -727,7 +666,7 @@ class CRUDController extends AbstractController
     /**
      * @return \Chill\MainBundle\Entity\Center[]
      */
-    protected function getReachableCenters(Role $role, ?Scope $scope = null)
+    protected function getReachableCenters(string $role, Scope $scope = null)
     {
         return $this->getAuthorizationHelper()
             ->getReachableCenters($this->getUser(), $role, $scope);
@@ -742,7 +681,7 @@ class CRUDController extends AbstractController
      */
     protected function getRoleFor($action)
     {
-        if (array_key_exists('role', $this->getActionConfig($action))) {
+        if (\array_key_exists('role', $this->getActionConfig($action))) {
             return $this->getActionConfig($action)['role'];
         }
 
@@ -757,39 +696,26 @@ class CRUDController extends AbstractController
      * and view.
      *
      * @param string $action
-     * @param mixed $entity the entity for the current request, or an array of entities
-     *
-     * @throws LogicException if no template are available
+     * @param mixed  $entity the entity for the current request, or an array of entities
      *
      * @return string the path to the template
+     *
+     * @throws \LogicException if no template are available
      */
-    protected function getTemplateFor($action, $entity, Request $request)
+    protected function getTemplateFor($action, mixed $entity, Request $request)
     {
         if ($this->hasCustomTemplate($action, $entity, $request)) {
             return $this->getActionConfig($action)['template'];
         }
 
-        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');
-        }
+        return match ($action) {
+            'new' => '@ChillMain/CRUD/new.html.twig',
+            'edit' => '@ChillMain/CRUD/edit.html.twig',
+            'index' => '@ChillMain/CRUD/index.html.twig',
+            'view' => '@ChillMain/CRUD/view.html.twig',
+            'delete' => '@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'),
+        };
     }
 
     protected function getTranslator(): TranslatorInterface
@@ -797,10 +723,6 @@ class CRUDController extends AbstractController
         return $this->container->get('translator');
     }
 
-    /**
-     * @param $action
-     * @param $entity
-     */
     protected function hasCustomTemplate($action, $entity, Request $request): bool
     {
         return !empty($this->getActionConfig($action)['template']);
@@ -904,125 +826,62 @@ class CRUDController extends AbstractController
      * * save-and-close: return to index of current crud ;
      * * save-and-new: return to new page of current crud ;
      * * save-and-view: return to view page of current crud ;
-     *
-     * @param mixed $entity
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    protected function onBeforeRedirectAfterSubmission(string $action, $entity, FormInterface $form, Request $request)
+    protected function onBeforeRedirectAfterSubmission(string $action, mixed $entity, FormInterface $form, Request $request): ?Response
     {
         $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());
-
-            default:
-                return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', [
-                    'id' => $entity->getId(),
-                ]);
-        }
+        return match ($next) {
+            'save-and-close' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index'),
+            'save-and-new' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_new', $request->query->all()),
+            default => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', [
+                'id' => $entity->getId(),
+            ]),
+        };
     }
 
-    protected function onFormValid(string $action, object $entity, FormInterface $form, Request $request)
-    {
-    }
+    protected function onFormValid(string $action, object $entity, FormInterface $form, Request $request) {}
 
-    /**
-     * @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 mixed $query
-     */
-    protected function onPostIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $query)
-    {
-    }
-
-    /**
-     * method used by indexAction.
-     *
-     * @param mixed $entities
-     */
-    protected function onPostIndexFetchQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $entities)
-    {
-    }
-
-    /**
-     * @param $entity
-     */
-    protected function onPostPersist(string $action, $entity, FormInterface $form, Request $request)
-    {
-    }
-
-    /**
-     * @param $entity
-     */
-    protected function onPostRemove(string $action, $entity, FormInterface $form, Request $request)
-    {
-    }
-
-    protected function onPreDelete(string $action, Request $request)
-    {
-    }
-
-    /**
-     * @param $entity
-     */
-    protected function onPreFlush(string $action, $entity, FormInterface $form, Request $request)
-    {
-    }
-
-    protected function onPreIndex(string $action, Request $request)
-    {
-    }
+    protected function onPostFlush(string $action, $entity, FormInterface $form, Request $request) {}
 
     /**
      * method used by indexAction.
      */
-    protected function onPreIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator)
-    {
-    }
+    protected function onPostIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, mixed $query) {}
 
     /**
-     * @param $entity
+     * method used by indexAction.
      */
-    protected function onPrePersist(string $action, $entity, FormInterface $form, Request $request)
-    {
-    }
+    protected function onPostIndexFetchQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, mixed $entities) {}
+
+    protected function onPostPersist(string $action, $entity, FormInterface $form, Request $request) {}
+
+    protected function onPostRemove(string $action, $entity, FormInterface $form, Request $request) {}
+
+    protected function onPreDelete(string $action, Request $request) {}
+
+    protected function onPreFlush(string $action, $entity, FormInterface $form, Request $request) {}
+
+    protected function onPreIndex(string $action, Request $request) {}
 
     /**
-     * @param $entity
+     * method used by indexAction.
      */
-    protected function onPreRemove(string $action, $entity, FormInterface $form, Request $request)
-    {
-    }
+    protected function onPreIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator) {}
+
+    protected function onPrePersist(string $action, $entity, FormInterface $form, Request $request) {}
+
+    protected function onPreRemove(string $action, $entity, FormInterface $form, Request $request) {}
 
     /**
      * Add ordering fields in the query build by self::queryEntities.
@@ -1047,7 +906,7 @@ class CRUDController extends AbstractController
      *
      * @return type
      */
-    protected function queryEntities(string $action, Request $request, PaginatorInterface $paginator, ?FilterOrderHelper $filterOrder = null)
+    protected function queryEntities(string $action, Request $request, PaginatorInterface $paginator, FilterOrderHelper $filterOrder = null)
     {
         $query = $this->buildQueryEntities($action, $request)
             ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
@@ -1057,9 +916,6 @@ class CRUDController extends AbstractController
         return $this->orderQuery($action, $query, $request, $paginator);
     }
 
-    /**
-     * @param $entity
-     */
     protected function removeEntity(string $action, $entity, FormInterface $form, Request $request)
     {
         $this->getDoctrine()
@@ -1087,11 +943,8 @@ class CRUDController extends AbstractController
      *     * `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
+    protected function viewAction(string $action, Request $request, mixed $id, mixed $_format = 'html'): Response
     {
         $entity = $this->getEntity($action, $id, $request);
 
@@ -1102,13 +955,7 @@ class CRUDController extends AbstractController
         }
 
         if (null === $entity) {
-            throw $this->createNotFoundException(
-                sprintf(
-                    'The %s with id %s is not found',
-                    $this->getCrudName(),
-                    $id
-                )
-            );
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $entity);
diff --git a/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php b/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php
index 3ff3cf134..95f81ae05 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php
@@ -16,6 +16,4 @@ use Symfony\Component\Form\AbstractType;
 /**
  * Class CRUDDeleteEntityForm.
  */
-class CRUDDeleteEntityForm extends AbstractType
-{
-}
+class CRUDDeleteEntityForm extends AbstractType {}
diff --git a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
index aa06fbf2d..535e47c91 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
@@ -12,10 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\CRUD\Resolver;
 
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
-
-use function array_key_exists;
-use function strtoupper;
 
 /**
  * Class Resolver.
@@ -25,17 +21,17 @@ class Resolver
     /**
      * The key to get the role necessary for the action.
      */
-    public const ROLE = 'role';
+    final public const ROLE = 'role';
 
     /**
      * @deprecated
      */
-    public const ROLE_EDIT = 'role.edit';
+    final public const ROLE_EDIT = 'role.edit';
 
     /**
      * @deprecated
      */
-    public const ROLE_VIEW = 'role.view';
+    final public const ROLE_VIEW = 'role.view';
 
     /**
      * @var array
@@ -65,28 +61,22 @@ class Resolver
     }
 
     /**
-     * @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'] .
-            '_' .
+        return \strtoupper(
+            $this->crudConfig[$crudName]['base_role'].
+            '_'.
             $action
         );
     }
 
     /**
-     * @param $key
-     * @param $crudName
      * @param null $action
      *
      * @return string
@@ -102,14 +92,11 @@ class Resolver
     }
 
     /**
-     * @param $crudName
-     * @param $action
-     *
      * @return bool
      */
     public function hasAction($crudName, $action)
     {
-        return array_key_exists(
+        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 76da401a3..7399d7884 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
@@ -11,20 +11,11 @@ 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 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 extends Loader
 {
     private const ALL_INDEX_METHODS = [Request::METHOD_GET, Request::METHOD_HEAD];
@@ -36,30 +27,22 @@ class CRUDRoutesLoader extends Loader
         Request::METHOD_DELETE,
     ];
 
-    protected array $apiCrudConfig = [];
-
-    protected array $crudConfig = [];
-
     private bool $isLoaded = false;
 
-    public function __construct(array $crudConfig, array $apiCrudConfig)
+    public function __construct(protected array $crudConfig, protected array $apiCrudConfig)
     {
-        $this->crudConfig = $crudConfig;
-        $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');
+            throw new \RuntimeException('Do not add the "CRUD" loader twice');
         }
 
         $collection = new RouteCollection();
@@ -76,7 +59,6 @@ class CRUDRoutesLoader extends Loader
     }
 
     /**
-     * @param mixed $resource
      * @param null $type
      *
      * @return bool
@@ -88,13 +70,11 @@ class CRUDRoutesLoader extends Loader
 
     /**
      * Load routes for api single.
-     *
-     * @param $crudConfig
      */
     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
@@ -104,57 +84,41 @@ class CRUDRoutesLoader extends Loader
                 //                continue;
             }
 
-            // compute default action
-            switch ($name) {
-                case '_entity':
-                    $controllerAction = 'entityApi';
-
-                    break;
-
-                case '_index':
-                    $controllerAction = 'indexApi';
-
-                    break;
-
-                default:
-                    $controllerAction = $name . 'Api';
-
-                    break;
-            }
+            $controllerAction = match ($name) {
+                '_entity' => 'entityApi',
+                '_index' => 'indexApi',
+                default => $name.'Api',
+            };
 
             $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'], true) ? '' : '/' . $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+'];
 
-            $methods = array_keys(array_filter(
+            $methods = \array_keys(\array_filter(
                 $action['methods'],
-                static function ($value, $key) {
-                    return $value;
-                },
-                ARRAY_FILTER_USE_BOTH
+                static fn ($value, $key) => $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');
+            if (0 === \count($methods)) {
+                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, true)) {
-                unset($methods[array_search(Request::METHOD_POST, $methods, true)]);
+            if ('_entity' === $name && \in_array(Request::METHOD_POST, $methods, true)) {
+                unset($methods[\array_search(Request::METHOD_POST, $methods, true)]);
                 $entityPostRoute = $this->createEntityPostRoute(
                     $name,
                     $crudConfig,
@@ -167,7 +131,7 @@ class CRUDRoutesLoader extends Loader
                 );
             }
 
-            if (count($methods) === 0) {
+            if (0 === \count($methods)) {
                 // the only method was POST,
                 // continue to next
                 continue;
@@ -176,7 +140,7 @@ 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;
@@ -184,35 +148,33 @@ class CRUDRoutesLoader extends Loader
 
     /**
      * Load routes for CRUD (without api).
-     *
-     * @param $crudConfig
      */
     protected function loadCrudConfig($crudConfig): RouteCollection
     {
         $collection = new RouteCollection();
-        $controller = 'cscrud_' . $crudConfig['name'] . '_controller';
+        $controller = 'cscrud_'.$crudConfig['name'].'_controller';
 
         foreach ($crudConfig['actions'] as $name => $action) {
             // defaults (controller name)
             $defaults = [
-                '_controller' => $controller . ':' . ($action['controller_action'] ?? $name),
+                '_controller' => $controller.':'.($action['controller_action'] ?? $name),
             ];
 
             if ('index' === $name) {
-                $path = '{_locale}' . $crudConfig['base_path'];
+                $path = '{_locale}'.$crudConfig['base_path'];
                 $route = new Route($path, $defaults);
             } elseif ('new' === $name) {
-                $path = '{_locale}' . $crudConfig['base_path'] . '/' . $name;
+                $path = '{_locale}'.$crudConfig['base_path'].'/'.$name;
                 $route = new Route($path, $defaults);
             } else {
-                $path = '{_locale}' . $crudConfig['base_path'] . ($action['path'] ?? '/{id}/' . $name);
+                $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);
+            $collection->add('chill_crud_'.$crudConfig['name'].'_'.$name, $route);
         }
 
         return $collection;
@@ -220,11 +182,11 @@ 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]);
diff --git a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
index afa3eab30..27476fcf2 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
@@ -35,8 +35,6 @@ class TwigCRUDResolver extends AbstractExtension
     }
 
     /**
-     * @param $configKey
-     * @param $crudName
      * @param null $action
      *
      * @return string
@@ -54,21 +52,18 @@ class TwigCRUDResolver extends AbstractExtension
         return [
             new TwigFunction(
                 'chill_crud_config',
-                [$this, 'getConfig'],
+                $this->getConfig(...),
                 ['is_safe' => 'html']
             ),
             new TwigFunction(
                 'chill_crud_action_exists',
-                [$this, 'hasAction'],
+                $this->hasAction(...),
                 []
             ),
         ];
     }
 
     /**
-     * @param $crudName
-     * @param $action
-     *
      * @return bool
      */
     public function hasAction($crudName, $action)
diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index 974edde2b..ec9855dab 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Cron\CronJobInterface;
 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;
@@ -30,6 +29,7 @@ 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\Service\EntityInfo\ViewEntityInfoProviderInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\UI\NotificationCounterInterface;
 use Chill\MainBundle\Widget\WidgetHandlerInterface;
@@ -65,17 +65,18 @@ class ChillMainBundle extends Bundle
             ->addTag('chill_main.cron_job');
         $container->registerForAutoconfiguration(WidgetHandlerInterface::class)
             ->addTag('chill_main.widget_handler');
-
-        $container->addCompilerPass(new SearchableServicesCompilerPass());
-        $container->addCompilerPass(new ConfigConsistencyCompilerPass());
-        $container->addCompilerPass(new TimelineCompilerClass());
-        $container->addCompilerPass(new RoleProvidersCompilerPass());
-        $container->addCompilerPass(new ExportsCompilerPass());
-        $container->addCompilerPass(new WidgetsCompilerPass());
-        $container->addCompilerPass(new NotificationCounterCompilerPass());
-        $container->addCompilerPass(new MenuCompilerPass());
-        $container->addCompilerPass(new ACLFlagsCompilerPass());
-        $container->addCompilerPass(new CRUDControllerCompilerPass());
-        $container->addCompilerPass(new ShortMessageCompilerPass());
+        $container->registerForAutoconfiguration(ViewEntityInfoProviderInterface::class)
+            ->addTag('chill_main.entity_info_provider');
+        $container->addCompilerPass(new SearchableServicesCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new ConfigConsistencyCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new TimelineCompilerClass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new RoleProvidersCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new ExportsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new WidgetsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new NotificationCounterCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new MenuCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new ACLFlagsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new CRUDControllerCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new ShortMessageCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
index e6f49c6b5..0d6dd0998 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
@@ -17,11 +17,9 @@ 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;
@@ -33,15 +31,6 @@ 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
 {
     /**
@@ -53,39 +42,23 @@ class ChillImportUsersCommand extends Command
 
     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,
-        UserRepository $userRepository
+        protected EntityManagerInterface $em,
+        protected LoggerInterface $logger,
+        protected UserPasswordEncoderInterface $passwordEncoder,
+        protected ValidatorInterface $validator,
+        protected UserRepository $userRepository
     ) {
-        $this->em = $em;
-        $this->passwordEncoder = $passwordEncoder;
-        $this->validator = $validator;
-        $this->logger = $logger;
-        $this->userRepository = $userRepository;
-
         parent::__construct('chill:main:import-users');
     }
 
@@ -107,7 +80,7 @@ class ChillImportUsersCommand extends Command
             $str[] = $e->getMessage();
         }
 
-        return implode(';', $str);
+        return \implode(';', $str);
     }
 
     protected function configure()
@@ -123,8 +96,8 @@ class ChillImportUsersCommand extends Command
 
     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()])) {
+        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()];
             }
         }
@@ -154,12 +127,12 @@ class ChillImportUsersCommand extends Command
     {
         $user = new User();
         $user
-            ->setEmail(trim($data['email']))
-            ->setUsername(trim($data['username']))
+            ->setEmail(\trim((string) $data['email']))
+            ->setUsername(\trim((string) $data['username']))
             ->setEnabled(true)
             ->setPassword($this->passwordEncoder->encodePassword(
                 $user,
-                bin2hex(random_bytes(32))
+                \bin2hex(\random_bytes(32))
             ));
 
         $errors = $this->validator->validate($user);
@@ -170,8 +143,7 @@ class ChillImportUsersCommand extends Command
             $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');
+            throw new \RuntimeException('Found errors while creating an user. Watch messages in command output');
         }
 
         $pgs = $this->getPermissionGroup($data['permission group']);
@@ -214,7 +186,7 @@ class ChillImportUsersCommand extends Command
         return false;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->tempOutput = $output;
         $this->tempInput = $input;
@@ -231,9 +203,11 @@ class ChillImportUsersCommand extends Command
 
         try {
             $this->loadUsers();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             throw $e;
         }
+
+        return 0;
     }
 
     /**
@@ -254,9 +228,9 @@ class ChillImportUsersCommand extends Command
     protected function getCenters($name)
     {
         // sanitize
-        $name = trim($name);
+        $name = \trim($name);
 
-        if (array_key_exists($name, $this->centers)) {
+        if (\array_key_exists($name, $this->centers)) {
             return $this->centers[$name];
         }
 
@@ -289,8 +263,7 @@ class ChillImportUsersCommand extends Command
                 $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);
@@ -303,7 +276,7 @@ class ChillImportUsersCommand extends Command
 
     protected function getPermissionGroup($alias)
     {
-        if (array_key_exists($alias, $this->permissionGroups)) {
+        if (\array_key_exists($alias, $this->permissionGroups)) {
             return $this->permissionGroups[$alias];
         }
 
@@ -316,30 +289,29 @@ class ChillImportUsersCommand extends Command
             $permissionGroupsByName[$permissionGroup->getName()] = $permissionGroup;
         }
 
-        if (count($permissionGroupsByName) === 0) {
-            throw new RuntimeException('no permission groups found. Create them '
-                . 'before importing users');
+        if (0 === \count($permissionGroupsByName)) {
+            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)
+            \array_keys($permissionGroupsByName)
         );
         $question
             ->setMultiselect(true)
-            ->setAutocompleterValues(array_keys($permissionGroupsByName))
+            ->setAutocompleterValues(\array_keys($permissionGroupsByName))
             ->setNormalizer(static function ($value) {
                 if (null === $value) {
                     return '';
                 }
 
-                return trim($value);
+                return \trim((string) $value);
             });
         $helper = $this->getHelper('question');
 
         $keys = $helper->ask($this->tempInput, $this->tempOutput, $question);
 
-        $this->tempOutput->writeln('You have chosen ' . implode(', ', $keys));
+        $this->tempOutput->writeln('You have chosen '.\implode(', ', $keys));
 
         if (
             $helper->ask(
@@ -358,7 +330,7 @@ class ChillImportUsersCommand extends Command
         $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');
+        throw new \RuntimeException('Error while responding to a question');
     }
 
     protected function loadUsers()
@@ -373,7 +345,7 @@ class ChillImportUsersCommand extends Command
 
             if ($this->doesUserExists($r)) {
                 $this->tempOutput->writeln(sprintf("User with username '%s' already "
-                    . 'exists, skipping', $r['username']));
+                    .'exists, skipping', $r['username']));
 
                 $this->logger->info('One user already exists, skipping creation', [
                     'username_in_file' => $r['username'],
@@ -396,7 +368,7 @@ class ChillImportUsersCommand extends Command
 
         foreach ($reader->getRecords() as $r) {
             $this->centers[$r['alias']] =
-                array_merge(
+                \array_merge(
                     $this->centers[$r['alias']] ?? [],
                     $this->getCenters(
                         $r['center']
diff --git a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
index ce8196aa4..0c68798f9 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
@@ -14,10 +14,7 @@ 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;
@@ -27,11 +24,6 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-use function array_key_exists;
-use function array_merge;
-use function in_array;
-use function trim;
-
 /**
  * Class ChillUserSendRenewPasswordCodeCommand.
  */
@@ -64,17 +56,13 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
 
     /**
      * The current input interface.
-     *
-     * @var InputInterface
      */
-    private $input;
+    private ?\Symfony\Component\Console\Input\InputInterface $input = null;
 
     /**
      * The current output interface.
-     *
-     * @var OutputInterface
      */
-    private $output;
+    private ?\Symfony\Component\Console\Output\OutputInterface $output = null;
 
     public function __construct(
         LoggerInterface $logger,
@@ -101,7 +89,7 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
             ->addOption('subject', null, InputOption::VALUE_REQUIRED, 'Subject of the email', 'Recover your password');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->input = $input;
         $this->output = $output;
@@ -119,18 +107,20 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
 
             $this->sendRecoverCode($user);
         }
+
+        return 0;
     }
 
     /**
-     * @throws Exception
-     *
      * @return Reader
+     *
+     * @throws \Exception
      */
     protected function getReader()
     {
         try {
             $reader = Reader::createFromPath($this->input->getArgument('csvfile'));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $this->logger->error('The csv file could not be read', [
                 'path' => $this->input->getArgument('csvfile'),
             ]);
@@ -143,11 +133,10 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
         $headers = $reader->getHeader();
 
         if (
-            false === in_array('username', $headers, true)
-            && false === in_array('email', $headers, true)
+            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');
+            throw new \InvalidArgumentException('The csv file does not have an username or email header');
         }
 
         return $reader;
@@ -159,25 +148,25 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
         $userRepository = $this->em->getRepository(User::class);
 
         try {
-            if (array_key_exists('email', $row)) {
-                return $userRepository->findOneByUsernameOrEmail(trim($row['email']));
+            if (\array_key_exists('email', $row)) {
+                return $userRepository->findOneByUsernameOrEmail(\trim((string) $row['email']));
             }
-        } catch (\Doctrine\ORM\NoResultException $e) {
+        } catch (\Doctrine\ORM\NoResultException) {
             // continue, we will try username
         }
 
         try {
-            if (array_key_exists('username', $row)) {
-                return $userRepository->findOneByUsernameOrEmail(trim($row['username']));
+            if (\array_key_exists('username', $row)) {
+                return $userRepository->findOneByUsernameOrEmail(\trim((string) $row['username']));
             }
-        } catch (\Doctrine\ORM\NoResultException $e) {
+        } catch (\Doctrine\ORM\NoResultException) {
             return null;
         }
     }
 
     protected function onUserNotFound($row, $offset)
     {
-        $this->logger->alert('User not found', array_merge([
+        $this->logger->alert('User not found', \array_merge([
             'offset' => $offset,
         ], $row));
     }
@@ -194,7 +183,7 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
         }
 
         $template = $this->input->getOption('template');
-        $expiration = DateTime::createFromFormat(
+        $expiration = \DateTime::createFromFormat(
             'U',
             $this->input->getOption('expiration')
         );
diff --git a/src/Bundle/ChillMainBundle/Command/ExecuteCronJobCommand.php b/src/Bundle/ChillMainBundle/Command/ExecuteCronJobCommand.php
index 0e81177dc..ec38fa173 100644
--- a/src/Bundle/ChillMainBundle/Command/ExecuteCronJobCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ExecuteCronJobCommand.php
@@ -19,14 +19,10 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class ExecuteCronJobCommand extends Command
 {
-    private CronManagerInterface $cronManager;
-
     public function __construct(
-        CronManagerInterface $cronManager
+        private readonly CronManagerInterface $cronManager
     ) {
         parent::__construct('chill:cron-job:execute');
-
-        $this->cronManager = $cronManager;
     }
 
     protected function configure()
@@ -38,7 +34,7 @@ class ExecuteCronJobCommand extends Command
             ->addUsage('');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ([] === $input->getArgument('job')) {
             $this->cronManager->run();
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressesBEFromBestAddressCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressesBEFromBestAddressCommand.php
index cc26b7687..710dedb8f 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressesBEFromBestAddressCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressesBEFromBestAddressCommand.php
@@ -20,17 +20,11 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class LoadAddressesBEFromBestAddressCommand extends Command
 {
-    private AddressReferenceBEFromBestAddress $addressImporter;
-
-    private PostalCodeBEFromBestAddress $postalCodeBEFromBestAddressImporter;
-
     public function __construct(
-        AddressReferenceBEFromBestAddress $addressImporter,
-        PostalCodeBEFromBestAddress $postalCodeBEFromBestAddressImporter
+        private readonly AddressReferenceBEFromBestAddress $addressImporter,
+        private readonly PostalCodeBEFromBestAddress $postalCodeBEFromBestAddressImporter
     ) {
         parent::__construct();
-        $this->addressImporter = $addressImporter;
-        $this->postalCodeBEFromBestAddressImporter = $postalCodeBEFromBestAddressImporter;
     }
 
     protected function configure()
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php
index 40772d52b..89a159fc4 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANOCommand.php
@@ -19,12 +19,9 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class LoadAddressesFRFromBANOCommand extends Command
 {
-    private AddressReferenceFromBano $addressReferenceFromBano;
-
-    public function __construct(AddressReferenceFromBano $addressReferenceFromBano)
+    public function __construct(private readonly AddressReferenceFromBano $addressReferenceFromBano)
     {
         parent::__construct();
-        $this->addressReferenceFromBano = $addressReferenceFromBano;
     }
 
     protected function configure()
@@ -37,7 +34,7 @@ class LoadAddressesFRFromBANOCommand extends Command
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         foreach ($input->getArgument('departementNo') as $departementNo) {
-            $output->writeln('Import addresses for ' . $departementNo);
+            $output->writeln('Import addresses for '.$departementNo);
 
             $this->addressReferenceFromBano->import($departementNo);
         }
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
index 8c5351b07..e5833e580 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
@@ -17,43 +17,30 @@ 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 Symfony\Component\Intl\Intl;
-
-use function in_array;
+use Symfony\Component\Intl\Languages;
 
 /*
  * Load or update the languages entities command
  */
 class LoadAndUpdateLanguagesCommand extends Command
 {
-    public const INCLUDE_ANCIENT = 'include_ancient';
+    final public const INCLUDE_ANCIENT = 'include_ancient';
 
-    public const INCLUDE_REGIONAL_VERSION = 'include_regional';
+    final 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',
+    private array $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;
-
     // The regional version of language are language with _ in the code
     // This array contains regional code to not exclude
-    private $regionalVersionToInclude = ['ro_MD'];
+    private array $regionalVersionToInclude = ['ro_MD'];
 
     /**
      * LoadCountriesCommand constructor.
-     *
-     * @param $availableLanguages
      */
-    public function __construct(EntityManager $entityManager, $availableLanguages)
+    public function __construct(private readonly EntityManager $entityManager, private $availableLanguages)
     {
-        $this->entityManager = $entityManager;
-        $this->availableLanguages = $availableLanguages;
         parent::__construct();
     }
 
@@ -66,21 +53,21 @@ class LoadAndUpdateLanguagesCommand extends Command
     {
         $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) . '.'
+                        .implode(',', $this->regionalVersionToInclude).'.'
             )
             ->addOption(
                 self::INCLUDE_ANCIENT,
                 null,
                 InputOption::VALUE_NONE,
                 'Include the ancient languages that are languages with code '
-                        . implode(', ', $this->ancientToExclude) . '.'
+                        .implode(', ', $this->ancientToExclude).'.'
             );
     }
 
@@ -89,55 +76,51 @@ class LoadAndUpdateLanguagesCommand extends Command
      *
      * @see \Symfony\Component\Console\Command\Command::execute()
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $em = $this->entityManager;
         $chillAvailableLanguages = $this->availableLanguages;
-        $languageBundle = Intl::getLanguageBundle();
         $languages = [];
 
         foreach ($chillAvailableLanguages as $avLang) {
-            $languages[$avLang] = $languageBundle->getLanguageNames($avLang);
+            $languages[$avLang] = \Symfony\Component\Intl\Languages::getNames();
         }
 
-        $languageCodes = array_keys($languages[$chillAvailableLanguages[0]]);
-
-        foreach ($languageCodes as $code) {
+        foreach (Languages::getNames() as $code => $lang) {
             $excludeCode = (
                 (
                     !$input->getOption(self::INCLUDE_REGIONAL_VERSION)
                     && strpos($code, '_')
-                    && !in_array($code, $this->regionalVersionToInclude, true)
+                    && !\in_array($code, $this->regionalVersionToInclude, true)
                 ) || (
                     !$input->getOption(self::INCLUDE_ANCIENT)
-                    && in_array($code, $this->ancientToExclude, true)
+                    && \in_array($code, $this->ancientToExclude, true)
                 )
             );
 
-            $langageDB = $em->getRepository(Language::class)->find($code);
-
-            if (!$excludeCode) {
-                if (!$langageDB) {
-                    $langageDB = new \Chill\MainBundle\Entity\Language();
-                    $langageDB->setId($code);
-                    $em->persist($langageDB);
-                }
-
-                $avLangNames = [];
-
-                foreach ($chillAvailableLanguages as $avLang) {
-                    $avLangNames[$avLang] = $languages[$avLang][$code];
-                }
-
-                $langageDB->setName($avLangNames);
-            } else {
-                if ($langageDB) {
-                    $em->remove($langageDB);
-                }
-                echo 'Code excluded : ' . $code . ' - ' . $languageBundle->getLanguageName($code) . "\n";
+            if (true === $excludeCode) {
+                continue;
             }
+
+            $languageDB = $em->getRepository(Language::class)->find($code);
+
+            if (null === $languageDB) {
+                $languageDB = new \Chill\MainBundle\Entity\Language();
+                $languageDB->setId($code);
+                $em->persist($languageDB);
+            }
+
+            $avLangNames = [];
+
+            foreach ($chillAvailableLanguages as $avLang) {
+                $avLangNames[$avLang] = Languages::getName($code, $avLang);
+            }
+
+            $languageDB->setName($avLangNames);
         }
 
         $em->flush();
+
+        return 0;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
index 1dd5a603f..92106d200 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
@@ -16,49 +16,32 @@ use Doctrine\ORM\EntityManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Countries;
 
 class LoadCountriesCommand extends Command
 {
-    private $availableLanguages;
-
-    /**
-     * @var EntityManager
-     */
-    private $entityManager;
-
     /**
      * LoadCountriesCommand constructor.
-     *
-     * @param $availableLanguages
      */
-    public function __construct(EntityManager $entityManager, $availableLanguages)
+    public function __construct(private readonly EntityManager $entityManager, private $availableLanguages)
     {
-        $this->entityManager = $entityManager;
-        $this->availableLanguages = $availableLanguages;
         parent::__construct();
     }
 
     public static function prepareCountryList($languages)
     {
-        $regionBundle = Intl::getRegionBundle();
-        $countries = [];
-
-        foreach ($languages as $language) {
-            $countries[$language] = $regionBundle->getCountryNames($language);
-        }
-
+        $countryCodes = Countries::getCountryCodes();
         $countryEntities = [];
 
-        foreach ($countries[$languages[0]] as $countryCode => $name) {
+        foreach ($countryCodes as $code) {
             $names = [];
 
             foreach ($languages as $language) {
-                $names[$language] = $countries[$language][$countryCode];
+                $names[$language] = Countries::getName($code, $language);
             }
 
             $country = new \Chill\MainBundle\Entity\Country();
-            $country->setName($names)->setCountryCode($countryCode);
+            $country->setName($names)->setCountryCode($code);
             $countryEntities[] = $country;
         }
 
@@ -73,7 +56,7 @@ class LoadCountriesCommand extends Command
     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');
     }
 
@@ -82,7 +65,7 @@ class LoadCountriesCommand extends Command
      *
      * @see \Symfony\Component\Console\Command\Command::execute()
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $countries = static::prepareCountryList($this->availableLanguages);
         $em = $this->entityManager;
@@ -99,5 +82,7 @@ class LoadCountriesCommand extends Command
         }
 
         $em->flush();
+
+        return 0;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php
index 522c36305..be29cad9f 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php
@@ -18,12 +18,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class LoadPostalCodeFR extends Command
 {
-    private PostalCodeFRFromOpenData $loader;
-
-    public function __construct(PostalCodeFRFromOpenData $loader)
+    public function __construct(private readonly PostalCodeFRFromOpenData $loader)
     {
-        $this->loader = $loader;
-
         parent::__construct();
     }
 
diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index fd8a469d6..b22027499 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -15,8 +15,6 @@ use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\Country;
 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;
@@ -25,19 +23,10 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-use function count;
-use function strlen;
-
 class LoadPostalCodesCommand extends Command
 {
-    private EntityManagerInterface $entityManager;
-
-    private ValidatorInterface $validator;
-
-    public function __construct(EntityManagerInterface $entityManager, ValidatorInterface $validator)
+    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly ValidatorInterface $validator)
     {
-        $this->entityManager = $entityManager;
-        $this->validator = $validator;
         parent::__construct();
     }
 
@@ -46,15 +35,15 @@ class LoadPostalCodesCommand extends Command
         $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 '
-                        . "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.')
+                        ."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.')
+                        .'the csv file. See the help for specifications.')
             ->addOption(
                 'delimiter',
                 'd',
@@ -78,11 +67,11 @@ class LoadPostalCodesCommand extends Command
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $csv = $this->getCSVResource($input);
 
-        if ($output->getVerbosity() === OutputInterface::VERBOSITY_VERY_VERBOSE) {
+        if (OutputInterface::VERBOSITY_VERY_VERBOSE === $output->getVerbosity()) {
             $output->writeln('The content of the file is ...');
             $output->write(file_get_contents($input->getArgument('csv_file')));
         }
@@ -96,38 +85,36 @@ class LoadPostalCodesCommand extends Command
                 0,
                 $input->getOption('delimiter'),
                 $input->getOption('enclosure'),
-                $input->getOption('escape')
+                (string) $input->getOption('escape')
             ))
         ) {
             try {
                 $this->addPostalCode($row, $output);
                 ++$num;
-            } catch (ExistingPostalCodeException $ex) {
-                $output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
-            } catch (CountryCodeNotFoundException $ex) {
-                $output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
-            } catch (PostalCodeNotValidException $ex) {
-                $output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
+            } catch (CountryCodeNotFoundException|ExistingPostalCodeException|PostalCodeNotValidException $ex) {
+                $output->writeln('<warning> on line '.$line.' : '.$ex->getMessage().'</warning>');
             }
             ++$line;
         }
 
         $this->entityManager->flush();
 
-        $output->writeln('<info>' . $num . ' were added !</info>');
+        $output->writeln('<info>'.$num.' were added !</info>');
+
+        return 0;
     }
 
     private function addPostalCode($row, OutputInterface $output)
     {
-        if ('FR' === $row[2] && strlen($row[0]) === 4) {
+        if ('FR' === $row[2] && 4 === \strlen((string) $row[0])) {
             // CP in FRANCE are on 5 digit
             // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
             // add a zero if CP from FR and on 4 digit
-            $row[0] = '0' . $row[0];
+            $row[0] = '0'.$row[0];
         }
 
         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
@@ -135,12 +122,7 @@ class LoadPostalCodesCommand extends Command
             ->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]
-            ));
+            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
@@ -148,12 +130,8 @@ class LoadPostalCodesCommand extends Command
             ->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]
-            ));
+        if (\count($existingPC) > 0) {
+            throw new ExistingPostalCodeException(sprintf('A postal code with code : %s and name : %s already exists, skipping', $row[0], $row[1]));
         }
 
         $postalCode = (new PostalCode())
@@ -175,13 +153,13 @@ class LoadPostalCodesCommand extends Command
 
         $errors = $this->validator->validate($postalCode);
 
-        if ($errors->count() === 0) {
+        if (0 === $errors->count()) {
             $em->persist($postalCode);
         } else {
             $msg = '';
 
             foreach ($errors as $error) {
-                $msg .= ' ' . $error->getMessage();
+                $msg .= ' '.$error->getMessage();
             }
 
             throw new PostalCodeNotValidException($msg);
@@ -203,28 +181,21 @@ class LoadPostalCodesCommand extends Command
         $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.');
+            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.");
+            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 1a570c3a9..c38272d06 100644
--- a/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
@@ -13,7 +13,6 @@ 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;
@@ -26,17 +25,11 @@ use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
  */
 class SetPasswordCommand extends Command
 {
-    /**
-     * @var EntityManager
-     */
-    private $entityManager;
-
     /**
      * SetPasswordCommand constructor.
      */
-    public function __construct(EntityManager $entityManager)
+    public function __construct(private readonly EntityManager $entityManager)
     {
-        $this->entityManager = $entityManager;
         parent::__construct();
     }
 
@@ -65,17 +58,16 @@ class SetPasswordCommand extends Command
         $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')
+                    .'username you want to change password')
             ->addArgument('password', InputArgument::OPTIONAL, 'the new password');
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         $user = $this->_getUser($input->getArgument('username'));
 
         if (null === $user) {
-            throw new LogicException("The user with username '" .
-                  $input->getArgument('username') . "' is not found");
+            throw new \LogicException("The user with username '".$input->getArgument('username')."' is not found");
         }
 
         $password = $input->getArgument('password');
@@ -83,9 +75,11 @@ class SetPasswordCommand extends Command
         if (null === $password) {
             $dialog = $this->getHelperSet()->get('dialog');
             $password = $dialog->askHiddenResponse($output, '<question>the new password :'
-                  . '</question>');
+                  .'</question>');
         }
 
         $this->_setPassword($user, $password);
+
+        return 0;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Command/SynchronizeEntityInfoViewsCommand.php b/src/Bundle/ChillMainBundle/Command/SynchronizeEntityInfoViewsCommand.php
new file mode 100644
index 000000000..71bee0e0e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Command/SynchronizeEntityInfoViewsCommand.php
@@ -0,0 +1,39 @@
+<?php
+
+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 Chill\MainBundle\Command;
+
+use Chill\MainBundle\Service\EntityInfo\ViewEntityInfoManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class SynchronizeEntityInfoViewsCommand extends Command
+{
+    public function __construct(
+        private readonly ViewEntityInfoManager $viewEntityInfoManager,
+    ) {
+        parent::__construct('chill:db:sync-views');
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Update or create sql views which provide info for various entities');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->viewEntityInfoManager->synchronizeOnDB();
+
+        return 0;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
index 5dafa4615..809b7b901 100644
--- a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php
@@ -36,7 +36,7 @@ class AbsenceController extends AbstractController
             $em = $this->getDoctrine()->getManager();
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_main_user_absence_index'));
+            return $this->redirectToRoute('chill_main_user_absence_index');
         }
 
         return $this->render('@ChillMain/Menu/absence.html.twig', [
@@ -60,6 +60,6 @@ class AbsenceController extends AbstractController
         $em = $this->getDoctrine()->getManager();
         $em->flush();
 
-        return $this->redirect($this->generateUrl('chill_main_user_absence_index'));
+        return $this->redirectToRoute('chill_main_user_absence_index');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
index 68f6f7f1d..b3cf68849 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
@@ -24,19 +24,9 @@ use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 
-use function trim;
-
 final class AddressReferenceAPIController extends ApiController
 {
-    private AddressReferenceRepository $addressReferenceRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    public function __construct(AddressReferenceRepository $addressReferenceRepository, PaginatorFactory $paginatorFactory)
-    {
-        $this->addressReferenceRepository = $addressReferenceRepository;
-        $this->paginatorFactory = $paginatorFactory;
-    }
+    public function __construct(private readonly AddressReferenceRepository $addressReferenceRepository, private readonly PaginatorFactory $paginatorFactory) {}
 
     /**
      * @Route("/api/1.0/main/address-reference/by-postal-code/{id}/search.json")
@@ -51,7 +41,7 @@ final class AddressReferenceAPIController extends ApiController
 
         $pattern = $request->query->get('q');
 
-        if ('' === trim($pattern)) {
+        if ('' === \trim((string) $pattern)) {
             throw new BadRequestHttpException('the search pattern is empty');
         }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/AddressToReferenceMatcherController.php b/src/Bundle/ChillMainBundle/Controller/AddressToReferenceMatcherController.php
index aab63aea3..967ee7b5b 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressToReferenceMatcherController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressToReferenceMatcherController.php
@@ -23,21 +23,7 @@ use Symfony\Component\Serializer\SerializerInterface;
 
 class AddressToReferenceMatcherController
 {
-    private Security $security;
-
-    private EntityManagerInterface $entityManager;
-
-    private SerializerInterface $serializer;
-
-    public function __construct(
-        Security $security,
-        EntityManagerInterface $entityManager,
-        SerializerInterface $serializer
-    ) {
-        $this->security = $security;
-        $this->entityManager = $entityManager;
-        $this->serializer = $serializer;
-    }
+    public function __construct(private readonly Security $security, private readonly EntityManagerInterface $entityManager, private readonly SerializerInterface $serializer) {}
 
     /**
      * @Route("/api/1.0/main/address/reference-match/{id}/set/reviewed", methods={"POST"})
diff --git a/src/Bundle/ChillMainBundle/Controller/CenterController.php b/src/Bundle/ChillMainBundle/Controller/CenterController.php
index 64d9a4527..8ae9c8a1c 100644
--- a/src/Bundle/ChillMainBundle/Controller/CenterController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CenterController.php
@@ -11,176 +11,19 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Controller;
 
-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 Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Class CenterController.
  */
-class CenterController extends AbstractController
+class CenterController extends CRUDController
 {
-    /**
-     * Creates a new Center entity.
-     */
-    public function createAction(Request $request)
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        $center = new Center();
-        $form = $this->createCreateForm($center);
-        $form->handleRequest($request);
+        $query->addOrderBy('e.name', 'ASC');
 
-        if ($form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($center);
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('admin_center'));
-        }
-
-        return $this->render('@ChillMain/Center/new.html.twig', [
-            'entity' => $center,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * Displays a form to edit an existing Center entity.
-     *
-     * @param mixed $id
-     */
-    public function editAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $center = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->find($id);
-
-        if (!$center) {
-            throw $this->createNotFoundException('Unable to find Center entity.');
-        }
-
-        $editForm = $this->createEditForm($center);
-
-        return $this->render('@ChillMain/Center/edit.html.twig', [
-            'entity' => $center,
-            'edit_form' => $editForm->createView(),
-        ]);
-    }
-
-    /**
-     * Lists all Center entities.
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->findAll();
-
-        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(\Chill\MainBundle\Entity\Center::class)->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)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $center = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->find($id);
-
-        if (!$center) {
-            throw $this->createNotFoundException('Unable to find Center entity.');
-        }
-
-        $editForm = $this->createEditForm($center);
-        $editForm->handleRequest($request);
-
-        if ($editForm->isValid()) {
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('admin_center_edit', ['id' => $id]));
-        }
-
-        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;
+        return parent::orderQuery($action, $query, $request, $paginator);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/DefaultController.php b/src/Bundle/ChillMainBundle/Controller/DefaultController.php
index fb1c7f061..389c89767 100644
--- a/src/Bundle/ChillMainBundle/Controller/DefaultController.php
+++ b/src/Bundle/ChillMainBundle/Controller/DefaultController.php
@@ -18,6 +18,9 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
  */
 class DefaultController extends AbstractController
 {
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/homepage", name="chill_main_homepage")
+     */
     public function indexAction()
     {
         if ($this->isGranted('ROLE_ADMIN')) {
@@ -27,9 +30,12 @@ class DefaultController extends AbstractController
         return $this->render('@ChillMain/layout.html.twig');
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/homepage", name="chill_main_homepage_without_locale")
+     */
     public function indexWithoutLocaleAction()
     {
-        return $this->redirect($this->generateUrl('chill_main_homepage'));
+        return $this->redirectToRoute('chill_main_homepage');
     }
 
     public function testAction()
@@ -66,22 +72,22 @@ class DefaultController extends AbstractController
                     ],
                     [
                         'name' => 'Link 2',
-                        //'link' => "http://localhost",
+                        // '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.',
                     ],
                     [
                         'name' => 'Link 3',
-                        //'link' => "http://localhost",
+                        // '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.',
                     ],
                     [
                         '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.",
+                        // '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',
-                        //'link' => "http://localhost",
+                        // '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.',
                     ],
                 ],
diff --git a/src/Bundle/ChillMainBundle/Controller/ExportController.php b/src/Bundle/ChillMainBundle/Controller/ExportController.php
index caeec8327..abae07f9c 100644
--- a/src/Bundle/ChillMainBundle/Controller/ExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ExportController.php
@@ -13,17 +13,19 @@ namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\SavedExport;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Export\DirectExportInterface;
+use Chill\MainBundle\Export\ExportFormHelper;
+use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Form\SavedExportType;
 use Chill\MainBundle\Form\Type\Export\ExportType;
 use Chill\MainBundle\Form\Type\Export\FormatterType;
 use Chill\MainBundle\Form\Type\Export\PickCenterType;
 use Chill\MainBundle\Redis\ChillRedis;
+use Chill\MainBundle\Repository\SavedExportRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\SavedExportVoter;
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use RedisException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -35,11 +37,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
-use function serialize;
-use function unserialize;
 
 /**
  * Class ExportController
@@ -47,66 +46,31 @@ use function unserialize;
  */
 class ExportController extends AbstractController
 {
-    private EntityManagerInterface $entityManager;
-
-    /**
-     * @var ExportManager
-     */
-    private $exportManager;
-
-    /**
-     * @var FormFactoryInterface
-     */
-    private $formFactory;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var ChillRedis
-     */
-    private $redis;
-
-    /**
-     * @var SessionInterface
-     */
-    private $session;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
     public function __construct(
-        ChillRedis $chillRedis,
-        ExportManager $exportManager,
-        FormFactoryInterface $formFactory,
-        LoggerInterface $logger,
-        SessionInterface $session,
-        TranslatorInterface $translator,
-        EntityManagerInterface $entityManager
-    ) {
-        $this->entityManager = $entityManager;
-        $this->redis = $chillRedis;
-        $this->exportManager = $exportManager;
-        $this->formFactory = $formFactory;
-        $this->logger = $logger;
-        $this->session = $session;
-        $this->translator = $translator;
-    }
+        private readonly ChillRedis $redis,
+        private readonly ExportManager $exportManager,
+        private readonly FormFactoryInterface $formFactory,
+        private readonly LoggerInterface $logger,
+        private readonly SessionInterface $session,
+        private readonly TranslatorInterface $translator,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly ExportFormHelper $exportFormHelper,
+        private readonly SavedExportRepositoryInterface $savedExportRepository,
+        private readonly Security $security
+    ) {}
 
-    public function downloadResultAction(Request $request, $alias)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/exports/download/{alias}", name="chill_main_export_download", methods={"GET"})
+     */
+    public function downloadResultAction(Request $request, mixed $alias)
     {
         /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
-
         $export = $exportManager->getExport($alias);
-
         $key = $request->query->get('key', null);
+        $savedExport = $this->getSavedExportFromRequest($request);
 
-        [$dataCenters, $dataExport, $dataFormatter] = $this->rebuildData($key);
+        [$dataCenters, $dataExport, $dataFormatter] = $this->rebuildData($key, $savedExport);
 
         $formatterAlias = $exportManager->getFormatterAlias($dataExport['export']);
 
@@ -120,6 +84,7 @@ class ExportController extends AbstractController
             'alias' => $alias,
             'export' => $export,
             'export_group' => $this->getExportGroup($export),
+            'saved_export' => $savedExport,
         ];
 
         if ($formater instanceof \Chill\MainBundle\Export\Formatter\CSVListFormatter) {
@@ -138,14 +103,17 @@ class ExportController extends AbstractController
      * @param string $alias
      *
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/exports/generate/{alias}", name="chill_main_export_generate", methods={"GET"})
      */
     public function generateAction(Request $request, $alias)
     {
         /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
         $key = $request->query->get('key', null);
+        $savedExport = $this->getSavedExportFromRequest($request);
 
-        [$dataCenters, $dataExport, $dataFormatter] = $this->rebuildData($key);
+        [$dataCenters, $dataExport, $dataFormatter] = $this->rebuildData($key, $savedExport);
 
         return $exportManager->generate(
             $alias,
@@ -158,15 +126,15 @@ class ExportController extends AbstractController
     /**
      * @Route("/{_locale}/exports/generate-from-saved/{id}", name="chill_main_export_generate_from_saved")
      *
-     * @throws RedisException
+     * @throws \RedisException
      */
     public function generateFromSavedExport(SavedExport $savedExport): RedirectResponse
     {
         $this->denyAccessUnlessGranted(SavedExportVoter::GENERATE, $savedExport);
 
-        $key = md5(uniqid((string) mt_rand(), false));
+        $key = md5(uniqid((string) random_int(0, mt_getrandmax()), false));
 
-        $this->redis->setEx($key, 3600, serialize($savedExport->getOptions()));
+        $this->redis->setEx($key, 3600, \serialize($savedExport->getOptions()));
 
         return $this->redirectToRoute(
             'chill_main_export_download',
@@ -180,6 +148,8 @@ class ExportController extends AbstractController
 
     /**
      * Render the list of available exports.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/exports/", name="chill_main_export_index")
      */
     public function indexAction(): Response
     {
@@ -204,39 +174,51 @@ class ExportController extends AbstractController
      * 3. 'generate': gather data from session from the previous steps, and
      * make a redirection to the "generate" action with data in query (HTTP GET)
      *
-     * @param string $request
-     * @param Request $alias
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/exports/new/{alias}", name="chill_main_export_new")
      */
-    public function newAction(Request $request, $alias)
+    public function newAction(Request $request, string $alias): Response
     {
         // first check for ACL
         $exportManager = $this->exportManager;
         $export = $exportManager->getExport($alias);
 
-        if ($exportManager->isGrantedForElement($export) === false) {
+        if (false === $exportManager->isGrantedForElement($export)) {
             throw $this->createAccessDeniedException('The user does not have access to this export');
         }
 
+        $savedExport = $this->getSavedExportFromRequest($request);
+
         $step = $request->query->getAlpha('step', 'centers');
 
-        switch ($step) {
-            case 'centers':
-                return $this->selectCentersStep($request, $export, $alias);
+        return match ($step) {
+            'centers' => $this->selectCentersStep($request, $export, $alias, $savedExport),
+            'export' => $this->exportFormStep($request, $export, $alias, $savedExport),
+            'formatter' => $this->formatterFormStep($request, $export, $alias, $savedExport),
+            'generate' => $this->forwardToGenerate($request, $export, $alias, $savedExport),
+            default => throw $this->createNotFoundException("The given step '{$step}' is invalid"),
+        };
+    }
 
-            case 'export':
-                return $this->exportFormStep($request, $export, $alias);
+    /**
+     * @Route("/{_locale}/export/saved/update-from-key/{id}/{key}", name="chill_main_export_saved_edit_options_from_key")
+     */
+    public function editSavedExportOptionsFromKey(SavedExport $savedExport, string $key): Response
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+        $user = $this->getUser();
 
-            case 'formatter':
-                return $this->formatterFormStep($request, $export, $alias);
-
-            case 'generate':
-                return $this->forwardToGenerate($request, $export, $alias);
-
-            default:
-                throw $this->createNotFoundException("The given step '{$step}' is invalid");
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException();
         }
+
+        $data = $this->rebuildRawData($key);
+
+        $savedExport
+            ->setOptions($data);
+
+        $this->entityManager->flush();
+
+        return $this->redirectToRoute('chill_main_export_saved_edit', ['id' => $savedExport->getId()]);
     }
 
     /**
@@ -282,45 +264,55 @@ class ExportController extends AbstractController
     /**
      * create a form to show on different steps.
      *
-     * @param string $alias
      * @param array $data the data from previous step. Required for steps 'formatter' and 'generate_formatter'
-     * @param mixed $step
      */
-    protected function createCreateFormExport($alias, $step, $data = []): FormInterface
+    protected function createCreateFormExport(string $alias, string $step, array $data, ?SavedExport $savedExport): FormInterface
     {
         /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
-        $isGenerate = strpos($step, 'generate_') === 0;
+        $isGenerate = str_starts_with($step, 'generate_');
+
+        $options = match ($step) {
+            'export', 'generate_export' => [
+                'export_alias' => $alias,
+                'picked_centers' => $exportManager->getPickedCenters($data['centers']),
+            ],
+            'formatter', 'generate_formatter' => [
+                'export_alias' => $alias,
+                'formatter_alias' => $exportManager->getFormatterAlias($data['export']),
+                'aggregator_aliases' => $exportManager->getUsedAggregatorsAliases($data['export']),
+            ],
+            default => [
+                'export_alias' => $alias,
+            ],
+        };
+
+        $defaultFormData = match ($savedExport) {
+            null => $this->exportFormHelper->getDefaultData($step, $exportManager->getExport($alias), $options),
+            default => $this->exportFormHelper->savedExportDataToFormData($savedExport, $step, $options),
+        };
 
         $builder = $this->formFactory
-            ->createNamedBuilder(null, FormType::class, [], [
-                'method' => $isGenerate ? 'GET' : 'POST',
-                'csrf_protection' => $isGenerate ? false : true,
-            ]);
-
-        // TODO: add a condition to be able to select a regroupment of centers?
+            ->createNamedBuilder(
+                null,
+                FormType::class,
+                $defaultFormData,
+                [
+                    'method' => $isGenerate ? 'GET' : 'POST',
+                    'csrf_protection' => !$isGenerate,
+                ]
+            );
 
         if ('centers' === $step || 'generate_centers' === $step) {
-            $builder->add('centers', PickCenterType::class, [
-                'export_alias' => $alias,
-            ]);
+            $builder->add('centers', PickCenterType::class, $options);
         }
 
         if ('export' === $step || 'generate_export' === $step) {
-            $builder->add('export', ExportType::class, [
-                'export_alias' => $alias,
-                'picked_centers' => $exportManager->getPickedCenters($data['centers']),
-            ]);
+            $builder->add('export', ExportType::class, $options);
         }
 
         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('formatter', FormatterType::class, $options);
         }
 
         $builder->add('submit', SubmitType::class, [
@@ -335,13 +327,8 @@ class ExportController extends AbstractController
      *
      * 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\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    protected function exportFormStep(Request $request, $export, $alias)
+    private function exportFormStep(Request $request, DirectExportInterface|ExportInterface $export, string $alias, SavedExport $savedExport = null): Response
     {
         $exportManager = $this->exportManager;
 
@@ -357,9 +344,9 @@ class ExportController extends AbstractController
 
         $export = $exportManager->getExport($alias);
 
-        $form = $this->createCreateFormExport($alias, 'export', $data);
+        $form = $this->createCreateFormExport($alias, 'export', $data, $savedExport);
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -374,13 +361,12 @@ class ExportController extends AbstractController
                 );
                 $this->session->set('export_step', $data);
 
-                //redirect to next step
-                return $this->redirect(
-                    $this->generateUrl('chill_main_export_new', [
-                        'step' => $this->getNextStep('export', $export),
-                        'alias' => $alias,
-                    ])
-                );
+                // redirect to next step
+                return $this->redirectToRoute('chill_main_export_new', [
+                    'step' => $this->getNextStep('export', $export),
+                    'alias' => $alias,
+                    'from_saved' => $request->get('from_saved', ''),
+                ]);
             }
             $this->logger->debug('form export is invalid', [
                 'location' => __METHOD__, ]);
@@ -399,13 +385,8 @@ class ExportController extends AbstractController
      *
      * If the form is posted and valid, store the data in session and
      * redirect to the next step.
-     *
-     * @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)
+    private function formatterFormStep(Request $request, DirectExportInterface|ExportInterface $export, string $alias, SavedExport $savedExport = null): Response
     {
         // check we have data from the previous step (export step)
         $data = $this->session->get('export_step', null);
@@ -417,9 +398,9 @@ class ExportController extends AbstractController
             ]);
         }
 
-        $form = $this->createCreateFormExport($alias, 'formatter', $data);
+        $form = $this->createCreateFormExport($alias, 'formatter', $data, $savedExport);
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -430,14 +411,12 @@ class ExportController extends AbstractController
                     $request->request->all()
                 );
 
-                //redirect to next step
-                return $this->redirect($this->generateUrl(
-                    'chill_main_export_new',
-                    [
-                        'alias' => $alias,
-                        'step' => $this->getNextStep('formatter', $export),
-                    ]
-                ));
+                // redirect to next step
+                return $this->redirectToRoute('chill_main_export_new', [
+                    'alias' => $alias,
+                    'step' => $this->getNextStep('formatter', $export),
+                    'from_saved' => $request->get('from_saved', ''),
+                ]);
             }
         }
 
@@ -457,12 +436,11 @@ class ExportController extends AbstractController
      *
      * The data from previous steps is removed from session.
      *
-     * @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)
+    private function forwardToGenerate(Request $request, DirectExportInterface|ExportInterface $export, $alias, ?SavedExport $savedExport)
     {
         $dataCenters = $this->session->get('centers_step_raw', null);
         $dataFormatter = $this->session->get('formatter_step_raw', null);
@@ -470,7 +448,9 @@ class ExportController extends AbstractController
 
         if (null === $dataFormatter && $export instanceof \Chill\MainBundle\Export\ExportInterface) {
             return $this->redirectToRoute('chill_main_export_new', [
-                'alias' => $alias, 'step' => $this->getNextStep('generate', $export, true),
+                'alias' => $alias,
+                'step' => $this->getNextStep('generate', $export, true),
+                'from_saved' => $savedExport?->getId() ?? '',
             ]);
         }
 
@@ -481,9 +461,9 @@ class ExportController extends AbstractController
             'alias' => $alias,
         ];
         unset($parameters['_token']);
-        $key = md5(uniqid((string) mt_rand(), false));
+        $key = md5(uniqid((string) random_int(0, mt_getrandmax()), false));
 
-        $this->redis->setEx($key, 3600, serialize($parameters));
+        $this->redis->setEx($key, 3600, \serialize($parameters));
 
         // remove data from session
         $this->session->remove('export_step_raw');
@@ -491,28 +471,33 @@ 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,
+            'from_saved' => $savedExport?->getId(),
+        ]);
     }
 
-    protected function rebuildData($key)
+    private function rebuildData($key, ?SavedExport $savedExport)
     {
         $rawData = $this->rebuildRawData($key);
 
         $alias = $rawData['alias'];
 
-        $formCenters = $this->createCreateFormExport($alias, 'generate_centers');
+        $formCenters = $this->createCreateFormExport($alias, 'generate_centers', [], $savedExport);
         $formCenters->submit($rawData['centers']);
         $dataCenters = $formCenters->getData();
 
-        $formExport = $this->createCreateFormExport($alias, 'generate_export', $dataCenters);
+        $formExport = $this->createCreateFormExport($alias, 'generate_export', $dataCenters, $savedExport);
         $formExport->submit($rawData['export']);
         $dataExport = $formExport->getData();
 
-        if (count($rawData['formatter']) > 0) {
+        if (\count($rawData['formatter']) > 0) {
             $formFormatter = $this->createCreateFormExport(
                 $alias,
                 'generate_formatter',
-                $dataExport
+                $dataExport,
+                $savedExport
             );
             $formFormatter->submit($rawData['formatter']);
             $dataFormatter = $formFormatter->getData();
@@ -522,19 +507,18 @@ class ExportController extends AbstractController
     }
 
     /**
-     * @param \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
      * @param string $alias
      *
      * @return Response
      */
-    protected function selectCentersStep(Request $request, $export, $alias)
+    private function selectCentersStep(Request $request, DirectExportInterface|ExportInterface $export, $alias, SavedExport $savedExport = null)
     {
         /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
 
-        $form = $this->createCreateFormExport($alias, 'centers');
+        $form = $this->createCreateFormExport($alias, 'centers', [], $savedExport);
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -545,14 +529,13 @@ class ExportController extends AbstractController
 
                 // check ACL
                 if (
-                    $exportManager->isGrantedForElement(
+                    false === $exportManager->isGrantedForElement(
                         $export,
                         null,
                         $exportManager->getPickedCenters($data['centers'])
-                    ) === false
+                    )
                 ) {
-                    throw $this->createAccessDeniedException('you do not have '
-                            . 'access to this export for those centers');
+                    throw $this->createAccessDeniedException('you do not have access to this export for those centers');
                 }
 
                 $this->session->set(
@@ -564,6 +547,7 @@ class ExportController extends AbstractController
                 return $this->redirectToRoute('chill_main_export_new', [
                     'step' => $this->getNextStep('centers', $export),
                     'alias' => $alias,
+                    'from_saved' => $request->get('from_saved', ''),
                 ]);
             }
         }
@@ -600,20 +584,19 @@ class ExportController extends AbstractController
      *
      * 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
+     * @param string $step    the current step
+     * @param bool   $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)
+    private function getNextStep($step, DirectExportInterface|ExportInterface $export, $reverse = false)
     {
         switch ($step) {
             case 'centers':
                 if (false !== $reverse) {
-                    throw new LogicException("there is no step before 'export'");
+                    throw new \LogicException("there is no step before 'export'");
                 }
 
                 return 'export';
@@ -633,13 +616,13 @@ class ExportController extends AbstractController
 
             case 'generate':
                 if (false === $reverse) {
-                    throw new LogicException("there is no step after 'generate'");
+                    throw new \LogicException("there is no step after 'generate'");
                 }
 
                 return 'formatter';
 
             default:
-                throw new LogicException("the step {$step} is not defined.");
+                throw new \LogicException("the step {$step} is not defined.");
         }
     }
 
@@ -649,7 +632,7 @@ class ExportController extends AbstractController
             throw $this->createNotFoundException('key does not exists');
         }
 
-        if ($this->redis->exists($key) !== 1) {
+        if (1 !== $this->redis->exists($key)) {
             $this->addFlash('error', $this->translator->trans('This report is not available any more'));
 
             throw $this->createNotFoundException('key does not exists');
@@ -658,16 +641,30 @@ class ExportController extends AbstractController
         $serialized = $this->redis->get($key);
 
         if (false === $serialized) {
-            throw new LogicException('the key could not be reached from redis');
+            throw new \LogicException('the key could not be reached from redis');
         }
 
-        $rawData = unserialize($serialized);
+        $rawData = \unserialize($serialized);
 
         $this->logger->notice('[export] choices for an export unserialized', [
             'key' => $key,
-            'rawData' => json_encode($rawData),
+            'rawData' => json_encode($rawData, JSON_THROW_ON_ERROR),
         ]);
 
         return $rawData;
     }
+
+    private function getSavedExportFromRequest(Request $request): ?SavedExport
+    {
+        $savedExport = match ($savedExportId = $request->query->get('from_saved', '')) {
+            '' => null,
+            default => $this->savedExportRepository->find($savedExportId),
+        };
+
+        if (null !== $savedExport && !$this->security->isGranted(SavedExportVoter::EDIT, $savedExport)) {
+            throw new AccessDeniedHttpException('saved export edition not allowed');
+        }
+
+        return $savedExport;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/GeographicalUnitByAddressApiController.php b/src/Bundle/ChillMainBundle/Controller/GeographicalUnitByAddressApiController.php
index 988439de5..24253de36 100644
--- a/src/Bundle/ChillMainBundle/Controller/GeographicalUnitByAddressApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/GeographicalUnitByAddressApiController.php
@@ -24,31 +24,7 @@ use Symfony\Component\Serializer\SerializerInterface;
 
 class GeographicalUnitByAddressApiController
 {
-    private PaginatorFactory $paginatorFactory;
-
-    private GeographicalUnitRepositoryInterface $geographicalUnitRepository;
-
-    private Security $security;
-
-    private SerializerInterface $serializer;
-
-    /**
-     * @param PaginatorFactory $paginatorFactory
-     * @param GeographicalUnitRepositoryInterface $geographicalUnitRepository
-     * @param Security $security
-     * @param SerializerInterface $serializer
-     */
-    public function __construct(
-        PaginatorFactory $paginatorFactory,
-        GeographicalUnitRepositoryInterface $geographicalUnitRepository,
-        Security $security,
-        SerializerInterface $serializer
-    ) {
-        $this->paginatorFactory = $paginatorFactory;
-        $this->geographicalUnitRepository = $geographicalUnitRepository;
-        $this->security = $security;
-        $this->serializer = $serializer;
-    }
+    public function __construct(private readonly PaginatorFactory $paginatorFactory, private readonly GeographicalUnitRepositoryInterface $geographicalUnitRepository, private readonly Security $security, private readonly SerializerInterface $serializer) {}
 
     /**
      * @Route("/api/1.0/main/geographical-unit/by-address/{id}.{_format}", requirements={"_format": "json"})
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
index 7e26bec32..c5b9cd74f 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
@@ -36,7 +36,6 @@ class LocationApiController extends ApiController
 
     /**
      * @param QueryBuilder $query
-     * @param mixed $_format
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
     {
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php b/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php
index bc28f9d12..418f49578 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php
@@ -13,6 +13,4 @@ namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 
-class LocationTypeController extends CRUDController
-{
-}
+class LocationTypeController extends CRUDController {}
diff --git a/src/Bundle/ChillMainBundle/Controller/LoginController.php b/src/Bundle/ChillMainBundle/Controller/LoginController.php
index 8a2468745..df295d0b2 100644
--- a/src/Bundle/ChillMainBundle/Controller/LoginController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LoginController.php
@@ -35,6 +35,8 @@ class LoginController extends AbstractController
      * Show a login form.
      *
      * @return Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/login", name="login")
      */
     public function loginAction(Request $request)
     {
@@ -44,7 +46,5 @@ class LoginController extends AbstractController
         ]);
     }
 
-    public function LoginCheckAction(Request $request)
-    {
-    }
+    public function LoginCheckAction(Request $request) {}
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
index 62a1dd10c..16599b9a2 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
@@ -19,43 +19,19 @@ use Chill\MainBundle\Security\Authorization\NotificationVoter;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Serializer\Model\Counter;
 use Doctrine\ORM\EntityManagerInterface;
-use RuntimeException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\SerializerInterface;
-use UnexpectedValueException;
 
 /**
  * @Route("/api/1.0/main/notification")
  */
 class NotificationApiController
 {
-    private EntityManagerInterface $entityManager;
-
-    private NotificationRepository $notificationRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private Security $security;
-
-    private SerializerInterface $serializer;
-
-    public function __construct(
-        EntityManagerInterface $entityManager,
-        NotificationRepository $notificationRepository,
-        PaginatorFactory $paginatorFactory,
-        Security $security,
-        SerializerInterface $serializer
-    ) {
-        $this->entityManager = $entityManager;
-        $this->notificationRepository = $notificationRepository;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->security = $security;
-        $this->serializer = $serializer;
-    }
+    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly NotificationRepository $notificationRepository, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly SerializerInterface $serializer) {}
 
     /**
      * @Route("/{id}/mark/read", name="chill_api_main_notification_mark_read", methods={"POST"})
@@ -113,23 +89,14 @@ class NotificationApiController
         $user = $this->security->getUser();
 
         if (!$user instanceof User) {
-            throw new RuntimeException('not possible to mark as read by this user');
+            throw new \RuntimeException('not possible to mark as read by this user');
         }
 
-        switch ($target) {
-            case 'read':
-                $notification->markAsReadBy($user);
-
-                break;
-
-            case 'unread':
-                $notification->markAsUnreadBy($user);
-
-                break;
-
-            default:
-                throw new UnexpectedValueException("target not supported: {$target}");
-        }
+        match ($target) {
+            'read' => $notification->markAsReadBy($user),
+            'unread' => $notification->markAsUnreadBy($user),
+            default => throw new \UnexpectedValueException("target not supported: {$target}"),
+        };
 
         $this->entityManager->flush();
 
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
index a6e876b6d..4131ba714 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
@@ -41,45 +41,7 @@ use function in_array;
  */
 class NotificationController extends AbstractController
 {
-    private LoggerInterface $chillLogger;
-
-    private EntityManagerInterface $em;
-
-    private LoggerInterface $logger;
-
-    private NotificationHandlerManager $notificationHandlerManager;
-
-    private NotificationRepository $notificationRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private Security $security;
-
-    private TranslatorInterface $translator;
-
-    private UserRepository $userRepository;
-
-    public function __construct(
-        EntityManagerInterface $em,
-        LoggerInterface $chillLogger,
-        LoggerInterface $logger,
-        Security $security,
-        NotificationRepository $notificationRepository,
-        NotificationHandlerManager $notificationHandlerManager,
-        PaginatorFactory $paginatorFactory,
-        TranslatorInterface $translator,
-        UserRepository $userRepository
-    ) {
-        $this->em = $em;
-        $this->logger = $logger;
-        $this->chillLogger = $chillLogger;
-        $this->security = $security;
-        $this->notificationRepository = $notificationRepository;
-        $this->notificationHandlerManager = $notificationHandlerManager;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->translator = $translator;
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly LoggerInterface $chillLogger, private readonly LoggerInterface $logger, private readonly Security $security, private readonly NotificationRepository $notificationRepository, private readonly NotificationHandlerManager $notificationHandlerManager, private readonly PaginatorFactory $paginatorFactory, private readonly TranslatorInterface $translator, private readonly UserRepository $userRepository) {}
 
     /**
      * @Route("/create", name="chill_main_notification_create")
@@ -117,7 +79,7 @@ class NotificationController extends AbstractController
 
         try {
             $handler = $this->notificationHandlerManager->getHandler($notification);
-        } catch (NotificationHandlerNotFound $e) {
+        } catch (NotificationHandlerNotFound) {
             throw new BadRequestHttpException('no handler for this notification');
         }
 
@@ -186,7 +148,7 @@ class NotificationController extends AbstractController
             throw new AccessDeniedHttpException('You must be authenticated and a user to create a notification');
         }
 
-        foreach (['accessKey'/*, 'email'*/] as $param) {
+        foreach (['accessKey'/* , 'email' */] as $param) {
             if (!$request->query->has($param)) {
                 throw new BadRequestHttpException("Missing {$param} parameter");
             }
@@ -229,7 +191,7 @@ class NotificationController extends AbstractController
         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
         $currentUser = $this->security->getUser();
 
-        $notificationsNbr = $this->notificationRepository->countAllForAttendee(($currentUser));
+        $notificationsNbr = $this->notificationRepository->countAllForAttendee($currentUser);
         $paginator = $this->paginatorFactory->create($notificationsNbr);
 
         $notifications = $this->notificationRepository->findAllForAttendee(
@@ -282,9 +244,7 @@ class NotificationController extends AbstractController
 
         if ($request->query->has('edit')) {
             $commentId = $request->query->getInt('edit');
-            $editedComment = $notification->getComments()->filter(static function (NotificationComment $c) use ($commentId) {
-                return $c->getId() === $commentId;
-            })->first();
+            $editedComment = $notification->getComments()->filter(static fn (NotificationComment $c) => $c->getId() === $commentId)->first();
 
             if (false === $editedComment) {
                 throw $this->createNotFoundException("Comment with id {$commentId} does not exists nor belong to this notification");
@@ -304,7 +264,7 @@ class NotificationController extends AbstractController
 
                     return $this->redirectToRoute('chill_main_notification_show', [
                         'id' => $notification->getId(),
-                        '_fragment' => 'comment-' . $commentId,
+                        '_fragment' => 'comment-'.$commentId,
                     ]);
                 }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/PasswordController.php b/src/Bundle/ChillMainBundle/Controller/PasswordController.php
index a9a14b7a1..04ec22977 100644
--- a/src/Bundle/ChillMainBundle/Controller/PasswordController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PasswordController.php
@@ -17,8 +17,6 @@ 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;
@@ -26,6 +24,7 @@ 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\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -87,6 +86,8 @@ class PasswordController extends AbstractController
 
     /**
      * @return Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/request-changed", name="password_request_recover_changed")
      */
     public function changeConfirmedAction()
     {
@@ -94,14 +95,14 @@ class PasswordController extends AbstractController
     }
 
     /**
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/recover", name="password_recover")
      */
-    public function recoverAction(Request $request)
+    public function recoverAction(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         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);
+                .'to try to recover password, due to mitigating possible '
+                .'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
         }
 
         $query = $request->query;
@@ -114,8 +115,8 @@ class PasswordController extends AbstractController
 
         if (null === $user) {
             $this->eventDispatcher->dispatch(
-                PasswordRecoverEvent::INVALID_TOKEN,
-                new PasswordRecoverEvent($token, null, $request->getClientIp())
+                new PasswordRecoverEvent($token, null, $request->getClientIp()),
+                PasswordRecoverEvent::INVALID_TOKEN
             );
 
             throw $this->createNotFoundException(sprintf('User %s not found', $username));
@@ -123,8 +124,8 @@ class PasswordController extends AbstractController
 
         if (true !== $this->tokenManager->verify($hash, $token, $user, $timestamp)) {
             $this->eventDispatcher->dispatch(
-                PasswordRecoverEvent::INVALID_TOKEN,
-                new PasswordRecoverEvent($token, $user, $request->getClientIp())
+                new PasswordRecoverEvent($token, $user, $request->getClientIp()),
+                PasswordRecoverEvent::INVALID_TOKEN
             );
 
             return new Response('Invalid token', Response::HTTP_FORBIDDEN);
@@ -162,14 +163,14 @@ class PasswordController extends AbstractController
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      *
-     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/request-recover", name="password_request_recover")
      */
-    public function requestRecoverAction(Request $request)
+    public function requestRecoverAction(Request $request): Response|\Symfony\Component\HttpFoundation\RedirectResponse
     {
         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);
+                .'to try to recover password, due to mitigating possible '
+                .'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
         }
 
         $form = $this->requestRecoverForm();
@@ -190,17 +191,17 @@ class PasswordController extends AbstractController
 
             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.'));
+                    .'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);
+                        .'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'))
+                    (new \DateTimeImmutable('now'))->add(new \DateInterval('PT30M'))
                 );
 
                 // logging for prod
@@ -214,16 +215,16 @@ class PasswordController extends AbstractController
                     );
 
                 $this->eventDispatcher->dispatch(
-                    PasswordRecoverEvent::ASK_TOKEN_SUCCESS,
-                    new PasswordRecoverEvent(null, $user, $request->getClientIp())
+                    new PasswordRecoverEvent(null, $user, $request->getClientIp()),
+                    PasswordRecoverEvent::ASK_TOKEN_SUCCESS
                 );
 
                 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())
+                new PasswordRecoverEvent(null, null, $request->getClientIp()),
+                PasswordRecoverEvent::ASK_TOKEN_INVALID_FORM
             );
         }
 
@@ -234,6 +235,8 @@ class PasswordController extends AbstractController
 
     /**
      * @return Response
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/public/{_locale}/password/request-confirm", name="password_request_recover_confirm")
      */
     public function requestRecoverConfirmAction()
     {
@@ -242,6 +245,8 @@ class PasswordController extends AbstractController
 
     /**
      * @return Response
+     *
+     * @Route("/{_locale}/my/password", name="change_my_password")
      */
     public function UserPasswordAction(Request $request)
     {
@@ -304,7 +309,7 @@ class PasswordController extends AbstractController
                                 ->orWhere($qb->expr()->eq('u.emailCanonical', 'UNACCENT(LOWER(:pattern))'))
                                 ->setParameter('pattern', $pattern);
 
-                            if ((int) $qb->getQuery()->getSingleScalarResult() !== 1) {
+                            if (1 !== (int) $qb->getQuery()->getSingleScalarResult()) {
                                 $context->addViolation('This username or email does not exists');
                             }
                         },
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
index 9f77e06f4..8b0561635 100644
--- a/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
@@ -19,22 +19,9 @@ 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;
-    }
+    public function __construct(private readonly DenormalizerInterface $denormalizer, private readonly Security $security) {}
 
     /**
      * @Route("/api/1.0/main/permissions/info.json", methods={"POST"})
@@ -45,21 +32,17 @@ class PermissionApiController extends AbstractController
     {
         $this->denyAccessUnlessGranted('ROLE_USER');
 
-        $data = json_decode($request->getContent(), true);
+        $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()
-            ));
+            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)) {
+        if (!\array_key_exists('object', $data)) {
             throw new BadRequestHttpException('the object key is not present');
         }
 
-        if (!array_key_exists('class', $data)) {
+        if (!\array_key_exists('class', $data)) {
             throw new BadRequestHttpException('the class key is not present');
         }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
index 372d0d7d1..681046ca1 100644
--- a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
@@ -16,78 +16,45 @@ use Chill\MainBundle\Entity\RoleScope;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Form\PermissionsGroupType;
 use Chill\MainBundle\Form\Type\ComposedRoleScopeType;
+use Chill\MainBundle\Repository\PermissionsGroupRepository;
+use Chill\MainBundle\Repository\RoleScopeRepository;
 use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use RuntimeException;
+use Doctrine\ORM\EntityManagerInterface;
 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\Security\Core\Role\Role;
-use Symfony\Component\Security\Core\Role\RoleHierarchy;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-
 /**
  * Class PermissionsGroupController.
  */
-class PermissionsGroupController extends AbstractController
+final class PermissionsGroupController extends AbstractController
 {
-    /**
-     * @var RoleHierarchy
-     */
-    private $roleHierarchy;
-
-    /**
-     * @var RoleProvider
-     */
-    private $roleProvider;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var ValidatorInterface
-     */
-    private $validator;
-
     /**
      * PermissionsGroupController constructor.
      */
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        RoleProvider $roleProvider,
-        RoleHierarchy $roleHierarchy,
-        TranslatorInterface $translator,
-        ValidatorInterface $validator
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->roleProvider = $roleProvider;
-        $this->roleHierarchy = $roleHierarchy;
-        $this->translator = $translator;
-        $this->validator = $validator;
-    }
+        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly RoleProvider $roleProvider,
+        private readonly RoleHierarchyInterface $roleHierarchy,
+        private readonly TranslatorInterface $translator,
+        private readonly ValidatorInterface $validator,
+        private readonly EntityManagerInterface $em,
+        private readonly PermissionsGroupRepository $permissionsGroupRepository,
+        private readonly RoleScopeRepository $roleScopeRepository,
+    ) {}
 
     /**
-     * @param int $id
-     *
-     * @throws type
-     *
-     * @return Respon
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/{id}/add_link_role_scope", name="admin_permissionsgroup_add_role_scope", methods={"PUT"})
      */
-    public function addLinkRoleScopeAction(Request $request, $id)
+    public function addLinkRoleScopeAction(Request $request, int $id): Response
     {
-        $em = $this->getDoctrine()->getManager();
-
-        $permissionsGroup = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->find($id);
+        $permissionsGroup = $this->permissionsGroupRepository->find($id);
 
         if (!$permissionsGroup) {
             throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
@@ -105,18 +72,15 @@ class PermissionsGroupController extends AbstractController
             $permissionsGroup->addRoleScope($roleScope);
             $violations = $this->validator->validate($permissionsGroup);
 
-            if ($violations->count() === 0) {
-                $em->flush();
+            if (0 === $violations->count()) {
+                $this->em->flush();
 
                 $this->addFlash(
                     'notice',
                     $this->translator->trans('The permissions have been added')
                 );
 
-                return $this->redirect($this->generateUrl(
-                    'admin_permissionsgroup_edit',
-                    ['id' => $id]
-                ));
+                return $this->redirectToRoute('admin_permissionsgroup_edit', ['id' => $id]);
             }
 
             foreach ($violations as $error) {
@@ -158,31 +122,27 @@ class PermissionsGroupController extends AbstractController
             '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),
+            'delete_role_scopes_form' => array_map(static fn ($form) => $form->createView(), $deleteRoleScopesForm),
             'add_role_scopes_form' => $addRoleScopesForm->createView(),
         ]);
     }
 
     /**
      * Creates a new PermissionsGroup entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/create", name="admin_permissionsgroup_create", methods={"POST"})
      */
-    public function createAction(Request $request)
+    public function createAction(Request $request): Response
     {
         $permissionsGroup = new PermissionsGroup();
         $form = $this->createCreateForm($permissionsGroup);
         $form->handleRequest($request);
 
         if ($form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($permissionsGroup);
-            $em->flush();
+            $this->em->persist($permissionsGroup);
+            $this->em->flush();
 
-            return $this->redirect($this->generateUrl(
-                'admin_permissionsgroup_edit',
-                ['id' => $permissionsGroup->getId()]
-            ));
+            return $this->redirectToRoute('admin_permissionsgroup_edit', ['id' => $permissionsGroup->getId()]);
         }
 
         return $this->render('@ChillMain/PermissionsGroup/new.html.twig', [
@@ -194,17 +154,12 @@ class PermissionsGroupController extends AbstractController
     /**
      * remove an association between permissionsGroup and roleScope.
      *
-     * @param int $pgid permissionsGroup id
-     * @param int $rsid roleScope id
-     *
-     * @return redirection to edit form
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/{pgid}/delete_link_role_scope/{rsid}", name="admin_permissionsgroup_delete_role_scope", methods={"DELETE"})
      */
-    public function deleteLinkRoleScopeAction($pgid, $rsid)
+    public function deleteLinkRoleScopeAction(int $pgid, int $rsid): Response
     {
-        $em = $this->getDoctrine()->getManager();
-
-        $permissionsGroup = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->find($pgid);
-        $roleScope = $em->getRepository(\Chill\MainBundle\Entity\RoleScope::class)->find($rsid);
+        $permissionsGroup = $this->permissionsGroupRepository->find($pgid);
+        $roleScope = $this->roleScopeRepository->find($rsid);
 
         if (!$permissionsGroup) {
             throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
@@ -216,30 +171,27 @@ class PermissionsGroupController extends AbstractController
 
         try {
             $permissionsGroup->removeRoleScope($roleScope);
-        } catch (RuntimeException $ex) {
+        } catch (\RuntimeException) {
             $this->addFlash(
                 'notice',
                 $this->translator->trans("The role '%role%' and circle "
-                        . "'%scope%' is not associated with this permission group", [
+                        ."'%scope%' is not associated with this permission group", [
                             '%role%' => $this->translator->trans($roleScope->getRole()),
                             '%scope%' => $this->translatableStringHelper
                                 ->localize($roleScope->getScope()->getName()),
                         ])
             );
 
-            return $this->redirect($this->generateUrl(
-                'admin_permissionsgroup_edit',
-                ['id' => $pgid]
-            ));
+            return $this->redirectToRoute('admin_permissionsgroup_edit', ['id' => $pgid]);
         }
 
-        $em->flush();
+        $this->em->flush();
 
-        if ($roleScope->getScope() !== null) {
+        if (null !== $roleScope->getScope()) {
             $this->addFlash(
                 'notice',
                 $this->translator->trans("The role '%role%' on circle "
-                        . "'%scope%' has been removed", [
+                        ."'%scope%' has been removed", [
                             '%role%' => $this->translator->trans($roleScope->getRole()),
                             '%scope%' => $this->translatableStringHelper
                                 ->localize($roleScope->getScope()->getName()),
@@ -254,22 +206,17 @@ class PermissionsGroupController extends AbstractController
             );
         }
 
-        return $this->redirect($this->generateUrl(
-            'admin_permissionsgroup_edit',
-            ['id' => $pgid]
-        ));
+        return $this->redirectToRoute('admin_permissionsgroup_edit', ['id' => $pgid]);
     }
 
     /**
      * Displays a form to edit an existing PermissionsGroup entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/{id}/edit", name="admin_permissionsgroup_edit")
      */
-    public function editAction($id)
+    public function editAction(int $id): Response
     {
-        $em = $this->getDoctrine()->getManager();
-
-        $permissionsGroup = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->find($id);
+        $permissionsGroup = $this->permissionsGroupRepository->find($id);
 
         if (!$permissionsGroup) {
             throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
@@ -305,21 +252,19 @@ class PermissionsGroupController extends AbstractController
             '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),
+            'delete_role_scopes_form' => array_map(static fn ($form) => $form->createView(), $deleteRoleScopesForm),
             'add_role_scopes_form' => $addRoleScopesForm->createView(),
         ]);
     }
 
     /**
      * Lists all PermissionsGroup entities.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/", name="admin_permissionsgroup")
      */
-    public function indexAction()
+    public function indexAction(): Response
     {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->findAll();
+        $entities = $this->permissionsGroupRepository->findAllOrderedAlphabetically();
 
         return $this->render('@ChillMain/PermissionsGroup/index.html.twig', [
             'entities' => $entities,
@@ -328,8 +273,10 @@ class PermissionsGroupController extends AbstractController
 
     /**
      * Displays a form to create a new PermissionsGroup entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/new", name="admin_permissionsgroup_new")
      */
-    public function newAction()
+    public function newAction(): Response
     {
         $permissionsGroup = new PermissionsGroup();
         $form = $this->createCreateForm($permissionsGroup);
@@ -343,13 +290,11 @@ class PermissionsGroupController extends AbstractController
     /**
      * Finds and displays a PermissionsGroup entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/{id}/show", name="admin_permissionsgroup_show")
      */
-    public function showAction($id)
+    public function showAction(int $id): Response
     {
-        $em = $this->getDoctrine()->getManager();
-
-        $permissionsGroup = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->find($id);
+        $permissionsGroup = $this->permissionsGroupRepository->find($id);
 
         if (!$permissionsGroup) {
             throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
@@ -362,11 +307,11 @@ class PermissionsGroupController extends AbstractController
         usort(
             $roleScopes,
             static function (RoleScope $a, RoleScope $b) use ($translatableStringHelper) {
-                if ($a->getScope() === null) {
+                if (null === $a->getScope()) {
                     return 1;
                 }
 
-                if ($b->getScope() === null) {
+                if (null === $b->getScope()) {
                     return +1;
                 }
 
@@ -398,28 +343,24 @@ class PermissionsGroupController extends AbstractController
     /**
      * Edits an existing PermissionsGroup entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/permissionsgroup/{id}/update", name="admin_permissionsgroup_update", methods={"POST", "PUT"})
      */
-    public function updateAction(Request $request, $id)
+    public function updateAction(Request $request, int $id): Response
     {
-        $em = $this->getDoctrine()->getManager();
-
-        $permissionsGroup = $em
-            ->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)
+        $permissionsGroup = $this->permissionsGroupRepository
             ->find($id);
 
         if (!$permissionsGroup) {
-            throw $this->createNotFoundException('Unable to find Permissions'
-                . 'Group entity.');
+            throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
         }
 
         $editForm = $this->createEditForm($permissionsGroup);
         $editForm->handleRequest($request);
 
         if ($editForm->isValid()) {
-            $em->flush();
+            $this->em->flush();
 
-            return $this->redirect($this->generateUrl('admin_permissionsgroup_edit', ['id' => $id]));
+            return $this->redirectToRoute('admin_permissionsgroup_edit', ['id' => $id]);
         }
 
         $deleteRoleScopesForm = [];
@@ -449,27 +390,18 @@ class PermissionsGroupController extends AbstractController
             '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),
+            'delete_role_scopes_form' => array_map(static fn ($form) => $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
+     * doesn't exist in database.
      */
-    protected function getPersistentRoleScopeBy($role, ?Scope $scope = null)
+    protected function getPersistentRoleScopeBy(string $role, Scope $scope = null): RoleScope
     {
-        $em = $this->getDoctrine()->getManager();
-
-        $roleScope = $em->getRepository(\Chill\MainBundle\Entity\RoleScope::class)
+        $roleScope = $this->roleScopeRepository
             ->findOneBy(['role' => $role, 'scope' => $scope]);
 
         if (null === $roleScope) {
@@ -477,7 +409,7 @@ class PermissionsGroupController extends AbstractController
                 ->setRole($role)
                 ->setScope($scope);
 
-            $em->persist($roleScope);
+            $this->em->persist($roleScope);
         }
 
         return $roleScope;
@@ -485,10 +417,8 @@ class PermissionsGroupController extends AbstractController
 
     /**
      * creates a form to add a role scope to permissionsgroup.
-     *
-     * @return \Symfony\Component\Form\Form The form
      */
-    private function createAddRoleScopeForm(PermissionsGroup $permissionsGroup)
+    private function createAddRoleScopeForm(PermissionsGroup $permissionsGroup): FormInterface
     {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl(
@@ -505,10 +435,8 @@ class PermissionsGroupController extends AbstractController
      * 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)
+    private function createCreateForm(PermissionsGroup $permissionsGroup): FormInterface
     {
         $form = $this->createForm(PermissionsGroupType::class, $permissionsGroup, [
             'action' => $this->generateUrl('admin_permissionsgroup_create'),
@@ -524,13 +452,11 @@ class PermissionsGroupController extends AbstractController
      * Creates a form to delete a link to roleScope.
      *
      * @param mixed $permissionsGroup The entity id
-     *
-     * @return \Symfony\Component\Form\Form The form
      */
     private function createDeleteRoleScopeForm(
         PermissionsGroup $permissionsGroup,
         RoleScope $roleScope
-    ) {
+    ): FormInterface {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl(
                 'admin_permissionsgroup_delete_role_scope',
@@ -543,12 +469,8 @@ class PermissionsGroupController extends AbstractController
 
     /**
      * 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)
+    private function createEditForm(PermissionsGroup $permissionsGroup): FormInterface
     {
         $form = $this->createForm(PermissionsGroupType::class, $permissionsGroup, [
             'action' => $this->generateUrl('admin_permissionsgroup_update', ['id' => $permissionsGroup->getId()]),
@@ -562,23 +484,19 @@ class PermissionsGroupController extends AbstractController
 
     /**
      * expand roleScopes to be easily shown in template.
-     *
-     * @return array
      */
-    private function getExpandedRoles(array $roleScopes)
+    private function getExpandedRoles(array $roleScopes): array
     {
         $expandedRoles = [];
 
         foreach ($roleScopes as $roleScope) {
-            if (!array_key_exists($roleScope->getRole(), $expandedRoles)) {
+            if (!\array_key_exists($roleScope->getRole(), $expandedRoles)) {
                 $expandedRoles[$roleScope->getRole()] =
                       array_map(
-                          static function (Role $role) {
-                              return $role->getRole();
-                          },
+                          static fn ($role) => $role,
                           $this->roleHierarchy
-                              ->getReachableRoles(
-                                  [new Role($roleScope->getRole())]
+                              ->getReachableRoleNames(
+                                  [$roleScope->getRole()]
                               )
                       );
             }
diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
index 8e679b228..2b897130d 100644
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
@@ -26,21 +26,7 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 
 final class PostalCodeAPIController extends ApiController
 {
-    private CountryRepository $countryRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private PostalCodeRepositoryInterface $postalCodeRepository;
-
-    public function __construct(
-        CountryRepository $countryRepository,
-        PostalCodeRepositoryInterface $postalCodeRepository,
-        PaginatorFactory $paginatorFactory
-    ) {
-        $this->countryRepository = $countryRepository;
-        $this->postalCodeRepository = $postalCodeRepository;
-        $this->paginatorFactory = $paginatorFactory;
-    }
+    public function __construct(private readonly CountryRepository $countryRepository, private readonly PostalCodeRepositoryInterface $postalCodeRepository, private readonly PaginatorFactory $paginatorFactory) {}
 
     /**
      * @Route("/api/1.0/main/postal-code/search.json")
@@ -55,7 +41,7 @@ final class PostalCodeAPIController extends ApiController
 
         $pattern = $request->query->get('q');
 
-        if ('' === trim($pattern)) {
+        if ('' === trim((string) $pattern)) {
             throw new BadRequestHttpException('the search pattern is empty');
         }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
index 91de40985..f186561d5 100644
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
@@ -19,8 +19,6 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
-use function array_map;
-
 /**
  * Class PostalCodeController.
  */
@@ -55,21 +53,21 @@ class PostalCodeController extends AbstractController
             ->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',
+                    .'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 . '%')
+            ->setParameter('pattern', '%'.$pattern.'%')
             ->setMaxResults(30);
 
-        $results = array_map(function ($row) {
+        $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));
diff --git a/src/Bundle/ChillMainBundle/Controller/SavedExportController.php b/src/Bundle/ChillMainBundle/Controller/SavedExportController.php
index 197fe253d..15bfcb9bb 100644
--- a/src/Bundle/ChillMainBundle/Controller/SavedExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/SavedExportController.php
@@ -30,51 +30,11 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 class SavedExportController
 {
-    private EntityManagerInterface $entityManager;
-
-    private ExportManager $exportManager;
-
-    private FormFactoryInterface $formFactory;
-
-    private SavedExportRepositoryInterface $savedExportRepository;
-
-    private Security $security;
-
-    private SessionInterface $session;
-
-    private EngineInterface $templating;
-
-    private TranslatorInterface $translator;
-
-    private UrlGeneratorInterface $urlGenerator;
-
-    public function __construct(
-        EngineInterface $templating,
-        EntityManagerInterface $entityManager,
-        ExportManager $exportManager,
-        FormFactoryInterface $formBuilder,
-        SavedExportRepositoryInterface $savedExportRepository,
-        Security $security,
-        SessionInterface $session,
-        TranslatorInterface $translator,
-        UrlGeneratorInterface $urlGenerator
-    ) {
-        $this->exportManager = $exportManager;
-        $this->entityManager = $entityManager;
-        $this->formFactory = $formBuilder;
-        $this->savedExportRepository = $savedExportRepository;
-        $this->security = $security;
-        $this->session = $session;
-        $this->templating = $templating;
-        $this->translator = $translator;
-        $this->urlGenerator = $urlGenerator;
-    }
+    public function __construct(private readonly \Twig\Environment $templating, private readonly EntityManagerInterface $entityManager, private readonly ExportManager $exportManager, private readonly FormFactoryInterface $formFactory, private readonly SavedExportRepositoryInterface $savedExportRepository, private readonly Security $security, private readonly SessionInterface $session, private readonly TranslatorInterface $translator, private readonly UrlGeneratorInterface $urlGenerator) {}
 
     /**
      * @Route("/{_locale}/exports/saved/{id}/delete", name="chill_main_export_saved_delete")
@@ -177,7 +137,7 @@ class SavedExportController
                 '@ChillMain/SavedExport/index.html.twig',
                 [
                     'grouped_exports' => $exportsGrouped,
-                    'total' => count($exports),
+                    'total' => \count($exports),
                 ]
             )
         );
diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeController.php b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
index f3b08204d..727796256 100644
--- a/src/Bundle/ChillMainBundle/Controller/ScopeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
@@ -24,6 +24,8 @@ class ScopeController extends AbstractController
 {
     /**
      * Creates a new Scope entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/create", name="admin_scope_create", methods={"POST"})
      */
     public function createAction(Request $request)
     {
@@ -31,12 +33,12 @@ class ScopeController extends AbstractController
         $form = $this->createCreateForm($scope);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($scope);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_scope'));
+            return $this->redirectToRoute('admin_scope');
         }
 
         return $this->render('@ChillMain/Scope/new.html.twig', [
@@ -48,9 +50,9 @@ class ScopeController extends AbstractController
     /**
      * Displays a form to edit an existing Scope entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/{id}/edit", name="admin_scope_edit")
      */
-    public function editAction($id)
+    public function editAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -70,6 +72,8 @@ class ScopeController extends AbstractController
 
     /**
      * Lists all Scope entities.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/", name="admin_scope")
      */
     public function indexAction()
     {
@@ -84,6 +88,8 @@ class ScopeController extends AbstractController
 
     /**
      * Displays a form to create a new Scope entity.
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/new", name="admin_scope_new")
      */
     public function newAction()
     {
@@ -98,10 +104,8 @@ class ScopeController extends AbstractController
 
     /**
      * Finds and displays a Scope entity.
-     *
-     * @param mixed $id
      */
-    public function showAction($id)
+    public function showAction(mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -119,9 +123,9 @@ class ScopeController extends AbstractController
     /**
      * Edits an existing Scope entity.
      *
-     * @param mixed $id
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/scope/{id}/update", name="admin_scope_update", methods={"POST", "PUT"})
      */
-    public function updateAction(Request $request, $id)
+    public function updateAction(Request $request, mixed $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -134,10 +138,10 @@ class ScopeController extends AbstractController
         $editForm = $this->createEditForm($scope);
         $editForm->handleRequest($request);
 
-        if ($editForm->isValid()) {
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_scope_edit', ['id' => $id]));
+            return $this->redirectToRoute('admin_scope_edit', ['id' => $id]);
         }
 
         return $this->render('@ChillMain/Scope/edit.html.twig', [
diff --git a/src/Bundle/ChillMainBundle/Controller/SearchController.php b/src/Bundle/ChillMainBundle/Controller/SearchController.php
index 8592dd2c3..6324561cc 100644
--- a/src/Bundle/ChillMainBundle/Controller/SearchController.php
+++ b/src/Bundle/ChillMainBundle/Controller/SearchController.php
@@ -27,36 +27,17 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function count;
-use function key;
-use function reset;
-
 /**
  * Class SearchController.
  */
 class SearchController extends AbstractController
 {
-    protected PaginatorFactory $paginatorFactory;
+    public function __construct(protected SearchProvider $searchProvider, protected TranslatorInterface $translator, protected PaginatorFactory $paginatorFactory, protected SearchApi $searchApi) {}
 
-    protected SearchApi $searchApi;
-
-    protected SearchProvider $searchProvider;
-
-    protected TranslatorInterface $translator;
-
-    public function __construct(
-        SearchProvider $searchProvider,
-        TranslatorInterface $translator,
-        PaginatorFactory $paginatorFactory,
-        SearchApi $searchApi
-    ) {
-        $this->searchProvider = $searchProvider;
-        $this->translator = $translator;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->searchApi = $searchApi;
-    }
-
-    public function advancedSearchAction($name, Request $request)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/search/advanced/{name}", name="chill_main_advanced_search")
+     */
+    public function advancedSearchAction(mixed $name, Request $request)
     {
         try {
             /** @var Chill\MainBundle\Search\SearchProvider $variable */
@@ -64,9 +45,8 @@ class SearchController extends AbstractController
             /** @var Chill\MainBundle\Search\HasAdvancedSearchFormInterface $variable */
             $search = $this->searchProvider
                 ->getHasAdvancedFormByName($name);
-        } catch (\Chill\MainBundle\Search\UnknowSearchNameException $e) {
-            throw $this->createNotFoundException('no advanced search for '
-                . "{$name}");
+        } catch (\Chill\MainBundle\Search\UnknowSearchNameException) {
+            throw $this->createNotFoundException('no advanced search for '."{$name}");
         }
 
         if ($request->query->has('q')) {
@@ -101,6 +81,9 @@ class SearchController extends AbstractController
         );
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/search/advanced", name="chill_main_advanced_search_list")
+     */
     public function advancedSearchListAction(Request $request)
     {
         /** @var Chill\MainBundle\Search\SearchProvider $variable */
@@ -108,20 +91,21 @@ class SearchController extends AbstractController
         $advancedSearchProviders = $searchProvider
             ->getHasAdvancedFormSearchServices();
 
-        if (count($advancedSearchProviders) === 1) {
-            reset($advancedSearchProviders);
-
+        if (1 === \count($advancedSearchProviders)) {
             return $this->redirectToRoute('chill_main_advanced_search', [
-                'name' => key($advancedSearchProviders),
+                'name' => array_key_first($advancedSearchProviders),
             ]);
         }
 
         return $this->render('@ChillMain/Search/choose_list.html.twig');
     }
 
-    public function searchAction(Request $request, $_format)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/search.{_format}", name="chill_main_search", requirements={"_format"="html|json"}, defaults={"_format"="html"})
+     */
+    public function searchAction(Request $request, mixed $_format)
     {
-        $pattern = trim($request->query->get('q', ''));
+        $pattern = trim((string) $request->query->get('q', ''));
 
         if ('' === $pattern) {
             switch ($_format) {
@@ -130,7 +114,7 @@ class SearchController extends AbstractController
                         '@ChillMain/Search/error.html.twig',
                         [
                             'message' => $this->translator->trans('Your search is empty. '
-                                  . 'Please provide search terms.'),
+                                  .'Please provide search terms.'),
                             'pattern' => $pattern,
                         ]
                     );
@@ -149,7 +133,7 @@ class SearchController extends AbstractController
             if (null === $name) {
                 if ('json' === $_format) {
                     return new JsonResponse('Currently, we still do not aggregate results '
-                        . 'from different providers', JsonResponse::HTTP_BAD_REQUEST);
+                        .'from different providers', JsonResponse::HTTP_BAD_REQUEST);
                 }
 
                 // no specific search selected. Rendering result in "preview" mode
@@ -177,7 +161,7 @@ class SearchController extends AbstractController
                     ), ];
 
                 if ('json' === $_format) {
-                    return new JsonResponse(reset($results));
+                    return new JsonResponse(\reset($results));
                 }
             }
         } catch (UnknowSearchDomainException $ex) {
@@ -185,18 +169,18 @@ class SearchController extends AbstractController
                 '@ChillMain/Search/error.html.twig',
                 [
                     'message' => $this->translator->trans('The domain %domain% '
-                          . 'is unknow. Please check your search.', ['%domain%' => $ex->getDomain()]),
+                          .'is unknow. Please check your search.', ['%domain%' => $ex->getDomain()]),
                     'pattern' => $pattern,
                 ]
             );
         } catch (UnknowSearchNameException $ex) {
-            throw $this->createNotFoundException('The name ' . $ex->getName() . ' is not found');
+            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()),
+                    'message' => $this->translator->trans('Invalid terms').
+                    ': '.$this->translator->trans($ex->getMessage()),
                     'pattern' => $pattern,
                 ]
             );
@@ -208,15 +192,17 @@ class SearchController extends AbstractController
         );
     }
 
-    public function searchApi(Request $request, $_format): JsonResponse
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/api/1.0/search.{_format}", name="chill_main_search_global", requirements={"_format"="json"}, defaults={"_format"="json"})
+     */
+    public function searchApi(Request $request, mixed $_format): JsonResponse
     {
-        //TODO this is an incomplete implementation
+        // TODO this is an incomplete implementation
         $query = $request->query->get('q', '');
         $types = $request->query->get('type', []);
 
-        if (count($types) === 0) {
-            throw new BadRequestHttpException('The request must contains at '
-                . ' one type');
+        if (0 === \count($types)) {
+            throw new BadRequestHttpException('The request must contains at  one type');
         }
 
         try {
diff --git a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
index c51952b3a..ebbd7a360 100644
--- a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
+++ b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
@@ -18,25 +18,9 @@ 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 PaginatorFactory $paginatorFactory;
-
-    protected TimelineBuilder $timelineBuilder;
-
-    private Security $security;
-
-    public function __construct(
-        TimelineBuilder $timelineBuilder,
-        PaginatorFactory $paginatorFactory,
-        Security $security
-    ) {
-        $this->timelineBuilder = $timelineBuilder;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->security = $security;
-    }
+    public function __construct(protected TimelineBuilder $timelineBuilder, protected PaginatorFactory $paginatorFactory, private readonly Security $security) {}
 
     /**
      * @Route("/{_locale}/center/timeline",
@@ -54,7 +38,7 @@ class TimelineCenterController extends AbstractController
             $centers[] = $group->getCenter();
         }
 
-        if (0 === count($centers)) {
+        if (0 === \count($centers)) {
             throw $this->createNotFoundException();
         }
 
diff --git a/src/Bundle/ChillMainBundle/Controller/UserApiController.php b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
index da873e118..6809d3289 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
@@ -28,10 +28,8 @@ class UserApiController extends ApiController
      *         "_format": "json"
      *     }
      * )
-     *
-     * @param mixed $_format
      */
-    public function currentLocation($_format): JsonResponse
+    public function currentLocation(mixed $_format): JsonResponse
     {
         return $this->json(
             $this->getUser()->getCurrentLocation(),
@@ -49,10 +47,8 @@ class UserApiController extends ApiController
      *         "_format": "json"
      *     }
      * )
-     *
-     * @param mixed $_format
      */
-    public function whoami($_format): JsonResponse
+    public function whoami(mixed $_format): JsonResponse
     {
         return $this->json(
             $this->getUser(),
@@ -72,10 +68,6 @@ class UserApiController extends ApiController
         }
     }
 
-    /**
-     * @param mixed $query
-     * @param mixed $_format
-     */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
     {
         return $query->orderBy('e.label', 'ASC');
diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 9d3941411..1ffd72c33 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -22,7 +22,6 @@ use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
@@ -36,39 +35,15 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 class UserController extends CRUDController
 {
-    public const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
+    final public const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
 
-    protected ParameterBagInterface $parameterBag;
-
-    private LoggerInterface $logger;
-
-    private UserPasswordEncoderInterface $passwordEncoder;
-
-    private UserRepository $userRepository;
-
-    private ValidatorInterface $validator;
-
-    public function __construct(
-        LoggerInterface $chillLogger,
-        ValidatorInterface $validator,
-        UserPasswordEncoderInterface $passwordEncoder,
-        UserRepository $userRepository,
-        ParameterBagInterface $parameterBag
-    ) {
-        $this->logger = $chillLogger;
-        $this->userRepository = $userRepository;
-        $this->validator = $validator;
-        $this->passwordEncoder = $passwordEncoder;
-        $this->parameterBag = $parameterBag;
-    }
+    public function __construct(private readonly LoggerInterface $logger, private readonly ValidatorInterface $validator, private readonly UserPasswordEncoderInterface $passwordEncoder, private readonly UserRepository $userRepository, protected ParameterBagInterface $parameterBag) {}
 
     /**
      * @Route("/{_locale}/admin/main/user/{uid}/add_link_groupcenter",
      * name="admin_user_add_groupcenter")
-     *
-     * @param mixed $uid
      */
-    public function addLinkGroupCenterAction(Request $request, $uid): Response
+    public function addLinkGroupCenterAction(Request $request, mixed $uid): Response
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -87,19 +62,16 @@ class UserController extends CRUDController
             );
             $user->addGroupCenter($groupCenter);
 
-            if ($this->validator->validate($user)->count() === 0) {
+            if (0 === $this->validator->validate($user)->count()) {
                 $em->flush();
 
                 $this->addFlash('success', $this->get('translator')->trans('The '
-                    . 'permissions have been successfully added to the user'));
+                    .'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)
-                ));
+                return $this->redirectToRoute('chill_crud_admin_user_edit', array_merge(['id' => $uid], $returnPathParams));
             }
 
             foreach ($this->validator->validate($user) as $error) {
@@ -122,11 +94,8 @@ class UserController extends CRUDController
     /**
      * @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
+    public function deleteLinkGroupCenterAction(mixed $uid, mixed $gcid, Request $request): RedirectResponse
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -145,10 +114,10 @@ class UserController extends CRUDController
 
         try {
             $user->removeGroupCenter($groupCenter);
-        } catch (RuntimeException $ex) {
+        } catch (\RuntimeException $ex) {
             $this->addFlash('error', $this->get('translator')->trans($ex->getMessage()));
 
-            return $this->redirect($this->generateUrl('chill_crud_admin_user_edit', ['id' => $uid]));
+            return $this->redirectToRoute('chill_crud_admin_user_edit', ['id' => $uid]);
         }
 
         $em->flush();
@@ -156,7 +125,7 @@ class UserController extends CRUDController
         $this->addFlash('success', $this->get('translator')
             ->trans('The permissions where removed.'));
 
-        return $this->redirect($this->generateUrl('chill_crud_admin_user_edit', ['id' => $uid]));
+        return $this->redirectToRoute('chill_crud_admin_user_edit', ['id' => $uid]);
     }
 
     public function edit(Request $request, $id): Response
@@ -165,13 +134,7 @@ class UserController extends CRUDController
         $entity = $this->getEntity($action, $id, $request);
 
         if (null === $entity) {
-            throw $this->createNotFoundException(
-                sprintf(
-                    'The %s with id %s is not found',
-                    $this->getCrudName(),
-                    $id
-                )
-            );
+            throw $this->createNotFoundException(sprintf('The %s with id %s is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $entity);
@@ -206,7 +169,7 @@ class UserController extends CRUDController
                 return $result;
             }
 
-            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index');
+            return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index');
         }
 
         if ($form->isSubmitted()) {
@@ -302,7 +265,7 @@ class UserController extends CRUDController
             ->build();
     }
 
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    protected function countEntities(string $action, Request $request, FilterOrderHelper $filterOrder = null): int
     {
         if (!$filterOrder instanceof FilterOrderHelper) {
             return parent::countEntities($action, $request, $filterOrder);
@@ -315,7 +278,7 @@ class UserController extends CRUDController
         return $this->userRepository->countByUsernameOrEmail($filterOrder->getQueryString());
     }
 
-    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    protected function createFormFor(string $action, $entity, string $formClass = null, array $formOptions = []): FormInterface
     {
         // for "new", add special config
         if ('new' === $action) {
@@ -337,14 +300,13 @@ class UserController extends CRUDController
                 [
                     'add_groupcenter_form' => $this->createAddLinkGroupCenterForm($entity, $request)->createView(),
                     'delete_groupcenter_form' => array_map(
-                        static function (Form $form) {
-                            return $form->createView();
-                        },
+                        static fn (Form $form) => $form->createView(),
                         iterator_to_array($this->getDeleteLinkGroupCenterByUser($entity, $request), true)
                     ),
                 ]
             );
-        } elseif ('index' === $action) {
+        }
+        if ('index' === $action) {
             return array_merge(
                 ['allow_change_password' => $this->parameterBag->get('chill_main.access_user_change_password')],
                 $defaultTemplateParameters
@@ -360,7 +322,7 @@ class UserController extends CRUDController
         Request $request,
         int $totalItems,
         PaginatorInterface $paginator,
-        ?FilterOrderHelper $filterOrder = null
+        FilterOrderHelper $filterOrder = null
     ) {
         if (0 === $totalItems) {
             return [];
@@ -422,10 +384,8 @@ class UserController extends CRUDController
 
     /**
      * Creates a form to delete a link to a GroupCenter.
-     *
-     * @param mixed $request
      */
-    private function createDeleteLinkGroupCenterForm(User $user, GroupCenter $groupCenter, $request): FormInterface
+    private function createDeleteLinkGroupCenterForm(User $user, GroupCenter $groupCenter, mixed $request): FormInterface
     {
         $returnPathParams = $request->query->has('returnPath') ? ['returnPath' => $request->query->get('returnPath')] : [];
 
diff --git a/src/Bundle/ChillMainBundle/Controller/UserExportController.php b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
new file mode 100644
index 000000000..7f14b5e64
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
@@ -0,0 +1,142 @@
+<?php
+
+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 Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use League\Csv\Writer;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final readonly class UserExportController
+{
+    public function __construct(
+        private UserRepositoryInterface $userRepository,
+        private Security $security,
+        private TranslatorInterface $translator,
+    ) {}
+
+    /**
+     * @throws \League\Csv\CannotInsertRecord
+     * @throws \League\Csv\Exception
+     * @throws \League\Csv\UnavailableStream
+     *
+     * @Route("/{_locale}/admin/main/users/export/list.{_format}", requirements={"_format": "csv"}, name="chill_main_users_export_list")
+     */
+    public function userList(Request $request, string $_format = 'csv'): StreamedResponse
+    {
+        if (!$this->security->isGranted('ROLE_ADMIN')) {
+            throw new AccessDeniedHttpException('Only ROLE_ADMIN can export this list');
+        }
+
+        $users = $this->userRepository->findAllAsArray($request->getLocale());
+
+        $csv = Writer::createFromPath('php://temp', 'r+');
+        $csv->insertOne(
+            array_map(
+                fn (string $e) => $this->translator->trans('admin.users.export.'.$e),
+                [
+                    'id',
+                    //  'username',
+                    'email',
+                    'enabled',
+                    'civility_id',
+                    'civility_abbreviation',
+                    'civility_name',
+                    'label',
+                    'mainCenter_id',
+                    'mainCenter_name',
+                    'mainScope_id',
+                    'mainScope_name',
+                    'userJob_id',
+                    'userJob_name',
+                    'currentLocation_id',
+                    'currentLocation_name',
+                    'mainLocation_id',
+                    'mainLocation_name',
+                    'absenceStart',
+                ]
+            )
+        );
+        $csv->addFormatter(fn (array $row) => null !== ($row['absenceStart'] ?? null) ? array_merge($row, ['absenceStart' => $row['absenceStart']->format('Y-m-d')]) : $row);
+        $csv->insertAll($users);
+
+        return new StreamedResponse(
+            function () use ($csv) {
+                foreach ($csv->chunk(1024) as $chunk) {
+                    echo $chunk;
+                    flush();
+                }
+            },
+            Response::HTTP_OK,
+            [
+                'Content-Encoding' => 'none',
+                'Content-Type' => 'text/csv; charset=UTF-8',
+                'Content-Disposition' => 'attachment; users.csv',
+            ]
+        );
+    }
+
+    /**
+     * @throws \League\Csv\CannotInsertRecord
+     * @throws \League\Csv\Exception
+     * @throws \League\Csv\UnavailableStream
+     *
+     * @Route("/{_locale}/admin/main/users/export/permissions.{_format}", requirements={"_format": "csv"}, name="chill_main_users_export_permissions")
+     */
+    public function userPermissionsList(string $_format = 'csv'): StreamedResponse
+    {
+        if (!$this->security->isGranted('ROLE_ADMIN')) {
+            throw new AccessDeniedHttpException('Only ROLE_ADMIN can export this list');
+        }
+
+        $userPermissions = $this->userRepository->findAllUserACLAsArray();
+
+        $csv = Writer::createFromPath('php://temp', 'r+');
+        $csv->insertOne(
+            array_map(
+                fn (string $e) => $this->translator->trans('admin.users.export.'.$e),
+                [
+                    'id',
+                    'username',
+                    'email',
+                    'label',
+                    'enabled',
+                    'center_id',
+                    'center_name',
+                    'permissionsGroup_id',
+                    'permissionsGroup_name',
+                ]
+            )
+        );
+        $csv->insertAll($userPermissions);
+
+        return new StreamedResponse(
+            function () use ($csv) {
+                foreach ($csv->chunk(1024) as $chunk) {
+                    echo $chunk;
+                    flush();
+                }
+            },
+            Response::HTTP_OK,
+            [
+                'Content-Encoding' => 'none',
+                'Content-Type' => 'text/csv; charset=UTF-8',
+                'Content-Disposition' => 'attachment; users.csv',
+            ]
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php b/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php
new file mode 100644
index 000000000..55d7aceb7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php
@@ -0,0 +1,45 @@
+<?php
+
+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 Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Entity\User;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Twig\Environment;
+
+class UserJobScopeHistoriesController extends AbstractController
+{
+    public function __construct(
+        private readonly Environment $engine,
+    ) {}
+
+    /**
+     * @Route("/{_locale}/admin/main/user/{id}/job-scope-history", name="admin_user_job_scope_history")
+     */
+    public function indexAction(User $user): Response
+    {
+        $jobHistories = $user->getUserJobHistoriesOrdered();
+        $scopeHistories = $user->getMainScopeHistoriesOrdered();
+
+        return new Response(
+            $this->engine->render(
+                '@ChillMain/User/history.html.twig',
+                [
+                    'user' => $user,
+                    'jobHistories' => $jobHistories,
+                    'scopeHistories' => $scopeHistories,
+                ]
+            )
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
index f0e728252..4c4d8218c 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Serializer\Model\Counter;
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -30,29 +29,7 @@ use Symfony\Component\Serializer\SerializerInterface;
 
 class WorkflowApiController
 {
-    private EntityManagerInterface $entityManager;
-
-    private EntityWorkflowRepository $entityWorkflowRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private Security $security;
-
-    private SerializerInterface $serializer;
-
-    public function __construct(
-        EntityManagerInterface $entityManager,
-        EntityWorkflowRepository $entityWorkflowRepository,
-        PaginatorFactory $paginatorFactory,
-        Security $security,
-        SerializerInterface $serializer
-    ) {
-        $this->entityManager = $entityManager;
-        $this->entityWorkflowRepository = $entityWorkflowRepository;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->security = $security;
-        $this->serializer = $serializer;
-    }
+    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly SerializerInterface $serializer) {}
 
     /**
      * Return a list of workflow which are waiting an action for the user.
@@ -160,46 +137,19 @@ class WorkflowApiController
 
         $user = $this->security->getUser();
 
-        switch ($request->query->get('subscribe')) {
-            case 'final':
-                switch ($action) {
-                    case 'subscribe':
-                        $entityWorkflow->addSubscriberToFinal($user);
-
-                        break;
-
-                    case 'unsubscribe':
-                        $entityWorkflow->removeSubscriberToFinal($user);
-
-                        break;
-
-                    default:
-                        throw new LogicException();
-                }
-
-                break;
-
-            case 'step':
-                switch ($action) {
-                    case 'subscribe':
-                        $entityWorkflow->addSubscriberToStep($user);
-
-                        break;
-
-                    case 'unsubscribe':
-                        $entityWorkflow->removeSubscriberToStep($user);
-
-                        break;
-
-                    default:
-                        throw new LogicException();
-                }
-
-                break;
-
-            default:
-                throw new BadRequestHttpException('subscribe parameter must be equal to "step" or "final"');
-        }
+        match ($request->query->get('subscribe')) {
+            'final' => match ($action) {
+                'subscribe' => $entityWorkflow->addSubscriberToFinal($user),
+                'unsubscribe' => $entityWorkflow->removeSubscriberToFinal($user),
+                default => throw new \LogicException(),
+            },
+            'step' => match ($action) {
+                'subscribe' => $entityWorkflow->addSubscriberToStep($user),
+                'unsubscribe' => $entityWorkflow->removeSubscriberToStep($user),
+                default => throw new \LogicException(),
+            },
+            default => throw new BadRequestHttpException('subscribe parameter must be equal to "step" or "final"'),
+        };
 
         $this->entityManager->flush();
 
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index ee09cc1a6..b641ed46a 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -35,37 +35,10 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\TransitionBlocker;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 class WorkflowController extends AbstractController
 {
-    private EntityManagerInterface $entityManager;
-
-    private EntityWorkflowManager $entityWorkflowManager;
-
-    private EntityWorkflowRepository $entityWorkflowRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private Registry $registry;
-
-    private Security $security;
-
-    private TranslatorInterface $translator;
-
-    private ValidatorInterface $validator;
-
-    public function __construct(EntityWorkflowManager $entityWorkflowManager, EntityWorkflowRepository $entityWorkflowRepository, ValidatorInterface $validator, PaginatorFactory $paginatorFactory, Registry $registry, EntityManagerInterface $entityManager, TranslatorInterface $translator, Security $security)
-    {
-        $this->entityWorkflowManager = $entityWorkflowManager;
-        $this->entityWorkflowRepository = $entityWorkflowRepository;
-        $this->validator = $validator;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->registry = $registry;
-        $this->entityManager = $entityManager;
-        $this->translator = $translator;
-        $this->security = $security;
-    }
+    public function __construct(private readonly EntityWorkflowManager $entityWorkflowManager, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly ValidatorInterface $validator, private readonly PaginatorFactory $paginatorFactory, private readonly Registry $registry, private readonly EntityManagerInterface $entityManager, private readonly TranslatorInterface $translator, private readonly Security $security) {}
 
     /**
      * @Route("/{_locale}/main/workflow/create", name="chill_main_workflow_create")
@@ -93,11 +66,11 @@ class WorkflowController extends AbstractController
 
         $errors = $this->validator->validate($entityWorkflow, null, ['creation']);
 
-        if (count($errors) > 0) {
+        if (\count($errors) > 0) {
             $msg = [];
 
             foreach ($errors as $error) {
-                /** @var \Symfony\Component\Validator\ConstraintViolationInterface $error */
+                /* @var \Symfony\Component\Validator\ConstraintViolationInterface $error */
                 $msg[] = $error->getMessage();
             }
 
@@ -320,7 +293,7 @@ class WorkflowController extends AbstractController
         $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
         $errors = [];
 
-        if (count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
+        if (\count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
             // possible transition
 
             $usersInvolved = $entityWorkflow->getUsersInvolved();
@@ -336,7 +309,7 @@ class WorkflowController extends AbstractController
                 [
                     'transition' => true,
                     'entity_workflow' => $entityWorkflow,
-                    'suggested_users' => $usersInvolved
+                    'suggested_users' => $usersInvolved,
                 ]
             );
 
@@ -345,25 +318,18 @@ class WorkflowController extends AbstractController
             if ($transitionForm->isSubmitted() && $transitionForm->isValid()) {
                 if (!$workflow->can($entityWorkflow, $transition = $transitionForm['transition']->getData()->getName())) {
                     $blockers = $workflow->buildTransitionBlockerList($entityWorkflow, $transition);
-                    $msgs = array_map(function (TransitionBlocker $tb) {
-                        return $this->translator->trans(
-                            $tb->getMessage(),
-                            $tb->getParameters()
-                        );
-                    }, iterator_to_array($blockers));
+                    $msgs = array_map(fn (TransitionBlocker $tb) => $this->translator->trans(
+                        $tb->getMessage(),
+                        $tb->getParameters()
+                    ), iterator_to_array($blockers));
 
-                    throw $this->createAccessDeniedException(
-                        sprintf(
-                            "not allowed to apply transition {$transition}: %s",
-                            implode(', ', $msgs)
-                        )
-                    );
+                    throw $this->createAccessDeniedException(sprintf("not allowed to apply transition {$transition}: %s", implode(', ', $msgs)));
                 }
 
                 // TODO symfony 5: add those "future" on context ($workflow->apply($entityWorkflow, $transition, $context)
-                $entityWorkflow->futureCcUsers = $transitionForm['future_cc_users']->getData();
-                $entityWorkflow->futureDestUsers = $transitionForm['future_dest_users']->getData();
-                $entityWorkflow->futureDestEmails = $transitionForm['future_dest_emails']->getData();
+                $entityWorkflow->futureCcUsers = $transitionForm['future_cc_users']->getData() ?? [];
+                $entityWorkflow->futureDestUsers = $transitionForm['future_dest_users']->getData() ?? [];
+                $entityWorkflow->futureDestEmails = $transitionForm['future_dest_emails']->getData() ?? [];
 
                 $workflow->apply($entityWorkflow, $transition);
 
@@ -402,7 +368,7 @@ class WorkflowController extends AbstractController
                 'transition_form' => isset($transitionForm) ? $transitionForm->createView() : null,
                 'entity_workflow' => $entityWorkflow,
                 'transition_form_errors' => $errors,
-                //'comment_form' => $commentForm->createView(),
+                // 'comment_form' => $commentForm->createView(),
             ]
         );
     }
diff --git a/src/Bundle/ChillMainBundle/Cron/CronJobInterface.php b/src/Bundle/ChillMainBundle/Cron/CronJobInterface.php
index 4e1ca9ff6..41e4b41a8 100644
--- a/src/Bundle/ChillMainBundle/Cron/CronJobInterface.php
+++ b/src/Bundle/ChillMainBundle/Cron/CronJobInterface.php
@@ -19,5 +19,14 @@ interface CronJobInterface
 
     public function getKey(): string;
 
-    public function run(): void;
+    /**
+     * Execute the cronjob.
+     *
+     * If data is returned, this data is passed as argument on the next execution
+     *
+     * @param array $lastExecutionData the data which was returned from the previous execution
+     *
+     * @return array|null optionally return an array with the same data than the previous execution
+     */
+    public function run(array $lastExecutionData): null|array;
 }
diff --git a/src/Bundle/ChillMainBundle/Cron/CronManager.php b/src/Bundle/ChillMainBundle/Cron/CronManager.php
index f69dcba76..3db7d5dc3 100644
--- a/src/Bundle/ChillMainBundle/Cron/CronManager.php
+++ b/src/Bundle/ChillMainBundle/Cron/CronManager.php
@@ -13,11 +13,10 @@ namespace Chill\MainBundle\Cron;
 
 use Chill\MainBundle\Entity\CronJobExecution;
 use Chill\MainBundle\Repository\CronJobExecutionRepositoryInterface;
-use DateTimeImmutable;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use Psr\Log\LoggerInterface;
-use function array_key_exists;
 
 /**
  * Manage cronjob and execute them.
@@ -38,41 +37,27 @@ use function array_key_exists;
  * If a tasks is "forced", there is no test about eligibility of the task (the `canRun` method is not called),
  * and the last task execution is not recorded.
  */
-class CronManager implements CronManagerInterface
+final readonly class CronManager implements CronManagerInterface
 {
     private const LOG_PREFIX = '[cron manager] ';
 
-    private const UPDATE_AFTER_EXEC = 'UPDATE ' . CronJobExecution::class . ' cr SET cr.lastEnd = :now, cr.lastStatus = :status WHERE cr.key = :key';
+    private const UPDATE_AFTER_EXEC = 'UPDATE '.CronJobExecution::class.' cr SET cr.lastEnd = :now, cr.lastStatus = :status WHERE cr.key = :key';
 
-    private const UPDATE_BEFORE_EXEC = 'UPDATE ' . CronJobExecution::class . ' cr SET cr.lastStart = :now WHERE cr.key = :key';
+    private const UPDATE_BEFORE_EXEC = 'UPDATE '.CronJobExecution::class.' cr SET cr.lastStart = :now WHERE cr.key = :key';
 
-    private CronJobExecutionRepositoryInterface $cronJobExecutionRepository;
-
-    private EntityManagerInterface $entityManager;
-
-    /**
-     * @var iterable<CronJobInterface>
-     */
-    private iterable $jobs;
-
-    private LoggerInterface $logger;
+    private const UPDATE_LAST_EXECUTION_DATA = 'UPDATE '.CronJobExecution::class.' cr SET cr.lastExecutionData = :data WHERE cr.key = :key';
 
     /**
      * @param CronJobInterface[] $jobs
      */
     public function __construct(
-        CronJobExecutionRepositoryInterface $cronJobExecutionRepository,
-        EntityManagerInterface $entityManager,
-        iterable $jobs,
-        LoggerInterface $logger
-    ) {
-        $this->cronJobExecutionRepository = $cronJobExecutionRepository;
-        $this->entityManager = $entityManager;
-        $this->jobs = $jobs;
-        $this->logger = $logger;
-    }
+        private CronJobExecutionRepositoryInterface $cronJobExecutionRepository,
+        private EntityManagerInterface $entityManager,
+        private iterable $jobs,
+        private LoggerInterface $logger
+    ) {}
 
-    public function run(?string $forceJob = null): void
+    public function run(string $forceJob = null): void
     {
         if (null !== $forceJob) {
             $this->runForce($forceJob);
@@ -84,11 +69,13 @@ class CronManager implements CronManagerInterface
 
         foreach ($orderedJobs as $job) {
             if ($job->canRun($lasts[$job->getKey()] ?? null)) {
-                if (array_key_exists($job->getKey(), $lasts)) {
+                if (\array_key_exists($job->getKey(), $lasts)) {
+                    $executionData = $lasts[$job->getKey()]->getLastExecutionData();
+
                     $this->entityManager
                         ->createQuery(self::UPDATE_BEFORE_EXEC)
                         ->setParameters([
-                            'now' => new DateTimeImmutable('now'),
+                            'now' => new \DateTimeImmutable('now'),
                             'key' => $job->getKey(),
                         ])
                         ->execute();
@@ -96,31 +83,44 @@ class CronManager implements CronManagerInterface
                     $execution = new CronJobExecution($job->getKey());
                     $this->entityManager->persist($execution);
                     $this->entityManager->flush();
+
+                    $executionData = $execution->getLastExecutionData();
                 }
                 $this->entityManager->clear();
 
+                // note: at this step, the entity manager does not have any entity CronJobExecution
+                // into his internal memory
+
                 try {
                     $this->logger->info(sprintf('%sWill run job', self::LOG_PREFIX), ['job' => $job->getKey()]);
-                    $job->run();
+                    $result = $job->run($executionData);
 
                     $this->entityManager
                         ->createQuery(self::UPDATE_AFTER_EXEC)
                         ->setParameters([
-                            'now' => new DateTimeImmutable('now'),
+                            'now' => new \DateTimeImmutable('now'),
                             'status' => CronJobExecution::SUCCESS,
                             'key' => $job->getKey(),
                         ])
                         ->execute();
 
+                    if (null !== $result) {
+                        $this->entityManager
+                            ->createQuery(self::UPDATE_LAST_EXECUTION_DATA)
+                            ->setParameter('data', $result, Types::JSON)
+                            ->setParameter('key', $job->getKey(), Types::STRING)
+                            ->execute();
+                    }
+
                     $this->logger->info(sprintf('%sSuccessfully run job', self::LOG_PREFIX), ['job' => $job->getKey()]);
 
                     return;
-                } catch (Exception $e) {
+                } catch (\Exception) {
                     $this->logger->error(sprintf('%sRunning job failed', self::LOG_PREFIX), ['job' => $job->getKey()]);
                     $this->entityManager
                         ->createQuery(self::UPDATE_AFTER_EXEC)
                         ->setParameters([
-                            'now' => new DateTimeImmutable('now'),
+                            'now' => new \DateTimeImmutable('now'),
                             'status' => CronJobExecution::FAILURE,
                             'key' => $job->getKey(),
                         ])
@@ -133,7 +133,7 @@ class CronManager implements CronManagerInterface
     }
 
     /**
-     * @return array<0: CronJobInterface[], 1: array<string, CronJobExecution>>
+     * @return array{0: array<CronJobInterface>, 1: array<string, CronJobExecution>}
      */
     private function getOrderedJobs(): array
     {
@@ -150,16 +150,16 @@ class CronManager implements CronManagerInterface
             $orderedJobs,
             static function (CronJobInterface $a, CronJobInterface $b) use ($lasts): int {
                 if (
-                    (!array_key_exists($a->getKey(), $lasts) && !array_key_exists($b->getKey(), $lasts))
+                    !\array_key_exists($a->getKey(), $lasts) && !\array_key_exists($b->getKey(), $lasts)
                 ) {
                     return 0;
                 }
 
-                if (!array_key_exists($a->getKey(), $lasts) && array_key_exists($b->getKey(), $lasts)) {
+                if (!\array_key_exists($a->getKey(), $lasts) && \array_key_exists($b->getKey(), $lasts)) {
                     return -1;
                 }
 
-                if (!array_key_exists($b->getKey(), $lasts) && array_key_exists($a->getKey(), $lasts)) {
+                if (!\array_key_exists($b->getKey(), $lasts) && \array_key_exists($a->getKey(), $lasts)) {
                     return 1;
                 }
 
@@ -174,7 +174,7 @@ class CronManager implements CronManagerInterface
     {
         foreach ($this->jobs as $job) {
             if ($job->getKey() === $forceJob) {
-                $job->run();
+                $job->run([]);
             }
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Cron/CronManagerInterface.php b/src/Bundle/ChillMainBundle/Cron/CronManagerInterface.php
index d2292d455..19b151657 100644
--- a/src/Bundle/ChillMainBundle/Cron/CronManagerInterface.php
+++ b/src/Bundle/ChillMainBundle/Cron/CronManagerInterface.php
@@ -16,5 +16,5 @@ interface CronManagerInterface
     /**
      * Execute one job, with a given priority, or the given job (identified by his key).
      */
-    public function run(?string $forceJob = null): void;
+    public function run(string $forceJob = null): void;
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
index bf27adc52..fdecd4092 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\Notification;
-use DateTimeImmutable;
 use Doctrine\Persistence\ObjectManager;
 
 /**
@@ -27,14 +26,14 @@ trait LoadAbstractNotificationsTrait
         foreach ($this->notifs as $notif) {
             $entityId = $this->getReference($notif['entityRef'])->getId();
 
-            echo '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'))
+                ->setDate(new \DateTimeImmutable('now'))
                 ->setRead([]);
 
             foreach ($notif['addressees'] as $addressee) {
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
index 93aaf01b3..f95a3cf66 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
@@ -26,10 +26,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
 {
     protected $faker;
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function __construct()
     {
@@ -53,7 +50,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
@@ -69,7 +66,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
 
         $ar->setRefId($this->faker->numerify('ref-id-######'));
         $ar->setStreet($this->faker->streetName);
-        $ar->setStreetNumber((string) mt_rand(0, 199));
+        $ar->setStreetNumber((string) random_int(0, 199));
         $ar->setPoint($this->getRandomPoint());
         $ar->setPostcode($this->getReference(
             LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]
@@ -89,8 +86,8 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
     {
         $lonBrussels = 4.35243;
         $latBrussels = 50.84676;
-        $lon = $lonBrussels + 0.01 * mt_rand(-5, 5);
-        $lat = $latBrussels + 0.01 * mt_rand(-5, 5);
+        $lon = $lonBrussels + 0.01 * random_int(-5, 5);
+        $lat = $latBrussels + 0.01 * random_int(-5, 5);
 
         return Point::fromLonLat($lon, $lat);
     }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
index 8f3ad0bca..4f0d24501 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
@@ -23,10 +23,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class LoadCountries extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function getOrder()
     {
@@ -46,7 +43,7 @@ class LoadCountries extends AbstractFixture implements ContainerAwareInterface,
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
index 6ef2dee97..8254dec1d 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
@@ -35,7 +35,7 @@ class LoadGroupCenters extends AbstractFixture implements OrderedFixtureInterfac
 
                 $manager->persist($GroupCenter);
 
-                $reference = $centerRef . '_' . $permissionGroupRef;
+                $reference = $centerRef.'_'.$permissionGroupRef;
                 $this->addReference($reference, $GroupCenter);
                 static::$refs[] = $reference;
                 echo "Creating {$reference}...  \n";
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
index 88a4869cc..54025cc2f 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
@@ -17,9 +17,6 @@ use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Intl\Intl;
-
-use function in_array;
 
 /**
  * Load languages into database.
@@ -27,17 +24,14 @@ use function in_array;
 class LoadLanguages extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
     // Array of ancien languages (to exclude)
-    private $ancientToExclude = ['ang', 'egy', 'fro', 'goh', 'grc', 'la', 'non', 'peo', 'pro', 'sga',
+    private array $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;
+    private ?\Symfony\Component\DependencyInjection\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'];
+    private array $regionalVersionToInclude = ['ro_MD'];
 
     public function getOrder()
     {
@@ -48,10 +42,10 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
     {
         echo "loading languages... \n";
 
-        foreach (Intl::getLanguageBundle()->getLanguageNames() as $code => $language) {
+        foreach (\Symfony\Component\Intl\Languages::getNames() as $code => $language) {
             if (
-                !in_array($code, $this->regionalVersionToInclude, true)
-                && !in_array($code, $this->ancientToExclude, true)
+                !\in_array($code, $this->regionalVersionToInclude, true)
+                && !\in_array($code, $this->ancientToExclude, true)
             ) {
                 $lang = (new Language())
                     ->setId($code)
@@ -63,7 +57,7 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
@@ -78,7 +72,7 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
         $names = [];
 
         foreach ($this->container->getParameter('chill_main.available_languages') as $lang) {
-            $names[$lang] = Intl::getLanguageBundle()->getLanguageName($languageCode);
+            $names[$lang] = \Symfony\Component\Intl\Languages::getName($languageCode, $lang);
         }
 
         return $names;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
index 37a3b605f..946632513 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
@@ -23,10 +23,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class LoadLocationType extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function getOrder()
     {
@@ -68,7 +65,7 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    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 590aa121a..885fc9af6 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
@@ -63,7 +63,7 @@ class LoadPermissionsGroup extends AbstractFixture implements OrderedFixtureInte
             }
 
             $manager->persist($permissionGroup);
-            $reference = 'permission_group_' . $new['name'];
+            $reference = 'permission_group_'.$new['name'];
             echo "Creating {$reference} \n";
             $this->setReference($reference, $permissionGroup);
             static::$refs[] = $reference;
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
index b1c66cd3f..c8010f604 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
@@ -18,9 +18,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function strtolower;
-use function ucwords;
-
 /**
  * Description of LoadPostalCodes.
  */
@@ -28,7 +25,7 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
 {
     public static $refs = [];
 
-    private static $postalCodeBelgium = <<<'EOF'
+    private static string $postalCodeBelgium = <<<'EOF'
         1000,BRUXELLES,BE
         1020,BRUXELLES,BE
         1030,SCHAERBEEK,BE
@@ -63,7 +60,7 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
         1320,BEAUVECHAIN,BE
         EOF;
 
-    private static $postalCodeFrance = <<<'EOF'
+    private static string $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
@@ -351,22 +348,22 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
             $c = new PostalCode();
             $c->setCountry($country)
                 ->setCode($code[0])
-                ->setName(ucwords(strtolower($code[1])));
+                ->setName(\ucwords(\strtolower($code[1])));
 
-            if (null !== $code[3]) {
+            if (null !== ($code[3] ?? null)) {
                 $c->setRefPostalCodeId($code[3]);
             }
 
-            if (null !== $code[4] & null !== $code[5]) {
+            if (null !== ($code[4] ?? null) & null !== ($code[5] ?? null)) {
                 $c->setCenter(Point::fromLonLat((float) $code[5], (float) $code[4]));
             }
 
-            if (null !== $code[6]) {
+            if (null !== ($code[6] ?? null)) {
                 $c->setPostalCodeSource($code[6]);
             }
 
             $manager->persist($c);
-            $ref = 'postal_code_' . $code[0];
+            $ref = 'postal_code_'.$code[0];
 
             if (!$this->hasReference($ref)) {
                 $this->addReference($ref, $c);
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
index e858d16e5..85e3f4ec2 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
@@ -56,7 +56,7 @@ class LoadRoleScopes extends AbstractFixture implements OrderedFixtureInterface
                 $roleScope = new RoleScope();
                 $roleScope->setRole($key)
                     ->setScope($this->getReference($scopeReference));
-                $reference = 'role_scope_' . $key . '_' . $this->getReference($scopeReference)->getName()['en'];
+                $reference = 'role_scope_'.$key.'_'.$this->getReference($scopeReference)->getName()['en'];
                 echo "Creating {$reference} \n";
                 $this->addReference($reference, $roleScope);
                 $manager->persist($roleScope);
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
index 99f6fa473..10c10de8c 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
@@ -58,7 +58,7 @@ class LoadScopes extends AbstractFixture implements OrderedFixtureInterface
             $scope->setName($new['names']);
 
             $manager->persist($scope);
-            $reference = 'scope_' . $new['names']['en'];
+            $reference = 'scope_'.$new['names']['en'];
             $this->addReference($reference, $scope);
             static::$references[] = $reference;
         }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
index 0d3b79fa0..d22da6b78 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
@@ -15,14 +15,11 @@ use Chill\MainBundle\Entity\User;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 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.
  *
@@ -56,10 +53,7 @@ class LoadUsers extends AbstractFixture implements ContainerAwareInterface, Orde
         ],
     ];
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function getOrder()
     {
@@ -84,13 +78,13 @@ class LoadUsers extends AbstractFixture implements ContainerAwareInterface, Orde
                         ->getEncoder($user)
                         ->encodePassword('password', $user->getSalt())
                 )
-                ->setEmail(sprintf('%s@chill.social', str_replace(' ', '', $username)));
+                ->setEmail(sprintf('%s@chill.social', \str_replace(' ', '', (string) $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);
         }
@@ -98,10 +92,10 @@ class LoadUsers extends AbstractFixture implements ContainerAwareInterface, Orde
         $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');
+            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 54eb090d0..90f43a4ce 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\Controller\AddressApiController;
+use Chill\MainBundle\Controller\CenterController;
 use Chill\MainBundle\Controller\CivilityApiController;
 use Chill\MainBundle\Controller\CivilityController;
 use Chill\MainBundle\Controller\CountryController;
@@ -31,6 +32,7 @@ use Chill\MainBundle\Doctrine\DQL\Greatest;
 use Chill\MainBundle\Doctrine\DQL\JsonAggregate;
 use Chill\MainBundle\Doctrine\DQL\JsonbArrayLength;
 use Chill\MainBundle\Doctrine\DQL\JsonbExistsInArray;
+use Chill\MainBundle\Doctrine\DQL\JsonBuildObject;
 use Chill\MainBundle\Doctrine\DQL\JsonExtract;
 use Chill\MainBundle\Doctrine\DQL\Least;
 use Chill\MainBundle\Doctrine\DQL\OverlapsI;
@@ -45,6 +47,7 @@ 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\Center;
 use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\GeographicalUnitLayer;
@@ -55,6 +58,7 @@ use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Entity\SavedExport;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Form\CenterType;
 use Chill\MainBundle\Form\CivilityType;
 use Chill\MainBundle\Form\CountryType;
 use Chill\MainBundle\Form\LanguageType;
@@ -63,7 +67,6 @@ use Chill\MainBundle\Form\LocationTypeType;
 use Chill\MainBundle\Form\RegroupmentType;
 use Chill\MainBundle\Form\UserJobType;
 use Chill\MainBundle\Form\UserType;
-use Exception;
 use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
 use Ramsey\Uuid\Doctrine\UuidType;
 use Symfony\Component\Config\FileLocator;
@@ -73,8 +76,6 @@ 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.
@@ -95,10 +96,7 @@ class ChillMainExtension extends Extension implements
         $this->widgetFactories[] = $factory;
     }
 
-    /**
-     * @return \Chill\MainBundle\DependencyInjection\Configuration|object|\Symfony\Component\Config\Definition\ConfigurationInterface|null
-     */
-    public function getConfiguration(array $config, ContainerBuilder $container)
+    public function getConfiguration(array $config, ContainerBuilder $container): Configuration
     {
         return new Configuration($this->widgetFactories, $container);
     }
@@ -112,7 +110,7 @@ class ChillMainExtension extends Extension implements
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -192,7 +190,7 @@ class ChillMainExtension extends Extension implements
                 []
         );
 
-        $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');
@@ -220,12 +218,12 @@ class ChillMainExtension extends Extension implements
 
         $this->configureCruds($container, $config['cruds'], $config['apis'], $loader);
         $container->setParameter('chill_main.short_messages', $config['short_messages']);
-        //$this->configureSms($config['short_messages'], $container, $loader);
+        // $this->configureSms($config['short_messages'], $container, $loader);
     }
 
     public function prepend(ContainerBuilder $container)
     {
-        //add installation_name and date_format to globals
+        // add installation_name and date_format to globals
         $chillMainConfig = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration($this
             ->getConfiguration($chillMainConfig, $container), $chillMainConfig);
@@ -240,7 +238,7 @@ class ChillMainExtension extends Extension implements
         ];
         $container->prependExtensionConfig('twig', $twigConfig);
 
-        //add DQL function to ORM (default entity_manager)
+        // add DQL function to ORM (default entity_manager)
         $container
             ->prependExtensionConfig(
                 'doctrine',
@@ -253,6 +251,7 @@ class ChillMainExtension extends Extension implements
                                 'AGGREGATE' => JsonAggregate::class,
                                 'REPLACE' => Replace::class,
                                 'JSON_EXTRACT' => JsonExtract::class,
+                                'JSON_BUILD_OBJECT' => JsonBuildObject::class,
                             ],
                             'numeric_functions' => [
                                 'JSONB_EXISTS_IN_ARRAY' => JsonbExistsInArray::class,
@@ -279,7 +278,7 @@ class ChillMainExtension extends Extension implements
                 ],
             );
 
-        //add dbal types (default entity_manager)
+        // add dbal types (default entity_manager)
         $container
             ->prependExtensionConfig(
                 'doctrine',
@@ -301,7 +300,7 @@ class ChillMainExtension extends Extension implements
                 ]
             );
 
-        //add current route to chill main
+        // add current route to chill main
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
@@ -310,7 +309,7 @@ class ChillMainExtension extends Extension implements
             ],
         ]);
 
-        //add a channel to log app events
+        // add a channel to log app events
         $container->prependExtensionConfig('monolog', [
             'channels' => ['chill'],
         ]);
@@ -322,7 +321,7 @@ class ChillMainExtension extends Extension implements
             ],
         ]);
 
-        //add crud api
+        // add crud api
         $this->prependCruds($container);
     }
 
@@ -334,9 +333,8 @@ class ChillMainExtension extends Extension implements
         array                 $crudConfig,
         array                 $apiConfig,
         Loader\YamlFileLoader $loader
-    ): void
-    {
-        if (count($crudConfig) === 0) {
+    ): void {
+        if (0 === \count($crudConfig)) {
             return;
         }
 
@@ -527,6 +525,27 @@ class ChillMainExtension extends Extension implements
                         ],
                     ],
                 ],
+                [
+                    'class' => Center::class,
+                    'name' => 'center',
+                    'base_path' => '/admin/center',
+                    'form_class' => CenterType::class,
+                    'controller' => CenterController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Center/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Center/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Center/edit.html.twig',
+                        ],
+                    ],
+                ],
             ],
             'apis' => [
                 [
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
index 40baccfc0..6518d6115 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
@@ -12,7 +12,6 @@ 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;
@@ -27,21 +26,10 @@ class ACLFlagsCompilerPass implements CompilerPassInterface
             $reference = new Reference($id);
 
             foreach ($tags as $tag) {
-                switch ($tag['scope']) {
-                    case PermissionsGroupType::FLAG_SCOPE:
-                        $permissionGroupType->addMethodCall('addFlagProvider', [$reference]);
-
-                        break;
-
-                    default:
-                        throw new LogicException(
-                            sprintf(
-                                "This tag 'scope' is not implemented: %s, on service with id %s",
-                                $tag['scope'],
-                                $id
-                            )
-                        );
-                }
+                match ($tag['scope']) {
+                    PermissionsGroupType::FLAG_SCOPE => $permissionGroupType->addMethodCall('addFlagProvider', [$reference]),
+                    default => 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 5c351728a..dbd79c0f4 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
 use Chill\MainBundle\Export\ExportManager;
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -32,8 +31,7 @@ class ExportsCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->has(ExportManager::class)) {
-            throw new LogicException('service ' . ExportManager::class . ' '
-                    . 'is not defined. It is required by ExportsCompilerPass');
+            throw new \LogicException('service '.ExportManager::class.' is not defined. It is required by ExportsCompilerPass');
         }
 
         $chillManagerDefinition = $container->findDefinition(
@@ -57,13 +55,11 @@ class ExportsCompilerPass implements CompilerPassInterface
         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");
+                    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.');
+                    throw new \LogicException('There is already a chill.export_elements_provider service with prefix '.$attributes['prefix'].'. Choose another prefix.');
                 }
                 $knownAliases[] = $attributes['prefix'];
 
@@ -88,13 +84,11 @@ class ExportsCompilerPass implements CompilerPassInterface
         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");
+                    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.');
+                    throw new \LogicException('There is already a chill.export_formatter service with alias '.$attributes['alias'].'. Choose another alias.');
                 }
                 $knownAliases[] = $attributes['alias'];
 
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
index c41a32056..a91436d3b 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
@@ -12,7 +12,6 @@ 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;
@@ -22,8 +21,7 @@ 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));
+            throw new \LogicException(sprintf('The service %s does not exists in container.', MenuComposer::class));
         }
 
         $menuComposerDefinition = $container->getDefinition('chill.main.menu_composer');
@@ -37,13 +35,7 @@ class MenuCompilerPass implements CompilerPassInterface
             ];
         }
 
-        usort($services, static function ($a, $b) {
-            if ($a['priority'] === $b['priority']) {
-                return 0;
-            }
-
-            return ($a['priority'] < $b['priority']) ? -1 : 1;
-        });
+        usort($services, static fn ($a, $b) => $a['priority'] <=> $b['priority']);
 
         foreach ($services as $service) {
             $class = $container->getDefinition($service['id'])->getClass();
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
index ed8c2cf03..a0ea00e8a 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
@@ -12,7 +12,6 @@ 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;
@@ -22,8 +21,7 @@ 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);
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
index d4d122d97..ee305f964 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
@@ -11,7 +11,6 @@ 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;
@@ -26,8 +25,7 @@ class SearchableServicesCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill_main.search_provider')) {
-            throw new LogicException('service chill_main.search_provider '
-                    . 'is not defined.');
+            throw new \LogicException('service chill_main.search_provider is not defined.');
         }
 
         $definition = $container->getDefinition(
@@ -43,13 +41,11 @@ class SearchableServicesCompilerPass implements CompilerPassInterface
         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");
+                    throw new \LogicException("the 'name' attribute is missing in your service '{$id}' definition");
                 }
 
                 if (array_search($attributes['alias'], $knownAliases, true)) {
-                    throw new LogicException('There is already a chill.search service with alias '
-                        . $attributes['alias'] . '. Choose another alias.');
+                    throw new \LogicException('There is already a chill.search service with alias '.$attributes['alias'].'. Choose another alias.');
                 }
                 $knownAliases[] = $attributes['alias'];
 
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
index f75840c3a..ebbfcee1b 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
@@ -28,55 +28,52 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
-use function array_key_exists;
 
 class ShortMessageCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $config = $container->resolveEnvPlaceholders($container->getParameter('chill_main.short_messages', null), true);
+        $config = $container->resolveEnvPlaceholders($container->getParameter('chill_main.short_messages'), true);
         // weird fix for special characters
-        $config['dsn'] = str_replace(['%%'], ['%'], $config['dsn']);
+        $config['dsn'] = str_replace(['%%'], ['%'], (string) $config['dsn']);
         $dsn = parse_url($config['dsn']);
         parse_str($dsn['query'] ?? '', $dsn['queries']);
 
         if ('null' === $dsn['scheme'] || false === $config['enabled']) {
             $defaultTransporter = new Reference(NullShortMessageSender::class);
         } elseif ('ovh' === $dsn['scheme']) {
-            if (!class_exists('\Ovh\Api')) {
+            if (!class_exists('\\'.\Ovh\Api::class)) {
                 throw new RuntimeException('Class \\Ovh\\Api not found');
             }
 
             foreach (['user', 'host', 'pass'] as $component) {
-                if (!array_key_exists($component, $dsn)) {
-                    throw new RuntimeException(sprintf('The component %s does not exist in dsn. Please provide a dsn ' .
-                        'like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $component));
+                if (!\array_key_exists($component, $dsn)) {
+                    throw new RuntimeException(sprintf('The component %s does not exist in dsn. Please provide a dsn like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $component));
                 }
 
-                $container->setParameter('chill_main.short_messages.ovh_config_' . $component, $dsn[$component]);
+                $container->setParameter('chill_main.short_messages.ovh_config_'.$component, $dsn[$component]);
             }
 
             foreach (['consumer_key', 'sender', 'service_name'] as $param) {
-                if (!array_key_exists($param, $dsn['queries'])) {
-                    throw new RuntimeException(sprintf('The parameter %s does not exist in dsn. Please provide a dsn ' .
-                        'like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $param));
+                if (!\array_key_exists($param, $dsn['queries'])) {
+                    throw new RuntimeException(sprintf('The parameter %s does not exist in dsn. Please provide a dsn like ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz', $param));
                 }
-                $container->setParameter('chill_main.short_messages.ovh_config_' . $param, $dsn['queries'][$param]);
+                $container->setParameter('chill_main.short_messages.ovh_config_'.$param, $dsn['queries'][$param]);
             }
 
             $ovh = new Definition();
             $ovh
-                ->setClass('\Ovh\Api')
+                ->setClass('\\'.\Ovh\Api::class)
                 ->setArgument(0, $dsn['user'])
                 ->setArgument(1, $dsn['pass'])
                 ->setArgument(2, $dsn['host'])
                 ->setArgument(3, $dsn['queries']['consumer_key']);
-            $container->setDefinition('Ovh\Api', $ovh);
+            $container->setDefinition(\Ovh\Api::class, $ovh);
 
             $ovhSender = new Definition();
             $ovhSender
                 ->setClass(OvhShortMessageSender::class)
-                ->setArgument(0, new Reference('Ovh\Api'))
+                ->setArgument(0, new Reference(\Ovh\Api::class))
                 ->setArgument(1, $dsn['queries']['service_name'])
                 ->setArgument(2, $dsn['queries']['sender'])
                 ->setArgument(3, new Reference(LoggerInterface::class))
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
index 56b4f0ef3..28ef7a991 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
@@ -11,7 +11,6 @@ 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;
@@ -25,8 +24,7 @@ class TimelineCompilerClass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill_main.timeline_builder')) {
-            throw new LogicException('service chill_main.timeline_builder '
-                    . 'is not defined.');
+            throw new \LogicException('service chill_main.timeline_builder is not defined.');
         }
 
         $definition = $container->getDefinition(
@@ -40,8 +38,7 @@ class TimelineCompilerClass implements CompilerPassInterface
         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");
+                    throw new \LogicException("the 'context' attribute is missing in your service '{$id}' definition");
                 }
 
                 $definition->addMethodCall(
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
index 9b39165d8..202d6f468 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
@@ -11,13 +11,9 @@ 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.
  */
@@ -42,17 +38,14 @@ class ConfigConsistencyCompilerPass implements CompilerPassInterface
             }
         }
 
-        if (count($fallbackLocales) === 0) {
-            throw new LogicException('the fallback locale are not defined. '
-                  . 'The framework config should not allow this.');
+        if (0 === \count($fallbackLocales)) {
+            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'
-                  . ' parameter does not contains fallback locales. The languages %s'
-                  . ' are missing.', implode(', ', $diff)));
+        if (\count($diff) > 0) {
+            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 9631900ab..76e160b52 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
@@ -24,20 +24,17 @@ class Configuration implements ConfigurationInterface
 {
     use AddWidgetConfigurationTrait;
 
-    private ContainerBuilder $containerBuilder;
-
     public function __construct(
         array $widgetFactories,
-        ContainerBuilder $containerBuilder
+        private readonly ContainerBuilder $containerBuilder
     ) {
         $this->setWidgetFactories($widgetFactories);
-        $this->containerBuilder = $containerBuilder;
     }
 
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_main');
-        $rootNode = $treeBuilder->getRootNode('chill_main');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()
@@ -179,8 +176,8 @@ class Configuration implements ConfigurationInterface
             ->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.')
+                                                .'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')
@@ -219,15 +216,15 @@ class Configuration implements ConfigurationInterface
             ->children()
             ->scalarNode('controller_action')
             ->defaultNull()
-            ->info('the method name to call in the controller. Will be set to the concatenation ' .
+            ->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 ' .
+            ->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()
@@ -238,8 +235,8 @@ class Configuration implements ConfigurationInterface
             ->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 ' .
+            ->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')
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php b/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
index f50a97636..a8f1a398c 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection;
 
-use Exception;
-
 /**
  * Description of MissingBundleException.
  */
-class MissingBundleException extends Exception
+class MissingBundleException extends \Exception
 {
     public function __construct($missingBundleName)
     {
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
index 5b20bde62..c4bbc846d 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection;
 
-use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -21,8 +20,7 @@ class RoleProvidersCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill.main.role_provider')) {
-            throw new LogicException('service chill.main.role_provider '
-                    . 'is not defined. It is required by RoleProviderCompilerPass');
+            throw new \LogicException('service chill.main.role_provider is not defined. It is required by RoleProviderCompilerPass');
         }
 
         $definition = $container->getDefinition(
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
index 223a7b6cb..85b7c892f 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
@@ -13,20 +13,11 @@ 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\DependencyInjection\Definition;
 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.
@@ -63,24 +54,24 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
     /**
      * the key to use to identify widget for a given place.
      */
-    public const WIDGET_CONFIG_ALIAS = 'widget_alias';
+    final public const WIDGET_CONFIG_ALIAS = 'widget_alias';
 
     /**
      * the key to use to order widget for a given place.
      */
-    public const WIDGET_CONFIG_ORDER = 'order';
+    final public const WIDGET_CONFIG_ORDER = 'order';
 
     /**
      * The service which will manage the widgets.
      *
      * @var string
      */
-    public const WIDGET_MANAGER = 'chill.main.twig.widget';
+    final public const WIDGET_MANAGER = 'chill.main.twig.widget';
 
     /**
      * the method wich register the widget into give service.
      */
-    public const WIDGET_MANAGER_METHOD_REGISTER = 'addWidget';
+    final public const WIDGET_MANAGER_METHOD_REGISTER = 'addWidget';
 
     /**
      * the key used to collect the alias in the service definition's tag.
@@ -89,46 +80,44 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
      *
      * @var string
      */
-    public const WIDGET_SERVICE_TAG_ALIAS = 'alias';
+    final public const WIDGET_SERVICE_TAG_ALIAS = 'alias';
 
     /**
      * the value of the `name` key in service definitions's tag.
      *
      * @var string
      */
-    public const WIDGET_SERVICE_TAG_NAME = 'chill_widget';
+    final public const WIDGET_SERVICE_TAG_NAME = 'chill_widget';
 
     /**
      * the key used to collect the authorized place in the service definition's tag.
      *
      * @var string
      */
-    public const WIDGET_SERVICE_TAG_PLACES = 'place';
+    final public const WIDGET_SERVICE_TAG_PLACES = 'place';
 
     /**
      * cache of ordering by place.
      *
      * @internal used by function cacheAndGetOrdering
-     *
-     * @var array
      */
-    private $cacheOrdering = [];
+    private array $cacheOrdering = [];
 
     /**
      * @var WidgetFactoryInterface[]
      */
-    private $widgetFactories;
+    private ?array $widgetFactories = null;
 
-    private $widgetServices = [];
+    private array $widgetServices = [];
 
     /**
      * process the configuration and the container to add the widget available.
      *
-     * @param string $extension the extension of your bundle
+     * @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 \LogicException
+     * @throws \UnexpectedValueException if the given extension does not implement HasWidgetExtensionInterface
      */
     public function doProcess(
         ContainerBuilder $container,
@@ -136,8 +125,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
         $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);
@@ -147,14 +135,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
         $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, $extensionClass::class));
         }
 
         $this->widgetFactories = $extensionClass->getWidgetFactories();
@@ -170,18 +151,13 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
             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));
+                if (!\array_key_exists($alias, $this->widgetServices)) {
+                    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,
-                        $place
-                    ));
+                    throw new InvalidConfigurationException(sprintf('The widget with alias %s is not allowed at place %s', $alias, $place));
                 }
 
                 // get the order, eventually corrected
@@ -193,8 +169,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
                     /** @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()] : [];
+                    $config = $param[$factory->getWidgetAlias()] ?? [];
                     // register the service into the container
                     $serviceId = $this->registerServiceIntoContainer(
                         $container,
@@ -245,23 +220,17 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
             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',
-                        self::WIDGET_SERVICE_TAG_PLACES,
-                        $id
-                    ));
+                    throw new InvalidConfigurationException(sprintf('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]);
+                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]);
                 }
 
                 // register the service as available
@@ -276,29 +245,21 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
 
             // 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', $factory::class));
             }
 
             // 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 ' .
-                        get_class($factory));
+            if (!\is_array($factory->getAllowedPlaces())) {
+                throw new \UnexpectedValueException("the method 'getAllowedPlaces' ".'should return a non-empty array. Unexpected value on '.$factory::class);
             }
 
-            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 (0 === \count($factory->getAllowedPlaces())) {
+                throw new \LengthException("The method 'getAllowedPlaces' should ".'return a non-empty array, but returned 0 elements on '.$factory::class.'::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);
+            if (\array_key_exists($alias, $this->widgetServices)) {
+                throw new InvalidArgumentException('a service has already be defined with the '.self::WIDGET_SERVICE_TAG_ALIAS.' '.$alias);
             }
 
             // register the factory as available
@@ -310,7 +271,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
      * register the service into container.
      *
      * @param string $place
-     * @param float $order
+     * @param float  $order
      *
      * @return string the id of the new service
      */
@@ -341,14 +302,14 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
      * recursive method.
      *
      * @param string $place
-     * @param float $ordering
+     * @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)) {
+        if (!\array_key_exists($place, $this->cacheOrdering)) {
             $this->cacheOrdering[$place] = [];
         }
 
@@ -366,16 +327,13 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
     /**
      * get the places where the service is allowed.
      *
-     * @param mixed $place
-     * @param mixed $widgetAlias
-     *
      * @return unknown
      */
-    private function isPlaceAllowedForWidget($place, $widgetAlias, ContainerBuilder $container)
+    private function isPlaceAllowedForWidget(mixed $place, mixed $widgetAlias, ContainerBuilder $container)
     {
         if ($this->widgetServices[$widgetAlias] instanceof WidgetFactoryInterface) {
             if (
-                in_array($place, $this->widgetServices[$widgetAlias]
+                \in_array($place, $this->widgetServices[$widgetAlias]
                     ->getAllowedPlaces(), true)
             ) {
                 return true;
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
index 3cff6583e..47040f0e1 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
@@ -16,10 +16,6 @@ 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.
@@ -139,12 +135,12 @@ trait AddWidgetConfigurationTrait
     protected function addWidgetsConfiguration(string $place, ContainerBuilder $containerBuilder)
     {
         $treeBuilder = new TreeBuilder($place);
-        $root = $treeBuilder->getRootNode($place)
+        $root = $treeBuilder->getRootNode()
             ->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) {
+        if (0 === \count(iterator_to_array($this->filterWidgetByPlace($place)))) {
             return $root;
         }
 
@@ -162,15 +158,15 @@ trait AddWidgetConfigurationTrait
                 // 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)))
+                        .'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 = $builder->getRootNode();
             $widgetOptionsRoot->canBeUnset()
                 ->info(sprintf(
                     'the configuration for the widget "%s" (only required if this widget is set in widget_alias)',
@@ -188,12 +184,12 @@ trait AddWidgetConfigurationTrait
      *
      * @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(), true)) {
+            if (\in_array($place, $factory->getAllowedPlaces(), true)) {
                 yield $factory;
             }
         }
@@ -209,9 +205,9 @@ trait AddWidgetConfigurationTrait
      *
      * @param type $place
      *
-     * @throws InvalidConfigurationException if a service's tag does not have the "alias" key
-     *
      * @return array
+     *
+     * @throws InvalidConfigurationException if a service's tag does not have the "alias" key
      */
     protected function getWidgetAliasesbyPlace($place, ContainerBuilder $containerBuilder)
     {
@@ -223,16 +219,11 @@ trait AddWidgetConfigurationTrait
 
         // append the aliases added without factory
         foreach ($containerBuilder
-            ->findTaggedServiceIds(WidgetsCompilerPass::WIDGET_SERVICE_TAG_NAME)
-            as $serviceId => $tags) {
+            ->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
-                    ));
+                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];
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
index d63d30a00..aaaf3fc47 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
@@ -72,7 +72,7 @@ interface WidgetFactoryInterface
      * return the service id to build the widget.
      *
      * @param string $place
-     * @param float $order
+     * @param float  $order
      *
      * @return string the service definition
      */
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php
index ad148fe99..dd28a8efe 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Age.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class Age extends FunctionNode
 {
-    private $value1;
+    private mixed $value1 = null;
 
-    private $value2;
+    private mixed $value2 = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
index e224c2a0c..1fb51c15b 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
@@ -29,10 +29,10 @@ class Extract extends FunctionNode
 {
     private string $field;
 
-    private $value;
-    //private PathExpression $value;
-    //private FunctionNode $value;
-    //private DateDiffFunction $value;
+    private null|\Doctrine\ORM\Query\AST\Node|string $value = null;
+    // private PathExpression $value;
+    // private FunctionNode $value;
+    // private DateDiffFunction $value;
 
     public function getSql(SqlWalker $sqlWalker)
     {
@@ -53,7 +53,7 @@ class Extract extends FunctionNode
 
         $parser->match(Lexer::T_FROM);
 
-        //$this->value = $parser->ScalarExpression();
+        // $this->value = $parser->ScalarExpression();
         $this->value = $parser->ArithmeticPrimary();
 
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
index 69b26e982..94d2da2e8 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class GetJsonFieldByKey extends FunctionNode
 {
-    private $expr1;
+    private ?\Doctrine\ORM\Query\AST\Node $expr1 = null;
 
-    private $expr2;
+    private ?\Doctrine\ORM\Query\AST\Node $expr2 = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php
index b9ca9c4b6..924831eb1 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Greatest.php
@@ -33,9 +33,7 @@ class Greatest extends FunctionNode
 
     public function getSql(SqlWalker $sqlWalker)
     {
-        return 'GREATEST(' . implode(', ', array_map(static function (Node $expr) use ($sqlWalker) {
-            return $expr->dispatch($sqlWalker);
-        }, $this->exprs)) . ')';
+        return 'GREATEST('.implode(', ', array_map(static fn (Node $expr) => $expr->dispatch($sqlWalker), $this->exprs)).')';
     }
 
     public function parse(Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
index c9a138c20..03809572d 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
@@ -24,7 +24,7 @@ use Doctrine\ORM\Query\SqlWalker;
  */
 class JsonAggregate extends FunctionNode
 {
-    private $expr;
+    private ?\Doctrine\ORM\Query\AST\Node $expr = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php
new file mode 100644
index 000000000..675935867
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonBuildObject.php
@@ -0,0 +1,53 @@
+<?php
+
+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 Chill\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\Node;
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+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.
+ */
+class JsonBuildObject extends FunctionNode
+{
+    /**
+     * @var array|Node[]
+     */
+    private array $exprs = [];
+
+    public function getSql(SqlWalker $sqlWalker)
+    {
+        return 'JSONB_BUILD_OBJECT('.implode(', ', array_map(static fn (Node $expr) => $expr->dispatch($sqlWalker), $this->exprs)).')';
+    }
+
+    public function parse(Parser $parser)
+    {
+        $lexer = $parser->getLexer();
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+        $this->exprs[] = $parser->ArithmeticPrimary();
+
+        while (Lexer::T_COMMA === $lexer->lookahead['type']) {
+            $parser->match(Lexer::T_COMMA);
+            $this->exprs[] = $parser->ArithmeticPrimary();
+        }
+
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php
index 9f93c437e..7d93071b7 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonExtract.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class JsonExtract extends FunctionNode
 {
-    private $element;
+    private null|\Doctrine\ORM\Query\AST\Node|string $element = null;
 
-    private $keyToExtract;
+    private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $keyToExtract = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
index 2fc7c7e17..4b3b75dfd 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
@@ -21,7 +21,7 @@ use Doctrine\ORM\Query\SqlWalker;
  */
 class JsonbArrayLength extends FunctionNode
 {
-    private $expr1;
+    private ?\Doctrine\ORM\Query\AST\Node $expr1 = null;
 
     public function getSql(SqlWalker $sqlWalker): string
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
index 1556753b6..6ca3da89c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
@@ -18,9 +18,9 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class JsonbExistsInArray extends FunctionNode
 {
-    private $expr1;
+    private ?\Doctrine\ORM\Query\AST\Node $expr1 = null;
 
-    private $expr2;
+    private ?\Doctrine\ORM\Query\AST\InputParameter $expr2 = null;
 
     public function getSql(SqlWalker $sqlWalker): string
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php
index 0c8a1b17d..7497e042e 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Least.php
@@ -33,9 +33,7 @@ class Least extends FunctionNode
 
     public function getSql(SqlWalker $sqlWalker)
     {
-        return 'LEAST(' . implode(', ', array_map(static function (Node $expr) use ($sqlWalker) {
-            return $expr->dispatch($sqlWalker);
-        }, $this->exprs)) . ')';
+        return 'LEAST('.implode(', ', array_map(static fn (Node $expr) => $expr->dispatch($sqlWalker), $this->exprs)).')';
     }
 
     public function parse(Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
index 29642dc15..2495199b1 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
@@ -15,7 +15,6 @@ 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.
@@ -25,13 +24,13 @@ use Exception;
  */
 class OverlapsI extends FunctionNode
 {
-    private $firstPeriodEnd;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPeriodEnd = null;
 
-    private $firstPeriodStart;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPeriodStart = null;
 
-    private $secondPeriodEnd;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPeriodEnd = null;
 
-    private $secondPeriodStart;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPeriodStart = null;
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
@@ -73,33 +72,22 @@ class OverlapsI extends FunctionNode
 
     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.');
-        }
+        $p = match ($position) {
+            'start' => '-infinity',
+            'end' => 'infinity',
+            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),
+                "COALESCE(%s, '%s'::date)",
                 $part->dispatch($sqlWalker),
                 $p
             );
         }
 
         return sprintf(
-            "CASE WHEN %s::date IS NOT NULL THEN %s::date ELSE '%s'::date END",
-            $part->dispatch($sqlWalker),
+            "COALESCE(%s::date, '%s'::date)",
             $part->dispatch($sqlWalker),
             $p
         );
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
index c66875e87..7caf2c62c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
@@ -24,12 +24,12 @@ class Replace extends FunctionNode
 
     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).
             ')';
     }
 
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
index d4dbd7c23..aa9bd29a4 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
@@ -19,14 +19,14 @@ use Doctrine\ORM\Query\Lexer;
  */
 class STContains extends FunctionNode
 {
-    private $firstPart;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPart = null;
 
-    private $secondPart;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPart = null;
 
     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/STX.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STX.php
index d5d8d0a3f..2841bb729 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/STX.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STX.php
@@ -18,7 +18,7 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class STX extends FunctionNode
 {
-    private $field;
+    private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $field = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STY.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STY.php
index e827da543..9457a9357 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/STY.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STY.php
@@ -18,7 +18,7 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class STY extends FunctionNode
 {
-    private $field;
+    private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $field = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
index e8b2bff1e..2aa97fb9c 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
@@ -16,14 +16,14 @@ use Doctrine\ORM\Query\Lexer;
 
 class Similarity extends FunctionNode
 {
-    private $firstPart;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPart = null;
 
-    private $secondPart;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPart = null;
 
     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 a45338563..7d0ef2acf 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
@@ -17,14 +17,14 @@ use Doctrine\ORM\Query\SqlWalker;
 
 class StrictWordSimilarityOPS extends \Doctrine\ORM\Query\AST\Functions\FunctionNode
 {
-    private $firstPart;
+    private ?\Doctrine\ORM\Query\AST\Node $firstPart = null;
 
-    private $secondPart;
+    private ?\Doctrine\ORM\Query\AST\Node $secondPart = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
-        return $this->firstPart->dispatch($sqlWalker) .
-            ' <<% ' . $this->secondPart->dispatch($sqlWalker);
+        return $this->firstPart->dispatch($sqlWalker).
+            ' <<% '.$this->secondPart->dispatch($sqlWalker);
     }
 
     public function parse(Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
index 948136637..a5e73209d 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
@@ -21,9 +21,9 @@ use Doctrine\ORM\Query\SqlWalker;
  */
 class ToChar extends FunctionNode
 {
-    private $datetime;
+    private ?\Doctrine\ORM\Query\AST\ArithmeticExpression $datetime = null;
 
-    private $fmt;
+    private null|\Doctrine\ORM\Query\AST\Node|string $fmt = null;
 
     public function getSql(SqlWalker $sqlWalker)
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
index 552f1e557..5813c546f 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
@@ -22,11 +22,11 @@ use Doctrine\ORM\Query\Lexer;
  */
 class Unaccent extends FunctionNode
 {
-    private $string;
+    private ?\Doctrine\ORM\Query\AST\Node $string = null;
 
     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)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
index bf493c344..e6ac2308a 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
@@ -14,7 +14,6 @@ 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;
@@ -22,12 +21,7 @@ use Symfony\Component\Security\Core\Security;
 
 class TrackCreateUpdateSubscriber implements EventSubscriber
 {
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private readonly Security $security) {}
 
     public function getSubscribedEvents()
     {
@@ -41,12 +35,12 @@ class TrackCreateUpdateSubscriber implements EventSubscriber
     {
         $object = $args->getObject();
 
-        if (
-            $object instanceof TrackCreationInterface
-            && $this->security->getUser() instanceof User
-        ) {
-            $object->setCreatedBy($this->security->getUser());
-            $object->setCreatedAt(new DateTimeImmutable('now'));
+        if ($object instanceof TrackCreationInterface) {
+            $object->setCreatedAt(new \DateTimeImmutable('now'));
+
+            if ($this->security->getUser() instanceof User) {
+                $object->setCreatedBy($this->security->getUser());
+            }
         }
 
         $this->onUpdate($object);
@@ -61,12 +55,12 @@ class TrackCreateUpdateSubscriber implements EventSubscriber
 
     protected function onUpdate(object $object): void
     {
-        if (
-            $object instanceof TrackUpdateInterface
-            && $this->security->getUser() instanceof User
-        ) {
-            $object->setUpdatedBy($this->security->getUser());
-            $object->setUpdatedAt(new DateTimeImmutable('now'));
+        if ($object instanceof TrackUpdateInterface) {
+            $object->setUpdatedAt(new \DateTimeImmutable('now'));
+
+            if ($this->security->getUser() instanceof User) {
+                $object->setUpdatedBy($this->security->getUser());
+            }
         }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php b/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
index 96fc12558..4c76ba03a 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
@@ -14,9 +14,6 @@ namespace Chill\MainBundle\Doctrine\Migrations;
 use Doctrine\Migrations\Version\Comparator;
 use Doctrine\Migrations\Version\Version;
 
-use function explode;
-use function strcmp;
-
 /**
  * Compare Version classes names from different namespaces and order them.
  *
@@ -26,12 +23,12 @@ final class VersionComparator implements Comparator
 {
     public function compare(Version $a, Version $b): int
     {
-        return strcmp($this->getNumber($a), $this->getNumber($b));
+        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);
     }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
index c4c18d179..de6af9625 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
@@ -11,24 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Doctrine\Model;
 
-use Exception;
-use JsonSerializable;
-
-use function json_encode;
-
-class Point implements JsonSerializable
+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;
-    }
+    private function __construct(private readonly ?float $lon, private readonly ?float $lat) {}
 
     public static function fromArrayGeoJson(array $array): self
     {
@@ -36,12 +23,12 @@ class Point implements JsonSerializable
             return self::fromLonLat($array['coordinates'][0], $array['coordinates'][1]);
         }
 
-        throw new Exception('Unable to build a point from input data.');
+        throw new \Exception('Unable to build a point from input data.');
     }
 
     public static function fromGeoJson(string $geojson): self
     {
-        $a = json_decode($geojson);
+        $a = json_decode($geojson, null, 512, JSON_THROW_ON_ERROR);
 
         if (null === $a) {
             throw PointException::badJsonString($geojson);
@@ -96,7 +83,7 @@ class Point implements JsonSerializable
     {
         $array = $this->toArrayGeoJson();
 
-        return json_encode($array);
+        return \json_encode($array, JSON_THROW_ON_ERROR);
     }
 
     public function toWKT(): string
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
index e99e84908..9729eb1b5 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Doctrine\Model;
 
-use Exception;
-
 /**
  * Description of PointException.
  */
-class PointException extends Exception
+class PointException extends \Exception
 {
     public static function badCoordinates($lon, $lat): self
     {
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
index aef0d749f..c6f5ef4ef 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
@@ -12,11 +12,10 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeInterface;
 
 interface TrackCreationInterface
 {
-    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/TrackCreationTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php
index 718e02714..29f1c2f43 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php
@@ -13,8 +13,6 @@ namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
@@ -22,18 +20,21 @@ trait TrackCreationTrait
 {
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL})
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?User $createdBy = null;
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -43,9 +44,9 @@ trait TrackCreationTrait
         return $this->createdBy;
     }
 
-    public function setCreatedAt(DateTimeInterface $datetime): self
+    public function setCreatedAt(\DateTimeInterface $datetime): self
     {
-        $this->createdAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime;
+        $this->createdAt = $datetime instanceof \DateTime ? \DateTimeImmutable::createFromMutable($datetime) : $datetime;
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
index 9edca11d3..5aa4fdb48 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
@@ -12,11 +12,10 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeInterface;
 
 interface TrackUpdateInterface
 {
-    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/Model/TrackUpdateTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php
index eaa5dcfd0..8a3f98972 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php
@@ -13,8 +13,6 @@ namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
@@ -22,18 +20,21 @@ trait TrackUpdateTrait
 {
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL})
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?User $updatedBy = null;
 
-    public function getUpdatedAt(): ?DateTimeInterface
+    public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
@@ -43,9 +44,9 @@ trait TrackUpdateTrait
         return $this->updatedBy;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
-        $this->updatedAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime;
+        $this->updatedAt = $datetime instanceof \DateTime ? \DateTimeImmutable::createFromMutable($datetime) : $datetime;
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
index d68f0ca7b..704b95861 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Doctrine\ORM\Hydration;
 
 use Doctrine\ORM\Internal\Hydration\ObjectHydrator;
-use Generator;
 
 final class FlatHierarchyEntityHydrator extends ObjectHydrator
 {
@@ -40,7 +39,7 @@ final class FlatHierarchyEntityHydrator extends ObjectHydrator
         );
     }
 
-    private function flatListGenerator(array $hashMap, ?object $parent = null): Generator
+    private function flatListGenerator(array $hashMap, object $parent = null): \Generator
     {
         $parent = null === $parent ? null : spl_object_id($parent);
         $hashMap += [$parent => []];
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
index 896ddb600..01de206c8 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
@@ -11,17 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Doctrine\Type;
 
-use DateInterval;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
 use Doctrine\DBAL\Types\DateIntervalType;
-use Exception;
-
-use LogicException;
-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
@@ -29,7 +21,7 @@ use function reset;
  */
 class NativeDateIntervalType extends DateIntervalType
 {
-    public const FORMAT = '%rP%YY%MM%DDT%HH%IM%SS';
+    final public const FORMAT = '%rP%YY%MM%DDT%HH%IM%SS';
 
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
@@ -37,7 +29,7 @@ class NativeDateIntervalType extends DateIntervalType
             return null;
         }
 
-        if ($value instanceof DateInterval) {
+        if ($value instanceof \DateInterval) {
             return $value->format(self::FORMAT);
         }
 
@@ -46,25 +38,25 @@ class NativeDateIntervalType extends DateIntervalType
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if (null === $value || $value instanceof DateInterval) {
+        if (null === $value || $value instanceof \DateInterval) {
             return $value;
         }
 
         try {
-            $strings = explode(' ', $value);
+            $strings = explode(' ', (string) $value);
 
-            if (count($strings) === 0) {
+            if (1 === count($strings) && ('' === $strings[0])) {
                 return null;
             }
             $intervalSpec = 'P';
-            reset($strings);
+            \reset($strings);
 
             do {
                 $intervalSpec .= $this->convertEntry($strings);
-            } while (next($strings) !== false);
+            } while (false !== next($strings));
 
-            return new DateInterval($intervalSpec);
-        } catch (Exception $exception) {
+            return new \DateInterval($intervalSpec);
+        } catch (\Exception $exception) {
             throw $this->createConversionException($value, $exception);
         }
     }
@@ -86,47 +78,31 @@ class NativeDateIntervalType extends DateIntervalType
 
     private function convertEntry(&$strings)
     {
-        $current = current($strings);
+        $current = \current($strings);
 
         if (is_numeric($current)) {
             $next = next($strings);
 
-            switch ($next) {
-                case 'year':
-                case 'years':
-                    $unit = 'Y';
+            $unit = match ($next) {
+                'year', 'years' => 'Y',
+                'mon', 'mons' => 'M',
+                'day', 'days' => 'D',
+                default => throw $this->createConversionException(implode('', $strings)),
+            };
 
-                    break;
-
-                case 'mon':
-                case 'mons':
-                    $unit = 'M';
-
-                    break;
-
-                case 'day':
-                case 'days':
-                    $unit = 'D';
-
-                    break;
-
-                default:
-                    throw $this->createConversionException(implode('', $strings));
-            }
-
-            return $current . $unit;
+            return $current.$unit;
         }
 
-        if (preg_match('/([0-9]{2}\:[0-9]{2}:[0-9]{2})/', $current) === 1) {
-            $tExploded = explode(':', $current);
+        if (1 === \preg_match('/([0-9]{2}\:[0-9]{2}:[0-9]{2})/', (string) $current)) {
+            $tExploded = explode(':', (string) $current);
             $intervalSpec = 'T';
-            $intervalSpec .= $tExploded[0] . 'H';
-            $intervalSpec .= $tExploded[1] . 'M';
-            $intervalSpec .= $tExploded[2] . 'S';
+            $intervalSpec .= $tExploded[0].'H';
+            $intervalSpec .= $tExploded[1].'M';
+            $intervalSpec .= $tExploded[2].'S';
 
             return $intervalSpec;
         }
 
-        throw new LogicException();
+        throw new \LogicException();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
index 3f74c62a3..b74ddf875 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
@@ -21,7 +21,7 @@ use Doctrine\DBAL\Types\Type;
  */
 class PointType extends Type
 {
-    public const POINT = 'point';
+    final public const POINT = 'point';
 
     public function canRequireSQLConversion()
     {
@@ -42,12 +42,7 @@ class PointType extends Type
         return $sqlExpr;
     }
 
-    /**
-     * @param mixed $value
-     *
-     * @return ?Point
-     */
-    public function convertToPHPValue($value, AbstractPlatform $platform)
+    public function convertToPHPValue($value, AbstractPlatform $platform): ?Point
     {
         if (null === $value) {
             return null;
@@ -58,7 +53,7 @@ class PointType extends Type
 
     public function convertToPHPValueSQL($sqlExpr, $platform)
     {
-        return 'ST_AsGeoJSON(' . $sqlExpr . ') ';
+        return 'ST_AsGeoJSON('.$sqlExpr.') ';
     }
 
     public function getName()
@@ -71,6 +66,6 @@ class PointType extends Type
      */
     public function getSQLDeclaration(array $column, AbstractPlatform $platform)
     {
-        return 'geometry(POINT,' . Point::$SRID . ')';
+        return 'geometry(POINT,'.Point::$SRID.')';
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 8e5299579..94f66b6d2 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use DateTime;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -29,7 +28,9 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  * Address.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_main_address")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Address implements TrackCreationInterface, TrackUpdateInterface
@@ -38,68 +39,76 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     use TrackUpdateTrait;
 
     /**
-     * When an Address does match with the AddressReference
+     * When an Address does match with the AddressReference.
      */
-    public const ADDR_REFERENCE_STATUS_MATCH = 'match';
+    final public const ADDR_REFERENCE_STATUS_MATCH = 'match';
 
     /**
      * When an Address does not match with the AddressReference, and
-     * is pending for a review
+     * is pending for a review.
      */
-    public const ADDR_REFERENCE_STATUS_TO_REVIEW = 'to_review';
+    final public const ADDR_REFERENCE_STATUS_TO_REVIEW = 'to_review';
 
     /**
      * When an Address does not match with the AddressReference, but
-     * is reviewed
+     * is reviewed.
      */
-    public const ADDR_REFERENCE_STATUS_REVIEWED = 'reviewed';
+    final public const ADDR_REFERENCE_STATUS_REVIEWED = 'reviewed';
 
     /**
      * @ORM\ManyToOne(targetEntity=AddressReference::class)
+     *
      * @Groups({"write"})
      */
     private ?AddressReference $addressReference = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $buildingName = '';
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     *
      * @Groups({"write"})
      */
     private bool $confidential = false;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $corridor = '';
 
     /**
-     * used for the CEDEX information
+     * used for the CEDEX information.
      *
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $distribution = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $extra = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $flat = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $floor = '';
@@ -110,9 +119,12 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * This list is computed by a materialized view. It won't be populated until a refresh is done
      * on the materialized view.
      *
-     * @var Collection<int, GeographicalUnit>|GeographicalUnit[]
+     * @var Collection<GeographicalUnit>
+     *
      * @readonly
+     *
      * @ORM\ManyToMany(targetEntity=GeographicalUnit::class)
+     *
      * @ORM\JoinTable(
      *     name="view_chill_main_address_geographical_unit",
      *     joinColumns={@ORM\JoinColumn(name="address_id")},
@@ -122,12 +134,14 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     private Collection $geographicalUnits;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"write"})
+     *
      * @readonly
      */
     private ?int $id = null;
@@ -136,6 +150,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * True if the address is a "no address", aka homeless person, ...
      *
      * @Groups({"write"})
+     *
      * @ORM\Column(type="boolean", options={"default": false})
      */
     private bool $isNoAddress = false;
@@ -143,33 +158,35 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * A ThirdParty reference for person's addresses that are linked to a third party.
      *
-     * @var ThirdParty|null
-     *
      * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     *
      * @Groups({"write"})
+     *
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
      */
-    private ?ThirdParty $linkedToThirdParty;
+    private ?ThirdParty $linkedToThirdParty = null;
 
     /**
      * A geospatial field storing the coordinates of the Address.
      *
-     * @var Point|null
-     *
      * @ORM\Column(type="point", nullable=true)
+     *
      * @Groups({"write"})
      */
     private ?Point $point = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"write"})
      */
     private ?PostalCode $postcode = null;
 
     /**
      * @var self::ADDR_REFERENCE_STATUS_*
+     *
      * @ORM\Column(type="text", nullable=false, options={"default": self::ADDR_REFERENCE_STATUS_MATCH})
      */
     private string $refStatus = self::ADDR_REFERENCE_STATUS_MATCH;
@@ -180,22 +197,22 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     private \DateTimeImmutable $refStatusLastUpdate;
 
     /**
-     *
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $steps = '';
 
     /**
-     *
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $street = '';
 
     /**
-     *
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Groups({"write"})
      */
     private string $streetNumber = '';
@@ -205,22 +222,24 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * of address. By default, the current date.
      *
      * @ORM\Column(type="date")
+     *
      * @Groups({"write"})
      */
-    private DateTime $validFrom;
+    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;
+    private ?\DateTime $validTo = null;
 
     public function __construct()
     {
-        $this->validFrom = new DateTime();
+        $this->validFrom = new \DateTime();
         $this->refStatusLastUpdate = new \DateTimeImmutable('now');
         $this->geographicalUnits = new ArrayCollection();
     }
@@ -376,6 +395,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * Get streetAddress1 (legacy function).
      *
      * @return string
+     *
      * @deprecated
      */
     public function getStreetAddress1()
@@ -387,6 +407,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      * Get streetAddress2 (legacy function).
      *
      * @return string
+     *
      * @deprecated
      */
     public function getStreetAddress2()
@@ -399,15 +420,12 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
         return $this->streetNumber;
     }
 
-    /**
-     * @return DateTime
-     */
-    public function getValidFrom(): DateTime
+    public function getValidFrom(): \DateTime
     {
         return $this->validFrom;
     }
 
-    public function getValidTo(): ?DateTimeInterface
+    public function getValidTo(): ?\DateTimeInterface
     {
         return $this->validTo;
     }
@@ -422,7 +440,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
         return $this->getIsNoAddress();
     }
 
-    public function setAddressReference(?AddressReference $addressReference = null): Address
+    public function setAddressReference(AddressReference $addressReference = null): Address
     {
         $this->addressReference = $addressReference;
 
@@ -509,11 +527,9 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Set postcode.
      *
-     * @param PostalCode $postcode
-     *
      * @return Address
      */
-    public function setPostcode(?PostalCode $postcode = null)
+    public function setPostcode(PostalCode $postcode = null)
     {
         $this->postcode = $postcode;
 
@@ -521,14 +537,15 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     }
 
     /**
-     * Update the ref status
+     * Update the ref status.
      *
      * <<<<<<< HEAD
+     *
      * @param Address::ADDR_REFERENCE_STATUS_* $refStatus
-     * @param bool|null $updateLastUpdate Also update the "refStatusLastUpdate"
-     * =======
-     * The refstatuslast update is also updated
-     * >>>>>>> 31152616d (Feature: Provide api endpoint for reviewing addresses)
+     * @param bool|null                        $updateLastUpdate Also update the "refStatusLastUpdate"
+     *                                                           =======
+     *                                                           The refstatuslast update is also updated
+     *                                                           >>>>>>> 31152616d (Feature: Provide api endpoint for reviewing addresses)
      */
     public function setRefStatus(string $refStatus, ?bool $updateLastUpdate = true): self
     {
@@ -565,14 +582,11 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Set streetAddress1 (legacy function).
      *
-     * @param string $streetAddress1
-     *
-     * @return Address
      * @deprecated
      */
-    public function setStreetAddress1($streetAddress1)
+    public function setStreetAddress1(?string $streetAddress1): self
     {
-        $this->street = null === $streetAddress1 ? '' : $streetAddress1;
+        $this->street = (string) $streetAddress1;
 
         return $this;
     }
@@ -580,13 +594,11 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Set streetAddress2 (legacy function).
      *
-     * @param string $streetAddress2
      * @deprecated
-     * @return Address
      */
-    public function setStreetAddress2($streetAddress2)
+    public function setStreetAddress2(?string $streetAddress2): self
     {
-        $this->streetNumber = null === $streetAddress2 ? '' : $streetAddress2;
+        $this->streetNumber = (string) $streetAddress2;
 
         return $this;
     }
@@ -601,14 +613,14 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @return Address
      */
-    public function setValidFrom(DateTime $validFrom)
+    public function setValidFrom(\DateTime $validFrom)
     {
         $this->validFrom = $validFrom;
 
         return $this;
     }
 
-    public function setValidTo(?DateTimeInterface $validTo = null): self
+    public function setValidTo(\DateTimeInterface $validTo = null): self
     {
         $this->validTo = $validTo;
 
@@ -629,7 +641,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
      */
     public function validate(ExecutionContextInterface $context, $payload)
     {
-        if (!$this->getValidFrom() instanceof DateTime) {
+        if (!$this->getValidFrom() instanceof \DateTime) {
             $context
                 ->buildViolation('address.date-should-be-set')
                 ->atPath('validFrom')
diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
index 57421749f..140028da5 100644
--- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php
+++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
@@ -12,18 +12,21 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\Point;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_main_address_reference", indexes={
+ *
  *     @ORM\Index(name="address_refid", columns={"refId"})
  * },
  * uniqueConstraints={
+ *
  *     @ORM\UniqueConstraint(name="chill_main_address_reference_unicity", columns={"refId", "source"})
  * })
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class AddressReference
@@ -39,26 +42,32 @@ class AddressReference
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @groups({"read"})
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @groups({"read"})
      */
-    private ?DateTimeImmutable $deletedAt = null;
+    private ?\DateTimeImmutable $deletedAt = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @groups({"read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $municipalityCode = '';
@@ -66,57 +75,60 @@ class AddressReference
     /**
      * A geospatial field storing the coordinates of the Address.
      *
-     * @var Point
-     *
      * @ORM\Column(type="point")
+     *
      * @groups({"read"})
      */
     private ?Point $point = null;
 
     /**
-     * @var PostalCode
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     *
      * @groups({"read"})
      */
-    private ?PostalCode $postcode;
+    private ?PostalCode $postcode = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $refId = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $source = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $street = '';
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @groups({"read"})
      */
     private string $streetNumber = '';
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @groups({"read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
 
-    public function getDeletedAt(): ?DateTimeImmutable
+    public function getDeletedAt(): ?\DateTimeImmutable
     {
         return $this->deletedAt;
     }
@@ -138,8 +150,6 @@ class AddressReference
 
     /**
      * Get postcode.
-     *
-     * @return PostalCode
      */
     public function getPostcode(): ?PostalCode
     {
@@ -166,7 +176,7 @@ class AddressReference
         return $this->streetNumber;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -176,14 +186,14 @@ class AddressReference
         return null !== $this->getPoint();
     }
 
-    public function setCreatedAt(?DateTimeImmutable $createdAt): self
+    public function setCreatedAt(?\DateTimeImmutable $createdAt): self
     {
         $this->createdAt = $createdAt;
 
         return $this;
     }
 
-    public function setDeletedAt(?DateTimeImmutable $deletedAt): self
+    public function setDeletedAt(?\DateTimeImmutable $deletedAt): self
     {
         $this->deletedAt = $deletedAt;
 
@@ -207,11 +217,9 @@ class AddressReference
     /**
      * Set postcode.
      *
-     * @param PostalCode $postcode
-     *
      * @return Address
      */
-    public function setPostcode(?PostalCode $postcode = null)
+    public function setPostcode(PostalCode $postcode = null)
     {
         $this->postcode = $postcode;
 
@@ -246,7 +254,7 @@ class AddressReference
         return $this;
     }
 
-    public function setUpdatedAt(?DateTimeImmutable $updatedAt): self
+    public function setUpdatedAt(?\DateTimeImmutable $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Center.php b/src/Bundle/ChillMainBundle/Entity/Center.php
index 5ca051ec0..b81200bdb 100644
--- a/src/Bundle/ChillMainBundle/Entity/Center.php
+++ b/src/Bundle/ChillMainBundle/Entity/Center.php
@@ -18,48 +18,61 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="centers")
  */
-class Center implements HasCenterInterface
+class Center implements HasCenterInterface, \Stringable
 {
     /**
-     * @var Collection
+     * @var Collection<GroupCenter>
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\MainBundle\Entity\GroupCenter",
      *     mappedBy="center"
      * )
      */
-    private $groupCenters;
+    private Collection $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 = '';
 
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $isActive = true;
+
+    /**
+     * @var Collection<Regroupment>
+     *
+     * @ORM\ManyToMany(targetEntity=Regroupment::class, mappedBy="centers")
+     */
+    private Collection $regroupments;
+
     /**
      * Center constructor.
      */
     public function __construct()
     {
-        $this->groupCenters = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->groupCenters = new ArrayCollection();
+        $this->regroupments = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->getName();
     }
@@ -82,10 +95,7 @@ class Center implements HasCenterInterface
         return $this;
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getGroupCenters()
+    public function getGroupCenters(): ArrayCollection|Collection
     {
         return $this->groupCenters;
     }
@@ -107,8 +117,19 @@ class Center implements HasCenterInterface
     }
 
     /**
-     * @param $name
-     *
+     * @return Collection<Regroupment>
+     */
+    public function getRegroupments(): Collection
+    {
+        return $this->regroupments;
+    }
+
+    public function getIsActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    /**
      * @return $this
      */
     public function setName($name)
@@ -117,4 +138,11 @@ class Center implements HasCenterInterface
 
         return $this;
     }
+
+    public function setIsActive(bool $isActive): self
+    {
+        $this->isActive = $isActive;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Civility.php b/src/Bundle/ChillMainBundle/Entity/Civility.php
index 5ed82445c..322155fe5 100644
--- a/src/Bundle/ChillMainBundle/Entity/Civility.php
+++ b/src/Bundle/ChillMainBundle/Entity/Civility.php
@@ -16,35 +16,45 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_main_civility")
+ *
  * @ORM\Entity
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={"chill_main_civility": Civility::class})
  */
 class Civility
 {
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $abbreviation = [];
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     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 = [];
@@ -79,9 +89,6 @@ class Civility
         return $this->order;
     }
 
-    /**
-     * @return Civility
-     */
     public function setAbbreviation(array $abbreviation): self
     {
         $this->abbreviation = $abbreviation;
diff --git a/src/Bundle/ChillMainBundle/Entity/Country.php b/src/Bundle/ChillMainBundle/Entity/Country.php
index 0c8509233..91484ba46 100644
--- a/src/Bundle/ChillMainBundle/Entity/Country.php
+++ b/src/Bundle/ChillMainBundle/Entity/Country.php
@@ -19,25 +19,31 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * Country.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="country")
+ *
  * @ORM\Cache(usage="READ_ONLY", region="country_cache_region")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Country
 {
     /**
      * @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", "docgen:read"})
      */
     private ?int $id = null;
@@ -46,7 +52,9 @@ class Country
      * @var array<string, string>
      *
      * @ORM\Column(type="json")
+     *
      * @groups({"read", "docgen:read"})
+     *
      * @Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
@@ -63,7 +71,6 @@ class Country
 
     /**
      * Get name.
-     *
      */
     public function getName(): array
     {
diff --git a/src/Bundle/ChillMainBundle/Entity/CronJobExecution.php b/src/Bundle/ChillMainBundle/Entity/CronJobExecution.php
index 0cacffac9..ee6ec9012 100644
--- a/src/Bundle/ChillMainBundle/Entity/CronJobExecution.php
+++ b/src/Bundle/ChillMainBundle/Entity/CronJobExecution.php
@@ -11,45 +11,47 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Entity;
 
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_main_cronjob_execution")
  */
 class CronJobExecution
 {
-    public const FAILURE = 100;
+    final public const FAILURE = 100;
 
-    public const SUCCESS = 1;
+    final public const SUCCESS = 1;
 
     /**
-     * @ORM\Column(type="text", nullable=false)
-     * @ORM\Id
-     */
-    private string $key;
-
-    /**
-     * @var DateTimeImmutable
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $lastEnd = null;
+    private ?\DateTimeImmutable $lastEnd = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=false)
      */
-    private DateTimeImmutable $lastStart;
+    private \DateTimeImmutable $lastStart;
 
     /**
      * @ORM\Column(type="integer", nullable=true, options={"default": null})
      */
     private ?int $lastStatus = null;
 
-    public function __construct(string $key)
-    {
-        $this->key = $key;
-        $this->lastStart = new DateTimeImmutable('now');
+    /**
+     * @ORM\Column(type="json", options={"default": "'{}'::jsonb", "jsonb": true})
+     */
+    private array $lastExecutionData = [];
+
+    public function __construct(/**
+     * @ORM\Column(type="text", nullable=false)
+     *
+     * @ORM\Id
+     */
+        private string $key
+    ) {
+        $this->lastStart = new \DateTimeImmutable('now');
     }
 
     public function getKey(): string
@@ -57,12 +59,12 @@ class CronJobExecution
         return $this->key;
     }
 
-    public function getLastEnd(): DateTimeImmutable
+    public function getLastEnd(): \DateTimeImmutable
     {
         return $this->lastEnd;
     }
 
-    public function getLastStart(): DateTimeImmutable
+    public function getLastStart(): \DateTimeImmutable
     {
         return $this->lastStart;
     }
@@ -72,14 +74,14 @@ class CronJobExecution
         return $this->lastStatus;
     }
 
-    public function setLastEnd(?DateTimeImmutable $lastEnd): CronJobExecution
+    public function setLastEnd(?\DateTimeImmutable $lastEnd): CronJobExecution
     {
         $this->lastEnd = $lastEnd;
 
         return $this;
     }
 
-    public function setLastStart(DateTimeImmutable $lastStart): CronJobExecution
+    public function setLastStart(\DateTimeImmutable $lastStart): CronJobExecution
     {
         $this->lastStart = $lastStart;
 
@@ -92,4 +94,16 @@ class CronJobExecution
 
         return $this;
     }
+
+    public function getLastExecutionData(): array
+    {
+        return $this->lastExecutionData;
+    }
+
+    public function setLastExecutionData(array $lastExecutionData): CronJobExecution
+    {
+        $this->lastExecutionData = $lastExecutionData;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
index f404d5931..cf858d60f 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
@@ -25,18 +25,16 @@ class CommentEmbeddable
     private ?string $comment = null;
 
     /**
-     * @var DateTime
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $date;
+    private ?\DateTime $date = null;
 
     /**
      * Embeddable does not support associations.
      *
-     * @var int
      * @ORM\Column(type="integer", nullable=true)
      */
-    private $userId;
+    private ?int $userId = null;
 
     public function getComment(): ?string
     {
@@ -44,7 +42,7 @@ class CommentEmbeddable
     }
 
     /**
-     * @return DateTime
+     * @return \DateTime
      */
     public function getDate()
     {
@@ -66,10 +64,7 @@ class CommentEmbeddable
         $this->comment = $comment;
     }
 
-    /**
-     * @param DateTime $date
-     */
-    public function setDate(?DateTime $date)
+    public function setDate(?\DateTime $date)
     {
         $this->date = $date;
     }
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index 560b0dd7f..3cfed7844 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Entity\Embeddable;
 
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
-use function array_key_exists;
 
 /**
  * @ORM\Embeddable
@@ -39,13 +38,13 @@ class PrivateCommentEmbeddable
 
     public function hasCommentForUser(User $user): bool
     {
-        return array_key_exists($user->getId(), $this->comments)
+        return \array_key_exists($user->getId(), $this->comments)
             && '' !== $this->comments[$user->getId()];
     }
 
     public function merge(PrivateCommentEmbeddable $newComment): self
     {
-        $currentComments = null === $this->getComments() ? [] : $this->getComments();
+        $currentComments = $this->getComments() ?? [];
 
         $mergedComments = $newComment->getComments() + $currentComments;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
index 37735bbc2..5c70b7bfe 100644
--- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
+++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
@@ -15,8 +15,10 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="chill_main_geographical_unit", uniqueConstraints={
+ *
  *     @ORM\UniqueConstraint(name="geographical_unit_refid", columns={"layer_id", "unitRefId"})
  * })
+ *
  * @ORM\Entity(readOnly=true)
  */
 class GeographicalUnit
@@ -28,7 +30,9 @@ class GeographicalUnit
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -36,7 +40,7 @@ class GeographicalUnit
     /**
      * @ORM\ManyToOne(targetEntity=GeographicalUnitLayer::class, inversedBy="units")
      */
-    private ?GeographicalUnitLayer $layer;
+    private ?GeographicalUnitLayer $layer = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php
index 7add53066..79e28e6f3 100644
--- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php
+++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php
@@ -20,39 +20,38 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  */
 class SimpleGeographicalUnitDTO
 {
-    /**
-     * @readonly
-     * @psalm-readonly
-     * @Serializer\Groups({"read"})
-     */
-    public int $id;
-
-    /**
-     * @readonly
-     * @psalm-readonly
-     * @Serializer\Groups({"read"})
-     */
-    public int $layerId;
-
-    /**
-     * @readonly
-     * @psalm-readonly
-     * @Serializer\Groups({"read"})
-     */
-    public string $unitName;
-
-    /**
-     * @readonly
-     * @psalm-readonly
-     * @Serializer\Groups({"read"})
-     */
-    public string $unitRefId;
-
-    public function __construct(int $id, string $unitName, string $unitRefId, int $layerId)
-    {
-        $this->id = $id;
-        $this->unitName = $unitName;
-        $this->unitRefId = $unitRefId;
-        $this->layerId = $layerId;
-    }
+    public function __construct(
+        /**
+         * @readonly
+         *
+         * @psalm-readonly
+         *
+         * @Serializer\Groups({"read"})
+         */
+        public int $id,
+        /**
+         * @readonly
+         *
+         * @psalm-readonly
+         *
+         * @Serializer\Groups({"read"})
+         */
+        public string $unitName,
+        /**
+         * @readonly
+         *
+         * @psalm-readonly
+         *
+         * @Serializer\Groups({"read"})
+         */
+        public string $unitRefId,
+        /**
+         * @readonly
+         *
+         * @psalm-readonly
+         *
+         * @Serializer\Groups({"read"})
+         */
+        public int $layerId
+    ) {}
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php
index b856c7a21..c875fecd4 100644
--- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php
+++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php
@@ -18,33 +18,42 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_main_geographical_unit_layer", uniqueConstraints={
+ *
  *     @ORM\UniqueConstraint(name="geographical_unit_layer_refid", columns={"refId"})
  * })
+ *
  * @ORM\Entity
  */
 class GeographicalUnitLayer
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json", nullable=false, options={"default": "[]"})
+     *
      * @Serializer\Groups({"read"})
      */
     private array $name = [];
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Serializer\Groups({"read"})
      */
     private string $refId = '';
 
     /**
+     * @var Collection<GeographicalUnit>
+     *
      * @ORM\OneToMany(targetEntity=GeographicalUnit::class, mappedBy="layer")
      */
     private Collection $units;
diff --git a/src/Bundle/ChillMainBundle/Entity/GroupCenter.php b/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
index 01b450394..bcd4bc8bd 100644
--- a/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
+++ b/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
@@ -17,27 +17,28 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="group_centers")
+ *
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
  */
 class GroupCenter
 {
     /**
-     * @var Center
-     *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\MainBundle\Entity\Center",
      *     inversedBy="groupCenters"
      * )
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private ?Center $center = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -46,6 +47,7 @@ class GroupCenter
      * @ORM\ManyToOne(
      *     targetEntity="Chill\MainBundle\Entity\PermissionsGroup",
      * inversedBy="groupCenters")
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private ?PermissionsGroup $permissionsGroup = null;
@@ -55,6 +57,7 @@ class GroupCenter
      *     targetEntity="Chill\MainBundle\Entity\User",
      *     mappedBy="groupCenters"
      * )
+     *
      * @var Collection<User::class>
      */
     private Collection $users;
diff --git a/src/Bundle/ChillMainBundle/Entity/Language.php b/src/Bundle/ChillMainBundle/Entity/Language.php
index ff803d979..1a91de7b8 100644
--- a/src/Bundle/ChillMainBundle/Entity/Language.php
+++ b/src/Bundle/ChillMainBundle/Entity/Language.php
@@ -18,17 +18,20 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * Language.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="language")
+ *
  * @ORM\Cache(usage="READ_ONLY", region="language_cache_region")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Language
 {
     /**
-     * @var string
-     *
      * @ORM\Id
+     *
      * @ORM\Column(type="string")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?string $id = null;
@@ -37,7 +40,9 @@ class Language
      * @var string array
      *
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillMainBundle/Entity/Location.php b/src/Bundle/ChillMainBundle/Entity/Location.php
index 566cc7bb3..29a049d35 100644
--- a/src/Bundle/ChillMainBundle/Entity/Location.php
+++ b/src/Bundle/ChillMainBundle/Entity/Location.php
@@ -15,8 +15,6 @@ 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 libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Annotation as Serializer;
@@ -24,7 +22,9 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * @ORM\Table(name="chill_main_location")
+ *
  * @ORM\Entity(repositoryClass=LocationRepository::class)
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "location": Location::class
  * })
@@ -33,84 +33,103 @@ 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", "docgen:read"})
      */
     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;
+    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", "docgen:read"})
      */
     private ?string $email = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=LocationType::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?LocationType $locationType = null;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?string $name = null;
 
     /**
      * @ORM\Column(type="phone_number", nullable=true)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
+     *
      * @PhonenumberConstraint(type="any")
      */
     private ?PhoneNumber $phonenumber1 = null;
 
     /**
      * @ORM\Column(type="phone_number", nullable=true)
+     *
      * @Serializer\Groups({"read", "write", "docgen:read"})
+     *
      * @PhonenumberConstraint(type="any")
      */
     private ?PhoneNumber $phonenumber2 = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @Serializer\Groups({"read"})
      */
     private ?User $updatedBy = null;
@@ -130,7 +149,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this->availableForUsers;
     }
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -170,7 +189,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this->phonenumber2;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -206,7 +225,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setCreatedAt(?DateTimeInterface $createdAt): self
+    public function setCreatedAt(?\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -255,7 +274,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(?DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(?\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/LocationType.php b/src/Bundle/ChillMainBundle/Entity/LocationType.php
index 42d1aa960..c6a176ab6 100644
--- a/src/Bundle/ChillMainBundle/Entity/LocationType.php
+++ b/src/Bundle/ChillMainBundle/Entity/LocationType.php
@@ -19,71 +19,85 @@ 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
  * })
+ *
  * @UniqueEntity({"defaultFor"})
  */
 class LocationType
 {
-    public const DEFAULT_FOR_3PARTY = 'thirdparty';
+    final public const DEFAULT_FOR_3PARTY = 'thirdparty';
 
-    public const DEFAULT_FOR_PERSON = 'person';
+    final public const DEFAULT_FOR_PERSON = 'person';
 
-    public const STATUS_NEVER = 'never';
+    final public const STATUS_NEVER = 'never';
 
-    public const STATUS_OPTIONAL = 'optional';
+    final public const STATUS_OPTIONAL = 'optional';
 
-    public const STATUS_REQUIRED = 'required';
+    final 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\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $editableByUsers = 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 $title = [];
diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php
index b8586b2e6..8604b5ee1 100644
--- a/src/Bundle/ChillMainBundle/Entity/Notification.php
+++ b/src/Bundle/ChillMainBundle/Entity/Notification.php
@@ -12,24 +12,23 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function count;
-use function in_array;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_main_notification",
  *     indexes={
+ *
  *         @ORM\Index(name="chill_main_notification_related_entity_idx", columns={"relatedentityclass", "relatedentityid"})
  *     }
  * )
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Notification implements TrackUpdateInterface
@@ -42,7 +41,10 @@ class Notification implements TrackUpdateInterface
     private array $addedAddresses = [];
 
     /**
+     * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_notification_addresses_user")
      */
     private Collection $addressees;
@@ -51,6 +53,7 @@ class Notification implements TrackUpdateInterface
      * a list of destinee which will receive notifications.
      *
      * @var array|string[]
+     *
      * @ORM\Column(type="json")
      */
     private array $addressesEmails = [];
@@ -65,7 +68,10 @@ class Notification implements TrackUpdateInterface
     private ?ArrayCollection $addressesOnLoad = null;
 
     /**
+     * @var Collection<NotificationComment>
+     *
      * @ORM\OneToMany(targetEntity=NotificationComment::class, mappedBy="notification", orphanRemoval=true)
+     *
      * @ORM\OrderBy({"createdAt": "ASC"})
      */
     private Collection $comments;
@@ -73,11 +79,13 @@ class Notification implements TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime_immutable")
      */
-    private DateTimeImmutable $date;
+    private \DateTimeImmutable $date;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -101,18 +109,23 @@ class Notification implements TrackUpdateInterface
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?User $sender = null;
 
     /**
      * @ORM\Column(type="text", options={"default": ""})
+     *
      * @Assert\NotBlank(message="notification.Title must be defined")
      */
     private string $title = '';
 
     /**
+     * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_notification_addresses_unread")
      */
     private Collection $unreadBy;
@@ -120,19 +133,19 @@ class Notification implements TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime_immutable")
      */
-    private ?DateTimeImmutable $updatedAt;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      */
-    private ?User $updatedBy;
+    private ?User $updatedBy = null;
 
     public function __construct()
     {
         $this->addressees = new ArrayCollection();
         $this->unreadBy = new ArrayCollection();
         $this->comments = new ArrayCollection();
-        $this->setDate(new DateTimeImmutable());
+        $this->setDate(new \DateTimeImmutable());
         $this->accessKey = bin2hex(openssl_random_pseudo_bytes(24));
     }
 
@@ -148,7 +161,7 @@ class Notification implements TrackUpdateInterface
 
     public function addAddressesEmail(string $email)
     {
-        if (!in_array($email, $this->addressesEmails, true)) {
+        if (!\in_array($email, $this->addressesEmails, true)) {
             $this->addressesEmails[] = $email;
             $this->addressesEmailsAdded[] = $email;
         }
@@ -180,7 +193,7 @@ class Notification implements TrackUpdateInterface
      */
     public function assertCountAddresses(ExecutionContextInterface $context, $payload): void
     {
-        if (0 === (count($this->getAddressesEmails()) + count($this->getAddressees()))) {
+        if (0 === (\count($this->getAddressesEmails()) + \count($this->getAddressees()))) {
             $context->buildViolation('notification.At least one addressee')
                 ->atPath('addressees')
                 ->addViolation();
@@ -231,7 +244,7 @@ class Notification implements TrackUpdateInterface
         return $this->comments;
     }
 
-    public function getDate(): ?DateTimeImmutable
+    public function getDate(): ?\DateTimeImmutable
     {
         return $this->date;
     }
@@ -271,7 +284,7 @@ class Notification implements TrackUpdateInterface
         return $this->unreadBy;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -344,7 +357,7 @@ class Notification implements TrackUpdateInterface
 
     public function removeAddressesEmail(string $email)
     {
-        if (in_array($email, $this->addressesEmails, true)) {
+        if (\in_array($email, $this->addressesEmails, true)) {
             $this->addressesEmails = array_filter($this->addressesEmails, static fn ($e) => $e !== $email);
             $this->addressesEmailsAdded = array_filter($this->addressesEmailsAdded, static fn ($e) => $e !== $email);
         }
@@ -364,7 +377,7 @@ class Notification implements TrackUpdateInterface
         return $this;
     }
 
-    public function setDate(DateTimeImmutable $date): self
+    public function setDate(\DateTimeImmutable $date): self
     {
         $this->date = $date;
 
@@ -406,7 +419,7 @@ class Notification implements TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
         $this->updatedAt = $datetime;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
index daf2b541f..49d1e859d 100644
--- a/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
+++ b/src/Bundle/ChillMainBundle/Entity/NotificationComment.php
@@ -13,9 +13,6 @@ namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use DateTimeImmutable;
-use DateTimeInterface;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
 use Doctrine\ORM\Event\PrePersistEventArgs;
 use Doctrine\ORM\Mapping as ORM;
@@ -23,13 +20,16 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_notification_comment")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class NotificationComment implements TrackCreationInterface, TrackUpdateInterface
 {
     /**
      * @ORM\Column(type="text")
+     *
      * @Assert\NotBlank(message="notification.Comment content might not be blank")
      */
     private string $content = '';
@@ -37,23 +37,27 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?User $createdBy = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Notification::class, inversedBy="comments")
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?Notification $notification = null;
@@ -70,10 +74,11 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
      *
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $updateAt = null;
+    private ?\DateTimeImmutable $updateAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?User $updatedBy = null;
@@ -83,7 +88,7 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
         return $this->content;
     }
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -103,7 +108,7 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
         return $this->notification;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updateAt;
     }
@@ -146,7 +151,7 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $datetime): self
+    public function setCreatedAt(\DateTimeInterface $datetime): self
     {
         $this->createdAt = $datetime;
 
@@ -173,12 +178,12 @@ class NotificationComment implements TrackCreationInterface, TrackUpdateInterfac
     /**
      * @deprecated use @see{self::setUpdatedAt} instead
      */
-    public function setUpdateAt(?DateTimeImmutable $updateAt): self
+    public function setUpdateAt(?\DateTimeImmutable $updateAt): self
     {
         return $this->setUpdatedAt($updateAt);
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
         $this->updateAt = $datetime;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
index fa505e550..501e28a9a 100644
--- a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
@@ -14,12 +14,13 @@ namespace Chill\MainBundle\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 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")
  */
 class PermissionsGroup
@@ -29,44 +30,43 @@ class PermissionsGroup
      *
      * @ORM\Column(type="json")
      */
-    private $flags = [];
+    private array $flags = [];
 
     /**
-     * @var Collection
+     * @var Collection<GroupCenter>
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\MainBundle\Entity\GroupCenter",
      *     mappedBy="permissionsGroup"
      * )
      */
-    private $groupCenters;
+    private Collection $groupCenters;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=255)
+     * @ORM\Column(type="string", length=255, nullable=false, options={"default": ""})
      */
-    private $name;
+    private string $name = '';
 
     /**
-     * @var Collection
+     * @var Collection<RoleScope>
      *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\RoleScope",
      *     inversedBy="permissionsGroups",
      * cascade={ "persist" })
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
-    private $roleScopes;
+    private Collection $roleScopes;
 
     /**
      * PermissionsGroup constructor.
@@ -106,10 +106,7 @@ class PermissionsGroup
         return $this->name;
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getRoleScopes()
+    public function getRoleScopes(): ArrayCollection|Collection
     {
         return $this->roleScopes;
     }
@@ -121,9 +118,7 @@ class PermissionsGroup
     public function isRoleScopePresentOnce(ExecutionContextInterface $context)
     {
         $roleScopesId = array_map(
-            static function (RoleScope $roleScope) {
-                return $roleScope->getId();
-            },
+            static fn (RoleScope $roleScope) => $roleScope->getId(),
             $this->getRoleScopes()->toArray()
         );
         $countedIds = array_count_values($roleScopesId);
@@ -131,22 +126,21 @@ class PermissionsGroup
         foreach ($countedIds as $id => $nb) {
             if (1 < $nb) {
                 $context->buildViolation('A permission is already present '
-                        . 'for the same role and scope')
+                        .'for the same role and scope')
                     ->addViolation();
             }
         }
     }
 
     /**
-     * @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 (false === $result) {
-            throw new RuntimeException(sprintf("The roleScope '%s' could not be removed, "
-                    . 'aborting.', spl_object_hash($roleScope)));
+            throw new \RuntimeException(sprintf("The roleScope '%s' could not be removed, ".'aborting.', spl_object_hash($roleScope)));
         }
     }
 
@@ -161,8 +155,6 @@ class PermissionsGroup
     }
 
     /**
-     * @param $name
-     *
      * @return $this
      */
     public function setName($name)
diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
index d016f7bc6..5aba8030c 100644
--- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php
+++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -24,13 +23,16 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * PostalCode.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_main_postal_code",
  *     uniqueConstraints={
+ *
  *         @ORM\UniqueConstraint(name="postal_code_import_unicity", columns={"code", "refpostalcodeid", "postalcodesource"},
  *         options={"where": "refpostalcodeid is not null"})
  *     },
  *     indexes={
+ *
  *         @ORM\Index(name="search_name_code", columns={"code", "label"}),
  *         @ORM\Index(name="search_by_reference_code", columns={"code", "refpostalcodeid"})
  *     })
@@ -53,75 +55,69 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
     private string $canonical = '';
 
     /**
-     * @var Point
-     *
      * @ORM\Column(type="point", nullable=true)
+     *
      * @groups({"read"})
      */
-    private $center;
+    private ?\Chill\MainBundle\Doctrine\Model\Point $center = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=100)
+     *
      * @groups({"write", "read"})
      */
-    private $code;
+    private ?string $code = null;
 
     /**
-     * @var Country
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
+     *
      * @groups({"write", "read"})
      */
-    private $country;
+    private ?\Chill\MainBundle\Entity\Country $country = null;
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $deletedAt = null;
+    private ?\DateTimeImmutable $deletedAt = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @groups({"write", "read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255, name="label")
+     *
      * @groups({"write", "read"})
      */
-    private $name;
+    private ?string $name = null;
 
     /**
-     * @var int
-     *
      * @ORM\Column(name="origin", type="integer", nullable=true)
+     *
      * @groups({"write", "read"})
      */
-    private $origin = 0;
+    private int $origin = 0;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255, nullable=true)
+     *
      * @groups({"read"})
      */
-    private $postalCodeSource;
+    private ?string $postalCodeSource = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255, nullable=true)
+     *
      * @groups({"read"})
      */
-    private $refPostalCodeId;
+    private ?string $refPostalCodeId = null;
 
     public function getCenter(): ?Point
     {
@@ -212,11 +208,9 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
     /**
      * Set country.
      *
-     * @param Country $country
-     *
      * @return PostalCode
      */
-    public function setCountry(?Country $country = null)
+    public function setCountry(Country $country = null)
     {
         $this->country = $country;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Regroupment.php b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
index 96953abf5..4945a62c7 100644
--- a/src/Bundle/ChillMainBundle/Entity/Regroupment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Regroupment.php
@@ -17,22 +17,28 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="regroupment")
  */
 class Regroupment
 {
     /**
-     * @var Center
      * @ORM\ManyToMany(
-     *     targetEntity=Center::class
+     *     targetEntity=Center::class,
+     *     inversedBy="regroupments"
      * )
+     *
      * @ORM\Id
+     *
+     * @var Collection<Center>
      */
     private Collection $centers;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -52,6 +58,26 @@ class Regroupment
         $this->centers = new ArrayCollection();
     }
 
+    public function addCenter(Center $center): self
+    {
+        if (!$this->centers->contains($center)) {
+            $this->centers->add($center);
+            $center->getRegroupments()->add($this);
+        }
+
+        return $this;
+    }
+
+    public function removeCenter(Center $center): self
+    {
+        if ($this->centers->contains($center)) {
+            $this->centers->removeElement($center);
+            $center->getRegroupments()->removeElement($this);
+        }
+
+        return $this;
+    }
+
     public function getCenters(): Collection
     {
         return $this->centers;
diff --git a/src/Bundle/ChillMainBundle/Entity/RoleScope.php b/src/Bundle/ChillMainBundle/Entity/RoleScope.php
index b2afe9117..f7dc5fa2f 100644
--- a/src/Bundle/ChillMainBundle/Entity/RoleScope.php
+++ b/src/Bundle/ChillMainBundle/Entity/RoleScope.php
@@ -17,26 +17,30 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="role_scopes")
+ *
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
  */
 class RoleScope
 {
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
     /**
-     * @var Collection
+     * @var Collection<PermissionsGroup>
      *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\PermissionsGroup",
      * mappedBy="roleScopes")
      */
-    private $permissionsGroups;
+    private Collection $permissionsGroups;
 
     /**
      * @ORM\Column(type="string", length=255)
@@ -47,7 +51,9 @@ class RoleScope
      * @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;
@@ -72,14 +78,14 @@ class RoleScope
         return $this->scope;
     }
 
-    public function setRole(?string $role = null): self
+    public function setRole(string $role = null): self
     {
         $this->role = $role;
 
         return $this;
     }
 
-    public function setScope(?Scope $scope = null): self
+    public function setScope(Scope $scope = null): self
     {
         $this->scope = $scope;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/SavedExport.php b/src/Bundle/ChillMainBundle/Entity/SavedExport.php
index 7f2cf5afb..c74ff55de 100644
--- a/src/Bundle/ChillMainBundle/Entity/SavedExport.php
+++ b/src/Bundle/ChillMainBundle/Entity/SavedExport.php
@@ -23,6 +23,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_main_saved_export")
  */
 class SavedExport implements TrackCreationInterface, TrackUpdateInterface
@@ -33,6 +34,7 @@ class SavedExport implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Assert\NotBlank
      * @Groups({"read"})
      */
@@ -45,7 +47,9 @@ class SavedExport implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="uuid", unique="true")
+     *
      * @ORM\GeneratedValue(strategy="NONE")
      * @Groups({"read"})
      */
@@ -59,6 +63,7 @@ class SavedExport implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Assert\NotBlank
      * @Groups({"read"})
      */
diff --git a/src/Bundle/ChillMainBundle/Entity/Scope.php b/src/Bundle/ChillMainBundle/Entity/Scope.php
index df4f75e4c..464d60488 100644
--- a/src/Bundle/ChillMainBundle/Entity/Scope.php
+++ b/src/Bundle/ChillMainBundle/Entity/Scope.php
@@ -20,8 +20,11 @@ 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
  * })
@@ -35,8 +38,11 @@ class Scope
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
@@ -45,20 +51,23 @@ class Scope
      * translatable names.
      *
      * @ORM\Column(type="json")
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
 
     /**
-     * @var Collection
+     * @var Collection<RoleScope>
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\MainBundle\Entity\RoleScope",
      * mappedBy="scope")
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
-    private $roleScopes;
+    private Collection $roleScopes;
 
     /**
      * Scope constructor.
@@ -75,9 +84,6 @@ class Scope
         return $this;
     }
 
-    /**
-     * @return int
-     */
     public function getId(): ?int
     {
         return $this->id;
@@ -106,8 +112,6 @@ class Scope
     }
 
     /**
-     * @param $name
-     *
      * @return $this
      */
     public function setName(array $name): self
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index a8ef88fbe..01655fa3d 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -11,32 +11,37 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Entity;
 
-use DateTimeImmutable;
+use Chill\MainBundle\Entity\User\UserJobHistory;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
-use RuntimeException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;
-
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function in_array;
 
 /**
  * User.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="users")
+ *
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "user": User::class
  * })
  */
-class User implements UserInterface
+class User implements UserInterface, \Stringable
 {
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     protected ?int $id = null;
@@ -44,7 +49,7 @@ class User implements UserInterface
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $absenceStart = null;
+    private ?\DateTimeImmutable $absenceStart = null;
 
     /**
      * Array where SAML attributes's data are stored.
@@ -83,9 +88,12 @@ class User implements UserInterface
     private bool $enabled = true;
 
     /**
+     * @var Collection<GroupCenter>
+     *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\GroupCenter",
      * inversedBy="users")
+     *
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private Collection $groupCenters;
@@ -112,9 +120,12 @@ class User implements UserInterface
     private ?Location $mainLocation = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity=Scope::class)
+     * @var Collection&Selectable<int, UserScopeHistory>
+     *
+     * @ORM\OneToMany(targetEntity=UserScopeHistory::class,
+     * mappedBy="user", cascade={"persist", "remove"}, orphanRemoval=true)
      */
-    private ?Scope $mainScope = null;
+    private Collection&Selectable $scopeHistories;
 
     /**
      * @ORM\Column(type="string", length=255)
@@ -129,9 +140,12 @@ class User implements UserInterface
     private ?string $salt = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity=UserJob::class)
+     * @var Collection&Selectable<int, UserJobHistory>
+     *
+     * @ORM\OneToMany(targetEntity=UserJobHistory::class,
+     * mappedBy="user", cascade={"persist", "remove"}, orphanRemoval=true)
      */
-    private ?UserJob $userJob = null;
+    private Collection&Selectable $jobHistories;
 
     /**
      * @ORM\Column(type="string", length=80)
@@ -153,19 +167,16 @@ class User implements UserInterface
     public function __construct()
     {
         $this->groupCenters = new ArrayCollection();
+        $this->scopeHistories = new ArrayCollection();
+        $this->jobHistories = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->getLabel();
     }
 
     /**
-     * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
-     *
      * @return \Chill\MainBundle\Entity\User
      */
     public function addGroupCenter(GroupCenter $groupCenter)
@@ -175,11 +186,9 @@ class User implements UserInterface
         return $this;
     }
 
-    public function eraseCredentials()
-    {
-    }
+    public function eraseCredentials() {}
 
-    public function getAbsenceStart(): ?DateTimeImmutable
+    public function getAbsenceStart(): ?\DateTimeImmutable
     {
         return $this->absenceStart;
     }
@@ -208,9 +217,6 @@ class User implements UserInterface
         return $this->currentLocation;
     }
 
-    /**
-     * @return string
-     */
     public function getEmail(): ?string
     {
         return $this->email;
@@ -227,7 +233,7 @@ class User implements UserInterface
     /**
      * @return Collection<GroupCenter>
      */
-    public function getGroupCenters()
+    public function getGroupCenters(): Collection
     {
         return $this->groupCenters;
     }
@@ -255,9 +261,38 @@ class User implements UserInterface
         return $this->mainLocation;
     }
 
-    public function getMainScope(): ?Scope
+    public function getMainScope(\DateTimeImmutable $at = null): ?Scope
     {
-        return $this->mainScope;
+        $at ??= new \DateTimeImmutable('now');
+
+        foreach ($this->scopeHistories as $scopeHistory) {
+            if ($at >= $scopeHistory->getStartDate() && (
+                null === $scopeHistory->getEndDate() || $at < $scopeHistory->getEndDate()
+            )) {
+                return $scopeHistory->getScope();
+            }
+        }
+
+        return null;
+    }
+
+    public function getMainScopeHistories(): Collection
+    {
+        return $this->scopeHistories;
+    }
+
+    /**
+     * @return ArrayCollection|UserScopeHistory[]
+     */
+    public function getMainScopeHistoriesOrdered(): ArrayCollection
+    {
+        $scopeHistories = $this->getMainScopeHistories();
+
+        $sortedScopeHistories = $scopeHistories->toArray();
+
+        usort($sortedScopeHistories, fn ($a, $b) => $a->getStartDate() < $b->getStartDate() ? 1 : -1);
+
+        return new ArrayCollection($sortedScopeHistories);
     }
 
     /**
@@ -273,17 +308,43 @@ class User implements UserInterface
         return ['ROLE_USER'];
     }
 
-    /**
-     * @return string|null
-     */
-    public function getSalt()
+    public function getSalt(): ?string
     {
         return $this->salt;
     }
 
-    public function getUserJob(): ?UserJob
+    public function getUserJob(\DateTimeImmutable $at = null): ?UserJob
     {
-        return $this->userJob;
+        $at ??= new \DateTimeImmutable('now');
+
+        foreach ($this->jobHistories as $jobHistory) {
+            if ($at >= $jobHistory->getStartDate() && (
+                null === $jobHistory->getEndDate() || $at < $jobHistory->getEndDate()
+            )) {
+                return $jobHistory->getJob();
+            }
+        }
+
+        return null;
+    }
+
+    public function getUserJobHistories(): Collection
+    {
+        return $this->jobHistories;
+    }
+
+    /**
+     * @return ArrayCollection|UserJobHistory[]
+     */
+    public function getUserJobHistoriesOrdered(): ArrayCollection
+    {
+        $jobHistories = $this->getUserJobHistories();
+
+        $sortedJobHistories = $jobHistories->toArray();
+
+        usort($sortedJobHistories, fn ($a, $b) => $a->getStartDate() < $b->getStartDate() ? 1 : -1);
+
+        return new ArrayCollection($sortedJobHistories);
     }
 
     /**
@@ -304,7 +365,7 @@ class User implements UserInterface
 
     public function isAbsent(): bool
     {
-        return null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new DateTimeImmutable('now');
+        return null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new \DateTimeImmutable('now');
     }
 
     /**
@@ -349,7 +410,7 @@ class User implements UserInterface
         $groupCentersIds = [];
 
         foreach ($this->getGroupCenters() as $groupCenter) {
-            if (in_array($groupCenter->getId(), $groupCentersIds, true)) {
+            if (\in_array($groupCenter->getId(), $groupCentersIds, true)) {
                 $context->buildViolation('The user has already those permissions')
                     ->addViolation();
             } else {
@@ -359,19 +420,16 @@ class User implements UserInterface
     }
 
     /**
-     * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
-     *
-     * @throws RuntimeException if the groupCenter is not in the collection
+     * @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.');
+        if (false === $this->groupCenters->removeElement($groupCenter)) {
+            throw new \RuntimeException('The groupCenter could not be removed, it seems not to be associated with the user. Aborting.');
         }
     }
 
-    public function setAbsenceStart(?DateTimeImmutable $absenceStart): void
+    public function setAbsenceStart(?\DateTimeImmutable $absenceStart): void
     {
         $this->absenceStart = $absenceStart;
     }
@@ -410,8 +468,6 @@ class User implements UserInterface
     }
 
     /**
-     * @param $email
-     *
      * @return $this
      */
     public function setEmail($email)
@@ -422,8 +478,6 @@ class User implements UserInterface
     }
 
     /**
-     * @param $emailCanonical
-     *
      * @return $this
      */
     public function setEmailCanonical($emailCanonical)
@@ -463,14 +517,41 @@ class User implements UserInterface
 
     public function setMainScope(?Scope $mainScope): User
     {
-        $this->mainScope = $mainScope;
+        if ($mainScope === $this->getMainScope()) {
+            return $this;
+        }
+
+        $newScope = new UserScopeHistory();
+
+        $newScope
+            ->setStartDate(new \DateTimeImmutable('now'))
+            ->setScope($mainScope)
+            ->setUser($this);
+
+        $this->scopeHistories[] = $newScope;
+
+        $criteria = new Criteria();
+        $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
+
+        /** @var \Iterator $scopes */
+        $scopes = $this->scopeHistories->matching($criteria)->getIterator();
+        $scopes->rewind();
+
+        do {
+            /** @var UserScopeHistory $current */
+            $current = $scopes->current();
+            $scopes->next();
+
+            if ($scopes->valid()) {
+                $next = $scopes->current();
+                $current->setEndDate($next->getStartDate());
+            }
+        } while ($scopes->valid());
 
         return $this;
     }
 
     /**
-     * @param $password
-     *
      * @return $this
      */
     public function setPassword($password)
@@ -481,8 +562,6 @@ class User implements UserInterface
     }
 
     /**
-     * @param $salt
-     *
      * @return $this
      */
     public function setSalt($salt)
@@ -494,7 +573,36 @@ class User implements UserInterface
 
     public function setUserJob(?UserJob $userJob): User
     {
-        $this->userJob = $userJob;
+        if ($userJob === $this->getUserJob()) {
+            return $this;
+        }
+
+        $newJob = new UserJobHistory();
+
+        $newJob
+            ->setStartDate(new \DateTimeImmutable('now'))
+            ->setJob($userJob)
+            ->setUser($this);
+
+        $this->jobHistories[] = $newJob;
+
+        $criteria = new Criteria();
+        $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
+
+        /** @var \Iterator $jobs */
+        $jobs = $this->jobHistories->matching($criteria)->getIterator();
+        $jobs->rewind();
+
+        do {
+            /** @var UserJobHistory $current */
+            $current = $jobs->current();
+            $jobs->next();
+
+            if ($jobs->valid()) {
+                $next = $jobs->current();
+                $current->setEndDate($next->getStartDate());
+            }
+        } while ($jobs->valid());
 
         return $this;
     }
@@ -502,15 +610,13 @@ class User implements UserInterface
     /**
      * Set username.
      *
-     * @param string $name
-     *
      * @return User
      */
-    public function setUsername($name)
+    public function setUsername(?string $name)
     {
-        $this->username = $name;
+        $this->username = (string) $name;
 
-        if (empty($this->getLabel())) {
+        if ('' === trim($this->getLabel())) {
             $this->setLabel($name);
         }
 
@@ -518,8 +624,6 @@ class User implements UserInterface
     }
 
     /**
-     * @param $usernameCanonical
-     *
      * @return $this
      */
     public function setUsernameCanonical($usernameCanonical)
diff --git a/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php b/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php
new file mode 100644
index 000000000..7916d9891
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/User/UserJobHistory.php
@@ -0,0 +1,107 @@
+<?php
+
+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 Chill\MainBundle\Entity\User;
+
+use App\Repository\UserJobHistoryRepository;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="chill_main_user_job_history")
+ *
+ * @ORM\Entity(repositoryClass=UserJobHistoryRepository::class)
+ */
+class UserJobHistory
+{
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    private ?\DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\Id
+     *
+     * @ORM\GeneratedValue
+     *
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=UserJob::class)
+     */
+    private ?UserJob $job = null;
+
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private \DateTimeImmutable $startDate;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     */
+    private User $user;
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getJob(): ?UserJob
+    {
+        return $this->job;
+    }
+
+    public function getStartDate(): ?\DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    public function setEndDate(?\DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function setJob(?UserJob $job): UserJobHistory
+    {
+        $this->job = $job;
+
+        return $this;
+    }
+
+    public function setStartDate(\DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    public function setUser(User $user): UserJobHistory
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php b/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php
new file mode 100644
index 000000000..6ac768de2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/User/UserScopeHistory.php
@@ -0,0 +1,107 @@
+<?php
+
+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 Chill\MainBundle\Entity\User;
+
+use App\Repository\UserScopeHistoryRepository;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="chill_main_user_scope_history")
+ *
+ * @ORM\Entity(repositoryClass=UserScopeHistoryRepository::class)
+ */
+class UserScopeHistory
+{
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    private ?\DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\Id
+     *
+     * @ORM\GeneratedValue
+     *
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Scope::class)
+     */
+    private ?Scope $scope = null;
+
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private \DateTimeImmutable $startDate;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     */
+    private User $user;
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getScope(): ?Scope
+    {
+        return $this->scope;
+    }
+
+    public function getStartDate(): ?\DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    public function setEndDate(?\DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function setScope(?Scope $scope): UserScopeHistory
+    {
+        $this->scope = $scope;
+
+        return $this;
+    }
+
+    public function setStartDate(\DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    public function setUser(User $user): UserScopeHistory
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php
index ed8bc43f3..6be1a5efe 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserJob.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php
@@ -16,7 +16,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_user_job")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "user_job": UserJob::class
  * })
@@ -30,16 +32,22 @@ class UserJob
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     protected ?int $id = null;
 
     /**
-     * @var array|string[]A
+     * @var array<string, string>
+     *
      * @ORM\Column(name="label", type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     protected array $label = [];
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
index d0f558cd5..e26547428 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
@@ -16,23 +16,20 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Validator\Constraints\Entity\WorkflowStepUsersOnTransition;
 use Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Iterator;
-use RuntimeException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
-use function count;
-use function is_array;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_workflow_entity")
+ *
  * @EntityWorkflowCreation(groups={"creation"})
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "entity_workflow": EntityWorkflow::class
  * })
@@ -75,13 +72,15 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\OneToMany(targetEntity=EntityWorkflowComment::class, mappedBy="entityWorkflow", orphanRemoval=true)
      *
-     * @var Collection|EntityWorkflowComment[]
+     * @var Collection<EntityWorkflowComment>
      */
     private Collection $comments;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -98,30 +97,35 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\OneToMany(targetEntity=EntityWorkflowStep::class, mappedBy="entityWorkflow", orphanRemoval=true, cascade={"persist"})
+     *
      * @ORM\OrderBy({"transitionAt": "ASC", "id": "ASC"})
+     *
      * @Assert\Valid(traverse=true)
-     * @var Collection|EntityWorkflowStep[]
+     *
+     * @var Collection<EntityWorkflowStep>
      */
     private Collection $steps;
 
     /**
-     * @var null|array|EntityWorkflowStep[]
+     * @var array|EntityWorkflowStep[]|null
      */
     private ?array $stepsChainedCache = null;
 
     /**
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_final")
      *
-     * @var Collection|User[]
+     * @var Collection<User>
      */
     private Collection $subscriberToFinal;
 
     /**
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_step")
      *
-     * @var Collection|User[]
+     * @var Collection<User>
      */
     private Collection $subscriberToStep;
 
@@ -220,7 +224,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
         return null;
     }
 
-    public function getCurrentStepCreatedAt(): ?DateTimeInterface
+    public function getCurrentStepCreatedAt(): ?\DateTimeInterface
     {
         if (null !== $previous = $this->getPreviousStepIfAny()) {
             return $previous->getTransitionAt();
@@ -267,7 +271,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
     {
         $iterator = $this->steps->getIterator();
 
-        if ($iterator instanceof Iterator) {
+        if ($iterator instanceof \Iterator) {
             $iterator->rewind();
 
             while ($iterator->valid()) {
@@ -288,20 +292,17 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
             return null;
         }
 
-        throw new RuntimeException();
+        throw new \RuntimeException();
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getSteps()
+    public function getSteps(): ArrayCollection|Collection
     {
         return $this->steps;
     }
 
     public function getStepsChained(): array
     {
-        if (is_array($this->stepsChainedCache)) {
+        if (\is_array($this->stepsChainedCache)) {
             return $this->stepsChainedCache;
         }
 
@@ -332,18 +333,12 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
         return $steps;
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getSubscriberToFinal()
+    public function getSubscriberToFinal(): ArrayCollection|Collection
     {
         return $this->subscriberToFinal;
     }
 
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getSubscriberToStep()
+    public function getSubscriberToStep(): ArrayCollection|Collection
     {
         return $this->subscriberToStep;
     }
@@ -495,7 +490,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     private function getPreviousStepIfAny(): ?EntityWorkflowStep
     {
-        if (1 === count($this->steps)) {
+        if (1 === \count($this->steps)) {
             return null;
         }
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
index 67093d5ce..9b02bbb9e 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_workflow_entity_comment")
  */
 class EntityWorkflowComment implements TrackCreationInterface, TrackUpdateInterface
@@ -39,7 +40,9 @@ class EntityWorkflowComment implements TrackCreationInterface, TrackUpdateInterf
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
index e43d524a4..53e4ad945 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@@ -12,17 +12,15 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Entity\Workflow;
 
 use Chill\MainBundle\Entity\User;
-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 Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function count;
-use function in_array;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_main_workflow_entity_step")
  */
 class EntityWorkflowStep
@@ -33,7 +31,10 @@ class EntityWorkflowStep
     private string $accessKey;
 
     /**
+     * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_step_cc_user")
      */
     private Collection $ccUser;
@@ -54,13 +55,19 @@ class EntityWorkflowStep
     private array $destEmail = [];
 
     /**
+     * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_step_user")
      */
     private Collection $destUser;
 
     /**
+     * @var Collection<User>
+     *
      * @ORM\ManyToMany(targetEntity=User::class)
+     *
      * @ORM\JoinTable(name="chill_main_workflow_entity_step_user_by_accesskey")
      */
     private Collection $destUserByAccessKey;
@@ -77,7 +84,9 @@ class EntityWorkflowStep
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -105,10 +114,11 @@ class EntityWorkflowStep
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $transitionAt = null;
+    private ?\DateTimeImmutable $transitionAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?User $transitionBy = null;
@@ -137,7 +147,7 @@ class EntityWorkflowStep
 
     public function addDestEmail(string $email): self
     {
-        if (!in_array($email, $this->destEmail, true)) {
+        if (!\in_array($email, $this->destEmail, true)) {
             $this->destEmail[] = $email;
         }
 
@@ -244,7 +254,7 @@ class EntityWorkflowStep
         return $this->transitionAfter;
     }
 
-    public function getTransitionAt(): ?DateTimeImmutable
+    public function getTransitionAt(): ?\DateTimeImmutable
     {
         return $this->transitionAt;
     }
@@ -291,9 +301,7 @@ class EntityWorkflowStep
 
     public function removeDestEmail(string $email): self
     {
-        $this->destEmail = array_filter($this->destEmail, static function (string $existing) use ($email) {
-            return $email !== $existing;
-        });
+        $this->destEmail = array_filter($this->destEmail, static fn (string $existing) => $email !== $existing);
 
         return $this;
     }
@@ -358,8 +366,6 @@ class EntityWorkflowStep
     }
 
     /**
-     * @return EntityWorkflowStep
-     *
      * @internal
      */
     public function setNext(?EntityWorkflowStep $next): self
@@ -370,8 +376,6 @@ class EntityWorkflowStep
     }
 
     /**
-     * @return EntityWorkflowStep
-     *
      * @internal
      */
     public function setPrevious(?EntityWorkflowStep $previous): self
@@ -388,7 +392,7 @@ class EntityWorkflowStep
         return $this;
     }
 
-    public function setTransitionAt(?DateTimeImmutable $transitionAt): EntityWorkflowStep
+    public function setTransitionAt(?\DateTimeImmutable $transitionAt): EntityWorkflowStep
     {
         $this->transitionAt = $transitionAt;
 
@@ -411,21 +415,19 @@ class EntityWorkflowStep
 
     /**
      * @Assert\Callback
-     *
-     * @param mixed $payload
      */
-    public function validateOnCreation(ExecutionContextInterface $context, $payload): void
+    public function validateOnCreation(ExecutionContextInterface $context, mixed $payload): void
     {
         return;
 
         if ($this->isFinalizeAfter()) {
-            if (0 !== count($this->getDestUser())) {
+            if (0 !== \count($this->getDestUser())) {
                 $context->buildViolation('workflow.No dest users when the workflow is finalized')
                     ->atPath('finalizeAfter')
                     ->addViolation();
             }
         } else {
-            if (0 === count($this->getDestUser())) {
+            if (0 === \count($this->getDestUser())) {
                 $context->buildViolation('workflow.The next step must count at least one dest')
                     ->atPath('finalizeAfter')
                     ->addViolation();
diff --git a/src/Bundle/ChillMainBundle/Export/AccompanyingCourseExportHelper.php b/src/Bundle/ChillMainBundle/Export/AccompanyingCourseExportHelper.php
new file mode 100644
index 000000000..e5f2e2564
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Export/AccompanyingCourseExportHelper.php
@@ -0,0 +1,30 @@
+<?php
+
+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 Chill\MainBundle\Export;
+
+use Doctrine\ORM\QueryBuilder;
+
+final readonly class AccompanyingCourseExportHelper
+{
+    public static function addClosingMotiveExclusionClause(QueryBuilder $qb): QueryBuilder
+    {
+        $qb->leftJoin('acp.closingMotive', 'cm')
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('cm.isCanceledAccompanyingPeriod', 'false'),
+                    $qb->expr()->isNull('acp.closingMotive')
+                )
+            );
+
+        return $qb;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php b/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
index 850d29838..28c168893 100644
--- a/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
@@ -11,7 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export;
 
-use Closure;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * Interface for Aggregators.
@@ -21,6 +21,16 @@ use Closure;
  */
 interface AggregatorInterface extends ModifierInterface
 {
+    /**
+     * Add a form to collect data from the user.
+     */
+    public function buildForm(FormBuilderInterface $builder);
+
+    /**
+     * Get the default data, that can be use as "data" for the form.
+     */
+    public function getFormDefaultData(): array;
+
     /**
      * get a callable which will be able to transform the results into
      * viewable and understable string.
@@ -61,13 +71,13 @@ interface AggregatorInterface extends ModifierInterface
      * 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 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`
+     * @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);
+    public function getLabels($key, array $values, mixed $data);
 
     /**
      * give the list of keys the current export added to the queryBuilder in
diff --git a/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php b/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
index 9703a42de..0949b0be0 100644
--- a/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
@@ -11,10 +11,21 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export;
 
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 
 interface DirectExportInterface extends ExportElementInterface
 {
+    /**
+     * Add a form to collect data from the user.
+     */
+    public function buildForm(FormBuilderInterface $builder);
+
+    /**
+     * Get the default data, that can be use as "data" for the form.
+     */
+    public function getFormDefaultData(): array;
+
     /**
      * Generate the export.
      */
diff --git a/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php b/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
index 3b0402f42..49b2500f0 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
@@ -11,19 +11,12 @@ 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).
  */
 interface ExportElementInterface
 {
-    /**
-     * 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).
      *
diff --git a/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php b/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php
index a7a1d58ca..ea9094687 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php
@@ -33,5 +33,5 @@ interface ExportElementValidatedInterface
      *
      * @param mixed $data the data, as returned by the user
      */
-    public function validateForm($data, ExecutionContextInterface $context);
+    public function validateForm(mixed $data, ExecutionContextInterface $context);
 }
diff --git a/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php b/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php
new file mode 100644
index 000000000..4746b6129
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Export/ExportFormHelper.php
@@ -0,0 +1,170 @@
+<?php
+
+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 Chill\MainBundle\Export;
+
+use Chill\MainBundle\Entity\SavedExport;
+use Chill\MainBundle\Form\Type\Export\ExportType;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use Chill\MainBundle\Form\Type\Export\FormatterType;
+use Chill\MainBundle\Form\Type\Export\PickCenterType;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormFactoryInterface;
+
+final readonly class ExportFormHelper
+{
+    public function __construct(
+        private AuthorizationHelperForCurrentUserInterface $authorizationHelper,
+        private ExportManager $exportManager,
+        private FormFactoryInterface $formFactory,
+    ) {}
+
+    public function getDefaultData(string $step, DirectExportInterface|ExportInterface $export, array $options = []): array
+    {
+        return match ($step) {
+            'centers', 'generate_centers' => ['centers' => $this->authorizationHelper->getReachableCenters($export->requiredRole())],
+            'export', 'generate_export' => ['export' => $this->getDefaultDataStepExport($export, $options)],
+            'formatter', 'generate_formatter' => ['formatter' => $this->getDefaultDataStepFormatter($options)],
+            default => throw new \LogicException('step not allowed : '.$step),
+        };
+    }
+
+    private function getDefaultDataStepFormatter(array $options): array
+    {
+        $formatter = $this->exportManager->getFormatter($options['formatter_alias']);
+
+        return $formatter->getFormDefaultData($options['aggregator_aliases']);
+    }
+
+    private function getDefaultDataStepExport(DirectExportInterface|ExportInterface $export, array $options): array
+    {
+        $data = [
+            ExportType::EXPORT_KEY => $export->getFormDefaultData(),
+            ExportType::FILTER_KEY => [],
+            ExportType::AGGREGATOR_KEY => [],
+            ExportType::PICK_FORMATTER_KEY => [],
+        ];
+
+        $filters = $this->exportManager->getFiltersApplyingOn($export, $options['picked_centers']);
+        foreach ($filters as $alias => $filter) {
+            $data[ExportType::FILTER_KEY][$alias] = [
+                FilterType::ENABLED_FIELD => false,
+                'form' => $filter->getFormDefaultData(),
+            ];
+        }
+
+        $aggregators = $this->exportManager
+            ->getAggregatorsApplyingOn($export, $options['picked_centers']);
+        foreach ($aggregators as $alias => $aggregator) {
+            $data[ExportType::AGGREGATOR_KEY][$alias] = [
+                'enabled' => false,
+                'form' => $aggregator->getFormDefaultData(),
+            ];
+        }
+
+        if ($export instanceof ExportInterface) {
+            $allowedFormatters = $this->exportManager
+                ->getFormattersByTypes($export->getAllowedFormattersTypes());
+            $choices = [];
+            foreach (array_keys(iterator_to_array($allowedFormatters)) as $alias) {
+                $choices[] = $alias;
+            }
+
+            $data[ExportType::PICK_FORMATTER_KEY]['alias'] = match (count($choices)) {
+                1 => $choices[0],
+                default => null,
+            };
+        } else {
+            unset($data[ExportType::PICK_FORMATTER_KEY]);
+        }
+
+        return $data;
+    }
+
+    public function savedExportDataToFormData(
+        SavedExport $savedExport,
+        string $step,
+        array $formOptions = [],
+    ): array {
+        return match ($step) {
+            'centers', 'generate_centers' => $this->savedExportDataToFormDataStepCenter($savedExport),
+            'export', 'generate_export' => $this->savedExportDataToFormDataStepExport($savedExport, $formOptions),
+            'formatter', 'generate_formatter' => $this->savedExportDataToFormDataStepFormatter($savedExport, $formOptions),
+            default => throw new \LogicException('this step is not allowed: '.$step),
+        };
+    }
+
+    private function savedExportDataToFormDataStepCenter(
+        SavedExport $savedExport,
+    ): array {
+        $builder = $this->formFactory
+            ->createBuilder(
+                FormType::class,
+                [],
+                [
+                    'csrf_protection' => false,
+                ]
+            );
+
+        $builder->add('centers', PickCenterType::class, [
+            'export_alias' => $savedExport->getExportAlias(),
+        ]);
+        $form = $builder->getForm();
+        $form->submit($savedExport->getOptions()['centers']);
+
+        return $form->getData();
+    }
+
+    private function savedExportDataToFormDataStepExport(
+        SavedExport $savedExport,
+        array $formOptions
+    ): array {
+        $builder = $this->formFactory
+            ->createBuilder(
+                FormType::class,
+                [],
+                [
+                    'csrf_protection' => false,
+                ]
+            );
+
+        $builder->add('export', ExportType::class, [
+            'export_alias' => $savedExport->getExportAlias(), ...$formOptions,
+        ]);
+        $form = $builder->getForm();
+        $form->submit($savedExport->getOptions()['export']);
+
+        return $form->getData();
+    }
+
+    private function savedExportDataToFormDataStepFormatter(
+        SavedExport $savedExport,
+        array $formOptions
+    ): array {
+        $builder = $this->formFactory
+            ->createBuilder(
+                FormType::class,
+                [],
+                [
+                    'csrf_protection' => false,
+                ]
+            );
+
+        $builder->add('formatter', FormatterType::class, [
+            'export_alias' => $savedExport->getExportAlias(), ...$formOptions,
+        ]);
+        $form = $builder->getForm();
+        $form->submit($savedExport->getOptions()['formatter']);
+
+        return $form->getData();
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Export/ExportInterface.php b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
index d4e456ca6..39e265153 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Export;
 
 use Doctrine\ORM\NativeQuery;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * Interface for Export.
@@ -24,10 +25,21 @@ use Doctrine\ORM\QueryBuilder;
  * aggregation, use `ListInterface`.
  *
  * @example Chill\PersonBundle\Export\CountPerson an example of implementation
+ *
  * @template Q of QueryBuilder|NativeQuery
  */
 interface ExportInterface extends ExportElementInterface
 {
+    /**
+     * Add a form to collect data from the user.
+     */
+    public function buildForm(FormBuilderInterface $builder);
+
+    /**
+     * Get the default data, that can be use as "data" for the form.
+     */
+    public function getFormDefaultData(): array;
+
     /**
      * Return which formatter type is allowed for this report.
      *
@@ -82,13 +94,13 @@ interface ExportInterface extends ExportElementInterface
      * 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 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`)
+     * @param mixed   $data   The data from the export's form (as defined in `buildForm`)
      *
-     * @return callable(null|string|int|float|'_header' $value): string|int|\DateTimeInterface 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 (callable(string|int|float|'_header'|null $value): string|int|\DateTimeInterface) 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);
+    public function getLabels($key, array $values, mixed $data);
 
     /**
      * give the list of keys the current export added to the queryBuilder in
@@ -104,8 +116,8 @@ interface ExportInterface extends ExportElementInterface
     /**
      * Return the results of the query builder.
      *
-     * @param Q $query
-     * @param mixed[] $data the data from the export's fomr (added by self::buildForm)
+     * @param Q       $query
+     * @param mixed[] $data  the data from the export's fomr (added by self::buildForm)
      *
      * @return mixed[] an array of results
      */
@@ -131,10 +143,10 @@ interface ExportInterface extends ExportElementInterface
      *
      * 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 $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 Q the query to execute.
+     * @return Q the query to execute
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []);
 
diff --git a/src/Bundle/ChillMainBundle/Export/ExportManager.php b/src/Bundle/ChillMainBundle/Export/ExportManager.php
index f39926083..8cb69bd63 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportManager.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportManager.php
@@ -12,24 +12,13 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Export;
 
 use Chill\MainBundle\Form\Type\Export\ExportType;
-use Chill\MainBundle\Form\Type\Export\PickCenterType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Doctrine\ORM\QueryBuilder;
-use Generator;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
 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
@@ -44,10 +33,6 @@ class ExportManager
      */
     private array $aggregators = [];
 
-    private AuthorizationCheckerInterface $authorizationChecker;
-
-    private AuthorizationHelperInterface $authorizationHelper;
-
     /**
      * Collected Exports, injected by DI.
      *
@@ -69,37 +54,29 @@ class ExportManager
      */
     private array $formatters = [];
 
-    private LoggerInterface $logger;
-
-    /**
-     * @var \Symfony\Component\Security\Core\User\UserInterface
-     */
-    private $user;
+    private readonly string|\Stringable|\Symfony\Component\Security\Core\User\UserInterface $user;
 
     public function __construct(
-        LoggerInterface $logger,
-        AuthorizationCheckerInterface $authorizationChecker,
-        AuthorizationHelperInterface $authorizationHelper,
+        private readonly LoggerInterface $logger,
+        private readonly AuthorizationCheckerInterface $authorizationChecker,
+        private readonly AuthorizationHelperInterface $authorizationHelper,
         TokenStorageInterface $tokenStorage,
         iterable $exports,
         iterable $aggregators,
         iterable $filters
-        //iterable $formatters,
-        //iterable $exportElementProvider
+        // iterable $formatters,
+        // iterable $exportElementProvider
     ) {
-        $this->logger = $logger;
-        $this->authorizationChecker = $authorizationChecker;
-        $this->authorizationHelper = $authorizationHelper;
         $this->user = $tokenStorage->getToken()->getUser();
         $this->exports = iterator_to_array($exports);
         $this->aggregators = iterator_to_array($aggregators);
         $this->filters = iterator_to_array($filters);
         // NOTE: PHP crashes on the next line (exit error code 11). This is desactivated until further investigation
-        //$this->formatters = iterator_to_array($formatters);
+        // $this->formatters = iterator_to_array($formatters);
 
-        //foreach ($exportElementProvider as $prefix => $provider) {
+        // foreach ($exportElementProvider as $prefix => $provider) {
         //    $this->addExportElementsProvider($provider, $prefix);
-        //}
+        // }
     }
 
     /**
@@ -114,11 +91,15 @@ class ExportManager
      *
      * @return FilterInterface[] a \Generator that contains filters. The key is the filter's alias
      */
-    public function &getFiltersApplyingOn(ExportInterface $export, ?array $centers = null)
+    public function &getFiltersApplyingOn(DirectExportInterface|ExportInterface $export, array $centers = null): iterable
     {
+        if ($export instanceof DirectExportInterface) {
+            return;
+        }
+
         foreach ($this->filters as $alias => $filter) {
             if (
-                in_array($filter->applyOn(), $export->supportsModifiers(), true)
+                \in_array($filter->applyOn(), $export->supportsModifiers(), true)
                     && $this->isGrantedForElement($filter, $export, $centers)
             ) {
                 yield $alias => $filter;
@@ -131,17 +112,17 @@ class ExportManager
      *
      * @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
+     * @return iterable<string, AggregatorInterface>|null a \Generator that contains aggretagors. The key is the filter's alias
      */
-    public function &getAggregatorsApplyingOn(ExportInterface $export, ?array $centers = null)
+    public function &getAggregatorsApplyingOn(DirectExportInterface|ExportInterface $export, array $centers = null): ?iterable
     {
-        if ($export instanceof ListInterface) {
+        if ($export instanceof ListInterface || $export instanceof DirectExportInterface) {
             return;
         }
 
         foreach ($this->aggregators as $alias => $aggregator) {
             if (
-                in_array($aggregator->applyOn(), $export->supportsModifiers(), true)
+                \in_array($aggregator->applyOn(), $export->supportsModifiers(), true)
                     && $this->isGrantedForElement($aggregator, $export, $centers)
             ) {
                 yield $alias => $aggregator;
@@ -149,10 +130,10 @@ class ExportManager
         }
     }
 
-    public function addExportElementsProvider(ExportElementsProviderInterface $provider, $prefix)
+    public function addExportElementsProvider(ExportElementsProviderInterface $provider, string $prefix): void
     {
         foreach ($provider->getExportElements() as $suffix => $element) {
-            $alias = $prefix . '_' . $suffix;
+            $alias = $prefix.'_'.$suffix;
 
             if ($element instanceof ExportInterface) {
                 $this->exports[$alias] = $element;
@@ -163,8 +144,7 @@ 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 '.$element::class.' is not an instance of export element');
             }
         }
     }
@@ -173,23 +153,16 @@ class ExportManager
      * add a formatter.
      *
      * @internal used by DI
-     *
-     * @param string $alias
      */
-    public function addFormatter(FormatterInterface $formatter, $alias)
+    public function addFormatter(FormatterInterface $formatter, string $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)
+    public function generate(string $exportAlias, array $pickedCentersData, array $data, array $formatterData): Response
     {
         $export = $this->getExport($exportAlias);
         $centers = $this->getPickedCenters($pickedCentersData);
@@ -210,37 +183,27 @@ class ExportManager
         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`');
+            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
+            // handle filters
             $this->handleFilters($export, $query, $data[ExportType::FILTER_KEY], $centers);
 
-            //handle aggregators
+            // handle aggregators
             $this->handleAggregators($export, $query, $data[ExportType::AGGREGATOR_KEY], $centers);
 
             $this->logger->notice('[export] will execute this qb in export', [
                 'dql' => $query->getDQL(),
             ]);
         } else {
-            throw new UnexpectedValueException('The method `intiateQuery` should return '
-                    . 'a `\\Doctrine\\ORM\\NativeQuery` or a `Doctrine\\ORM\\QueryBuilder` '
-                    . 'object.');
+            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)
-                )
-            );
+            throw new \UnexpectedValueException(sprintf('The result of the export should be an iterable, %s given', \gettype($result)));
         }
 
         /** @var FormatterInterface $formatter */
@@ -275,20 +238,23 @@ class ExportManager
     /**
      * @param string $alias
      *
-     * @throws RuntimeException if the aggregator is not known
-     *
      * @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.");
+        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)
+    /**
+     * @return iterable<string, AggregatorInterface>
+     */
+    public function getAggregators(array $aliases): iterable
     {
         foreach ($aliases as $alias) {
             yield $alias => $this->getAggregator($alias);
@@ -296,14 +262,16 @@ class ExportManager
     }
 
     /**
-     * @return string[] the existing type for known exports
+     * Get the types for known exports.
+     *
+     * @return list<string> the existing type for known exports
      */
-    public function getExistingExportsTypes()
+    public function getExistingExportsTypes(): array
     {
         $existingTypes = [];
 
         foreach ($this->exports as $export) {
-            if (!in_array($export->getType(), $existingTypes, true)) {
+            if (!\in_array($export->getType(), $existingTypes, true)) {
                 $existingTypes[] = $export->getType();
             }
         }
@@ -316,14 +284,12 @@ class ExportManager
      *
      * @param string $alias
      *
-     * @throws RuntimeException
-     *
-     * @return ExportInterface
+     * @throws \RuntimeException
      */
-    public function getExport($alias)
+    public function getExport($alias): DirectExportInterface|ExportInterface
     {
-        if (!array_key_exists($alias, $this->exports)) {
-            throw new RuntimeException("The export with alias {$alias} is not known.");
+        if (!\array_key_exists($alias, $this->exports)) {
+            throw new \RuntimeException("The export with alias {$alias} is not known.");
         }
 
         return $this->exports[$alias];
@@ -334,9 +300,9 @@ class ExportManager
      *
      * @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
+     * @return iterable<string, ExportInterface|DirectExportInterface> an array where export's alias are keys
      */
-    public function getExports($whereUserIsGranted = true)
+    public function getExports($whereUserIsGranted = true): iterable
     {
         foreach ($this->exports as $alias => $export) {
             if ($whereUserIsGranted) {
@@ -352,11 +318,9 @@ 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
+     * @return array<string, array<string, ExportInterface|DirectExportInterface>> where keys are the groups's name and value is an array of exports
      */
-    public function getExportsGrouped($whereUserIsGranted = true): array
+    public function getExportsGrouped(bool $whereUserIsGranted = true): array
     {
         $groups = ['_' => []];
 
@@ -372,16 +336,12 @@ class ExportManager
     }
 
     /**
-     * @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)
+    public function getFilter(string $alias): FilterInterface
     {
-        if (!array_key_exists($alias, $this->filters)) {
-            throw new RuntimeException("The filter with alias {$alias} is not known.");
+        if (!\array_key_exists($alias, $this->filters)) {
+            throw new \RuntimeException("The filter with alias {$alias} is not known.");
         }
 
         return $this->filters[$alias];
@@ -390,19 +350,21 @@ class ExportManager
     /**
      * get all filters.
      *
-     * @param Generator $aliases
+     * @param array<string> $aliases
+     *
+     * @return iterable<string, FilterInterface> $aliases
      */
-    public function getFilters(array $aliases)
+    public function getFilters(array $aliases): iterable
     {
         foreach ($aliases as $alias) {
             yield $alias => $this->getFilter($alias);
         }
     }
 
-    public function getFormatter($alias)
+    public function getFormatter(string $alias): FormatterInterface
     {
-        if (!array_key_exists($alias, $this->formatters)) {
-            throw new RuntimeException("The formatter with alias {$alias} is not known.");
+        if (!\array_key_exists($alias, $this->formatters)) {
+            throw new \RuntimeException("The formatter with alias {$alias} is not known.");
         }
 
         return $this->formatters[$alias];
@@ -412,11 +374,12 @@ class ExportManager
      * 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)
+    public function getFormatterAlias(array $data): ?string
     {
-        if (array_key_exists(ExportType::PICK_FORMATTER_KEY, $data)) {
+        if (\array_key_exists(ExportType::PICK_FORMATTER_KEY, $data)) {
             return $data[ExportType::PICK_FORMATTER_KEY]['alias'];
         }
 
@@ -426,12 +389,12 @@ class ExportManager
     /**
      * Get all formatters which supports one of the given types.
      *
-     * @return Generator
+     * @return iterable<string, FormatterInterface>
      */
-    public function getFormattersByTypes(array $types)
+    public function getFormattersByTypes(array $types): iterable
     {
         foreach ($this->formatters as $alias => $formatter) {
-            if (in_array($formatter->getType(), $types, true)) {
+            if (\in_array($formatter->getType(), $types, true)) {
                 yield $alias => $formatter;
             }
         }
@@ -445,7 +408,7 @@ class ExportManager
      *
      * @return \Chill\MainBundle\Entity\Center[] the picked center
      */
-    public function getPickedCenters(array $data)
+    public function getPickedCenters(array $data): array
     {
         return $data;
     }
@@ -455,9 +418,9 @@ class ExportManager
      *
      * @param array $data the data from the export form
      *
-     * @return string[]
+     * @return list<string>
      */
-    public function getUsedAggregatorsAliases(array $data)
+    public function getUsedAggregatorsAliases(array $data): array
     {
         $aggregators = $this->retrieveUsedAggregators($data[ExportType::AGGREGATOR_KEY]);
 
@@ -467,34 +430,27 @@ class ExportManager
     /**
      * 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
      */
-    public function isGrantedForElement(ExportElementInterface $element, ?ExportElementInterface $export = null, ?array $centers = null)
-    {
+    public function isGrantedForElement(
+        DirectExportInterface|ExportInterface|ModifierInterface $element,
+        DirectExportInterface|ExportInterface $export = null,
+        array $centers = null
+    ): bool {
         if ($element instanceof ExportInterface || $element instanceof DirectExportInterface) {
             $role = $element->requiredRole();
-        } elseif ($element instanceof ModifierInterface) {
+        } else {
             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');
+                    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.');
         }
 
-        if (null === $centers || [] !== $centers) {
-            // we want to try if at least one center is reachabler
+        if (null === $centers || [] === $centers) {
+            // we want to try if at least one center is reachable
             return [] !== $this->authorizationHelper->getReachableCenters(
                 $this->user,
                 $role
@@ -503,10 +459,10 @@ class ExportManager
 
         foreach ($centers as $center) {
             if (false === $this->authorizationChecker->isGranted($role, $center)) {
-                //debugging
+                // debugging
                 $this->logger->debug('user has no access to element', [
                     'method' => __METHOD__,
-                    'type' => get_class($element),
+                    'type' => $element::class,
                     'center' => $center->getName(),
                     'role' => $role,
                 ]);
@@ -548,18 +504,21 @@ class ExportManager
      * Check for acl. If an user is not authorized to see an aggregator, throw an
      * UnauthorizedException.
      *
-     * @param type $data
      * @throw UnauthorizedHttpException if the user is not authorized
      */
     private function handleAggregators(
         ExportInterface $export,
         QueryBuilder $qb,
-        $data,
+        array $data,
         array $center
     ) {
         $aggregators = $this->retrieveUsedAggregators($data);
 
         foreach ($aggregators as $alias => $aggregator) {
+            if (false === $this->isGrantedForElement($aggregator, $export, $center)) {
+                throw new UnauthorizedHttpException('You are not authorized to use the aggregator'.$aggregator->getTitle());
+            }
+
             $formData = $data[$alias];
             $aggregator->alterQuery($qb, $formData['form']);
         }
@@ -570,27 +529,27 @@ class ExportManager
      *
      * This function check the acl.
      *
-     * @param mixed $data the data under the initial 'filters' data
+     * @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,
+        mixed $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());
+            if (false === $this->isGrantedForElement($filter, $export, $centers)) {
+                throw new UnauthorizedHttpException('You are not authorized to use the filter '.$filter->getTitle());
             }
 
             $formData = $data[$alias];
 
-            $this->logger->debug('alter query by filter ' . $alias, [
+            $this->logger->debug('alter query by filter '.$alias, [
                 'class' => self::class, 'function' => __FUNCTION__,
             ]);
             $filter->alterQuery($qb, $formData['form']);
@@ -598,11 +557,9 @@ class ExportManager
     }
 
     /**
-     * @param mixed $data
-     *
-     * @return AggregatorInterface[]
+     * @return iterable<string, AggregatorInterface>
      */
-    private function retrieveUsedAggregators($data)
+    private function retrieveUsedAggregators(mixed $data): iterable
     {
         if (null === $data) {
             return [];
@@ -616,11 +573,9 @@ class ExportManager
     }
 
     /**
-     * @param mixed $data
-     *
      * @return string[]
      */
-    private function retrieveUsedAggregatorsType($data)
+    private function retrieveUsedAggregatorsType(mixed $data)
     {
         if (null === $data) {
             return [];
@@ -629,7 +584,7 @@ class ExportManager
         $usedTypes = [];
 
         foreach ($this->retrieveUsedAggregators($data) as $alias => $aggregator) {
-            if (!in_array($aggregator->applyOn(), $usedTypes, true)) {
+            if (!\in_array($aggregator->applyOn(), $usedTypes, true)) {
                 $usedTypes[] = $aggregator->applyOn();
             }
         }
@@ -638,9 +593,9 @@ class ExportManager
     }
 
     /**
-     * @param type $data the data from the filter key of the ExportType
+     * @param mixed $data the data from the filter key of the ExportType
      */
-    private function retrieveUsedFilters($data)
+    private function retrieveUsedFilters(mixed $data): iterable
     {
         if (null === $data) {
             return [];
@@ -660,7 +615,7 @@ class ExportManager
      *
      * @return array an array with types
      */
-    private function retrieveUsedFiltersType($data)
+    private function retrieveUsedFiltersType(mixed $data): iterable
     {
         if (null === $data) {
             return [];
@@ -672,7 +627,7 @@ class ExportManager
             if (true === $filterData['enabled']) {
                 $filter = $this->getFilter($alias);
 
-                if (!in_array($filter->applyOn(), $usedTypes, true)) {
+                if (!\in_array($filter->applyOn(), $usedTypes, true)) {
                     $usedTypes[] = $filter->applyOn();
                 }
             }
@@ -684,11 +639,9 @@ class ExportManager
     /**
      * parse the data to retrieve the used filters and aggregators.
      *
-     * @param mixed $data
-     *
      * @return string[]
      */
-    private function retrieveUsedModifiers($data)
+    private function retrieveUsedModifiers(mixed $data)
     {
         if (null === $data) {
             return [];
@@ -700,7 +653,7 @@ class ExportManager
         );
 
         $this->logger->debug(
-            'Required types are ' . implode(', ', $usedTypes),
+            'Required types are '.implode(', ', $usedTypes),
             ['class' => self::class, 'function' => __FUNCTION__]
         );
 
diff --git a/src/Bundle/ChillMainBundle/Export/FilterInterface.php b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
index 5e398c30d..d02b9843e 100644
--- a/src/Bundle/ChillMainBundle/Export/FilterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export;
 
+use Symfony\Component\Form\FormBuilderInterface;
+
 /**
  * Interface for filters.
  *
@@ -23,6 +25,16 @@ interface FilterInterface extends ModifierInterface
 {
     public const STRING_FORMAT = 'string';
 
+    /**
+     * Add a form to collect data from the user.
+     */
+    public function buildForm(FormBuilderInterface $builder);
+
+    /**
+     * Get the default data, that can be use as "data" for the form.
+     */
+    public function getFormDefaultData(): array;
+
     /**
      * Describe the filtering action.
      *
@@ -48,7 +60,7 @@ interface FilterInterface extends ModifierInterface
      *
      * Example: `array('my string with %parameter%', ['%parameter%' => 'good news'], 'mydomain', 'mylocale')`
      *
-     * @param array $data
+     * @param array  $data
      * @param string $format the format
      *
      * @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
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
index c8b20a88b..ee7b5d5c3 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
@@ -13,25 +13,18 @@ namespace Chill\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Export\FormatterInterface;
-use LogicException;
-use RuntimeException;
 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\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.
  *
- * @deprecated this formatter is not used any more.
+ * @deprecated this formatter is not used any more
  */
 class CSVFormatter implements FormatterInterface
 {
@@ -56,25 +49,20 @@ class CSVFormatter implements FormatterInterface
 
     protected $result;
 
-    protected TranslatorInterface $translator;
-
     public function __construct(
-        TranslatorInterface $translator,
+        protected TranslatorInterface $translator,
         ExportManager $manager
     ) {
-        $this->translator = $translator;
         $this->exportManager = $manager;
     }
 
     /**
      * @uses appendAggregatorForm
-     *
-     * @param mixed $exportAlias
      */
     public function buildForm(FormBuilderInterface $builder, $exportAlias, array $aggregatorAliases)
     {
         $aggregators = $this->exportManager->getAggregators($aggregatorAliases);
-        $nb = count($aggregatorAliases);
+        $nb = \count($aggregatorAliases);
 
         foreach ($aggregators as $alias => $aggregator) {
             $builderAggregator = $builder->create($alias, FormType::class, [
@@ -86,6 +74,11 @@ class CSVFormatter implements FormatterInterface
         }
     }
 
+    public function getFormDefaultData(array $aggregatorAliases): array
+    {
+        return [];
+    }
+
     public function gatherFiltersDescriptions()
     {
         $descriptions = [];
@@ -99,7 +92,7 @@ class CSVFormatter implements FormatterInterface
                 continue;
             }
 
-            if (is_array($statement)) {
+            if (\is_array($statement)) {
                 $descriptions[] = $this->translator->trans(
                     $statement[0],
                     $statement[1],
@@ -140,7 +133,7 @@ class CSVFormatter implements FormatterInterface
         $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($this->generateContent());
 
@@ -170,10 +163,8 @@ class CSVFormatter implements FormatterInterface
             // 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');
+                    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];
@@ -197,10 +188,8 @@ class CSVFormatter implements FormatterInterface
 
         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');
+                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];
@@ -218,9 +207,9 @@ class CSVFormatter implements FormatterInterface
     protected function generateContent()
     {
         $line = null;
-        $rowKeysNb = count($this->getRowHeaders());
-        $columnKeysNb = count($this->getColumnHeaders());
-        $resultsKeysNb = count($this->export->getQueryKeys($this->exportData));
+        $rowKeysNb = \count($this->getRowHeaders());
+        $columnKeysNb = \count($this->getColumnHeaders());
+        $resultsKeysNb = \count($this->export->getQueryKeys($this->exportData));
         $results = $this->getOrderedResults();
         /** @var string[] $columnHeaders the column headers associations */
         $columnHeaders = [];
@@ -231,9 +220,9 @@ class CSVFormatter implements FormatterInterface
         // create a file pointer connected to the output stream
         $output = fopen('php://output', 'wb');
 
-        //title
+        // title
         fputcsv($output, [$this->translator->trans($this->export->getTitle())]);
-        //blank line
+        // blank line
         fputcsv($output, ['']);
 
         // add filtering description
@@ -245,32 +234,32 @@ class CSVFormatter implements FormatterInterface
 
         // iterate on result to : 1. populate row headers, 2. populate column headers, 3. add result
         foreach ($results as $row) {
-            $rowHeaders = array_slice($row, 0, $rowKeysNb);
+            $rowHeaders = \array_slice($row, 0, $rowKeysNb);
 
-            //first line : we create line and adding them row headers
+            // first line : we create line and adding them row headers
             if (!isset($line)) {
-                $line = array_slice($row, 0, $rowKeysNb);
+                $line = \array_slice($row, 0, $rowKeysNb);
             }
 
             // do we have to create a new line ? if the rows are equals, continue on the line, else create a next line
-            if (array_slice($line, 0, $rowKeysNb) !== $rowHeaders) {
+            if (\array_slice($line, 0, $rowKeysNb) !== $rowHeaders) {
                 $contentData[] = $line;
-                $line = array_slice($row, 0, $rowKeysNb);
+                $line = \array_slice($row, 0, $rowKeysNb);
             }
 
             // add the column headers
             /** @var string[] $columns the column for this row */
-            $columns = array_slice($row, $rowKeysNb, $columnKeysNb);
+            $columns = \array_slice($row, $rowKeysNb, $columnKeysNb);
             $columnPosition = $this->findColumnPosition($columnHeaders, $columns);
 
-            //fill with blank at the position given by the columnPosition + nbRowHeaders
+            // fill with blank at the position given by the columnPosition + nbRowHeaders
             for ($i = 0; $i < $columnPosition; ++$i) {
                 if (!isset($line[$rowKeysNb + $i])) {
                     $line[$rowKeysNb + $i] = '';
                 }
             }
 
-            $resultData = array_slice($row, $resultsKeysNb * -1);
+            $resultData = \array_slice($row, $resultsKeysNb * -1);
 
             foreach ($resultData as $data) {
                 $line[] = $data;
@@ -280,7 +269,7 @@ class CSVFormatter implements FormatterInterface
         // we add  the last line
         $contentData[] = $line;
 
-        //column title headers
+        // column title headers
         for ($i = 0; $i < $columnKeysNb; ++$i) {
             $line = array_fill(0, $rowKeysNb, '');
 
@@ -291,22 +280,22 @@ class CSVFormatter implements FormatterInterface
             $content[] = $line;
         }
 
-        //row title headers
+        // row title headers
         $headerLine = [];
 
         foreach ($this->getRowHeaders() as $headerKey) {
-            $headerLine[] = array_key_exists('_header', $this->labels[$headerKey]) ?
+            $headerLine[] = \array_key_exists('_header', $this->labels[$headerKey]) ?
                     $this->labels[$headerKey]['_header'] : '';
         }
 
         foreach ($this->export->getQueryKeys($this->exportData) as $key) {
-            $headerLine[] = array_key_exists('_header', $this->labels[$key]) ?
+            $headerLine[] = \array_key_exists('_header', $this->labels[$key]) ?
                     $this->labels[$key]['_header'] : '';
         }
         fputcsv($output, $headerLine);
-        unset($headerLine); //free memory
+        unset($headerLine); // free memory
 
-        //generate CSV
+        // generate CSV
         foreach ($content as $line) {
             fputcsv($output, $line);
         }
@@ -388,7 +377,7 @@ class CSVFormatter implements FormatterInterface
             ++$i;
         }
 
-        //we didn't find it, adding the column
+        // we didn't find it, adding the column
         $columnHeaders[] = $columnToFind;
 
         return $i++;
@@ -408,12 +397,12 @@ class CSVFormatter implements FormatterInterface
             $line = [];
 
             foreach ($headers as $key) {
-                $line[] = call_user_func($labels[$key], $row[$key]);
+                $line[] = \call_user_func($labels[$key], $row[$key]);
             }
 
-            //append result
+            // append result
             foreach ($resultsKeys as $key) {
-                $line[] = call_user_func($labels[$key], $row[$key]);
+                $line[] = \call_user_func($labels[$key], $row[$key]);
             }
 
             $r[] = $line;
@@ -427,19 +416,17 @@ class CSVFormatter implements FormatterInterface
     /**
      * @param string $position may be 'c' (column) or 'r' (row)
      *
-     * @throws RuntimeException
-     *
      * @return string[]
+     *
+     * @throws \RuntimeException
      */
     private function getPositionnalHeaders($position)
     {
         $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');
+            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');
             }
 
             $aggregator = $this->aggregators[$alias];
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
index 7dc6f120f..97a37d455 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
@@ -13,18 +13,11 @@ namespace Chill\MainBundle\Export\Formatter;
 
 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\Contracts\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
 
@@ -85,10 +78,14 @@ class CSVListFormatter implements FormatterInterface
             'expanded' => true,
             'multiple' => false,
             'label' => 'Add a number on first column',
-            'data' => true,
         ]);
     }
 
+    public function getFormDefaultData(array $aggregatorAliases): array
+    {
+        return ['numerotation' => true];
+    }
+
     public function getName()
     {
         return 'CSV vertical list';
@@ -97,11 +94,11 @@ class CSVListFormatter implements FormatterInterface
     /**
      * 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
+     * @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
      */
@@ -146,7 +143,7 @@ class CSVListFormatter implements FormatterInterface
         $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);
 
@@ -164,9 +161,9 @@ class CSVListFormatter implements FormatterInterface
      * @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)
     {
@@ -174,15 +171,8 @@ class CSVListFormatter implements FormatterInterface
             $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);
@@ -199,9 +189,7 @@ class CSVListFormatter implements FormatterInterface
 
         foreach ($keys as $key) {
             // get an array with all values for this key if possible
-            $values = array_map(static function ($v) use ($key) {
-                return $v[$key];
-            }, $this->result);
+            $values = \array_map(static fn ($v) => $v[$key], $this->result);
             // store the label in the labelsCache property
             $this->labelsCache[$key] = $export->getLabels($key, $values, $this->exportData);
         }
@@ -216,7 +204,7 @@ class CSVListFormatter implements FormatterInterface
     {
         $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] : [];
+        $first_row = \count($this->result) > 0 ? $this->result[0] : [];
         $header_line = [];
 
         if (true === $this->formatterData['numerotation']) {
@@ -229,7 +217,7 @@ class CSVListFormatter implements FormatterInterface
             );
         }
 
-        if (count($header_line) > 0) {
+        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 b062a9c3c..02b7409bc 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
@@ -13,15 +13,11 @@ namespace Chill\MainBundle\Export\Formatter;
 
 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\Contracts\Translation\TranslatorInterface;
 
-use function array_map;
-use function count;
-
 /**
  * Create a CSV List for the export where the header are printed on the
  * first column, and the result goes from left to right.
@@ -84,6 +80,11 @@ class CSVPivotedListFormatter implements FormatterInterface
         ]);
     }
 
+    public function getFormDefaultData(array $aggregatorAliases): array
+    {
+        return ['numerotation' => true];
+    }
+
     public function getName()
     {
         return 'CSV horizontal list';
@@ -92,11 +93,11 @@ class CSVPivotedListFormatter implements FormatterInterface
     /**
      * 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
+     * @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
      */
@@ -134,7 +135,7 @@ class CSVPivotedListFormatter implements FormatterInterface
             ++$i;
         }
 
-        //adding the lines to the csv output
+        // adding the lines to the csv output
         foreach ($lines as $line) {
             fputcsv($output, $line);
         }
@@ -163,9 +164,9 @@ class CSVPivotedListFormatter implements FormatterInterface
      * @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)
     {
@@ -187,9 +188,7 @@ class CSVPivotedListFormatter implements FormatterInterface
 
         foreach ($keys as $key) {
             // get an array with all values for this key if possible
-            $values = array_map(static function ($v) use ($key) {
-                return $v[$key];
-            }, $this->result);
+            $values = \array_map(static fn ($v) => $v[$key], $this->result);
             // store the label in the labelsCache property
             $this->labelsCache[$key] = $export->getLabels($key, $values, $this->exportData);
         }
@@ -204,7 +203,7 @@ class CSVPivotedListFormatter implements FormatterInterface
     {
         $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] : [];
+        $first_row = \count($this->result) > 0 ? $this->result[0] : [];
         $header_line = [];
 
         if (true === $this->formatterData['numerotation']) {
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
index 6b77e5b2b..4147c0016 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
@@ -13,7 +13,6 @@ 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;
@@ -21,19 +20,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\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
 {
     /**
@@ -60,7 +46,7 @@ class SpreadSheetFormatter implements FormatterInterface
      *
      * @var type
      */
-    //protected $aggregators;
+    // protected $aggregators;
 
     /**
      * array containing value of export form.
@@ -104,7 +90,7 @@ class SpreadSheetFormatter implements FormatterInterface
      *
      * @var array
      */
-    //protected $labels;
+    // protected $labels;
 
     /**
      * temporary file to store spreadsheet.
@@ -126,17 +112,13 @@ class SpreadSheetFormatter implements FormatterInterface
      * The array's keys are the keys in the raw result, and
      * values are the callable which will transform the raw result to
      * displayable result.
-     *
-     * @var array
      */
-    private $cacheDisplayableResult;
+    private ?array $cacheDisplayableResult = null;
 
     /**
      * Whethe `cacheDisplayableResult` is initialized or not.
-     *
-     * @var bool
      */
-    private $cacheDisplayableResultIsInitialized = false;
+    private bool $cacheDisplayableResultIsInitialized = false;
 
     public function __construct(TranslatorInterface $translatorInterface, ExportManager $exportManager)
     {
@@ -161,7 +143,7 @@ class SpreadSheetFormatter implements FormatterInterface
 
         // ordering aggregators
         $aggregators = $this->exportManager->getAggregators($aggregatorAliases);
-        $nb = count($aggregatorAliases);
+        $nb = \count($aggregatorAliases);
 
         foreach ($aggregators as $alias => $aggregator) {
             $builderAggregator = $builder->create($alias, FormType::class, [
@@ -173,7 +155,19 @@ class SpreadSheetFormatter implements FormatterInterface
         }
     }
 
-    public function getName()
+    public function getFormDefaultData(array $aggregatorAliases): array
+    {
+        $data = ['format' => 'xlsx'];
+
+        $aggregators = iterator_to_array($this->exportManager->getAggregators($aggregatorAliases));
+        foreach (array_keys($aggregators) as $index => $alias) {
+            $data[$alias] = ['order' => $index + 1];
+        }
+
+        return $data;
+    }
+
+    public function getName(): string
     {
         return 'SpreadSheet (xlsx, ods)';
     }
@@ -185,7 +179,7 @@ class SpreadSheetFormatter implements FormatterInterface
         array $exportData,
         array $filtersData,
         array $aggregatorsData
-    ) {
+    ): Response {
         // store all data when the process is initiated
         $this->result = $result;
         $this->formatterData = $formatterData;
@@ -204,15 +198,15 @@ class SpreadSheetFormatter implements FormatterInterface
             $this->getContentType($this->formatterData['format'])
         );
 
-        $this->tempfile = tempnam(sys_get_temp_dir(), '');
+        $this->tempfile = \tempnam(\sys_get_temp_dir(), '');
         $this->generateContent();
 
-        $f = fopen($this->tempfile, 'rb');
-        $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;
     }
@@ -230,11 +224,11 @@ class SpreadSheetFormatter implements FormatterInterface
         $worksheet->fromArray(
             $sortedResults,
             null,
-            'A' . $line,
+            'A'.$line,
             true
         );
 
-        return $line + count($sortedResults) + 1;
+        return $line + \count($sortedResults) + 1;
     }
 
     /**
@@ -252,7 +246,7 @@ class SpreadSheetFormatter implements FormatterInterface
             $filter = $this->exportManager->getFilter($alias);
             $description = $filter->describeAction($data, 'string');
 
-            if (is_array($description)) {
+            if (\is_array($description)) {
                 $description = $this->translator
                     ->trans(
                         $description[0],
@@ -260,7 +254,7 @@ class SpreadSheetFormatter implements FormatterInterface
                     );
             }
 
-            $worksheet->setCellValue('A' . $line, $description);
+            $worksheet->setCellValue('A'.$line, $description);
             ++$line;
         }
 
@@ -295,7 +289,7 @@ class SpreadSheetFormatter implements FormatterInterface
         $worksheet->fromArray(
             $displayables,
             null,
-            'A' . $line
+            'A'.$line
         );
 
         return $line + 1;
@@ -347,27 +341,12 @@ class SpreadSheetFormatter implements FormatterInterface
 
         $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 = match ($this->formatterData['format']) {
+            'ods' => \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Ods'),
+            'xlsx' => \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Xlsx'),
+            'csv' => \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Csv'),
+            default => throw new \LogicException(),
+        };
 
         $writer->save($this->tempfile);
     }
@@ -390,7 +369,7 @@ class SpreadSheetFormatter implements FormatterInterface
             $aggregator = $this->exportManager->getAggregator($alias);
             $aggregatorsKeys = $aggregator->getQueryKeys($data);
             // append the keys from aggregator to the $keys existing array
-            $keys = array_merge($keys, $aggregatorsKeys);
+            $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;
@@ -427,7 +406,7 @@ class SpreadSheetFormatter implements FormatterInterface
 
             case 'xlsx':
                 return 'application/vnd.openxmlformats-officedocument.'
-                . 'spreadsheetml.sheet';
+                .'spreadsheetml.sheet';
         }
     }
 
@@ -435,26 +414,29 @@ class SpreadSheetFormatter implements FormatterInterface
      * Get the displayable result.
      *
      * @param string $key
-     * @param string $value
      *
      * @return string
      */
-    protected function getDisplayableResult($key, $value)
+    protected function getDisplayableResult($key, mixed $value)
     {
         if (false === $this->cacheDisplayableResultIsInitialized) {
             $this->initializeCache($key);
         }
 
-        $value = null === $value ? '' : $value;
+        $value ??= '';
 
-        return call_user_func($this->cacheDisplayableResult[$key], $value);
+        return \call_user_func($this->cacheDisplayableResult[$key], $value);
     }
 
     protected function getTitle()
     {
         $title = $this->translator->trans($this->export->getTitle());
 
-        return substr($title, 0, 30) . '…';
+        if (30 < strlen($title)) {
+            return substr($title, 0, 30).'…';
+        }
+
+        return $title;
     }
 
     protected function initializeCache($key)
@@ -503,7 +485,7 @@ class SpreadSheetFormatter implements FormatterInterface
                 $this->cacheDisplayableResult[$key] = $element->getLabels($key, ['_header'], $data);
             } else {
                 $this->cacheDisplayableResult[$key] =
-                    $element->getLabels($key, array_unique($allValues[$key]), $data);
+                    $element->getLabels($key, \array_unique($allValues[$key]), $data);
             }
         }
 
@@ -552,9 +534,9 @@ 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) {
+        $sortedResult = \array_map(function ($row) use ($globalKeys) {
             $newRow = [];
 
             foreach ($globalKeys as $key) {
@@ -564,7 +546,7 @@ class SpreadSheetFormatter implements FormatterInterface
             return $newRow;
         }, $this->result);
 
-        array_multisort($sortedResult);
+        \array_multisort($sortedResult);
 
         return [$sortedResult, $exportKeys, $aggregatorKeys, $globalKeys];
     }
@@ -574,10 +556,8 @@ class SpreadSheetFormatter implements FormatterInterface
      *
      * This form allow to choose the aggregator position (row or column) and
      * the ordering
-     *
-     * @param string $nbAggregators
      */
-    private function appendAggregatorForm(FormBuilderInterface $builder, $nbAggregators)
+    private function appendAggregatorForm(FormBuilderInterface $builder, int $nbAggregators): void
     {
         $builder->add('order', ChoiceType::class, [
             'choices' => array_combine(
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
index 0e5e339ea..e91095afd 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
@@ -13,29 +13,15 @@ namespace Chill\MainBundle\Export\Formatter;
 
 use Chill\MainBundle\Export\ExportManager;
 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 RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-
 use Symfony\Contracts\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
 
@@ -104,10 +90,14 @@ class SpreadsheetListFormatter implements FormatterInterface
                 'expanded' => true,
                 'multiple' => false,
                 'label' => 'Add a number on first column',
-                'data' => true,
             ]);
     }
 
+    public function getFormDefaultData(array $aggregatorAliases): array
+    {
+        return ['numerotation' => true, 'format' => 'xlsx'];
+    }
+
     public function getName()
     {
         return 'Spreadsheet list formatter (.xlsx, .ods)';
@@ -116,11 +106,11 @@ class SpreadsheetListFormatter implements FormatterInterface
     /**
      * 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
+     * @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
      */
@@ -146,20 +136,20 @@ class SpreadsheetListFormatter implements FormatterInterface
 
         foreach ($result as $row) {
             if (true === $this->formatterData['numerotation']) {
-                $worksheet->setCellValue('A' . ($i + 1), (string) $i);
+                $worksheet->setCellValue('A'.($i + 1), (string) $i);
             }
 
             $a = $this->formatterData['numerotation'] ? 'B' : 'A';
 
             foreach ($row as $key => $value) {
-                $row = $a . ($i + 1);
+                $row = $a.($i + 1);
 
                 $formattedValue = $this->getLabel($key, $value);
 
-                if ($formattedValue instanceof DateTimeInterface) {
+                if ($formattedValue instanceof \DateTimeInterface) {
                     $worksheet->setCellValue($row, Date::PHPToExcel($formattedValue));
 
-                    if ($formattedValue->format('His') === '000000') {
+                    if ('000000' === $formattedValue->format('His')) {
                         $worksheet->getStyle($row)
                             ->getNumberFormat()
                             ->setFormatCode(NumberFormat::FORMAT_DATE_DDMMYYYY);
@@ -187,7 +177,7 @@ class SpreadsheetListFormatter implements FormatterInterface
             case 'xlsx':
                 $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Xlsx');
                 $contentType = 'application/vnd.openxmlformats-officedocument.'
-                    . 'spreadsheetml.sheet';
+                    .'spreadsheetml.sheet';
 
                 break;
 
@@ -200,22 +190,21 @@ class SpreadsheetListFormatter implements FormatterInterface
             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, 'rb');
-        $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;
     }
@@ -231,9 +220,9 @@ class SpreadsheetListFormatter implements FormatterInterface
      * @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)
     {
@@ -241,15 +230,8 @@ class SpreadsheetListFormatter implements FormatterInterface
             $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);
@@ -266,9 +248,9 @@ class SpreadsheetListFormatter implements FormatterInterface
 
         foreach ($keys as $key) {
             // get an array with all values for this key if possible
-            $values = array_map(static function ($v) use ($key) {
-                if (!array_key_exists($key, $v)) {
-                    throw new RuntimeException(sprintf('This key does not exists: %s. Available keys are %s', $key, implode(', ', array_keys($v))));
+            $values = \array_map(static function ($v) use ($key) {
+                if (!\array_key_exists($key, $v)) {
+                    throw new \RuntimeException(sprintf('This key does not exists: %s. Available keys are %s', $key, \implode(', ', \array_keys($v))));
                 }
 
                 return $v[$key];
@@ -285,7 +267,7 @@ class SpreadsheetListFormatter implements FormatterInterface
     {
         $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] : [];
+        $first_row = \count($this->result) > 0 ? $this->result[0] : [];
         $header_line = [];
 
         if (true === $this->formatterData['numerotation']) {
@@ -298,7 +280,7 @@ class SpreadsheetListFormatter implements FormatterInterface
             );
         }
 
-        if (count($header_line) > 0) {
+        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 1f9df225a..11316ea4b 100644
--- a/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
@@ -25,8 +25,8 @@ interface FormatterInterface
      *
      * @uses appendAggregatorForm
      *
-     * @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
+     * @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,
@@ -34,16 +34,21 @@ interface FormatterInterface
         array $aggregatorAliases
     );
 
+    /**
+     * get the default data for the form build by buildForm.
+     */
+    public function getFormDefaultData(array $aggregatorAliases): array;
+
     public function getName();
 
     /**
      * 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
+     * @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
      */
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/AggregateStringHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/AggregateStringHelper.php
index 6266ce86f..f1f5dab90 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/AggregateStringHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/AggregateStringHelper.php
@@ -29,7 +29,7 @@ class AggregateStringHelper
 
             return implode(
                 '|',
-                json_decode($value, true)
+                json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR)
             );
         };
     }
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php
index 1c2c99083..0fad30b4f 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php
@@ -11,19 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export\Helper;
 
-use DateTime;
-use DateTimeInterface;
-use Exception;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DateTimeHelper
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function getLabel($header): callable
     {
@@ -36,23 +28,22 @@ class DateTimeHelper
                 return '';
             }
 
-            if ($value instanceof DateTimeInterface) {
+            if ($value instanceof \DateTimeInterface) {
                 return $value;
             }
 
             // warning: won't work with DateTimeImmutable as we reset time a few lines later
-            $date = DateTime::createFromFormat('Y-m-d', $value);
+            $date = \DateTime::createFromFormat('Y-m-d', $value);
             $hasTime = false;
 
             if (false === $date) {
-                $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
                 $hasTime = true;
             }
 
             // check that the creation could occurs.
             if (false === $date) {
-                throw new Exception(sprintf('The value %s could '
-                    . 'not be converted to %s', $value, DateTime::class));
+                throw new \Exception(sprintf('The value %s could not be converted to %s', $value, \DateTime::class));
             }
 
             if (!$hasTime) {
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
index 9077b501a..9161316e7 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
@@ -18,11 +18,6 @@ use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\AddressRender;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function strlen;
 
 /**
  * Helps to load addresses and format them in list.
@@ -32,25 +27,25 @@ class ExportAddressHelper
     /**
      * Compute all the F_* constants.
      */
-    public const F_ALL =
+    final public const F_ALL =
         self::F_ATTRIBUTES | self::F_BUILDING | self::F_COUNTRY |
         self::F_GEOM | self::F_POSTAL_CODE | self::F_STREET | self::F_GEOGRAPHICAL_UNITS;
 
-    public const F_AS_STRING = 0b00010000;
+    final public const F_AS_STRING = 0b00010000;
 
-    public const F_ATTRIBUTES = 0b01000000;
+    final public const F_ATTRIBUTES = 0b01000000;
 
-    public const F_BUILDING = 0b00001000;
+    final public const F_BUILDING = 0b00001000;
 
-    public const F_COUNTRY = 0b00000001;
+    final public const F_COUNTRY = 0b00000001;
 
-    public const F_GEOGRAPHICAL_UNITS = 0b1000000000;
+    final public const F_GEOGRAPHICAL_UNITS = 0b1000000000;
 
-    public const F_GEOM = 0b00100000;
+    final public const F_GEOM = 0b00100000;
 
-    public const F_POSTAL_CODE = 0b00000010;
+    final public const F_POSTAL_CODE = 0b00000010;
 
-    public const F_STREET = 0b00000100;
+    final public const F_STREET = 0b00000100;
 
     private const ALL = [
         'country' => self::F_COUNTRY,
@@ -74,14 +69,6 @@ class ExportAddressHelper
         'geographical_units' => ['_unit_names', '_unit_refs'],
     ];
 
-    private AddressRender $addressRender;
-
-    private AddressRepository $addressRepository;
-
-    private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
     /**
      * @var array<string, string, GeographicalUnitLayer>>|null
      */
@@ -92,17 +79,7 @@ class ExportAddressHelper
      */
     private ?array $unitRefsKeysCache = [];
 
-    public function __construct(
-        AddressRender $addressRender,
-        AddressRepository $addressRepository,
-        GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->addressRepository = $addressRepository;
-        $this->geographicalUnitLayerRepository = $geographicalUnitLayerRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->addressRender = $addressRender;
-    }
+    public function __construct(private readonly AddressRender $addressRender, private readonly AddressRepository $addressRepository, private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function addSelectClauses(int $params, QueryBuilder $queryBuilder, $entityName = 'address', $prefix = 'add')
     {
@@ -134,8 +111,8 @@ class ExportAddressHelper
                         case 'postcode_code':
                             $postCodeAlias = sprintf('%spostcode_t', $prefix);
 
-                            if (!in_array($postCodeAlias, $queryBuilder->getAllAliases(), true)) {
-                                $queryBuilder->leftJoin($entityName . '.postcode', $postCodeAlias);
+                            if (!\in_array($postCodeAlias, $queryBuilder->getAllAliases(), true)) {
+                                $queryBuilder->leftJoin($entityName.'.postcode', $postCodeAlias);
                             }
 
                             if ('postcode_name' === $field) {
@@ -152,7 +129,7 @@ class ExportAddressHelper
 
                             $countryAlias = sprintf('%scountry_t', $prefix);
 
-                            if (!in_array($countryAlias, $queryBuilder->getAllAliases(), true)) {
+                            if (!\in_array($countryAlias, $queryBuilder->getAllAliases(), true)) {
                                 $queryBuilder->leftJoin(sprintf('%s.country', $postCodeAlias), $countryAlias);
                             }
 
@@ -229,7 +206,7 @@ class ExportAddressHelper
                             break;
 
                         default:
-                            throw new LogicException(sprintf('This key is not supported: %s, field %s', $key, $field));
+                            throw new \LogicException(sprintf('This key is not supported: %s, field %s', $key, $field));
                     }
                 }
             }
@@ -249,7 +226,7 @@ class ExportAddressHelper
             if (($params & $bitmask) === $bitmask) {
                 if ('geographical_units' === $key) {
                     // geographical unit generate keys dynamically, depending on layers
-                    $prefixes = array_merge($prefixes, array_keys($this->generateKeysForUnitsNames($prefix)), array_keys($this->generateKeysForUnitsRefs($prefix)));
+                    $prefixes = [...$prefixes, ...array_keys($this->generateKeysForUnitsNames($prefix)), ...array_keys($this->generateKeysForUnitsRefs($prefix))];
 
                     continue;
                 }
@@ -257,9 +234,7 @@ class ExportAddressHelper
                 $prefixes = array_merge(
                     $prefixes,
                     array_map(
-                        static function ($item) use ($prefix) {
-                            return $prefix . $item;
-                        },
+                        static fn ($item) => $prefix.$item,
                         self::COLUMN_MAPPING[$key]
                     )
                 );
@@ -271,7 +246,7 @@ class ExportAddressHelper
 
     public function getLabel($key, array $values, $data, string $prefix = '', string $translationPrefix = 'export.address_helper.'): callable
     {
-        $sanitizedKey = substr($key, strlen($prefix));
+        $sanitizedKey = substr((string) $key, \strlen($prefix));
 
         switch ($sanitizedKey) {
             case 'id':
@@ -290,7 +265,7 @@ class ExportAddressHelper
             case 'postcode_name':
                 return static function ($value) use ($sanitizedKey, $translationPrefix) {
                     if ('_header' === $value) {
-                        return $translationPrefix . $sanitizedKey;
+                        return $translationPrefix.$sanitizedKey;
                     }
 
                     if (null === $value) {
@@ -301,23 +276,23 @@ class ExportAddressHelper
                 };
 
             case 'country':
-                return function ($value) use ($key) {
+                return function ($value) use ($sanitizedKey, $translationPrefix) {
                     if ('_header' === $value) {
-                        return 'export.list.acp' . $key;
+                        return $translationPrefix.$sanitizedKey;
                     }
 
                     if (null === $value) {
                         return '';
                     }
 
-                    return $this->translatableStringHelper->localize(json_decode($value, true));
+                    return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR));
                 };
 
             case 'isNoAddress':
             case 'confidential':
                 return static function ($value) use ($sanitizedKey, $translationPrefix) {
                     if ('_header' === $value) {
-                        return $translationPrefix . $sanitizedKey;
+                        return $translationPrefix.$sanitizedKey;
                     }
 
                     switch ($value) {
@@ -331,14 +306,14 @@ class ExportAddressHelper
                             return 0;
 
                         default:
-                            throw new LogicException('this value is not supported for ' . $sanitizedKey . ': ' . $value);
+                            throw new \LogicException('this value is not supported for '.$sanitizedKey.': '.$value);
                     }
                 };
 
             case '_as_string':
                 return function ($value) use ($sanitizedKey, $translationPrefix) {
                     if ('_header' === $value) {
-                        return $translationPrefix . $sanitizedKey;
+                        return $translationPrefix.$sanitizedKey;
                     }
 
                     if (null === $value) {
@@ -351,9 +326,9 @@ class ExportAddressHelper
                 };
 
             default:
-                $layerNamesKeys = array_merge($this->generateKeysForUnitsNames($prefix), $this->generateKeysForUnitsRefs($prefix));
+                $layerNamesKeys = [...$this->generateKeysForUnitsNames($prefix), ...$this->generateKeysForUnitsRefs($prefix)];
 
-                if (array_key_exists($key, $layerNamesKeys)) {
+                if (\array_key_exists($key, $layerNamesKeys)) {
                     return function ($value) use ($key, $layerNamesKeys) {
                         if ('_header' === $value) {
                             $header = $this->translatableStringHelper->localize($layerNamesKeys[$key]->getName());
@@ -369,22 +344,17 @@ class ExportAddressHelper
                             return '';
                         }
 
-                        $decodedValues = json_decode($value, true);
+                        $decodedValues = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 
-                        switch (count($decodedValues)) {
-                            case 0:
-                                return '';
-
-                            case 1:
-                                return $decodedValues[0];
-
-                            default:
-                                return implode('|', $decodedValues);
-                        }
+                        return match (\count($decodedValues)) {
+                            0 => '',
+                            1 => $decodedValues[0],
+                            default => implode('|', $decodedValues),
+                        };
                     };
                 }
 
-                throw new LogicException('this key is not supported: ' . $sanitizedKey);
+                throw new \LogicException('this key is not supported: '.$sanitizedKey);
         }
     }
 
@@ -393,14 +363,14 @@ class ExportAddressHelper
      */
     private function generateKeysForUnitsNames(string $prefix): array
     {
-        if (array_key_exists($prefix, $this->unitNamesKeysCache)) {
+        if (\array_key_exists($prefix, $this->unitNamesKeysCache)) {
             return $this->unitNamesKeysCache[$prefix];
         }
 
         $keys = [];
 
         foreach ($this->geographicalUnitLayerRepository->findAllHavingUnits() as $layer) {
-            $keys[$prefix . 'unit_names_' . $layer->getId()] = $layer;
+            $keys[$prefix.'unit_names_'.$layer->getId()] = $layer;
         }
 
         return $this->unitNamesKeysCache[$prefix] = $keys;
@@ -411,14 +381,14 @@ class ExportAddressHelper
      */
     private function generateKeysForUnitsRefs(string $prefix): array
     {
-        if (array_key_exists($prefix, $this->unitRefsKeysCache)) {
+        if (\array_key_exists($prefix, $this->unitRefsKeysCache)) {
             return $this->unitRefsKeysCache[$prefix];
         }
 
         $keys = [];
 
         foreach ($this->geographicalUnitLayerRepository->findAllHavingUnits() as $layer) {
-            $keys[$prefix . 'unit_refs_' . $layer->getId()] = $layer;
+            $keys[$prefix.'unit_refs_'.$layer->getId()] = $layer;
         }
 
         return $this->unitRefsKeysCache[$prefix] = $keys;
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/TranslatableStringExportLabelHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/TranslatableStringExportLabelHelper.php
index 44ce2b194..1b561390a 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/TranslatableStringExportLabelHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/TranslatableStringExportLabelHelper.php
@@ -21,12 +21,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
  */
 class TranslatableStringExportLabelHelper
 {
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function getLabel(string $key, array $values, string $header)
     {
@@ -39,7 +34,7 @@ class TranslatableStringExportLabelHelper
                 return '';
             }
 
-            return $this->translatableStringHelper->localize(json_decode($value, true));
+            return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR));
         };
     }
 
@@ -54,7 +49,7 @@ class TranslatableStringExportLabelHelper
                 return '';
             }
 
-            $decoded = json_decode($value, true);
+            $decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 
             return implode(
                 '|',
diff --git a/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php
index 0e770786d..46e19c2d1 100644
--- a/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php
+++ b/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php
@@ -13,36 +13,67 @@ namespace Chill\MainBundle\Export\Helper;
 
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use function count;
-use const SORT_NUMERIC;
 
 class UserHelper
 {
-    private UserRender $userRender;
-
-    private UserRepositoryInterface $userRepository;
-
-    public function __construct(UserRender $userRender, UserRepositoryInterface $userRepository)
-    {
-        $this->userRender = $userRender;
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly UserRender $userRender, private readonly UserRepositoryInterface $userRepository) {}
 
+    /**
+     * Return a callable that will transform a value into a string representing a user.
+     *
+     * The callable may receive as argument:
+     *
+     * - an int or a string, the id of the user;
+     * - a string containing a json which will be decoded, and will have this structure: array{uid: int, d: string}. The job and scopes will be shown at this date
+     *
+     * @param string $key    the key of the content
+     * @param array  $values the list of values
+     * @param string $header the header's content
+     */
     public function getLabel($key, array $values, string $header): callable
     {
-        return function ($value) use ($header) {
+        return function (null|int|string $value) use ($header) {
             if ('_header' === $value) {
                 return $header;
             }
 
-            if (null === $value || null === $user = $this->userRepository->find($value)) {
+            if (null === $value) {
                 return '';
             }
 
-            return $this->userRender->renderString($user, []);
+            if (is_numeric($value)) {
+                $uid = $value;
+                $date = null;
+            } else {
+                $decode = json_decode($value, true, 512, JSON_THROW_ON_ERROR);
+                $uid = $decode['uid'];
+
+                if (null === $uid) {
+                    return '';
+                }
+
+                $date = new \DateTimeImmutable($decode['d']);
+            }
+
+            if (null === $user = $this->userRepository->find($uid)) {
+                return '';
+            }
+
+            return $this->userRender->renderString($user, ['at' => $date]);
         };
     }
 
+    /**
+     * Return a callable that will transform a value into a string representing a user.
+     *
+     *  The callable may receive as argument:
+     *
+     *  - an int or a string, the id of the user;
+     *
+     * @param string $key    the key of the element
+     * @param array  $values a list of values
+     * @param string $header the header's content
+     */
     public function getLabelMulti($key, array $values, string $header): callable
     {
         return function ($value) use ($header) {
@@ -54,31 +85,36 @@ class UserHelper
                 return '';
             }
 
-            $decoded = json_decode($value);
+            $decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 
-            if (0 === count($decoded)) {
+            if (0 === \count($decoded)) {
                 return '';
             }
+            $asStrings = [];
 
-            return
-                implode(
-                    '|',
-                    array_map(
-                        function (int $userId) {
-                            $user = $this->userRepository->find($userId);
+            foreach ($decoded as $userId) {
+                if (is_array($userId)) {
+                    $uid = $userId['uid'];
+                    $date = new \DateTimeImmutable($userId['d']);
+                } else {
+                    $uid = $userId;
+                    $date = null;
+                }
 
-                            if (null === $user) {
-                                return '';
-                            }
+                if (null === $uid) {
+                    continue;
+                }
 
-                            return $this->userRender->renderString($user, []);
-                        },
-                        array_unique(
-                            array_filter($decoded, static fn (?int $userId) => null !== $userId),
-                            SORT_NUMERIC
-                        )
-                    )
-                );
+                $user = $this->userRepository->find($uid);
+
+                if (null === $user) {
+                    continue;
+                }
+
+                $asStrings[$uid] = $this->userRender->renderString($user, ['absence' => false, 'at' => $date]);
+            }
+
+            return implode('|', $asStrings);
         };
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Export/ListInterface.php b/src/Bundle/ChillMainBundle/Export/ListInterface.php
index 53442f0e7..9b88525ca 100644
--- a/src/Bundle/ChillMainBundle/Export/ListInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ListInterface.php
@@ -20,6 +20,4 @@ namespace Chill\MainBundle\Export;
  *
  * When used, the `ExportManager` will not handle aggregator for this class.
  */
-interface ListInterface extends ExportInterface
-{
-}
+interface ListInterface extends ExportInterface {}
diff --git a/src/Bundle/ChillMainBundle/Export/ModifierInterface.php b/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
index 50cb17e09..d3ec9de83 100644
--- a/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
@@ -34,8 +34,8 @@ interface ModifierInterface extends ExportElementInterface
      * 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)
+     * @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);
 
diff --git a/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php b/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php
deleted file mode 100644
index 9157e8023..000000000
--- a/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-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 Chill\MainBundle\Form;
-
-use Chill\MainBundle\Search\SearchProvider;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-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);
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver
-            ->setRequired('search_service')
-            ->setAllowedTypes('search_service', ['string']);
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Form/CenterType.php b/src/Bundle/ChillMainBundle/Form/CenterType.php
index 6af579870..62b018f11 100644
--- a/src/Bundle/ChillMainBundle/Form/CenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/CenterType.php
@@ -11,7 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -21,24 +23,18 @@ class CenterType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name', TextType::class);
+            ->add('name', TextType::class, [
+                'label' => 'Nom',
+            ])
+            ->add('isActive', CheckboxType::class, [
+                'label' => 'Actif ?',
+                'required' => false,
+            ]);
     }
 
-    /**
-     * @param OptionsResolverInterface $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
-            'data_class' => 'Chill\MainBundle\Entity\Center',
-        ]);
-    }
-
-    /**
-     * @return string
-     */
-    public function getBlockPrefix()
-    {
-        return 'chill_mainbundle_center';
+        $resolver
+            ->setDefault('class', Center::class);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
index bb9b180f5..2bc89f97d 100644
--- a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+++ b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
@@ -16,8 +16,6 @@ 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.
  */
@@ -48,9 +46,7 @@ class PostalCodeChoiceLoader implements ChoiceLoaderInterface
     {
         return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
             $this->lazyLoadedPostalCodes,
-            static function (?PostalCode $pc = null) use ($value) {
-                return call_user_func($value, $pc);
-            }
+            static fn (PostalCode $pc = null) => \call_user_func($value, $pc)
         );
     }
 
@@ -90,7 +86,7 @@ class PostalCodeChoiceLoader implements ChoiceLoaderInterface
                 continue;
             }
 
-            $id = call_user_func($value, $choice);
+            $id = \call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedPostalCodes[$id] = $choice;
         }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
index ca9c8452e..c88e2275b 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Form\DataMapper;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\PostalCode;
-use Iterator;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\FormInterface;
@@ -26,8 +25,8 @@ use Symfony\Component\Form\FormInterface;
 class AddressDataMapper implements DataMapperInterface
 {
     /**
-     * @param Address $address
-     * @param Iterator $forms
+     * @param Address   $address
+     * @param \Iterator $forms
      */
     public function mapDataToForms($address, $forms)
     {
@@ -40,16 +39,16 @@ class AddressDataMapper implements DataMapperInterface
         }
 
         foreach ($forms as $key => $form) {
-            /** @var FormInterface $form */
+            /* @var FormInterface $form */
             switch ($key) {
                 case 'streetAddress1':
-                    /** @phpstan-ignore-next-line  */
+                    /* @phpstan-ignore-next-line */
                     $form->setData($address->getStreetAddress1());
 
                     break;
 
                 case 'streetAddress2':
-                    /** @phpstan-ignore-next-line  */
+                    /* @phpstan-ignore-next-line */
                     $form->setData($address->getStreetAddress2());
 
                     break;
@@ -76,8 +75,8 @@ class AddressDataMapper implements DataMapperInterface
     }
 
     /**
-     * @param Iterator $forms
-     * @param Address $address
+     * @param \Iterator $forms
+     * @param Address   $address
      */
     public function mapFormsToData($forms, &$address)
     {
@@ -94,7 +93,7 @@ class AddressDataMapper implements DataMapperInterface
         }
 
         foreach ($forms as $key => $form) {
-            /** @var FormInterface $form */
+            /* @var FormInterface $form */
             switch ($key) {
                 case 'postCode':
                     if (!$form->getData() instanceof PostalCode && !$isNoAddress) {
@@ -112,13 +111,13 @@ class AddressDataMapper implements DataMapperInterface
 
                         return;
                     }
-                    /** @phpstan-ignore-next-line  */
+                    /* @phpstan-ignore-next-line */
                     $address->setStreetAddress1($form->getData());
 
                     break;
 
                 case 'streetAddress2':
-                    /** @phpstan-ignore-next-line  */
+                    /* @phpstan-ignore-next-line */
                     $address->setStreetAddress2($form->getData());
 
                     break;
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
index 52e053795..73d048c1a 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
@@ -11,46 +11,27 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\DataMapper;
 
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
-use Chill\MainBundle\Repository\RegroupmentRepository;
-use Exception;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\FormInterface;
-use function array_key_exists;
-use function count;
 
-class ExportPickCenterDataMapper implements DataMapperInterface
+final readonly class ExportPickCenterDataMapper implements DataMapperInterface
 {
-    protected RegroupmentRepository $regroupmentRepository;
-
-    public function mapDataToForms($data, $forms): void
+    public function mapDataToForms($viewData, $forms): void
     {
-        if (null === $data) {
+        if (null === $viewData) {
             return;
         }
 
         /** @var array<string, FormInterface> $form */
         $form = iterator_to_array($forms);
 
-        $pickedRegroupment = [];
+        $form['center']->setData($viewData);
 
-        foreach ($this->regroupmentRepository->findAll() as $regroupment) {
-            /** @phpstan-ignore-next-line  */
-            [$contained, $notContained] = $regroupment->getCenters()->partition(static function (Center $center): bool {
-                return false;
-            });
-
-            if (0 === count($notContained)) {
-                $pickedRegroupment[] = $regroupment;
-            }
-        }
-
-        $form['regroupment']->setData($pickedRegroupment);
-        $form['centers']->setData($data);
+        // NOTE: we do not map back the regroupments
     }
 
-    public function mapFormsToData($forms, &$data): void
+    public function mapFormsToData($forms, &$viewData): void
     {
         /** @var array<string, FormInterface> $forms */
         $forms = iterator_to_array($forms);
@@ -61,7 +42,7 @@ class ExportPickCenterDataMapper implements DataMapperInterface
             $centers[spl_object_hash($center)] = $center;
         }
 
-        if (array_key_exists('regroupment', $forms)) {
+        if (\array_key_exists('regroupment', $forms)) {
             /** @var Regroupment $regroupment */
             foreach ($forms['regroupment']->getData() as $regroupment) {
                 foreach ($regroupment->getCenters() as $center) {
@@ -70,6 +51,6 @@ class ExportPickCenterDataMapper implements DataMapperInterface
             }
         }
 
-        $data = array_values($centers);
+        $viewData = array_values($centers);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
index e8c7e6c5a..68fad0a99 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
@@ -19,12 +19,7 @@ use Symfony\Component\Security\Core\Security;
 
 final class PrivateCommentDataMapper extends AbstractType implements DataMapperInterface
 {
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private readonly Security $security) {}
 
     public function mapDataToForms($viewData, $forms)
     {
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/RollingDateDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/RollingDateDataMapper.php
index 909b671b8..7628d6aa3 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/RollingDateDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/RollingDateDataMapper.php
@@ -38,7 +38,7 @@ class RollingDateDataMapper implements DataMapperInterface
         $forms = iterator_to_array($forms);
 
         $viewData = new RollingDate(
-            ($forms['roll']->getData() ?? RollingDate::T_TODAY),
+            $forms['roll']->getData() ?? RollingDate::T_TODAY,
             $forms['fixedDate']->getData()
         );
     }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
index ebae9f2b9..cf96292af 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
@@ -16,15 +16,7 @@ use Symfony\Component\Form\DataMapperInterface;
 
 class ScopePickerDataMapper implements DataMapperInterface
 {
-    /**
-     * @var \Chill\MainBundle\Entity\Scope
-     */
-    private $scope;
-
-    public function __construct(?Scope $scope = null)
-    {
-        $this->scope = $scope;
-    }
+    public function __construct(private readonly ?Scope $scope = null) {}
 
     public function mapDataToForms($data, $forms)
     {
diff --git a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
index cc215e7aa..3532c3d9e 100644
--- a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
@@ -18,33 +18,26 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\DataTransformer;
 
-use Closure;
 use Doctrine\Persistence\ObjectRepository;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use function call_user_func;
 
 /**
  * @template T
  */
 class IdToEntityDataTransformer implements DataTransformerInterface
 {
-    private Closure $getId;
-
-    private bool $multiple = false;
-
-    private ObjectRepository $repository;
+    private readonly \Closure $getId;
 
     /**
-     * @param Closure $getId
+     * @param \Closure $getId
      */
-    public function __construct(ObjectRepository $repository, bool $multiple = false, ?callable $getId = null)
-    {
-        $this->repository = $repository;
-        $this->multiple = $multiple;
-        $this->getId = $getId ?? static function (object $o) {
-            return $o->getId();
-        };
+    public function __construct(
+        private readonly ObjectRepository $repository,
+        private readonly bool $multiple = false,
+        callable $getId = null
+    ) {
+        $this->getId = $getId ?? static fn (object $o) => $o->getId();
     }
 
     /**
@@ -87,7 +80,7 @@ class IdToEntityDataTransformer implements DataTransformerInterface
             $ids = [];
 
             foreach ($value as $v) {
-                $ids[] = $id = call_user_func($this->getId, $v);
+                $ids[] = $id = \call_user_func($this->getId, $v);
 
                 if (null === $id) {
                     throw new TransformationFailedException('id is null');
@@ -101,7 +94,7 @@ class IdToEntityDataTransformer implements DataTransformerInterface
             return '';
         }
 
-        $id = call_user_func($this->getId, $value);
+        $id = \call_user_func($this->getId, $value);
 
         if (null === $id) {
             throw new TransformationFailedException('id is null');
diff --git a/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
index 3c58ddc7c..42606ebd7 100644
--- a/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
+++ b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
@@ -13,19 +13,11 @@ namespace Chill\MainBundle\Form\Event;
 
 use Symfony\Component\Form\FormBuilderInterface;
 
-class CustomizeFormEvent extends \Symfony\Component\EventDispatcher\Event
+class CustomizeFormEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
-    public const NAME = 'chill_main.customize_form';
+    final 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;
-    }
+    public function __construct(protected string $type, protected FormBuilderInterface $builder) {}
 
     public function getBuilder(): FormBuilderInterface
     {
diff --git a/src/Bundle/ChillMainBundle/Form/LocationFormType.php b/src/Bundle/ChillMainBundle/Form/LocationFormType.php
index 8e6861029..7f61cccce 100644
--- a/src/Bundle/ChillMainBundle/Form/LocationFormType.php
+++ b/src/Bundle/ChillMainBundle/Form/LocationFormType.php
@@ -24,27 +24,18 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class LocationFormType extends AbstractType
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('locationType', EntityType::class, [
                 'class' => EntityLocationType::class,
-                '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());
-                },
+                'choice_attr' => static fn (EntityLocationType $entity) => [
+                    'data-address' => $entity->getAddressRequired(),
+                    'data-contact' => $entity->getContactData(),
+                ],
+                'choice_label' => fn (EntityLocationType $entity) => $this->translatableStringHelper->localize($entity->getTitle()),
             ])
             ->add('name', TextType::class)
             ->add('phonenumber1', ChillPhoneNumberType::class, ['required' => false])
@@ -75,7 +66,7 @@ final class LocationFormType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\MainBundle\Entity\Location',
+            'data_class' => \Chill\MainBundle\Entity\Location::class,
         ]);
     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/NotificationType.php b/src/Bundle/ChillMainBundle/Form/NotificationType.php
index 61f8e6695..2bd8ba820 100644
--- a/src/Bundle/ChillMainBundle/Form/NotificationType.php
+++ b/src/Bundle/ChillMainBundle/Form/NotificationType.php
@@ -52,7 +52,7 @@ class NotificationType extends AbstractType
                 'empty_collection_explain' => 'notification.Any email',
                 'entry_options' => [
                     'constraints' => [
-                        new NotNull(), new NotBlank(), new Email(['checkMX' => true]),
+                        new NotNull(), new NotBlank(), new Email(),
                     ],
                     'label' => 'Email',
                 ],
diff --git a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
index ad5f7243b..bd9f897e1 100644
--- a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
+++ b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
@@ -18,13 +18,9 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use function array_combine;
-use function array_merge;
-use function count;
-
 class PermissionsGroupType extends AbstractType
 {
-    public const FLAG_SCOPE = 'permissions_group';
+    final public const FLAG_SCOPE = 'permissions_group';
 
     /**
      * @var PermissionsGroupFlagProvider[]
@@ -43,10 +39,10 @@ class PermissionsGroupType extends AbstractType
 
         $flags = $this->getFlags();
 
-        if (count($flags) > 0) {
+        if (\count($flags) > 0) {
             $builder
                 ->add('flags', ChoiceType::class, [
-                    'choices' => array_combine($flags, $flags),
+                    'choices' => \array_combine($flags, $flags),
                     'multiple' => true,
                     'expanded' => true,
                     'required' => false,
@@ -60,7 +56,7 @@ class PermissionsGroupType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\MainBundle\Entity\PermissionsGroup',
+            'data_class' => \Chill\MainBundle\Entity\PermissionsGroup::class,
         ]);
     }
 
@@ -77,7 +73,7 @@ class PermissionsGroupType extends AbstractType
         $flags = [];
 
         foreach ($this->flagProviders as $flagProvider) {
-            $flags = array_merge($flags, $flagProvider->getPermissionsGroupFlags());
+            $flags = \array_merge($flags, $flagProvider->getPermissionsGroupFlags());
         }
 
         return $flags;
diff --git a/src/Bundle/ChillMainBundle/Form/RegroupmentType.php b/src/Bundle/ChillMainBundle/Form/RegroupmentType.php
index bc8e6684f..22814598a 100644
--- a/src/Bundle/ChillMainBundle/Form/RegroupmentType.php
+++ b/src/Bundle/ChillMainBundle/Form/RegroupmentType.php
@@ -31,7 +31,7 @@ class RegroupmentType extends AbstractType
             ->add('centers', EntityType::class, [
                 'class' => Center::class,
                 'multiple' => true,
-                'attr' => ['class' => 'select2'],
+                'expanded' => true,
             ])
             ->add('isActive', CheckboxType::class, [
                 'label' => 'Actif ?',
diff --git a/src/Bundle/ChillMainBundle/Form/ScopeType.php b/src/Bundle/ChillMainBundle/Form/ScopeType.php
index 86335c554..c5a7657b0 100644
--- a/src/Bundle/ChillMainBundle/Form/ScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/ScopeType.php
@@ -36,7 +36,7 @@ class ScopeType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\MainBundle\Entity\Scope',
+            'data_class' => \Chill\MainBundle\Entity\Scope::class,
         ]);
     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php b/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
index 547aeb3ec..fcc4b4ec5 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
@@ -83,8 +83,8 @@ trait AppendScopeChoiceTypeTrait
     {
         $resolver
             ->setRequired(['center', 'role'])
-            ->setAllowedTypes('center', 'Chill\MainBundle\Entity\Center')
-            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role');
+            ->setAllowedTypes('center', \Chill\MainBundle\Entity\Center::class)
+            ->setAllowedTypes('role', 'string');
     }
 
     /**
@@ -97,7 +97,7 @@ trait AppendScopeChoiceTypeTrait
      */
     protected function appendScopeChoices(
         FormBuilderInterface $builder,
-        Role $role,
+        string $role,
         Center $center,
         User $user,
         AuthorizationHelper $authorizationHelper,
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
index 159d2ec1e..700726619 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
@@ -20,9 +20,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ChillPhoneNumberType extends AbstractType
 {
-    private string $defaultCarrierCode;
+    private readonly string $defaultCarrierCode;
 
-    private PhoneNumberUtil $phoneNumberUtil;
+    private readonly PhoneNumberUtil $phoneNumberUtil;
 
     public function __construct(ParameterBagInterface $parameterBag)
     {
diff --git a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
index 542a429c6..2b1d2f3e0 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
@@ -12,7 +12,6 @@ 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\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -47,7 +46,7 @@ class CommentType extends AbstractType
             $comment = $event->getData() ?? ['comment' => ''];
 
             if (null !== $data && $data->getComment() !== $comment['comment']) {
-                $data->setDate(new DateTime());
+                $data->setDate(new \DateTime());
                 $data->setUserId($this->user->getId());
                 $event->getForm()->setData($data);
             }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
index d78cf813b..48bd37dcc 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
@@ -23,21 +23,17 @@ class ComposedGroupCenterType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('permissionsgroup', EntityType::class, [
-            'class' => 'Chill\MainBundle\Entity\PermissionsGroup',
-            'choice_label' => static function (PermissionsGroup $group) {
-                return $group->getName();
-            },
+            'class' => \Chill\MainBundle\Entity\PermissionsGroup::class,
+            'choice_label' => static fn (PermissionsGroup $group) => $group->getName(),
         ])->add('center', EntityType::class, [
-            'class' => 'Chill\MainBundle\Entity\Center',
-            'choice_label' => static function (Center $center) {
-                return $center->getName();
-            },
+            'class' => \Chill\MainBundle\Entity\Center::class,
+            'choice_label' => static fn (Center $center) => $center->getName(),
         ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefault('data_class', 'Chill\MainBundle\Entity\GroupCenter');
+        $resolver->setDefault('data_class', \Chill\MainBundle\Entity\GroupCenter::class);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
index 627ce596a..6b87ed6ef 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
@@ -20,41 +20,30 @@ 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.
  */
 class ComposedRoleScopeType extends AbstractType
 {
-    /**
-     * @var RoleProvider
-     */
-    private $roleProvider;
+    private readonly \Chill\MainBundle\Security\RoleProvider $roleProvider;
 
     /**
      * @var string[]
      */
-    private $roles = [];
+    private array $roles = [];
 
     /**
      * @var string[]
      */
-    private $rolesWithoutScope = [];
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
+    private array $rolesWithoutScope = [];
 
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
+        private readonly TranslatableStringHelper $translatableStringHelper,
         RoleProvider $roleProvider
     ) {
         $this->roles = $roleProvider->getRoles();
         $this->rolesWithoutScope = $roleProvider->getRolesWithoutScopes();
-        $this->translatableStringHelper = $translatableStringHelper;
         $this->roleProvider = $roleProvider;
     }
 
@@ -64,7 +53,7 @@ class ComposedRoleScopeType extends AbstractType
         $translatableStringHelper = $this->translatableStringHelper;
         $rolesWithoutScopes = $this->rolesWithoutScope;
 
-        //build roles
+        // build roles
         $values = [];
 
         foreach ($this->roles as $role) {
@@ -76,22 +65,18 @@ class ComposedRoleScopeType extends AbstractType
                 '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)) {
+                    if (\in_array($role, $rolesWithoutScopes, true)) {
                         return ['data-has-scope' => '0'];
                     }
 
                     return ['data-has-scope' => '1'];
                 },
-                'group_by' => function ($role, $key, $index) {
-                    return $this->roleProvider->getRoleTitle($role);
-                },
+                'group_by' => fn ($role, $key, $index) => $this->roleProvider->getRoleTitle($role),
             ])
             ->add('scope', EntityType::class, [
                 'class' => Scope::class,
+                'choice_label' => static fn (Scope $scope) => $translatableStringHelper->localize($scope->getName()),
                 'placeholder' => 'Choose amongst scopes',
-                'choice_label' => static function (Scope $scope) use ($translatableStringHelper) {
-                    return $translatableStringHelper->localize($scope->getName());
-                },
                 'required' => false,
                 'data' => null,
             ]);
@@ -99,6 +84,6 @@ class ComposedRoleScopeType extends AbstractType
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefault('data_class', 'Chill\MainBundle\Entity\RoleScope');
+        $resolver->setDefault('data_class', \Chill\MainBundle\Entity\RoleScope::class);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php
index 844834177..04094537b 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php
@@ -15,14 +15,9 @@ use Chill\MainBundle\Repository\AddressRepository;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
-final class AddressToIdDataTransformer implements DataTransformerInterface
+final readonly class AddressToIdDataTransformer implements DataTransformerInterface
 {
-    private AddressRepository $addressRepository;
-
-    public function __construct(AddressRepository $addressRepository)
-    {
-        $this->addressRepository = $addressRepository;
-    }
+    public function __construct(private AddressRepository $addressRepository) {}
 
     public function reverseTransform($value)
     {
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
index 48807655c..d328d38f0 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
@@ -17,23 +17,10 @@ use Doctrine\Common\Collections\ArrayCollection;
 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(
-        CenterRepository $centerRepository,
-        bool $multiple = false
-    ) {
-        $this->centerRepository = $centerRepository;
-        $this->multiple = $multiple;
-    }
+    public function __construct(private readonly CenterRepository $centerRepository, private readonly bool $multiple = false) {}
 
     public function reverseTransform($id)
     {
@@ -48,7 +35,7 @@ class CenterTransformer implements DataTransformerInterface
         $ids = [];
 
         if ($this->multiple) {
-            $ids = explode(',', $id);
+            $ids = explode(',', (string) $id);
         } else {
             $ids[] = (int) $id;
         }
@@ -57,11 +44,8 @@ class CenterTransformer implements DataTransformerInterface
             ->centerRepository
             ->findBy(['id' => $ids]);
 
-        if ([] === $centers || count($ids) > count($centers)) {
-            throw new TransformationFailedException(sprintf(
-                'No center found for one of those ids: %s',
-                implode(',', $ids)
-            ));
+        if ([] === $centers || \count($ids) > \count($centers)) {
+            throw new TransformationFailedException(sprintf('No center found for one of those ids: %s', implode(',', $ids)));
         }
 
         if ($this->multiple) {
@@ -79,7 +63,7 @@ class CenterTransformer implements DataTransformerInterface
 
         if ($this->multiple) {
             if (!is_iterable($center)) {
-                throw new UnexpectedTypeException($center, Traversable::class);
+                throw new UnexpectedTypeException($center, \Traversable::class);
             }
             $ids = [];
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
index 8cfd1e38b..7bc447f29 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
@@ -11,8 +11,6 @@ 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;
@@ -25,16 +23,12 @@ class DateIntervalTransformer implements DataTransformerInterface
             return null;
         }
 
-        $string = 'P' . $value['n'] . $value['unit'];
+        $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
-            );
+            return new \DateInterval($string);
+        } catch (\Exception $e) {
+            throw new TransformationFailedException('Could not transform value into DateInterval', 1542, $e);
         }
     }
 
@@ -44,13 +38,13 @@ class DateIntervalTransformer implements DataTransformerInterface
             return null;
         }
 
-        if (!$value instanceof DateInterval) {
-            throw new UnexpectedTypeException($value, DateInterval::class);
+        if (!$value instanceof \DateInterval) {
+            throw new UnexpectedTypeException($value, \DateInterval::class);
         }
 
         if (0 < $value->d) {
             // we check for weeks (weeks are converted to 7 days)
-            if ($value->d % 7 === 0) {
+            if (0 === $value->d % 7) {
                 return [
                     'n' => $value->d / 7,
                     'unit' => 'W',
@@ -77,8 +71,6 @@ class DateIntervalTransformer implements DataTransformerInterface
             ];
         }
 
-        throw new TransformationFailedException(
-            'The date interval does not contains any days, months or years.'
-        );
+        throw new TransformationFailedException('The date interval does not contains any days, months or years.');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
index 46fa8799f..d193ea2ef 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
@@ -19,31 +19,18 @@ use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
-use UnexpectedValueException;
-
-use function array_key_exists;
 
 class EntityToJsonTransformer implements DataTransformerInterface
 {
-    private DenormalizerInterface $denormalizer;
-
-    private bool $multiple;
-
-    private SerializerInterface $serializer;
-
-    private string $type;
-
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, bool $multiple, string $type)
-    {
-        $this->denormalizer = $denormalizer;
-        $this->serializer = $serializer;
-        $this->multiple = $multiple;
-        $this->type = $type;
-    }
+    public function __construct(private readonly DenormalizerInterface $denormalizer, private readonly SerializerInterface $serializer, private readonly bool $multiple, private readonly string $type) {}
 
     public function reverseTransform($value)
     {
-        $denormalized = json_decode($value, true);
+        if ('' === $value) {
+            return null;
+        }
+
+        $denormalized = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 
         if ($this->multiple) {
             if (null === $denormalized) {
@@ -51,17 +38,11 @@ class EntityToJsonTransformer implements DataTransformerInterface
             }
 
             return array_map(
-                function ($item) {
-                    return $this->denormalizeOne($item);
-                },
+                fn ($item) => $this->denormalizeOne($item),
                 $denormalized
             );
         }
 
-        if ('' === $value) {
-            return null;
-        }
-
         return $this->denormalizeOne($denormalized);
     }
 
@@ -81,33 +62,20 @@ class EntityToJsonTransformer implements DataTransformerInterface
 
     private function denormalizeOne(array $item)
     {
-        if (!array_key_exists('type', $item)) {
+        if (!\array_key_exists('type', $item)) {
             throw new TransformationFailedException('the key "type" is missing on element');
         }
 
-        if (!array_key_exists('id', $item)) {
+        if (!\array_key_exists('id', $item)) {
             throw new TransformationFailedException('the key "id" is missing on element');
         }
 
-        switch ($this->type) {
-            case 'user':
-                $class = User::class;
-
-                break;
-
-            case 'person':
-                $class = Person::class;
-
-                break;
-
-            case 'thirdparty':
-                $class = ThirdParty::class;
-
-                break;
-
-            default:
-                throw new UnexpectedValueException('This type is not supported');
-        }
+        $class = match ($this->type) {
+            'user' => User::class,
+            'person' => Person::class,
+            'thirdparty' => ThirdParty::class,
+            default => throw new \UnexpectedValueException('This type is not supported'),
+        };
 
         return
             $this->denormalizer->denormalize(
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
index a21f49b2c..808093278 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
@@ -17,20 +17,10 @@ use Symfony\Component\Form\DataTransformerInterface;
 
 class MultipleObjectsToIdTransformer implements DataTransformerInterface
 {
-    private ?string $class;
-
-    private EntityManagerInterface $em;
-
-    public function __construct(EntityManagerInterface $em, ?string $class = null)
-    {
-        $this->em = $em;
-        $this->class = $class;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly ?string $class = null) {}
 
     /**
      * Transforms a string (id) to an object (item).
-     *
-     * @param mixed $array
      */
     public function reverseTransform($array)
     {
@@ -57,7 +47,7 @@ class MultipleObjectsToIdTransformer implements DataTransformerInterface
         $ret = [];
 
         foreach ($array as $el) {
-            $ret[] = ($el->getId());
+            $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 1e4ee2439..e56778bf2 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
@@ -17,26 +17,16 @@ use Symfony\Component\Form\Exception\TransformationFailedException;
 
 class ObjectToIdTransformer implements DataTransformerInterface
 {
-    private ?string $class;
-
-    private EntityManagerInterface $em;
-
-    public function __construct(EntityManagerInterface $em, ?string $class = null)
-    {
-        $this->em = $em;
-        $this->class = $class;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly ?string $class = null) {}
 
     /**
      * Transforms a string (id) to an object.
      *
-     * @param  string $id
+     * @param string $id
      *
-     * @throws TransformationFailedException if object is not found.
-     *
-     * @return object|null
+     * @throws TransformationFailedException if object is not found
      */
-    public function reverseTransform($id)
+    public function reverseTransform($id): ?object
     {
         if (null === $id) {
             return null;
@@ -56,8 +46,6 @@ class ObjectToIdTransformer implements DataTransformerInterface
     /**
      * Transforms an object to a string (id).
      *
-     * @param mixed $object
-     *
      * @return string
      */
     public function transform($object)
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php
index ca488fe1a..dde8b7b9e 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php
@@ -15,17 +15,10 @@ use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Repository\PostalCodeRepositoryInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use function gettype;
-use function is_int;
 
 class PostalCodeToIdTransformer implements DataTransformerInterface
 {
-    private PostalCodeRepositoryInterface $postalCodeRepository;
-
-    public function __construct(PostalCodeRepositoryInterface $postalCodeRepository)
-    {
-        $this->postalCodeRepository = $postalCodeRepository;
-    }
+    public function __construct(private readonly PostalCodeRepositoryInterface $postalCodeRepository) {}
 
     public function reverseTransform($value)
     {
@@ -33,8 +26,8 @@ class PostalCodeToIdTransformer implements DataTransformerInterface
             return null;
         }
 
-        if (!is_int((int) $value)) {
-            throw new TransformationFailedException('Cannot transform ' . gettype($value));
+        if (!\is_int((int) $value)) {
+            throw new TransformationFailedException('Cannot transform '.\gettype($value));
         }
 
         return $this->postalCodeRepository->find((int) $value);
@@ -50,6 +43,6 @@ class PostalCodeToIdTransformer implements DataTransformerInterface
             return $value->getId();
         }
 
-        throw new TransformationFailedException('Could not reverseTransform ' . gettype($value));
+        throw new TransformationFailedException('Could not reverseTransform '.\gettype($value));
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
index 5ae26ec79..2779f2cdd 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
@@ -18,12 +18,7 @@ use Symfony\Component\Form\Exception\TransformationFailedException;
 
 class ScopeTransformer implements DataTransformerInterface
 {
-    private EntityManagerInterface $em;
-
-    public function __construct(EntityManagerInterface $em)
-    {
-        $this->em = $em;
-    }
+    public function __construct(private readonly EntityManagerInterface $em) {}
 
     public function reverseTransform($id)
     {
@@ -37,8 +32,7 @@ class ScopeTransformer implements DataTransformerInterface
             ->find($id);
 
         if (null === $scope) {
-            throw new TransformationFailedException(sprintf('The scope with id '
-                    . "'%d' were not found", $id));
+            throw new TransformationFailedException(sprintf('The scope with id '."'%d' were not found", $id));
         }
 
         return $scope;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php b/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
index c25b2b324..7a70e7ca6 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
@@ -20,12 +20,6 @@ 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.
  *
@@ -86,21 +80,17 @@ class DateIntervalType extends AbstractType
                 'Years' => 'Y',
             ])
             ->setAllowedValues('unit_choices', static function ($values) {
-                if (false === is_array($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']);
+                $diff = \array_diff(\array_values($values), ['D', 'W', 'M', 'Y']);
 
-                if (count($diff) === 0) {
+                if (0 === \count($diff)) {
                     return true;
                 }
 
-                throw new InvalidOptionsException(sprintf(
-                    'The values of the '
-                        . "units should be 'D', 'W', 'M', 'Y', those are invalid: %s",
-                    implode(', ', $diff)
-                ));
+                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 eff303573..cfcf4a471 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
@@ -19,9 +19,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class AggregatorType extends AbstractType
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -32,7 +30,6 @@ class AggregatorType extends AbstractType
             ->add('enabled', CheckboxType::class, [
                 'value' => true,
                 'required' => false,
-                'data' => false,
             ]);
 
         $filterFormBuilder = $builder->create('form', FormType::class, [
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
index bfb408cca..324b5d8d7 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
@@ -20,13 +20,13 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ExportType extends AbstractType
 {
-    public const AGGREGATOR_KEY = 'aggregators';
+    final public const AGGREGATOR_KEY = 'aggregators';
 
-    public const EXPORT_KEY = 'export';
+    final public const EXPORT_KEY = 'export';
 
-    public const FILTER_KEY = 'filters';
+    final public const FILTER_KEY = 'filters';
 
-    public const PICK_FORMATTER_KEY = 'pick_formatter';
+    final public const PICK_FORMATTER_KEY = 'pick_formatter';
 
     /**
      * @var ExportManager
@@ -49,14 +49,14 @@ class ExportType extends AbstractType
         ];
 
         // add a contraint if required by export
-        $exportBuilder = $builder->create(self::EXPORT_KEY/*, FormType::class, $exportOptions*/);
+        $exportBuilder = $builder->create(self::EXPORT_KEY/* , FormType::class, $exportOptions */);
 
         $export->buildForm($exportBuilder);
 
         $builder->add($exportBuilder, null, $exportOptions);
 
         if ($export instanceof \Chill\MainBundle\Export\ExportInterface) {
-            //add filters
+            // add filters
             $filters = $this->exportManager->getFiltersApplyingOn($export, $options['picked_centers']);
             $filterBuilder = $builder->create(self::FILTER_KEY, FormType::class, ['compound' => true]);
 
@@ -73,7 +73,7 @@ class ExportType extends AbstractType
 
             $builder->add($filterBuilder);
 
-            //add aggregators
+            // add aggregators
             $aggregators = $this->exportManager
                 ->getAggregatorsApplyingOn($export, $options['picked_centers']);
             $aggregatorBuilder = $builder->create(
@@ -115,7 +115,7 @@ class ExportType extends AbstractType
             ->setAllowedTypes('export_alias', ['string'])
             ->setDefault('compound', true)
             ->setDefault('constraints', [
-                //new \Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraint()
+                // new \Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraint()
             ]);
     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
index 153f8946b..d4f897430 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
@@ -19,11 +19,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class FilterType extends AbstractType
 {
-    public const ENABLED_FIELD = 'enabled';
+    final public const ENABLED_FIELD = 'enabled';
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -33,7 +31,6 @@ class FilterType extends AbstractType
         $builder
             ->add(self::ENABLED_FIELD, CheckboxType::class, [
                 'value' => true,
-                'data' => false,
                 'required' => false,
             ]);
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 8287a8814..a093dda44 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -16,15 +16,11 @@ use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Form\DataMapper\ExportPickCenterDataMapper;
 use Chill\MainBundle\Repository\RegroupmentRepository;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
 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\User\UserInterface;
-use function count;
 
 /**
  * Pick centers amongst available centers for the user.
@@ -33,56 +29,41 @@ final class PickCenterType extends AbstractType
 {
     public const CENTERS_IDENTIFIERS = 'c';
 
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    private ExportManager $exportManager;
-
-    private RegroupmentRepository $regroupmentRepository;
-
-    private UserInterface $user;
-
     public function __construct(
-        TokenStorageInterface $tokenStorage,
-        ExportManager $exportManager,
-        RegroupmentRepository $regroupmentRepository,
-        AuthorizationHelperInterface $authorizationHelper
-    ) {
-        $this->exportManager = $exportManager;
-        $this->user = $tokenStorage->getToken()->getUser();
-        $this->authorizationHelper = $authorizationHelper;
-        $this->regroupmentRepository = $regroupmentRepository;
-    }
+        private readonly ExportManager $exportManager,
+        private readonly RegroupmentRepository $regroupmentRepository,
+        private readonly AuthorizationHelperForCurrentUserInterface $authorizationHelper
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $export = $this->exportManager->getExport($options['export_alias']);
         $centers = $this->authorizationHelper->getReachableCenters(
-            $this->user,
             $export->requiredRole()
         );
 
+        $centersActive = array_filter($centers, fn (Center $c) => $c->getIsActive());
+
+        // order alphabetically
+        usort($centersActive, fn (Center $a, Center $b) => $a->getCenter() <=> $b->getName());
+
         $builder->add('center', EntityType::class, [
             'class' => Center::class,
+            'choices' => $centersActive,
             'label' => 'center',
-            'choices' => $centers,
             'multiple' => true,
             'expanded' => true,
-            'choice_label' => static function (Center $c) {
-                return $c->getName();
-            },
-            'data' => $centers,
+            'choice_label' => static fn (Center $c) => $c->getName(),
         ]);
 
-        if (count($this->regroupmentRepository->findAllActive()) > 0) {
+        if (\count($this->regroupmentRepository->findAllActive()) > 0) {
             $builder->add('regroupment', EntityType::class, [
                 'class' => Regroupment::class,
                 'label' => 'regroupment',
                 'multiple' => true,
                 'expanded' => true,
                 'choices' => $this->regroupmentRepository->findAllActive(),
-                'choice_label' => static function (Regroupment $r) {
-                    return $r->getName();
-                },
+                'choice_label' => static fn (Regroupment $r) => $r->getName(),
             ]);
         }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
index ce442231e..8a2883657 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
@@ -35,7 +35,7 @@ class PickFormatterType extends AbstractType
         $allowedFormatters = $this->exportManager
             ->getFormattersByTypes($export->getAllowedFormattersTypes());
 
-        //build choices
+        // build choices
         $choices = [];
 
         foreach ($allowedFormatters as $alias => $formatter) {
@@ -47,8 +47,6 @@ class PickFormatterType extends AbstractType
             'multiple' => false,
             'placeholder' => 'Choose a format',
         ]);
-
-        //$builder->get('type')->addModelTransformer($transformer);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
index aaa6afa24..5873c0a45 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
@@ -12,28 +12,18 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form\Type\Listing;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+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\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
 {
-    private RequestStack $requestStack;
-
-    public function __construct(RequestStack $requestStack)
-    {
-        $this->requestStack = $requestStack;
-    }
-
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         /** @var FilterOrderHelper $helper */
@@ -43,22 +33,16 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
             $builder->add('q', SearchType::class, [
                 'label' => false,
                 'required' => false,
+                'attr' => [
+                    'placeholder' => 'filter_order.Search',
+                ],
             ]);
         }
 
         $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']
-            );
+            $choices = self::buildCheckboxChoices($c['choices'], $c['trans']);
 
             $checkboxesBuilder->add($name, ChoiceType::class, [
                 'choices' => $choices,
@@ -67,11 +51,30 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
             ]);
         }
 
-        if (0 < count($helper->getCheckboxes())) {
+        if (0 < \count($helper->getCheckboxes())) {
             $builder->add($checkboxesBuilder);
         }
 
-        if (0 < count($helper->getDateRanges())) {
+        if ([] !== $helper->getEntityChoices()) {
+            $entityChoicesBuilder = $builder->create('entity_choices', null, ['compound' => true]);
+
+            foreach ($helper->getEntityChoices() as $key => [
+                'label' => $label, 'choices' => $choices, 'options' => $opts, 'class' => $class
+            ]) {
+                $entityChoicesBuilder->add($key, EntityType::class, [
+                    'label' => $label,
+                    'choices' => $choices,
+                    'class' => $class,
+                    'multiple' => true,
+                    'expanded' => true,
+                    ...$opts,
+                ]);
+            }
+
+            $builder->add($entityChoicesBuilder);
+        }
+
+        if (0 < \count($helper->getDateRanges())) {
             $dateRangesBuilder = $builder->create('dateRanges', null, ['compound' => true]);
 
             foreach ($helper->getDateRanges() as $name => $opts) {
@@ -97,29 +100,49 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
             $builder->add($dateRangesBuilder);
         }
 
-        foreach ($this->requestStack->getCurrentRequest()->query->getIterator() as $key => $value) {
-            switch ($key) {
-                case 'q':
-                case 'checkboxes' . $key:
-                case $key . '_from':
-                case $key . '_to':
-                    break;
+        if ([] !== $helper->getSingleCheckbox()) {
+            $singleCheckBoxBuilder = $builder->create('single_checkboxes', null, ['compound' => true]);
 
-                case 'page':
-                    $builder->add($key, HiddenType::class, [
-                        'data' => 1,
-                    ]);
-
-                    break;
-
-                default:
-                    $builder->add($key, HiddenType::class, [
-                        'data' => $value,
-                    ]);
-
-                    break;
+            foreach ($helper->getSingleCheckbox() as $name => ['label' => $label]) {
+                $singleCheckBoxBuilder->add($name, CheckboxType::class, ['label' => $label, 'required' => false]);
             }
+
+            $builder->add($singleCheckBoxBuilder);
         }
+
+        if ([] !== $helper->getUserPickers()) {
+            $userPickersBuilder = $builder->create('user_pickers', null, ['compound' => true]);
+
+            foreach ($helper->getUserPickers() as $name => [
+                'label' => $label, 'options' => $opts
+            ]) {
+                $userPickersBuilder->add(
+                    $name,
+                    PickUserDynamicType::class,
+                    [
+                        'multiple' => true,
+                        'label' => $label,
+                        ...$opts,
+                    ]
+                );
+            }
+
+            $builder->add($userPickersBuilder);
+        }
+    }
+
+    public static function buildCheckboxChoices(array $choices, array $trans = []): array
+    {
+        return \array_combine(
+            \array_map(static function ($c, $t) {
+                if (null !== $t) {
+                    return $t;
+                }
+
+                return $c;
+            }, $choices, $trans),
+            $choices
+        );
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php b/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
index 50d6f4eb7..190e09f30 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
@@ -21,8 +21,6 @@ use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function uniqid;
-
 /**
  * Form type for picking an address.
  *
@@ -43,17 +41,7 @@ use function uniqid;
  */
 final class PickAddressType extends AbstractType
 {
-    private AddressToIdDataTransformer $addressToIdDataTransformer;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        AddressToIdDataTransformer $addressToIdDataTransformer,
-        TranslatorInterface $translator
-    ) {
-        $this->addressToIdDataTransformer = $addressToIdDataTransformer;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly AddressToIdDataTransformer $addressToIdDataTransformer, private readonly TranslatorInterface $translator) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -62,7 +50,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 0f6dd44bc..ba6cc874d 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
 use Chill\MainBundle\Repository\CenterRepository;
 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;
@@ -25,9 +24,6 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Security;
-
-use function array_merge;
-use function array_values;
 use function count;
 
 /**
@@ -38,21 +34,7 @@ use function count;
  */
 class PickCenterType extends AbstractType
 {
-    protected AuthorizationHelperInterface $authorizationHelper;
-
-    protected CenterRepository $centerRepository;
-
-    protected Security $security;
-
-    public function __construct(
-        AuthorizationHelperInterface $authorizationHelper,
-        Security $security,
-        CenterRepository $centerRepository
-    ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->security = $security;
-        $this->centerRepository = $centerRepository;
-    }
+    public function __construct(protected AuthorizationHelperInterface $authorizationHelper, protected Security $security, protected CenterRepository $centerRepository) {}
 
     /**
      * add a data transformer if user can reach only one center.
@@ -61,7 +43,9 @@ class PickCenterType extends AbstractType
     {
         $centers = $this->getReachableCenters($options['role'], $options['scopes']);
 
-        if (count($centers) <= 1) {
+        $centersActive = array_filter($centers, fn (Center $c) => $c->getIsActive());
+
+        if (\count($centers) <= 1) {
             $multiple = $options['choice_options']['multiple'] ?? false;
             $builder->add('center', HiddenType::class);
             $builder->get('center')->addModelTransformer(
@@ -71,11 +55,11 @@ class PickCenterType extends AbstractType
             $builder->add(
                 'center',
                 EntityType::class,
-                array_merge(
+                \array_merge(
                     $options['choice_options'],
                     [
                         'class' => Center::class,
-                        'choices' => $centers,
+                        'choices' => $centersActive,
                     ]
                 )
             );
@@ -90,15 +74,13 @@ class PickCenterType extends AbstractType
 
                     return ['center' => $data];
                 },
-                static function ($data) {
-                    return $data['center'];
-                }
+                static fn ($data) => $data['center']
             ));
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['is_hidden'] = count($this->getReachableCenters(
+        $view->vars['is_hidden'] = \count($this->getReachableCenters(
             $options['role'],
             $options['scopes']
         )) <= 1;
@@ -109,9 +91,9 @@ class PickCenterType extends AbstractType
      *
      * 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()
@@ -148,7 +130,7 @@ class PickCenterType extends AbstractType
 
     private function getReachableCenters(string $role, iterable $scopes): array
     {
-        if (0 < count($scopes)) {
+        if (0 < \count($scopes)) {
             $centers = [];
 
             foreach ($scopes as $scope) {
@@ -160,7 +142,7 @@ class PickCenterType extends AbstractType
                 }
             }
 
-            return array_values($centers);
+            return \array_values($centers);
         }
 
         return $this->authorizationHelper
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php b/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
index 84342dfc3..f9aa09ce8 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCivilityType.php
@@ -21,12 +21,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PickCivilityType extends AbstractType
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
@@ -34,17 +29,13 @@ class PickCivilityType extends AbstractType
             ->setDefault('label', 'Civility')
             ->setDefault(
                 'choice_label',
-                function (Civility $civility): string {
-                    return $this->translatableStringHelper->localize($civility->getName());
-                }
+                fn (Civility $civility): string => $this->translatableStringHelper->localize($civility->getName())
             )
             ->setDefault(
                 'query_builder',
-                static function (EntityRepository $er): QueryBuilder {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.active = true')
-                        ->orderBy('c.order');
-                },
+                static fn (EntityRepository $er): QueryBuilder => $er->createQueryBuilder('c')
+                    ->where('c.active = true')
+                    ->orderBy('c.order'),
             )
             ->setDefault('placeholder', 'choose civility')
             ->setDefault('class', Civility::class);
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickLocationTypeType.php b/src/Bundle/ChillMainBundle/Form/Type/PickLocationTypeType.php
index 6774e0941..8aa216da1 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickLocationTypeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickLocationTypeType.php
@@ -19,21 +19,14 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PickLocationTypeType extends AbstractType
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setDefaults([
                 'class' => LocationType::class,
-                'choice_label' => function (LocationType $type) {
-                    return $this->translatableStringHelper->localize($type->getTitle());
-                },
+                'choice_label' => fn (LocationType $type) => $this->translatableStringHelper->localize($type->getTitle()),
                 'placeholder' => 'Pick a location type',
                 'required' => false,
                 'attr' => ['class' => 'select2'],
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickPostalCodeType.php b/src/Bundle/ChillMainBundle/Form/Type/PickPostalCodeType.php
index d1feacd6a..1a1ed4354 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickPostalCodeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickPostalCodeType.php
@@ -21,12 +21,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PickPostalCodeType extends AbstractType
 {
-    private PostalCodeToIdTransformer $postalCodeToIdTransformer;
-
-    public function __construct(PostalCodeToIdTransformer $postalCodeToIdTransformer)
-    {
-        $this->postalCodeToIdTransformer = $postalCodeToIdTransformer;
-    }
+    public function __construct(private readonly PostalCodeToIdTransformer $postalCodeToIdTransformer) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php b/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php
index a4492526f..c23e0fa81 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickRollingDateType.php
@@ -29,7 +29,7 @@ class PickRollingDateType extends AbstractType
         $builder
             ->add('roll', ChoiceType::class, [
                 'choices' => array_combine(
-                    array_map(static fn (string $item) => 'rolling_date.' . $item, RollingDate::ALL_T),
+                    array_map(static fn (string $item) => 'rolling_date.'.$item, RollingDate::ALL_T),
                     RollingDate::ALL_T
                 ),
                 'multiple' => false,
@@ -55,7 +55,7 @@ class PickRollingDateType extends AbstractType
             'class' => RollingDate::class,
             'empty_data' => new RollingDate(RollingDate::T_TODAY),
             'constraints' => [
-                new Callback([$this, 'validate']),
+                new Callback($this->validate(...)),
             ],
         ]);
     }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index f6c2b7f4a..9a4fbdd75 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -27,18 +27,7 @@ use Symfony\Component\Serializer\SerializerInterface;
  */
 class PickUserDynamicType extends AbstractType
 {
-    private DenormalizerInterface $denormalizer;
-
-    private NormalizerInterface $normalizer;
-
-    private SerializerInterface $serializer;
-
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, NormalizerInterface $normalizer)
-    {
-        $this->denormalizer = $denormalizer;
-        $this->serializer = $serializer;
-        $this->normalizer = $normalizer;
-    }
+    public function __construct(private readonly DenormalizerInterface $denormalizer, private readonly SerializerInterface $serializer, private readonly NormalizerInterface $normalizer) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
index 792daa39e..9d1cdb626 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
@@ -20,15 +20,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PickUserLocationType extends AbstractType
 {
-    private LocationRepository $locationRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper, LocationRepository $locationRepository)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->locationRepository = $locationRepository;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly LocationRepository $locationRepository) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
@@ -36,11 +28,9 @@ class PickUserLocationType extends AbstractType
             ->setDefaults([
                 '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());
-                },
+                'choice_label' => fn (Location $entity) => $entity->getName() ?
+                    $entity->getName().' ('.$this->translatableStringHelper->localize($entity->getLocationType()->getTitle()).')' :
+                    $this->translatableStringHelper->localize($entity->getLocationType()->getTitle()),
                 'placeholder' => 'Pick a location',
                 'required' => false,
                 'attr' => ['class' => 'select2'],
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
index 60fefddfa..b02d069f5 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
@@ -77,10 +77,8 @@ class PostalCodeType extends AbstractType
         $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_label', static fn (PostalCode $code) => $code->getCode().' '.$code->getName().' ['.
+                  $helper->localize($code->getCountry()->getName()).']')
             ->setDefault('choice_loader', $this->choiceLoader)
             ->setDefault('placeholder', 'Select a postal code');
     }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index 5c29f4d42..0d26b5a95 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -13,26 +13,15 @@ namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper;
-
 use Symfony\Component\Form\AbstractType;
 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\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
 
 class PrivateCommentType extends AbstractType
 {
-    protected PrivateCommentDataMapper $dataMapper;
-
-    protected UserInterface $user;
-
-    public function __construct(TokenStorageInterface $tokenStorage, PrivateCommentDataMapper $dataMapper)
-    {
-        $this->user = $tokenStorage->getToken()->getUser();
-        $this->dataMapper = $dataMapper;
-    }
+    public function __construct(protected PrivateCommentDataMapper $dataMapper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index 2529a0655..68ae84549 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\DataMapper\ScopePickerDataMapper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
@@ -27,9 +26,7 @@ use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Role\Role;
-
 use Symfony\Component\Security\Core\Security;
-use function count;
 
 /**
  * Allow to pick amongst available scope for the current
@@ -42,21 +39,7 @@ use function count;
  */
 class ScopePickerType extends AbstractType
 {
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    private Security $security;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        AuthorizationHelperInterface $authorizationHelper,
-        Security $security,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->security = $security;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly AuthorizationHelperInterface $authorizationHelper, private readonly Security $security, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -64,26 +47,22 @@ class ScopePickerType extends AbstractType
             array_filter(
                 $this->authorizationHelper->getReachableScopes(
                     $this->security->getUser(),
-                    $options['role'] instanceof Role ? $options['role']->getRole() : $options['role'],
+                    $options['role'],
                     $options['center']
                 ),
-                static function (Scope $s) {
-                    return $s->isActive();
-                }
+                static fn (Scope $s) => $s->isActive()
             )
         );
 
-        if (0 === count($items)) {
-            throw new RuntimeException('no scopes are reachable. This form should not be shown to user');
+        if (0 === \count($items)) {
+            throw new \RuntimeException('no scopes are reachable. This form should not be shown to user');
         }
 
-        if (1 !== count($items)) {
+        if (1 !== \count($items)) {
             $builder->add('scope', EntityType::class, [
                 'class' => Scope::class,
                 'placeholder' => 'Choose the circle',
-                'choice_label' => function (Scope $c) {
-                    return $this->translatableStringHelper->localize($c->getName());
-                },
+                'choice_label' => fn (Scope $c) => $this->translatableStringHelper->localize($c->getName()),
                 'choices' => $items,
             ]);
             $builder->setDataMapper(new ScopePickerDataMapper());
@@ -108,6 +87,6 @@ class ScopePickerType extends AbstractType
             ->setAllowedTypes('center', [Center::class, 'array', 'null'])
           // create ``role` option
             ->setRequired('role')
-            ->setAllowedTypes('role', ['string', Role::class]);
+            ->setAllowedTypes('role', ['string']);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php
index b427c603b..d965a919a 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php
@@ -29,11 +29,6 @@ class Select2ChoiceType extends AbstractType
         );
     }
 
-    public function getBlockPrefix()
-    {
-        return 'select2_choice';
-    }
-
     public function getParent()
     {
         return ChoiceType::class;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
index 5b4d49edd..39648c11a 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
@@ -21,33 +21,12 @@ 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.
  */
 class Select2CountryType extends AbstractType
 {
-    protected ParameterBagInterface $parameterBag;
-
-    protected TranslatableStringHelper $translatableStringHelper;
-
-    private ObjectManager $em;
-
-    private RequestStack $requestStack;
-
-    public function __construct(
-        RequestStack $requestStack,
-        ObjectManager $em,
-        TranslatableStringHelper $translatableStringHelper,
-        ParameterBagInterface $parameterBag
-    ) {
-        $this->requestStack = $requestStack;
-        $this->em = $em;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->parameterBag = $parameterBag;
-    }
+    public function __construct(private readonly RequestStack $requestStack, private readonly ObjectManager $em, protected TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -74,10 +53,10 @@ class Select2CountryType extends AbstractType
             }
         }
 
-        asort($choices, SORT_STRING | SORT_FLAG_CASE);
+        asort($choices, \SORT_STRING | \SORT_FLAG_CASE);
 
         $resolver->setDefaults([
-            'class' => 'Chill\MainBundle\Entity\Country',
+            'class' => \Chill\MainBundle\Entity\Country::class,
             'choices' => array_combine(array_values($choices), array_keys($choices)),
             'preferred_choices' => array_combine(array_values($preferredChoices), array_keys($preferredChoices)),
         ]);
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
index 51e7261e4..bf300a389 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
@@ -27,11 +27,6 @@ class Select2EntityType extends AbstractType
         );
     }
 
-    public function getBlockPrefix()
-    {
-        return 'select2_entity';
-    }
-
     public function getParent()
     {
         return EntityType::class;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
index 164a138d9..bc25ac638 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
@@ -21,33 +21,12 @@ 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).
  */
 class Select2LanguageType extends AbstractType
 {
-    protected ParameterBagInterface $parameterBag;
-
-    protected TranslatableStringHelper $translatableStringHelper;
-
-    private ObjectManager $em;
-
-    private RequestStack $requestStack;
-
-    public function __construct(
-        RequestStack $requestStack,
-        ObjectManager $em,
-        TranslatableStringHelper $translatableStringHelper,
-        ParameterBagInterface $parameterBag
-    ) {
-        $this->requestStack = $requestStack;
-        $this->em = $em;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->parameterBag = $parameterBag;
-    }
+    public function __construct(private readonly RequestStack $requestStack, private readonly ObjectManager $em, protected TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -70,10 +49,10 @@ class Select2LanguageType extends AbstractType
             $preferredChoices[$l] = $choices[$l];
         }
 
-        asort($choices, SORT_STRING | SORT_FLAG_CASE);
+        asort($choices, \SORT_STRING | \SORT_FLAG_CASE);
 
         $resolver->setDefaults([
-            'class' => 'Chill\MainBundle\Entity\Language',
+            'class' => \Chill\MainBundle\Entity\Language::class,
             'choices' => array_combine(array_values($choices), array_keys($choices)),
             'preferred_choices' => array_combine(array_values($preferredChoices), array_keys($preferredChoices)),
         ]);
diff --git a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
index ee39ef75e..6945d28fb 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
@@ -20,17 +20,14 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Translation\Translator;
 
-use function in_array;
-
 class TranslatableStringFormType extends AbstractType
 {
-    private $availableLanguages;  // The langauges availaible
+    // The langauges availaible
 
-    private $frameworkTranslatorFallback; // The langagues used for the translation
+    private readonly array $frameworkTranslatorFallback; // The langagues used for the translation
 
-    public function __construct(array $availableLanguages, Translator $translator)
+    public function __construct(private readonly array $availableLanguages, Translator $translator)
     {
-        $this->availableLanguages = $availableLanguages;
         $this->frameworkTranslatorFallback = $translator->getFallbackLocales();
     }
 
@@ -40,11 +37,11 @@ class TranslatableStringFormType extends AbstractType
             $builder->add(
                 $lang,
                 TextType::class,
-                ['required' => (in_array(
+                ['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 6b1bb357a..ebda0c34f 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
@@ -44,24 +44,15 @@ class UserPickerType extends AbstractType
      */
     protected $tokenStorage;
 
-    protected UserACLAwareRepositoryInterface $userACLAwareRepository;
-
-    protected UserRepository $userRepository;
-
-    private UserRender $userRender;
-
     public function __construct(
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage,
-        UserRepository $userRepository,
-        UserACLAwareRepositoryInterface $userACLAwareRepository,
-        UserRender $userRender
+        protected UserRepository $userRepository,
+        protected UserACLAwareRepositoryInterface $userACLAwareRepository,
+        private readonly UserRender $userRender
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
-        $this->userRepository = $userRepository;
-        $this->userACLAwareRepository = $userACLAwareRepository;
-        $this->userRender = $userRender;
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -72,24 +63,18 @@ class UserPickerType extends AbstractType
             ->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']);
 
         $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) {
-                return $this->userRender->renderString($u, []);
-            })
+            ->setDefault('choice_label', fn (User $u) => $this->userRender->renderString($u, []))
             ->setDefault('scope', null)
             ->setAllowedTypes('scope', [Scope::class, 'array', 'null'])
             ->setNormalizer('choices', function (Options $options) {
-                if ($options['role'] instanceof Role) {
-                    $role = $options['role']->getRole();
-                } else {
-                    $role = $options['role'];
-                }
+                $role = $options['role'];
                 $users = $this->userACLAwareRepository
                     ->findUsersByReachedACL($role, $options['center'], $options['scope'], true);
 
diff --git a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
index 4fd1a6157..8a5dc01fd 100644
--- a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
@@ -67,8 +67,8 @@ class UserPasswordType extends AbstractType
                     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.",
+                        .'capitalized letter, one number and one special character '
+                        ."as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.",
                     ]),
                 ],
             ])
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index dc2140997..cb5e05c13 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -35,17 +35,7 @@ use Symfony\Component\Validator\Constraints\Regex;
 
 class UserType extends AbstractType
 {
-    protected ParameterBagInterface $parameterBag;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        ParameterBagInterface $parameterBag
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->parameterBag = $parameterBag;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -67,6 +57,7 @@ class UserType extends AbstractType
                 'class' => Center::class,
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('c');
+                    $qb->where($qb->expr()->eq('c.isActive', 'true'));
                     $qb->addOrderBy('c.name');
 
                     return $qb;
@@ -77,18 +68,14 @@ class UserType extends AbstractType
                 'required' => false,
                 'placeholder' => 'Choose a main scope',
                 'class' => Scope::class,
-                'choice_label' => function (Scope $c) {
-                    return $this->translatableStringHelper->localize($c->getName());
-                },
+                'choice_label' => fn (Scope $c) => $this->translatableStringHelper->localize($c->getName()),
             ])
             ->add('userJob', EntityType::class, [
                 'label' => 'user job',
                 'required' => false,
                 'placeholder' => 'choose a job',
                 'class' => UserJob::class,
-                'choice_label' => function (UserJob $c) {
-                    return $this->translatableStringHelper->localize($c->getLabel());
-                },
+                'choice_label' => fn (UserJob $c) => $this->translatableStringHelper->localize($c->getLabel()),
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('uj');
                     $qb->where('uj.active = TRUE');
@@ -101,9 +88,7 @@ class UserType extends AbstractType
                 'required' => false,
                 'placeholder' => 'choose a location',
                 'class' => Location::class,
-                'choice_label' => function (Location $l) {
-                    return $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ' - ' . $l->getName();
-                },
+                'choice_label' => fn (Location $l) => $this->translatableStringHelper->localize($l->getLocationType()->getTitle()).' - '.$l->getName(),
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('l');
                     $qb->orderBy('l.locationType');
@@ -141,8 +126,8 @@ class UserType extends AbstractType
                     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.",
+                        .'capitalized letter, one number and one special character '
+                        ."as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.",
                     ]),
                 ],
             ]);
@@ -167,7 +152,7 @@ class UserType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\MainBundle\Entity\User',
+            'data_class' => \Chill\MainBundle\Entity\User::class,
         ]);
 
         $resolver
diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
index 54d953016..208af8522 100644
--- a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
+++ b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
-use LogicException;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -32,22 +31,10 @@ use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
-use function array_key_exists;
 
 class WorkflowStepType extends AbstractType
 {
-    private EntityWorkflowManager $entityWorkflowManager;
-
-    private Registry $registry;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(EntityWorkflowManager $entityWorkflowManager, Registry $registry, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->entityWorkflowManager = $entityWorkflowManager;
-        $this->registry = $registry;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly EntityWorkflowManager $entityWorkflowManager, private readonly Registry $registry, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -60,7 +47,7 @@ class WorkflowStepType extends AbstractType
 
         if (true === $options['transition']) {
             if (null === $options['entity_workflow']) {
-                throw new LogicException('if transition is true, entity_workflow should be defined');
+                throw new \LogicException('if transition is true, entity_workflow should be defined');
             }
 
             $transitions = $this->registry
@@ -69,15 +56,13 @@ class WorkflowStepType extends AbstractType
 
             $choices = array_combine(
                 array_map(
-                    static function (Transition $transition) {
-                        return $transition->getName();
-                    },
+                    static fn (Transition $transition) => $transition->getName(),
                     $transitions
                 ),
                 $transitions
             );
 
-            if (array_key_exists('validationFilterInputLabels', $placeMetadata)) {
+            if (\array_key_exists('validationFilterInputLabels', $placeMetadata)) {
                 $inputLabels = $placeMetadata['validationFilterInputLabels'];
 
                 $builder->add('transitionFilter', ChoiceType::class, [
@@ -88,14 +73,10 @@ class WorkflowStepType extends AbstractType
                         'backward' => 'backward',
                         'neutral' => 'neutral',
                     ],
-                    'choice_label' => function (string $key) use ($inputLabels) {
-                        return $this->translatableStringHelper->localize($inputLabels[$key]);
-                    },
-                    'choice_attr' => static function (string $key) {
-                        return [
-                            $key => $key,
-                        ];
-                    },
+                    'choice_label' => fn (string $key) => $this->translatableStringHelper->localize($inputLabels[$key]),
+                    'choice_attr' => static fn (string $key) => [
+                        $key => $key,
+                    ],
                     'mapped' => false,
                     'expanded' => true,
                     'data' => 'forward',
@@ -113,7 +94,7 @@ class WorkflowStepType extends AbstractType
                     'choice_label' => function (Transition $transition) use ($workflow) {
                         $meta = $workflow->getMetadataStore()->getTransitionMetadata($transition);
 
-                        if (array_key_exists('label', $meta)) {
+                        if (\array_key_exists('label', $meta)) {
                             return $this->translatableStringHelper->localize($meta['label']);
                         }
 
@@ -125,7 +106,7 @@ class WorkflowStepType extends AbstractType
 
                         $metadata = $workflow->getMetadataStore()->getTransitionMetadata($transition);
 
-                        if (array_key_exists('isForward', $metadata)) {
+                        if (\array_key_exists('isForward', $metadata)) {
                             if ($metadata['isForward']) {
                                 $isForward = 'forward';
                             } else {
@@ -137,7 +118,7 @@ class WorkflowStepType extends AbstractType
                             $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
 
                             if (
-                                !array_key_exists('isFinal', $meta) || false === $meta['isFinal']
+                                !\array_key_exists('isFinal', $meta) || false === $meta['isFinal']
                             ) {
                                 $toFinal = false;
                             }
@@ -174,7 +155,7 @@ class WorkflowStepType extends AbstractType
                     'empty_collection_explain' => 'workflow.Any email',
                     'entry_options' => [
                         'constraints' => [
-                            new NotNull(), new NotBlank(), new Email(['checkMX' => true]),
+                            new NotNull(), new NotBlank(), new Email(),
                         ],
                         'label' => 'Email',
                     ],
@@ -203,7 +184,7 @@ class WorkflowStepType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefined('class', EntityWorkflowStep::class)
+            ->setDefined('class')
             ->setRequired('transition')
             ->setAllowedTypes('transition', 'bool')
             ->setRequired('entity_workflow')
@@ -226,7 +207,7 @@ class WorkflowStepType extends AbstractType
                                 $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
 
                                 if (
-                                    !array_key_exists('isFinal', $meta) || false === $meta['isFinal']
+                                    !\array_key_exists('isFinal', $meta) || false === $meta['isFinal']
                                 ) {
                                     $toFinal = false;
                                 }
@@ -256,7 +237,7 @@ class WorkflowStepType extends AbstractType
                             }
                         }
                     }
-                )
+                ),
             ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php b/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php
index a17ffbdae..1b4c2d7df 100644
--- a/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php
+++ b/src/Bundle/ChillMainBundle/Notification/Counter/NotificationByUserCounter.php
@@ -16,24 +16,14 @@ use Chill\MainBundle\Entity\NotificationComment;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\NotificationRepository;
 use Chill\MainBundle\Templating\UI\NotificationCounterInterface;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostPersistEventArgs;
-use Doctrine\ORM\Event\PostUpdateEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
-final class NotificationByUserCounter implements NotificationCounterInterface
+final readonly class NotificationByUserCounter implements NotificationCounterInterface
 {
-    private CacheItemPoolInterface $cacheItemPool;
-
-    private NotificationRepository $notificationRepository;
-
-    public function __construct(CacheItemPoolInterface $cacheItemPool, NotificationRepository $notificationRepository)
-    {
-        $this->cacheItemPool = $cacheItemPool;
-        $this->notificationRepository = $notificationRepository;
-    }
+    public function __construct(private CacheItemPoolInterface $cacheItemPool, private NotificationRepository $notificationRepository) {}
 
     public function addNotification(UserInterface $u): int
     {
@@ -67,7 +57,7 @@ final class NotificationByUserCounter implements NotificationCounterInterface
 
     public static function generateCacheKeyUnreadNotificationByUser(User $user): string
     {
-        return 'chill_main_notif_unread_by_' . $user->getId();
+        return 'chill_main_notif_unread_by_'.$user->getId();
     }
 
     public function onEditNotificationComment(NotificationComment $notificationComment, PostPersistEventArgs $eventArgs): void
diff --git a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
index 5290492b1..7b535f1a7 100644
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Notification\Email;
 
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\NotificationComment;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
 use Psr\Log\LoggerInterface;
@@ -25,34 +24,28 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class NotificationMailer
 {
-    private LoggerInterface $logger;
-
-    private MailerInterface $mailer;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(MailerInterface $mailer, LoggerInterface $logger, TranslatorInterface $translator)
-    {
-        $this->mailer = $mailer;
-        $this->logger = $logger;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly MailerInterface $mailer, private readonly LoggerInterface $logger, private readonly TranslatorInterface $translator) {}
 
     public function postPersistComment(NotificationComment $comment, PostPersistEventArgs $eventArgs): void
     {
-        foreach (
-            array_merge(
-                $comment->getNotification()->getAddressees()->toArray(),
-                [$comment->getNotification()->getSender()]
-            ) as $dest
-        ) {
-            if (null === $dest->getEmail() || $comment->getCreatedBy() !== $dest) {
+        $dests = [$comment->getNotification()->getSender(), ...$comment->getNotification()->getAddressees()->toArray()];
+
+        $uniqueDests = [];
+        foreach ($dests as $dest) {
+            // avoid duplication
+            if (in_array(spl_object_hash($dest), $uniqueDests, true)) {
+                continue;
+            }
+            $uniqueDests[] = spl_object_hash($dest);
+
+            // do not send if the sender does not have any email, nor to the creator of the comment
+            if (null === $dest->getEmail() || $comment->getCreatedBy() === $dest) {
                 continue;
             }
             $email = new TemplatedEmail();
             $email
                 ->to($dest->getEmail())
-                ->subject('Re: ' . $comment->getNotification()->getTitle())
+                ->subject('Re: '.$comment->getNotification()->getTitle())
                 ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.fr.md.twig')
                 ->context([
                     'comment' => $comment,
diff --git a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
index f9e050769..74c784b4b 100644
--- a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php
@@ -15,19 +15,10 @@ use Chill\MainBundle\Notification\NotificationPersisterInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\TerminateEvent;
-use function count;
 
 class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberInterface
 {
-    private EntityManagerInterface $em;
-
-    private NotificationPersisterInterface $persister;
-
-    public function __construct(EntityManagerInterface $em, NotificationPersisterInterface $persister)
-    {
-        $this->em = $em;
-        $this->persister = $persister;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly NotificationPersisterInterface $persister) {}
 
     public static function getSubscribedEvents()
     {
@@ -47,7 +38,7 @@ class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberIn
 
     private function persistNotifications(): void
     {
-        if (0 < count($this->persister->getWaitingNotifications())) {
+        if (0 < \count($this->persister->getWaitingNotifications())) {
             foreach ($this->persister->getWaitingNotifications() as $notification) {
                 $this->em->persist($notification);
             }
diff --git a/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php b/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php
index 61eafd312..b1acff57b 100644
--- a/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php
+++ b/src/Bundle/ChillMainBundle/Notification/Exception/NotificationHandlerNotFound.php
@@ -11,8 +11,4 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Notification\Exception;
 
-use RuntimeException;
-
-class NotificationHandlerNotFound extends RuntimeException
-{
-}
+class NotificationHandlerNotFound extends \RuntimeException {}
diff --git a/src/Bundle/ChillMainBundle/Notification/Mailer.php b/src/Bundle/ChillMainBundle/Notification/Mailer.php
index 307d5d1df..5dacbc6fa 100644
--- a/src/Bundle/ChillMainBundle/Notification/Mailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Mailer.php
@@ -13,17 +13,12 @@ namespace Chill\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\User;
 use Psr\Log\LoggerInterface;
-use Swift_Mailer;
-use Swift_Message;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Email;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;
 
-use function call_user_func;
-
 /**
  * Class Mailer
  * Classe d'aide pour l'envoi de notification.
@@ -34,59 +29,19 @@ use function call_user_func;
  */
 class Mailer
 {
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var array
-     */
-    private $routeParameters;
-
-    /**
-     * @var RouterInterface
-     */
-    private $router;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    private EngineInterface $twig;
-
-    private MailerInterface $mailer;
-
     /**
      * Mailer constructor.
      *
-     * @param $routeParameters
+     * @param mixed[] $routeParameters
      */
-    public function __construct(
-        MailerInterface $mailer,
-        LoggerInterface $logger,
-        EngineInterface $twig,
-        RouterInterface $router,
-        TranslatorInterface $translator,
-        $routeParameters
-    ) {
-        $this->logger = $logger;
-        $this->twig = $twig;
-        $this->mailer = $mailer;
-        $this->router = $router;
-        $this->translator = $translator;
-        $this->routeParameters = $routeParameters;
-    }
+    public function __construct(private readonly MailerInterface $mailer, private readonly LoggerInterface $logger, private readonly Environment $twig, private readonly RouterInterface $router, private readonly TranslatorInterface $translator, protected $routeParameters) {}
 
     /**
-     * @param $template
+     * @return string
      *
      * @throws \Twig\Error\LoaderError
      * @throws \Twig\Error\RuntimeError
      * @throws \Twig\Error\SyntaxError
-     *
-     * @return string
      */
     public function renderContentToUser(User $to, $template, array $parameters = [])
     {
@@ -109,18 +64,16 @@ class Mailer
     /**
      * 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 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 sendNotification(
-        $recipient,
+        mixed $recipient,
         array $subject,
         array $bodies,
-        ?callable $callback = null,
-        $force = false
+        callable $callback = null,
+        mixed $force = false
     ) {
         $fromEmail = $this->routeParameters['from_email'];
         $fromName = $this->routeParameters['from_name'];
@@ -143,12 +96,12 @@ class Mailer
         }
 
         if (null !== $callback) {
-            call_user_func($callback, $email);
+            \call_user_func($callback, $email);
         }
 
         $this->logger->info('[notification] Sending notification', [
             'to' => $email->getTo(),
-            'subject' => $email->getSubject()
+            'subject' => $email->getSubject(),
         ]);
 
         $this->mailer->send($email);
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php
index 9efe69ffb..aa6e700bc 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php
@@ -15,19 +15,9 @@ use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Notification\Exception\NotificationHandlerNotFound;
 use Doctrine\ORM\EntityManagerInterface;
 
-final class NotificationHandlerManager
+final readonly class NotificationHandlerManager
 {
-    private EntityManagerInterface $em;
-
-    private iterable $handlers;
-
-    public function __construct(
-        iterable $handlers,
-        EntityManagerInterface $em
-    ) {
-        $this->handlers = $handlers;
-        $this->em = $em;
-    }
+    public function __construct(private iterable $handlers, private EntityManagerInterface $em) {}
 
     /**
      * @throw NotificationHandlerNotFound if handler is not found
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php
index c09b845d7..5c5cb3dcf 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationPresence.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\NotificationRepository;
 use Symfony\Component\Security\Core\Security;
-use function array_key_exists;
 
 /**
  * Helps to find if a notification exist for a given entity.
@@ -24,19 +23,16 @@ class NotificationPresence
 {
     private array $cache = [];
 
-    private NotificationRepository $notificationRepository;
+    public function __construct(private readonly Security $security, private readonly NotificationRepository $notificationRepository) {}
 
-    private Security $security;
-
-    public function __construct(Security $security, NotificationRepository $notificationRepository)
+    /**
+     * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     *
+     * @return array{unread: int, sent: int, total: int}
+     */
+    public function countNotificationsForClassAndEntity(string $relatedEntityClass, int $relatedEntityId, array $more = [], array $options = []): array
     {
-        $this->security = $security;
-        $this->notificationRepository = $notificationRepository;
-    }
-
-    public function countNotificationsForClassAndEntity(string $relatedEntityClass, int $relatedEntityId): array
-    {
-        if (array_key_exists($relatedEntityClass, $this->cache) && array_key_exists($relatedEntityId, $this->cache[$relatedEntityClass])) {
+        if ([] === $more && \array_key_exists($relatedEntityClass, $this->cache) && \array_key_exists($relatedEntityId, $this->cache[$relatedEntityClass])) {
             return $this->cache[$relatedEntityClass][$relatedEntityId];
         }
 
@@ -46,21 +42,26 @@ class NotificationPresence
             $counter = $this->notificationRepository->countNotificationByRelatedEntityAndUserAssociated(
                 $relatedEntityClass,
                 $relatedEntityId,
-                $user
+                $user,
+                $more
             );
 
-            $this->cache[$relatedEntityClass][$relatedEntityId] = $counter;
+            if ([] === $more) {
+                $this->cache[$relatedEntityClass][$relatedEntityId] = $counter;
+            }
 
             return $counter;
         }
 
-        return ['unread' => 0, 'read' => 0];
+        return ['unread' => 0, 'sent' => 0, 'total' => 0];
     }
 
     /**
+     * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     *
      * @return array|Notification[]
      */
-    public function getNotificationsForClassAndEntity(string $relatedEntityClass, int $relatedEntityId): array
+    public function getNotificationsForClassAndEntity(string $relatedEntityClass, int $relatedEntityId, array $more = []): array
     {
         $user = $this->security->getUser();
 
@@ -68,7 +69,8 @@ class NotificationPresence
             return $this->notificationRepository->findNotificationByRelatedEntityAndUserAssociated(
                 $relatedEntityClass,
                 $relatedEntityId,
-                $user
+                $user,
+                $more
             );
         }
 
diff --git a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php
index 0720c6da6..a65758f5f 100644
--- a/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php
+++ b/src/Bundle/ChillMainBundle/Notification/Templating/NotificationTwigExtensionRuntime.php
@@ -21,37 +21,32 @@ use Twig\Extension\RuntimeExtensionInterface;
 
 class NotificationTwigExtensionRuntime implements RuntimeExtensionInterface
 {
-    private FormFactoryInterface $formFactory;
+    public function __construct(private readonly FormFactoryInterface $formFactory, private readonly NotificationPresence $notificationPresence, private readonly UrlGeneratorInterface $urlGenerator) {}
 
-    private NotificationPresence $notificationPresence;
-
-    private UrlGeneratorInterface $urlGenerator;
-
-    public function __construct(FormFactoryInterface $formFactory, NotificationPresence $notificationPresence, UrlGeneratorInterface $urlGenerator)
-    {
-        $this->formFactory = $formFactory;
-        $this->notificationPresence = $notificationPresence;
-        $this->urlGenerator = $urlGenerator;
-    }
-
-    public function counterNotificationFor(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $options = []): string
+    public function counterNotificationFor(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $more = [], array $options = []): string
     {
         return $environment->render(
             '@ChillMain/Notification/extension_counter_notifications_for.html.twig',
             [
-                'counter' => $this->notificationPresence->countNotificationsForClassAndEntity($relatedEntityClass, $relatedEntityId),
+                'counter' => $this->notificationPresence->countNotificationsForClassAndEntity($relatedEntityClass, $relatedEntityId, $more),
             ]
         );
     }
 
-    public function countNotificationsFor(string $relatedEntityClass, int $relatedEntityId, array $options = []): array
+    /**
+     * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     */
+    public function countNotificationsFor(string $relatedEntityClass, int $relatedEntityId, array $more = [], array $options = []): array
     {
-        return $this->notificationPresence->countNotificationsForClassAndEntity($relatedEntityClass, $relatedEntityId);
+        return $this->notificationPresence->countNotificationsForClassAndEntity($relatedEntityClass, $relatedEntityId, $more);
     }
 
-    public function listNotificationsFor(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $options = []): string
+    /**
+     * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     */
+    public function listNotificationsFor(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $more = [], array $options = []): string
     {
-        $notifications = $this->notificationPresence->getNotificationsForClassAndEntity($relatedEntityClass, $relatedEntityId);
+        $notifications = $this->notificationPresence->getNotificationsForClassAndEntity($relatedEntityClass, $relatedEntityId, $more);
 
         if ([] === $notifications) {
             return '';
diff --git a/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php b/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php
index 97d4629c7..d66adb974 100644
--- a/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php
+++ b/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php
@@ -25,7 +25,7 @@ class ChillItemsPerPageTwig extends AbstractExtension
         return [
             new TwigFunction(
                 'chill_items_per_page',
-                [$this, 'paginationRender'],
+                $this->paginationRender(...),
                 [
                     'needs_environment' => true,
                     'is_safe' => ['html'],
diff --git a/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php b/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php
index 2831d9322..e5883d593 100644
--- a/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php
+++ b/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php
@@ -20,16 +20,16 @@ use Twig\TwigFunction;
  */
 class ChillPaginationTwig extends AbstractExtension
 {
-    public const LONG_TEMPLATE = '@ChillMain/Pagination/long.html.twig';
+    final public const LONG_TEMPLATE = '@ChillMain/Pagination/long.html.twig';
 
-    public const SHORT_TEMPLATE = '@ChillMain/Pagination/short.html.twig';
+    final public const SHORT_TEMPLATE = '@ChillMain/Pagination/short.html.twig';
 
     public function getFunctions()
     {
         return [
             new TwigFunction(
                 'chill_pagination',
-                [$this, 'paginationRender'],
+                $this->paginationRender(...),
                 [
                     'needs_environment' => true,
                     'is_safe' => ['html'],
@@ -48,20 +48,11 @@ class ChillPaginationTwig extends AbstractExtension
         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;
-        }
+        $t = match ($template) {
+            'long' => self::LONG_TEMPLATE,
+            'short' => self::SHORT_TEMPLATE,
+            default => $template,
+        };
 
         return $env->render($t, [
             'paginator' => $paginator,
diff --git a/src/Bundle/ChillMainBundle/Pagination/Page.php b/src/Bundle/ChillMainBundle/Pagination/Page.php
index d7c47ebbd..9858a27b8 100644
--- a/src/Bundle/ChillMainBundle/Pagination/Page.php
+++ b/src/Bundle/ChillMainBundle/Pagination/Page.php
@@ -18,59 +18,35 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
  */
 class Page implements PageInterface
 {
-    /**
-     * the number of item per page.
-     *
-     */
-    protected int $itemPerPage;
-
-    /**
-     * the number of the current page.
-     *
-     * @var int
-     */
-    protected int $number;
-
-    /**
-     * The route for the current page.
-     *
-     * @var string
-     */
-    protected string $route;
-
-    /**
-     * Parameters for the route to the current page.
-     *
-     * @var array
-     */
-    protected array $routeParameters;
-
-    /**
-     * The number of items in the whole iteration.
-     *
-     * @var int
-     */
-    protected int $totalItems;
-
     /**
      * @var UrlGeneratorInterface
      */
     protected $urlGenerator;
 
     public function __construct(
-        int $number,
-        int $itemPerPage,
+        /**
+         * the number of the current page.
+         */
+        protected int $number,
+        /**
+         * the number of item per page.
+         */
+        protected int $itemPerPage,
         UrlGeneratorInterface $urlGenerator,
-        string $route,
-        array $routeParameters,
-        int $totalItems
+        /**
+         * The route for the current page.
+         */
+        protected string $route,
+        /**
+         * Parameters for the route to the current page.
+         */
+        protected array $routeParameters,
+        /**
+         * The number of items in the whole iteration.
+         */
+        protected int $totalItems
     ) {
         $this->urlGenerator = $urlGenerator;
-        $this->number = $number;
-        $this->itemPerPage = $itemPerPage;
-        $this->route = $route;
-        $this->routeParameters = $routeParameters;
-        $this->totalItems = $totalItems;
     }
 
     public function generateUrl(): string
diff --git a/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php b/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
index 4a10fde2a..4c9cb68fe 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
@@ -11,21 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Pagination;
 
-use Iterator;
-
 /**
  * PageGenerator associated with a Paginator.
  */
-class PageGenerator implements Iterator
+class PageGenerator implements \Iterator
 {
     protected int $current = 1;
 
-    protected Paginator $paginator;
-
-    public function __construct(Paginator $paginator)
-    {
-        $this->paginator = $paginator;
-    }
+    public function __construct(protected Paginator $paginator) {}
 
     public function current(): Page
     {
diff --git a/src/Bundle/ChillMainBundle/Pagination/Paginator.php b/src/Bundle/ChillMainBundle/Pagination/Paginator.php
index 5427bf46d..a809bc9f4 100644
--- a/src/Bundle/ChillMainBundle/Pagination/Paginator.php
+++ b/src/Bundle/ChillMainBundle/Pagination/Paginator.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Pagination;
 
-use RuntimeException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
@@ -22,81 +21,43 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 class Paginator implements PaginatorInterface
 {
     /**
-     * The number of the current page.
-     *
-     * @var int
+     * @param string[] $routeParameters
      */
-    protected int $currentPageNumber;
-
-    /**
-     * the number of items on a single page.
-     *
-     * @var int
-     */
-    protected int $itemPerPage;
-
-    /**
-     * the key in the GET parameter to indicate the number of item per page.
-     *
-     * @var string
-     */
-    protected string $itemPerPageKey;
-
-    /**
-     * the key in the GET parameter to indicate the page number in
-     * generated routes.
-     *
-     * @var string
-     */
-    protected string $pageKey;
-
-    /**
-     * the route of the pages.
-     *
-     * @var string
-     */
-    protected string $route;
-
-    /**
-     * the parameters of the route.
-     *
-     * @var string[]
-     */
-    protected array $routeParameters;
-
-    /**
-     * The number of total items.
-     *
-     * @var int
-     */
-    protected int $totalItems;
-
-    /**
-     * the generator for url.
-     *
-     * @var UrlGeneratorInterface
-     */
-    protected UrlGeneratorInterface $urlGenerator;
-
     public function __construct(
-        int $totalItems,
-        int $itemPerPage,
-        int $currentPageNumber,
-        string $route,
-        array $routeParameters,
-        UrlGeneratorInterface $urlGenerator,
-        string $pageKey,
-        string $itemPerPageKey
-    ) {
-        $this->totalItems = $totalItems;
-        $this->itemPerPage = $itemPerPage;
-        $this->currentPageNumber = $currentPageNumber;
-        $this->route = $route;
-        $this->routeParameters = $routeParameters;
-        $this->urlGenerator = $urlGenerator;
-        $this->pageKey = $pageKey;
-        $this->itemPerPageKey = $itemPerPageKey;
-    }
+        /**
+         * The number of total items.
+         */
+        protected int $totalItems,
+        /**
+         * the number of items on a single page.
+         */
+        protected int $itemPerPage,
+        /**
+         * The number of the current page.
+         */
+        protected int $currentPageNumber,
+        /**
+         * the route of the pages.
+         */
+        protected string $route,
+        /**
+         * the parameters of the route.
+         */
+        protected array $routeParameters,
+        /**
+         * the generator for url.
+         */
+        protected UrlGeneratorInterface $urlGenerator,
+        /**
+         * the key in the GET parameter to indicate the page number in
+         * generated routes.
+         */
+        protected string $pageKey,
+        /**
+         * the key in the GET parameter to indicate the number of item per page.
+         */
+        protected string $itemPerPageKey
+    ) {}
 
     public function count(): int
     {
@@ -138,28 +99,21 @@ class Paginator implements PaginatorInterface
     }
 
     /**
-     * @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(): Page
     {
         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);
     }
 
-    /**
-     *
-     * @return \Chill\MainBundle\Pagination\Page
-     */
     public function getPage(int $number): Page
     {
         if (!$this->hasPage($number)) {
-            throw new RuntimeException("The page with number {$number} does not "
-                  . 'exists');
+            throw new \RuntimeException("The page with number {$number} does not ".'exists');
         }
 
         return new Page(
@@ -183,14 +137,14 @@ class Paginator implements PaginatorInterface
     }
 
     /**
-     * @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(): PageInterface
     {
         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);
@@ -201,9 +155,6 @@ class Paginator implements PaginatorInterface
         return $this->totalItems;
     }
 
-    /**
-     * @return bool
-     */
     public function hasNextPage(): bool
     {
         return $this->hasPage($this->currentPageNumber + 1);
@@ -219,9 +170,6 @@ class Paginator implements PaginatorInterface
               && $this->countPages() >= $number;
     }
 
-    /**
-     * @return bool
-     */
     public function hasPreviousPage(): bool
     {
         return $this->hasPage($this->currentPageNumber - 1);
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
index e6e0863a2..4bf651280 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
@@ -19,43 +19,30 @@ use Symfony\Component\Routing\RouterInterface;
  */
 class PaginatorFactory
 {
-    public const DEFAULT_CURRENT_PAGE_KEY = 'page';
+    final public const DEFAULT_CURRENT_PAGE_KEY = 'page';
 
-    public const DEFAULT_ITEM_PER_NUMBER_KEY = 'item_per_page';
+    final public const DEFAULT_ITEM_PER_NUMBER_KEY = 'item_per_page';
 
-    public const DEFAULT_PAGE_NUMBER = 1;
+    final public const DEFAULT_PAGE_NUMBER = 1;
 
     /**
-     * the default item per page. This may be overriden by
-     * the request or inside the paginator.
-     *
-     * @var int
+     * @param int $itemPerPage
      */
-    private $itemPerPage;
-
-    /**
-     * the request stack.
-     *
-     * @var RequestStack
-     */
-    private $requestStack;
-
-    /**
-     * the router and generator for url.
-     *
-     * @var RouterInterface
-     */
-    private $router;
-
     public function __construct(
-        RequestStack $requestStack,
-        RouterInterface $router,
-        $itemPerPage = 20
-    ) {
-        $this->itemPerPage = $itemPerPage;
-        $this->requestStack = $requestStack;
-        $this->router = $router;
-    }
+        /**
+         * the request stack.
+         */
+        private readonly RequestStack $requestStack,
+        /**
+         * the router and generator for url.
+         */
+        private readonly RouterInterface $router,
+        /**
+         * the default item per page. This may be overriden by
+         * the request or inside the paginator.
+         */
+        private $itemPerPage = 20
+    ) {}
 
     /**
      * create a paginator instance.
@@ -63,24 +50,23 @@ class PaginatorFactory
      * The default route and route parameters are the current ones. If set,
      * thos route are overriden.
      *
-     * @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
+     * @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
+        string $route = null,
+        array $routeParameters = null
     ) {
         return new Paginator(
             $totalItems,
             $this->getCurrentItemsPerPage(),
             $this->getCurrentPageNumber(),
-            null === $route ? $this->getCurrentRoute() : $route,
-            null === $routeParameters ? $this->getCurrentRouteParameters() :
-                 $routeParameters,
+            $route ?? $this->getCurrentRoute(),
+            $routeParameters ?? $this->getCurrentRouteParameters(),
             $this->router,
             self::DEFAULT_CURRENT_PAGE_KEY,
             self::DEFAULT_ITEM_PER_NUMBER_KEY
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
index cbdc12e6b..4af13b916 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Pagination;
 
-use Countable;
 use Generator;
-use RuntimeException;
 
 /**
  * Represent a set of numbered pages.
@@ -25,26 +23,20 @@ use RuntimeException;
  *
  * The first page number is 1, although the first result number is 0.
  */
-interface PaginatorInterface extends Countable
+interface PaginatorInterface extends \Countable
 {
     /**
      * get the number of pages for this pagination.
-     *
-     * @return int
      */
     public function countPages(): int;
 
     /**
      * get the current page.
-     *
-     * @return PageInterface
      */
     public function getCurrentPage(): PageInterface;
 
     /**
      * get the first result for the current page.
-     *
-     * @return int
      */
     public function getCurrentPageFirstItemNumber(): int;
 
@@ -56,71 +48,53 @@ interface PaginatorInterface extends Countable
     /**
      * 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(): PageInterface;
 
     /**
      * get page by his number.
      *
-     * @param int $number
-     *
-     * @throws RuntimeException if the pagination has no page with specified number
+     * @throws \RuntimeException if the pagination has no page with specified number
      */
     public function getPage(int $number): PageInterface;
 
     /**
      * get a generator to generate pages.
      *
-     * @return Generator which return PageInterface elements
+     * @return \Generator which return PageInterface elements
      */
     public function getPagesGenerator(): iterable;
 
     /**
      * 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(): PageInterface;
 
     /**
      * get the number of results for this paginator.
-     *
-     * @return int
      */
     public function getTotalItems(): int;
 
     /**
      * check if the current page has a next page.
-     *
-     * @return bool
      */
     public function hasNextPage(): bool;
 
     /**
      * check if the page with the given number exists.
-     *
-     * @param mixed $number
      */
     public function hasPage($number): bool;
 
     /**
      * check if the current page has a page before.
-     *
-     * @return bool
      */
     public function hasPreviousPage(): bool;
 
     /**
      * check if the given page is the current page.
-     *
-     * @param \Chill\MainBundle\Pagination\PageInterface $page
-     *
-     * @return bool
      */
     public function isCurrentPage(PageInterface $page): bool;
 
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
index c7cf1ddfd..bd3eeffe5 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
@@ -22,7 +22,7 @@ use libphonenumber\PhoneNumber;
  */
 interface PhoneNumberHelperInterface
 {
-    public function format(?PhoneNumber $phoneNumber = null): string;
+    public function format(PhoneNumber $phoneNumber = null): string;
 
     /**
      * Get type (mobile, landline, ...) for phone number.
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index 9ee013b1a..462f379cf 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -23,46 +23,34 @@ use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
-use function array_key_exists;
-use function in_array;
-use function json_decode;
-use function preg_replace;
-use function strlen;
-
 final class PhonenumberHelper implements PhoneNumberHelperInterface
 {
     public const FORMAT_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s';
 
     public const LOOKUP_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s';
 
-    private CacheItemPoolInterface $cachePool;
-
-    private array $config;
+    private readonly array $config;
 
     private bool $isConfigured = false;
 
-    private LoggerInterface $logger;
-
-    private PhonenumberUtil $phoneNumberUtil;
+    private readonly PhonenumberUtil $phoneNumberUtil;
 
     private Client $twilioClient;
 
     public function __construct(
-        CacheItemPoolInterface $cacheUserData,
+        private readonly CacheItemPoolInterface $cachePool,
         ParameterBagInterface $parameterBag,
-        LoggerInterface $logger
+        private readonly LoggerInterface $logger
     ) {
-        $this->logger = $logger;
-        $this->cachePool = $cacheUserData;
         $this->config = $config = $parameterBag->get('chill_main.phone_helper');
 
         if (
-            array_key_exists('twilio_sid', $config)
+            \array_key_exists('twilio_sid', $config)
             && !empty($config['twilio_sid'])
-            && strlen($config['twilio_sid']) > 2
-            && array_key_exists('twilio_secret', $config)
+            && \strlen((string) $config['twilio_sid']) > 2
+            && \array_key_exists('twilio_secret', $config)
             && !empty($config['twilio_secret'])
-            && strlen($config['twilio_secret']) > 2
+            && \strlen((string) $config['twilio_secret']) > 2
         ) {
             $this->twilioClient = new Client([
                 'auth' => [$config['twilio_sid'], $config['twilio_secret']],
@@ -78,7 +66,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      *
      * @throws NumberParseException
      */
-    public function format(?PhoneNumber $phoneNumber = null): string
+    public function format(PhoneNumber $phoneNumber = null): string
     {
         if (null === $phoneNumber) {
             return '';
@@ -93,17 +81,11 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      */
     public function getType(PhoneNumber $phonenumber): string
     {
-        switch ($this->phoneNumberUtil->getNumberType($phonenumber)) {
-            case PhoneNumberType::MOBILE:
-                return 'mobile';
-
-            case PhoneNumberType::FIXED_LINE:
-            case PhoneNumberType::VOIP:
-                return 'landline';
-
-            default:
-                return 'landline';
-        }
+        return match ($this->phoneNumberUtil->getNumberType($phonenumber)) {
+            PhoneNumberType::MOBILE => 'mobile',
+            PhoneNumberType::FIXED_LINE, PhoneNumberType::VOIP => 'landline',
+            default => 'landline',
+        };
     }
 
     /**
@@ -131,7 +113,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return false;
         }
 
-        return in_array($validation, ['landline', 'voip', 'mobile'], true);
+        return \in_array($validation, ['landline', 'voip', 'mobile'], true);
     }
 
     /**
@@ -152,7 +134,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return true;
         }
 
-        return in_array($validation, ['landline', 'voip'], true);
+        return \in_array($validation, ['landline', 'voip'], true);
     }
 
     /**
@@ -187,27 +169,27 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
         }
 
         // filter only number
-        $filtered = preg_replace('/[^0-9]/', '', (string) $phonenumber);
+        $filtered = \preg_replace('/[^0-9]/', '', (string) $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',
                 ],
             ]);
-        } catch (ClientException $e) {
+        } catch (ClientException) {
             return 'invalid';
         } catch (ServerException $e) {
             $response = $e->getResponse();
             $this->logger->error('[phonenumber helper] Could not perform validation '
-                . 'due to server error', [
+                .'due to server error', [
                     'message' => $response->getBody()->getContents(),
                     'status_code' => $response->getStatusCode(),
                     'phonenumber' => $phonenumber,
@@ -216,7 +198,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return null;
         } catch (ConnectException $e) {
             $this->logger->error('[phonenumber helper] Could not format number '
-                . 'due to connect error', [
+                .'due to connect error', [
                     'message' => $e->getMessage(),
                     'phonenumber' => $phonenumber,
                 ]);
@@ -224,7 +206,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return null;
         }
 
-        $validation = json_decode($response->getBody()->getContents())->carrier->type;
+        $validation = \json_decode($response->getBody()->getContents(), null, 512, JSON_THROW_ON_ERROR)->carrier->type;
 
         $item
             ->set($validation)
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/Templating.php b/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
index b6304e0de..51d57c9e9 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
@@ -16,12 +16,7 @@ use Twig\TwigFilter;
 
 class Templating extends AbstractExtension
 {
-    protected PhonenumberHelper $phonenumberHelper;
-
-    public function __construct(PhonenumberHelper $phonenumberHelper)
-    {
-        $this->phonenumberHelper = $phonenumberHelper;
-    }
+    public function __construct(protected PhonenumberHelper $phonenumberHelper) {}
 
     public function formatPhonenumber($phonenumber)
     {
@@ -31,7 +26,7 @@ class Templating extends AbstractExtension
     public function getFilters()
     {
         return [
-            new TwigFilter('chill_format_phonenumber', [$this, 'formatPhonenumber']),
+            new TwigFilter('chill_format_phonenumber', $this->formatPhonenumber(...)),
         ];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Redis/ChillRedis.php b/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
index 5070f77fd..b9e454b46 100644
--- a/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
+++ b/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
@@ -16,6 +16,4 @@ use Redis;
 /**
  * Redis client configured by chill main.
  */
-class ChillRedis extends Redis
-{
-}
+class ChillRedis extends \Redis {}
diff --git a/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php b/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
index f5a2515c8..d41f9225f 100644
--- a/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
+++ b/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
@@ -11,18 +11,17 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Redis;
 
-use RuntimeException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 final class RedisConnectionFactory implements EventSubscriberInterface
 {
-    private string $host;
+    private readonly string $host;
 
-    private int $port;
+    private readonly int $port;
 
-    private ChillRedis $redis;
+    private readonly ChillRedis $redis;
 
-    private int $timeout;
+    private readonly int $timeout;
 
     public function __construct($parameters)
     {
@@ -37,7 +36,7 @@ final class RedisConnectionFactory implements EventSubscriberInterface
         $result = $this->redis->connect($this->host, $this->port, $this->timeout);
 
         if (false === $result) {
-            throw new RuntimeException('Could not connect to redis instance');
+            throw new \RuntimeException('Could not connect to redis instance');
         }
 
         return $this->redis;
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
index d301940ae..d029226d0 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
@@ -19,18 +19,12 @@ 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 readonly EntityManagerInterface $entityManager;
 
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -77,7 +71,7 @@ final class AddressReferenceRepository implements ObjectRepository
      *
      * @return AddressReference[]
      */
-    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);
     }
@@ -94,11 +88,11 @@ final class AddressReferenceRepository implements ObjectRepository
             $rsm->addRootEntityFromClassMetadata(AddressReference::class, 'cma');
             $query->addSelectClause($rsm->generateSelectClause());
         } else {
-            throw new RuntimeException('not implemented');
+            throw new \RuntimeException('not implemented');
         }
 
-        $sql = strtr(
-            $query->buildQuery() . 'ORDER BY pertinence DESC, lpad(streetnumber, 10, \'0\') ASC OFFSET ? LIMIT ? ',
+        $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']
         );
@@ -109,7 +103,7 @@ final class AddressReferenceRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?AddressReference
+    public function findOneBy(array $criteria, array $orderBy = null): ?AddressReference
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -121,10 +115,10 @@ final class AddressReferenceRepository implements ObjectRepository
 
     private function buildQueryByPostalCodePattern(PostalCode $postalCode, string $pattern): SearchApiQuery
     {
-        $pattern = trim($pattern);
+        $pattern = \trim($pattern);
 
         if ('' === $pattern) {
-            throw new RuntimeException('the search pattern must not be empty');
+            throw new \RuntimeException('the search pattern must not be empty');
         }
         $query = new SearchApiQuery();
 
@@ -138,8 +132,8 @@ final class AddressReferenceRepository implements ObjectRepository
         $andWhere = [];
         $andWhereArgs = [];
 
-        foreach (explode(' ', $pattern) as $part) {
-            $part = trim($part);
+        foreach (\explode(' ', $pattern) as $part) {
+            $part = \trim($part);
 
             if ('' === $part) {
                 continue;
@@ -154,8 +148,8 @@ final class AddressReferenceRepository implements ObjectRepository
             array_push($pertinenceArgs, $part, $part);
         }
         $query
-            ->setSelectPertinence(implode(' + ', $pertinenceClause), $pertinenceArgs)
-            ->andWhereClause(implode(' AND ', $andWhere), $andWhereArgs);
+            ->setSelectPertinence(\implode(' + ', $pertinenceClause), $pertinenceArgs)
+            ->andWhereClause(\implode(' AND ', $andWhere), $andWhereArgs);
 
         return $query;
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
index 622a9cb65..eee1d5b1f 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
@@ -19,14 +19,14 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class AddressRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(Address::class);
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -50,12 +50,12 @@ final class AddressRepository implements ObjectRepository
      *
      * @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 findOneBy(array $criteria, ?array $orderBy = null): ?Address
+    public function findOneBy(array $criteria, array $orderBy = null): ?Address
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
index eaa0a6b1e..46e87cb10 100644
--- a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class CenterRepository implements CenterRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -29,9 +29,12 @@ final class CenterRepository implements CenterRepositoryInterface
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
+    /**
+     * @return Center[]
+     */
     public function findActive(): array
     {
-        return $this->findAll();
+        return $this->repository->findBy(['isActive' => true], ['name' => 'ASC']);
     }
 
     /**
@@ -48,12 +51,12 @@ final class CenterRepository implements CenterRepositoryInterface
      *
      * @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 findOneBy(array $criteria, ?array $orderBy = null): ?Center
+    public function findOneBy(array $criteria, array $orderBy = null): ?Center
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
index 70b4a2bc4..9ed4cbf01 100644
--- a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 class CivilityRepository implements CivilityRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -34,7 +34,7 @@ class CivilityRepository implements CivilityRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CivilityRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/CivilityRepositoryInterface.php
index 5d687ac7e..f838b54e8 100644
--- a/src/Bundle/ChillMainBundle/Repository/CivilityRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/CivilityRepositoryInterface.php
@@ -26,7 +26,7 @@ interface CivilityRepositoryInterface extends ObjectRepository
     /**
      * @return array|Civility[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?Civility;
 
diff --git a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
index 699303bc8..000ecb4e1 100644
--- a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
@@ -19,14 +19,14 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class CountryRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(Country::class);
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -50,12 +50,12 @@ final class CountryRepository implements ObjectRepository
      *
      * @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 findOneBy(array $criteria, ?array $orderBy = null): ?Country
+    public function findOneBy(array $criteria, array $orderBy = null): ?Country
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepository.php b/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepository.php
index a3c495d7d..8fa4ea8f6 100644
--- a/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 class CronJobExecutionRepository implements CronJobExecutionRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -40,7 +40,7 @@ class CronJobExecutionRepository implements CronJobExecutionRepositoryInterface
     /**
      * @return array|CronJobExecution[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepositoryInterface.php
index df894bbfb..cef997edd 100644
--- a/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/CronJobExecutionRepositoryInterface.php
@@ -26,7 +26,7 @@ interface CronJobExecutionRepositoryInterface extends ObjectRepository
     /**
      * @return array|CronJobExecution[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?CronJobExecution;
 
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
index 3f7f96407..88d92a7dc 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitLayerLayerRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class GeographicalUnitLayerLayerRepository implements GeographicalUnitLayerRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -49,7 +49,7 @@ final class GeographicalUnitLayerLayerRepository implements GeographicalUnitLaye
     /**
      * @return array|GeographicalUnitLayer[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
index f5e646dba..2bb22b842 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
@@ -20,14 +20,13 @@ use Doctrine\ORM\QueryBuilder;
 
 final class GeographicalUnitRepository implements GeographicalUnitRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
         $this->repository = $em->getRepository($this->getClassName());
     }
 
-
     public function countGeographicalUnitContainingAddress(Address $address): int
     {
         $qb = $this->buildQueryGeographicalUnitContainingAddress($address);
@@ -45,7 +44,7 @@ final class GeographicalUnitRepository implements GeographicalUnitRepositoryInte
         return $qb
             ->select(sprintf('NEW %s(gu.id, gu.unitName, gu.unitRefId, IDENTITY(gu.layer))', GeographicalUnit\SimpleGeographicalUnitDTO::class))
             ->addOrderBy('IDENTITY(gu.layer)')
-            ->addOrderBy(('gu.unitName'))
+            ->addOrderBy('gu.unitName')
             ->getQuery()
             ->setFirstResult($offset)
             ->setMaxResults($limit)
@@ -57,6 +56,7 @@ final class GeographicalUnitRepository implements GeographicalUnitRepositoryInte
         $qb = $this->repository
             ->createQueryBuilder('gu')
         ;
+
         return $qb
             ->select(sprintf('NEW %s(gu.id, gu.unitName, gu.unitRefId, IDENTITY(gu.layer))', GeographicalUnit\SimpleGeographicalUnitDTO::class))
             ->innerJoin(Address::class, 'address', Join::WITH, 'ST_CONTAINS(gu.geom, address.point) = TRUE')
@@ -81,12 +81,12 @@ final class GeographicalUnitRepository implements GeographicalUnitRepositoryInte
             ->createQueryBuilder('gu')
             ->select(sprintf('NEW %s(gu.id, gu.unitName, gu.unitRefId, IDENTITY(gu.layer))', GeographicalUnit\SimpleGeographicalUnitDTO::class))
             ->addOrderBy('IDENTITY(gu.layer)')
-            ->addOrderBy(('gu.unitName'))
+            ->addOrderBy('gu.unitName')
             ->getQuery()
             ->getResult();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): ?GeographicalUnit
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): ?GeographicalUnit
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php
index f2c102407..b00b0cd98 100644
--- a/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepositoryInterface.php
@@ -18,13 +18,10 @@ use Doctrine\Persistence\ObjectRepository;
 interface GeographicalUnitRepositoryInterface extends ObjectRepository
 {
     /**
-     * Return the geographical units as @link{SimpleGeographicalUnitDTO} whithin the address is contained.
+     * Return the geographical units as @see{SimpleGeographicalUnitDTO} whithin the address is contained.
      *
      * This query is executed in real time (without the refresh of the materialized view which load the addresses).
      *
-     * @param Address $address
-     * @param int $offset
-     * @param int $limit
      * @return SimpleGeographicalUnitDTO[]
      */
     public function findGeographicalUnitContainingAddress(Address $address, int $offset = 0, int $limit = 50): array;
diff --git a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
index 07bf728a2..a07087369 100644
--- a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class GroupCenterRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -44,12 +44,12 @@ final class GroupCenterRepository implements ObjectRepository
      *
      * @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 findOneBy(array $criteria, ?array $orderBy = null): ?GroupCenter
+    public function findOneBy(array $criteria, array $orderBy = null): ?GroupCenter
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
index 2e972442e..1bbf2c168 100644
--- a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class LanguageRepository implements LanguageRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -43,12 +43,12 @@ final class LanguageRepository implements LanguageRepositoryInterface
      *
      * @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 findOneBy(array $criteria, ?array $orderBy = null): ?Language
+    public function findOneBy(array $criteria, array $orderBy = null): ?Language
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/LanguageRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/LanguageRepositoryInterface.php
index 397b264e4..ab110fc24 100644
--- a/src/Bundle/ChillMainBundle/Repository/LanguageRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/LanguageRepositoryInterface.php
@@ -29,9 +29,9 @@ interface LanguageRepositoryInterface extends ObjectRepository
      *
      * @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;
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Language;
+    public function findOneBy(array $criteria, array $orderBy = null): ?Language;
 
     public function getClassName(): string;
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
index 72f9ea5d1..bc26981b2 100644
--- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
@@ -23,16 +23,21 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class NotificationRepository implements ObjectRepository
 {
-    private EntityManagerInterface $em;
-
     private ?Statement $notificationByRelatedEntityAndUserAssociatedStatement = null;
 
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    private const BASE_COUNTER_SQL = <<<'SQL'
+                    SELECT
+                   SUM((EXISTS (SELECT 1 AS c FROM chill_main_notification_addresses_unread cmnau WHERE user_id = :userid and cmnau.notification_id = cmn.id))::int) AS unread,
+                   SUM((cmn.sender_id = :userid)::int) AS sent,
+                   SUM((EXISTS (SELECT 1 AS c FROM chill_main_notification_addresses_user cmnau_all WHERE user_id = :userid and cmnau_all.notification_id = cmn.id))::int) + SUM((cmn.sender_id = :userid)::int) AS total
+                FROM chill_main_notification cmn
+    SQL;
+
+    public function __construct(private readonly EntityManagerInterface $em)
     {
-        $this->em = $entityManager;
-        $this->repository = $entityManager->getRepository(Notification::class);
+        $this->repository = $em->getRepository(Notification::class);
     }
 
     public function countAllForAttendee(User $addressee): int
@@ -51,29 +56,46 @@ final class NotificationRepository implements ObjectRepository
             ->getSingleScalarResult();
     }
 
-    public function countNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user): array
+    /**
+     * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     *
+     * @return array{unread: int, sent: int, total: int}
+     */
+    public function countNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user, array $more = []): array
     {
-        if (null === $this->notificationByRelatedEntityAndUserAssociatedStatement) {
-            $sql =
-                'SELECT
-                   SUM((EXISTS (SELECT 1 AS c FROM chill_main_notification_addresses_unread cmnau WHERE user_id = :userid and cmnau.notification_id = cmn.id))::int) AS unread,
-                   SUM((cmn.sender_id = :userid)::int) AS sent,
-                   COUNT(cmn.*) AS total
-                FROM chill_main_notification cmn
-                WHERE relatedentityclass = :relatedEntityClass AND relatedentityid = :relatedEntityId AND sender_id IS NOT NULL';
+        $sqlParams = ['relatedEntityClass' => $relatedEntityClass, 'relatedEntityId' => $relatedEntityId, 'userid' => $user->getId()];
 
-            $this->notificationByRelatedEntityAndUserAssociatedStatement =
-                $this->em->getConnection()->prepare($sql);
+        if ([] === $more) {
+            if (null === $this->notificationByRelatedEntityAndUserAssociatedStatement) {
+                $sql = self::BASE_COUNTER_SQL.' WHERE relatedentityclass = :relatedEntityClass AND relatedentityid = :relatedEntityId AND sender_id IS NOT NULL';
+
+                $this->notificationByRelatedEntityAndUserAssociatedStatement =
+                    $this->em->getConnection()->prepare($sql);
+            }
+
+            $results = $this->notificationByRelatedEntityAndUserAssociatedStatement
+                ->executeQuery($sqlParams);
+
+            $result = $results->fetchAssociative();
+
+            $results->free();
+        } else {
+            $wheres = [];
+            foreach ([
+                ['relatedEntityClass' => $relatedEntityClass, 'relatedEntityId' => $relatedEntityId],
+                ...$more,
+            ] as $k => ['relatedEntityClass' => $relClass, 'relatedEntityId' => $relId]) {
+                $wheres[] = "(relatedEntityClass = :relatedEntityClass_{$k} AND relatedEntityId = :relatedEntityId_{$k})";
+                $sqlParams["relatedEntityClass_{$k}"] = $relClass;
+                $sqlParams["relatedEntityId_{$k}"] = $relId;
+            }
+
+            $sql = self::BASE_COUNTER_SQL.' WHERE sender_id IS NOT NULL AND ('.implode(' OR ', $wheres).')';
+
+            $result = $this->em->getConnection()->fetchAssociative($sql, $sqlParams);
         }
 
-        $results = $this->notificationByRelatedEntityAndUserAssociatedStatement
-            ->executeQuery(['relatedEntityClass' => $relatedEntityClass, 'relatedEntityId' => $relatedEntityId, 'userid' => $user->getId()]);
-
-        $result = $results->fetchAssociative();
-
-        $results->free();
-
-        return $result;
+        return array_map(fn (?int $number) => $number ?? 0, $result);
     }
 
     public function countUnreadByUser(User $user): int
@@ -167,29 +189,32 @@ final class NotificationRepository implements ObjectRepository
     }
 
     /**
-     * @param mixed|null $limit
-     * @param mixed|null $offset
+     * @param int|null $limit
+     * @param int|null $offset
      *
      * @return Notification[]
      */
-    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);
     }
 
     /**
+     * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     *
      * @return array|Notification[]
      */
-    public function findNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user): array
+    public function findNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user, array $more): array
     {
         return
-            $this->buildQueryNotificationByRelatedEntityAndUserAssociated($relatedEntityClass, $relatedEntityId, $user)
+            $this->buildQueryNotificationByRelatedEntityAndUserAssociated($relatedEntityClass, $relatedEntityId, $user, $more)
                 ->select('n')
+                ->addOrderBy('n.date', 'DESC')
                 ->getQuery()
                 ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Notification
+    public function findOneBy(array $criteria, array $orderBy = null): ?Notification
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -202,11 +227,11 @@ final class NotificationRepository implements ObjectRepository
         $rsm = new Query\ResultSetMappingBuilder($this->em);
         $rsm->addRootEntityFromClassMetadata(Notification::class, 'cmn');
 
-        $sql = 'SELECT ' . $rsm->generateSelectClause(['cmn' => 'cmn']) . ' ' .
-        'FROM chill_main_notification cmn ' .
-        'WHERE ' .
-              'EXISTS (select 1 FROM chill_main_notification_addresses_unread cmnau WHERE cmnau.user_id = :userId and cmnau.notification_id = cmn.id) ' .
-        'ORDER BY cmn.date DESC ' .
+        $sql = 'SELECT '.$rsm->generateSelectClause(['cmn' => 'cmn']).' '.
+        'FROM chill_main_notification cmn '.
+        'WHERE '.
+              'EXISTS (select 1 FROM chill_main_notification_addresses_unread cmnau WHERE cmnau.user_id = :userId and cmnau.notification_id = cmn.id) '.
+        'ORDER BY cmn.date DESC '.
         'LIMIT :limit OFFSET :offset';
 
         $nq = $this->em->createNativeQuery($sql, $rsm)
@@ -222,13 +247,36 @@ final class NotificationRepository implements ObjectRepository
         return Notification::class;
     }
 
-    private function buildQueryNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user): QueryBuilder
+    /**
+     * @param list<array{relatedEntityClass: class-string, relatedEntityId: int}> $more
+     */
+    private function buildQueryNotificationByRelatedEntityAndUserAssociated(string $relatedEntityClass, int $relatedEntityId, User $user, array $more = []): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('n');
 
+        // add condition for related entity (in main arguments, and in more)
+        $or = $qb->expr()->orX($qb->expr()->andX(
+            $qb->expr()->eq('n.relatedEntityClass', ':relatedEntityClass'),
+            $qb->expr()->eq('n.relatedEntityId', ':relatedEntityId')
+        ));
         $qb
-            ->where($qb->expr()->eq('n.relatedEntityClass', ':relatedEntityClass'))
-            ->andWhere($qb->expr()->eq('n.relatedEntityId', ':relatedEntityId'))
+            ->setParameter('relatedEntityClass', $relatedEntityClass)
+            ->setParameter('relatedEntityId', $relatedEntityId);
+
+        foreach ($more as $k => ['relatedEntityClass' => $relatedClass, 'relatedEntityId' => $relatedId]) {
+            $or->add(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('n.relatedEntityClass', ':relatedEntityClass_'.$k),
+                    $qb->expr()->eq('n.relatedEntityId', ':relatedEntityId_'.$k)
+                )
+            );
+            $qb
+                ->setParameter('relatedEntityClass_'.$k, $relatedClass)
+                ->setParameter('relatedEntityId_'.$k, $relatedId);
+        }
+
+        $qb
+            ->andWhere($or)
             ->andWhere($qb->expr()->isNotNull('n.sender'))
             ->andWhere(
                 $qb->expr()->orX(
@@ -236,8 +284,6 @@ final class NotificationRepository implements ObjectRepository
                     $qb->expr()->eq('n.sender', ':user')
                 )
             )
-            ->setParameter('relatedEntityClass', $relatedEntityClass)
-            ->setParameter('relatedEntityId', $relatedEntityId)
             ->setParameter('user', $user);
 
         return $qb;
diff --git a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
index 64863bf8c..59b7c93a4 100644
--- a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class PermissionsGroupRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -38,18 +38,31 @@ final class PermissionsGroupRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
+    /**
+     * @return list<PermissionsGroup>
+     */
+    public function findAllOrderedAlphabetically(): array
+    {
+        $qb = $this->repository->createQueryBuilder('pg');
+
+        return $qb->select(['pg', 'pg.name AS HIDDEN sort_name'])
+            ->orderBy('sort_name')
+            ->getQuery()
+            ->getResult();
+    }
+
     /**
      * @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 findOneBy(array $criteria, ?array $orderBy = null): ?PermissionsGroup
+    public function findOneBy(array $criteria, array $orderBy = null): ?PermissionsGroup
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
index 32c1322be..45e10816a 100644
--- a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
@@ -18,13 +18,12 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
-use RuntimeException;
 
 final class PostalCodeRepository implements PostalCodeRepositoryInterface
 {
-    private EntityManagerInterface $entityManager;
+    private readonly EntityManagerInterface $entityManager;
 
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -55,7 +54,7 @@ final class PostalCodeRepository implements PostalCodeRepositoryInterface
         return $this->repository->findAll();
     }
 
-    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);
     }
@@ -69,7 +68,7 @@ final class PostalCodeRepository implements PostalCodeRepositoryInterface
         $query->addSelectClause($rsm->generateSelectClause());
 
         $sql = strtr(
-            $query->buildQuery() . 'ORDER BY pertinence DESC, canonical ASC OFFSET ? LIMIT ? ',
+            $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']
         );
@@ -80,7 +79,7 @@ final class PostalCodeRepository implements PostalCodeRepositoryInterface
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?PostalCode
+    public function findOneBy(array $criteria, array $orderBy = null): ?PostalCode
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -95,7 +94,7 @@ final class PostalCodeRepository implements PostalCodeRepositoryInterface
         $pattern = trim($pattern);
 
         if ('' === $pattern) {
-            throw new RuntimeException('the search pattern must not be empty');
+            throw new \RuntimeException('the search pattern must not be empty');
         }
         $query = new SearchApiQuery();
 
diff --git a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepositoryInterface.php
index fe3dee195..590598cb0 100644
--- a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepositoryInterface.php
@@ -32,11 +32,11 @@ interface PostalCodeRepositoryInterface extends ObjectRepository
      *
      * @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;
 
     public function findByPattern(string $pattern, ?Country $country, ?int $start = 0, ?int $limit = 50): array;
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?PostalCode;
+    public function findOneBy(array $criteria, array $orderBy = null): ?PostalCode;
 
     public function getClassName(): string;
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
index a28f2f341..cd51b7913 100644
--- a/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RegroupmentRepository.php
@@ -14,11 +14,13 @@ namespace Chill\MainBundle\Repository;
 use Chill\MainBundle\Entity\Regroupment;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
 use Doctrine\Persistence\ObjectRepository;
 
 final class RegroupmentRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -49,16 +51,40 @@ final class RegroupmentRepository implements ObjectRepository
      *
      * @return Regroupment[]
      */
-    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 findOneBy(array $criteria, ?array $orderBy = null): ?Regroupment
+    public function findOneBy(array $criteria, array $orderBy = null): ?Regroupment
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
 
+    /**
+     * @throws NonUniqueResultException
+     * @throws NoResultException
+     */
+    public function findOneByName(string $name): ?Regroupment
+    {
+        return $this->repository->createQueryBuilder('r')
+            ->where('LOWER(r.name) = LOWER(:searched)')
+            ->setParameter('searched', $name)
+            ->getQuery()
+            ->getSingleResult();
+    }
+
+    /**
+     * @return array<Regroupment>
+     */
+    public function findRegroupmentAssociatedToNoCenter(): array
+    {
+        return $this->repository->createQueryBuilder('r')
+            ->where('SIZE(r.centers) = 0')
+            ->getQuery()
+            ->getResult();
+    }
+
     public function getClassName()
     {
         return Regroupment::class;
diff --git a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
index 49162310c..6ee488ffe 100644
--- a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class RoleScopeRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -44,12 +44,12 @@ final class RoleScopeRepository implements ObjectRepository
      *
      * @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 findOneBy(array $criteria, ?array $orderBy = null): ?RoleScope
+    public function findOneBy(array $criteria, array $orderBy = null): ?RoleScope
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php b/src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php
index 0011c5c43..4c0a5035b 100644
--- a/src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php
@@ -22,7 +22,7 @@ use Doctrine\Persistence\ObjectRepository;
  */
 class SavedExportRepository implements SavedExportRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -42,12 +42,12 @@ class SavedExportRepository implements SavedExportRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findByUser(User $user, ?array $orderBy = [], ?int $limit = null, ?int $offset = null): array
+    public function findByUser(User $user, ?array $orderBy = [], int $limit = null, int $offset = null): array
     {
         $qb = $this->repository->createQueryBuilder('se');
 
@@ -64,7 +64,7 @@ class SavedExportRepository implements SavedExportRepositoryInterface
         }
 
         foreach ($orderBy as $field => $order) {
-            $qb->addOrderBy('se.' . $field, $order);
+            $qb->addOrderBy('se.'.$field, $order);
         }
 
         return $qb->getQuery()->getResult();
diff --git a/src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php
index 3b168505f..488139846 100644
--- a/src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php
@@ -27,12 +27,12 @@ interface SavedExportRepositoryInterface extends ObjectRepository
      */
     public function findAll(): array;
 
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     /**
      * @return array|SavedExport[]
      */
-    public function findByUser(User $user, ?array $orderBy = [], ?int $limit = null, ?int $offset = null): array;
+    public function findByUser(User $user, ?array $orderBy = [], int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?SavedExport;
 
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
index 158678fb6..21e55954b 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
@@ -18,7 +18,7 @@ use Doctrine\ORM\QueryBuilder;
 
 final class ScopeRepository implements ScopeRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -58,12 +58,12 @@ final class ScopeRepository implements ScopeRepositoryInterface
      *
      * @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 findOneBy(array $criteria, ?array $orderBy = null): ?Scope
+    public function findOneBy(array $criteria, array $orderBy = null): ?Scope
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
index 3cfb6042d..6c68b08b2 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepositoryInterface.php
@@ -32,14 +32,14 @@ interface ScopeRepositoryInterface extends ObjectRepository
     public function findAllActive(): array;
 
     /**
-     * @param null|mixed $limit
-     * @param null|mixed $offset
+     * @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;
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Scope;
+    public function findOneBy(array $criteria, array $orderBy = null): ?Scope;
 
     public function getClassName(): string;
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php b/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php
new file mode 100644
index 000000000..2e0ac988f
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Repository/User/UserJobHistoryRepository.php
@@ -0,0 +1,27 @@
+<?php
+
+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 Chill\MainBundle\Repository\User;
+
+use Chill\MainBundle\Entity\User\UserJobHistory;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<UserJobHistory>
+ */
+class UserJobHistoryRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, UserJobHistory::class);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php b/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php
new file mode 100644
index 000000000..6ded91ba4
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Repository/User/UserScopeHistoryRepository.php
@@ -0,0 +1,27 @@
+<?php
+
+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 Chill\MainBundle\Repository\User;
+
+use Chill\MainBundle\Entity\User\UserScopeHistory;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<UserScopeHistory>
+ */
+final class UserScopeHistoryRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, UserScopeHistory::class);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php
index 395874deb..f14424f6f 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php
@@ -19,15 +19,7 @@ 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 __construct(private readonly ParentRoleHelper $parentRoleHelper, private readonly EntityManagerInterface $em) {}
 
     public function findUsersByReachedACL(string $role, $center, $scope = null, bool $onlyEnabled = true): array
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
index 6a51a9c0a..6c8d7191f 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
@@ -20,9 +20,9 @@ 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
+     * @param array|Center|Center[]|null $center
+     * @param array|Scope|Scope[]|null   $scope
+     * @param bool                       $onlyActive true if get only active users
      *
      * @return User[]
      */
diff --git a/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php b/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
index 0be3e1b9c..ca3c60e1c 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 class UserJobRepository implements UserJobRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -48,7 +48,7 @@ class UserJobRepository implements UserJobRepositoryInterface
      *
      * @return array|object[]|UserJob[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/UserJobRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserJobRepositoryInterface.php
index a752f452b..3c3f16fc1 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserJobRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserJobRepositoryInterface.php
@@ -34,7 +34,7 @@ interface UserJobRepositoryInterface extends ObjectRepository
      *
      * @return array|object[]|UserJob[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null);
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null);
 
     public function findOneBy(array $criteria): ?UserJob;
 
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index a26ae04ad..3bc24a6ac 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -13,6 +13,8 @@ namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\User;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\NoResultException;
@@ -20,17 +22,16 @@ use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\ORM\QueryBuilder;
 
-use function count;
-
-final class UserRepository implements UserRepositoryInterface
+final readonly class UserRepository implements UserRepositoryInterface
 {
-    private EntityManagerInterface $entityManager;
-
     private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    private const FIELDS = ['id', 'email', 'enabled', 'civility_id', 'civility_abbreviation', 'civility_name', 'label', 'mainCenter_id',
+        'mainCenter_name', 'mainScope_id', 'mainScope_name', 'userJob_id', 'userJob_name', 'currentLocation_id', 'currentLocation_name',
+        'mainLocation_id', 'mainLocation_name'];
+
+    public function __construct(private EntityManagerInterface $entityManager, private Connection $connection)
     {
-        $this->entityManager = $entityManager;
         $this->repository = $entityManager->getRepository(User::class);
     }
 
@@ -76,13 +77,94 @@ final class UserRepository implements UserRepositoryInterface
         return $this->repository->findAll();
     }
 
+    /**
+     * @throws Exception
+     */
+    public function findAllAsArray(string $lang): iterable
+    {
+        $sql = sprintf(<<<'SQL'
+            SELECT
+                u.id,
+                u.username AS username,
+                u.email AS email,
+                u.enabled,
+                u.civility_id,
+                civility.abbreviation->>:lang AS civility_abbreviation,
+                civility.name->>:lang AS civility_name,
+                u.label,
+                mainCenter.id AS mainCenter_id,
+                mainCenter.name AS mainCenter_name,
+                mainScope.id AS mainScope_id,
+                mainScope.name->>:lang AS mainScope_name,
+                userJob.id AS userJob_id,
+                userJob.label->>:lang AS userJob_name,
+                currentLocation.id AS currentLocation_id,
+                currentLocation.name AS currentLocation_name,
+                mainLocation.id AS mainLocation_id,
+                mainLocation.name AS mainLocation_name,
+                u.absenceStart
+            FROM users u
+            LEFT JOIN chill_main_civility civility ON u.civility_id = civility.id
+            LEFT JOIN centers mainCenter ON u.maincenter_id = mainCenter.id
+            LEFT JOIN chill_main_user_job_history userJobHistory ON u.id = userJobHistory.user_id
+            LEFT JOIN chill_main_user_job userJob ON userJobHistory.job_id = userJob.id AND tstzrange(userJobHistory.startdate, userJobHistory.enddate) @> NOW()
+            LEFT JOIN chill_main_user_scope_history userScopeHistory ON u.id = userScopeHistory.user_id AND tstzrange(userScopeHistory.startdate, userScopeHistory.enddate) @> NOW()
+            LEFT JOIN scopes mainScope ON userScopeHistory.scope_id = mainScope.id
+            LEFT JOIN chill_main_location currentLocation ON u.currentlocation_id = currentLocation.id
+            LEFT JOIN chill_main_location mainLocation ON u.mainlocation_id = mainLocation.id
+            ORDER BY u.label, u.id
+        SQL);
+
+        $query = $this->connection->prepare($sql);
+
+        foreach ($query->executeQuery(['lang' => $lang])->iterateAssociative() as $u) {
+            $converted = [];
+            foreach (self::FIELDS as $f) {
+                $converted[$f] = $u[strtolower($f)];
+            }
+
+            $converted['absenceStart'] = null !== $u['absencestart'] ? new \DateTimeImmutable($u['absencestart']) : null;
+
+            /* @phpstan-ignore-next-line phpstan does not take into account that all required keys will be present */
+            yield $converted;
+        }
+    }
+
+    public function findAllUserACLAsArray(): iterable
+    {
+        $sql = <<<'SQL'
+            SELECT
+                u.id,
+                u.username,
+                u.email,
+                u.label,
+                u.enabled,
+                c.id AS center_id,
+                c.name AS center_name,
+                pg.id AS permissionsGroup_id,
+                pg.name AS permissionsGroup_name
+            FROM users u
+                LEFT JOIN user_groupcenter ON u.id = user_groupcenter.user_id
+                LEFT JOIN group_centers ON user_groupcenter.groupcenter_id = group_centers.id
+                LEFT JOIN centers c on group_centers.center_id = c.id
+                LEFT JOIN permission_groups pg on group_centers.permissionsgroup_id = pg.id
+            ORDER BY u.username, c.name, pg.name
+        SQL;
+
+        $query = $this->entityManager->getConnection()->executeQuery($sql);
+
+        foreach ($query->iterateAssociative() as $u) {
+            yield $u;
+        }
+    }
+
     /**
      * @param mixed|null $limit
      * @param mixed|null $offset
      *
      * @return User[]
      */
-    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);
     }
@@ -90,7 +172,7 @@ final class UserRepository implements UserRepositoryInterface
     /**
      * @return array|User[]
      */
-    public function findByActive(?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findByActive(array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->findBy(['enabled' => true], $orderBy, $limit, $offset);
     }
@@ -100,12 +182,12 @@ final class UserRepository implements UserRepositoryInterface
      *
      * @return array|User[]
      */
-    public function findByNotHavingAttribute(string $key, ?int $limit = null, ?int $offset = null): array
+    public function findByNotHavingAttribute(string $key, int $limit = null, int $offset = null): array
     {
         $rsm = new ResultSetMappingBuilder($this->entityManager);
         $rsm->addRootEntityFromClassMetadata(User::class, 'u');
 
-        $sql = 'SELECT ' . $rsm->generateSelectClause() . ' FROM users u WHERE NOT attributes ?? :key OR attributes IS NULL AND enabled IS TRUE';
+        $sql = 'SELECT '.$rsm->generateSelectClause().' FROM users u WHERE NOT attributes ?? :key OR attributes IS NULL AND enabled IS TRUE';
 
         if (null !== $limit) {
             $sql .= " LIMIT {$limit}";
@@ -118,7 +200,7 @@ final class UserRepository implements UserRepositoryInterface
         return $this->entityManager->createNativeQuery($sql, $rsm)->setParameter(':key', $key)->getResult();
     }
 
-    public function findByUsernameOrEmail(string $pattern, ?array $orderBy = [], ?int $limit = null, ?int $offset = null): array
+    public function findByUsernameOrEmail(string $pattern, ?array $orderBy = [], int $limit = null, int $offset = null): array
     {
         $qb = $this->queryByUsernameOrEmail($pattern);
 
@@ -133,13 +215,13 @@ final class UserRepository implements UserRepositoryInterface
         }
 
         foreach ($orderBy as $field => $order) {
-            $qb->addOrderBy('u.' . $field, $order);
+            $qb->addOrderBy('u.'.$field, $order);
         }
 
         return $qb->getQuery()->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?User
+    public function findOneBy(array $criteria, array $orderBy = null): ?User
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -150,7 +232,7 @@ final class UserRepository implements UserRepositoryInterface
 
         try {
             return $qb->getQuery()->getSingleResult();
-        } catch (NoResultException $e) {
+        } catch (NoResultException) {
             return null;
         }
     }
@@ -163,17 +245,16 @@ final class UserRepository implements UserRepositoryInterface
      * 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 ' .
+                'SELECT DISTINCT gc '.
+                'FROM '.GroupCenter::class.' gc '.
+                'JOIN gc.permissionsGroup pg '.
+                'WHERE '.
                 'JSONB_EXISTS_IN_ARRAY(pg.flags, :flag) = :true '
             )
             ->setParameters([
@@ -182,7 +263,7 @@ final class UserRepository implements UserRepositoryInterface
             ])
             ->getResult();
 
-        if (count($gcs) === 0) {
+        if (0 === \count($gcs)) {
             return [];
         }
 
@@ -195,8 +276,8 @@ final class UserRepository implements UserRepositoryInterface
         $orx = $qb->expr()->orX();
 
         foreach ($gcs as $i => $gc) {
-            $orx->add(':gc_' . $i . ' MEMBER OF u.groupCenters');
-            $qb->setParameter('gc_' . $i, $gc);
+            $orx->add(':gc_'.$i.' MEMBER OF u.groupCenters');
+            $qb->setParameter('gc_'.$i, $gc);
         }
 
         $qb->andWhere($orx);
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
index c869e1b82..f05da315d 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepositoryInterface.php
@@ -14,6 +14,9 @@ namespace Chill\MainBundle\Repository;
 use Chill\MainBundle\Entity\User;
 use Doctrine\Persistence\ObjectRepository;
 
+/**
+ * @template ObjectRepository<User>
+ */
 interface UserRepositoryInterface extends ObjectRepository
 {
     public function countBy(array $criteria): int;
@@ -24,36 +27,40 @@ interface UserRepositoryInterface extends ObjectRepository
 
     public function countByUsernameOrEmail(string $pattern): int;
 
-    public function find($id, $lockMode = null, $lockVersion = null): ?User;
-
     /**
-     * @return User[]
-     */
-    public function findAll(): array;
-
-    /**
-     * @param mixed|null $limit
-     * @param mixed|null $offset
+     * Find a list of all users.
      *
-     * @return User[]
+     * The main purpose for this method is to provide a lightweight list of all users in the database.
+     *
+     * @param string $lang The lang to display all the translatable string (no fallback if not present)
+     *
+     * @return iterable<array{id: int, username: string, email: string, enabled: bool, civility_id: int, civility_abbreviation: string, civility_name: string, label: string, mainCenter_id: int, mainCenter_name: string, mainScope_id: int, mainScope_name: string, userJob_id: int, userJob_name: string, currentLocation_id: int, currentLocation_name: string, mainLocation_id: int, mainLocation_name: string, absenceStart: \DateTimeImmutable}>
      */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+    public function findAllAsArray(string $lang): iterable;
+
+    /**
+     * Find a list of permissions associated to each users.
+     *
+     * The main purpose for this method is to provide a lightweight list of all permissions group and center
+     * associated to each user.
+     *
+     * @return iterable<array{id: int, username: string, email: string, enabled: bool, center_id: int, center_name: string, permissionsGroup_id: int, permissionsGroup_name: string}>
+     */
+    public function findAllUserACLAsArray(): iterable;
 
     /**
      * @return array|User[]
      */
-    public function findByActive(?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findByActive(array $orderBy = null, int $limit = null, int $offset = null): array;
 
     /**
      * Find users which does not have a key on attribute column.
      *
      * @return array|User[]
      */
-    public function findByNotHavingAttribute(string $key, ?int $limit = null, ?int $offset = null): array;
+    public function findByNotHavingAttribute(string $key, int $limit = null, int $offset = null): array;
 
-    public function findByUsernameOrEmail(string $pattern, ?array $orderBy = [], ?int $limit = null, ?int $offset = null): array;
-
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?User;
+    public function findByUsernameOrEmail(string $pattern, ?array $orderBy = [], int $limit = null, int $offset = null): array;
 
     public function findOneByUsernameOrEmail(string $pattern): ?User;
 
@@ -65,9 +72,6 @@ interface UserRepositoryInterface extends ObjectRepository
      * and, then filter those users having some flags.
      *
      * @param \Chill\MainBundle\Entity\User[] $amongstUsers
-     * @param mixed $flag
      */
-    public function findUsersHavingFlags($flag, array $amongstUsers = []): array;
-
-    public function getClassName(): string;
+    public function findUsersHavingFlags(mixed $flag, array $amongstUsers = []): array;
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
index a304ff6d7..234ea258e 100644
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
@@ -20,7 +20,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 class EntityWorkflowRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -72,13 +72,13 @@ class EntityWorkflowRepository implements ObjectRepository
         foreach ($relateds as $related) {
             $orX->add(
                 $qb->expr()->andX(
-                    $qb->expr()->eq('w.relatedEntityClass', ':entity_class_' . $i),
-                    $qb->expr()->eq('w.relatedEntityId', ':entity_id_' . $i)
+                    $qb->expr()->eq('w.relatedEntityClass', ':entity_class_'.$i),
+                    $qb->expr()->eq('w.relatedEntityId', ':entity_id_'.$i)
                 )
             );
             $qb
-                ->setParameter('entity_class_' . $i, $related['entityClass'])
-                ->setParameter('entity_id_' . $i, $related['entityId']);
+                ->setParameter('entity_class_'.$i, $related['entityClass'])
+                ->setParameter('entity_id_'.$i, $related['entityId']);
             ++$i;
         }
         $qb->where($orX);
@@ -100,22 +100,22 @@ class EntityWorkflowRepository implements ObjectRepository
     }
 
     /**
-     * @param null|mixed $limit
-     * @param null|mixed $offset
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return array|EntityWorkflow[]
      */
-    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 findByCc(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findByCc(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryByCc($user)->select('ew');
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -123,12 +123,12 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByDest(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findByDest(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryByDest($user)->select('ew');
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -136,12 +136,12 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByPreviousDestWithoutReaction(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findByPreviousDestWithoutReaction(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryByPreviousDestWithoutReaction($user)->select('ew');
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -149,12 +149,12 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findByPreviousTransitionned(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findByPreviousTransitionned(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryByPreviousTransitionned($user)->select('ew')->distinct(true);
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
@@ -162,12 +162,12 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findBySubscriber(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBySubscriber(User $user, array $orderBy = null, $limit = null, $offset = null): array
     {
         $qb = $this->buildQueryBySubscriber($user)->select('ew');
 
         foreach ($orderBy as $key => $sort) {
-            $qb->addOrderBy('ew.' . $key, $sort);
+            $qb->addOrderBy('ew.'.$key, $sort);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php
index d8c3619c3..d7e5455ba 100644
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowStepRepository.php
@@ -20,14 +20,14 @@ use Doctrine\Persistence\ObjectRepository;
 
 class EntityWorkflowStepRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(EntityWorkflowStep::class);
     }
 
-    public function countUnreadByUser(User $user, ?array $orderBy = null, $limit = null, $offset = null): int
+    public function countUnreadByUser(User $user, array $orderBy = null, $limit = null, $offset = null): int
     {
         $qb = $this->buildQueryByUser($user)->select('count(e)');
 
@@ -44,7 +44,7 @@ class EntityWorkflowStepRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    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);
     }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss
index 0ae568244..28c597bc0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss
@@ -42,3 +42,7 @@ form {
     font-weight: 700;
     margin-bottom: .375em;
 }
+
+.chill_filter_order {
+    background: $gray-100;
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts
new file mode 100644
index 000000000..ce0671d82
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts
@@ -0,0 +1,20 @@
+const buildLinkCreate = function (relatedEntityClass: string, relatedEntityId: number, to: number | null, returnPath: string | null): string
+{
+    const params = new URLSearchParams();
+    params.append('entityClass', relatedEntityClass);
+    params.append('entityId', relatedEntityId.toString());
+
+    if (null !== to) {
+        params.append('tos[0]', to.toString());
+    }
+
+    if (null !== returnPath) {
+        params.append('returnPath', returnPath);
+    }
+
+    return `/fr/notification/create?${params.toString()}`;
+}
+
+export {
+    buildLinkCreate,
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
index 06683f8fc..b7cf2bcf0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
@@ -66,6 +66,10 @@ export default {
                return appMessages.fr.the_activity;
             case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod':
                return appMessages.fr.the_course;
+            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork':
+               return appMessages.fr.the_action;
+            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument':
+               return appMessages.fr.the_evaluation_document;
             case 'Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow':
                return appMessages.fr.the_workflow;
             default:
@@ -78,6 +82,10 @@ export default {
                return `/fr/activity/${n.relatedEntityId}/show`
             case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod':
                return `/fr/parcours/${n.relatedEntityId}`
+            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork':
+               return `/fr/person/accompanying-period/work/${n.relatedEntityId}/show`
+            case 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument':
+               return `/fr/person/accompanying-period/work/evaluation/document/${n.relatedEntityId}/show`
             case 'Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow':
                return `/fr/main/workflow/${n.relatedEntityId}/show`
             default:
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
index 697074671..c4c97e5c6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
@@ -46,6 +46,7 @@ const appMessages = {
         the_course: "le parcours",
         the_action: "l'action",
         the_evaluation: "l'évaluation",
+        the_evaluation_document: "le document",
         the_task: "la tâche",
         the_workflow: "le workflow",
         StartDate: "Date d'ouverture",
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
index 2bca56379..f5e914d27 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
@@ -1,7 +1,7 @@
 <template>
   <span v-if="data.working_ref_status === 'to_review'" class="badge bg-danger address-details-button-warning">L'adresse de référence a été modifiée</span>
-  <a v-if="data.loading === false" @click.prevent="clickOrOpen" class="btn btn-misc address-details-button">
-    <span class="fa fa-map"></span> <!-- button -->
+  <a v-if="data.loading === false" @click.prevent="clickOrOpen" class="btn btn-sm address-details-button" title="Plus de détails">
+    <span class="fa fa-map-o"></span>
   </a>
   <span v-if="data.loading" class="fa fa-spin fa-spinner "></span>
   <AddressModal :address="data.working_address" @update-address="onUpdateAddress" ref="address_modal"></AddressModal>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
index 14a376856..00fb2b996 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -1,6 +1,6 @@
 <template>
 
-   <component :is="component" class="chill-entity entity-address my-3">
+   <component :is="component" class="chill-entity entity-address">
 
       <component :is="component" class="address" :class="multiline">
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Center/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Center/edit.html.twig
new file mode 100644
index 000000000..4d55c480c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Center/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Center/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Center/index.html.twig
new file mode 100644
index 000000000..27c19c504
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Center/index.html.twig
@@ -0,0 +1,39 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Label'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.name }}</td>
+                    <td style="text-align:center">
+                        {% if entity.isActive %}
+                            <i class="fa fa-check-square-o"></i>
+                        {% else %}
+                            <i class="fa fa-square-o"></i>
+                        {% endif %}
+                    </td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_center_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Center/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Center/new.html.twig
new file mode 100644
index 000000000..7c204dddd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Center/new.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
deleted file mode 100644
index 1894a1402..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
-
-{% block title %}{{ 'Center edit'|trans }}{% endblock %}
-
-{% block admin_content -%}
-    <h1>{{ 'Center edit'|trans }}</h1>
-
-    {{ form_start(edit_form) }}
-    {{ form_row(edit_form.name) }}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class='cancel'>
-            <a href="{{ path('admin_center') }}" class="btn btn-cancel">
-                {{ 'Back to the list'|trans }}
-            </a>
-        </li>
-        <li>
-            {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' }}) }}
-        </li>
-    </ul>
-    
-    {{ form_end(edit_form) }}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
deleted file mode 100644
index cb2da8a62..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
+++ /dev/null
@@ -1,50 +0,0 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
-
-{% block title %}{{ 'Center list'|trans }}{% endblock %}
-
-{% block admin_content -%}
-    {% embed '@ChillMain/CRUD/_index.html.twig' %}
-    
-        {% block index_header %}
-            <h1>{{ 'Center list'|trans }}</h1>
-        {% endblock %}
-    
-        {% block filter_order %}{% endblock %}
-    
-        {% block table_entities_thead_tr %}
-            <th>id</th>
-            <th>{{ 'Name'|trans }}</th>
-            <th>{{ 'Actions'|trans }}</th>
-        {% endblock %}
-    
-        {% block table_entities_tbody %}
-            {% for entity in entities %}
-                <tr>
-                    <td>{{ entity.id }}</td>
-                    <td>{{ entity.name }}</td>
-                    <td>
-                        <ul class="record_actions">
-                            <li>
-                                <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
-                            </li>
-                        </ul>
-                    </td>
-                </tr>
-            {% endfor %}
-        {% endblock %}
-    
-        {% block pagination %}{% endblock %}
-    
-        {% block list_actions %}
-            <ul class="record_actions sticky-form-buttons">
-                <li class='cancel'>
-                    <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
-                </li>
-                <li>
-                    <a href="{{ path('admin_center_new') }}" class="btn btn-create">{{ 'Create a new center'|trans }}</a>
-                </li>
-            </ul>
-        {% endblock list_actions %}
-    
-    {% endembed %}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
deleted file mode 100644
index cc64b37c2..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
-
-{% block title %}{{ 'Center creation'|trans }}{% endblock %}
-
-{% block admin_content -%}
-    <h1>{{ 'Center creation'|trans }}</h1>
-
-    {{ form_start(form) }}
-    {{ form_row(form.name) }}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class='cancel'>
-            <a href="{{ path('admin_center') }}" class="btn btn-cancel">
-                {{ 'Back to the list'|trans }}
-            </a>
-        </li>
-        <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-save' }}) }}
-        </li>
-    </ul>
-    
-    {{ form_end(form) }}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
index ad05a5a2c..c95308610 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
@@ -1,10 +1,10 @@
 <span class="chill-entity entity-user">
     {{- user.label }}
-    {%- if opts['user_job'] and user.userJob is not null %}
-        <span class="user-job">({{ user.userJob.label|localize_translatable_string }})</span>
+    {%- if opts['user_job'] and user.userJob(opts['at']) is not null %}
+        <span class="user-job">({{ user.userJob(opts['at']).label|localize_translatable_string }})</span>
     {%- endif -%}
-    {%- if opts['main_scope'] and user.mainScope is not null %}
-    <span class="main-scope">({{ user.mainScope.name|localize_translatable_string }})</span>
+    {%- if opts['main_scope'] and user.mainScope(opts['at']) is not null %}
+    <span class="main-scope">({{ user.mainScope(opts['at']).name|localize_translatable_string }})</span>
     {%- endif -%}
     {%- if opts['absence'] and user.isAbsent %}
         <span class="badge bg-danger rounded-pill" title="{{ 'absence.Absent'|trans|escape('html_attr') }}">{{ 'absence.A'|trans }}</span>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
index 1e69c5a49..bd7dbf7e9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  <info@champs-libres.coop> / <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
 {% block title "Download export"|trans ~ export.title|trans %}
-    
+
 {% block js %}
 <script type="text/javascript">
 window.addEventListener("DOMContentLoaded", function(e) {
@@ -27,20 +27,20 @@ window.addEventListener("DOMContentLoaded", function(e) {
         query = window.location.search,
         container = document.querySelector("#download_container")
         ;
-    
+
     chill.download_report(url+query, container);
-});   
+});
 </script>
 {% endblock %}
- 
+
 {% block content %}
     <div class="col-md-10">
-    
+
         {{ include('@ChillMain/Export/_breadcrumb.html.twig') }}
-        
+
         <h1>{{ export.title|trans }}</h1>
         <h2>{{ "Download export"|trans }}</h2>
-        
+
         <div id="download_container"
              data-alias="{{ alias|escape('html_attr') }}"
              {%- if mime_type is defined %}
@@ -53,10 +53,24 @@ window.addEventListener("DOMContentLoaded", function(e) {
             <li class="cancel"><a href="{{ chill_return_path_or('chill_main_export_index') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a></li>
 
             {% if not app.request.query.has('prevent_save') %}
+                {% if saved_export is null %}
                 <li>
                     <a href="{{ chill_path_add_return_path('chill_main_export_save_from_key', { alias: alias, key: app.request.query.get('key')}) }}" class="btn btn-save">{{ 'Save'|trans }}</a>
                 </li>
+                {% else %}
+                <li>
+                    <div class="dropdown">
+                        <button class="btn btn-save dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            {{ 'Save'|trans }}
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li><a href="{{ chill_path_add_return_path('chill_main_export_save_from_key', { alias: alias, key: app.request.query.get('key')}) }}" class="dropdown-item">{{ 'Save'|trans }}</a></li>
+                            <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit_options_from_key', { id: saved_export.id(), key: app.request.query.get('key') }) }}" class="dropdown-item">{{ 'saved_export.Update existing'|trans }}</a></li>
+                        </ul>
+                    </div>
+                </li>
+                {% endif %}
             {% endif %}
         </ul>
 </div>
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
index 9e37dc2cd..2e2dc0ec6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig
@@ -39,8 +39,13 @@
                 {{ 'This will eventually restrict your possibilities in filtering the data.'|trans }}</p>
 
             <h3 class="m-3">{{ 'Center'|trans }}</h3>
+
             {{ form_widget(form.centers.center) }}
 
+            <div class="mb-3 mt-3">
+                <input id="toggle-check-all" class="btn btn-misc" type= "button" onclick='uncheckAll(this)' value="{{ 'uncheck all centers'|trans|e('html_attr') }}"/>
+            </div>
+
             {% if form.centers.regroupment is defined %}
                 <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
                 {{ form_widget(form.centers.regroupment) }}
@@ -53,3 +58,15 @@
 
     </div>
 {% endblock content %}
+
+{% block js %}
+
+    <script>
+        const uncheckAll = () => {
+            const allCenters = document.getElementsByName('centers[center][]');
+
+            allCenters.forEach(checkbox => checkbox.checked = false)
+        }
+    </script>
+
+{% endblock js %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
index 1f1e54c72..adf67b81b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
@@ -1,65 +1,144 @@
 {{ form_start(form) }}
-    <div class="chill_filter_order container my-4">
-        <div class="row">
-            {% 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>
-            {% endif %}
-        </div>
-        {% if form.dateRanges is defined %}
-            {% if form.dateRanges|length > 0 %}
-                {% for dateRangeName, _o in form.dateRanges %}
-                    <div class="row gx-2 justify-content-center">
-                        {% if form.dateRanges[dateRangeName].vars.label is not same as(false) %}
-                        <div class="col-md-5">
-                            {{ form_label(form.dateRanges[dateRangeName])}}
-                        </div>
-                        {% endif %}
-                        <div class="col-md-6">
-                            <div class="input-group mb-3">
-                                <span class="input-group-text">{{ 'chill_calendar.From'|trans }}</span>
-                                {{ form_widget(form.dateRanges[dateRangeName]['from']) }}
-                                <span class="input-group-text">{{ 'chill_calendar.To'|trans }}</span>
-                                {{ form_widget(form.dateRanges[dateRangeName]['to']) }}
-                            </div>
-                        </div>
-                        <div class="col-md-1">
-                            <button type="submit" class="btn btn-misc"><i class="fa fa-filter"></i></button>
+<div class="accordion my-3" id="filterOrderAccordion">
+    <h2 class="accordion-header" id="filterOrderHeading">
+        <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#filterOrderCollapse" aria-expanded="true" aria-controls="filterOrderCollapse">
+            <strong><i class="fa fa-fw fa-filter"></i>Filtrer la liste</strong>
+        </button>
+    </h2>
+    <div class="accordion-collapse collapse" id="filterOrderCollapse" aria-labelledby="filterOrderHeading" data-bs-parent="#filterOrderAccordion">
+        {% set btnSubmit = 0 %}
+        <div class="accordion-body chill_filter_order container-xxl p-5 py-2">
+            <div class="row my-2">
+                {% if form.vars.has_search_box %}
+                    <div class="col-sm-12">
+                        <div class="input-group">
+                            {{ form_widget(form.q) }}
+                            <button type="submit" class="btn btn-misc"><i class="fa fa-search"></i></button>
                         </div>
                     </div>
-                {% endfor %}
+                {% endif %}
+            </div>
+
+            {% if form.dateRanges is defined %}
+                {% set btnSubmit = 1 %}
+                {% if form.dateRanges|length > 0 %}
+                    {% for dateRangeName, _o in form.dateRanges %}
+                        <div class="row my-2">
+                            {% if form.dateRanges[dateRangeName].vars.label is not same as(false) %}
+                                {{ form_label(form.dateRanges[dateRangeName])}}
+                            {% else %}
+                                <div class="col-sm-4 col-form-label">{{ 'filter_order.By date'|trans }}</div>
+                            {% endif %}
+                            <div class="col-sm-8 pt-1">
+                                <div class="input-group">
+                                    <span class="input-group-text">{{ 'chill_calendar.From'|trans }}</span>
+                                    {{ form_widget(form.dateRanges[dateRangeName]['from']) }}
+                                    <span class="input-group-text">{{ 'chill_calendar.To'|trans }}</span>
+                                    {{ form_widget(form.dateRanges[dateRangeName]['to']) }}
+                                </div>
+                            </div>
+                        </div>
+                    {% endfor %}
+                {% endif %}
             {% endif %}
-        {% endif %}
-        {% 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">
+
+            {% if form.checkboxes is defined %}
+                {% set btnSubmit = 1 %}
+                {% if form.checkboxes|length > 0 %}
+                    {% for checkbox_name, options in form.checkboxes %}
+                        <div class="row my-2">
+                            <div class="col-sm-4 col-form-label">{{ 'filter_order.By'|trans }}</div>
+                            <div class="col-sm-8 pt-2">
+                                {% for c in form['checkboxes'][checkbox_name].children %}
                                     {{ 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>
+                                {% endfor %}
                             </div>
                         </div>
-                    {% endif %}
+                    {% endfor %}
+                {% endif %}
+            {% endif %}
+
+            {% if form.entity_choices is defined %}
+                {% set btnSubmit = 1 %}
+                {% if form.entity_choices |length > 0 %}
+                    {% for checkbox_name, options in form.entity_choices %}
+                        <div class="row my-2">
+                            {% if form.entity_choices[checkbox_name].vars.label is not same as(false) %}
+                                {{ form_label(form.entity_choices[checkbox_name])}}
+                            {% endif %}
+                            <div class="col-sm-8 pt-2">
+                                {% for c in form['entity_choices'][checkbox_name].children %}
+                                    {{ form_widget(c) }}
+                                    {{ form_label(c) }}
+                                {% endfor %}
+                            </div>
+                        </div>
+                    {% endfor %}
+                {% endif %}
+            {% endif %}
+
+            {% if form.user_pickers is defined %}
+                {% set btnSubmit = 1 %}
+                {% if form.user_pickers.children|length > 0 %}
+                    {% for name, options in form.user_pickers %}
+                        <div class="row my-2">
+                            {% if form.user_pickers[name].vars.label is not same as(false) %}
+                                {{ form_label(form.user_pickers[name]) }}
+                            {% else %}
+                                {{ form_label(form.user_pickers[name].vars.label) }}
+                            {% endif %}
+                            <div class="col-sm-8 pt-2">
+                                {{ form_widget(form.user_pickers[name]) }}
+                            </div>
+                        </div>
+                    {% endfor %}
+                {% endif %}
+            {% endif %}
+
+            {% if form.single_checkboxes is defined %}
+                {% set btnSubmit = 1 %}
+                {% for name, _o in form.single_checkboxes %}
+                    <div class="row my-2">
+                        <div class="col-sm-4 col-form-label">{{ 'filter_order.By'|trans }}</div>
+                        <div class="col-sm-8 pt-2">
+                            {{ form_widget(form.single_checkboxes[name]) }}
+                        </div>
+                    </div>
                 {% endfor %}
             {% endif %}
-        {% endif %}
+
+            {% if btnSubmit == 1 %}
+                <div class="row my-2">
+                    <button type="submit" class="btn btn-sm btn-misc"><i class="fa fa-fw fa-filter"></i>{{ 'Filter'|trans }}</button>
+                </div>
+            {% endif %}
+
+        </div>
     </div>
+
+    {% if active|length > 0 %}
+        <div class="activeFilters mt-3">
+            {% for f in active %}
+                <span class="badge rounded-pill bg-secondary ms-1 {{ f.position }} {{ f.name }}">
+                    {%- if f.label != '' %}
+                        <span class="text-dark">{{ f.label|trans }}&nbsp;: </span>
+                    {% endif -%}
+                    {%- if f.position == 'search_box' and f.value is not null %}
+                        <span class="text-dark">{{ 'filter_order.search_box'|trans ~ ' :' }}</span>
+                    {% endif -%}
+                    {{ f.value}}{#
+                #}</span>
+            {% endfor %}
+        </div>
+    {% endif %}
+    <div>
+
+    </div>
+</div>
+
+{% for k,v in otherParameters %}
+    <input type="hidden" name="{{ k }}" value="{{ v }}" />
+{% endfor %}
 {{ form_end(form) }}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig
index e42faeeb6..00a50c6e3 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig
@@ -28,7 +28,7 @@
 
         <b>
             {{ app.user.username }}
-            {{ render(controller('ChillMainBundle:UI:showNotificationUserCounter')) }}
+            {{ render(controller('Chill\\MainBundle\\Controller\\UIController::showNotificationUserCounterAction')) }}
         </b>
 
         {% if is_granted('ROLE_PREVIOUS_ADMIN') %}
@@ -43,14 +43,15 @@
             <a class="dropdown-item list-group-item bg-dark text-white"
                 href="{{ path('chill_crud_admin_user_index', {'_switch_user': '_exit'}) }}">
                 {{ 'Exit impersonation'|trans }}
+            </a>
             {% else %}
             <a class="dropdown-item list-group-item bg-dark text-white"
                 href="{{ menu.uri }}">{{ menu.label|trans }}
-            {% endif %}
-            {% if menu.extras.icon is defined %}
-                <i class="fa fa-{{ menu.extras.icon }} fa-lg"></i>
-            {% endif %}
+                {% if menu.extras.icon is defined %}
+                    <i class="fa fa-{{ menu.extras.icon }} fa-lg"></i>
+                {% endif %}
             </a>
+            {% endif %}
         {% endfor %}
 
     </div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig
index d92e4230e..0e64e9f6a 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_counter_notifications_for.html.twig
@@ -9,4 +9,4 @@
             {{ 'notification.counter unread notifications'|trans({'unread': counter.unread }) }}
         </span>
     {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
index 748142ab8..fbb9e3f4d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
@@ -2,7 +2,7 @@
 
 <div class="flex-table accordion accordion-flush" id="notification-fold">
     {% for notification in notifications %}
-        {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
+        {% include '@ChillMain/Notification/_list_item.html.twig' with {
             'full_content': true,
             'fold_item': true,
             'action_button': true,
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
index 6dff67299..90d103aaf 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
@@ -49,7 +49,7 @@
         <div class="flex-table accordion accordion-flush" id="notification-fold">
             {% for data in datas %}
                 {% set notification = data.notification %}
-                {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
+                {% include '@ChillMain/Notification/_list_item.html.twig' with {
                     'fold_item': true,
                     'notification_cc': data.template_data.notificationCc is defined ? data.template_data.notificationCc : false
                 } %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
index 2f9d5d63f..53e296d8d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
@@ -20,7 +20,7 @@
     <h1>{{ 'notification.Notification'|trans }}</h1>
 
     <div class="flex-table">
-        {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
+        {% include '@ChillMain/Notification/_list_item.html.twig' with {
             'data': {
                  'template': handler.getTemplate(notification),
                  'template_data': handler.getTemplateData(notification)
@@ -32,7 +32,7 @@
         } %}
     </div>
 
-    {% include 'ChillMainBundle:Notification:_item_comments.html.twig' %}
+    {% include '@ChillMain/Notification/_item_comments.html.twig' %}
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig
index fd0cda2a7..7e0517e31 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig
@@ -22,18 +22,28 @@
                                 <div class="item-row card-body">
                                     <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
                                     <h2 class="card-title">{{ s.saved.title }}</h2>
-            
+
                                     <div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div>
-            
+
                                     <div class="card-text my-3">
                                         {{ s.saved.description|chill_markdown_to_html }}
                                     </div>
-            
+
                                     <div>
                                         <ul class="record_actions">
-                                            <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li>
-                                            <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li>
-                                            <li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li>
+                                            <li>
+                                                <div class="dropdown">
+                                                    <button class="btn btn-outline-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                                        {{ 'Actions'|trans }}
+                                                    </button>
+                                                    <ul class="dropdown-menu">
+                                                        <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="dropdown-item"><i class="fa fa-pencil"></i> {{ 'saved_export.update_title_and_description'|trans }}</a></li>
+                                                        <li><a href="{{ chill_path_add_return_path('chill_main_export_new', {'alias': s.saved.exportAlias,'from_saved': s.saved.id }) }}" class="dropdown-item"><i class="fa fa-pencil"></i> {{ 'saved_export.update_filters_aggregators_and_execute'|trans }}</a></li>
+                                                        <li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="dropdown-item"><i class="fa fa-cog"></i> {{ 'saved_export.execute'|trans }}</a></li>
+                                                        <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="dropdown-item"><i class="fa fa-trash"></i> {{ 'Delete'|trans }}</a></li>
+                                                    </ul>
+                                                </div>
+                                            </li>
                                         </ul>
                                     </div>
                                 </div>
@@ -54,13 +64,13 @@
                             <div class="item-row card-body">
                                 <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
                                 <h2 class="card-title">{{ s.saved.title }}</h2>
-            
+
                                 <div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div>
-                                
+
                                 <div class="card-text my-3">
                                     {{ s.saved.description|chill_markdown_to_html }}
                                 </div>
-                        
+
                                 <div>
                                     <ul class="record_actions">
                                         <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
index 60beb7ed7..38493201e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
@@ -4,20 +4,20 @@
 
 {% block admin_content -%}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
-    
+
         {% block index_header %}
             <h1>{{ 'List circles'|trans }}</h1>
         {% endblock %}
-        
+
         {% block filter_order %}{% endblock %}
-    
+
         {% block table_entities_thead_tr %}
             <th>id</th>
             <th>{{ 'Name'|trans }}</th>
             <th>{{ 'Active'|trans }}</th>
             <th>{{ 'Actions'|trans }}</th>
         {% endblock %}
-    
+
         {% block table_entities_tbody %}
             {% for entity in entities %}
                 <tr>
@@ -40,9 +40,9 @@
                 </tr>
             {% endfor %}
         {% endblock %}
-    
+
         {% block pagination %}{% endblock %}
-    
+
         {% block list_actions %}
             <ul class="record_actions sticky-form-buttons">
                 <li class='cancel'>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
index 4ac863ee6..4c90915ed 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
@@ -1,7 +1,8 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content -%}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+
         {% block crud_content_after_form %}
             {% if access_permissions_group_list %}
                 <h2 class="mt-5">{{ 'Permissions granted'|trans }}</h2>
@@ -54,5 +55,14 @@
         {% endblock %}
 
         {% block content_form_actions_save_and_show %}{% endblock %}
+
+        {% block content_form_actions_view %}
+        <li>
+            <a href="{{ path('admin_user_job_scope_history', {id: entity.id}) }}" class="btn btn-show">
+                {{ 'admin.users.job_scope_histories.Show history'|trans }}
+            </a>
+        </li>
+        {% endblock %}
+
     {% endembed %}
 {% endblock %}
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
index b1990833c..3c3e6d5f7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title %}{{ 'Edit my current location'|trans }}{% endblock %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/history.html.twig
new file mode 100644
index 000000000..eb1e0e461
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/history.html.twig
@@ -0,0 +1,81 @@
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+
+{% block title %}{{ 'admin.users.job_scope_histories.index.histories'|trans }}{% endblock title %}
+
+{% block admin_content %}
+    <h2>{{ user.usernameCanonical }}</h2>
+    <h1>{{ 'admin.users.job_scope_histories.index.histories'|trans }}</h1>
+
+    <h3 class="mt-5">{{ 'admin.users.job_scope_histories.index.job_history.title'|trans }}</h3>
+    <table class="records_list table table-bordered border-dark">
+        <thead>
+            <tr>
+                <th class="w-25">{{ 'admin.users.job_scope_histories.index.job_history.start'|trans }}</th>
+                <th class="w-25">{{ 'admin.users.job_scope_histories.index.job_history.end'|trans }}</th>
+                <th>{{ 'admin.users.job_scope_histories.index.job_history.job'|trans }}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for entity in jobHistories %}
+                <tr>
+                    <td>{{ entity.startDate|format_datetime('medium') }}</td>
+                    <td>
+                        {% if entity.endDate is not null %}
+                            {{ entity.endDate|format_datetime('medium') }}
+                        {% else %}
+                            <i class="opacity-50">{{ "admin.users.job_scope_histories.index.job_history.today"|trans }}</i>
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if entity.job %}
+                            {{ entity.job.label|localize_translatable_string }}
+                        {% else %}
+                            <i class="opacity-50">{{ 'admin.users.job_scope_histories.index.job_history.undefined'|trans }}</i>
+                        {% endif %}
+                    </td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+    <h3 class="mt-5">{{ 'admin.users.job_scope_histories.index.scope_history.title'|trans }}</h3>
+    <table class="records_list table table-bordered border-dark">
+        <thead>
+        <tr>
+            <th class="w-25">{{ 'admin.users.job_scope_histories.index.scope_history.start'|trans }}</th>
+            <th class="w-25">{{ 'admin.users.job_scope_histories.index.scope_history.end'|trans }}</th>
+            <th>{{ 'admin.users.job_scope_histories.index.scope_history.scope'|trans }}</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for entity in scopeHistories %}
+            <tr>
+                <td>{{ entity.startDate|format_datetime('medium') }}</td>
+                <td>
+                    {% if entity.endDate is not null %}
+                        {{ entity.endDate|format_datetime('medium') }}
+                    {% else %}
+                        <i class="opacity-50">{{ "admin.users.job_scope_histories.index.scope_history.today"|trans }}</i>
+                    {% endif %}
+                </td>
+                <td>
+                    {% if entity.scope %}
+                        {{ entity.scope.name|localize_translatable_string }}
+                    {% else %}
+                        <i class="opacity-50">{{ 'admin.users.job_scope_histories.index.scope_history.undefined'|trans }}</i>
+                    {% endif %}
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_crud_admin_user_edit', {id: user.id}) }}" class="btn btn-cancel">
+                {{'admin.users.job_scope_histories.index.Back to user job'|trans }}
+            </a>
+        </li>
+    </ul>
+
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index e4e7d70d8..5393f09c8 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -56,7 +56,9 @@
                             </li>
                             <li>
                                 <span class="dt">métier:</span>
-                                {% if entity.userJob %}{{ entity.userJob.label|localize_translatable_string }}{% endif %}
+                                {% if entity.userJob %}
+                                    {{ entity.userJob.label|localize_translatable_string }}
+                                {% endif %}
                             </li>
                             <li>
                                 <span class="dt">cercle/centre:</span>
@@ -98,6 +100,18 @@
                 <li class='cancel'>
                     <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
                 </li>
+
+                <li>
+                    <div class="dropdown">
+                        <button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            <i class="fa fa-download"></i>
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li><a class="dropdown-item" href="{{ path('chill_main_users_export_list') }}">{{ 'admin.users.export_list_csv'|trans }}</a></li>
+                            <li><a class="dropdown-item" href="{{ path('chill_main_users_export_permissions') }}">{{ 'admin.users.export_permissions_csv'|trans }}</a></li>
+                        </ul>
+                    </div>
+                </li>
                 <li>
                     <a href="{{ path('chill_crud_admin_user_new') }}" class="btn btn-create">{{ 'Create'|trans }}</a>
                 </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
index 3902b33cf..a0c66ccdc 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
@@ -35,7 +35,7 @@
 
         {% block actions_before %}
             <li class='cancel'>
-                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans }}</a>
             </li>
         {% endblock %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig
index 1099d8452..5d8c39c63 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as macro %}
 
diff --git a/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php b/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php
index 112054ee3..37faf98ab 100644
--- a/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php
+++ b/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php
@@ -22,12 +22,8 @@ use Symfony\Component\Routing\RouteCollection;
  */
 class ChillRoutesLoader extends Loader
 {
-    private array $routes;
-
-    public function __construct(array $routes)
+    public function __construct(private readonly array $routes)
     {
-        $this->routes = $routes;
-
         parent::__construct();
     }
 
diff --git a/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php b/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
index f2b19f84c..6dfab882a 100644
--- a/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
+++ b/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
@@ -14,15 +14,13 @@ namespace Chill\MainBundle\Routing;
 use Knp\Menu\MenuItem;
 
 /**
- * Implements a builder for menu
+ * Implements a builder for menu.
  *
  * @template TParams of array
  */
 interface LocalMenuBuilderInterface
 {
     /**
-     * @param $menuId
-     * @param MenuItem $menu
      * @param TParams $parameters
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters);
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
index 7bd23c81f..809733287 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
@@ -23,14 +23,11 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $authorizationChecker;
 
-    protected ParameterBagInterface $parameterBag;
-
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
-        ParameterBagInterface $parameterBag
+        protected ParameterBagInterface $parameterBag
     ) {
         $this->authorizationChecker = $authorizationChecker;
-        $this->parameterBag = $parameterBag;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
@@ -49,7 +46,7 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
             ]);
 
         $menu->addChild('Center list', [
-            'route' => 'admin_center',
+            'route' => 'chill_crud_center_index',
         ])->setExtras(['order' => 1010]);
 
         $menu->addChild('Regroupements des centres', [
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
index 305b944d8..37c47e1bd 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
@@ -23,25 +23,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected AuthorizationCheckerInterface $authorizationChecker;
-
-    protected ParameterBagInterface $parameterBag;
-
-    protected TranslatorInterface $translator;
-
     /**
      * SectionMenuBuilder constructor.
      */
-    public function __construct(AuthorizationCheckerInterface $authorizationChecker, TranslatorInterface $translator, ParameterBagInterface $parameterBag)
-    {
-        $this->authorizationChecker = $authorizationChecker;
-        $this->translator = $translator;
-        $this->parameterBag = $parameterBag;
-    }
+    public function __construct(protected AuthorizationCheckerInterface $authorizationChecker, protected TranslatorInterface $translator, protected ParameterBagInterface $parameterBag) {}
 
-    /**
-     * @param $menuId
-     */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild($this->translator->trans('Homepage'), [
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
index ea5ed2062..2c28ff2e8 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
@@ -22,33 +22,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected ParameterBagInterface $parameterBag;
-
-    private NotificationByUserCounter $notificationByUserCounter;
-
-    private RequestStack $requestStack;
-
-    private Security $security;
-
-    private TranslatorInterface $translator;
-
-    private WorkflowByUserCounter $workflowByUserCounter;
-
-    public function __construct(
-        NotificationByUserCounter $notificationByUserCounter,
-        WorkflowByUserCounter $workflowByUserCounter,
-        Security $security,
-        TranslatorInterface $translator,
-        ParameterBagInterface $parameterBag,
-        RequestStack $requestStack
-    ) {
-        $this->notificationByUserCounter = $notificationByUserCounter;
-        $this->workflowByUserCounter = $workflowByUserCounter;
-        $this->security = $security;
-        $this->translator = $translator;
-        $this->parameterBag = $parameterBag;
-        $this->requestStack = $requestStack;
-    }
+    public function __construct(private readonly NotificationByUserCounter $notificationByUserCounter, private readonly WorkflowByUserCounter $workflowByUserCounter, private readonly Security $security, private readonly TranslatorInterface $translator, protected ParameterBagInterface $parameterBag, private readonly RequestStack $requestStack) {}
 
     public function buildMenu($menuId, \Knp\Menu\MenuItem $menu, array $parameters)
     {
@@ -72,19 +46,19 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     ]
                 )
                 ->setExtras([
-                    'order' => -9999999,
+                    'order' => -9_999_999,
                     'icon' => 'map-marker',
                 ]);
 
             $nbNotifications = $this->notificationByUserCounter->countUnreadByUser($user);
 
-            //TODO add an icon? How exactly? For example a clock icon...
+            // TODO add an icon? How exactly? For example a clock icon...
             $menu
                 ->addChild($this->translator->trans('absence.Set absence date'), [
                     'route' => 'chill_main_user_absence_index',
                 ])
                 ->setExtras([
-                    'order' => -8888888,
+                    'order' => -8_888_888,
                 ]);
 
             $menu
@@ -116,7 +90,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                         ['route' => 'change_my_password']
                     )
                     ->setExtras([
-                        'order' => 99999999998,
+                        'order' => 99_999_999_998,
                     ]);
             }
         }
@@ -129,7 +103,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                 ]
             )
             ->setExtras([
-                'order' => 99999999999,
+                'order' => 99_999_999_999,
                 'icon' => 'power-off',
             ]);
     }
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
index 2fc1eb3d0..e16b10e8f 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
@@ -17,10 +17,6 @@ use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\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.
@@ -31,23 +27,9 @@ class MenuComposer
 {
     private array $localMenuBuilders = [];
 
-    private FactoryInterface $menuFactory;
-
     private RouteCollection $routeCollection;
 
-    private RouterInterface $router;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        RouterInterface $router,
-        FactoryInterface $menuFactory,
-        TranslatorInterface $translator
-    ) {
-        $this->router = $router;
-        $this->menuFactory = $menuFactory;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly RouterInterface $router, private readonly FactoryInterface $menuFactory, private readonly TranslatorInterface $translator) {}
 
     public function addLocalMenuBuilder(LocalMenuBuilderInterface $menuBuilder, $menuId)
     {
@@ -67,7 +49,7 @@ class MenuComposer
                 'order' => $order,
             ])
                 ->setExtras([
-                    //'icon' => $route['icon'],
+                    // '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,
                 ]);
@@ -90,7 +72,7 @@ class MenuComposer
      * The array is aimed to build route with MenuTwig.
      *
      * @param string $menuId
-     * @param array $parameters see https://redmine.champs-libres.coop/issues/179
+     * @param array  $parameters see https://redmine.champs-libres.coop/issues/179
      *
      * @return array
      */
@@ -101,13 +83,13 @@ class MenuComposer
 
         foreach ($routeCollection->all() as $routeKey => $route) {
             if ($route->hasOption('menus')) {
-                if (array_key_exists($menuId, $route->getOption('menus'))) {
+                if (\array_key_exists($menuId, $route->getOption('menus'))) {
                     $route = $route->getOption('menus')[$menuId];
 
                     $route['key'] = $routeKey;
 
                     $order = $this->resolveOrder($routes, $route['order']);
-                    //we do not want to duplicate order information
+                    // we do not want to duplicate order information
                     unset($route['order']);
                     $routes[$order] = $route;
                 }
@@ -130,7 +112,7 @@ class MenuComposer
      */
     public function hasLocalMenuBuilder($menuId): bool
     {
-        return array_key_exists($menuId, $this->localMenuBuilders);
+        return \array_key_exists($menuId, $this->localMenuBuilders);
     }
 
     /**
@@ -161,7 +143,7 @@ class MenuComposer
 
         ksort($ordered);
 
-        $menus = array_merge(array_values($ordered), $unordered);
+        $menus = \array_merge(\array_values($ordered), $unordered);
         $menu->reorderChildren($menus);
     }
 
@@ -171,7 +153,7 @@ class MenuComposer
      * first next order available.
      *
      * @param array $routes the routes previously added
-     * @param int $order
+     * @param int   $order
      *
      * @return int
      */
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
index bca9a81c3..65608ba4d 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
@@ -22,43 +22,32 @@ use Twig\TwigFunction;
  */
 class MenuTwig extends AbstractExtension implements ContainerAwareInterface
 {
-    /**
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     /**
      * the default parameters for chillMenu.
      *
      * @var mixed[]
      */
-    private $defaultParams = [
+    private array $defaultParams = [
         'layout' => '@ChillMain/Menu/defaultMenu.html.twig',
         'args' => [],
         'activeRouteKey' => null,
     ];
 
-    /**
-     * @var MenuComposer
-     */
-    private $menuComposer;
-
-    public function __construct(MenuComposer $menuComposer)
-    {
-        $this->menuComposer = $menuComposer;
-    }
+    public function __construct(private readonly MenuComposer $menuComposer) {}
 
     /**
      * 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)
+     * - layout: the layout. Absolute path needed (i.e.: @ChillXyz/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 string  $menuId
      * @param mixed[] $params
      */
     public function chillMenu(Environment $env, $menuId, array $params = [])
@@ -68,7 +57,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
         $layout = $resolvedParams['layout'];
         unset($resolvedParams['layout']);
 
-        if ($this->menuComposer->hasLocalMenuBuilder($menuId) === false) {
+        if (false === $this->menuComposer->hasLocalMenuBuilder($menuId)) {
             $resolvedParams['routes'] = $this->menuComposer->getRoutesFor($menuId, $resolvedParams);
 
             return $env->render($layout, $resolvedParams);
@@ -82,7 +71,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
     {
         return [new TwigFunction(
             'chill_menu',
-            [$this, 'chillMenu'],
+            $this->chillMenu(...),
             [
                 'is_safe' => ['html'],
                 'needs_environment' => true,
@@ -96,7 +85,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
         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 0ddf5cd0a..9c3f96f5d 100644
--- a/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
+++ b/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
@@ -13,9 +13,6 @@ namespace Chill\MainBundle\Search;
 
 use DateTime;
 
-use function array_key_exists;
-use function strpos;
-
 /**
  * This class implements abstract search with most common responses.
  *
@@ -29,17 +26,17 @@ abstract class AbstractSearch implements SearchInterface
      *
      * @param type $string
      *
-     * @throws ParsingException if the  date is not parseable
+     * @return \DateTime
      *
-     * @return DateTime
+     * @throws ParsingException if the  date is not parseable
      */
     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);
+                      .'not parsable', 0, $ex);
 
             throw $exception;
         }
@@ -59,18 +56,18 @@ abstract class AbstractSearch implements SearchInterface
         $recomposed = '';
 
         if (null !== $domain) {
-            $recomposed .= '@' . $domain . ' ';
+            $recomposed .= '@'.$domain.' ';
         }
 
         foreach ($supportedTerms as $term) {
-            if (array_key_exists($term, $terms) && '_default' !== $term) {
-                $recomposed .= ' ' . $term . ':';
-                $containsSpace = strpos($terms[$term], ' ') !== false;
+            if (\array_key_exists($term, $terms) && '_default' !== $term) {
+                $recomposed .= ' '.$term.':';
+                $containsSpace = str_contains((string) $terms[$term], ' ');
 
                 if ($containsSpace) {
                     $recomposed .= '"';
                 }
-                $recomposed .= (mb_stristr(' ', $terms[$term]) === false) ? $terms[$term] : '(' . $terms[$term] . ')';
+                $recomposed .= (false === mb_stristr(' ', (string) $terms[$term])) ? $terms[$term] : '('.$terms[$term].')';
 
                 if ($containsSpace) {
                     $recomposed .= '"';
@@ -79,11 +76,11 @@ abstract class AbstractSearch implements SearchInterface
         }
 
         if ('' !== $terms['_default']) {
-            $recomposed .= ' ' . $terms['_default'];
+            $recomposed .= ' '.$terms['_default'];
         }
 
-        //strip first character if empty
-        if (mb_strcut($recomposed, 0, 1) === ' ') {
+        // strip first character if empty
+        if (' ' === mb_strcut($recomposed, 0, 1)) {
             $recomposed = mb_strcut($recomposed, 1);
         }
 
diff --git a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
index 6affc5a5d..12568287d 100644
--- a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
@@ -15,17 +15,9 @@ 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;
-
-    public function __construct(UserRepository $userRepository)
-    {
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly UserRepository $userRepository) {}
 
     public function getResult(string $key, array $metadata, float $pertinence)
     {
@@ -34,7 +26,7 @@ class SearchUserApiProvider implements SearchApiInterface
 
     public function prepare(array $metadatas): void
     {
-        $ids = array_map(static fn ($m) => $m['id'], $metadatas);
+        $ids = \array_map(static fn ($m) => $m['id'], $metadatas);
 
         $this->userRepository->findBy(['id' => $ids]);
     }
@@ -66,6 +58,6 @@ class SearchUserApiProvider implements SearchApiInterface
 
     public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return in_array('user', $types, true);
+        return \in_array('user', $types, true);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php b/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php
index e5f103cdf..7aaf31bb3 100644
--- a/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php
@@ -20,4 +20,6 @@ interface HasAdvancedSearchFormInterface extends SearchInterface
     public function convertFormDataToQuery(array $data);
 
     public function convertTermsToFormData(array $terms);
+
+    public function getAdvancedSearchTitle(): string;
 }
diff --git a/src/Bundle/ChillMainBundle/Search/Model/Result.php b/src/Bundle/ChillMainBundle/Search/Model/Result.php
index 33312a961..1866da2f2 100644
--- a/src/Bundle/ChillMainBundle/Search/Model/Result.php
+++ b/src/Bundle/ChillMainBundle/Search/Model/Result.php
@@ -13,21 +13,13 @@ namespace Chill\MainBundle\Search\Model;
 
 class Result
 {
-    private float $relevance;
-
-    /**
-     * mixed an arbitrary result.
-     */
-    private $result;
-
-    /**
-     * @param $result
-     */
-    public function __construct(float $relevance, $result)
-    {
-        $this->relevance = $relevance;
-        $this->result = $result;
-    }
+    public function __construct(
+        private readonly float $relevance,
+        /**
+         * mixed an arbitrary result.
+         */
+        private $result
+    ) {}
 
     public function getRelevance(): float
     {
diff --git a/src/Bundle/ChillMainBundle/Search/ParsingException.php b/src/Bundle/ChillMainBundle/Search/ParsingException.php
index b54afef6a..241079925 100644
--- a/src/Bundle/ChillMainBundle/Search/ParsingException.php
+++ b/src/Bundle/ChillMainBundle/Search/ParsingException.php
@@ -11,8 +11,4 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use Exception;
-
-class ParsingException extends Exception
-{
-}
+class ParsingException extends \Exception {}
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApi.php b/src/Bundle/ChillMainBundle/Search/SearchApi.php
index 1fea71c46..267b90313 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApi.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApi.php
@@ -18,35 +18,15 @@ use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 
-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 iterable $providers;
-
-    public function __construct(
-        EntityManagerInterface $em,
-        iterable $providers,
-        PaginatorFactory $paginator
-    ) {
-        $this->em = $em;
-        $this->providers = $providers;
-        $this->paginator = $paginator;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly iterable $providers, private readonly PaginatorFactory $paginator) {}
 
     public function getResults(string $pattern, array $types, array $parameters): Collection
     {
         $queries = $this->findQueries($pattern, $types, $parameters);
 
-        if (0 === count($queries)) {
+        if (0 === \count($queries)) {
             throw new SearchApiNoQueryException($pattern, $types, $parameters);
         }
 
@@ -69,13 +49,13 @@ class SearchApi
 
         foreach ($queries as $q) {
             $unions[] = $q->buildQuery(true);
-            $parameters = array_merge($parameters, $q->buildParameters(true));
+            $parameters = \array_merge($parameters, $q->buildParameters(true));
         }
 
-        $unionUnordered = implode(' UNION ', $unions);
+        $unionUnordered = \implode(' UNION ', $unions);
 
         return [
-            strtr($query, ['{union_unordered}' => $unionUnordered]),
+            \strtr($query, ['{union_unordered}' => $unionUnordered]),
             $parameters,
         ];
     }
@@ -108,17 +88,17 @@ class SearchApi
 
         foreach ($queries as $q) {
             $unions[] = $q->buildQuery();
-            $parameters = array_merge($parameters, $q->buildParameters());
+            $parameters = \array_merge($parameters, $q->buildParameters());
         }
 
         // add pagination limit
         $parameters[] = $paginator->getItemsPerPage();
         $parameters[] = $paginator->getCurrentPageFirstItemNumber();
 
-        $union = implode(' UNION ', $unions);
+        $union = \implode(' UNION ', $unions);
 
         return [
-            strtr($query, ['{unions}' => $union]),
+            \strtr($query, ['{unions}' => $union]),
             $parameters,
         ];
     }
@@ -163,7 +143,7 @@ class SearchApi
 
     private function findQueries($pattern, array $types, array $parameters): array
     {
-        return array_map(
+        return \array_map(
             static fn ($p) => $p->provideQuery($pattern, $parameters),
             $this->findProviders($pattern, $types, $parameters),
         );
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
index 6a389088d..b16cec9c5 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
@@ -11,26 +11,18 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use RuntimeException;
-use Throwable;
-
-use function implode;
-
-class SearchApiNoQueryException extends RuntimeException
+class SearchApiNoQueryException extends \RuntimeException
 {
-    private array $parameters;
+    private readonly string $pattern;
 
-    private string $pattern;
+    private readonly array $types;
 
-    private array $types;
-
-    public function __construct(string $pattern = '', array $types = [], array $parameters = [], $code = 0, ?Throwable $previous = null)
+    public function __construct(string $pattern = '', array $types = [], private readonly 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;
-        $this->parameters = $parameters;
 
         parent::__construct($message, $code, $previous);
     }
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php b/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
index ad852d95a..325fba31d 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
@@ -11,11 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use function array_push;
-use function count;
-use function implode;
-use function strtr;
-
 /**
  * This create a query optimized for searching for the api response.
  *
@@ -24,9 +19,9 @@ use function strtr;
  *
  * `SELECT '<key>' as key, <metadata> as metadata, <pertinence> as pertinence FROM <from clause> WHERE <where clause>`.
  *
- * The clause between `<>` are provided through the dedicated method in this class (@link{self::setSelectKey},
- * @link{self::setFromClause}), etc.).
+ * The clause between `<>` are provided through the dedicated method in this class (@see{self::setSelectKey},
  *
+ * @see{self::setFromClause}), etc.).
  */
 class SearchApiQuery
 {
@@ -76,7 +71,7 @@ class SearchApiQuery
     public function andWhereClause(string $whereClause, array $params = []): self
     {
         $this->whereClauses[] = $whereClause;
-        array_push($this->whereClausesParams, ...$params);
+        \array_push($this->whereClausesParams, ...$params);
 
         return $this;
     }
@@ -99,18 +94,18 @@ class SearchApiQuery
 
     public function buildQuery(bool $countOnly = false): string
     {
-        $isMultiple = count($this->whereClauses);
+        $isMultiple = \count($this->whereClauses);
         $where =
-            ($isMultiple ? '(' : '') .
-            implode(
-                ($isMultiple ? ')' : '') . ' AND ' . ($isMultiple ? '(' : ''),
+            ($isMultiple ? '(' : '').
+            \implode(
+                ($isMultiple ? ')' : '').' AND '.($isMultiple ? '(' : ''),
                 $this->whereClauses
-            ) .
+            ).
             ($isMultiple ? ')' : '');
 
         $select = $this->buildSelectClause($countOnly);
 
-        return strtr('SELECT
+        return \strtr('SELECT
                 {select}
             FROM {from}
             WHERE {where}
@@ -218,24 +213,24 @@ class SearchApiQuery
                 return 'count(*) AS c';
             }
 
-            return 'count(distinct ' . $this->isDistinctKey . ') AS c';
+            return 'count(distinct '.$this->isDistinctKey.') AS c';
         }
 
         $selects = $this->getSelectClauses();
 
         if (null !== $this->selectKey) {
-            $selects[] = strtr("'{key}' AS key", ['{key}' => $this->selectKey]);
+            $selects[] = \strtr("'{key}' AS key", ['{key}' => $this->selectKey]);
         }
 
         if (null !== $this->jsonbMetadata) {
-            $selects[] = strtr('{metadata} AS metadata', ['{metadata}' => $this->jsonbMetadata]);
+            $selects[] = \strtr('{metadata} AS metadata', ['{metadata}' => $this->jsonbMetadata]);
         }
 
         if (null !== $this->pertinence) {
-            $selects[] = strtr('{pertinence} AS pertinence', ['{pertinence}' => $this->pertinence]);
+            $selects[] = \strtr('{pertinence} AS pertinence', ['{pertinence}' => $this->pertinence]);
         }
 
-        return ($this->isDistinct ? 'DISTINCT ' : '') . implode(', ', $selects);
+        return ($this->isDistinct ? 'DISTINCT ' : '').\implode(', ', $selects);
     }
 
     private function buildSelectParams(bool $count = false): array
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiResult.php b/src/Bundle/ChillMainBundle/Search/SearchApiResult.php
index cd0fa06e1..14f448746 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiResult.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiResult.php
@@ -15,16 +15,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 class SearchApiResult
 {
-    private float $pertinence;
+    private mixed $result;
 
-    private float $relevance;
-
-    private $result;
-
-    public function __construct(float $relevance)
-    {
-        $this->relevance = $relevance;
-    }
+    public function __construct(private readonly float $relevance) {}
 
     /**
      * @Serializer\Groups({"read"})
@@ -42,7 +35,7 @@ class SearchApiResult
         return $this->result;
     }
 
-    public function setResult($result): self
+    public function setResult(mixed $result): self
     {
         $this->result = $result;
 
diff --git a/src/Bundle/ChillMainBundle/Search/SearchInterface.php b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
index a7cd285fe..10d4f2a06 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
@@ -68,10 +68,10 @@ interface SearchInterface
      * 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 "html"|"json" $format  The format for result
+     * @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 "html"|"json" $format The format for result
      *
      * @return string|array a string if format is html, an array if format is json
      */
@@ -80,9 +80,6 @@ interface SearchInterface
     /**
      * 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 f63d3c04f..e239b872d 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use function array_key_exists;
 use function chr;
-use function count;
 
 /**
  * a service which gather all search services defined into the bundles
@@ -33,21 +31,21 @@ use function count;
 class SearchProvider
 {
     /**
-     * @var HasAdvancedSearchForm[]
+     * @var HasAdvancedSearchFormInterface[]
      */
-    private $hasAdvancedFormSearchServices = [];
+    private array $hasAdvancedFormSearchServices = [];
 
     /**
      * store string which must be extracted to find default arguments.
      *
      * @var string[]
      */
-    private $mustBeExtracted = [];
+    private array $mustBeExtracted = [];
 
     /**
      * @var SearchInterface[]
      */
-    private $searchServices = [];
+    private array $searchServices = [];
 
     public function addSearchService(SearchInterface $service, $name)
     {
@@ -62,13 +60,11 @@ class SearchProvider
      * return search services with a specific name, defined in service
      * definition.
      *
-     * @param mixed $name
+     * @return SearchInterface
      *
      * @throws UnknowSearchNameException if not exists
-     *
-     * @return SearchInterface
      */
-    public function getByName($name)
+    public function getByName(mixed $name)
     {
         if (isset($this->searchServices[$name])) {
             return $this->searchServices[$name];
@@ -89,14 +85,8 @@ class SearchProvider
      */
     public function getByOrder()
     {
-        //sort the array
-        uasort($this->searchServices, static function (SearchInterface $a, SearchInterface $b) {
-            if ($a->getOrder() === $b->getOrder()) {
-                return 0;
-            }
-
-            return ($a->getOrder() < $b->getOrder()) ? -1 : 1;
-        });
+        // sort the array
+        uasort($this->searchServices, static fn (SearchInterface $a, SearchInterface $b) => $a->getOrder() <=> $b->getOrder());
 
         return $this->searchServices;
     }
@@ -105,15 +95,11 @@ class SearchProvider
      * return searchservice with an advanced form, defined in service
      * definition.
      *
-     * @param string $name
-     *
      * @throws UnknowSearchNameException
-     *
-     * @return HasAdvancedSearchForm
      */
-    public function getHasAdvancedFormByName($name)
+    public function getHasAdvancedFormByName(string $name): HasAdvancedSearchFormInterface
     {
-        if (array_key_exists($name, $this->hasAdvancedFormSearchServices)) {
+        if (\array_key_exists($name, $this->hasAdvancedFormSearchServices)) {
             return $this->hasAdvancedFormSearchServices[$name];
         }
 
@@ -122,14 +108,8 @@ class SearchProvider
 
     public function getHasAdvancedFormSearchServices()
     {
-        //sort the array
-        uasort($this->hasAdvancedFormSearchServices, static function (SearchInterface $a, SearchInterface $b) {
-            if ($a->getOrder() === $b->getOrder()) {
-                return 0;
-            }
-
-            return ($a->getOrder() < $b->getOrder()) ? -1 : 1;
-        });
+        // sort the array
+        uasort($this->hasAdvancedFormSearchServices, static fn (HasAdvancedSearchFormInterface $a, HasAdvancedSearchFormInterface $b): int => $a->getOrder() <=> $b->getOrder());
 
         return $this->hasAdvancedFormSearchServices;
     }
@@ -161,9 +141,9 @@ class SearchProvider
      * @param number $limit
      * @param string $format
      *
-     * @throws UnknowSearchDomainException if the domain is unknow
-     *
      * @return array of results from different SearchInterface
+     *
+     * @throws UnknowSearchDomainException if the domain is unknow
      */
     public function getSearchResults(
         $pattern,
@@ -175,7 +155,7 @@ class SearchProvider
         $terms = $this->parse($pattern);
         $results = [];
 
-        //sort searchServices by order
+        // sort searchServices by order
         $sortedSearchServices = [];
 
         foreach ($this->searchServices as $service) {
@@ -189,7 +169,7 @@ class SearchProvider
                 }
             }
 
-            if (count($results) === 0) {
+            if (0 === \count($results)) {
                 throw new UnknowSearchDomainException($terms['_domain']);
             }
         } else { // no domain provided, we use default search
@@ -200,7 +180,7 @@ class SearchProvider
             }
         }
 
-        //sort array
+        // sort array
         ksort($results);
 
         return $results;
@@ -215,9 +195,9 @@ class SearchProvider
      */
     public function parse($pattern)
     {
-        //reset must be extracted
+        // reset must be extracted
         $this->mustBeExtracted = [];
-        //filter to lower and remove accentued
+        // filter to lower and remove accentued
         $filteredPattern = mb_strtolower($this->remove_accents($pattern));
 
         $terms = $this->extractTerms($filteredPattern);
@@ -246,19 +226,19 @@ class SearchProvider
      *
      * @param type $subject
      *
-     * @throws ParsingException
-     *
      * @return string
+     *
+     * @throws ParsingException
      */
     private function extractDomain(&$subject)
     {
         preg_match_all('/@([a-z]+)/', $subject, $terms);
 
-        if (count($terms[0]) > 1) {
+        if (\count($terms[0]) > 1) {
             throw new ParsingException('You should not have more than one domain.');
         }
 
-        //add pattern to be extracted
+        // add pattern to be extracted
         if (isset($terms[0][0])) {
             $this->mustBeExtracted[] = $terms[0][0];
         }
@@ -270,17 +250,17 @@ class SearchProvider
     {
         $terms = [];
         $matches = [];
-        preg_match_all('/([a-z\-]+):(([^"][\S\-]+)|"[^"]*")/', $subject, $matches);
+        preg_match_all('/([a-z\-]+):(([^"][\S\-]+)|"[^"]*")/', (string) $subject, $matches);
 
         foreach ($matches[2] as $key => $match) {
-            //remove from search pattern
+            // remove from search pattern
             $this->mustBeExtracted[] = $matches[0][$key];
-            //strip parenthesis
+            // strip parenthesis
             if (
-                mb_substr($match, 0, 1) === '"'
-                  && mb_substr($match, mb_strlen($match) - 1) === '"'
+                '"' === mb_substr((string) $match, 0, 1)
+                  && '"' === mb_substr((string) $match, mb_strlen((string) $match) - 1)
             ) {
-                $match = trim(mb_substr($match, 1, mb_strlen($match) - 2));
+                $match = trim(mb_substr((string) $match, 1, mb_strlen((string) $match) - 2));
             }
             $terms[$matches[1][$key]] = $match;
         }
@@ -297,7 +277,7 @@ class SearchProvider
      *
      * @param string $string Text that might have accent characters
      *
-     * @return string Filtered string with replaced "nice" characters.
+     * @return string filtered string with replaced "nice" characters
      *
      * @license GNU GPLv2 : https://core.trac.wordpress.org/browser/tags/4.1/src/license.txt
      */
@@ -307,182 +287,182 @@ class SearchProvider
             return $string;
         }
 
-        //if ($this->seems_utf8($string)) { // remove from wordpress: we use only UTF-8
+        // if ($this->seems_utf8($string)) { // remove from wordpress: we use only UTF-8
         if (true) {
             $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',
+                \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',
+                \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',
+                \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',
+                \chr(226).\chr(130).\chr(172) => 'E',
                 // GBP (Pound) Sign
-                chr(194) . chr(163) => '',
+                \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',
+                \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',
+                \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',
+                \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',
+                \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',
+                \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',
+                \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',
+                \chr(201).\chr(145) => 'a',
                 // macron
-                chr(199) . chr(149) => 'U', chr(199) . chr(150) => 'u',
+                \chr(199).\chr(149) => 'U', \chr(199).\chr(150) => 'u',
                 // acute accent
-                chr(199) . chr(151) => 'U', chr(199) . chr(152) => 'u',
+                \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',
+                \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',
+                \chr(199).\chr(155) => 'U', \chr(199).\chr(156) => 'u',
             ];
 
             // Used for locale-specific rules
diff --git a/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php b/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
index 110bfee9c..3f3ea6dee 100644
--- a/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
+++ b/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use Exception;
-
 /**
  * Throw by search provider when the search name is not found.
  */
-class UnknowSearchDomainException extends Exception
+class UnknowSearchDomainException extends \Exception
 {
     private $domain;
 
diff --git a/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php b/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
index 7f65aaf22..69e7a135f 100644
--- a/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
+++ b/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Search;
 
-use Exception;
-
 /**
  * Throw by search provider when the search name is not found.
  */
-class UnknowSearchNameException extends Exception
+class UnknowSearchNameException extends \Exception
 {
     private $name;
 
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php b/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
index 3c9be8954..f858797f5 100644
--- a/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
@@ -11,12 +11,6 @@ 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 = [
@@ -32,15 +26,15 @@ class ExtractDateFromPattern
 
         foreach (self::DATE_PATTERN as [$pattern, $format]) {
             $matches = [];
-            preg_match_all($pattern, $filteredSubject, $matches);
+            \preg_match_all($pattern, $filteredSubject, $matches);
 
             foreach ($matches[0] as $match) {
-                $date = DateTimeImmutable::createFromFormat($format, $match);
+                $date = \DateTimeImmutable::createFromFormat($format, $match);
 
                 if (false !== $date) {
                     $dates[] = $date;
                     // filter string: remove what is found
-                    $filteredSubject = trim(strtr($filteredSubject, [$match => '']));
+                    $filteredSubject = \trim(\strtr($filteredSubject, [$match => '']));
                 }
             }
         }
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
index df9934570..1823e462c 100644
--- a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
@@ -12,21 +12,13 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Search\Utils;
 
 use libphonenumber\PhoneNumberUtil;
-use LogicException;
-
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-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,})';
 
-    private string $defaultCarrierCode;
+    private readonly string $defaultCarrierCode;
 
     public function __construct(ParameterBagInterface $parameterBag)
     {
@@ -36,19 +28,19 @@ class ExtractPhonenumberFromPattern
     public function extractPhonenumber(string $subject): SearchExtractionResult
     {
         $matches = [];
-        preg_match(self::PATTERN, $subject, $matches);
+        \preg_match(self::PATTERN, $subject, $matches);
 
-        if (0 < count($matches)) {
+        if (0 < \count($matches)) {
             $phonenumber = [];
             $length = 0;
 
-            foreach (str_split(trim($matches[0])) as $key => $char) {
+            foreach (\str_split(\trim($matches[0])) as $key => $char) {
                 switch ($char) {
                     case '+':
                         if (0 === $key) {
                             $phonenumber[] = $char;
                         } else {
-                            throw new LogicException('should not match not alnum character');
+                            throw new \LogicException('should not match not alnum character');
                         }
 
                         break;
@@ -58,7 +50,7 @@ class ExtractPhonenumberFromPattern
 
                         if (0 === $key) {
                             $util = PhoneNumberUtil::getInstance();
-                            $phonenumber[] = '+' . $util->getCountryCodeForRegion($this->defaultCarrierCode);
+                            $phonenumber[] = '+'.$util->getCountryCodeForRegion($this->defaultCarrierCode);
                         } else {
                             $phonenumber[] = $char;
                         }
@@ -83,14 +75,14 @@ class ExtractPhonenumberFromPattern
                         break;
 
                     default:
-                        throw new LogicException('should not match not alnum character');
+                        throw new \LogicException('should not match not alnum character');
                 }
             }
 
             if (5 < $length) {
-                $filtered = trim(strtr($subject, [$matches[0] => '']));
+                $filtered = \trim(\strtr($subject, [$matches[0] => '']));
 
-                return new SearchExtractionResult($filtered, [implode('', $phonenumber)]);
+                return new SearchExtractionResult($filtered, [\implode('', $phonenumber)]);
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php b/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php
index 0c885de59..b992b00c1 100644
--- a/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php
@@ -13,15 +13,7 @@ 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 __construct(private readonly string $filteredSubject, private readonly array $found) {}
 
     public function getFilteredSubject(): string
     {
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
index 02ffc9122..d80020285 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
@@ -11,19 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Security\Authorization;
 
-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
  */
-abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
-{
-}
+abstract class AbstractChillVoter extends Voter implements ChillVoterInterface {}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index 1105c9d8a..e37c3171e 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -19,13 +19,7 @@ use Chill\MainBundle\Security\ParentRoleHelper;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 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.
@@ -34,45 +28,24 @@ use function get_class;
  */
 class AuthorizationHelper implements AuthorizationHelperInterface
 {
-    private CenterResolverManagerInterface $centerResolverManager;
-
-    private LoggerInterface $logger;
-
-    private ParentRoleHelper $parentRoleHelper;
-
-    private ScopeResolverDispatcher $scopeResolverDispatcher;
-
-    private UserACLAwareRepositoryInterface $userACLAwareRepository;
-
     public function __construct(
-        CenterResolverManagerInterface $centerResolverManager,
-        LoggerInterface $logger,
-        ScopeResolverDispatcher $scopeResolverDispatcher,
-        UserACLAwareRepositoryInterface $userACLAwareRepository,
-        ParentRoleHelper $parentRoleHelper
-    ) {
-        $this->centerResolverManager = $centerResolverManager;
-        $this->logger = $logger;
-        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
-        $this->userACLAwareRepository = $userACLAwareRepository;
-        $this->parentRoleHelper = $parentRoleHelper;
-    }
+        private readonly CenterResolverManagerInterface $centerResolverManager,
+        private readonly LoggerInterface $logger,
+        private readonly ScopeResolverDispatcher $scopeResolverDispatcher,
+        private readonly UserACLAwareRepositoryInterface $userACLAwareRepository,
+        private readonly ParentRoleHelper $parentRoleHelper
+    ) {}
 
     /**
      * Filter an array of centers, return only center which are reachable.
      *
-     * @param User $user The user
+     * @param User  $user    The user
      * @param array $centers a list of centers which are going to be filtered
-     * @param mixed $role
      */
-    public function filterReachableCenters(User $user, array $centers, $role): array
+    public function filterReachableCenters(User $user, array $centers, mixed $role): array
     {
         $results = [];
 
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
-
         foreach ($centers as $center) {
             if ($this->userCanReachCenter($user, $center)) {
                 $results[] = $center;
@@ -85,12 +58,9 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     /**
      * @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
+    public function findUsersReaching(string $role, array|\Chill\MainBundle\Entity\Center $center, array|\Chill\MainBundle\Entity\Scope $scope = null, bool $onlyEnabled = true): array
     {
         return $this->userACLAwareRepository
             ->findUsersByReachedACL($role, $center, $scope, $onlyEnabled);
@@ -115,12 +85,8 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      *
      * @return list<Center>
      */
-    public function getReachableCenters(UserInterface $user, string $role, ?Scope $scope = null): array
+    public function getReachableCenters(UserInterface $user, string $role, Scope $scope = null): array
     {
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
-
         if (!$user instanceof User) {
             return [];
         }
@@ -130,9 +96,9 @@ class AuthorizationHelper implements AuthorizationHelperInterface
 
         foreach ($user->getGroupCenters() as $groupCenter) {
             $permissionGroup = $groupCenter->getPermissionsGroup();
-            //iterate on roleScopes
+            // iterate on roleScopes
             foreach ($permissionGroup->getRoleScopes() as $roleScope) {
-                //check that the role is in the reachable roles
+                // check that the role is in the reachable roles
                 if ($this->isRoleReached($role, $roleScope->getRole())) {
                     if (null === $scope) {
                         $centers[spl_object_hash($groupCenter->getCenter())] = $groupCenter->getCenter();
@@ -155,34 +121,29 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     /**
      * 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)
+    public function getReachableCircles(UserInterface $user, string $role, array|\Chill\MainBundle\Entity\Center $center)
     {
         $scopes = [];
 
         if (is_iterable($center)) {
             foreach ($center as $c) {
-                $scopes = array_merge($scopes, $this->getReachableCircles($user, $role, $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
+                // iterate on permissionGroup
                 $permissionGroup = $groupCenter->getPermissionsGroup();
-                //iterate on roleScopes
+                // iterate on roleScopes
                 foreach ($permissionGroup->getRoleScopes() as $roleScope) {
-                    //check that the role is in the reachable roles
+                    // check that the role is in the reachable roles
                     if ($this->isRoleReached($role, $roleScope->getRole())) {
                         $scopes[] = $roleScope->getScope();
                     }
@@ -195,12 +156,8 @@ class AuthorizationHelper implements AuthorizationHelperInterface
 
     /**
      * Return all reachable scope for a given user, center and role.
-     *
-     * @param Center|Center[] $center
-     *
-     * @return array|Scope[]
      */
-    public function getReachableScopes(UserInterface $user, string $role, Center|array $center): array
+    public function getReachableScopes(UserInterface $user, string $role, array|Center $center): array
     {
         return $this->getReachableCircles($user, $role, $center);
     }
@@ -210,9 +167,9 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      *
      * @param Center|Center[] $center May be an array of center
      */
-    public function userCanReachCenter(User $user, $center): bool
+    public function userCanReachCenter(User $user, array|\Chill\MainBundle\Entity\Center $center): bool
     {
-        if ($center instanceof Traversable) {
+        if ($center instanceof \Traversable) {
             foreach ($center as $c) {
                 if ($c->userCanReachCenter($user, $c)) {
                     return true;
@@ -232,13 +189,7 @@ 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 or an array of centers, %s given', Center::class, gettype($center)));
     }
 
     /**
@@ -248,11 +199,10 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      * the scope is taken into account.
      *
      * @param mixed $entity the entity may also implement HasScopeInterface
-     * @param Role|string $attribute
      *
      * @return bool true if the user has access
      */
-    public function userHasAccess(User $user, $entity, $attribute)
+    public function userHasAccess(User $user, mixed $entity, string $attribute)
     {
         $centers = $this->centerResolverManager->resolveCenters($entity);
 
@@ -268,7 +218,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     /**
      * 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 $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
@@ -278,7 +228,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
         return $this->parentRoleHelper->isRoleReached($childRole, $parentRole);
     }
 
-    private function userHasAccessForCenter(User $user, Center $center, $entity, $attribute): bool
+    private function userHasAccessForCenter(User $user, Center $center, mixed $entity, $attribute): bool
     {
         if (!$this->userCanReachCenter($user, $center)) {
             $this->logger->debug('user cannot reach center of entity', [
@@ -288,16 +238,17 @@ class AuthorizationHelper implements AuthorizationHelperInterface
 
             return false;
         }
-
         foreach ($user->getGroupCenters() as $groupCenter) {
-            //filter on center
-            if ($groupCenter->getCenter() === $center) {
+            // filter on center
+            // in some case, the center can be the same, but have different object hashes,
+            // we cannot compare the objects: we must compare the ids here
+            if ($groupCenter->getCenter()->getId() === $center->getId()) {
                 $permissionGroup = $groupCenter->getPermissionsGroup();
-                //iterate on roleScopes
+                // iterate on roleScopes
                 foreach ($permissionGroup->getRoleScopes() as $roleScope) {
-                    //check that the role allow to reach the required role
+                    // check that the role allow to reach the required role
                     if ($this->isRoleReached($attribute, $roleScope->getRole())) {
-                        //if yes, we have a right on something...
+                        // if yes, we have a right on something...
                         // perform check on scope if necessary
                         if ($this->scopeResolverDispatcher->isConcerned($entity)) {// here, we should also check that the role need a scope
                             $scope = $this->scopeResolverDispatcher->resolveScope($entity);
@@ -308,7 +259,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
 
                             if (is_iterable($scope)) {
                                 foreach ($scope as $s) {
-                                    if ($roleScope->getScope() === $s) {
+                                    if ($roleScope->getScope()->getId() === $s->getId()) {
                                         return true;
                                     }
                                 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUser.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUser.php
index 55005fe92..e9bb709a8 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUser.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUser.php
@@ -17,17 +17,9 @@ use Symfony\Component\Security\Core\Security;
 
 class AuthorizationHelperForCurrentUser implements AuthorizationHelperForCurrentUserInterface
 {
-    private AuthorizationHelperInterface $authorizationHelper;
+    public function __construct(private readonly AuthorizationHelperInterface $authorizationHelper, private readonly Security $security) {}
 
-    private Security $security;
-
-    public function __construct(AuthorizationHelperInterface $authorizationHelper, Security $security)
-    {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->security = $security;
-    }
-
-    public function getReachableCenters(string $role, ?Scope $scope = null): array
+    public function getReachableCenters(string $role, Scope $scope = null): array
     {
         if (!$this->security->getUser() instanceof User) {
             return [];
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUserInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUserInterface.php
index f0d3f9fba..04b34c8e5 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUserInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperForCurrentUserInterface.php
@@ -22,10 +22,12 @@ interface AuthorizationHelperForCurrentUserInterface
      *
      * @return Center[]
      */
-    public function getReachableCenters(string $role, ?Scope $scope = null): array;
+    public function getReachableCenters(string $role, Scope $scope = null): array;
 
     /**
-     * @param array|Center|Center[] $center
+     * @param list<Center>|Center $center
+     *
+     * @return list<Scope>
      */
-    public function getReachableScopes(string $role, $center): array;
+    public function getReachableScopes(string $role, array|Center $center): array;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
index 1176cf1fa..5df54a0d6 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
@@ -23,10 +23,12 @@ interface AuthorizationHelperInterface
      *
      * @return list<Center>
      */
-    public function getReachableCenters(UserInterface $user, string $role, ?Scope $scope = null): array;
+    public function getReachableCenters(UserInterface $user, string $role, Scope $scope = null): array;
 
     /**
-     * @param Center|list<Center> $center
+     * @param Center|array<Center> $center
+     *
+     * @return list<Scope>
      */
-    public function getReachableScopes(UserInterface $user, string $role, Center|array $center): array;
+    public function getReachableScopes(UserInterface $user, string $role, array|Center $center): array;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
index 62ac2b81b..10552d1f7 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
@@ -16,9 +16,9 @@ use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 
 class ChillExportVoter extends Voter
 {
-    public const EXPORT = 'chill_export';
+    final public const EXPORT = 'chill_export';
 
-    private VoterHelperInterface $helper;
+    private readonly VoterHelperInterface $helper;
 
     public function __construct(VoterHelperFactoryInterface $voterHelperFactory)
     {
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php
index 2ed1856d2..f8b0102c7 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php
@@ -14,6 +14,4 @@ namespace Chill\MainBundle\Security\Authorization;
 /**
  * Provides methods for compiling voter and build admin role fields.
  */
-interface ChillVoterInterface
-{
-}
+interface ChillVoterInterface {}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
index ec2b2112c..071388fcf 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
@@ -12,37 +12,23 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 
-use function in_array;
-
-final class DefaultVoterHelper implements VoterHelperInterface
+final readonly class DefaultVoterHelper implements VoterHelperInterface
 {
-    private AuthorizationHelper $authorizationHelper;
-
-    private CenterResolverDispatcherInterface $centerResolverDispatcher;
-
-    private array $configuration = [];
-
     public function __construct(
-        AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcherInterface $centerResolverDispatcher,
-        array $configuration
-    ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-        $this->configuration = $configuration;
-    }
+        private AuthorizationHelper $authorizationHelper,
+        private array $configuration
+    ) {}
 
     public function supports($attribute, $subject): bool
     {
         foreach ($this->configuration as [$attributes, $subj]) {
             if (null === $subj) {
-                if (null === $subject && in_array($attribute, $attributes, true)) {
+                if (null === $subject && \in_array($attribute, $attributes, true)) {
                     return true;
                 }
             } elseif ($subject instanceof $subj) {
-                return in_array($attribute, $attributes, true);
+                return \in_array($attribute, $attributes, true);
             }
         }
 
@@ -51,7 +37,9 @@ final class DefaultVoterHelper implements VoterHelperInterface
 
     public function voteOnAttribute($attribute, $subject, $token): bool
     {
-        if (!$token->getUser() instanceof User) {
+        $user = $token->getUser();
+
+        if (!$user instanceof User) {
             return false;
         }
 
@@ -60,7 +48,7 @@ final class DefaultVoterHelper implements VoterHelperInterface
         }
 
         return $this->authorizationHelper->userHasAccess(
-            $token->getUser(),
+            $user,
             $subject,
             $attribute
         );
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
index 6fd0b0ef0..805ba03e5 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
@@ -11,27 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
-
 class DefaultVoterHelperFactory implements VoterHelperFactoryInterface
 {
-    protected AuthorizationHelper $authorizationHelper;
-
-    protected CenterResolverDispatcherInterface $centerResolverDispatcher;
-
-    public function __construct(
-        AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcherInterface $centerResolverDispatcher
-    ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-    }
+    public function __construct(protected AuthorizationHelper $authorizationHelper) {}
 
     public function generate($context): VoterGeneratorInterface
     {
         return new DefaultVoterHelperGenerator(
-            $this->authorizationHelper,
-            $this->centerResolverDispatcher
+            $this->authorizationHelper
         );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
index 2e56c9856..6a1fe5356 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
@@ -11,27 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
-
 final class DefaultVoterHelperGenerator implements VoterGeneratorInterface
 {
-    private AuthorizationHelper $authorizationHelper;
-
-    private CenterResolverDispatcherInterface $centerResolverDispatcher;
-
     private array $configuration = [];
 
-    public function __construct(
-        AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcherInterface $centerResolverDispatcher
-    ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-    }
+    public function __construct(private readonly AuthorizationHelper $authorizationHelper) {}
 
-    public function addCheckFor(?string $subject, array $attributes): self
+    public function addCheckFor(?string $class, array $attributes): self
     {
-        $this->configuration[] = [$attributes, $subject];
+        $this->configuration[] = [$attributes, $class];
 
         return $this;
     }
@@ -40,7 +28,6 @@ final class DefaultVoterHelperGenerator implements VoterGeneratorInterface
     {
         return new DefaultVoterHelper(
             $this->authorizationHelper,
-            $this->centerResolverDispatcher,
             $this->configuration
         );
     }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
index ffcc1bb95..44766a583 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
@@ -16,37 +16,26 @@ use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function in_array;
 
 class EntityWorkflowVoter extends Voter
 {
-    public const CREATE = 'CHILL_MAIN_WORKFLOW_CREATE';
+    final public const CREATE = 'CHILL_MAIN_WORKFLOW_CREATE';
 
-    public const DELETE = 'CHILL_MAIN_WORKFLOW_DELETE';
+    final public const DELETE = 'CHILL_MAIN_WORKFLOW_DELETE';
 
-    public const SEE = 'CHILL_MAIN_WORKFLOW_SEE';
+    final public const SEE = 'CHILL_MAIN_WORKFLOW_SEE';
 
-    public const SHOW_ENTITY_LINK = 'CHILL_MAIN_WORKFLOW_LINK_SHOW';
+    final public const SHOW_ENTITY_LINK = 'CHILL_MAIN_WORKFLOW_LINK_SHOW';
 
-    private EntityWorkflowManager $manager;
-
-    private Security $security;
-
-    public function __construct(EntityWorkflowManager $manager, Security $security)
-    {
-        $this->manager = $manager;
-        $this->security = $security;
-    }
+    public function __construct(private readonly EntityWorkflowManager $manager, private readonly Security $security) {}
 
     protected function supports($attribute, $subject)
     {
-        return $subject instanceof EntityWorkflow && in_array($attribute, self::getRoles(), true);
+        return $subject instanceof EntityWorkflow && \in_array($attribute, self::getRoles(), true);
     }
 
     /**
      * @param EntityWorkflow $subject
-     * @param mixed $attribute
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
@@ -80,10 +69,10 @@ class EntityWorkflowVoter extends Voter
                 return false;
 
             case self::DELETE:
-                return $subject->getStep() === 'initial';
+                return 'initial' === $subject->getStep();
 
             case self::SHOW_ENTITY_LINK:
-                if ($subject->getStep() === 'initial') {
+                if ('initial' === $subject->getStep()) {
                     return false;
                 }
 
@@ -96,7 +85,7 @@ class EntityWorkflowVoter extends Voter
                 return $currentStep->getPrevious()->getTransitionBy() === $this->security->getUser();
 
             default:
-                throw new UnexpectedValueException("attribute {$attribute} not supported");
+                throw new \UnexpectedValueException("attribute {$attribute} not supported");
         }
     }
 
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
index 9fae2f51a..9cca4c019 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/NotificationVoter.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Entity\NotificationComment;
 use Chill\MainBundle\Entity\User;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use UnexpectedValueException;
 
 final class NotificationVoter extends Voter
 {
@@ -42,7 +41,6 @@ final class NotificationVoter extends Voter
 
     /**
      * @param string $attribute
-     * @param mixed $subject
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
@@ -53,37 +51,24 @@ final class NotificationVoter extends Voter
         }
 
         if ($subject instanceof Notification) {
-            switch ($attribute) {
-                case self::COMMENT_ADD:
-                    return false === $subject->isSystem() && (
-                        $subject->getAddressees()->contains($user) || $subject->getSender() === $user
-                    );
-
-                case self::NOTIFICATION_SEE:
-                case self::NOTIFICATION_TOGGLE_READ_STATUS:
-                    return $subject->getSender() === $user || $subject->getAddressees()->contains($user);
-
-                case self::NOTIFICATION_UPDATE:
-                    return $subject->getSender() === $user && false === $subject->isSystem();
-
-                default:
-                    throw new UnexpectedValueException("this subject {$attribute} is not implemented");
-            }
+            return match ($attribute) {
+                self::COMMENT_ADD => false === $subject->isSystem() && (
+                    $subject->getAddressees()->contains($user) || $subject->getSender() === $user
+                ),
+                self::NOTIFICATION_SEE, self::NOTIFICATION_TOGGLE_READ_STATUS => $subject->getSender() === $user || $subject->getAddressees()->contains($user),
+                self::NOTIFICATION_UPDATE => $subject->getSender() === $user && false === $subject->isSystem(),
+                default => throw new \UnexpectedValueException("this subject {$attribute} is not implemented"),
+            };
         } elseif ($subject instanceof NotificationComment) {
-            switch ($attribute) {
-                case self::COMMENT_ADD:
-                    return false === $subject->getNotification()->isSystem() && (
-                        $subject->getNotification()->getAddressees()->contains($user) || $subject->getNotification()->getSender() === $user
-                    );
-
-                case self::COMMENT_EDIT:
-                    return $subject->getCreatedBy() === $user && false === $subject->getNotification()->isSystem();
-
-                default:
-                    throw new UnexpectedValueException("this subject {$attribute} is not implemented");
-            }
+            return match ($attribute) {
+                self::COMMENT_ADD => false === $subject->getNotification()->isSystem() && (
+                    $subject->getNotification()->getAddressees()->contains($user) || $subject->getNotification()->getSender() === $user
+                ),
+                self::COMMENT_EDIT => $subject->getCreatedBy() === $user && false === $subject->getNotification()->isSystem(),
+                default => throw new \UnexpectedValueException("this subject {$attribute} is not implemented"),
+            };
         }
 
-        throw new UnexpectedValueException();
+        throw new \UnexpectedValueException();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/SavedExportVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/SavedExportVoter.php
index 667bced46..0e9a7da52 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/SavedExportVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/SavedExportVoter.php
@@ -14,16 +14,14 @@ namespace Chill\MainBundle\Security\Authorization;
 use Chill\MainBundle\Entity\SavedExport;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use UnexpectedValueException;
-use function in_array;
 
 class SavedExportVoter extends Voter
 {
-    public const DELETE = 'CHLL_MAIN_EXPORT_SAVED_DELETE';
+    final public const DELETE = 'CHLL_MAIN_EXPORT_SAVED_DELETE';
 
-    public const EDIT = 'CHLL_MAIN_EXPORT_SAVED_EDIT';
+    final public const EDIT = 'CHLL_MAIN_EXPORT_SAVED_EDIT';
 
-    public const GENERATE = 'CHLL_MAIN_EXPORT_SAVED_GENERATE';
+    final public const GENERATE = 'CHLL_MAIN_EXPORT_SAVED_GENERATE';
 
     private const ALL = [
         self::DELETE,
@@ -33,20 +31,14 @@ class SavedExportVoter extends Voter
 
     protected function supports($attribute, $subject): bool
     {
-        return $subject instanceof SavedExport && in_array($attribute, self::ALL, true);
+        return $subject instanceof SavedExport && \in_array($attribute, self::ALL, true);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
-        /** @var SavedExport $subject */
-        switch ($attribute) {
-            case self::DELETE:
-            case self::EDIT:
-            case self::GENERATE:
-                return $subject->getUser() === $token->getUser();
-
-            default:
-                throw new UnexpectedValueException('attribute not supported: ' . $attribute);
-        }
+        return match ($attribute) {
+            self::DELETE, self::EDIT, self::GENERATE => $subject->getUser() === $token->getUser(),
+            default => throw new \UnexpectedValueException('attribute not supported: '.$attribute),
+        };
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
index 15e2f2585..0c72ade3e 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
@@ -14,8 +14,8 @@ namespace Chill\MainBundle\Security\Authorization;
 interface VoterGeneratorInterface
 {
     /**
-     * @param string $class The FQDN of a class
-     * @param array $attributes an array of attributes
+     * @param string $class      The FQDN of a class
+     * @param array  $attributes an array of attributes
      *
      * @return $this
      */
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
index b75acb7ae..9718cf013 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
@@ -12,37 +12,25 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
-use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
-use RuntimeException;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use function in_array;
-use function is_object;
 
 class WorkflowEntityDeletionVoter extends Voter
 {
-    private EntityWorkflowRepository $entityWorkflowRepository;
-
     /**
-     * @var iterable|EntityWorkflowHandlerInterface[]
+     * @param \Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface[] $handlers
      */
-    private iterable $handlers;
-
-    public function __construct($handlers, EntityWorkflowRepository $entityWorkflowRepository)
-    {
-        $this->handlers = $handlers;
-        $this->entityWorkflowRepository = $entityWorkflowRepository;
-    }
+    public function __construct(private $handlers, private readonly EntityWorkflowRepository $entityWorkflowRepository) {}
 
     protected function supports($attribute, $subject)
     {
-        if (!is_object($subject)) {
+        if (!\is_object($subject)) {
             return false;
         }
 
         foreach ($this->handlers as $handler) {
             if ($handler->isObjectSupported($subject)
-                && in_array($attribute, $handler->getDeletionRoles($subject), true)) {
+                && \in_array($attribute, $handler->getDeletionRoles($subject), true)) {
                 return true;
             }
         }
@@ -60,6 +48,6 @@ class WorkflowEntityDeletionVoter extends Voter
             }
         }
 
-        throw new RuntimeException('no handlers found');
+        throw new \RuntimeException('no handlers found');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php b/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
index f53e49583..231bc021d 100644
--- a/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
@@ -15,9 +15,6 @@ 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.
  */
@@ -31,13 +28,10 @@ class ParentRoleHelper
      */
     protected array $hierarchy;
 
-    protected RoleHierarchyInterface $roleHierarchy;
-
     public function __construct(
-        RoleHierarchyInterface $roleHierarchy,
+        protected RoleHierarchyInterface $roleHierarchy,
         ParameterBagInterface $parameterBag
     ) {
-        $this->roleHierarchy = $roleHierarchy;
         $this->hierarchy = $parameterBag->get('security.role_hierarchy.roles');
     }
 
@@ -53,12 +47,12 @@ class ParentRoleHelper
     {
         $parentRoles = [$role];
         // transform the roles from role hierarchy from string to Role
-        $roles = array_keys($this->hierarchy);
+        $roles = \array_keys($this->hierarchy);
 
         foreach ($roles as $r) {
             $childRoles = $this->roleHierarchy->getReachableRoleNames([$r]);
 
-            if (in_array($role, $childRoles, true)) {
+            if (\in_array($role, $childRoles, true)) {
                 $parentRoles[] = $r;
             }
         }
@@ -69,7 +63,7 @@ class ParentRoleHelper
     /**
      * 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 $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
@@ -79,6 +73,6 @@ class ParentRoleHelper
         $reachableRoles = $this->roleHierarchy
             ->getReachableRoleNames([$parentRole]);
 
-        return in_array($childRole, $reachableRoles, true);
+        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 c39c34ebe..264b77056 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
@@ -12,49 +12,25 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
-use Symfony\Component\EventDispatcher\Event;
 
-class PasswordRecoverEvent extends Event
+class PasswordRecoverEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
-    public const ASK_TOKEN_INVALID_FORM = 'chill_main.ask_token_invalid_form';
+    final public const ASK_TOKEN_INVALID_FORM = 'chill_main.ask_token_invalid_form';
 
-    public const ASK_TOKEN_SUCCESS = 'chill_main.ask_token_success';
+    final public const ASK_TOKEN_SUCCESS = 'chill_main.ask_token_success';
 
-    public const INVALID_TOKEN = 'chill_main.password_recover_invalid_token';
+    final public const INVALID_TOKEN = 'chill_main.password_recover_invalid_token';
 
     /**
-     * @var string
+     * @param bool       $safelyGenerated true if generated safely (from console command, etc.)
+     * @param mixed|null $ip
      */
-    protected $ip;
-
-    /**
-     * @var bool
-     */
-    protected $safelyGenerated;
-
-    /**
-     * @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)
-    {
-        $this->user = $user;
-        $this->token = $token;
-        $this->ip = $ip;
-        $this->safelyGenerated = $safelyGenerated;
-    }
+    public function __construct(
+        private readonly ?string $token = null,
+        private readonly ?User $user = null,
+        private $ip = null,
+        private readonly bool $safelyGenerated = false,
+    ) {}
 
     public function getIp()
     {
@@ -69,10 +45,7 @@ class PasswordRecoverEvent extends Event
         return $this->token;
     }
 
-    /**
-     * @return User|null
-     */
-    public function getUser()
+    public function getUser(): ?User
     {
         return $this->user;
     }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
index cc09dbef6..11d14c374 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
@@ -12,34 +12,32 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Redis\ChillRedis;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use UnexpectedValueException;
 
 class PasswordRecoverLocker
 {
-    public const ASK_TOKEN_INVALID_FORM_TTL = 3600;
+    final public const ASK_TOKEN_INVALID_FORM_TTL = 3600;
 
     /**
      * TTL to keep invalid token recorded.
      */
-    public const INVALID_TOKEN_TTL = 3600;
+    final public const INVALID_TOKEN_TTL = 3600;
 
-    public const MAX_ASK_TOKEN_BY_USER = 10;
+    final public const MAX_ASK_TOKEN_BY_USER = 10;
 
-    public const MAX_ASK_TOKEN_INVALID_FORM_BY_IP = 10;
+    final public const MAX_ASK_TOKEN_INVALID_FORM_BY_IP = 10;
 
-    public const MAX_ASK_TOKEN_INVALID_FORM_GLOBAL = 50;
+    final public const MAX_ASK_TOKEN_INVALID_FORM_GLOBAL = 50;
 
     /**
      * The maximum of invalid token by ip.
      */
-    public const MAX_INVALID_TOKEN_BY_IP = 10;
+    final public const MAX_INVALID_TOKEN_BY_IP = 10;
 
     /**
      * The maximum of invalid token globally (across all ip).
      */
-    public const MAX_INVALID_TOKEN_GLOBAL = 50;
+    final public const MAX_INVALID_TOKEN_GLOBAL = 50;
 
     /**
      * @var ChillRedis
@@ -75,72 +73,41 @@ class PasswordRecoverLocker
     }
 
     /**
-     * @param string $usage 'invalid_token_global' or ...
+     * @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');
-        }
+        return match ($usage) {
+            'invalid_token_global' => sprintf('invalid_token_global_%d', $number),
+            'invalid_token_by_ip' => sprintf('invalid_token_ip_%s_%d', $discriminator, $number),
+            'ask_token_invalid_form_global' => sprintf('ask_token_invalid_form_global_%d', $number),
+            'ask_token_invalid_form_by_ip' => sprintf('ask_token_invalid_form_by_ip_%s_%d', $discriminator, $number),
+            'ask_token_success_by_user' => sprintf('ask_token_success_by_user_%s_%d', $discriminator->getId(), $number),
+            default => throw new \LogicException('this usage is not implemented'),
+        };
     }
 
     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");
-        }
+        return match ($usage) {
+            'invalid_token_global' => self::MAX_INVALID_TOKEN_GLOBAL,
+            'invalid_token_by_ip' => self::MAX_INVALID_TOKEN_BY_IP,
+            'ask_token_invalid_form_global' => self::MAX_ASK_TOKEN_INVALID_FORM_GLOBAL,
+            'ask_token_invalid_form_by_ip' => self::MAX_ASK_TOKEN_INVALID_FORM_BY_IP,
+            'ask_token_success_by_user' => self::MAX_ASK_TOKEN_BY_USER,
+            default => 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");
-        }
+        return match ($usage) {
+            'invalid_token_global', 'invalid_token_by_ip' => self::INVALID_TOKEN_TTL,
+            'ask_token_invalid_form_global', 'ask_token_invalid_form_by_ip' => self::ASK_TOKEN_INVALID_FORM_TTL,
+            'ask_token_success_by_user' => self::ASK_TOKEN_INVALID_FORM_TTL * 24,
+            default => throw new \UnexpectedValueException("this usage '{$usage}' is not yet implemented"),
+        };
     }
 
     public function isLocked($usage, $discriminator = null)
@@ -150,7 +117,7 @@ class PasswordRecoverLocker
         for ($i = 0; $i < $max; ++$i) {
             $key = self::generateLockKey($usage, $i, $discriminator);
 
-            if ($this->chillRedis->exists($key) === 0) {
+            if (0 === $this->chillRedis->exists($key)) {
                 return false;
             }
         }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
index 7ba724618..ab847aa5e 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
@@ -16,13 +16,11 @@ 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
 {
-    public const ASK_TOKEN = 'CHILL_PASSWORD_ASK_TOKEN';
+    final public const ASK_TOKEN = 'CHILL_PASSWORD_ASK_TOKEN';
 
-    public const TRY_TOKEN = 'CHILL_PASSWORD_TRY_TOKEN';
+    final public const TRY_TOKEN = 'CHILL_PASSWORD_TRY_TOKEN';
 
     /**
      * @var PasswordRecoverLocker
@@ -47,7 +45,7 @@ class PasswordRecoverVoter extends Voter
 
     protected function supports($attribute, $subject): bool
     {
-        if (!in_array($attribute, $this->supported, true)) {
+        if (!\in_array($attribute, $this->supported, true)) {
             return false;
         }
 
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
index 42881e291..e868262e2 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
@@ -12,51 +12,27 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Notification\Mailer;
-use DateTimeInterface;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
-use function array_merge;
-
 class RecoverPasswordHelper
 {
-    public const RECOVER_PASSWORD_ROUTE = 'password_recover';
+    final public const RECOVER_PASSWORD_ROUTE = 'password_recover';
 
-    private MailerInterface $mailer;
+    public function __construct(private readonly TokenManager $tokenManager, private readonly UrlGeneratorInterface $urlGenerator, private readonly MailerInterface $mailer) {}
 
     /**
-     * @var TokenManager
-     */
-    private $tokenManager;
-
-    /**
-     * @var UrlGeneratorInterface
-     */
-    private $urlGenerator;
-
-    public function __construct(
-        TokenManager $tokenManager,
-        UrlGeneratorInterface $urlGenerator,
-        MailerInterface $mailer,
-    ) {
-        $this->tokenManager = $tokenManager;
-        $this->urlGenerator = $urlGenerator;
-        $this->mailer = $mailer;
-    }
-
-    /**
-     * @param bool $absolute
+     * @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 = [])
     {
         return $this->urlGenerator->generate(
             self::RECOVER_PASSWORD_ROUTE,
-            array_merge(
+            \array_merge(
                 $this->tokenManager->generate($user, $expiration),
                 $parameters
             ),
@@ -66,7 +42,7 @@ class RecoverPasswordHelper
 
     public function sendRecoverEmail(
         User $user,
-        DateTimeInterface $expiration,
+        \DateTimeInterface $expiration,
         $template = '@ChillMain/Password/recover_email.txt.twig',
         array $templateParameters = [],
         $force = false,
@@ -74,7 +50,7 @@ class RecoverPasswordHelper
         $emailSubject = 'Recover your password'
     ) {
         if (null === $user->getEmail() || '' === trim($user->getEmail())) {
-            throw new \UnexpectedValueException("No emaail associated to the user");
+            throw new \UnexpectedValueException('No emaail associated to the user');
         }
 
         $email = (new TemplatedEmail())
@@ -84,7 +60,7 @@ class RecoverPasswordHelper
             ->context([
                 'user' => $user,
                 'url' => $this->generateUrl($user, $expiration, true, $additionalUrlParameters),
-                ...$templateParameters
+                ...$templateParameters,
             ]);
 
         $this->mailer->send($email);
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
index 3d4afb1b3..acb010ca9 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
@@ -12,30 +12,19 @@ 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;
 
 class TokenManager
 {
-    public const HASH = 'h';
+    final public const HASH = 'h';
 
-    public const TIMESTAMP = 'ts';
+    final public const TIMESTAMP = 'ts';
 
-    public const TOKEN = 't';
+    final public const TOKEN = 't';
 
-    public const TOKEN_LENGTH = 24;
+    final public const TOKEN_LENGTH = 24;
 
-    public const USERNAME_CANONICAL = 'u';
+    final public const USERNAME_CANONICAL = 'u';
 
     /**
      * @var LoggerInterface
@@ -43,31 +32,28 @@ class TokenManager
     protected $logger;
 
     /**
-     * @var string
+     * @param string $secret
      */
-    protected $secret;
-
-    public function __construct($secret, LoggerInterface $logger)
+    public function __construct(protected $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 = (string) $expiration->getTimestamp();
-        $hash = hash('sha1', $token . $username . $timestamp . $this->secret);
+        $hash = \hash('sha1', $token.$username.$timestamp.$this->secret);
 
         return [
             self::HASH => $hash,
-            self::TOKEN => bin2hex($token),
+            self::TOKEN => \bin2hex($token),
             self::TIMESTAMP => $timestamp,
             self::USERNAME_CANONICAL => $username,
         ];
@@ -75,23 +61,23 @@ class TokenManager
 
     public function verify($hash, $token, User $user, string $timestamp)
     {
-        $token = hex2bin(trim($token));
+        $token = \hex2bin(\trim((string) $token));
 
-        if (strlen($token) !== self::TOKEN_LENGTH) {
+        if (self::TOKEN_LENGTH !== \strlen($token)) {
             return false;
         }
 
         $username = $user->getUsernameCanonical();
-        $date = DateTimeImmutable::createFromFormat('U', $timestamp);
+        $date = \DateTimeImmutable::createFromFormat('U', $timestamp);
 
-        if ($date < new DateTime('now')) {
+        if ($date < new \DateTime('now')) {
             $this->logger->info('receiving a password recover token with expired '
-                . 'validity');
+                .'validity');
 
             return false;
         }
 
-        $expected = hash('sha1', $token . $username . $timestamp . $this->secret);
+        $expected = \hash('sha1', $token.$username.$timestamp.$this->secret);
 
         if ($expected !== $hash) {
             return false;
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
index f757efa3a..903b8c5c5 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
@@ -11,17 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Security\Resolver;
 
-final class CenterResolverDispatcher implements CenterResolverDispatcherInterface
+final readonly class CenterResolverDispatcher implements CenterResolverDispatcherInterface
 {
     /**
-     * @var CenterResolverInterface[]
+     * @param \Chill\MainBundle\Security\Resolver\CenterResolverInterface[] $resolvers
      */
-    private iterable $resolvers;
-
-    public function __construct(iterable $resolvers = [])
-    {
-        $this->resolvers = $resolvers;
-    }
+    public function __construct(private iterable $resolvers = []) {}
 
     public function resolveCenter($entity, ?array $options = [])
     {
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
index 65507e610..f629459b4 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
@@ -12,22 +12,13 @@ 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
+final readonly class CenterResolverManager implements CenterResolverManagerInterface
 {
     /**
-     * @var CenterResolverInterface[]
+     * @param \Chill\MainBundle\Security\Resolver\CenterResolverInterface[] $resolvers
      */
-    private iterable $resolvers;
-
-    public function __construct(iterable $resolvers = [])
-    {
-        $this->resolvers = $resolvers;
-    }
+    public function __construct(private iterable $resolvers = []) {}
 
     public function resolveCenters($entity, ?array $options = []): array
     {
@@ -43,16 +34,11 @@ final class CenterResolverManager implements CenterResolverManagerInterface
                     return [$resolved];
                 }
 
-                if (is_array($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)
-                ));
+                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, $resolver::class));
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
index 3d699bec5..0f9eddd38 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasCentersInterface;
-use UnexpectedValueException;
 
 class DefaultCenterResolver implements CenterResolverInterface
 {
@@ -24,7 +23,6 @@ class DefaultCenterResolver implements CenterResolverInterface
 
     /**
      * @param HasCenterInterface $entity
-     * @param array $options
      */
     public function resolveCenter($entity, ?array $options = [])
     {
@@ -36,7 +34,7 @@ class DefaultCenterResolver implements CenterResolverInterface
             return $entity->getCenters();
         }
 
-        throw new UnexpectedValueException('should be an instanceof');
+        throw new \UnexpectedValueException('should be an instanceof');
     }
 
     public function supports($entity, ?array $options = []): bool
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
index 384272cdd..1551725e1 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\HasScopesInterface;
-use UnexpectedValueException;
 
 class DefaultScopeResolver implements ScopeResolverInterface
 {
@@ -40,11 +39,7 @@ class DefaultScopeResolver implements ScopeResolverInterface
             return $entity->getScopes();
         }
 
-        throw new UnexpectedValueException(
-            'should be an instanceof %s or %s',
-            HasScopesInterface::class,
-            HasScopeInterface::class
-        );
+        throw new \UnexpectedValueException(sprintf('should be an instanceof %s or %s', HasScopesInterface::class, HasScopeInterface::class));
     }
 
     public function supports($entity, ?array $options = []): bool
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
index 058bea75d..032c28a9b 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
@@ -15,28 +15,18 @@ use Twig\TwigFilter;
 
 final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
 {
-    private CenterResolverManagerInterface $centerResolverDispatcher;
-
-    private ScopeResolverDispatcher $scopeResolverDispatcher;
-
-    public function __construct(CenterResolverManagerInterface $centerResolverDispatcher, ScopeResolverDispatcher $scopeResolverDispatcher)
-    {
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
-    }
+    public function __construct(private readonly CenterResolverManagerInterface $centerResolverDispatcher, private readonly ScopeResolverDispatcher $scopeResolverDispatcher) {}
 
     public function getFilters()
     {
         return [
-            new TwigFilter('chill_resolve_center', [$this, 'resolveCenter']),
-            new TwigFilter('chill_resolve_scope', [$this, 'resolveScope']),
-            new TwigFilter('chill_is_scope_concerned', [$this, 'isScopeConcerned']),
+            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 = [])
@@ -45,21 +35,17 @@ final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
     }
 
     /**
-     * @param mixed $entity
-     *
      * @return Center|Center[]|null
      */
-    public function resolveCenter($entity, ?array $options = [])
+    public function resolveCenter(mixed $entity, ?array $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 = [])
+    public function resolveScope($entity, ?array $options = []): array|\Chill\MainBundle\Entity\Scope
     {
         return $this->scopeResolverDispatcher->resolveScope();
     }
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
index 308b9aee0..bafadf1a6 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
@@ -14,17 +14,12 @@ namespace Chill\MainBundle\Security\Resolver;
 use Chill\MainBundle\Entity\Scope;
 use Doctrine\Common\Collections\Collection;
 
-final class ScopeResolverDispatcher
+final readonly class ScopeResolverDispatcher
 {
     /**
-     * @var iterable|ScopeResolverInterface[]
+     * @param \Chill\MainBundle\Security\Resolver\ScopeResolverInterface[] $resolvers
      */
-    private iterable $resolvers;
-
-    public function __construct(iterable $resolvers)
-    {
-        $this->resolvers = $resolvers;
-    }
+    public function __construct(private iterable $resolvers) {}
 
     public function isConcerned($entity, ?array $options = []): bool
     {
@@ -38,11 +33,9 @@ final class ScopeResolverDispatcher
     }
 
     /**
-     * @param $entity
-     *
-     * @return iterable|Scope|Scope[]
+     * @return Scope|iterable<Scope>|Scope|null
      */
-    public function resolveScope($entity, ?array $options = [])
+    public function resolveScope(mixed $entity, ?array $options = []): null|\Chill\MainBundle\Entity\Scope|iterable
     {
         foreach ($this->resolvers as $resolver) {
             if ($resolver->supports($entity, $options)) {
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
index d56e54f2e..1ea3260a0 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
@@ -26,24 +26,18 @@ interface ScopeResolverInterface
 
     /**
      * 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 c299ee508..95e4a666f 100644
--- a/src/Bundle/ChillMainBundle/Security/RoleProvider.php
+++ b/src/Bundle/ChillMainBundle/Security/RoleProvider.php
@@ -11,32 +11,25 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Security;
 
-use function array_fill_keys;
-use function array_key_exists;
-
 class RoleProvider
 {
     /**
      * @var ProvideRoleInterface[]
      */
-    private $providers = [];
+    private array $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;
+    private ?array $rolesTitlesCache = null;
 
     /**
      * 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)
     {
@@ -48,9 +41,7 @@ class RoleProvider
         $roles = [];
 
         foreach ($this->providers as $provider) {
-            if ($provider->getRoles() !== null) {
-                $roles = array_merge($roles, $provider->getRoles());
-            }
+            $roles = array_merge($roles, $provider->getRoles());
         }
 
         return $roles;
@@ -61,9 +52,7 @@ class RoleProvider
         $roles = [];
 
         foreach ($this->providers as $provider) {
-            if ($provider->getRolesWithoutScope() !== null) {
-                $roles = array_merge($roles, $provider->getRolesWithoutScope());
-            }
+            $roles = array_merge($roles, $provider->getRolesWithoutScope());
         }
 
         return $roles;
@@ -80,7 +69,7 @@ class RoleProvider
     {
         $this->initializeRolesTitlesCache();
 
-        if (!array_key_exists($role, $this->rolesTitlesCache)) {
+        if (!\array_key_exists($role, $this->rolesTitlesCache)) {
             // this case might happens when the role is not described in
             // `getRolesWithHierarchy`
             return null;
@@ -107,12 +96,10 @@ class RoleProvider
                     }
                 }
             } else {
-                if ($provider->getRoles() !== null) {
-                    $this->rolesTitlesCache = array_merge(
-                        $this->rolesTitlesCache,
-                        array_fill_keys($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 ff0c73fb6..c624c6a99 100644
--- a/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
+++ b/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
@@ -21,31 +21,22 @@ use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 class UserProvider implements UserProviderInterface
 {
-    protected EntityManagerInterface $em;
-
-    public function __construct(EntityManagerInterface $em)
-    {
-        $this->em = $em;
-    }
+    public function __construct(protected EntityManagerInterface $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))',
+                    .'WHERE u.usernameCanonical = UNACCENT(LOWER(:pattern)) '
+                    .'OR '
+                    .'u.emailCanonical = UNACCENT(LOWER(:pattern))',
                 User::class
             ))
                 ->setParameter('pattern', $username)
                 ->getSingleResult();
         } catch (NoResultException $e) {
-            throw new UsernameNotFoundException(
-                'Bad credentials.',
-                0,
-                $e
-            );
+            throw new UsernameNotFoundException('Bad credentials.', 0, $e);
         }
 
         return $user;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php b/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php
index 38b151bb7..6349f5d85 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php
@@ -15,15 +15,7 @@ use Chill\MainBundle\Pagination\PaginatorInterface;
 
 class Collection
 {
-    private $items;
-
-    private PaginatorInterface $paginator;
-
-    public function __construct($items, PaginatorInterface $paginator)
-    {
-        $this->items = $items;
-        $this->paginator = $paginator;
-    }
+    public function __construct(private $items, private readonly PaginatorInterface $paginator) {}
 
     public function getItems()
     {
diff --git a/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php b/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
index 10669c1c5..476d68568 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
@@ -11,16 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Model;
 
-use JsonSerializable;
-
-class Counter implements JsonSerializable
+class Counter implements \JsonSerializable
 {
-    private int $counter;
-
-    public function __construct(?int $counter)
-    {
-        $this->counter = $counter;
-    }
+    public function __construct(private ?int $counter) {}
 
     public function getCounter(): ?int
     {
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index 8018fe951..bbae6bd40 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -14,7 +14,6 @@ namespace Chill\MainBundle\Serializer\Normalizer;
 use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Templating\Entity\AddressRender;
-use DateTimeInterface;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
@@ -43,20 +42,15 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
         'buildingName',
         'distribution',
         'extra',
-        'validFrom' => DateTimeInterface::class,
-        'validTo' => DateTimeInterface::class,
+        'validFrom' => \DateTimeInterface::class,
+        'validTo' => \DateTimeInterface::class,
         'confidential',
     ];
 
-    private AddressRender $addressRender;
-
-    public function __construct(AddressRender $addressRender)
-    {
-        $this->addressRender = $addressRender;
-    }
+    public function __construct(private readonly AddressRender $addressRender) {}
 
     /**
-     * @param Address $address
+     * @param Address     $address
      * @param string|null $format
      */
     public function normalize($address, $format = null, array $context = [])
@@ -105,7 +99,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
                 );
                 $data['isNoAddress'] = $address->isNoAddress();
             } elseif ('docgen' === $format) {
-                $dateContext = array_merge($context, ['docgen:expects' => DateTimeInterface::class]);
+                $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);
             }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
index e0b2a3e96..7c41bcb8a 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
@@ -18,16 +18,9 @@ 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 DenormalizerInterface, NormalizerInterface
 {
-    private CenterRepository $repository;
-
-    public function __construct(CenterRepository $repository)
-    {
-        $this->repository = $repository;
-    }
+    public function __construct(private readonly CenterRepository $repository) {}
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
@@ -35,7 +28,7 @@ class CenterNormalizer implements DenormalizerInterface, NormalizerInterface
             return null;
         }
 
-        if (false === array_key_exists('type', $data)) {
+        if (false === \array_key_exists('type', $data)) {
             throw new InvalidArgumentException('missing "type" key in data');
         }
 
@@ -43,7 +36,7 @@ class CenterNormalizer implements DenormalizerInterface, NormalizerInterface
             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');
         }
 
@@ -58,11 +51,12 @@ class CenterNormalizer implements DenormalizerInterface, NormalizerInterface
 
     public function normalize($center, $format = null, array $context = [])
     {
-        /** @var Center $center */
+        /* @var Center $center */
         return [
             'id' => $center->getId(),
             'type' => 'center',
             'name' => $center->getName(),
+            'isActive' => $center->getIsActive(),
         ];
     }
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
index b9cbe9caa..117e18704 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
@@ -21,7 +21,7 @@ class CollectionNormalizer implements NormalizerAwareInterface, NormalizerInterf
     use NormalizerAwareTrait;
 
     /**
-     * @param Collection $collection
+     * @param Collection  $collection
      * @param string|null $format
      */
     public function normalize($collection, $format = null, array $context = [])
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
index a00e6379a..41cf94e1b 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
@@ -14,37 +14,30 @@ namespace Chill\MainBundle\Serializer\Normalizer;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepository;
-use DateTime;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
-use function array_key_exists;
 
 class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
     use NormalizerAwareTrait;
 
-    private UserRepository $userRepository;
-
-    public function __construct(UserRepository $userRepository)
-    {
-        $this->userRepository = $userRepository;
-    }
+    public function __construct(private readonly UserRepository $userRepository) {}
 
     /**
      * @param CommentEmbeddable $object
      *
      * @throws ExceptionInterface
      */
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
-        if (null === $object || ($object->isEmpty())) {
+        if (null === $object || $object->isEmpty()) {
             return [
                 'comment' => '',
                 'isNull' => true,
                 'date' => $this->normalizer->normalize(null, $format, array_merge($context, [
-                    'docgen:expects' => DateTime::class,
+                    'docgen:expects' => \DateTime::class,
                 ])),
                 'user' => $this->normalizer->normalize(null, $format, array_merge($context, [
                     'docgen:expects' => User::class,
@@ -62,7 +55,7 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
             'comment' => $object->getComment(),
             'isNull' => false,
             'date' => $this->normalizer->normalize($object->getDate(), $format, array_merge($context, [
-                'docgen:expects' => DateTime::class,
+                'docgen:expects' => \DateTime::class,
             ])),
             'user' => $this->normalizer->normalize($user, $format, array_merge($context, [
                 'docgen:expects' => User::class,
@@ -70,7 +63,7 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
         ];
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         if ('docgen' !== $format) {
             return false;
@@ -82,7 +75,7 @@ class CommentEmbeddableDocGenNormalizer implements ContextAwareNormalizerInterfa
 
         if (
             null === $data
-            && array_key_exists('docgen:expects', $context)
+            && \array_key_exists('docgen:expects', $context)
             && CommentEmbeddable::class === $context['docgen:expects']) {
             return true;
         }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
index 8bd0fd3c1..9ee8bf158 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
@@ -11,30 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use DateTime;
-use DateTimeImmutable;
 use DateTimeInterface;
-use IntlDateFormatter;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-use function array_key_exists;
-use function is_array;
-
 class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
-    private ParameterBagInterface $parameterBag;
-
-    private RequestStack $requestStack;
-
-    public function __construct(RequestStack $requestStack, ParameterBagInterface $parameterBag)
-    {
-        $this->requestStack = $requestStack;
-        $this->parameterBag = $parameterBag;
-    }
+    public function __construct(private readonly RequestStack $requestStack, private readonly ParameterBagInterface $parameterBag) {}
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
@@ -43,14 +29,14 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
         }
 
         switch ($type) {
-            case DateTime::class:
-                $result = DateTime::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
+            case \DateTime::class:
+                $result = \DateTime::createFromFormat(\DateTimeInterface::ISO8601, $data['datetime']);
 
                 break;
 
-            case DateTimeInterface::class:
-            case DateTimeImmutable::class:
-                $result = DateTimeImmutable::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
+            case \DateTimeInterface::class:
+            case \DateTimeImmutable::class:
+                $result = \DateTimeImmutable::createFromFormat(\DateTimeInterface::ISO8601, $data['datetime']);
 
                 break;
 
@@ -67,12 +53,12 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
 
     public function normalize($date, $format = null, array $context = [])
     {
-        /** @var DateTimeInterface $date */
+        /* @var DateTimeInterface $date */
         switch ($format) {
             case 'json':
                 return [
-                    'datetime' => $date->format(DateTimeInterface::ISO8601),
-                    'datetime8601' => $date->format(DateTimeInterface::ATOM),
+                    'datetime' => $date->format(\DateTimeInterface::ISO8601),
+                    'datetime8601' => $date->format(\DateTimeInterface::ATOM),
                 ];
 
             case 'docgen':
@@ -82,18 +68,18 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
                     ];
                 }
 
-                $hasTime = $date->format('His') !== '000000';
+                $hasTime = '000000' !== $date->format('His');
                 $request = $this->requestStack->getCurrentRequest();
                 $locale = null !== $request ? $request->getLocale() : $this->parameterBag->get('kernel.default_locale');
-                $formatterLong = IntlDateFormatter::create(
+                $formatterLong = \IntlDateFormatter::create(
                     $locale,
-                    IntlDateFormatter::LONG,
-                    $hasTime ? IntlDateFormatter::SHORT : IntlDateFormatter::NONE
+                    \IntlDateFormatter::LONG,
+                    $hasTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE
                 );
-                $formatterShort = IntlDateFormatter::create(
+                $formatterShort = \IntlDateFormatter::create(
                     $locale,
-                    IntlDateFormatter::SHORT,
-                    $hasTime ? IntlDateFormatter::SHORT : IntlDateFormatter::NONE
+                    \IntlDateFormatter::SHORT,
+                    $hasTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE
                 );
 
                 return [
@@ -105,26 +91,26 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
 
     public function supportsDenormalization($data, $type, $format = null): bool
     {
-        return DateTimeInterface::class === $type
-            || DateTime::class === $type
-            || DateTimeImmutable::class === $type
-            || (is_array($data) && array_key_exists('datetime', $data));
+        return \DateTimeInterface::class === $type
+            || \DateTime::class === $type
+            || \DateTimeImmutable::class === $type
+            || (\is_array($data) && \array_key_exists('datetime', $data));
     }
 
     public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         if ('json' === $format) {
-            return $data instanceof DateTimeInterface;
+            return $data instanceof \DateTimeInterface;
         }
 
         if ('docgen' === $format) {
-            return $data instanceof DateTimeInterface || (
+            return $data instanceof \DateTimeInterface || (
                 null === $data
-                && array_key_exists('docgen:expects', $context)
+                && \array_key_exists('docgen:expects', $context)
                 && (
-                    DateTimeInterface::class === $context['docgen:expects']
-                    || DateTime::class === $context['docgen:expects']
-                    || DateTimeImmutable::class === $context['docgen:expects']
+                    \DateTimeInterface::class === $context['docgen:expects']
+                    || \DateTime::class === $context['docgen:expects']
+                    || \DateTimeImmutable::class === $context['docgen:expects']
                 )
             );
         }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
index da2b63faa..1ecb7824f 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
@@ -11,16 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use LogicException;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 
-use function count;
-use function implode;
-
 /**
  * Denormalize an object given a list of supported class.
  */
@@ -32,12 +28,12 @@ class DiscriminatedObjectDenormalizer implements ContextAwareDenormalizerInterfa
      * Should be present in context and contains an array of
      * allowed types.
      */
-    public const ALLOWED_TYPES = 'denormalize_multi.allowed_types';
+    final public const ALLOWED_TYPES = 'denormalize_multi.allowed_types';
 
     /**
      * The type to set for enabling this type.
      */
-    public const TYPE = '@multi';
+    final public const TYPE = '@multi';
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
@@ -45,14 +41,13 @@ class DiscriminatedObjectDenormalizer implements ContextAwareDenormalizerInterfa
             if ($this->denormalizer->supportsDenormalization($data, $localType, $format)) {
                 try {
                     return $this->denormalizer->denormalize($data, $localType, $format, $context);
-                } catch (RuntimeException|NotNormalizableValueException $e) {
+                } catch (NotNormalizableValueException|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])));
     }
 
     public function supportsDenormalization($data, $type, $format = null, array $context = [])
@@ -61,8 +56,8 @@ class DiscriminatedObjectDenormalizer implements ContextAwareDenormalizerInterfa
             return false;
         }
 
-        if (0 === count($context[self::ALLOWED_TYPES] ?? [])) {
-            throw new LogicException('The context should contains a list of
+        if (0 === \count($context[self::ALLOWED_TYPES] ?? [])) {
+            throw new \LogicException('The context should contains a list of
                 allowed types');
         }
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
index 3f4d0c51f..ed34a45be 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
@@ -17,25 +17,13 @@ use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 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
 {
-    private EntityManagerInterface $em;
-
-    private ClassMetadataFactoryInterface $serializerMetadataFactory;
-
-    public function __construct(EntityManagerInterface $em, ClassMetadataFactoryInterface $serializerMetadataFactory)
-    {
-        $this->em = $em;
-        $this->serializerMetadataFactory = $serializerMetadataFactory;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly ClassMetadataFactoryInterface $serializerMetadataFactory) {}
 
     public function denormalize($data, $type, $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];
         }
 
@@ -45,11 +33,11 @@ class DoctrineExistingEntityNormalizer implements DenormalizerInterface
 
     public function supportsDenormalization($data, $type, $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;
         }
 
@@ -68,13 +56,13 @@ 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
-                return count($data) === 2
-                    && array_key_exists($typeProperty, $data)
+                return 2 === \count($data)
+                    && \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;
+        return 1 === \count($data);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
index 4dd6888a0..c4284a526 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
@@ -23,28 +23,14 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
 {
     use NormalizerAwareTrait;
 
-    private EntityWorkflowManager $entityWorkflowManager;
-
-    private MetadataExtractor $metadataExtractor;
-
-    private Registry $registry;
-
-    public function __construct(
-        EntityWorkflowManager $entityWorkflowManager,
-        MetadataExtractor $metadataExtractor,
-        Registry $registry
-    ) {
-        $this->entityWorkflowManager = $entityWorkflowManager;
-        $this->metadataExtractor = $metadataExtractor;
-        $this->registry = $registry;
-    }
+    public function __construct(private readonly EntityWorkflowManager $entityWorkflowManager, private readonly MetadataExtractor $metadataExtractor, private readonly Registry $registry) {}
 
     /**
      * @param EntityWorkflow $object
      *
      * @return array
      */
-    public function normalize($object, ?string $format = null, array $context = [])
+    public function normalize($object, string $format = null, array $context = [])
     {
         $workflow = $this->registry->get($object, $object->getWorkflowName());
         $handler = $this->entityWorkflowManager->getHandler($object);
@@ -62,7 +48,7 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
         ];
     }
 
-    public function supportsNormalization($data, ?string $format = null): bool
+    public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof EntityWorkflow && 'json' === $format;
     }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
index 63b2c1141..1edc6e74c 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
@@ -21,17 +21,12 @@ class EntityWorkflowStepNormalizer implements NormalizerAwareInterface, Normaliz
 {
     use NormalizerAwareTrait;
 
-    private MetadataExtractor $metadataExtractor;
-
-    public function __construct(MetadataExtractor $metadataExtractor)
-    {
-        $this->metadataExtractor = $metadataExtractor;
-    }
+    public function __construct(private readonly MetadataExtractor $metadataExtractor) {}
 
     /**
      * @param EntityWorkflowStep $object
      */
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
         $data = [
             'type' => 'entity_workflow_step',
@@ -80,7 +75,7 @@ class EntityWorkflowStepNormalizer implements NormalizerAwareInterface, Normaliz
         return $data;
     }
 
-    public function supportsNormalization($data, ?string $format = null): bool
+    public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof EntityWorkflowStep && 'json' === $format;
     }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
index 589d0b914..3195f9aab 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use ArrayObject;
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Notification\NotificationHandlerManager;
 use Doctrine\ORM\EntityManagerInterface;
@@ -24,25 +23,14 @@ class NotificationNormalizer implements NormalizerAwareInterface, NormalizerInte
 {
     use NormalizerAwareTrait;
 
-    private EntityManagerInterface $entityManager;
-
-    private NotificationHandlerManager $notificationHandlerManager;
-
-    private Security $security;
-
-    public function __construct(NotificationHandlerManager $notificationHandlerManager, EntityManagerInterface $entityManager, Security $security)
-    {
-        $this->notificationHandlerManager = $notificationHandlerManager;
-        $this->entityManager = $entityManager;
-        $this->security = $security;
-    }
+    public function __construct(private readonly NotificationHandlerManager $notificationHandlerManager, private readonly EntityManagerInterface $entityManager, private readonly Security $security) {}
 
     /**
      * @param Notification $object
      *
-     * @return array|ArrayObject|bool|float|int|string|void|null
+     * @return array|\ArrayObject|bool|float|int|string|void|null
      */
-    public function normalize($object, ?string $format = null, array $context = [])
+    public function normalize($object, string $format = null, array $context = [])
     {
         $entity = $this->entityManager
             ->getRepository($object->getRelatedEntityClass())
@@ -63,7 +51,7 @@ class NotificationNormalizer implements NormalizerAwareInterface, NormalizerInte
         ];
     }
 
-    public function supportsNormalization($data, ?string $format = null)
+    public function supportsNormalization($data, string $format = null)
     {
         return $data instanceof Notification && 'json' === $format;
     }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 349f2dace..583c8a75b 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -21,9 +21,9 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 class PhonenumberNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
-    private string $defaultCarrierCode;
+    private readonly string $defaultCarrierCode;
 
-    private PhoneNumberUtil $phoneNumberUtil;
+    private readonly PhoneNumberUtil $phoneNumberUtil;
 
     public function __construct(ParameterBagInterface $parameterBag)
     {
@@ -33,8 +33,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
     /**
      * @param string|null $data
-     * @param mixed $type
-     * @param null|mixed $format
+     * @param mixed|null  $format
      *
      * @throws UnexpectedValueException
      */
@@ -51,7 +50,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
         }
     }
 
-    public function normalize($object, ?string $format = null, array $context = []): string
+    public function normalize($object, string $format = null, array $context = []): string
     {
         if ('docgen' === $format && null === $object) {
             return '';
@@ -65,7 +64,7 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
         return 'libphonenumber\PhoneNumber' === $type;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         if ($data instanceof PhoneNumber && 'json' === $format) {
             return true;
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
index 46e6f45d3..4084bce44 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
@@ -15,18 +15,15 @@ use Chill\MainBundle\Doctrine\Model\Point;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
-use function count;
-use function is_array;
-
 class PointNormalizer implements DenormalizerInterface
 {
     public function denormalize($data, $type, $format = null, array $context = [])
     {
-        if (!is_array($data)) {
+        if (!\is_array($data)) {
             throw new InvalidArgumentException('point data is not an array. It should be an array of 2 coordinates.');
         }
 
-        if (count($data) !== 2) {
+        if (2 !== \count($data)) {
             throw new InvalidArgumentException('point data is not an array of 2 elements. It should be an array of 2 coordinates.');
         }
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
index 0049657bb..565fa34fc 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -18,14 +18,9 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, DenormalizerInterface
 {
-    private Security $security;
+    public function __construct(private readonly Security $security) {}
 
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
-
-    public function denormalize($data, string $type, ?string $format = null, array $context = []): PrivateCommentEmbeddable
+    public function denormalize($data, string $type, string $format = null, array $context = []): PrivateCommentEmbeddable
     {
         $comment = new PrivateCommentEmbeddable();
 
@@ -43,12 +38,12 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
         return $object->getCommentForUser($this->security->getUser());
     }
 
-    public function supportsDenormalization($data, string $type, ?string $format = null): bool
+    public function supportsDenormalization($data, string $type, string $format = null): bool
     {
         return PrivateCommentEmbeddable::class === $type;
     }
 
-    public function supportsNormalization($data, ?string $format = null): bool
+    public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof PrivateCommentEmbeddable;
     }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
index fde3a3d8e..8a80f1492 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -26,7 +26,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
 {
     use NormalizerAwareTrait;
 
-    public const NULL_USER = [
+    final public const NULL_USER = [
         'type' => 'user',
         'id' => '',
         'username' => '',
@@ -36,12 +36,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
         'email' => '',
     ];
 
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly UserRender $userRender) {}
 
     public function normalize($object, $format = null, array $context = [])
     {
@@ -68,14 +63,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
         );
 
         if (null === $object && 'docgen' === $format) {
-            return array_merge(self::NULL_USER, [
-                'civility' => $this->normalizer->normalize(null, $format, $civilityContext),
-                'user_job' => $this->normalizer->normalize(null, $format, $userJobContext),
-                'main_center' => $this->normalizer->normalize(null, $format, $centerContext),
-                'main_scope' => $this->normalizer->normalize(null, $format, $scopeContext),
-                'current_location' => $this->normalizer->normalize(null, $format, $locationContext),
-                'main_location' => $this->normalizer->normalize(null, $format, $locationContext),
-            ]);
+            return [...self::NULL_USER, 'civility' => $this->normalizer->normalize(null, $format, $civilityContext), 'user_job' => $this->normalizer->normalize(null, $format, $userJobContext), 'main_center' => $this->normalizer->normalize(null, $format, $centerContext), 'main_scope' => $this->normalizer->normalize(null, $format, $scopeContext), 'current_location' => $this->normalizer->normalize(null, $format, $locationContext), 'main_location' => $this->normalizer->normalize(null, $format, $locationContext)];
         }
 
         $data = [
diff --git a/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCode.php b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCode.php
new file mode 100644
index 000000000..a4589b836
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCode.php
@@ -0,0 +1,148 @@
+<?php
+
+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 Chill\MainBundle\Service\AddressGeographicalUnit;
+
+use Doctrine\DBAL\Connection;
+use Psr\Log\LoggerInterface;
+
+final readonly class CollateAddressWithReferenceOrPostalCode implements CollateAddressWithReferenceOrPostalCodeInterface
+{
+    private const LOG_PREFIX = '[collate addresses] ';
+    /**
+     * For the address having an "invented" postal code, find the postal code "reference" with the same code,
+     * and the most similar name. When two reference code match, we add.
+     *
+     * This query intentionally includes also address with reference, as the reference may be wrong.
+     */
+    private const FORCE_ORIGINAL_POSTAL_CODE = <<<'SQL'
+        WITH recollate AS (
+            SELECT * FROM (
+                              SELECT cma.id AS address_id, cmpc.id, cmpc.label, cmpc.code, cmpc_reference.id AS cmpc_reference_id, cmpc_reference.label, cmpc_reference.code,
+                                     RANK() OVER (PARTITION BY cma.id ORDER BY SIMILARITY(cmpc.label, cmpc_reference.label) DESC, cmpc_reference.id ASC) AS ranked
+                              FROM
+                                  chill_main_address cma JOIN chill_main_postal_code cmpc on cma.postcode_id = cmpc.id,
+                                  chill_main_postal_code cmpc_reference
+                              WHERE
+                                -- use only postal code which are reference
+                                      cmpc_reference.id != cmpc.id AND cmpc_reference.origin = 0
+                                -- only where cmpc is created manually
+                                AND cmpc.origin != 0
+                                -- only when postal code match
+                                AND TRIM(REPLACE(LOWER(cmpc.code), ' ', '')) = LOWER(cmpc_reference.code)
+                                AND cmpc.country_id = cmpc_reference.country_id
+                                AND cma.id > :since_id -- to set the first id
+                          ) sq
+            WHERE ranked = 1)
+        UPDATE chill_main_address SET postcode_id = cmpc_reference_id FROM recollate WHERE recollate.address_id = chill_main_address.id;
+    SQL;
+
+    /**
+     * associate the address with the most similar address reference.
+     *
+     * This query intentionally ignores the existing addressreference_id, to let fixing the address match the
+     * most similar address reference.
+     */
+    private const FORCE_MOST_SIMILAR_ADDRESS_REFERENCE = <<<'SQL'
+        WITH recollate AS (
+            SELECT * FROM (
+                  SELECT cma.id AS address_id, cma.streetnumber, cma.street,  cmpc.code, cmpc.label, cmar.id AS address_reference_id, cmar.streetnumber, cmar.street, cmpc_reference.code, cmpc_reference.label,
+                         similarity(cma.street, cmar.street),
+                         RANK() OVER (PARTITION BY cma.id ORDER BY SIMILARITY (cma.street, cmar.street) DESC, SIMILARITY (cma.streetnumber, cmar.streetnumber), cmar.id ASC) AS ranked
+                  FROM
+                      chill_main_address cma
+                          JOIN chill_main_postal_code cmpc on cma.postcode_id = cmpc.id,
+                      chill_main_address_reference cmar JOIN chill_main_postal_code cmpc_reference ON cmar.postcode_id = cmpc_reference.id
+                  WHERE
+                    -- only if cmpc is a reference (must be matched before executing this query)
+                    cma.postcode_id = cmar.postcode_id
+                    -- join cmpc to cma
+                    AND SIMILARITY(LOWER(cma.street), LOWER(cmar.street)) > 0.6 AND LOWER(cma.streetnumber) = LOWER(cmar.streetnumber)
+                    -- only addresses which match the address reference - let the user decide if the reference has changed
+                    AND cma.refstatus = 'match'
+                    -- only the most recent
+                    AND cma.id > :since_id
+              ) AS sq
+            WHERE ranked = 1
+        )
+        UPDATE chill_main_address SET addressreference_id = recollate.address_reference_id FROM recollate WHERE chill_main_address.id = recollate.address_id;
+    SQL;
+
+    /**
+     * Update the point's address with the:.
+     *
+     * - address reference point, if the address match the reference with sufficient similarity
+     * - or the postcal code center
+     */
+    private const UPDATE_POINT = <<<'SQL'
+        WITH address_geom AS (
+            SELECT cma.id AS address_id, COALESCE(cmar.point, cmpc.center) AS point
+            FROM chill_main_address cma
+            LEFT JOIN chill_main_address_reference cmar ON cma.addressreference_id = cmar.id AND similarity(cma.street, cmar.street) > 0.6 AND LOWER(cma.streetnumber) = LOWER(cmar.streetnumber)
+            LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id
+            WHERE cma.id > :since_id
+        )
+        UPDATE chill_main_address SET point = address_geom.point FROM address_geom WHERE address_geom.address_id = chill_main_address.id
+    SQL;
+
+    private const MAX_ADDRESS_ID = <<<'SQL'
+        SELECT MAX(id) AS max_id FROM chill_main_address;
+    SQL;
+
+    public function __construct(
+        private Connection $connection,
+        private LoggerInterface $logger,
+    ) {}
+
+    /**
+     * @throws \Throwable
+     */
+    public function __invoke(int $sinceId = 0): int
+    {
+        try {
+            [
+                $postCodeSetReferenceFromMostSimilar,
+                $addressReferenceMatch,
+                $pointUpdates,
+                $lastId,
+            ] = $this->connection->transactional(function () use ($sinceId) {
+                $postCodeSetReferenceFromMostSimilar = $this->connection->executeStatement(self::FORCE_ORIGINAL_POSTAL_CODE, ['since_id' => $sinceId]);
+                $addressReferenceMatch = $this->connection->executeStatement(self::FORCE_MOST_SIMILAR_ADDRESS_REFERENCE, ['since_id' => $sinceId]);
+                $pointUpdates = $this->connection->executeStatement(self::UPDATE_POINT, ['since_id' => $sinceId]);
+                $lastId = $this->connection->fetchOne(self::MAX_ADDRESS_ID);
+
+                return [
+                    $postCodeSetReferenceFromMostSimilar,
+                    $addressReferenceMatch,
+                    $pointUpdates,
+                    $lastId,
+                ];
+            });
+        } catch (\Throwable $e) {
+            $this->logger->error(self::LOG_PREFIX.'error while re-collating addresses', [
+                'message' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+
+            throw $e;
+        }
+
+        $this->logger->info(self::LOG_PREFIX.'Collate the addresses with reference', [
+            'set_postcode_from_most_similar' => $postCodeSetReferenceFromMostSimilar,
+            'address_reference_match' => $addressReferenceMatch,
+            'point_update' => $pointUpdates,
+            'since_id' => $sinceId,
+            'last_id' => $lastId,
+        ]);
+
+        return $lastId;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJob.php b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJob.php
new file mode 100644
index 000000000..ed055a3c3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJob.php
@@ -0,0 +1,49 @@
+<?php
+
+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 Chill\MainBundle\Service\AddressGeographicalUnit;
+
+use Chill\MainBundle\Cron\CronJobInterface;
+use Chill\MainBundle\Entity\CronJobExecution;
+use Symfony\Component\Clock\ClockInterface;
+
+final readonly class CollateAddressWithReferenceOrPostalCodeCronJob implements CronJobInterface
+{
+    private const LAST_MAX_ID = 'last-max-id';
+
+    public function __construct(
+        private ClockInterface $clock,
+        private CollateAddressWithReferenceOrPostalCodeInterface $collateAddressWithReferenceOrPostalCode,
+    ) {}
+
+    public function canRun(?CronJobExecution $cronJobExecution): bool
+    {
+        if (null === $cronJobExecution) {
+            return true;
+        }
+
+        $now = $this->clock->now();
+
+        return $now->sub(new \DateInterval('PT6H')) > $cronJobExecution->getLastStart();
+    }
+
+    public function getKey(): string
+    {
+        return 'collate-address';
+    }
+
+    public function run(array $lastExecutionData): null|array
+    {
+        $maxId = ($this->collateAddressWithReferenceOrPostalCode)($lastExecutionData[self::LAST_MAX_ID] ?? 0);
+
+        return [self::LAST_MAX_ID => $maxId];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeInterface.php b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeInterface.php
new file mode 100644
index 000000000..cd3f2606f
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+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 Chill\MainBundle\Service\AddressGeographicalUnit;
+
+interface CollateAddressWithReferenceOrPostalCodeInterface
+{
+    /**
+     * @throws \Throwable
+     */
+    public function __invoke(int $sinceId = 0): int;
+}
diff --git a/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJob.php b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJob.php
index 3c1ff0a75..06eb2104d 100644
--- a/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJob.php
+++ b/src/Bundle/ChillMainBundle/Service/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJob.php
@@ -13,19 +13,15 @@ namespace Chill\MainBundle\Service\AddressGeographicalUnit;
 
 use Chill\MainBundle\Cron\CronJobInterface;
 use Chill\MainBundle\Entity\CronJobExecution;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
-use UnexpectedValueException;
+use Symfony\Component\Clock\ClockInterface;
 
-class RefreshAddressToGeographicalUnitMaterializedViewCronJob implements CronJobInterface
+final readonly class RefreshAddressToGeographicalUnitMaterializedViewCronJob implements CronJobInterface
 {
-    private Connection $connection;
-
-    public function __construct(Connection $connection)
-    {
-        $this->connection = $connection;
-    }
+    public function __construct(
+        private Connection $connection,
+        private ClockInterface $clock,
+    ) {}
 
     public function canRun(?CronJobExecution $cronJobExecution): bool
     {
@@ -34,14 +30,14 @@ class RefreshAddressToGeographicalUnitMaterializedViewCronJob implements CronJob
         }
 
         if ($cronJobExecution->getKey() !== $this->getKey()) {
-            throw new UnexpectedValueException();
+            throw new \UnexpectedValueException();
         }
 
-        $now = new DateTimeImmutable('now');
+        $now = $this->clock->now();
 
-        return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
+        return $cronJobExecution->getLastStart() < $now->sub(new \DateInterval('P1D'))
             // introduce a random component to ensure a roll when multiple instances are hosted on same machines
-            && mt_rand(0, 10) === 0;
+            && 0 === random_int(0, 10);
     }
 
     public function getKey(): string
@@ -49,8 +45,10 @@ class RefreshAddressToGeographicalUnitMaterializedViewCronJob implements CronJob
         return 'refresh-materialized-view-address-to-geog-units';
     }
 
-    public function run(): void
+    public function run(array $lastExecutionData): null|array
     {
         $this->connection->executeQuery('REFRESH MATERIALIZED VIEW view_chill_main_address_geographical_unit');
+
+        return null;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php b/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php
new file mode 100644
index 000000000..b545d3979
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoManager.php
@@ -0,0 +1,51 @@
+<?php
+
+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 Chill\MainBundle\Service\EntityInfo;
+
+use Doctrine\DBAL\Connection;
+use Psr\Log\LoggerInterface;
+
+class ViewEntityInfoManager
+{
+    public function __construct(
+        /**
+         * @var ViewEntityInfoProviderInterface[]
+         */
+        private readonly iterable $vienEntityInfoProviders,
+        private readonly Connection $connection,
+        private readonly LoggerInterface $logger,
+    ) {}
+
+    public function synchronizeOnDB(): void
+    {
+        $this->connection->transactional(function (Connection $conn): void {
+            foreach ($this->vienEntityInfoProviders as $viewProvider) {
+                foreach ($this->createOrReplaceViewSQL($viewProvider, $viewProvider->getViewName()) as $sql) {
+                    $this->logger->debug('Will execute create view sql', ['sql' => $sql]);
+                    $this->logger->debug($sql);
+                    $conn->executeQuery($sql);
+                }
+            }
+        });
+    }
+
+    /**
+     * @return array<string>
+     */
+    private function createOrReplaceViewSQL(ViewEntityInfoProviderInterface $viewProvider, string $viewName): array
+    {
+        return [
+            "DROP VIEW IF EXISTS {$viewName}",
+            sprintf("CREATE OR REPLACE VIEW {$viewName} AS %s", $viewProvider->getViewQuery()),
+        ];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoProviderInterface.php b/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoProviderInterface.php
new file mode 100644
index 000000000..392c0f82c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Service/EntityInfo/ViewEntityInfoProviderInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+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 Chill\MainBundle\Service\EntityInfo;
+
+interface ViewEntityInfoProviderInterface
+{
+    public function getViewQuery(): string;
+
+    public function getViewName(): string;
+}
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
index 88a9cb4c5..25749aa89 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
@@ -11,10 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\Import;
 
-use Exception;
 use League\Csv\Reader;
 use League\Csv\Statement;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -22,21 +20,7 @@ class AddressReferenceBEFromBestAddress
 {
     private const RELEASE = 'https://gitea.champs-libres.be/api/v1/repos/Chill-project/belgian-bestaddresses-transform/releases/tags/v1.0.0';
 
-    private AddressReferenceBaseImporter $baseImporter;
-
-    private AddressToReferenceMatcher $addressToReferenceMatcher;
-
-    private HttpClientInterface $client;
-
-    public function __construct(
-        HttpClientInterface $client,
-        AddressReferenceBaseImporter $baseImporter,
-        AddressToReferenceMatcher $addressToReferenceMatcher
-    ) {
-        $this->client = $client;
-        $this->baseImporter = $baseImporter;
-        $this->addressToReferenceMatcher = $addressToReferenceMatcher;
-    }
+    public function __construct(private readonly HttpClientInterface $client, private readonly AddressReferenceBaseImporter $baseImporter, private readonly AddressToReferenceMatcher $addressToReferenceMatcher) {}
 
     public function import(string $lang, array $lists): void
     {
@@ -51,12 +35,10 @@ class AddressReferenceBEFromBestAddress
             $release = $this->client->request('GET', self::RELEASE)
                 ->toArray();
         } catch (TransportExceptionInterface $e) {
-            throw new RuntimeException('could not get the release definition', 0, $e);
+            throw new \RuntimeException('could not get the release definition', 0, $e);
         }
 
-        $asset = array_filter($release['assets'], static function (array $item) use ($lang, $list) {
-            return 'addresses-' . $list . '.' . $lang . '.csv.gz' === $item['name'];
-        });
+        $asset = array_filter($release['assets'], static fn (array $item) => 'addresses-'.$list.'.'.$lang.'.csv.gz' === $item['name']);
 
         return array_values($asset)[0]['browser_download_url'];
     }
@@ -68,10 +50,10 @@ class AddressReferenceBEFromBestAddress
         $response = $this->client->request('GET', $downloadUrl);
 
         if (200 !== $response->getStatusCode()) {
-            throw new Exception('Could not download CSV: ' . $response->getStatusCode());
+            throw new \Exception('Could not download CSV: '.$response->getStatusCode());
         }
 
-        $tmpname = tempnam(sys_get_temp_dir(), 'php-add-' . $list . $lang);
+        $tmpname = tempnam(sys_get_temp_dir(), 'php-add-'.$list.$lang);
         $file = fopen($tmpname, 'r+b');
 
         foreach ($this->client->stream($response) as $chunk) {
@@ -95,8 +77,8 @@ class AddressReferenceBEFromBestAddress
                 $record['municipality_objectid'],
                 $record['postal_info_objectid'],
                 $record['streetname'],
-                $record['housenumber'] .($record['boxnumber'] !== '' ? ' bte '. $record['boxnumber'] : ''),
-                'bestaddress.' . $list,
+                $record['housenumber'].('' !== $record['boxnumber'] ? ' bte '.$record['boxnumber'] : ''),
+                'bestaddress.'.$list,
                 (float) $record['Y'],
                 (float) $record['X'],
                 3812
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
index c6ddfcf40..bc656ebc5 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
@@ -13,12 +13,7 @@ namespace Chill\MainBundle\Service\Import;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Statement;
-use Exception;
-use LogicException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
-use function array_key_exists;
-use function count;
 
 final class AddressReferenceBaseImporter
 {
@@ -46,19 +41,11 @@ final class AddressReferenceBaseImporter
 
     private ?string $currentSource = null;
 
-    private Connection $defaultConnection;
-
     private bool $isInitialized = false;
 
-    private LoggerInterface $logger;
-
     private array $waitingForInsert = [];
 
-    public function __construct(Connection $defaultConnection, LoggerInterface $logger)
-    {
-        $this->defaultConnection = $defaultConnection;
-        $this->logger = $logger;
-    }
+    public function __construct(private readonly Connection $defaultConnection, private readonly LoggerInterface $logger) {}
 
     public function finalize(): void
     {
@@ -79,16 +66,16 @@ final class AddressReferenceBaseImporter
         string $street,
         string $streetNumber,
         string $source,
-        ?float $lat = null,
-        ?float $lon = null,
-        ?int $srid = null
+        float $lat = null,
+        float $lon = null,
+        int $srid = null
     ): void {
         if (!$this->isInitialized) {
             $this->initialize($source);
         }
 
         if ($this->currentSource !== $source) {
-            throw new LogicException('Cannot store addresses from different sources during same import. Execute finalize to commit inserts before changing the source');
+            throw new \LogicException('Cannot store addresses from different sources during same import. Execute finalize to commit inserts before changing the source');
         }
 
         $this->waitingForInsert[] = [
@@ -103,7 +90,7 @@ final class AddressReferenceBaseImporter
             $srid,
         ];
 
-        if (100 <= count($this->waitingForInsert)) {
+        if (100 <= \count($this->waitingForInsert)) {
             $this->doInsertPending();
         }
     }
@@ -130,7 +117,7 @@ final class AddressReferenceBaseImporter
 
     private function doInsertPending(): void
     {
-        if (!array_key_exists($forNumber = count($this->waitingForInsert), $this->cachingStatements)) {
+        if (!\array_key_exists($forNumber = \count($this->waitingForInsert), $this->cachingStatements)) {
             $sql = strtr(self::INSERT, [
                 '{{ values }}' => implode(
                     ', ',
@@ -138,7 +125,7 @@ final class AddressReferenceBaseImporter
                 ),
             ]);
 
-            $this->logger->debug(self::LOG_PREFIX . ' generated sql for insert', [
+            $this->logger->debug(self::LOG_PREFIX.' generated sql for insert', [
                 'sql' => $sql,
                 'forNumber' => $forNumber,
             ]);
@@ -150,7 +137,7 @@ final class AddressReferenceBaseImporter
             return;
         }
 
-        $this->logger->debug(self::LOG_PREFIX . ' inserting pending addresses', [
+        $this->logger->debug(self::LOG_PREFIX.' inserting pending addresses', [
             'number' => $forNumber,
             'first' => $this->waitingForInsert[0] ?? null,
         ]);
@@ -161,11 +148,11 @@ final class AddressReferenceBaseImporter
             $affected = $statement->executeStatement(array_merge(...$this->waitingForInsert));
 
             if (0 === $affected) {
-                throw new RuntimeException('no row affected');
+                throw new \RuntimeException('no row affected');
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // in some case, we can add debug code here
-            //dump($this->waitingForInsert);
+            // dump($this->waitingForInsert);
             throw $e;
         } finally {
             $this->waitingForInsert = [];
@@ -186,8 +173,8 @@ final class AddressReferenceBaseImporter
             'CREATE INDEX idx_ref_add_temp ON reference_address_temp (refid)'
         );
 
-        //1) Add new addresses
-        $this->logger->info(self::LOG_PREFIX . 'upsert new addresses');
+        // 1) Add new addresses
+        $this->logger->info(self::LOG_PREFIX.'upsert new addresses');
         $affected = $this->defaultConnection->executeStatement("INSERT INTO chill_main_address_reference
             (id, postcode_id, refid, street, streetnumber, municipalitycode, source, point, createdat, deletedat, updatedat)
             SELECT
@@ -206,16 +193,16 @@ final class AddressReferenceBaseImporter
             ON CONFLICT (refid, source) DO UPDATE
             SET postcode_id = excluded.postcode_id, refid = excluded.refid, street = excluded.street, streetnumber = excluded.streetnumber, municipalitycode = excluded.municipalitycode, source = excluded.source, point = excluded.point, updatedat = NOW(), deletedAt = NULL
         ");
-        $this->logger->info(self::LOG_PREFIX . 'addresses upserted', ['upserted' => $affected]);
+        $this->logger->info(self::LOG_PREFIX.'addresses upserted', ['upserted' => $affected]);
 
-        //3) Delete addresses
-        $this->logger->info(self::LOG_PREFIX . 'soft delete adresses');
+        // 3) Delete addresses
+        $this->logger->info(self::LOG_PREFIX.'soft delete adresses');
         $affected = $this->defaultConnection->executeStatement('UPDATE chill_main_address_reference
             SET deletedat = NOW()
             WHERE
                 chill_main_address_reference.refid NOT IN (SELECT refid FROM reference_address_temp WHERE source LIKE ?)
                 AND chill_main_address_reference.source LIKE ?
         ', [$this->currentSource, $this->currentSource]);
-        $this->logger->info(self::LOG_PREFIX . 'addresses deleted', ['deleted' => $affected]);
+        $this->logger->info(self::LOG_PREFIX.'addresses deleted', ['deleted' => $affected]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
index d02a846ec..ade89c6ff 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
@@ -11,32 +11,18 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\Import;
 
-use Exception;
 use League\Csv\Reader;
 use League\Csv\Statement;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use UnexpectedValueException;
-use function is_int;
 
 class AddressReferenceFromBano
 {
-    private AddressReferenceBaseImporter $baseImporter;
-
-    private AddressToReferenceMatcher $addressToReferenceMatcher;
-
-    private HttpClientInterface $client;
-
-    public function __construct(HttpClientInterface $client, AddressReferenceBaseImporter $baseImporter, AddressToReferenceMatcher $addressToReferenceMatcher)
-    {
-        $this->client = $client;
-        $this->baseImporter = $baseImporter;
-        $this->addressToReferenceMatcher = $addressToReferenceMatcher;
-    }
+    public function __construct(private readonly HttpClientInterface $client, private readonly AddressReferenceBaseImporter $baseImporter, private readonly AddressToReferenceMatcher $addressToReferenceMatcher) {}
 
     public function import(string $departementNo): void
     {
-        if (!is_numeric($departementNo) || !is_int((int) $departementNo)) {
-            throw new UnexpectedValueException('Could not parse this department number');
+        if (!is_numeric($departementNo) || !\is_int((int) $departementNo)) {
+            throw new \UnexpectedValueException('Could not parse this department number');
         }
 
         $url = "https://bano.openstreetmap.fr/data/bano-{$departementNo}.csv";
@@ -44,7 +30,7 @@ class AddressReferenceFromBano
         $response = $this->client->request('GET', $url);
 
         if (200 !== $response->getStatusCode()) {
-            throw new Exception('Could not download CSV: ' . $response->getStatusCode());
+            throw new \Exception('Could not download CSV: '.$response->getStatusCode());
         }
 
         $file = tmpfile();
@@ -76,7 +62,7 @@ class AddressReferenceFromBano
                 $record['postcode'],
                 $record['street'],
                 $record['streetNumber'],
-                'BANO.' . $departementNo,
+                'BANO.'.$departementNo,
                 (float) $record['lat'],
                 (float) $record['lon'],
                 4326
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressToReferenceMatcher.php b/src/Bundle/ChillMainBundle/Service/Import/AddressToReferenceMatcher.php
index eab6858d9..6a7bff632 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressToReferenceMatcher.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressToReferenceMatcher.php
@@ -17,14 +17,10 @@ use Psr\Log\LoggerInterface;
 
 /**
  * Mark existing addresses as to be reviewed regarding the
- * address reference
+ * address reference.
  */
-final class AddressToReferenceMatcher
+final readonly class AddressToReferenceMatcher
 {
-    private Connection $connection;
-
-    private LoggerInterface $logger;
-
     private const LOG_PREFIX = '[address_to_reference_matcher] ';
 
     private const SQL_MARK_TO_REVIEW_ADDRESS_UNMATCHING = <<<'SQL'
@@ -65,14 +61,10 @@ final class AddressToReferenceMatcher
     private const SUBSTITUTES = [
         '{{ to_review }}' => Address::ADDR_REFERENCE_STATUS_TO_REVIEW,
         '{{ matching }}' => Address::ADDR_REFERENCE_STATUS_MATCH,
-        '{{ reviewed }}' => Address::ADDR_REFERENCE_STATUS_REVIEWED
+        '{{ reviewed }}' => Address::ADDR_REFERENCE_STATUS_REVIEWED,
     ];
 
-    public function __construct(Connection $connection, LoggerInterface $logger)
-    {
-        $this->connection = $connection;
-        $this->logger = $logger;
-    }
+    public function __construct(private Connection $connection, private LoggerInterface $logger) {}
 
     public function checkAddressesMatchingReferences(): void
     {
diff --git a/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php
index 1ec6b70de..b76d6f096 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/GeographicalUnitBaseImporter.php
@@ -14,11 +14,7 @@ namespace Chill\MainBundle\Service\Import;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Statement;
 use Doctrine\DBAL\Types\Types;
-use Exception;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
-use function array_key_exists;
-use function count;
 
 final class GeographicalUnitBaseImporter
 {
@@ -43,19 +39,11 @@ final class GeographicalUnitBaseImporter
      */
     private array $cachingStatements = [];
 
-    private Connection $defaultConnection;
-
     private bool $isInitialized = false;
 
-    private LoggerInterface $logger;
-
     private array $waitingForInsert = [];
 
-    public function __construct(Connection $defaultConnection, LoggerInterface $logger)
-    {
-        $this->defaultConnection = $defaultConnection;
-        $this->logger = $logger;
-    }
+    public function __construct(private readonly Connection $defaultConnection, private readonly LoggerInterface $logger) {}
 
     public function finalize(): void
     {
@@ -76,7 +64,7 @@ final class GeographicalUnitBaseImporter
         string $unitName,
         string $unitKey,
         string $geomAsWKT,
-        ?int $srid = null
+        int $srid = null
     ): void {
         $this->initialize();
 
@@ -89,7 +77,7 @@ final class GeographicalUnitBaseImporter
             'srid' => $srid,
         ];
 
-        if (100 <= count($this->waitingForInsert)) {
+        if (100 <= \count($this->waitingForInsert)) {
             $this->doInsertPending();
         }
     }
@@ -114,13 +102,13 @@ final class GeographicalUnitBaseImporter
 
     private function doInsertPending(): void
     {
-        $forNumber = count($this->waitingForInsert);
+        $forNumber = \count($this->waitingForInsert);
 
         if (0 === $forNumber) {
             return;
         }
 
-        if (!array_key_exists($forNumber, $this->cachingStatements)) {
+        if (!\array_key_exists($forNumber, $this->cachingStatements)) {
             $sql = strtr(self::INSERT, [
                 '{{ values }}' => implode(
                     ', ',
@@ -128,7 +116,7 @@ final class GeographicalUnitBaseImporter
                 ),
             ]);
 
-            $this->logger->debug(self::LOG_PREFIX . ' generated sql for insert', [
+            $this->logger->debug(self::LOG_PREFIX.' generated sql for insert', [
                 'sql' => $sql,
                 'forNumber' => $forNumber,
             ]);
@@ -153,9 +141,9 @@ final class GeographicalUnitBaseImporter
             $affected = $statement->executeStatement();
 
             if (0 === $affected) {
-                throw new RuntimeException('no row affected');
+                throw new \RuntimeException('no row affected');
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             throw $e;
         } finally {
             $this->waitingForInsert = [];
@@ -201,8 +189,8 @@ final class GeographicalUnitBaseImporter
                 "
                 );
 
-                //1) Add new units
-                $this->logger->info(self::LOG_PREFIX . 'upsert new units');
+                // 1) Add new units
+                $this->logger->info(self::LOG_PREFIX.'upsert new units');
                 $affected = $this->defaultConnection->executeStatement("INSERT INTO chill_main_geographical_unit
             (id, geom, unitname, layer_id, unitrefid)
             SELECT
@@ -216,10 +204,10 @@ final class GeographicalUnitBaseImporter
             DO UPDATE
             SET geom = EXCLUDED.geom, unitname = EXCLUDED.unitname
         ");
-                $this->logger->info(self::LOG_PREFIX . 'units upserted', ['upserted' => $affected]);
+                $this->logger->info(self::LOG_PREFIX.'units upserted', ['upserted' => $affected]);
 
-                //3) Delete units
-                $this->logger->info(self::LOG_PREFIX . 'soft delete adresses');
+                // 3) Delete units
+                $this->logger->info(self::LOG_PREFIX.'soft delete adresses');
                 $affected = $this->defaultConnection->executeStatement('WITH to_delete AS (
                     SELECT cmgu.id
                     FROM chill_main_geographical_unit AS cmgu
@@ -229,7 +217,7 @@ final class GeographicalUnitBaseImporter
                 DELETE FROM chill_main_geographical_unit
                 WHERE id NOT IN (SELECT id FROM to_delete)
                 ');
-                $this->logger->info(self::LOG_PREFIX . 'addresses deleted', ['deleted' => $affected]);
+                $this->logger->info(self::LOG_PREFIX.'addresses deleted', ['deleted' => $affected]);
             }
         );
     }
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
index a6d9512c7..a95ba1abc 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Service\Import;
 
 use League\Csv\Reader;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -21,18 +20,7 @@ class PostalCodeBEFromBestAddress
 {
     private const RELEASE = 'https://gitea.champs-libres.be/api/v1/repos/Chill-project/belgian-bestaddresses-transform/releases/tags/v1.0.0';
 
-    private PostalCodeBaseImporter $baseImporter;
-
-    private HttpClientInterface $client;
-
-    private LoggerInterface $logger;
-
-    public function __construct(PostalCodeBaseImporter $baseImporter, HttpClientInterface $client, LoggerInterface $logger)
-    {
-        $this->baseImporter = $baseImporter;
-        $this->client = $client;
-        $this->logger = $logger;
-    }
+    public function __construct(private readonly PostalCodeBaseImporter $baseImporter, private readonly HttpClientInterface $client, private readonly LoggerInterface $logger) {}
 
     public function import(string $lang = 'fr'): void
     {
@@ -44,7 +32,7 @@ class PostalCodeBEFromBestAddress
         $tmpfile = fopen($tmpname, 'r+b');
 
         if (false === $tmpfile) {
-            throw new RuntimeException('could not create temporary file');
+            throw new \RuntimeException('could not create temporary file');
         }
 
         foreach ($this->client->stream($response) as $chunk) {
@@ -66,11 +54,11 @@ class PostalCodeBEFromBestAddress
         gzclose($uncompressedStream);
         unlink($tmpname);
 
-        $this->logger->info(__CLASS__ . ' list of postal code downloaded');
+        $this->logger->info(self::class.' list of postal code downloaded');
 
         $this->baseImporter->finalize();
 
-        $this->logger->info(__CLASS__ . ' postal code fetched', ['offset' => $offset ?? 0]);
+        $this->logger->info(self::class.' postal code fetched', ['offset' => $offset ?? 0]);
     }
 
     private function getFileDownloadUrl(string $lang): string
@@ -79,12 +67,10 @@ class PostalCodeBEFromBestAddress
             $release = $this->client->request('GET', self::RELEASE)
                 ->toArray();
         } catch (TransportExceptionInterface $e) {
-            throw new RuntimeException('could not get the release definition', 0, $e);
+            throw new \RuntimeException('could not get the release definition', 0, $e);
         }
 
-        $postals = array_filter($release['assets'], static function (array $item) use ($lang) {
-            return 'postals.' . $lang . '.csv.gz' === $item['name'];
-        });
+        $postals = array_filter($release['assets'], static fn (array $item) => 'postals.'.$lang.'.csv.gz' === $item['name']);
 
         return array_values($postals)[0]['browser_download_url'];
     }
@@ -93,8 +79,8 @@ class PostalCodeBEFromBestAddress
     {
         $this->baseImporter->importCode(
             'BE',
-            trim($record['municipality_name']),
-            trim($record['postal_info_objectid']),
+            trim((string) $record['municipality_name']),
+            trim((string) $record['postal_info_objectid']),
             $record['municipality_objectid'],
             'bestaddress',
             (float) $record['Y'],
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php
index 9086e1843..a0fc5a5db 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBaseImporter.php
@@ -13,9 +13,6 @@ namespace Chill\MainBundle\Service\Import;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Statement;
-use Exception;
-use function array_key_exists;
-use function count;
 
 /**
  * Optimized way to load postal code into database.
@@ -55,15 +52,9 @@ class PostalCodeBaseImporter
      */
     private array $cachingStatements = [];
 
-    private Connection $defaultConnection;
-
     private array $waitingForInsert = [];
 
-    public function __construct(
-        Connection $defaultConnection
-    ) {
-        $this->defaultConnection = $defaultConnection;
-    }
+    public function __construct(private readonly Connection $defaultConnection) {}
 
     public function finalize(): void
     {
@@ -91,14 +82,14 @@ class PostalCodeBaseImporter
             $centerSRID,
         ];
 
-        if (100 <= count($this->waitingForInsert)) {
+        if (100 <= \count($this->waitingForInsert)) {
             $this->doInsertPending();
         }
     }
 
     private function doInsertPending(): void
     {
-        if (!array_key_exists($forNumber = count($this->waitingForInsert), $this->cachingStatements)) {
+        if (!\array_key_exists($forNumber = \count($this->waitingForInsert), $this->cachingStatements)) {
             $sql = strtr(self::QUERY, [
                 '{{ values }}' => implode(
                     ', ',
@@ -113,9 +104,9 @@ class PostalCodeBaseImporter
 
         try {
             $statement->executeStatement(array_merge(...$this->waitingForInsert));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // in some case, we can add debug code here
-            //dump($this->waitingForInsert);
+            // dump($this->waitingForInsert);
             throw $e;
         } finally {
             $this->waitingForInsert = [];
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
index e2d25350d..ee68e9d96 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Service\Import;
 
 use League\Csv\Reader;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
@@ -26,34 +25,20 @@ class PostalCodeFRFromOpenData
 {
     private const CSV = 'https://datanova.legroupe.laposte.fr/explore/dataset/laposte_hexasmal/download/?format=csv&timezone=Europe/Berlin&lang=fr&use_labels_for_header=true&csv_separator=%3B';
 
-    private PostalCodeBaseImporter $baseImporter;
-
-    private HttpClientInterface $client;
-
-    private LoggerInterface $logger;
-
-    public function __construct(
-        PostalCodeBaseImporter $baseImporter,
-        HttpClientInterface $client,
-        LoggerInterface $logger
-    ) {
-        $this->baseImporter = $baseImporter;
-        $this->client = $client;
-        $this->logger = $logger;
-    }
+    public function __construct(private readonly PostalCodeBaseImporter $baseImporter, private readonly HttpClientInterface $client, private readonly LoggerInterface $logger) {}
 
     public function import(): void
     {
         $response = $this->client->request('GET', self::CSV);
 
         if (200 !== $response->getStatusCode()) {
-            throw new RuntimeException('could not download CSV');
+            throw new \RuntimeException('could not download CSV');
         }
 
         $tmpfile = tmpfile();
 
         if (false === $tmpfile) {
-            throw new RuntimeException('could not create temporary file');
+            throw new \RuntimeException('could not create temporary file');
         }
 
         foreach ($this->client->stream($response) as $chunk) {
@@ -73,7 +58,7 @@ class PostalCodeFRFromOpenData
         $this->baseImporter->finalize();
         fclose($tmpfile);
 
-        $this->logger->info(__CLASS__ . ' postal code fetched', ['offset' => $offset ?? 0]);
+        $this->logger->info(self::class.' postal code fetched', ['offset' => $offset ?? 0]);
     }
 
     private function handleRecord(array $record): void
@@ -84,17 +69,17 @@ class PostalCodeFRFromOpenData
             $lat = $lon = 0.0;
         }
 
-        $ref = trim($record['Code_commune_INSEE']);
+        $ref = trim((string) $record['Code_commune_INSEE']);
 
-        if ('987' === substr($ref, 0, 3)) {
+        if (str_starts_with($ref, '987')) {
             // some differences in French Polynesia
-            $ref .= '.' . trim($record['Libellé_d_acheminement']);
+            $ref .= '.'.trim((string) $record['Libellé_d_acheminement']);
         }
 
         $this->baseImporter->importCode(
             'FR',
-            trim($record['Libellé_d_acheminement']),
-            trim($record['Code_postal']),
+            trim((string) $record['Libellé_d_acheminement']),
+            trim((string) $record['Code_postal']),
             $ref,
             'INSEE',
             $lat,
diff --git a/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
index 4658d7e3b..4f2e88c08 100644
--- a/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
+++ b/src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
@@ -20,28 +20,18 @@ use Symfony\Component\Mime\RawMessage;
 
 class ChillMailer implements MailerInterface
 {
-    private LoggerInterface $chillLogger;
-
-    private MailerInterface $initial;
-
     private string $prefix = '[Chill] ';
 
-    public function __construct(MailerInterface $initial, LoggerInterface $chillLogger)
-    {
-        $this->initial = $initial;
-        $this->chillLogger = $chillLogger;
-    }
+    public function __construct(private readonly MailerInterface $initial, private readonly LoggerInterface $chillLogger) {}
 
-    public function send(RawMessage $message, ?Envelope $envelope = null): void
+    public function send(RawMessage $message, Envelope $envelope = null): void
     {
         if ($message instanceof Email) {
-            $message->subject($this->prefix . $message->getSubject());
+            $message->subject($this->prefix.$message->getSubject());
         }
 
         $this->chillLogger->info('chill email sent', [
-            'to' => array_map(static function (Address $address) {
-                return $address->getAddress();
-            }, $message->getTo()),
+            'to' => array_map(static fn (Address $address) => $address->getAddress(), $message->getTo()),
             'subject' => $message->getSubject(),
         ]);
 
diff --git a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDate.php b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDate.php
index e8427c62f..445b35cb0 100644
--- a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDate.php
+++ b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDate.php
@@ -11,11 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\RollingDate;
 
-use DateTimeImmutable;
-
 class RollingDate
 {
-    public const ALL_T = [
+    final public const ALL_T = [
         self::T_YEAR_PREVIOUS_START,
         self::T_QUARTER_PREVIOUS_START,
         self::T_MONTH_PREVIOUS_START,
@@ -35,61 +33,50 @@ class RollingDate
     /**
      * A given fixed date.
      */
-    public const T_FIXED_DATE = 'fixed_date';
+    final public const T_FIXED_DATE = 'fixed_date';
 
-    public const T_MONTH_CURRENT_START = 'month_current_start';
+    final public const T_MONTH_CURRENT_START = 'month_current_start';
 
-    public const T_MONTH_NEXT_START = 'month_next_start';
+    final public const T_MONTH_NEXT_START = 'month_next_start';
 
-    public const T_MONTH_PREVIOUS_START = 'month_previous_start';
+    final public const T_MONTH_PREVIOUS_START = 'month_previous_start';
 
-    public const T_QUARTER_CURRENT_START = 'quarter_current_start';
+    final public const T_QUARTER_CURRENT_START = 'quarter_current_start';
 
-    public const T_QUARTER_NEXT_START = 'quarter_next_start';
+    final public const T_QUARTER_NEXT_START = 'quarter_next_start';
 
-    public const T_QUARTER_PREVIOUS_START = 'quarter_previous_start';
+    final public const T_QUARTER_PREVIOUS_START = 'quarter_previous_start';
 
-    public const T_TODAY = 'today';
+    final public const T_TODAY = 'today';
 
-    public const T_WEEK_CURRENT_START = 'week_current_start';
+    final public const T_WEEK_CURRENT_START = 'week_current_start';
 
-    public const T_WEEK_NEXT_START = 'week_next_start';
+    final public const T_WEEK_NEXT_START = 'week_next_start';
 
-    public const T_WEEK_PREVIOUS_START = 'week_previous_start';
+    final public const T_WEEK_PREVIOUS_START = 'week_previous_start';
 
-    public const T_YEAR_CURRENT_START = 'year_current_start';
+    final public const T_YEAR_CURRENT_START = 'year_current_start';
 
-    public const T_YEAR_NEXT_START = 'year_next_start';
+    final public const T_YEAR_NEXT_START = 'year_next_start';
 
-    public const T_YEAR_PREVIOUS_START = 'year_previous_start';
-
-    private ?DateTimeImmutable $fixedDate;
+    final public const T_YEAR_PREVIOUS_START = 'year_previous_start';
 
     /**
-     * The pivot date is the date from the rolling is computed. By default, it is "now".
+     * @param string|self::T_*        $roll
+     * @param \DateTimeImmutable|null $fixedDate Only to insert if $roll equals @see{self::T_FIXED_DATE}
      */
-    private DateTimeImmutable $pivotDate;
+    public function __construct(
+        private readonly string $roll,
+        private readonly ?\DateTimeImmutable $fixedDate = null,
+        private readonly \DateTimeImmutable $pivotDate = new \DateTimeImmutable('now')
+    ) {}
 
-    private string $roll;
-
-    /**
-     * @param string|self::T_* $roll
-     * @param DateTimeImmutable|null $pivotDate Will be "now" if null is given
-     * @param DateTimeImmutable|null $fixedDate Only to insert if $roll equals @see{self::T_FIXED_DATE}
-     */
-    public function __construct(string $roll, ?DateTimeImmutable $fixedDate = null, ?DateTimeImmutable $pivotDate = null)
-    {
-        $this->roll = $roll;
-        $this->pivotDate = $pivotDate ?? new DateTimeImmutable('now');
-        $this->fixedDate = $fixedDate;
-    }
-
-    public function getFixedDate(): ?DateTimeImmutable
+    public function getFixedDate(): ?\DateTimeImmutable
     {
         return $this->fixedDate;
     }
 
-    public function getPivotDate(): DateTimeImmutable
+    public function getPivotDate(): \DateTimeImmutable
     {
         return $this->pivotDate;
     }
diff --git a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverter.php b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverter.php
index 026ff7a8a..f569ebf18 100644
--- a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverter.php
+++ b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverter.php
@@ -11,130 +11,103 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\RollingDate;
 
-use DateInterval;
-use DateTimeImmutable;
-use LogicException;
-use UnexpectedValueException;
-
 class RollingDateConverter implements RollingDateConverterInterface
 {
-    public function convert(RollingDate $rollingDate): DateTimeImmutable
+    public function convert(?RollingDate $rollingDate): ?\DateTimeImmutable
     {
+        if (null === $rollingDate) {
+            return null;
+        }
+
         switch ($rollingDate->getRoll()) {
             case RollingDate::T_MONTH_CURRENT_START:
                 return $this->toBeginOfMonth($rollingDate->getPivotDate());
 
             case RollingDate::T_MONTH_NEXT_START:
-                return $this->toBeginOfMonth($rollingDate->getPivotDate()->add(new DateInterval('P1M')));
+                return $this->toBeginOfMonth($rollingDate->getPivotDate()->add(new \DateInterval('P1M')));
 
             case RollingDate::T_MONTH_PREVIOUS_START:
-                return $this->toBeginOfMonth($rollingDate->getPivotDate()->sub(new DateInterval('P1M')));
+                return $this->toBeginOfMonth($rollingDate->getPivotDate()->sub(new \DateInterval('P1M')));
 
             case RollingDate::T_QUARTER_CURRENT_START:
                 return $this->toBeginOfQuarter($rollingDate->getPivotDate());
 
             case RollingDate::T_QUARTER_NEXT_START:
-                return $this->toBeginOfQuarter($rollingDate->getPivotDate()->add(new DateInterval('P3M')));
+                return $this->toBeginOfQuarter($rollingDate->getPivotDate()->add(new \DateInterval('P3M')));
 
             case RollingDate::T_QUARTER_PREVIOUS_START:
-                return $this->toBeginOfQuarter($rollingDate->getPivotDate()->sub(new DateInterval('P3M')));
+                return $this->toBeginOfQuarter($rollingDate->getPivotDate()->sub(new \DateInterval('P3M')));
 
             case RollingDate::T_WEEK_CURRENT_START:
                 return $this->toBeginOfWeek($rollingDate->getPivotDate());
 
             case RollingDate::T_WEEK_NEXT_START:
-                return $this->toBeginOfWeek($rollingDate->getPivotDate()->add(new DateInterval('P1W')));
+                return $this->toBeginOfWeek($rollingDate->getPivotDate()->add(new \DateInterval('P1W')));
 
             case RollingDate::T_WEEK_PREVIOUS_START:
-                return $this->toBeginOfWeek($rollingDate->getPivotDate()->sub(new DateInterval('P1W')));
+                return $this->toBeginOfWeek($rollingDate->getPivotDate()->sub(new \DateInterval('P1W')));
 
             case RollingDate::T_YEAR_CURRENT_START:
                 return $this->toBeginOfYear($rollingDate->getPivotDate());
 
             case RollingDate::T_YEAR_PREVIOUS_START:
-                return $this->toBeginOfYear($rollingDate->getPivotDate()->sub(new DateInterval('P1Y')));
+                return $this->toBeginOfYear($rollingDate->getPivotDate()->sub(new \DateInterval('P1Y')));
 
             case RollingDate::T_YEAR_NEXT_START:
-                return $this->toBeginOfYear($rollingDate->getPivotDate()->add(new DateInterval('P1Y')));
+                return $this->toBeginOfYear($rollingDate->getPivotDate()->add(new \DateInterval('P1Y')));
 
             case RollingDate::T_TODAY:
                 return $rollingDate->getPivotDate();
 
             case RollingDate::T_FIXED_DATE:
                 if (null === $rollingDate->getFixedDate()) {
-                    throw new LogicException('You must provide a fixed date when selecting a fixed date');
+                    throw new \LogicException('You must provide a fixed date when selecting a fixed date');
                 }
 
                 return $rollingDate->getFixedDate();
 
             default:
-                throw new UnexpectedValueException(sprintf('%s rolling operation not supported', $rollingDate->getRoll()));
+                throw new \UnexpectedValueException(sprintf('%s rolling operation not supported', $rollingDate->getRoll()));
         }
     }
 
-    private function toBeginOfMonth(DateTimeImmutable $date): DateTimeImmutable
+    private function toBeginOfMonth(\DateTimeImmutable $date): \DateTimeImmutable
     {
-        return DateTimeImmutable::createFromFormat(
+        return \DateTimeImmutable::createFromFormat(
             'Y-m-d His',
             sprintf('%s-%s-01 000000', $date->format('Y'), $date->format('m'))
         );
     }
 
-    private function toBeginOfQuarter(DateTimeImmutable $date): DateTimeImmutable
+    private function toBeginOfQuarter(\DateTimeImmutable $date): \DateTimeImmutable
     {
-        switch ((int) $date->format('n')) {
-            case 1:
-            case 2:
-            case 3:
-                $month = '01';
+        $month = match ((int) $date->format('n')) {
+            1, 2, 3 => '01',
+            4, 5, 6 => '04',
+            7, 8, 9 => '07',
+            10, 11, 12 => '10',
+        };
 
-                break;
-
-            case 4:
-            case 5:
-            case 6:
-                $month = '04';
-
-                break;
-
-            case 7:
-            case 8:
-            case 9:
-                $month = '07';
-
-                break;
-
-            case 10:
-            case 11:
-            case 12:
-                $month = '10';
-
-                break;
-
-            default:
-                throw new LogicException('this month is not valid: ' . $date->format('n'));
-        }
-
-        return DateTimeImmutable::createFromFormat(
+        return \DateTimeImmutable::createFromFormat(
             'Y-m-d His',
             sprintf('%s-%s-01 000000', $date->format('Y'), $month)
         );
     }
 
-    private function toBeginOfWeek(DateTimeImmutable $date): DateTimeImmutable
+    private function toBeginOfWeek(\DateTimeImmutable $date): \DateTimeImmutable
     {
         if (1 === $dayOfWeek = (int) $date->format('N')) {
             return $date->setTime(0, 0, 0);
         }
 
         return $date
-            ->sub(new DateInterval('P' . ($dayOfWeek - 1) . 'D'))
+            ->sub(new \DateInterval('P'.($dayOfWeek - 1).'D'))
             ->setTime(0, 0, 0);
     }
 
-    private function toBeginOfYear(DateTimeImmutable $date): DateTimeImmutable
+    private function toBeginOfYear(\DateTimeImmutable $date): \DateTimeImmutable
     {
-        return DateTimeImmutable::createFromFormat(
+        return \DateTimeImmutable::createFromFormat(
             'Y-m-d His',
             sprintf('%s-01-01 000000', $date->format('Y'))
         );
diff --git a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverterInterface.php b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverterInterface.php
index b20a5ced2..309ae4c7b 100644
--- a/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverterInterface.php
+++ b/src/Bundle/ChillMainBundle/Service/RollingDate/RollingDateConverterInterface.php
@@ -11,9 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Service\RollingDate;
 
-use DateTimeImmutable;
-
 interface RollingDateConverterInterface
 {
-    public function convert(RollingDate $rollingDate): DateTimeImmutable;
+    /**
+     * @return ($rollingDate is null ? null : \DateTimeImmutable)
+     */
+    public function convert(?RollingDate $rollingDate): ?\DateTimeImmutable;
 }
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/NullShortMessageSender.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/NullShortMessageSender.php
index 82dea7bc6..16bc87790 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/NullShortMessageSender.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/NullShortMessageSender.php
@@ -20,7 +20,5 @@ namespace Chill\MainBundle\Service\ShortMessage;
 
 class NullShortMessageSender implements ShortMessageSenderInterface
 {
-    public function send(ShortMessage $shortMessage): void
-    {
-    }
+    public function send(ShortMessage $shortMessage): void {}
 }
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessage.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessage.php
index 145e90593..a2a5b6ed4 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessage.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessage.php
@@ -22,22 +22,11 @@ use libphonenumber\PhoneNumber;
 
 class ShortMessage
 {
-    public const PRIORITY_LOW = 'low';
+    final public const PRIORITY_LOW = 'low';
 
-    public const PRIORITY_MEDIUM = 'medium';
+    final public const PRIORITY_MEDIUM = 'medium';
 
-    private string $content;
-
-    private PhoneNumber $phoneNumber;
-
-    private string $priority = 'low';
-
-    public function __construct(string $content, PhoneNumber $phoneNumber, string $priority = 'low')
-    {
-        $this->content = $content;
-        $this->phoneNumber = $phoneNumber;
-        $this->priority = $priority;
-    }
+    public function __construct(private string $content, private PhoneNumber $phoneNumber, private string $priority = 'low') {}
 
     public function getContent(): string
     {
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageHandler.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageHandler.php
index 924335ad9..344ff3c17 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageHandler.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageHandler.php
@@ -25,12 +25,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
  */
 class ShortMessageHandler implements MessageHandlerInterface
 {
-    private ShortMessageTransporterInterface $messageTransporter;
-
-    public function __construct(ShortMessageTransporterInterface $messageTransporter)
-    {
-        $this->messageTransporter = $messageTransporter;
-    }
+    public function __construct(private readonly ShortMessageTransporterInterface $messageTransporter) {}
 
     public function __invoke(ShortMessage $message): void
     {
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporter.php b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporter.php
index 6fdc8b05d..bbe4f0575 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporter.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessage/ShortMessageTransporter.php
@@ -20,13 +20,7 @@ namespace Chill\MainBundle\Service\ShortMessage;
 
 class ShortMessageTransporter implements ShortMessageTransporterInterface
 {
-    private ShortMessageSenderInterface $sender;
-
-    public function __construct(
-        ShortMessageSenderInterface $sender // hint: must remain at place 0 for DI
-    ) {
-        $this->sender = $sender;
-    }
+    public function __construct(private readonly ShortMessageSenderInterface $sender) {}
 
     public function send(ShortMessage $shortMessage): void
     {
diff --git a/src/Bundle/ChillMainBundle/Service/ShortMessageOvh/OvhShortMessageSender.php b/src/Bundle/ChillMainBundle/Service/ShortMessageOvh/OvhShortMessageSender.php
index e3273578a..d81123c9a 100644
--- a/src/Bundle/ChillMainBundle/Service/ShortMessageOvh/OvhShortMessageSender.php
+++ b/src/Bundle/ChillMainBundle/Service/ShortMessageOvh/OvhShortMessageSender.php
@@ -27,29 +27,16 @@ use Psr\Log\LoggerInterface;
 
 class OvhShortMessageSender implements ShortMessageSenderInterface
 {
-    private Api $api;
-
-    private LoggerInterface $logger;
-
-    private PhoneNumberUtil $phoneNumberUtil;
-
-    private string $sender;
-
-    private string $serviceName;
-
     public function __construct(
-        Api $api, // for DI, must remains as first argument
-        string $serviceName, // for di, must remains as second argument
-        string $sender, // for DI, must remains as third argument
-        LoggerInterface $logger,
-        PhoneNumberUtil $phoneNumberUtil
-    ) {
-        $this->api = $api;
-        $this->serviceName = $serviceName;
-        $this->sender = $sender;
-        $this->logger = $logger;
-        $this->phoneNumberUtil = $phoneNumberUtil;
-    }
+        private readonly Api $api,
+        // for DI, must remains as first argument
+        private readonly string $serviceName,
+        // for di, must remains as second argument
+        private readonly string $sender,
+        // for DI, must remains as third argument
+        private readonly LoggerInterface $logger,
+        private readonly PhoneNumberUtil $phoneNumberUtil
+    ) {}
 
     public function send(ShortMessage $shortMessage): void
     {
diff --git a/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php b/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
index f5f91c361..a3968231e 100644
--- a/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
@@ -25,9 +25,9 @@ class CSVCellTwig extends AbstractExtension
     /**
      * Replace into a string the char " by "".
      *
-     * @param string $content The input string.
+     * @param string $content the input string
      *
-     * @return string The safe string.
+     * @return string the safe string
      */
     public function csvCellFilter($content)
     {
@@ -46,7 +46,7 @@ class CSVCellTwig extends AbstractExtension
         return [
             new TwigFilter(
                 'csv_cell',
-                [$this, 'csvCellFilter'],
+                $this->csvCellFilter(...),
                 ['is_safe' => ['html']]
             ),
         ];
@@ -55,7 +55,7 @@ class CSVCellTwig extends AbstractExtension
     /**
      * Returns the name of the extension.
      *
-     * @return The name of the extension.
+     * @return The name of the extension
      */
     public function getName()
     {
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php b/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
index d277c0f41..54c9c4f63 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating;
 
-use Parsedown;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
@@ -21,20 +20,20 @@ use Twig\TwigFilter;
 final class ChillMarkdownRenderExtension extends AbstractExtension
 {
     /**
-     * @var Parsedown
+     * @var \Parsedown
      */
     protected $parsedown;
 
     public function __construct()
     {
-        $this->parsedown = new Parsedown();
+        $this->parsedown = new \Parsedown();
         $this->parsedown->setSafeMode(true);
     }
 
     public function getFilters(): array
     {
         return [
-            new TwigFilter('chill_markdown_to_html', [$this, 'renderMarkdownToHtml'], [
+            new TwigFilter('chill_markdown_to_html', $this->renderMarkdownToHtml(...), [
                 'is_safe' => ['html'],
             ]),
         ];
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
index a503426f0..da91fc6f8 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
@@ -16,14 +16,12 @@ use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
-use function array_merge;
-
 class ChillTwigHelper extends AbstractExtension
 {
     public function getFilters()
     {
         return [
-            new TwigFilter('chill_print_or_message', [$this, 'printOrMessage'], [
+            new TwigFilter('chill_print_or_message', $this->printOrMessage(...), [
                 'needs_environment' => true,
                 'is_safe' => ['html', 'html_attrs'],
             ]),
@@ -46,7 +44,7 @@ class ChillTwigHelper extends AbstractExtension
      * - `date_format` (default to `'medium'`)
      * - `time_format` (default to `'none'`)
      *
-     * @param string $value Default to 'No value'. Fallback to default if null
+     * @param string $value    Default to 'No value'. Fallback to default if null
      * @param string $message
      * @param string $template
      *
@@ -59,36 +57,24 @@ class ChillTwigHelper extends AbstractExtension
         $template = 'default',
         array $options = []
     ) {
-        if ($value instanceof DateTimeInterface) {
-            $options = array_merge([
+        if ($value instanceof \DateTimeInterface) {
+            $options = \array_merge([
                 'date_format' => 'medium',
                 'time_format' => 'none',
             ], $options);
 
-            switch ($template) {
-                case 'default':
-                case 'blockquote':
-                    $t = '@ChillMain/Extensions/PrintOrMessage/' . $template . '_date.html.twig';
-
-                    break;
-
-                default:
-                    $t = $template;
-            }
+            $t = match ($template) {
+                'default', 'blockquote' => '@ChillMain/Extensions/PrintOrMessage/'.$template.'_date.html.twig',
+                default => $template,
+            };
         } else {
-            switch ($template) {
-                case 'default':
-                case 'blockquote':
-                    $t = '@ChillMain/Extensions/PrintOrMessage/' . $template . '.html.twig';
-
-                    break;
-
-                default:
-                    $t = $template;
-            }
+            $t = match ($template) {
+                'default', 'blockquote' => '@ChillMain/Extensions/PrintOrMessage/'.$template.'.html.twig',
+                default => $template,
+            };
         }
 
-        return $twig->render($t, array_merge([
+        return $twig->render($t, \array_merge([
             'value' => $value,
             'message' => $message,
         ], $options));
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
index a01398210..9a11a7ffc 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
@@ -46,16 +46,16 @@ class ChillTwigRoutingHelper extends AbstractExtension
     public function getFilters()
     {
         return [
-            new TwigFilter('chill_return_path_label', [$this, 'getLabelReturnPath']),
+            new TwigFilter('chill_return_path_label', $this->getLabelReturnPath(...)),
         ];
     }
 
     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']]),
+            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(...)]),
         ];
     }
 
@@ -69,9 +69,9 @@ class ChillTwigRoutingHelper extends AbstractExtension
     /**
      * Build an url with a returnPath parameter to current page.
      *
-     * @param string $name
-     * @param array $parameters
-     * @param bool $relative
+     * @param string     $name
+     * @param array      $parameters
+     * @param bool       $relative
      * @param mixed|null $label
      *
      * @return string
@@ -93,8 +93,8 @@ class ChillTwigRoutingHelper extends AbstractExtension
      * Build an url with a returnPath parameter to current page.
      *
      * @param string $name
-     * @param array $parameters
-     * @param bool $relative
+     * @param array  $parameters
+     * @param bool   $relative
      *
      * @return string
      */
@@ -118,8 +118,8 @@ class ChillTwigRoutingHelper extends AbstractExtension
      * Return the return path if it exists, or generate the path if not.
      *
      * @param string $name
-     * @param array $parameters
-     * @param bool $relative
+     * @param array  $parameters
+     * @param bool   $relative
      *
      * @return string
      */
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
index 16977fb27..fcc07ebca 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Templating\Entity;
 
 /**
- * @deprecated load @link{BoxUtilsChillEntityRenderTrait} in the render
+ * @deprecated load @see{BoxUtilsChillEntityRenderTrait} in the render
  */
 abstract class AbstractChillEntityRender implements ChillEntityRenderInterface
 {
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
index 132884d60..f59b1cd66 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
@@ -13,19 +13,13 @@ namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Templating\EngineInterface;
-
-use function array_merge;
-use function strtr;
 
 /**
  * @implements ChillEntityRenderInterface<Address>
  */
 class AddressRender implements ChillEntityRenderInterface
 {
-    public const DEFAULT_OPTIONS = [
+    final public const DEFAULT_OPTIONS = [
         'with_valid_from' => false,
         'with_valid_to' => false,
         'with_picto' => false,
@@ -36,21 +30,11 @@ class AddressRender implements ChillEntityRenderInterface
         'extended_infos' => false,
     ];
 
-    private EngineInterface $templating;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        EngineInterface $templating,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->templating = $templating;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly \Twig\Environment $templating, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function renderBox($addr, array $options): string
     {
-        $options = array_merge(self::DEFAULT_OPTIONS, $options);
+        $options = \array_merge(self::DEFAULT_OPTIONS, $options);
 
         return $this->templating
             ->render('@ChillMain/Entity/address.html.twig', [
@@ -70,7 +54,7 @@ class AddressRender implements ChillEntityRenderInterface
         $lines = [];
 
         if (null !== $addr->getPostcode()) {
-            if ($addr->getPostcode()->getCountry()->getCountryCode() === 'FR') {
+            if ('FR' === $addr->getPostcode()->getCountry()->getCountryCode()) {
                 $lines[] = $this->renderIntraBuildingLine($addr);
                 $lines[] = $this->renderBuildingLine($addr);
                 $lines[] = $this->renderStreetLine($addr);
@@ -115,10 +99,10 @@ class AddressRender implements ChillEntityRenderInterface
             $streetNumber = '';
         }
 
-        $res = trim($street . ', ' . $streetNumber, ', ');
+        $res = trim($street.', '.$streetNumber, ', ');
 
-        if ($addr->getPostcode()->getCountry()->getCountryCode() === 'FR') {
-            $res = trim($streetNumber . ', ' . $street, ', ');
+        if ('FR' === $addr->getPostcode()->getCountry()->getCountryCode()) {
+            $res = trim($streetNumber.', '.$street, ', ');
         }
 
         if ((',' === $res) || ('' === $res)) {
@@ -140,7 +124,7 @@ class AddressRender implements ChillEntityRenderInterface
 
     private function renderBuildingLine(Address $addr): ?string
     {
-        if ($addr->getBuildingName() !== '') {
+        if ('' !== $addr->getBuildingName()) {
             $building = $addr->getBuildingName();
         } else {
             $building = '';
@@ -151,13 +135,13 @@ class AddressRender implements ChillEntityRenderInterface
             $intraBuilding = '';
         }
 
-        $res = trim($building . ' - ' . $intraBuilding, ' - ');
+        $res = trim($building.' - '.$intraBuilding, ' - ');
 
         if ('' === $res) {
             $res = null;
         }
 
-        if ($addr->getPostcode()->getCountry()->getCountryCode() === 'FR') {
+        if ('FR' === $addr->getPostcode()->getCountry()->getCountryCode()) {
             $res = $addr->getBuildingName();
         }
 
@@ -167,14 +151,14 @@ class AddressRender implements ChillEntityRenderInterface
     private function renderCityLine(Address $addr): string
     {
         if (null !== $addr->getPostcode()) {
-            $res = strtr('{postcode} {label}', [
+            $res = \strtr('{postcode} {label}', [
                 '{postcode}' => $addr->getPostcode()->getCode(),
                 '{label}' => $addr->getPostcode()->getName(),
             ]);
 
-            if ($addr->getPostcode()->getCountry()->getCountryCode() === 'FR') {
+            if ('FR' === $addr->getPostcode()->getCountry()->getCountryCode()) {
                 if ('' !== $addr->getDistribution()) {
-                    $res = $res . ' ' . $addr->getDistribution();
+                    $res = $res.' '.$addr->getDistribution();
                 }
             }
         }
@@ -199,19 +183,19 @@ class AddressRender implements ChillEntityRenderInterface
         $arr = [];
 
         if ('' !== $addr->getFlat()) {
-            $arr[] = 'appart ' . $addr->getFlat();
+            $arr[] = 'appart '.$addr->getFlat();
         }
 
         if ('' !== $addr->getFloor()) {
-            $arr[] = 'ét ' . $addr->getFloor();
+            $arr[] = 'ét '.$addr->getFloor();
         }
 
         if ('' !== $addr->getCorridor()) {
-            $arr[] = 'coul ' . $addr->getCorridor();
+            $arr[] = 'coul '.$addr->getCorridor();
         }
 
         if ('' !== $addr->getSteps()) {
-            $arr[] = 'esc ' . $addr->getSteps();
+            $arr[] = 'esc '.$addr->getSteps();
         }
 
         $res = implode(' - ', $arr);
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/BoxUtilsChillEntityRenderTrait.php b/src/Bundle/ChillMainBundle/Templating/Entity/BoxUtilsChillEntityRenderTrait.php
index 860313cbd..a0ce6355f 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/BoxUtilsChillEntityRenderTrait.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/BoxUtilsChillEntityRenderTrait.php
@@ -20,6 +20,6 @@ trait BoxUtilsChillEntityRenderTrait
 
     protected function getDefaultOpeningBox($classSuffix): string
     {
-        return '<section class="chill-entity entity-' . $classSuffix . '">';
+        return '<section class="chill-entity entity-'.$classSuffix.'">';
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
index 6b1294d42..0e2743e8c 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
@@ -20,8 +20,8 @@ class ChillEntityRender implements ChillEntityRenderInterface
 
     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 967b3ca78..9c8d4599e 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
@@ -44,18 +44,15 @@ class ChillEntityRenderExtension extends AbstractExtension
     public function getFilters()
     {
         return [
-            new TwigFilter('chill_entity_render_string', [$this, 'renderString'], [
+            new TwigFilter('chill_entity_render_string', $this->renderString(...), [
                 'is_safe' => ['html'],
             ]),
-            new TwigFilter('chill_entity_render_box', [$this, 'renderBox'], [
+            new TwigFilter('chill_entity_render_box', $this->renderBox(...), [
                 'is_safe' => ['html'],
             ]),
         ];
     }
 
-    /**
-     * @param $entity
-     */
     public function renderBox($entity, array $options = []): string
     {
         if (null === $entity) {
@@ -66,9 +63,6 @@ class ChillEntityRenderExtension extends AbstractExtension
             ->renderBox($entity, $options);
     }
 
-    /**
-     * @param $entity
-     */
     public function renderString($entity, array $options = []): string
     {
         if (null === $entity) {
@@ -79,10 +73,6 @@ class ChillEntityRenderExtension extends AbstractExtension
             ->renderString($entity, $options);
     }
 
-    /**
-     * @param $entity
-     * @param $options
-     */
     protected function getRender($entity, $options): ?ChillEntityRenderInterface
     {
         foreach ($this->renders as $render) {
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
index 9dadc4f7a..d628420c7 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
@@ -32,6 +32,8 @@ interface ChillEntityRenderInterface
      * ```
      *
      * @param T $entity
+     *
+     * @phpstan-pure
      */
     public function renderBox($entity, array $options): string;
 
@@ -41,11 +43,15 @@ interface ChillEntityRenderInterface
      * Example: returning the name of a person.
      *
      * @param T $entity
+     *
+     * @phpstan-pure
      */
     public function renderString($entity, array $options): string;
 
     /**
      * Return true if the class support this object for the given options.
+     *
+     * @phpstan-pure
      */
     public function supports(object $entity, array $options): bool;
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
index 7e567725e..a4d0f48e6 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
@@ -12,11 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
-use Symfony\Component\Templating\EngineInterface;
-
-use function array_merge;
 
 /**
  * @implements ChillEntityRenderInterface<CommentEmbeddable>
@@ -24,25 +20,13 @@ use function array_merge;
 class CommentRender implements ChillEntityRenderInterface
 {
     use BoxUtilsChillEntityRenderTrait;
-    /**
-     * @var EngineInterface
-     */
-    private $engine;
 
-    private UserRepositoryInterface $userRepository;
-
-    public function __construct(
-        UserRepositoryInterface $userRepository,
-        EngineInterface $engine
-    ) {
-        $this->userRepository = $userRepository;
-        $this->engine = $engine;
-    }
+    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly \Twig\Environment $engine) {}
 
     public function renderBox($entity, array $options): string
     {
         // default options
-        $options = array_merge([
+        $options = \array_merge([
             'user' => [],
             'disable_markdown' => false,
             'limit_lines' => null,
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
index eab014289..790996847 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -13,39 +13,25 @@ namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use DateTimeImmutable;
-
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_merge;
 
 /**
  * @implements ChillEntityRenderInterface<User>
  */
 class UserRender implements ChillEntityRenderInterface
 {
-    public const DEFAULT_OPTIONS = [
+    final public const DEFAULT_OPTIONS = [
         'main_scope' => true,
         'user_job' => true,
         'absence' => true,
+        'at' => null,
     ];
 
-    private EngineInterface $engine;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine, TranslatorInterface $translator)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->engine = $engine;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly \Twig\Environment $engine, private readonly TranslatorInterface $translator) {}
 
     public function renderBox($entity, array $options): string
     {
-        $opts = array_merge(self::DEFAULT_OPTIONS, $options);
+        $opts = \array_merge(self::DEFAULT_OPTIONS, $options);
 
         return $this->engine->render('@ChillMain/Entity/user.html.twig', [
             'user' => $entity,
@@ -55,22 +41,22 @@ class UserRender implements ChillEntityRenderInterface
 
     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['at']) && $opts['user_job']) {
+            $str .= ' ('.$this->translatableStringHelper
+                ->localize($entity->getUserJob($opts['at'])->getLabel()).')';
         }
 
-        if (null !== $entity->getMainScope() && $opts['main_scope']) {
-            $str .= ' (' . $this->translatableStringHelper
-                ->localize($entity->getMainScope()->getName()) . ')';
+        if (null !== $entity->getMainScope($opts['at']) && $opts['main_scope']) {
+            $str .= ' ('.$this->translatableStringHelper
+                ->localize($entity->getMainScope($opts['at'])->getName()).')';
         }
 
         if ($entity->isAbsent() && $opts['absence']) {
-            $str .= ' (' . $this->translator->trans('absence.Absent') . ')';
+            $str .= ' ('.$this->translator->trans('absence.Absent').')';
         }
 
         return $str;
diff --git a/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php b/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
index ce02789fd..afdb32349 100644
--- a/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
+++ b/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating\Events;
 
-use ArrayAccess;
-use RuntimeException;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -30,7 +28,7 @@ use Symfony\Component\EventDispatcher\Event;
  * 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.
  */
-class DelegatedBlockRenderingEvent extends Event implements ArrayAccess
+class DelegatedBlockRenderingEvent extends \Symfony\Contracts\EventDispatcher\Event implements \ArrayAccess
 {
     /**
      * The returned content of the event.
@@ -80,15 +78,13 @@ class DelegatedBlockRenderingEvent extends Event implements ArrayAccess
         return $this->context[$offset];
     }
 
-    public function offsetSet($offset, $value): void
+    public function offsetSet($offset, $value): never
     {
-        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): void
+    public function offsetUnset($offset): never
     {
-        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/FilterOrderGetActiveFilterHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderGetActiveFilterHelper.php
new file mode 100644
index 000000000..4ca9eda41
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderGetActiveFilterHelper.php
@@ -0,0 +1,90 @@
+<?php
+
+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 Chill\MainBundle\Templating\Listing;
+
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+use Symfony\Component\PropertyAccess\PropertyPathInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final readonly class FilterOrderGetActiveFilterHelper
+{
+    public function __construct(
+        private TranslatorInterface $translator,
+        private PropertyAccessorInterface $propertyAccessor,
+        private UserRender $userRender,
+    ) {}
+
+    /**
+     * Return all the data required to display the active filters.
+     *
+     * @return array<array{label: string, value: string, position: string, name: string}>
+     */
+    public function getActiveFilters(FilterOrderHelper $filterOrderHelper): array
+    {
+        $result = [];
+
+        if ($filterOrderHelper->hasSearchBox() && '' !== $filterOrderHelper->getQueryString()) {
+            $result[] = ['label' => '', 'value' => $filterOrderHelper->getQueryString(), 'position' => FilterOrderPositionEnum::SearchBox->value, 'name' => 'q'];
+        }
+
+        foreach ($filterOrderHelper->getDateRanges() as $name => ['label' => $label]) {
+            $base = ['position' => FilterOrderPositionEnum::DateRange->value, 'name' => $name, 'label' => (string) $label];
+
+            if (null !== ($from = $filterOrderHelper->getDateRangeData($name)['from'] ?? null)) {
+                $result[] = ['value' => $this->translator->trans('filter_order.by_date.From', ['from_date' => $from]), ...$base];
+            }
+            if (null !== ($to = $filterOrderHelper->getDateRangeData($name)['to'] ?? null)) {
+                $result[] = ['value' => $this->translator->trans('filter_order.by_date.To', ['to_date' => $to]), ...$base];
+            }
+        }
+
+        foreach ($filterOrderHelper->getCheckboxes() as $name => ['choices' => $choices, 'trans' => $trans]) {
+            $translatedChoice = array_combine($choices, [...$trans]);
+            foreach ($filterOrderHelper->getCheckboxData($name) as $keyChoice) {
+                $result[] = ['value' => $this->translator->trans($translatedChoice[$keyChoice]), 'label' => '', 'position' => FilterOrderPositionEnum::Checkboxes->value, 'name' => $name];
+            }
+        }
+
+        foreach ($filterOrderHelper->getEntityChoices() as $name => ['label' => $label, 'class' => $class, 'choices' => $choices, 'options' => $options]) {
+            foreach ($filterOrderHelper->getEntityChoiceData($name) as $selected) {
+                if (is_callable($options['choice_label'])) {
+                    $value = call_user_func($options['choice_label'], $selected);
+                } elseif ($options['choice_label'] instanceof PropertyPathInterface || is_string($options['choice_label'])) {
+                    $value = $this->propertyAccessor->getValue($selected, $options['choice_label']);
+                } else {
+                    if (!$selected instanceof \Stringable) {
+                        throw new \UnexpectedValueException(sprintf("we are not able to transform the value of %s to a string. Implements \\Stringable or add a 'choice_label' option to the filterFormBuilder", $selected::class));
+                    }
+
+                    $value = (string) $selected;
+                }
+
+                $result[] = ['value' => $this->translator->trans($value), 'label' => $label, 'position' => FilterOrderPositionEnum::EntityChoice->value, 'name' => $name];
+            }
+        }
+
+        foreach ($filterOrderHelper->getUserPickers() as $name => ['label' => $label, 'options' => $options]) {
+            foreach ($filterOrderHelper->getUserPickerData($name) as $user) {
+                $result[] = ['value' => $this->userRender->renderString($user, []), 'label' => (string) $label, 'position' => FilterOrderPositionEnum::UserPicker->value, 'name' => $name];
+            }
+        }
+
+        foreach ($filterOrderHelper->getSingleCheckbox() as $name => ['label' => $label]) {
+            if (true === $filterOrderHelper->getSingleCheckboxData($name)) {
+                $result[] = ['label' => '', 'value' => $this->translator->trans($label), 'position' => FilterOrderPositionEnum::SingleCheckbox->value, 'name' => $name];
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
index 367cc0861..9b6a42fe4 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
@@ -11,59 +11,94 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating\Listing;
 
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\Listing\FilterOrderType;
-use DateTimeImmutable;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
-use function array_merge;
-use function count;
-
-class FilterOrderHelper
+final class FilterOrderHelper
 {
     private array $checkboxes = [];
 
+    /**
+     * @var array<string, array{label: string}>
+     */
+    private array $singleCheckbox = [];
+
     private array $dateRanges = [];
 
-    private FormFactoryInterface $formFactory;
-
-    private ?string $formName = 'f';
+    public const FORM_NAME = 'f';
 
     private array $formOptions = [];
 
     private string $formType = FilterOrderType::class;
 
-    private RequestStack $requestStack;
-
     private ?array $searchBoxFields = null;
 
     private ?array $submitted = null;
 
+    /**
+     * @var array<string, array{label: string, choices: array, options: array}>
+     */
+    private array $entityChoices = [];
+
+    /**
+     * @var array<string, array{label: string, options: array}>
+     */
+    private array $userPickers = [];
+
     public function __construct(
-        FormFactoryInterface $formFactory,
-        RequestStack $requestStack
-    ) {
-        $this->formFactory = $formFactory;
-        $this->requestStack = $requestStack;
+        private readonly FormFactoryInterface $formFactory,
+        private readonly RequestStack $requestStack,
+    ) {}
+
+    public function addSingleCheckbox(string $name, string $label): self
+    {
+        $this->singleCheckbox[$name] = ['label' => $label];
+
+        return $this;
     }
 
-    public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = []): self
+    /**
+     * @param class-string $class
+     */
+    public function addEntityChoice(string $name, string $class, string $label, array $choices, array $options = []): self
     {
-        $missing = count($choices) - count($trans) - 1;
+        $this->entityChoices[$name] = ['label' => $label, 'class' => $class, 'choices' => $choices, 'options' => $options];
+
+        return $this;
+    }
+
+    public function getEntityChoices(): array
+    {
+        return $this->entityChoices;
+    }
+
+    public function addUserPicker(string $name, string $label = null, array $options = []): self
+    {
+        $this->userPickers[$name] = ['label' => $label, 'options' => $options];
+
+        return $this;
+    }
+
+    public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = [], array $options = []): self
+    {
+        if ([] === $trans) {
+            $trans = $choices;
+        }
+
         $this->checkboxes[$name] = [
-            'choices' => $choices, 'default' => $default,
-            'trans' => array_merge(
-                $trans,
-                0 < $missing ?
-                       array_fill(0, $missing, null) : []
-            ),
+            'choices' => $choices,
+            'default' => $default,
+            'trans' => $trans,
+            ...$options,
         ];
 
         return $this;
     }
 
-    public function addDateRange(string $name, ?string $label = null, ?DateTimeImmutable $from = null, ?DateTimeImmutable $to = null): self
+    public function addDateRange(string $name, string $label = null, \DateTimeImmutable $from = null, \DateTimeImmutable $to = null): self
     {
         $this->dateRanges[$name] = ['from' => $from, 'to' => $to, 'label' => $label];
 
@@ -73,7 +108,7 @@ class FilterOrderHelper
     public function buildForm(): FormInterface
     {
         return $this->formFactory
-            ->createNamed($this->formName, $this->formType, $this->getDefaultData(), array_merge([
+            ->createNamed(self::FORM_NAME, $this->formType, $this->getDefaultData(), \array_merge([
                 'helper' => $this,
                 'method' => 'GET',
                 'csrf_protection' => false,
@@ -81,18 +116,74 @@ class FilterOrderHelper
             ->handleRequest($this->requestStack->getCurrentRequest());
     }
 
+    public function getUserPickers(): array
+    {
+        return $this->userPickers;
+    }
+
+    /**
+     * @return list<User>
+     */
+    public function getUserPickerData(string $name): array
+    {
+        return $this->getFormData()['user_pickers'][$name];
+    }
+
+    public function hasCheckboxData(string $name): bool
+    {
+        return array_key_exists($name, $this->checkboxes);
+    }
+
     public function getCheckboxData(string $name): array
     {
         return $this->getFormData()['checkboxes'][$name];
     }
 
+    public function hasSingleCheckboxData(string $name): bool
+    {
+        return array_key_exists($name, $this->singleCheckbox);
+    }
+
+    public function getSingleCheckboxData(string $name): ?bool
+    {
+        return $this->getFormData()['single_checkboxes'][$name];
+    }
+
+    public function hasEntityChoice(string $name): bool
+    {
+        return array_key_exists($name, $this->entityChoices);
+    }
+
+    public function getEntityChoiceData($name): mixed
+    {
+        return $this->getFormData()['entity_choices'][$name];
+    }
+
     public function getCheckboxes(): array
     {
         return $this->checkboxes;
     }
 
+    public function hasCheckBox(string $name): bool
+    {
+        return array_key_exists($name, $this->checkboxes);
+    }
+
     /**
-     * @return array<'to': DateTimeImmutable, 'from': DateTimeImmutable>
+     * @return array<string, array{label: string}>
+     */
+    public function getSingleCheckbox(): array
+    {
+        return $this->singleCheckbox;
+    }
+
+    public function hasDateRangeData(string $name): bool
+    {
+        return array_key_exists($name, $this->dateRanges);
+    }
+
+    /**
+     * @return array{to: ?\DateTimeImmutable, from: ?\DateTimeImmutable}
      */
     public function getDateRangeData(string $name): array
     {
@@ -123,7 +214,13 @@ class FilterOrderHelper
 
     private function getDefaultData(): array
     {
-        $r = [];
+        $r = [
+            'checkboxes' => [],
+            'dateRanges' => [],
+            'single_checkboxes' => [],
+            'entity_choices' => [],
+            'user_pickers' => [],
+        ];
 
         if ($this->hasSearchBox()) {
             $r['q'] = '';
@@ -138,6 +235,18 @@ class FilterOrderHelper
             $r['dateRanges'][$name]['to'] = $defaults['to'];
         }
 
+        foreach ($this->singleCheckbox as $name => $c) {
+            $r['single_checkboxes'][$name] = false;
+        }
+
+        foreach ($this->entityChoices as $name => $c) {
+            $r['entity_choices'][$name] = ($c['options']['multiple'] ?? true) ? [] : null;
+        }
+
+        foreach ($this->userPickers as $name => $u) {
+            $r['user_pickers'][$name] = ($u['options']['multiple'] ?? true) ? [] : null;
+        }
+
         return $r;
     }
 
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
index d68c8c37a..d5df6d4f3 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating\Listing;
 
-use DateTimeImmutable;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -21,18 +20,30 @@ class FilterOrderHelperBuilder
 
     private array $dateRanges = [];
 
-    private FormFactoryInterface $formFactory;
-
-    private RequestStack $requestStack;
-
     private ?array $searchBoxFields = null;
 
-    public function __construct(
-        FormFactoryInterface $formFactory,
-        RequestStack $requestStack
-    ) {
-        $this->formFactory = $formFactory;
-        $this->requestStack = $requestStack;
+    /**
+     * @var array<string, array{label: string}>
+     */
+    private array $singleCheckboxes = [];
+
+    /**
+     * @var array<string, array{label: string, class: class-string, choices: array, options: array}>
+     */
+    private array $entityChoices = [];
+
+    /**
+     * @var array<string, array{label: string, options: array}>
+     */
+    private array $userPickers = [];
+
+    public function __construct(private readonly FormFactoryInterface $formFactory, private readonly RequestStack $requestStack) {}
+
+    public function addSingleCheckbox(string $name, string $label): self
+    {
+        $this->singleCheckboxes[$name] = ['label' => $label];
+
+        return $this;
     }
 
     public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = []): self
@@ -42,7 +53,17 @@ class FilterOrderHelperBuilder
         return $this;
     }
 
-    public function addDateRange(string $name, ?string $label = null, ?DateTimeImmutable $from = null, ?DateTimeImmutable $to = null): self
+    /**
+     * @param class-string $class
+     */
+    public function addEntityChoice(string $name, string $label, string $class, array $choices, ?array $options = []): self
+    {
+        $this->entityChoices[$name] = ['label' => $label, 'class' => $class, 'choices' => $choices, 'options' => $options];
+
+        return $this;
+    }
+
+    public function addDateRange(string $name, string $label = null, \DateTimeImmutable $from = null, \DateTimeImmutable $to = null): self
     {
         $this->dateRanges[$name] = ['from' => $from, 'to' => $to, 'label' => $label];
 
@@ -56,11 +77,18 @@ class FilterOrderHelperBuilder
         return $this;
     }
 
+    public function addUserPicker(string $name, string $label = null, ?array $options = []): self
+    {
+        $this->userPickers[$name] = ['label' => $label, 'options' => $options];
+
+        return $this;
+    }
+
     public function build(): FilterOrderHelper
     {
         $helper = new FilterOrderHelper(
             $this->formFactory,
-            $this->requestStack
+            $this->requestStack,
         );
 
         $helper->setSearchBox($this->searchBoxFields);
@@ -75,6 +103,18 @@ class FilterOrderHelperBuilder
             $helper->addCheckbox($name, $choices, $default, $trans);
         }
 
+        foreach (
+            $this->singleCheckboxes as $name => ['label' => $label]
+        ) {
+            $helper->addSingleCheckbox($name, $label);
+        }
+
+        foreach (
+            $this->entityChoices as $name => ['label' => $label, 'class' => $class, 'choices' => $choices, 'options' => $options]
+        ) {
+            $helper->addEntityChoice($name, $class, $label, $choices, $options);
+        }
+
         foreach (
             $this->dateRanges as $name => [
                 'from' => $from,
@@ -85,6 +125,15 @@ class FilterOrderHelperBuilder
             $helper->addDateRange($name, $label, $from, $to);
         }
 
+        foreach (
+            $this->userPickers as $name => [
+                'label' => $label,
+                'options' => $options
+            ]
+        ) {
+            $helper->addUserPicker($name, $label, $options);
+        }
+
         return $helper;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
index c88c71af5..0aff466dc 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
@@ -16,17 +16,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
 
 class FilterOrderHelperFactory implements FilterOrderHelperFactoryInterface
 {
-    private FormFactoryInterface $formFactory;
-
-    private RequestStack $requestStack;
-
-    public function __construct(
-        FormFactoryInterface $formFactory,
-        RequestStack $requestStack
-    ) {
-        $this->formFactory = $formFactory;
-        $this->requestStack = $requestStack;
-    }
+    public function __construct(private readonly FormFactoryInterface $formFactory, private readonly RequestStack $requestStack) {}
 
     public function create(string $context, ?array $options = []): FilterOrderHelperBuilder
     {
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderPositionEnum.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderPositionEnum.php
new file mode 100644
index 000000000..ed2337f1d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderPositionEnum.php
@@ -0,0 +1,22 @@
+<?php
+
+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 Chill\MainBundle\Templating\Listing;
+
+enum FilterOrderPositionEnum: string
+{
+    case SearchBox = 'search_box';
+    case Checkboxes = 'checkboxes';
+    case DateRange = 'date_range';
+    case EntityChoice = 'entity_choice';
+    case SingleCheckbox = 'single_checkbox';
+    case UserPicker = 'user_picker';
+}
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php b/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php
index bc256e24f..6d91cdd83 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php
@@ -11,31 +11,67 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating\Listing;
 
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
 class Templating extends AbstractExtension
 {
-    public function getFilters()
+    public function __construct(
+        private readonly RequestStack $requestStack,
+        private readonly FilterOrderGetActiveFilterHelper $filterOrderGetActiveFilterHelper,
+    ) {}
+
+    public function getFilters(): array
     {
         return [
-            new TwigFilter('chill_render_filter_order_helper', [$this, 'renderFilterOrderHelper'], [
+            new TwigFilter('chill_render_filter_order_helper', $this->renderFilterOrderHelper(...), [
                 'needs_environment' => true, 'is_safe' => ['html'],
             ]),
         ];
     }
 
+    /**
+     * @throws SyntaxError
+     * @throws RuntimeError
+     * @throws LoaderError
+     */
     public function renderFilterOrderHelper(
         Environment $environment,
         FilterOrderHelper $helper,
         ?string $template = '@ChillMain/FilterOrder/base.html.twig',
         ?array $options = []
-    ) {
+    ): string {
+        $otherParameters = [];
+
+        foreach ($this->requestStack->getCurrentRequest()->query->getIterator() as $key => $value) {
+            switch ($key) {
+                case FilterOrderHelper::FORM_NAME:
+                    break;
+
+                case PaginatorFactory::DEFAULT_CURRENT_PAGE_KEY:
+                    // when filtering, go back to page 1
+                    $otherParameters[PaginatorFactory::DEFAULT_CURRENT_PAGE_KEY] = 1;
+
+                    break;
+                default:
+                    $otherParameters[$key] = $value;
+
+                    break;
+            }
+        }
+
         return $environment->render($template, [
             'helper' => $helper,
+            'active' => $this->filterOrderGetActiveFilterHelper->getActiveFilters($helper),
             'form' => $helper->buildForm()->createView(),
             'options' => $options,
+            'otherParameters' => $otherParameters,
         ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
index 19f9a4d45..b5fedeec0 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
@@ -15,20 +15,12 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-
 final class TranslatableStringHelper implements TranslatableStringHelperInterface
 {
-    private string $defaultLocale;
+    private readonly string $defaultLocale;
 
-    private RequestStack $requestStack;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(RequestStack $requestStack, TranslatorInterface $translator, ParameterBagInterface $parameterBag)
+    public function __construct(private readonly RequestStack $requestStack, private readonly TranslatorInterface $translator, ParameterBagInterface $parameterBag)
     {
-        $this->requestStack = $requestStack;
-        $this->translator = $translator;
         $this->defaultLocale = $parameterBag->get('kernel.default_locale');
     }
 
@@ -42,12 +34,12 @@ final class TranslatableStringHelper implements TranslatableStringHelperInterfac
 
         $language = null === $request ? $this->defaultLocale : $request->getLocale();
 
-        if (array_key_exists($language, $translatableStrings)) {
+        if (\array_key_exists($language, $translatableStrings)) {
             return $translatableStrings[$language];
         }
 
         foreach ($this->translator->getFallbackLocales() as $locale) {
-            if (array_key_exists($locale, $translatableStrings)) {
+            if (\array_key_exists($locale, $translatableStrings)) {
                 return $translatableStrings[$locale];
             }
         }
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
index 61a381f75..eceae8d9c 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
@@ -19,18 +19,10 @@ class TranslatableStringTwig extends AbstractExtension
 {
     use ContainerAwareTrait;
 
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $helper;
-
     /**
      * TranslatableStringTwig constructor.
      */
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->helper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $helper) {}
 
     /**
      * Returns a list of filters to add to the existing list.
@@ -44,14 +36,14 @@ class TranslatableStringTwig extends AbstractExtension
         return [
             new TwigFilter(
                 'localize_translatable_string',
-                [$this, 'localize']
+                $this->localize(...)
             ), ];
     }
 
     /**
      * Returns the name of the extension.
      *
-     * @return The name of the extension.
+     * @return The name of the extension
      */
     public function getName()
     {
diff --git a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
index 39b74a041..7245c62fb 100644
--- a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
@@ -17,9 +17,6 @@ use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
-use function array_key_exists;
-use function ksort;
-
 /**
  * Add the function `chill_delegated_block`.
  *
@@ -78,11 +75,10 @@ class WidgetRenderingTwig extends AbstractExtension
      * 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 string          $place
      * @param WidgetInterface $widget
-     * @param mixed $ordering
      */
-    public function addWidget($place, $ordering, $widget, array $config = [])
+    public function addWidget($place, mixed $ordering, $widget, array $config = [])
     {
         $this->widget[$place][$ordering] = [$widget, $config];
     }
@@ -92,7 +88,7 @@ class WidgetRenderingTwig extends AbstractExtension
         return [
             new TwigFunction(
                 'chill_delegated_block',
-                [$this, 'renderingWidget'],
+                $this->renderingWidget(...),
                 [
                     'is_safe' => ['html'],
                     'needs_environment' => true,
@@ -101,7 +97,7 @@ class WidgetRenderingTwig extends AbstractExtension
             ),
             new TwigFunction(
                 'chill_widget',
-                [$this, 'renderingWidget'],
+                $this->renderingWidget(...),
                 ['is_safe' => ['html'], 'needs_environment' => true]
             ),
         ];
@@ -128,9 +124,9 @@ class WidgetRenderingTwig extends AbstractExtension
         // for old rendering events (deprecated)
         $event = new DelegatedBlockRenderingEvent($context);
 
-        $this->eventDispatcher->dispatch('chill_block.' . $block, $event);
+        $this->eventDispatcher->dispatch($event, 'chill_block.'.$block);
 
-        return $content . ' ' . $event->getContent();
+        return $content.' '.$event->getContent();
     }
 
     /**
@@ -140,11 +136,11 @@ class WidgetRenderingTwig extends AbstractExtension
      */
     protected function getWidgetsArraysOrdered($place)
     {
-        if (!array_key_exists($place, $this->widget)) {
+        if (!\array_key_exists($place, $this->widget)) {
             $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 af0e3843a..e66096c63 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
@@ -12,31 +12,44 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Test\Export;
 
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\EntityManagerInterface;
 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.
- *
- * @internal
  */
 abstract class AbstractAggregatorTest extends KernelTestCase
 {
+    public static function tearDownAfterClass(): void
+    {
+        if (null !== self::$container) {
+            /** @var EntityManagerInterface $em */
+            $em = self::$container->get(EntityManagerInterface::class);
+            $em->getConnection()->close();
+        }
+        self::ensureKernelShutdown();
+    }
+
     /**
      * provide data for `testAliasDidNotDisappears`.
      */
     public function dataProviderAliasDidNotDisappears()
     {
+        $datas = $this->getFormData();
+
+        if (!\is_array($datas)) {
+            $datas = iterator_to_array($datas);
+        }
+
         foreach ($this->getQueryBuilders() as $qb) {
-            foreach ($this->getFormData() as $data) {
-                yield [clone $qb, $data];
+            if ([] === $datas) {
+                yield [clone $qb, []];
+            } else {
+                foreach ($this->getFormData() as $data) {
+                    yield [clone $qb, $data];
+                }
             }
         }
     }
@@ -46,9 +59,38 @@ abstract class AbstractAggregatorTest extends KernelTestCase
      */
     public function dataProviderAlterQuery()
     {
+        $datas = $this->getFormData();
+
+        if (!\is_array($datas)) {
+            $datas = iterator_to_array($datas);
+        }
+
         foreach ($this->getQueryBuilders() as $qb) {
-            foreach ($this->getFormData() as $data) {
-                yield [clone $qb, $data];
+            if ([] === $datas) {
+                yield [clone $qb, []];
+            } else {
+                foreach ($this->getFormData() as $data) {
+                    yield [clone $qb, $data];
+                }
+            }
+        }
+    }
+
+    public function dataProviderQueryExecution(): iterable
+    {
+        $datas = $this->getFormData();
+
+        if (!\is_array($datas)) {
+            $datas = iterator_to_array($datas);
+        }
+
+        foreach ($this->getQueryBuilders() as $qb) {
+            if ([] === $datas) {
+                yield [clone $qb, []];
+            } else {
+                foreach ($this->getFormData() as $data) {
+                    yield [clone $qb, $data];
+                }
             }
         }
     }
@@ -58,7 +100,13 @@ abstract class AbstractAggregatorTest extends KernelTestCase
      */
     public function dataProviderGetQueryKeys()
     {
-        foreach ($this->getFormData() as $data) {
+        $datas = $this->getFormData();
+
+        if (!\is_array($datas)) {
+            $datas = iterator_to_array($datas);
+        }
+
+        foreach ($datas as $data) {
             yield [$data];
         }
     }
@@ -68,9 +116,19 @@ abstract class AbstractAggregatorTest extends KernelTestCase
      */
     public function dataProviderGetResultsAndLabels()
     {
+        $datas = $this->getFormData();
+
+        if (!\is_array($datas)) {
+            $datas = iterator_to_array($datas);
+        }
+
         foreach ($this->getQueryBuilders() as $qb) {
-            foreach ($this->getFormData() as $data) {
-                yield [clone $qb, $data];
+            if ([] === $datas) {
+                yield [clone $qb, []];
+            } else {
+                foreach ($datas as $data) {
+                    yield [clone $qb, $data];
+                }
             }
         }
     }
@@ -103,7 +161,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
      *
      * This method is executed before the `setUp` method.
      *
-     * @return \Doctrine\DBAL\Query\QueryBuilder[]
+     * @return QueryBuilder[]
      */
     abstract public function getQueryBuilders();
 
@@ -122,13 +180,27 @@ abstract class AbstractAggregatorTest extends KernelTestCase
 
         $alteredQuery = $qb->getAllAliases();
 
-        $this->assertGreaterThanOrEqual(count($aliases), count($alteredQuery));
+        $this->assertGreaterThanOrEqual(\count($aliases), \count($alteredQuery));
 
         foreach ($aliases as $alias) {
             $this->assertContains($alias, $alteredQuery);
         }
     }
 
+    /**
+     * @dataProvider dataProviderQueryExecution
+     *
+     * @group dbIntensive
+     */
+    public function testQueryExecution(QueryBuilder $qb, array $data): void
+    {
+        $this->getAggregator()->alterQuery($qb, $data);
+
+        $actual = $qb->getQuery()->getResult();
+
+        self::assertIsArray($actual);
+    }
+
     /**
      * test the alteration of query by the filter.
      *
@@ -139,30 +211,30 @@ abstract class AbstractAggregatorTest extends KernelTestCase
     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 ?
+        $nbOfFrom = null !== $query->getDQLPart('from') ?
+            \count($query->getDQLPart('from')) : 0;
+        $nbOfWhere = null !== $query->getDQLPart('where') ?
             $query->getDQLPart('where')->count() : 0;
-        $nbOfSelect = $query->getDQLPart('select') !== null ?
-            count($query->getDQLPart('select')) : 0;
+        $nbOfSelect = null !== $query->getDQLPart('select') ?
+            \count($query->getDQLPart('select')) : 0;
 
         $this->getAggregator()->alterQuery($query, $data);
 
         $this->assertGreaterThanOrEqual(
             $nbOfFrom,
-            $query->getDQLPart('from') !== null ? count($query->getDQLPart('from')) : 0,
+            null !== $query->getDQLPart('from') ? \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,
+            null !== $query->getDQLPart('where') ? $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->assertGreaterThanOrEqual(
             $nbOfSelect,
-            $query->getDQLPart('select') !== null ? count($query->getDQLPart('select')) : 0,
+            null !== $query->getDQLPart('select') ? \count($query->getDQLPart('select')) : 0,
             "Test that the filter has no altered the 'select' part of the query"
         );
     }
@@ -205,7 +277,7 @@ abstract class AbstractAggregatorTest extends KernelTestCase
         );
         $this->assertGreaterThanOrEqual(
             1,
-            count($queryKeys),
+            \count($queryKeys),
             'test that there are at least one query key returned'
         );
     }
@@ -234,16 +306,16 @@ abstract class AbstractAggregatorTest extends KernelTestCase
 
         $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
 
-        if (count($results) === 0) {
+        if (0 === \count($results)) {
             $this->markTestIncomplete('The result is empty. We cannot process tests '
-                . 'on results');
+                .'on results');
         }
 
         // testing the result
         $result = $results[0];
 
         $this->assertTrue(
-            $result instanceof Traversable || is_array($result),
+            is_iterable($result),
             'test that each row in the result is traversable or an array'
         );
 
@@ -257,23 +329,23 @@ abstract class AbstractAggregatorTest extends KernelTestCase
             $closure = $this->getAggregator()->getLabels($key, [$result[$key]], $data);
 
             $this->assertTrue(
-                is_callable($closure, false),
+                \is_callable($closure, false),
                 'test that the `getLabels` for key is a callable'
             );
             $this->assertTrue(
-                is_string((string) call_user_func($closure, $result[$key])),
+                \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)
+                    .'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',
+                \is_string((string) \call_user_func($closure, '_header'))
+                && !empty(\call_user_func($closure, '_header'))
+                && '_header' !== \call_user_func($closure, '_header'),
                 // message
                 sprintf('Test that the callable return by `getLabels` for key %s '
-                . 'can provide an header', $key)
+                .'can provide an header', $key)
             );
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
index 0e5b56ae0..8d845b413 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
@@ -12,28 +12,16 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Test\Export;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NativeQuery;
 use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\BrowserKit\HttpBrowser;
-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.
  *
  * The tests provided by this class will check basic things, like
  * the type of value are conform to the expected, etc.
- *
- * @internal
  */
 abstract class AbstractExportTest extends WebTestCase
 {
@@ -81,22 +69,19 @@ abstract class AbstractExportTest extends WebTestCase
             static::bootKernel();
         }
 
-        $em = static::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
+        $em = static::$container->get(EntityManagerInterface::class);
 
         $centers = $em->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findAll();
         $circles = $em->getRepository(\Chill\MainBundle\Entity\Scope::class)
             ->findAll();
 
-        if (count($centers) === 0) {
-            throw new RuntimeException('No center found. Did you forget to '
-                . 'run `doctrine:fixtures:load` command before ?');
+        if (0 === \count($centers)) {
+            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 ?');
+        if (0 === \count($circles)) {
+            throw new \RuntimeException('No circle found. Did you forget to run `doctrine:fixtures:load` command before ?');
         }
 
         return [[
@@ -160,7 +145,7 @@ abstract class AbstractExportTest extends WebTestCase
         $this->assertNotEmpty(
             $export->getDescription(),
             'Assert that the `getDescription` method does not return an empty '
-            . 'string.'
+            .'string.'
         );
     }
 
@@ -181,7 +166,7 @@ abstract class AbstractExportTest extends WebTestCase
         );
         $this->assertGreaterThanOrEqual(
             1,
-            count($queryKeys),
+            \count($queryKeys),
             'test that there are at least one query key returned'
         );
     }
@@ -196,7 +181,7 @@ abstract class AbstractExportTest extends WebTestCase
      * - each of this callable can provide a string for '_header'
      *
      * @param string[] $modifiers
-     * @param array $acl
+     * @param array    $acl
      *
      * @dataProvider dataProviderInitiateQuery
      */
@@ -221,16 +206,16 @@ abstract class AbstractExportTest extends WebTestCase
             'assert that the returned result is an array'
         );
 
-        if (count($results) === 0) {
+        if (0 === \count($results)) {
             $this->markTestIncomplete('The result is empty. We cannot process tests '
-                . 'on results');
+                .'on results');
         }
 
         // testing the result
         $result = $results[0];
 
         $this->assertTrue(
-            $result instanceof Traversable || is_array($result),
+            is_iterable($result),
             'test that each row in the result is traversable or an array'
         );
 
@@ -244,23 +229,18 @@ abstract class AbstractExportTest extends WebTestCase
             $closure = $this->getExport()->getLabels($key, [$value], $data);
 
             $this->assertTrue(
-                is_callable($closure, false),
+                \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
-                is_string((string) call_user_func($closure, '_header'))
-                && !empty(call_user_func($closure, '_header'))
-                && call_user_func($closure, '_header') !== '_header',
+                \is_string((string) \call_user_func($closure, '_header'))
+                && !empty(\call_user_func($closure, '_header'))
+                && '_header' !== \call_user_func($closure, '_header'),
                 // message
                 sprintf('Test that the callable return by `getLabels` for key %s '
-                . 'can provide an header', $key)
+                .'can provide an header', $key)
             );
         }
     }
@@ -277,7 +257,7 @@ abstract class AbstractExportTest extends WebTestCase
             'Assert that the `getType` method return a string'
         );
         $this->assertNotEmpty($export->getType(), 'Assert that the `getType` method'
-            . ' does not return an empty string.');
+            .' does not return an empty string.');
     }
 
     /**
@@ -289,12 +269,8 @@ abstract class AbstractExportTest extends WebTestCase
      * > 0).
      *
      * @dataProvider dataProviderInitiateQuery
-     *
-     * @param mixed $modifiers
-     * @param mixed $acl
-     * @param mixed $data
      */
-    public function testInitiateQuery($modifiers, $acl, $data)
+    public function testInitiateQuery(mixed $modifiers, mixed $acl, mixed $data)
     {
         $query = $this->getExport()->initiateQuery($modifiers, $acl, $data);
 
@@ -310,13 +286,13 @@ abstract class AbstractExportTest extends WebTestCase
         if ($query instanceof QueryBuilder) {
             $this->assertGreaterThanOrEqual(
                 1,
-                count($query->getDQLPart('select')),
+                \count($query->getDQLPart('select')),
                 "assert there is at least one 'select' part"
             );
 
             $this->assertGreaterThanOrEqual(
                 1,
-                count($query->getDQLPart('from')),
+                \count($query->getDQLPart('from')),
                 "assert there is at least one 'from' part"
             );
         } elseif ($query instanceof NativeQuery) {
@@ -327,42 +303,6 @@ abstract class AbstractExportTest extends WebTestCase
         }
     }
 
-    /**
-     * Test that the translated title of the export is present the list,
-     * and that the list of exports (under `/fr/exports/`) is still successfull.
-     */
-    public function testListExportPage()
-    {
-        /** @var HttpBrowser $client */
-        $client = new HttpBrowser();
-
-        $export = $this->getExport();
-        $prophet = new \Prophecy\Prophet();
-        $container = static::$kernel->getContainer();
-
-        // store the locale in a request
-        $request = new Request();
-        $request->setLocale('fr');
-        $container->get('request_stack')->push($request);
-        // translate the title
-        $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}')"
-        );
-    }
-
     /**
      * Test required role is an instance of Role.
      */
@@ -370,12 +310,7 @@ abstract class AbstractExportTest extends WebTestCase
     {
         $role = $this->getExport()->requiredRole();
 
-        $this->assertInstanceOf(
-            Role::class,
-            $role,
-            sprintf('test that the returned value of `requiredRole` is an instance '
-            . 'of %s', Role::class)
-        );
+        self::assertIsString($role);
     }
 
     /**
@@ -385,12 +320,8 @@ abstract class AbstractExportTest extends WebTestCase
      * - 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)
+    public function testSupportsModifier(mixed $modifiers, mixed $acl, mixed $data)
     {
         $export = $this->getExport();
         $query = $export->initiateQuery($modifiers, $acl, $data);
@@ -404,8 +335,8 @@ abstract class AbstractExportTest extends WebTestCase
             );
         } elseif ($query instanceof NativeQuery) {
             $this->assertTrue(
-                $export->supportsModifiers() === null
-                || count($export->supportsModifiers()) === 0,
+                null === $export->supportsModifiers()
+                || 0 === \count($export->supportsModifiers()),
                 '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 e1c8665ec..6f5d74de5 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
@@ -11,20 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Test\Export;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
-use Exception;
 use Prophecy\PhpUnit\ProphecyTrait;
 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
 {
@@ -40,23 +33,60 @@ abstract class AbstractFilterTest extends KernelTestCase
         $this->prophet = $this->getProphet();
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        if (null !== self::$container) {
+            /** @var EntityManagerInterface $em */
+            $em = self::$container->get(EntityManagerInterface::class);
+            $em->getConnection()->close();
+        }
+        self::ensureKernelShutdown();
+    }
+
     /**
      * provide data for `testAliasDidNotDisappears`.
      */
     public function dataProviderAliasDidNotDisappears()
     {
+        $datas = $this->getFormData();
+
         foreach ($this->getQueryBuilders() as $qb) {
-            foreach ($this->getFormData() as $data) {
-                yield [clone $qb, $data];
+            if ([] === $datas) {
+                yield [clone $qb, []];
+            } else {
+                foreach ($datas as $data) {
+                    yield [clone $qb, $data];
+                }
             }
         }
     }
 
     public function dataProviderAlterQuery()
     {
+        $datas = $this->getFormData();
+
         foreach ($this->getQueryBuilders() as $qb) {
-            foreach ($this->getFormData() as $data) {
-                yield [$qb, $data];
+            if ([] === $datas) {
+                yield [clone $qb, []];
+            } else {
+                foreach ($datas as $data) {
+                    yield [clone $qb, $data];
+                }
+            }
+        }
+    }
+
+    public function dataProvideQueryExecution(): iterable
+    {
+        $datas = $this->getFormData();
+
+        foreach ($this->getQueryBuilders() as $qb) {
+            if ([] === $datas) {
+                yield [clone $qb, []];
+            } else {
+                foreach ($datas as $data) {
+                    yield [clone $qb, $data];
+                }
             }
         }
     }
@@ -103,10 +133,8 @@ abstract class AbstractFilterTest extends KernelTestCase
      * Compare aliases array before and after that filter alter query.
      *
      * @dataProvider dataProviderAliasDidNotDisappears
-     *
-     * @return void
      */
-    public function testAliasDidNotDisappears(QueryBuilder $qb, array $data)
+    public function testAliasDidNotDisappears(QueryBuilder $qb, array $data): void
     {
         $aliases = $qb->getAllAliases();
 
@@ -114,7 +142,7 @@ abstract class AbstractFilterTest extends KernelTestCase
 
         $alteredQuery = $qb->getAllAliases();
 
-        $this->assertGreaterThanOrEqual(count($aliases), count($alteredQuery));
+        $this->assertGreaterThanOrEqual(\count($aliases), \count($alteredQuery));
 
         foreach ($aliases as $alias) {
             $this->assertContains($alias, $alteredQuery);
@@ -126,39 +154,51 @@ abstract class AbstractFilterTest extends KernelTestCase
      *
      * @dataProvider dataProviderAlterQuery
      *
-     * @param type $data
+     * @group dbIntensive
      */
-    public function testAlterQuery(QueryBuilder $query, $data)
+    public function testAlterQuery(QueryBuilder $query, array $data)
     {
         // retains informations about query
-        $nbOfFrom = $query->getDQLPart('from') !== null ?
-            count($query->getDQLPart('from')) : 0;
-        $nbOfWhere = $query->getDQLPart('where') !== null ?
+        $nbOfFrom = null !== $query->getDQLPart('from') ?
+            \count($query->getDQLPart('from')) : 0;
+        $nbOfWhere = null !== $query->getDQLPart('where') ?
             $query->getDQLPart('where')->count() : 0;
-        $nbOfSelect = $query->getDQLPart('select') !== null ?
-            count($query->getDQLPart('select')) : 0;
+        $nbOfSelect = null !== $query->getDQLPart('select') ?
+            \count($query->getDQLPart('select')) : 0;
 
         $this->getFilter()->alterQuery($query, $data);
 
         $this->assertGreaterThanOrEqual(
             $nbOfFrom,
-            $query->getDQLPart('from') !== null ? count($query->getDQLPart('from')) : 0,
+            null !== $query->getDQLPart('from') ? \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,
+            null !== $query->getDQLPart('where') ? $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,
-            $query->getDQLPart('select') !== null ? count($query->getDQLPart('select')) : 0,
+            null !== $query->getDQLPart('select') ? \count($query->getDQLPart('select')) : 0,
             "Test that the filter has no altered the 'select' part of the query"
         );
     }
 
+    /**
+     * @dataProvider dataProvideQueryExecution
+     */
+    public function testQueryExecution(QueryBuilder $qb, mixed $data): void
+    {
+        $this->getFilter()->alterQuery($qb, $data);
+
+        $actual = $qb->getQuery()->getResult();
+
+        self::assertIsArray($actual);
+    }
+
     public function testApplyOn()
     {
         $filter = $this->getFilter();
@@ -176,16 +216,16 @@ abstract class AbstractFilterTest extends KernelTestCase
         $description = $this->getFilter()->describeAction($data);
 
         $this->assertTrue(
-            is_string($description) || is_array($description),
+            \is_string($description) || \is_array($description),
             'test that the description is a string or an array'
         );
 
-        if (is_string($description)) {
+        if (\is_string($description)) {
             $this->assertNotEmpty(
                 $description,
                 'test that the description is not empty'
             );
-        } elseif (is_array($description)) {
+        } elseif (\is_array($description)) {
             $this->assertIsString(
                 $description[0],
                 'test that the first element in the description array is a string'
@@ -200,12 +240,12 @@ abstract class AbstractFilterTest extends KernelTestCase
                 $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),
+                        .'complete stack : %s',
+                        $ex::class,
                         $ex->getMessage(),
                         $ex->getTraceAsString()
                     )
@@ -217,8 +257,8 @@ abstract class AbstractFilterTest extends KernelTestCase
                     $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])
+                .'present in the catalogue of translations. HINT : check that "%s" '
+                .'is correctly translated', $description[0])
             );
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php
index 343c41180..00045e889 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Test;
 
+use Chill\MainBundle\Entity\Center;
+
 /**
  * A trait to prepare center.
  *
@@ -25,23 +27,17 @@ trait PrepareCenterTrait
 
     /**
      * prepare a mocked center, with and id and name given.
-     *
-     * @param int $id
-     * @param string $name
-     *
-     * @return \Chill\MainBundle\Entity\Center
      */
-    protected function prepareCenter($id, $name)
+    protected function prepareCenter(int $id, string $name): Center
     {
-        if (null === $this->centerProphet) {
-            $this->centerProphet = new \Prophecy\Prophet();
-        }
+        $center = new Center();
+        $center->setName($name);
 
-        $center = $this->centerProphet->prophesize();
-        $center->willExtend('\Chill\MainBundle\Entity\Center');
-        $center->getId()->willReturn($id);
-        $center->getName()->willReturn($name);
+        $reflectionClass = new \ReflectionClass($center);
+        $reflectionId = $reflectionClass->getProperty('id');
+        $reflectionId->setAccessible(true);
+        $reflectionId->setValue($center, $id);
 
-        return $center->reveal();
+        return $center;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php
deleted file mode 100644
index 4621fce04..000000000
--- a/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-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 Chill\MainBundle\Test;
-
-/**
- * A trait to prepare center.
- *
- * **Usage :** You must set up trait with `setUpTrait` before use
- * and use tearDownTrait after usage.
- *
- * @codeCoverageIgnore
- */
-trait PrepareCircleTrait
-{
-    private $circleProphet;
-
-    /**
-     * prepare a mocked center, with and id and name given.
-     *
-     * @param int $id
-     * @param string $name
-     *
-     * @return \Chill\MainBundle\Entity\Center
-     */
-    protected function prepareCircle($id, $name)
-    {
-        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 c84ee4051..c4080e46f 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Test;
 
-use LogicException;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
@@ -26,15 +25,14 @@ trait PrepareClientTrait
      * @param string $username the username (default 'center a_social')
      * @param string $password the password (default 'password')
      *
-     * @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([], [
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php
index 4ac86af79..dbd1825d8 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Test;
 
+use Chill\MainBundle\Entity\Scope;
+
 /**
  * A trait to prepare center.
  *
@@ -18,25 +20,24 @@ namespace Chill\MainBundle\Test;
  * and use tearDownTrait after usage.
  *
  * @codeCoverageIgnore
- *
- * @deprecated use PrepareCircleTrait instead
  */
 trait PrepareScopeTrait
 {
-    use PrepareCircleTrait;
-
     /**
-     * prepare a mocked center, with and id and name given.
+     * prepare a mocked scope, with and id and name given.
      *
-     * @param int $id
-     * @param string $name
-     *
-     * @return \Chill\MainBundle\Entity\Center
-     *
-     * @deprecated
+     * The name will be present in both lang `fr` and `en`.
      */
-    protected function prepareScope($id, $name)
+    protected function prepareScope(int $id, string $name): Scope
     {
-        return $this->prepareCircle($id, $name);
+        $scope = new Scope();
+        // set the name
+        $scope->setName(['fr' => $name, 'en' => $name]);
+        $reflection = new \ReflectionClass($scope);
+        $idProperty = $reflection->getProperty('id');
+        $idProperty->setAccessible(true);
+        $idProperty->setValue($scope, $id);
+
+        return $scope;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
index b657052dc..044d17400 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\GroupCenter;
 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
@@ -47,9 +46,9 @@ trait PrepareUserTrait
      *
      * @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)
     {
diff --git a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
index 57768bf6e..d43aaf995 100644
--- a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
@@ -18,6 +18,7 @@ namespace Chill\MainBundle\Test;
  * and use tearDownTrait after usage.
  *
  * @deprecated use @see{\Prophecy\PhpUnit\ProphecyTrait} instead
+ *
  * @codeCoverageIgnore
  *
  * @deprecated use @class{Prophecy\PhpUnit\ProphecyTrait} instead
diff --git a/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
index a0de7c6ed..f5574ef2e 100644
--- a/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ParentRoleHelperTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
index e0d781a18..a45cc7d29 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressControllerTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
@@ -26,13 +27,12 @@ final class AddressControllerTest extends \Symfony\Bundle\FrameworkBundle\Test\W
 
     private KernelBrowser $client;
 
-    protected function setUp(): void
+    protected function tearDown(): void
     {
-        self::bootKernel();
-        $this->client = $this->getClientAuthenticated();
+        self::ensureKernelShutdown();
     }
 
-    public function generateAddressIds()
+    public function generateAddressIds(): iterable
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
@@ -46,6 +46,8 @@ final class AddressControllerTest extends \Symfony\Bundle\FrameworkBundle\Test\W
         foreach ($addresses as $a) {
             yield [$a->getId()];
         }
+
+        self::ensureKernelShutdown();
     }
 
     /**
@@ -53,6 +55,7 @@ final class AddressControllerTest extends \Symfony\Bundle\FrameworkBundle\Test\W
      */
     public function testDuplicate(int $addressId)
     {
+        $this->client = $this->getClientAuthenticated();
         $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
index 3de13a54d..36796f47f 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressReferenceApiControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressToReferenceMatcherControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressToReferenceMatcherControllerTest.php
index 7bcbe9889..bd8c03860 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/AddressToReferenceMatcherControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressToReferenceMatcherControllerTest.php
@@ -21,6 +21,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AddressToReferenceMatcherControllerTest extends WebTestCase
@@ -29,10 +30,9 @@ class AddressToReferenceMatcherControllerTest extends WebTestCase
 
     private AddressRepository $addressRepository;
 
-    protected function setUp(): void
+    protected function tearDown(): void
     {
-        self::bootKernel();
-        $this->addressRepository = self::$container->get(AddressRepository::class);
+        self::ensureKernelShutdown();
     }
 
     /**
@@ -42,10 +42,11 @@ class AddressToReferenceMatcherControllerTest extends WebTestCase
     {
         $client = $this->getClientAuthenticated();
 
-        $client->request('POST', "/api/1.0/main/address/reference-match/${addressId}/set/reviewed");
+        $client->request('POST', "/api/1.0/main/address/reference-match/{$addressId}/set/reviewed");
 
         $this->assertResponseIsSuccessful();
 
+        $this->addressRepository = self::$container->get(AddressRepository::class);
         $address = $this->addressRepository->find($addressId);
 
         $this->assertEquals(Address::ADDR_REFERENCE_STATUS_REVIEWED, $address->getRefStatus());
@@ -58,10 +59,11 @@ class AddressToReferenceMatcherControllerTest extends WebTestCase
     {
         $client = $this->getClientAuthenticated();
 
-        $client->request('POST', "/api/1.0/main/address/reference-match/${addressId}/sync-with-reference");
+        $client->request('POST', "/api/1.0/main/address/reference-match/{$addressId}/sync-with-reference");
 
         $this->assertResponseIsSuccessful();
 
+        $this->addressRepository = self::$container->get(AddressRepository::class);
         $address = $this->addressRepository->find($addressId);
 
         $this->assertEquals(Address::ADDR_REFERENCE_STATUS_MATCH, $address->getRefStatus());
@@ -84,7 +86,7 @@ class AddressToReferenceMatcherControllerTest extends WebTestCase
 
         /** @var Address $address */
         $address = $em->createQuery('SELECT a FROM '.Address::class.' a')
-            ->setFirstResult(rand(0, $nb))
+            ->setFirstResult(random_int(0, $nb))
             ->setMaxResults(1)
             ->getSingleResult();
 
@@ -92,6 +94,8 @@ class AddressToReferenceMatcherControllerTest extends WebTestCase
         $em->flush();
 
         yield [$address->getId()];
+
+        self::ensureKernelShutdown();
     }
 
     public static function addressUnsyncedProvider(): iterable
@@ -108,7 +112,7 @@ class AddressToReferenceMatcherControllerTest extends WebTestCase
 
         $ref = $em->createQuery('SELECT a FROM '.AddressReference::class.' a')
             ->setMaxResults(1)
-            ->setFirstResult(rand(0, $nb))
+            ->setFirstResult(random_int(0, $nb - 1))
             ->getSingleResult();
 
         $address = Address::createFromAddressReference($ref);
@@ -123,5 +127,7 @@ class AddressToReferenceMatcherControllerTest extends WebTestCase
         $em->flush();
 
         yield [$address->getId()];
+
+        self::ensureKernelShutdown();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
index 8699ceba1..2f0e11e60 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
@@ -11,67 +11,34 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Tests\Controller;
 
+use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CenterControllerTest extends WebTestCase
 {
-    public function testCompleteScenario()
+    use PrepareClientTrait;
+
+    /**
+     * This is a smoke test that ensure that the list page does show.
+     */
+    public function testCenterAdminSmokeTest(): void
     {
-        // Create a new client to browse the application
-        $client = self::createClient([], [
-            'PHP_AUTH_USER' => 'admin',
-            'PHP_AUTH_PW' => 'password',
-            'HTTP_ACCEPT_LANGUAGE' => 'fr_FR',
-        ]);
+        $client = $this->getClientAuthenticated('admin', 'password');
 
-        // 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/'
-        );
-        $crawler = $client->click($crawler->selectLink('Créer un nouveau centre')->link());
+        $crawler = $client->request('GET', '/fr/admin/center');
+        self::assertResponseIsSuccessful('Test that /fr/admin/center does show');
 
-        // Fill in the form and submit it
-        $form = $crawler->selectButton('Créer')->form([
-            'chill_mainbundle_center[name]' => 'Test center',
-        ]);
+        $btnEdit = $crawler->filter('.btn-edit')?->first();
 
-        $client->submit($form);
-        $crawler = $client->followRedirect();
+        self::assertNotNull($btnEdit, 'check that there is at least one btn-edit on center page');
 
-        // Check data in the show view
-        $this->assertGreaterThan(
-            0,
-            $crawler->filter('td:contains("Test center")')->count(),
-            'Missing element td:contains("Test center")'
-        );
+        $client->click($btnEdit->link());
 
-        // Edit the entity
-        $crawler = $client->click($crawler->selectLink('modifier')->link());
-
-        $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"]'
-        );
-
-        $crawler = $client->request('GET', '/fr/admin/center/');
-
-        // Check the entity has been delete on the list
-        $this->assertMatchesRegularExpression('/Foo/', $client->getResponse()->getContent());
+        self::assertResponseIsSuccessful();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
index 8eda45a74..10ad4060b 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * Test the export.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ExportControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/GeographicalUnitByAddressApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/GeographicalUnitByAddressApiControllerTest.php
index a320bb073..cf8fabf66 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/GeographicalUnitByAddressApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/GeographicalUnitByAddressApiControllerTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class GeographicalUnitByAddressApiControllerTest extends WebTestCase
@@ -44,7 +45,7 @@ class GeographicalUnitByAddressApiControllerTest extends WebTestCase
         $nb = $em->createQuery('SELECT COUNT(a) FROM '.Address::class.' a')->getSingleScalarResult();
         /** @var \Chill\MainBundle\Entity\Address $random */
         $random = $em->createQuery('SELECT a FROM '.Address::class.' a')
-            ->setFirstResult(rand(0, $nb))
+            ->setFirstResult(random_int(0, $nb))
             ->setMaxResults(1)
             ->getSingleResult();
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
index e8b11bc12..9dd664f5d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LoginControllerTest extends WebTestCase
@@ -24,7 +25,7 @@ final class LoginControllerTest extends WebTestCase
     {
         $client = self::createClient();
 
-        //load login page and submit form
+        // load login page and submit form
         $crawler = $client->request('GET', '/login');
         $this->assertTrue($client->getResponse()->isSuccessful());
 
@@ -36,15 +37,15 @@ final class LoginControllerTest extends WebTestCase
             '_password' => 'password',
         ]);
 
-        //the response is a redirection
+        // the response is a redirection
         $this->assertTrue($client->getResponse()->isRedirect());
 
-        //the response is not a login page, but on a new page
+        // the response is not a login page, but on a new page
         $this->assertDoesNotMatchRegularExpression('/\/login$/', $client->getResponse()
             ->headers
             ->get('location'));
 
-        //on the home page, there must be a logout link
+        // on the home page, there must be a logout link
         $client->followRedirects(true);
         $crawler = $client->request('GET', '/');
 
@@ -52,17 +53,17 @@ final class LoginControllerTest extends WebTestCase
             ->getContent());
         $logoutLinkFilter = $crawler->filter('a:contains("Se déconnecter")');
 
-        //check there is > 0 logout link
+        // check there is > 0 logout link
         $this->assertGreaterThan(0, $logoutLinkFilter->count(), 'check that a logout link is present');
 
-        //click on logout link
+        // 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
+        // check we are back on login page
         $this->assertMatchesRegularExpression('/\/login$/', $client->getResponse()
             ->headers
             ->get('location'));
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php
index e3839f140..f64451af9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/NotificationApiControllerTest.php
@@ -16,12 +16,12 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NotificationApiControllerTest extends WebTestCase
@@ -57,7 +57,7 @@ final class NotificationApiControllerTest extends WebTestCase
             ->setRelatedEntityId(0)
             ->setSender($userB)
             ->addAddressee($userA)
-            ->setUpdatedAt(new DateTimeImmutable());
+            ->setUpdatedAt(new \DateTimeImmutable());
         $em->persist($notification);
         $em->refresh($notification);
         $em->flush();
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
index 59adb374a..a99871119 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
@@ -12,19 +12,26 @@ 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;
 
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
     public function testDenormalizingObject()
     {
+        // for a unknown reason, the kernel may be booted before running this test...
+        self::ensureKernelShutdown();
         $client = $this->getClientAuthenticated();
 
         $client->request(
@@ -37,14 +44,14 @@ final class PermissionApiControllerTest extends WebTestCase
                 'object' => [
                     'datetime' => '1969-07-09T00:00:00+0100',
                 ],
-                'class' => DateTime::class,
+                'class' => \DateTime::class,
                 'roles' => ['FOO_ROLE'],
             ])
         );
 
         $this->assertResponseIsSuccessful();
 
-        $data = json_decode($client->getResponse()->getContent(), true);
+        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
         $this->assertFalse($data['roles']['FOO_ROLE']);
     }
 
@@ -67,7 +74,7 @@ final class PermissionApiControllerTest extends WebTestCase
 
         $this->assertResponseIsSuccessful();
 
-        $data = json_decode($client->getResponse()->getContent(), true);
+        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
         $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 cbb3e3601..182ad444f 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
@@ -15,11 +15,15 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PermissionsGroupControllerTest extends WebTestCase
 {
-    public function testEmpty()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testEmpty(): never
     {
         $this->markTestSkipped();
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
index 31bfab285..1cb8687f8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
@@ -13,10 +13,10 @@ namespace Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function json_decode;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PostalCodeApiControllerTest extends WebTestCase
@@ -35,7 +35,7 @@ final class PostalCodeApiControllerTest extends WebTestCase
 
         $this->assertResponseIsSuccessful();
 
-        $data = json_decode($client->getResponse()->getContent(), true);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertEquals('Fontenay Le Comte', $data['results'][0]['name']);
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
index ee2b4fb1e..4a055f679 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
@@ -15,6 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
index 436fc88d3..925fa1527 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SearchApiControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
index 90d55df27..c1807904d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * Test the search controller.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class SearchControllerTest extends WebTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
index 57800c6cb..4b08884ca 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
@@ -14,11 +14,10 @@ namespace Chill\MainBundle\Tests\Controller;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_key_exists;
-use function json_decode;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserApiControllerTest extends WebTestCase
@@ -27,14 +26,12 @@ final class UserApiControllerTest extends WebTestCase
 
     /**
      * @depends testIndex
-     *
-     * @param mixed $existingUser
      */
-    public function testEntity($existingUser)
+    public function testEntity(mixed $existingUser)
     {
         $client = $this->getClientAuthenticated();
 
-        $client->request(Request::METHOD_GET, '/api/1.0/main/user/' . $existingUser['id'] . '.json');
+        $client->request(Request::METHOD_GET, '/api/1.0/main/user/'.$existingUser['id'].'.json');
 
         $this->assertResponseIsSuccessful();
     }
@@ -47,10 +44,10 @@ final 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, 512, JSON_THROW_ON_ERROR);
+        $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];
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index bc14d2604..b29f28478 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -12,24 +12,24 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserControllerTest extends WebTestCase
 {
-    private $client;
+    private \Symfony\Bundle\FrameworkBundle\KernelBrowser $client;
 
     private array $toDelete = [];
 
     protected function setUp(): void
     {
-        self::bootKernel();
-
         $this->client = self::createClient([], [
             'PHP_AUTH_USER' => 'admin',
             'PHP_AUTH_PW' => 'password',
@@ -48,6 +48,7 @@ final class UserControllerTest extends WebTestCase
         }
 
         $em->flush();
+        self::ensureKernelShutdown();
     }
 
     public function dataGenerateUserId()
@@ -56,7 +57,7 @@ final class UserControllerTest extends WebTestCase
         $em = self::$container->get(EntityManagerInterface::class);
 
         $user = new User();
-        $user->setUsername('Test_user ' . uniqid());
+        $user->setUsername('Test_user '.uniqid());
         $user->setPassword(self::$container->get(UserPasswordEncoderInterface::class)->encodePassword(
             $user,
             'password'
@@ -68,6 +69,8 @@ final class UserControllerTest extends WebTestCase
         $this->toDelete[] = [User::class, $user->getId()];
 
         yield [$user->getId(), $user->getUsername()];
+
+        self::ensureKernelShutdown();
     }
 
     public function testList()
@@ -85,14 +88,15 @@ final class UserControllerTest extends WebTestCase
     {
         $crawler = $this->client->request('GET', '/fr/admin/main/user/new');
 
-        $username = 'Test_user' . uniqid();
+        $username = 'Test_user'.uniqid();
         $password = 'Password1234!';
+
         // Fill in the form and submit it
-        $form = $crawler->selectButton('Créer')->form([
+        $form = $crawler->selectButton('Créer & fermer')->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[email]' => $username.'@gmail.com',
             'chill_mainbundle_user[label]' => $username,
         ]);
 
@@ -106,7 +110,7 @@ final class UserControllerTest extends WebTestCase
             'page contains the name of the user'
         );
 
-        //test the auth of the new client
+        // test the auth of the new client
         $this->isPasswordValid($username, $password);
     }
 
@@ -117,7 +121,7 @@ final class UserControllerTest extends WebTestCase
     {
         $crawler = $this->client->request('GET', "/fr/admin/main/user/{$userId}/edit");
 
-        $username = 'Foo bar ' . uniqid();
+        $username = 'Foo bar '.uniqid();
         $form = $crawler->selectButton('Enregistrer & fermer')->form([
             'chill_mainbundle_user[username]' => $username,
         ]);
@@ -130,10 +134,8 @@ final class UserControllerTest extends WebTestCase
 
     /**
      * @dataProvider dataGenerateUserId
-     *
-     * @param mixed $username
      */
-    public function testUpdatePassword(int $userId, $username)
+    public function testUpdatePassword(int $userId, mixed $username)
     {
         $crawler = $this->client->request('GET', "/fr/admin/user/{$userId}/edit_password");
         $newPassword = '1234Password!';
@@ -159,9 +161,7 @@ final class UserControllerTest extends WebTestCase
         $passwordEncoder = self::$container
             ->get(UserPasswordEncoderInterface::class);
 
-        $user = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository(\Chill\MainBundle\Entity\User::class)
+        $user = self::$container->get(UserRepositoryInterface::class)
             ->findOneBy(['username' => $username]);
 
         $this->assertTrue($passwordEncoder->isPasswordValid($user, $password));
diff --git a/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php b/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php
new file mode 100644
index 000000000..594bd6460
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Cron/CronJobDatabaseInteractionTest.php
@@ -0,0 +1,98 @@
+<?php
+
+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 Cron;
+
+use Chill\MainBundle\Cron\CronJobInterface;
+use Chill\MainBundle\Cron\CronManager;
+use Chill\MainBundle\Entity\CronJobExecution;
+use Chill\MainBundle\Repository\CronJobExecutionRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Log\NullLogger;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class CronJobDatabaseInteractionTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private EntityManagerInterface $entityManager;
+
+    private CronJobExecutionRepository $cronJobExecutionRepository;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+        $this->cronJobExecutionRepository = self::$container->get(CronJobExecutionRepository::class);
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::bootKernel();
+
+        $entityManager = self::$container->get(EntityManagerInterface::class);
+
+        $entityManager->createQuery('DELETE '.CronJobExecution::class.' cje WHERE cje.key LIKE :key')
+            ->setParameter('key', 'test-with-data')
+            ->execute();
+    }
+
+    public function testCompleteLifeCycle(): void
+    {
+        $cronjob = $this->prophesize(CronJobInterface::class);
+        $cronjob->canRun(null)->willReturn(true);
+        $cronjob->canRun(Argument::type(CronJobExecution::class))->willReturn(true);
+        $cronjob->getKey()->willReturn('test-with-data');
+        $cronjob->run([])->willReturn(['test' => 'execution-0']);
+        $cronjob->run(['test' => 'execution-0'])->willReturn(['test' => 'execution-1']);
+
+        $cronjob->run([])->shouldBeCalledOnce();
+        $cronjob->run(['test' => 'execution-0'])->shouldBeCalledOnce();
+
+        $manager = new CronManager(
+            $this->cronJobExecutionRepository,
+            $this->entityManager,
+            [$cronjob->reveal()],
+            new NullLogger()
+        );
+
+        // run a first time
+        $manager->run();
+
+        // run a second time
+        $manager->run();
+    }
+}
+
+class JobWithReturn implements CronJobInterface
+{
+    public function canRun(?CronJobExecution $cronJobExecution): bool
+    {
+        return true;
+    }
+
+    public function getKey(): string
+    {
+        return 'with-data';
+    }
+
+    public function run(array $lastExecutionData): null|array
+    {
+        return ['data' => 'test'];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Cron/CronManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Cron/CronManagerTest.php
index 4b812ce2b..cec60c7c9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Cron/CronManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Cron/CronManagerTest.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Tests\Cron;
 
-use ArrayObject;
 use Chill\MainBundle\Cron\CronJobInterface;
 use Chill\MainBundle\Cron\CronManager;
 use Chill\MainBundle\Entity\CronJobExecution;
@@ -23,10 +22,10 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Log\NullLogger;
-use function array_key_exists;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CronManagerTest extends TestCase
@@ -40,19 +39,19 @@ final class CronManagerTest extends TestCase
         $jobToExecute = $this->prophesize(CronJobInterface::class);
         $jobToExecute->getKey()->willReturn('to-exec');
         $jobToExecute->canRun(Argument::type(CronJobExecution::class))->willReturn(true);
-        $jobToExecute->run()->shouldBeCalled();
+        $jobToExecute->run([])->shouldBeCalled();
 
         $executions = [
-            ['key' => $jobOld1->getKey(), 'lastStart' => new DateTimeImmutable('yesterday'), 'lastEnd' => new DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
-            ['key' => $jobOld2->getKey(), 'lastStart' => new DateTimeImmutable('3 days ago'), 'lastEnd' => new DateTimeImmutable('36 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => $jobOld1->getKey(), 'lastStart' => new \DateTimeImmutable('yesterday'), 'lastEnd' => new \DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => $jobOld2->getKey(), 'lastStart' => new \DateTimeImmutable('3 days ago'), 'lastEnd' => new \DateTimeImmutable('36 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
             // this is the oldest one
-            ['key' => 'to-exec', 'lastStart' => new DateTimeImmutable('1 month ago'), 'lastEnd' => new DateTimeImmutable('10 days ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => 'to-exec', 'lastStart' => new \DateTimeImmutable('1 month ago'), 'lastEnd' => new \DateTimeImmutable('10 days ago'), 'lastStatus' => CronJobExecution::SUCCESS],
         ];
 
         $cronManager = new CronManager(
             $this->buildCronJobExecutionRepository($executions),
             $this->buildEntityManager([]),
-            new ArrayObject([$jobOld1, $jobToExecute->reveal(), $jobOld2]),
+            new \ArrayObject([$jobOld1, $jobToExecute->reveal(), $jobOld2]),
             new NullLogger()
         );
 
@@ -64,17 +63,17 @@ final class CronManagerTest extends TestCase
         $jobAlreadyExecuted = new JobCanRun('k');
         $jobNeverExecuted = $this->prophesize(CronJobInterface::class);
         $jobNeverExecuted->getKey()->willReturn('never-executed');
-        $jobNeverExecuted->run()->shouldBeCalled();
+        $jobNeverExecuted->run([])->shouldBeCalled();
         $jobNeverExecuted->canRun(null)->willReturn(true);
 
         $executions = [
-            ['key' => $jobAlreadyExecuted->getKey(), 'lastStart' => new DateTimeImmutable('yesterday'), 'lastEnd' => new DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => $jobAlreadyExecuted->getKey(), 'lastStart' => new \DateTimeImmutable('yesterday'), 'lastEnd' => new \DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
         ];
 
         $cronManager = new CronManager(
             $this->buildCronJobExecutionRepository($executions),
             $this->buildEntityManager([Argument::type(CronJobExecution::class)]),
-            new ArrayObject([$jobNeverExecuted->reveal(), $jobAlreadyExecuted]),
+            new \ArrayObject([$jobNeverExecuted->reveal(), $jobAlreadyExecuted]),
             new NullLogger()
         );
 
@@ -86,17 +85,17 @@ final class CronManagerTest extends TestCase
         $jobAlreadyExecuted = new JobCanRun('k');
         $jobNeverExecuted = $this->prophesize(CronJobInterface::class);
         $jobNeverExecuted->getKey()->willReturn('never-executed');
-        $jobNeverExecuted->run()->shouldBeCalled();
+        $jobNeverExecuted->run([])->shouldBeCalled();
         $jobNeverExecuted->canRun(null)->willReturn(true);
 
         $executions = [
-            ['key' => $jobAlreadyExecuted->getKey(), 'lastStart' => new DateTimeImmutable('yesterday'), 'lastEnd' => new DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
+            ['key' => $jobAlreadyExecuted->getKey(), 'lastStart' => new \DateTimeImmutable('yesterday'), 'lastEnd' => new \DateTimeImmutable('1 hours ago'), 'lastStatus' => CronJobExecution::SUCCESS],
         ];
 
         $cronManager = new CronManager(
             $this->buildCronJobExecutionRepository($executions),
             $this->buildEntityManager([Argument::type(CronJobExecution::class)]),
-            new ArrayObject([$jobAlreadyExecuted, $jobNeverExecuted->reveal()]),
+            new \ArrayObject([$jobAlreadyExecuted, $jobNeverExecuted->reveal()]),
             new NullLogger()
         );
 
@@ -116,11 +115,11 @@ final class CronManagerTest extends TestCase
                     $e = new CronJobExecution($exec['key']);
                     $e->setLastStart($exec['lastStart']);
 
-                    if (array_key_exists('lastEnd', $exec)) {
+                    if (\array_key_exists('lastEnd', $exec)) {
                         $e->setLastEnd($exec['lastEnd']);
                     }
 
-                    if (array_key_exists('lastStatus', $exec)) {
+                    if (\array_key_exists('lastStatus', $exec)) {
                         $e->setLastStatus($exec['lastStatus']);
                     }
 
@@ -151,6 +150,7 @@ final class CronManagerTest extends TestCase
 
         $query = $this->prophesize(AbstractQuery::class);
         $query->setParameters(Argument::type('array'))->willReturn($query->reveal());
+        $query->setParameter(Argument::type('string'), Argument::any(), Argument::type('string'))->willReturn($query->reveal());
         $query->execute()->shouldBeCalled();
 
         $em->createQuery(Argument::type('string'))->willReturn($query->reveal());
@@ -161,12 +161,7 @@ final class CronManagerTest extends TestCase
 
 class JobCanRun implements CronJobInterface
 {
-    private string $key;
-
-    public function __construct(string $key)
-    {
-        $this->key = $key;
-    }
+    public function __construct(private readonly string $key) {}
 
     public function canRun(?CronJobExecution $cronJobExecution): bool
     {
@@ -178,8 +173,9 @@ class JobCanRun implements CronJobInterface
         return $this->key;
     }
 
-    public function run(): void
+    public function run(array $lastExecutionData): null|array
     {
+        return null;
     }
 }
 
@@ -195,7 +191,8 @@ class JobCannotRun implements CronJobInterface
         return 'job-b';
     }
 
-    public function run(): void
+    public function run(array $lastExecutionData): null|array
     {
+        return null;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/AgeTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/AgeTest.php
index 90f6a24bf..212303274 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/AgeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/AgeTest.php
@@ -12,12 +12,12 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Doctrine\DQL;
 
 use Chill\MainBundle\Entity\Address;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgeTest extends KernelTestCase
@@ -34,29 +34,29 @@ final class AgeTest extends KernelTestCase
     public function generateQueries(): iterable
     {
         yield [
-            'SELECT AGE(a.validFrom, a.validTo) FROM ' . Address::class . ' a',
+            'SELECT AGE(a.validFrom, a.validTo) FROM '.Address::class.' a',
             [],
         ];
 
         yield [
-            'SELECT AGE(:date0, :date1) FROM ' . Address::class . ' a',
+            'SELECT AGE(:date0, :date1) FROM '.Address::class.' a',
             [
-                'date0' => new DateTimeImmutable('now'),
-                'date1' => new DateTimeImmutable('2020-01-01'),
+                'date0' => new \DateTimeImmutable('now'),
+                'date1' => new \DateTimeImmutable('2020-01-01'),
             ],
         ];
 
         yield [
-            'SELECT AGE(a.validFrom, :date1) FROM ' . Address::class . ' a',
+            'SELECT AGE(a.validFrom, :date1) FROM '.Address::class.' a',
             [
-                'date1' => new DateTimeImmutable('now'),
+                'date1' => new \DateTimeImmutable('now'),
             ],
         ];
 
         yield [
-            'SELECT AGE(:date0, a.validFrom) FROM ' . Address::class . ' a',
+            'SELECT AGE(:date0, a.validFrom) FROM '.Address::class.' a',
             [
-                'date0' => new DateTimeImmutable('now'),
+                'date0' => new \DateTimeImmutable('now'),
             ],
         ];
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/GreatestTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/GreatestTest.php
index c11061287..bba3dccc0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/GreatestTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/GreatestTest.php
@@ -12,13 +12,13 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Doctrine\DQL;
 
 use Chill\MainBundle\Entity\Address;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GreatestTest extends KernelTestCase
@@ -34,11 +34,11 @@ final class GreatestTest extends KernelTestCase
 
     public function testGreatestInDQL()
     {
-        $dql = 'SELECT GREATEST(a.validFrom, a.validTo, :now) AS g FROM ' . Address::class . ' a WHERE a.validTo < :now and a.validFrom < :now';
+        $dql = 'SELECT GREATEST(a.validFrom, a.validTo, :now) AS g FROM '.Address::class.' a WHERE a.validTo < :now and a.validFrom < :now';
 
         $actual = $this->entityManager
             ->createQuery($dql)
-            ->setParameter('now', $now = new DateTimeImmutable('now'), Types::DATE_IMMUTABLE)
+            ->setParameter('now', $now = new \DateTimeImmutable('now'), Types::DATE_IMMUTABLE)
             ->setMaxResults(3)
             ->getResult();
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php
new file mode 100644
index 000000000..8feb75617
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonBuildObjectTest.php
@@ -0,0 +1,61 @@
+<?php
+
+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 Chill\MainBundle\Tests\Doctrine\DQL;
+
+use Chill\MainBundle\Entity\Address;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class JsonBuildObjectTest extends KernelTestCase
+{
+    private EntityManagerInterface $entityManager;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        self::bootKernel();
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+    }
+
+    /**
+     * @dataProvider provideQueries
+     */
+    public function testQuery(string $sql, array $params, array $paramType): void
+    {
+        $query = $this->entityManager->createQuery($sql);
+
+        foreach ($params as $k => $v) {
+            $query->setParameter($k, $v, $paramType[$k]);
+        }
+        $query->setMaxResults(1);
+
+        $result = $query->getResult(AbstractQuery::HYDRATE_ARRAY);
+
+        self::assertIsArray($result);
+    }
+
+    public function provideQueries(): iterable
+    {
+        yield ['SELECT JSON_BUILD_OBJECT(1, 2, 3, 4) FROM '.Address::class.' a', [], []];
+        yield ["SELECT JSON_BUILD_OBJECT('st', a.street, 'sn', a.streetNumber) FROM ".Address::class.' a', [], []];
+        // next query make the test fails. But we do not need it for now.
+        // yield ["SELECT JSON_BUILD_OBJECT(a.street, :param), LOWER(:param) FROM " . Address::class . " a", ['param' => 1], ['param' => Types::INTEGER]];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonExtractTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonExtractTest.php
index 3f2b3eb2f..286aa71c9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonExtractTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonExtractTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JsonExtractTest extends KernelTestCase
@@ -32,9 +33,9 @@ final class JsonExtractTest extends KernelTestCase
 
     public function dataGenerateDql(): iterable
     {
-        yield ['SELECT JSON_EXTRACT(c.name, \'fr\') FROM ' . Country::class . ' c', []];
+        yield ['SELECT JSON_EXTRACT(c.name, \'fr\') FROM '.Country::class.' c', []];
 
-        yield ['SELECT JSON_EXTRACT(c.name, :lang) FROM ' . Country::class . ' c', ['lang' => 'fr']];
+        yield ['SELECT JSON_EXTRACT(c.name, :lang) FROM '.Country::class.' c', ['lang' => 'fr']];
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonbExistsInArrayTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonbExistsInArrayTest.php
index 67c41d3d9..31f1714d1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonbExistsInArrayTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/JsonbExistsInArrayTest.php
@@ -17,6 +17,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JsonbExistsInArrayTest extends KernelTestCase
@@ -32,7 +33,7 @@ final class JsonbExistsInArrayTest extends KernelTestCase
     public function testDQLFunctionWorks()
     {
         $result = $this->em
-            ->createQuery('SELECT JSONB_EXISTS_IN_ARRAY(u.attributes, :param) FROM ' . User::class . ' u')
+            ->createQuery('SELECT JSONB_EXISTS_IN_ARRAY(u.attributes, :param) FROM '.User::class.' u')
             ->setParameter('param', 'fr')
             ->getResult();
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/LeastTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/LeastTest.php
index 1e5be8e24..e8bb0f5b1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/LeastTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/DQL/LeastTest.php
@@ -12,13 +12,13 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Doctrine\DQL;
 
 use Chill\MainBundle\Entity\Address;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LeastTest extends KernelTestCase
@@ -34,11 +34,11 @@ final class LeastTest extends KernelTestCase
 
     public function testGreatestInDQL()
     {
-        $dql = 'SELECT LEAST(a.validFrom, a.validTo, :now) AS g FROM ' . Address::class . ' a WHERE a.validTo < :now and a.validFrom < :now';
+        $dql = 'SELECT LEAST(a.validFrom, a.validTo, :now) AS g FROM '.Address::class.' a WHERE a.validTo < :now and a.validFrom < :now';
 
         $actual = $this->entityManager
             ->createQuery($dql)
-            ->setParameter('now', $now = new DateTimeImmutable('now'), Types::DATE_IMMUTABLE)
+            ->setParameter('now', $now = new \DateTimeImmutable('now'), Types::DATE_IMMUTABLE)
             ->setMaxResults(3)
             ->getResult();
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
index 01160604a..f4a9451c2 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * Test the point model methods.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PointTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
index 9246cf1e6..c5118479a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php
@@ -15,13 +15,12 @@ use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NotificationTest extends KernelTestCase
@@ -117,7 +116,7 @@ final class NotificationTest extends KernelTestCase
             ->setSender($em->find(User::class, $senderId))
             ->setRelatedEntityId(0)
             ->setRelatedEntityClass(AccompanyingPeriod::class)
-            ->setUpdatedAt(new DateTimeImmutable())
+            ->setUpdatedAt(new \DateTimeImmutable())
             ->setMessage('Fake message');
 
         foreach ($addressesIds as $addresseeId) {
@@ -132,11 +131,9 @@ final class NotificationTest extends KernelTestCase
         $this->toDelete[] = [Notification::class, $notification->getId()];
 
         $this->assertEquals($senderId, $notification->getSender()->getId());
-        $this->assertCount(count($addressesIds), $notification->getUnreadBy());
+        $this->assertCount(\count($addressesIds), $notification->getUnreadBy());
 
-        $unreadIds = $notification->getUnreadBy()->map(static function (User $u) {
-            return $u->getId();
-        });
+        $unreadIds = $notification->getUnreadBy()->map(static fn (User $u) => $u->getId());
 
         foreach ($addressesIds as $addresseeId) {
             $this->assertContains($addresseeId, $unreadIds);
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
new file mode 100644
index 000000000..b9dc56ea5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
@@ -0,0 +1,70 @@
+<?php
+
+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 Entity;
+
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class UserTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testMainScopeHistory()
+    {
+        $user = new User();
+        $scopeA = new Scope();
+        $scopeB = new Scope();
+
+        $user->setMainScope($scopeA);
+        $user->setMainScope($scopeB);
+
+        // 1. check getMainScope get now scopeB, not scopeA
+        self::assertSame($scopeB, $user->getMainScope());
+
+        // 2. get scopeA history, check endDate is not null
+        self::assertNotNull(
+            $user
+                ->getMainScopeHistories()
+                ->filter(fn (User\UserScopeHistory $userScopeHistory) => $userScopeHistory->getScope() === $scopeA)
+                ->first()->getEndDate()
+        );
+    }
+
+    public function testUserJobHistory()
+    {
+        $user = new User();
+        $jobA = new UserJob();
+        $jobB = new UserJob();
+
+        $user->setUserJob($jobA);
+        $user->setUserJob($jobB);
+
+        // 1. check getUserJob get now jobB, not jobA
+        self::assertSame($jobB, $user->getUserJob());
+
+        // 2. get jobA history, check endDate is not null
+        self::assertNotNull(
+            $user
+                ->getUserJobHistories()
+                ->filter(fn (User\UserJobHistory $userJobHistory) => $userJobHistory->getJob() === $jobA)
+                ->first()->getEndDate()
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php b/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php
index 72b301328..f515490b8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Entity/Workflow/EntityWorkflowTest.php
@@ -16,6 +16,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EntityWorkflowTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/AccompanyingCourseExportHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Export/AccompanyingCourseExportHelperTest.php
new file mode 100644
index 000000000..f726553e9
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Export/AccompanyingCourseExportHelperTest.php
@@ -0,0 +1,115 @@
+<?php
+
+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 Export;
+
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AccompanyingCourseExportHelperTest extends KernelTestCase
+{
+    /**
+     * @var list<array{0: class-string, 1: int}>
+     */
+    private static array $entitiesToDelete = [];
+
+    private EntityManagerInterface $em;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->em = self::$container->get(EntityManagerInterface::class);
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        foreach (self::$entitiesToDelete as [$class, $id]) {
+            $entity = $em->find($class, $id);
+
+            if (null !== $entity) {
+                $em->remove($entity);
+            }
+        }
+
+        $em->flush();
+    }
+
+    public function testExclusionOnClosingMotive(): void
+    {
+        [$periodA, $periodB, $periodC] = $this->prepareData();
+
+        $qb = $this->em->getRepository(AccompanyingPeriod::class)->createQueryBuilder('acp');
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
+        $qb->select('acp.id');
+
+        $periodIdsFound = array_map(fn ($el) => $el['id'], $qb->getQuery()->getResult());
+
+        $periodA = $this->em->find(AccompanyingPeriod::class, $periodA->getId());
+        $periodB = $this->em->find(AccompanyingPeriod::class, $periodB->getId());
+        $periodC = $this->em->find(AccompanyingPeriod::class, $periodC->getId());
+
+        self::assertContains($periodA->getId(), $periodIdsFound, 'Period without canceled closing motive has been found');
+        self::assertNotContains($periodB->getId(), $periodIdsFound, 'Period with canceled closing motive has not been found');
+        self::assertNotContains($periodC->getId(), $periodIdsFound, 'Period with child canceled closing motive has not been found');
+    }
+
+    private function prepareData()
+    {
+        $cmA = new ClosingMotive();
+        $cmA->setIsCanceledAccompanyingPeriod(false);
+
+        $cmB = new ClosingMotive();
+        $cmB->setIsCanceledAccompanyingPeriod(true);
+
+        $cmChild = new ClosingMotive();
+        $cmB->addChildren($cmChild);
+
+        $this->em->persist($cmA);
+        $this->em->persist($cmB);
+        $this->em->persist($cmChild);
+
+        $periodA = new AccompanyingPeriod();
+        $periodB = new AccompanyingPeriod();
+        $periodC = new AccompanyingPeriod();
+
+        $periodA->setClosingMotive($cmA);
+        $periodB->setClosingMotive($cmB);
+        $periodC->setClosingMotive($cmChild);
+
+        $this->em->persist($periodA);
+        $this->em->persist($periodB);
+        $this->em->persist($periodC);
+
+        self::$entitiesToDelete[] = [AccompanyingPeriod::class, $periodA];
+        self::$entitiesToDelete[] = [AccompanyingPeriod::class, $periodB];
+        self::$entitiesToDelete[] = [AccompanyingPeriod::class, $periodC];
+        self::$entitiesToDelete[] = [ClosingMotive::class, $cmChild];
+        self::$entitiesToDelete[] = [ClosingMotive::class, $cmA];
+        self::$entitiesToDelete[] = [ClosingMotive::class, $cmB];
+
+        $this->em->flush();
+        $this->em->clear();
+
+        return [$periodA, $periodB, $periodC];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
index 77f5aa1e1..b9e597ec0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
@@ -11,11 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Tests\Export;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\Export\ExportType;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Test\PrepareCenterTrait;
 use Chill\MainBundle\Test\PrepareScopeTrait;
@@ -25,20 +28,20 @@ use Doctrine\ORM\QueryBuilder;
 use Prophecy\Argument;
 use Prophecy\Prophet;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\User\UserInterface;
-use function count;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Test the export manager.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ExportManagerTest extends KernelTestCase
@@ -65,8 +68,7 @@ final class ExportManagerTest extends KernelTestCase
 
     public function testAggregatorsApplyingOn()
     {
-        $center = $this->prepareCenter(100, 'center');
-        $centers = [$center];
+        $centers = [$center = new Center()];
         $user = $this->prepareUser([]);
 
         $authorizationChecker = $this->prophet->prophesize();
@@ -74,134 +76,114 @@ final class ExportManagerTest extends KernelTestCase
         $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
             ->willReturn(true);
 
-        $exportManager = $this->createExportManager(
-            null,
-            null,
-            $authorizationChecker->reveal(),
-            null,
-            $user
-        );
+        $exports = [];
+        $aggregators = [];
+        $filters = [];
 
-        $exportFooBar = $this->prophet->prophesize();
-        $exportFooBar->willImplement(ExportInterface::class);
-        $exportFooBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        $exportFooBar->supportsModifiers()->willReturn(['foo', 'bar']);
+        $exports[] = $exportFooBar = new DummyExport('CHILL_STAT_DUMMY', ['foo', 'bar']);
 
         $aggregatorBar = $this->prophet->prophesize();
         $aggregatorBar->willImplement(AggregatorInterface::class);
         $aggregatorBar->applyOn()->willReturn('bar');
         $aggregatorBar->addRole()->willReturn(null);
-        $exportManager->addAggregator($aggregatorBar->reveal(), 'bar');
+        $aggregators['bar'] = $aggregatorBar->reveal();
 
-        $exportBar = $this->prophet->prophesize();
-        $exportBar->willImplement(ExportInterface::class);
-        $exportBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        $exportBar->supportsModifiers()->willReturn(['bar']);
+        $exports[] = $exportBar = new DummyExport('CHILL_STAT_DUMMY', ['bar']);
 
         $aggregatorFoo = $this->prophet->prophesize();
         $aggregatorFoo->willImplement(AggregatorInterface::class);
         $aggregatorFoo->applyOn()->willReturn('foo');
         $aggregatorFoo->addRole()->willReturn(null);
-        $exportManager->addAggregator($aggregatorFoo->reveal(), 'foo');
+        $aggregators['foo'] = $aggregatorFoo->reveal();
 
-        $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));
-    }
-
-    public function testFiltersApplyingOn()
-    {
-        $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);
+        $exports[] = $exportFoo = new DummyExport('CHILL_STAT_DUMMY', ['foo']);
 
         $exportManager = $this->createExportManager(
             null,
             null,
             $authorizationChecker->reveal(),
             null,
-            $user
+            $user,
+            $exports,
+            $aggregators,
+            $filters
         );
 
-        $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(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(['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));
+        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFoo, $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));
+        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportBar, $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));
+        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFooBar, $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));
+        // test with empty centers
+        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFooBar, []));
+        $this->assertEquals(0, \count($obtained));
+    }
+
+    public function testFiltersApplyingOn()
+    {
+        $centers = [$center = new Center()];
+        $user = $this->prepareUser([]);
+
+        $authorizationChecker = $this->prophet->prophesize();
+        $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted(Argument::type('string'), $center)
+            ->willReturn(true);
+
+        $filters = [];
+        $exports = [];
+
+        $exports['fooBar'] = $exportFooBar = new DummyExport('CHILL_STAT_DUMMY', ['foo', 'bar']);
+        $filters['bar'] = $filterBar = new DummyFilterWithApplying(null, 'bar');
+        $exports['bar'] = $exportBar = new DummyExport('CHILL_STAT_DUMMY', ['bar']);
+        $filters['foo'] = $filterFoo = new DummyFilterWithApplying(null, 'foo');
+        $exports['foo'] = $exportFoo = new DummyExport('CHILL_STAT_DUMMY', ['foo']);
+
+        $exportManager = $this->createExportManager(
+            null,
+            null,
+            $authorizationChecker->reveal(),
+            null,
+            $user,
+            $exports,
+            [],
+            $filters
+        );
+
+        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFoo, $centers));
+        $this->assertEquals(1, \count($obtained));
+        $this->assertContains('foo', array_keys($obtained));
+
+        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportBar, $centers));
+        $this->assertEquals(1, \count($obtained));
+        $this->assertContains('bar', array_keys($obtained));
+
+        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFooBar, $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, []));
+        $this->assertEquals(0, \count($obtained));
     }
 
     public function testFormattersByTypes()
     {
         $exportManager = $this->createExportManager();
 
-        //create a formatter
+        // create a formatter
         $formatterFoo = $this->prophet->prophesize();
-        $formatterFoo->willImplement('Chill\MainBundle\Export\FormatterInterface');
+        $formatterFoo->willImplement(\Chill\MainBundle\Export\FormatterInterface::class);
         $formatterFoo->getType()->willReturn('foo');
         $formatterBar = $this->prophet->prophesize();
-        $formatterBar->willImplement('Chill\MainBundle\Export\FormatterInterface');
+        $formatterBar->willImplement(\Chill\MainBundle\Export\FormatterInterface::class);
         $formatterBar->getType()->willReturn('bar');
         $exportManager->addFormatter($formatterFoo->reveal(), 'foo');
         $exportManager->addFormatter($formatterBar->reveal(), 'bar');
@@ -224,18 +206,14 @@ final class ExportManagerTest extends KernelTestCase
         $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
         $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
             ->willReturn(true);
+        $exports = [];
+        $filters = [];
+        $aggregators = [];
 
-        $exportManager = $this->createExportManager(
-            null,
-            null,
-            $authorizationChecker->reveal(),
-            null,
-            $user
-        );
+        $em = self::$container->get(EntityManagerInterface::class);
 
         $export = $this->prophet->prophesize();
         $export->willImplement(ExportInterface::class);
-        $em = self::$container->get('doctrine.orm.entity_manager');
         $export->initiateQuery(
             Argument::is(['foo']),
             Argument::Type('array'),
@@ -245,11 +223,15 @@ final class ExportManagerTest extends KernelTestCase
                 $qb = $em->createQueryBuilder();
 
                 return $qb->addSelect('COUNT(user.id) as export')
-                    ->from('ChillMainBundle:User', 'user');
+                    ->from(User::class, 'user');
             });
-        //$export->initiateQuery()->shouldBeCalled();
+        $export->initiateQuery(
+            Argument::is(['foo']),
+            Argument::Type('array'),
+            Argument::is(['a' => 'b'])
+        )->shouldBeCalled();
         $export->supportsModifiers()->willReturn(['foo']);
-        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $export->requiredRole()->willReturn('CHILL_STAT_DUMMY');
         $export->getResult(Argument::Type(QueryBuilder::class), Argument::Type('array'))->willReturn([
             [
                 'aggregator' => 'cat a',
@@ -274,61 +256,69 @@ final class ExportManagerTest extends KernelTestCase
                     case '_header':
                         return 'export';
 
-                    default: throw new RuntimeException(sprintf('The value %s is not valid', $value));
+                    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');
+        $exports['dummy'] = $export->reveal();
 
         $filter = $this->prophet->prophesize();
         $filter->willImplement(FilterInterface::class);
-        //$filter->alterQuery()->shouldBeCalled();
         $filter->alterQuery(Argument::Type(QueryBuilder::class), Argument::Type('array'))
             ->willReturn(null);
+        $filter->alterQuery(Argument::Type(QueryBuilder::class), Argument::Type('array'))
+            ->shouldBeCalled();
         $filter->addRole()->shouldBeCalled();
-        //$filter->addRole()->shouldBeCalled();
+        $filter->addRole()->willReturn(null);
         $filter->applyOn()->willReturn('foo');
         $filter->describeAction(Argument::cetera())->willReturn('filtered string');
-        $exportManager->addFilter($filter->reveal(), 'filter_foo');
+        $filters['filter_foo'] = $filter->reveal();
 
         $aggregator = $this->prophet->prophesize();
         $aggregator->willImplement(AggregatorInterface::class);
+        $aggregator->addRole()->willReturn(null);
         $aggregator->applyOn()->willReturn('foo');
         $aggregator->alterQuery(Argument::Type(QueryBuilder::class), Argument::Type('array'))
             ->willReturn(null);
-        //$aggregator->alterQuery()->shouldBeCalled();
+        $aggregator->alterQuery(Argument::Type(QueryBuilder::class), Argument::Type('array'))
+            ->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));
-                }
+            ->willReturn(static fn ($value) => match ($value) {
+                '_header' => 'foo_header',
+                'cat a' => 'label cat a',
+                'cat b' => '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');
+        $aggregator->addRole()->shouldBeCalled();
+        $aggregators['aggregator_foo'] = $aggregator->reveal();
 
-        //add formatter interface
+        $exportManager = $this->createExportManager(
+            null,
+            null,
+            $authorizationChecker->reveal(),
+            null,
+            $user,
+            $exports,
+            $aggregators,
+            $filters
+        );
+
+        // add formatter interface
         $formatter = new \Chill\MainBundle\Export\Formatter\SpreadSheetFormatter(
-            self::$container->get('translator'),
+            self::$container->get(TranslatorInterface::class),
             $exportManager
         );
+
         $exportManager->addFormatter($formatter, 'spreadsheet');
 
-        //ob_start();
         $response = $exportManager->generate(
             'dummy',
             [$center],
@@ -359,14 +349,14 @@ final class ExportManagerTest extends KernelTestCase
                 ],
             ]
         );
-        //$content = ob_get_clean();
+
         $this->assertInstanceOf(Response::class, $response);
         $expected = <<<'EOT'
             "dummy title",""
             "",""
             "filtered string",""
-            "foo_header","_header"
-            "label cat a",""
+            "foo_header","export"
+            "label cat a","0"
             "label cat b","1"
 
             EOT;
@@ -374,184 +364,29 @@ final class ExportManagerTest extends KernelTestCase
         $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);
-    }
-
-    public function testGetAggregatorNonExistant()
-    {
-        $this->expectException(RuntimeException::class);
-
-        $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');
-        $aggBar = $this->prophet->prophesize();
-        $aggBar->willImplement('Chill\MainBundle\Export\AggregatorInterface');
-        $aggFooBar = $this->prophet->prophesize();
-        $aggFooBar->willImplement('Chill\MainBundle\Export\AggregatorInterface');
-        $exportManager->addAggregator($aggFoo->reveal(), 'foo');
-        $exportManager->addAggregator($aggBar->reveal(), 'bar');
-        $exportManager->addAggregator($aggFooBar->reveal(), 'foobar');
-
-        $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);
-    }
-
-    public function testGetExportNonExistant()
-    {
-        $this->expectException(RuntimeException::class);
-
-        $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);
-    }
-
-    public function testGetFilterNonExistant()
-    {
-        $this->expectException(RuntimeException::class);
-
-        $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->willImplement(\Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface::class);
         $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
             ->willReturn(true);
 
+        $export = $this->prophet->prophesize();
+        $export->willImplement(ExportInterface::class);
+        $export->requiredRole()->willReturn('CHILL_STAT_DUMMY');
+
         $exportManager = $this->createExportManager(
             null,
             null,
             $authorizationChecker->reveal(),
             null,
-            $user
+            $user,
+            ['dummy_export' => $export->reveal()],
         );
 
-        $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);
@@ -564,7 +399,7 @@ final class ExportManagerTest extends KernelTestCase
         $user = $this->prepareUser([]);
 
         $authorizationChecker = $this->prophet->prophesize();
-        $authorizationChecker->willImplement('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
+        $authorizationChecker->willImplement(\Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface::class);
         $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
             ->willReturn(true);
         $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $centerB)
@@ -580,7 +415,7 @@ final class ExportManagerTest extends KernelTestCase
 
         $export = $this->prophet->prophesize();
         $export->willImplement(ExportInterface::class);
-        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $export->requiredRole()->willReturn('CHILL_STAT_DUMMY');
 
         $result = $exportManager->isGrantedForElement($export->reveal(), null, [$center, $centerB]);
 
@@ -601,7 +436,7 @@ final class ExportManagerTest extends KernelTestCase
 
         $export = $this->prophet->prophesize();
         $export->willImplement(\Chill\MainBundle\Export\ExportInterface::class);
-        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $export->requiredRole()->willReturn('CHILL_STAT_DUMMY');
 
         $result = $exportManager->isGrantedForElement($export->reveal(), null, []);
 
@@ -635,7 +470,7 @@ final class ExportManagerTest extends KernelTestCase
 
         $export = $this->prophet->prophesize();
         $export->willImplement(ExportInterface::class);
-        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $export->requiredRole()->willReturn('CHILL_STAT_DUMMY');
 
         $result = $exportManager->isGrantedForElement(
             $modifier->reveal(),
@@ -648,7 +483,7 @@ final class ExportManagerTest extends KernelTestCase
 
     public function testNonExistingFormatter()
     {
-        $this->expectException(RuntimeException::class);
+        $this->expectException(\RuntimeException::class);
 
         $exportManager = $this->createExportManager();
 
@@ -663,16 +498,18 @@ final class ExportManagerTest extends KernelTestCase
      * user 'center a_social' from database.
      */
     protected function createExportManager(
-        ?LoggerInterface $logger = null,
-        ?EntityManagerInterface $em = null,
-        ?AuthorizationCheckerInterface $authorizationChecker = null,
-        ?AuthorizationHelper $authorizationHelper = null,
-        ?UserInterface $user = null
+        LoggerInterface $logger = null,
+        EntityManagerInterface $em = null,
+        AuthorizationCheckerInterface $authorizationChecker = null,
+        AuthorizationHelper $authorizationHelper = null,
+        UserInterface $user = null,
+        array $exports = [],
+        array $aggregators = [],
+        array $filters = [],
     ): ExportManager {
         $localUser = $user ?? self::$container->get(
-            'doctrine.orm.entity_manager'
+            UserRepositoryInterface::class
         )
-            ->getRepository(\Chill\MainBundle\Entity\User::class)
             ->findOneBy(['username' => 'center a_social']);
         $token = new UsernamePasswordToken($localUser, 'password', 'provider');
         $tokenStorage = new TokenStorage();
@@ -683,9 +520,114 @@ final class ExportManagerTest extends KernelTestCase
             $authorizationChecker ?? self::$container->get('security.authorization_checker'),
             $authorizationHelper ?? self::$container->get('chill.main.security.authorization.helper'),
             $tokenStorage,
-            [],
-            [],
-            []
+            $exports,
+            $aggregators,
+            $filters
         );
     }
 }
+
+class DummyFilterWithApplying implements FilterInterface
+{
+    public function __construct(
+        private readonly ?string $role,
+        private readonly string $applyOn
+    ) {}
+
+    public function getTitle()
+    {
+        return 'dummy';
+    }
+
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return ['dummy filter', []];
+    }
+
+    public function addRole(): ?string
+    {
+        return $this->role;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data) {}
+
+    public function applyOn()
+    {
+        return $this->applyOn;
+    }
+}
+
+class DummyExport implements ExportInterface
+{
+    public function __construct(
+        private readonly string $role,
+        /**
+         * @var array<string>
+         */
+        private readonly array $supportedModifiers,
+    ) {}
+
+    public function getTitle()
+    {
+        return 'dummy';
+    }
+
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return ['test'];
+    }
+
+    public function getDescription()
+    {
+        return 'dummy export';
+    }
+
+    public function getLabels($key, array $values, mixed $data)
+    {
+        return [];
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [];
+    }
+
+    public function getResult($query, $data)
+    {
+        return [];
+    }
+
+    public function getType()
+    {
+        return 'dummy';
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        return null;
+    }
+
+    public function requiredRole(): string
+    {
+        return $this->role;
+    }
+
+    public function supportsModifiers()
+    {
+        return $this->supportedModifiers;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php b/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php
index 99815d130..37024f947 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php
@@ -23,10 +23,10 @@ use Doctrine\Persistence\ObjectRepository;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use stdClass;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class IdToEntityDataTransformerTest extends TestCase
@@ -35,8 +35,8 @@ final class IdToEntityDataTransformerTest extends TestCase
 
     public function testReverseTransformMulti()
     {
-        $o1 = new stdClass();
-        $o2 = new stdClass();
+        $o1 = new \stdClass();
+        $o2 = new \stdClass();
 
         $repository = $this->prophesize(ObjectRepository::class);
         $repository->findOneBy(Argument::exact(['id' => 1]))->willReturn($o1);
@@ -58,7 +58,7 @@ final class IdToEntityDataTransformerTest extends TestCase
 
     public function testReverseTransformSingle()
     {
-        $o = new stdClass();
+        $o = new \stdClass();
 
         $repository = $this->prophesize(ObjectRepository::class);
         $repository->findOneBy(Argument::exact(['id' => 1]))->willReturn($o);
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
index ad32ecee7..4e0da5f86 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PickCenterTypeTest extends TypeTestCase
@@ -28,10 +29,10 @@ final class PickCenterTypeTest extends TypeTestCase
      * Test that a user which can reach multiple center
      * make CenterType render as "entity" type.
      */
-    public function testUserCanReachMultipleCenters()
+    public function testUserCanReachMultipleCenters(): never
     {
         $this->markTestSkipped();
-        //prepare user
+        // prepare user
         $centerA = $this->prepareCenter(1, 'centerA');
         $centerB = $this->prepareCenter(2, 'centerB');
         $groupCenterA = (new GroupCenter())
@@ -51,10 +52,10 @@ final class PickCenterTypeTest extends TypeTestCase
      * Test that a user which can reach only one center
      * render as an hidden field.
      */
-    public function testUserCanReachMultipleSameCenter()
+    public function testUserCanReachMultipleSameCenter(): never
     {
         $this->markTestSkipped();
-        //prepare user
+        // prepare user
         $center = $this->prepareCenter(1, 'center');
         $groupCenterA = (new GroupCenter())
             ->setCenter($center);
@@ -73,10 +74,10 @@ final class PickCenterTypeTest extends TypeTestCase
      * Test that a user which can reach only one center
      * render as an hidden field.
      */
-    public function testUserCanReachSingleCenter()
+    public function testUserCanReachSingleCenter(): never
     {
         $this->markTestSkipped();
-        //prepare user
+        // prepare user
         $center = $this->prepareCenter(1, 'center');
         $groupCenter = (new GroupCenter())
             ->setCenter($center);
@@ -91,7 +92,7 @@ final class PickCenterTypeTest extends TypeTestCase
     /**
      * prepare a mocked center, with and id and name given.
      *
-     * @param int $id
+     * @param int    $id
      * @param string $name
      *
      * @return \Chill\MainBundle\Entity\Center
@@ -101,7 +102,7 @@ final class PickCenterTypeTest extends TypeTestCase
         $prophet = new \Prophecy\Prophet();
 
         $prophecyCenter = $prophet->prophesize();
-        $prophecyCenter->willExtend('\Chill\MainBundle\Entity\Center');
+        $prophecyCenter->willExtend('\\'.\Chill\MainBundle\Entity\Center::class);
         $prophecyCenter->getId()->willReturn($id);
         $prophecyCenter->getName()->willReturn($name);
 
@@ -119,21 +120,21 @@ final class PickCenterTypeTest extends TypeTestCase
     {
         $prophet = new \Prophecy\Prophet();
 
-        //create a center transformer
+        // create a center transformer
         $centerTransformerProphecy = $prophet->prophesize();
         $centerTransformerProphecy
-            ->willExtend('Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer');
+            ->willExtend(\Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer::class);
         $transformer = $centerTransformerProphecy->reveal();
 
         $tokenProphecy = $prophet->prophesize();
         $tokenProphecy
-            ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+            ->willImplement('\\'.\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
         $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::class);
         $tokenStorageProphecy->getToken()->willReturn($token);
         $tokenStorage = $tokenStorageProphecy->reveal();
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickPostalCodeTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickPostalCodeTypeTest.php
index 126130275..19788bea7 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickPostalCodeTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickPostalCodeTypeTest.php
@@ -17,13 +17,13 @@ use Chill\MainBundle\Form\Type\PickPostalCodeType;
 use Chill\MainBundle\Repository\PostalCodeRepositoryInterface;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionClass;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PickPostalCodeTypeTest extends TypeTestCase
@@ -49,7 +49,7 @@ final class PickPostalCodeTypeTest extends TypeTestCase
         $postalCodeRepository->find(Argument::any())
             ->will(static function ($args) {
                 $postalCode = new PostalCode();
-                $reflectionClass = new ReflectionClass($postalCode);
+                $reflectionClass = new \ReflectionClass($postalCode);
                 $id = $reflectionClass->getProperty('id');
                 $id->setAccessible(true);
                 $id->setValue($postalCode, (int) $args[0]);
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickRollingDateTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickRollingDateTypeTest.php
index 771dd0310..fca789541 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickRollingDateTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickRollingDateTypeTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PickRollingDateTypeTest extends TypeTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
index ce41c9a21..c42595049 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
@@ -31,6 +31,7 @@ use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopePickerTypeTest extends TypeTestCase
@@ -96,9 +97,7 @@ final class ScopePickerTypeTest extends TypeTestCase
 
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
         $translatableStringHelper->localize(Argument::type('array'))->will(
-            static function ($args) {
-                return $args[0]['fr'];
-            }
+            static fn ($args) => $args[0]['fr']
         );
 
         $type = new ScopePickerType(
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php
new file mode 100644
index 000000000..2bd7708b8
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/Email/NotificationMailerTest.php
@@ -0,0 +1,124 @@
+<?php
+
+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 Notification\Email;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Entity\NotificationComment;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Notification\Email\NotificationMailer;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Event\PostPersistEventArgs;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Log\NullLogger;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mime\Email;
+use Symfony\Component\Translation\Translator;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class NotificationMailerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testPostPersistComment(): void
+    {
+        $user1 = (new User())->setEmail('user1@foo.com');
+        $user2 = (new User())->setEmail('user2@foo.com');
+        $user3 = (new User())->setEmail('user3@foo.com');
+
+        $notification = new Notification();
+        $notification
+            ->setTitle('test notification')
+            ->setSender($user1)
+            ->addAddressee($user2)
+            ->addAddressee($user3)
+        ;
+
+        $comment = (new NotificationComment())
+            ->setContent('foo bar baz')
+            ->setCreatedBy($user2)
+        ;
+        $notification->addComment($comment);
+
+        $mailer = $this->prophesize(MailerInterface::class);
+
+        // a mail only to user1 and user3 should have been sent
+        $mailer->send(Argument::that(function (Email $email) {
+            foreach ($email->getTo() as $address) {
+                if ('user1@foo.com' === $address->getAddress() || 'user3@foo.com' === $address->getAddress()) {
+                    return true;
+                }
+            }
+
+            return false;
+        }))->shouldBeCalledTimes(2);
+
+        $objectManager = $this->prophesize(EntityManagerInterface::class);
+
+        $mailer = $this->buildNotificationMailer($mailer->reveal());
+        $mailer->postPersistComment($comment, new PostPersistEventArgs($comment, $objectManager->reveal()));
+    }
+
+    public function testPostPersistCommentDestWithNullEmail(): void
+    {
+        $user1 = (new User())->setEmail('user1@foo.com');
+        $user2 = (new User())->setEmail('user2@foo.com');
+        $user3 = (new User())->setEmail(null);
+
+        $notification = new Notification();
+        $notification
+            ->setTitle('test notification')
+            ->setSender($user1)
+            ->addAddressee($user2)
+            ->addAddressee($user3)
+        ;
+
+        $comment = (new NotificationComment())
+            ->setContent('foo bar baz')
+            ->setCreatedBy($user2)
+        ;
+        $notification->addComment($comment);
+
+        $mailer = $this->prophesize(MailerInterface::class);
+
+        // a mail only to user1 and user3 should have been sent
+        $mailer->send(Argument::that(function (Email $email) {
+            foreach ($email->getTo() as $address) {
+                if ('user1@foo.com' === $address->getAddress()) {
+                    return true;
+                }
+            }
+
+            return false;
+        }))->shouldBeCalledTimes(1);
+
+        $objectManager = $this->prophesize(EntityManagerInterface::class);
+
+        $mailer = $this->buildNotificationMailer($mailer->reveal());
+        $mailer->postPersistComment($comment, new PostPersistEventArgs($comment, $objectManager->reveal()));
+    }
+
+    private function buildNotificationMailer(
+        MailerInterface $mailer = null,
+    ): NotificationMailer {
+        return new NotificationMailer(
+            $mailer,
+            new NullLogger(),
+            new Translator('fr')
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
index 3939accc7..4fd07643c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php
@@ -22,6 +22,7 @@ use Symfony\Component\HttpKernel\Event\TerminateEvent;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersistNotificationOnTerminateEventSubscriberTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
index 2ae0ecab7..9b0866024 100644
--- a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
@@ -19,6 +19,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
  * Test the Page class.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PageTest extends KernelTestCase
@@ -72,6 +73,7 @@ final class PageTest extends KernelTestCase
      * @param int $number
      * @param int $itemPerPage
      * @param int $expectedItemPerPage
+     *
      * @dataProvider generateGetFirstItemNumber
      */
     public function testGetFirstItemNumber(
@@ -88,6 +90,7 @@ final class PageTest extends KernelTestCase
      * @param int $number
      * @param int $itemPerPage
      * @param int $expectedItemPerPage
+     *
      * @dataProvider generateGetLastItemNumber
      */
     public function testGetLastItemNumber(
@@ -108,19 +111,17 @@ final class PageTest extends KernelTestCase
     }
 
     /**
-     * @param int $itemPerPage
+     * @param int    $itemPerPage
      * @param string $route
-     * @param mixed $number
-     * @param mixed $totalItems
      *
      * @return Page
      */
     protected function generatePage(
-        $number = 1,
+        mixed $number = 1,
         $itemPerPage = 10,
         $route = 'route',
         array $routeParameters = [],
-        $totalItems = 100
+        mixed $totalItems = 100
     ) {
         $urlGenerator = $this->prophet->prophesize();
         $urlGenerator->willImplement(UrlGeneratorInterface::class);
diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
index 52f156843..8ba207aa6 100644
--- a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
@@ -20,6 +20,7 @@ use function count;
  * Test the paginator class.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PaginatorTest extends KernelTestCase
@@ -108,10 +109,11 @@ final class PaginatorTest extends KernelTestCase
     }
 
     /**
-     * @param int $totalItems
-     * @param int $itemPerPage
-     * @param int $currentPage
+     * @param int  $totalItems
+     * @param int  $itemPerPage
+     * @param int  $currentPage
      * @param bool $expectedHasNextPage
+     *
      * @dataProvider generateHasNextPage
      */
     public function testHasNextPage(
@@ -128,10 +130,11 @@ final class PaginatorTest extends KernelTestCase
     /**
      * test the HasPage function.
      *
-     * @param int $totalItems
-     * @param int $itemPerpage
-     * @param int $pageNumber
+     * @param int  $totalItems
+     * @param int  $itemPerpage
+     * @param int  $pageNumber
      * @param bool $expectedHasPage
+     *
      * @dataProvider generateHasPage
      */
     public function testHasPage(
@@ -149,14 +152,14 @@ final class PaginatorTest extends KernelTestCase
      * @param int $totalItems
      * @param int $itemPerPage
      * @param int $currentPage
-     * @param mixed $expectedHasNextPage
+     *
      * @dataProvider generateHasPreviousPage
      */
     public function testHasPreviousPage(
         $totalItems,
         $itemPerPage,
         $currentPage,
-        $expectedHasNextPage
+        mixed $expectedHasNextPage
     ) {
         $paginator = $this->generatePaginator($totalItems, $itemPerPage, $currentPage);
 
@@ -170,6 +173,7 @@ final class PaginatorTest extends KernelTestCase
      * @param int $totalItems
      * @param int $itemPerPage
      * @param int $expectedPageNumber
+     *
      * @dataProvider generatePageNumber
      */
     public function testPageNumber($totalItems, $itemPerPage, $expectedPageNumber)
@@ -177,7 +181,7 @@ final class PaginatorTest extends KernelTestCase
         $paginator = $this->generatePaginator($totalItems, $itemPerPage);
 
         $this->assertEquals($expectedPageNumber, $paginator->countPages());
-        $this->assertEquals($expectedPageNumber, count($paginator));
+        $this->assertEquals($expectedPageNumber, \count($paginator));
     }
 
     public function testPagesGenerator()
@@ -213,17 +217,15 @@ final class PaginatorTest extends KernelTestCase
     }
 
     /**
-     * @param int $itemPerPage
+     * @param int    $itemPerPage
      * @param string $route
-     * @param mixed $totalItems
-     * @param mixed $currentPageNumber
      *
      * @return Paginator
      */
     protected function generatePaginator(
-        $totalItems,
+        mixed $totalItems,
         $itemPerPage,
-        $currentPageNumber = 1,
+        mixed $currentPageNumber = 1,
         $route = '',
         array $routeParameters = []
     ) {
diff --git a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
index 95e3e52b0..184c994e4 100644
--- a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\MainBundle\Tests\Routing\Loader;
+namespace Chill\MainBundle\Tests\Phonenumber;
 
 use Chill\MainBundle\Phonenumber\PhonenumberHelper;
 use libphonenumber\PhoneNumberUtil;
@@ -20,6 +20,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PhonenumberHelperTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
index 412f1098a..bcbf609df 100644
--- a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
@@ -17,11 +17,12 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
  * Test the route loader.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class RouteLoaderTest extends KernelTestCase
 {
-    private $router;
+    private ?object $router = null;
 
     protected function setUp(): void
     {
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
index 497f91271..d783cc22c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
@@ -15,6 +15,7 @@ namespace Chill\MainBundle\Tests\Search;
  * Description of AbstractSearch.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class AbstractSearchTest extends \PHPUnit\Framework\TestCase
@@ -22,11 +23,11 @@ final class AbstractSearchTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Chill\MainBundle\Search\AbstractSearch
      */
-    private $stub;
+    private \Chill\MainBundle\Search\AbstractSearch&\PHPUnit\Framework\MockObject\MockObject $stub;
 
     protected function setUp(): void
     {
-        $this->stub = $this->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
+        $this->stub = $this->getMockForAbstractClass(\Chill\MainBundle\Search\AbstractSearch::class);
     }
 
     public function testParseDateRegular()
@@ -38,7 +39,10 @@ final class AbstractSearchTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('01', $date->format('d'));
     }
 
-    public function testRecompose()
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testRecompose(): never
     {
         $this->markTestSkipped();
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
index e6e434d5b..7f4e4c533 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
@@ -13,10 +13,10 @@ namespace Search;
 
 use Chill\MainBundle\Search\SearchApiQuery;
 use PHPUnit\Framework\TestCase;
-use function is_string;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SearchApiQueryTest extends TestCase
@@ -65,7 +65,7 @@ final class SearchApiQueryTest extends TestCase
             ->setSelectPertinence('1')
             ->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 362787b84..b8ce37fff 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
@@ -20,25 +20,23 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SearchProviderTest extends TestCase
 {
-    /**
-     * @var SearchProvider
-     */
-    private $search;
+    private \Chill\MainBundle\Search\SearchProvider $search;
 
     protected function setUp(): void
     {
         $this->search = new SearchProvider();
 
-        //add a default service
+        // add a default service
         $this->addSearchService(
             $this->createDefaultSearchService('I am default', 10),
             'default'
         );
-        //add a domain service
+        // add a domain service
         $this->addSearchService(
             $this->createNonDefaultDomainSearchService('I am domain bar', 20, false),
             'bar'
@@ -47,7 +45,7 @@ final class SearchProviderTest extends TestCase
 
     public function testAccentued()
     {
-        //$this->markTestSkipped('accentued characters must be implemented');
+        // $this->markTestSkipped('accentued characters must be implemented');
 
         $terms = $this->p('manço bélier aztèque à saloù ê');
 
@@ -59,7 +57,7 @@ final class SearchProviderTest extends TestCase
 
     public function testAccentuedCapitals()
     {
-        //$this->markTestSkipped('accentued characters must be implemented');
+        // $this->markTestSkipped('accentued characters must be implemented');
 
         $terms = $this->p('MANÉÀ oÛ lÎ À');
 
@@ -125,7 +123,7 @@ final class SearchProviderTest extends TestCase
     {
         $response = $this->search->getSearchResults('default search');
 
-        //$this->markTestSkipped();
+        // $this->markTestSkipped();
 
         $this->assertEquals([
             'I am default',
@@ -134,7 +132,7 @@ final class SearchProviderTest extends TestCase
 
     public function testSearchResultDomainSearch()
     {
-        //add a search service which will be supported
+        // add a search service which will be supported
         $this->addSearchService(
             $this->createNonDefaultDomainSearchService('I am domain foo', 100, true),
             'foo'
@@ -156,7 +154,7 @@ final class SearchProviderTest extends TestCase
 
     public function testSearchWithinSpecificSearchName()
     {
-        //add a search service which will be supported
+        // add a search service which will be supported
         $this->addSearchService(
             $this->createNonDefaultDomainSearchService('I am domain foo', 100, true),
             'foo'
@@ -245,9 +243,9 @@ final class SearchProviderTest extends TestCase
     private function createDefaultSearchService($result, $order)
     {
         $mock = $this
-            ->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
+            ->getMockForAbstractClass(\Chill\MainBundle\Search\AbstractSearch::class);
 
-        //set the mock as default
+        // set the mock as default
         $mock->expects($this->any())
             ->method('isActiveByDefault')
             ->will($this->returnValue(true));
@@ -256,7 +254,7 @@ final class SearchProviderTest extends TestCase
             ->method('getOrder')
             ->will($this->returnValue($order));
 
-        //set the return value
+        // set the return value
         $mock->expects($this->any())
             ->method('renderResult')
             ->will($this->returnValue($result));
@@ -267,9 +265,9 @@ final class SearchProviderTest extends TestCase
     private function createNonDefaultDomainSearchService($result, $order, $domain)
     {
         $mock = $this
-            ->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
+            ->getMockForAbstractClass(\Chill\MainBundle\Search\AbstractSearch::class);
 
-        //set the mock as default
+        // set the mock as default
         $mock->expects($this->any())
             ->method('isActiveByDefault')
             ->will($this->returnValue(false));
@@ -282,7 +280,7 @@ final class SearchProviderTest extends TestCase
             ->method('supports')
             ->will($this->returnValue($domain));
 
-        //set the return value
+        // set the return value
         $mock->expects($this->any())
             ->method('renderResult')
             ->will($this->returnValue($result));
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
index 392e9a4ff..f592b0e1a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
@@ -12,12 +12,11 @@ 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
@@ -49,12 +48,10 @@ final class ExtractDateFromPatternTest extends TestCase
 
         $this->assertCount($count, $result->getFound());
         $this->assertEquals($filtered, $result->getFilteredSubject());
-        $this->assertContainsOnlyInstancesOf(DateTimeImmutable::class, $result->getFound());
+        $this->assertContainsOnlyInstancesOf(\DateTimeImmutable::class, $result->getFound());
 
-        $dates = array_map(
-            static function (DateTimeImmutable $d) {
-                return $d->format('Y-m-d');
-            },
+        $dates = \array_map(
+            static fn (\DateTimeImmutable $d) => $d->format('Y-m-d'),
             $result->getFound()
         );
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
index 962aac450..68b1ba9a8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ExtractPhonenumberFromPatternTest extends KernelTestCase
@@ -46,14 +47,8 @@ final class ExtractPhonenumberFromPatternTest extends KernelTestCase
 
     /**
      * @dataProvider provideData
-     *
-     * @param mixed $subject
-     * @param mixed $expectedCount
-     * @param mixed $expected
-     * @param mixed $filteredSubject
-     * @param mixed $msg
      */
-    public function testExtract(string $defaultCarrierCode, $subject, $expectedCount, $expected, $filteredSubject, $msg)
+    public function testExtract(string $defaultCarrierCode, mixed $subject, mixed $expectedCount, mixed $expected, mixed $filteredSubject, mixed $msg)
     {
         $extractor = new ExtractPhonenumberFromPattern(new ParameterBag(['chill_main' => [
             'phone_helper' => ['default_carrier_code' => $defaultCarrierCode],
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
index cc5a49096..e74888b83 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
@@ -18,17 +18,16 @@ use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Test\PrepareCenterTrait;
 use Chill\MainBundle\Test\PrepareScopeTrait;
 use Chill\MainBundle\Test\PrepareUserTrait;
-use Chill\MainBundle\Test\ProphecyTrait;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Security\Core\Role\Role;
-use function array_map;
-use function in_array;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AuthorizationHelperTest extends KernelTestCase
@@ -48,7 +47,8 @@ final class AuthorizationHelperTest extends KernelTestCase
 
     public function dataProvider_getReachableCenters()
     {
-        $this->setUp();
+        self::bootKernel();
+
         $centerA = $this->prepareCenter(1, 'center A');
         $centerB = $this->prepareCenter(2, 'center B');
         $scopeA = $this->prepareScope(1, 'scope default');
@@ -78,7 +78,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             // without scopes
             [
                 true,
-                in_array($centerA, $ah->getReachableCenters(
+                \in_array($centerA, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_1',
                     null
@@ -87,7 +87,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 true,
-                in_array($centerA, $ah->getReachableCenters(
+                \in_array($centerA, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_2',
                     null
@@ -96,7 +96,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 true,
-                in_array($centerB, $ah->getReachableCenters(
+                \in_array($centerB, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_2',
                     null
@@ -105,7 +105,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 false,
-                in_array($centerB, $ah->getReachableCenters(
+                \in_array($centerB, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_1',
                     null
@@ -115,7 +115,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             // with scope
             [
                 true,
-                in_array($centerA, $ah->getReachableCenters(
+                \in_array($centerA, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_1',
                     $scopeB
@@ -124,7 +124,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 false,
-                in_array($centerA, $ah->getReachableCenters(
+                \in_array($centerA, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_2',
                     $scopeC
@@ -133,7 +133,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
             [
                 true,
-                in_array($centerB, $ah->getReachableCenters(
+                \in_array($centerB, $ah->getReachableCenters(
                     $userA,
                     'CHILL_ROLE_2',
                     $scopeA
@@ -193,31 +193,14 @@ final class AuthorizationHelperTest extends KernelTestCase
                 'CHILL_ROLE_1',
                 $centerB,
                 'Assert that a scope not reachable is not found within accessible scopes.'
-                . ' Trying on filter centering',
+                .' 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);
-    }
-
+    /**
+     * @group legacy
+     */
     public function testGetParentRoles()
     {
         $parentRoles = $this->getAuthorizationHelper()
@@ -232,12 +215,8 @@ final class AuthorizationHelperTest extends KernelTestCase
 
     /**
      * @dataProvider dataProvider_getReachableCenters
-     *
-     * @param mixed $test
-     * @param mixed $result
-     * @param mixed $msg
      */
-    public function testGetReachableCenters($test, $result, $msg)
+    public function testGetReachableCenters(mixed $test, mixed $result, mixed $msg)
     {
         $this->assertEquals($test, $result, $msg);
     }
@@ -245,7 +224,7 @@ final class AuthorizationHelperTest extends KernelTestCase
     /**
      * @dataProvider dataProvider_getReachableScopes
      *
-     * @param bool $expectedResult
+     * @param bool   $expectedResult
      * @param string $message
      */
     public function testGetReachableScopes(
@@ -261,7 +240,7 @@ final class AuthorizationHelperTest extends KernelTestCase
 
         $this->assertEquals(
             $expectedResult,
-            in_array($testedScope, $reachableScopes, true),
+            \in_array($testedScope, $reachableScopes, true),
             $message
         );
     }
@@ -278,9 +257,9 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
+        $entity = $this->prophesize();
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasScopeInterface::class);
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scope);
 
@@ -333,9 +312,9 @@ final class AuthorizationHelperTest extends KernelTestCase
     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
+        $centerB = $this->prepareCenter(2, 'centerB');
+        $scopeA = $this->prepareScope(3, 'other'); // the user will be granted this scope
+        $scopeB = $this->prepareScope(4, 'other'); // the user will be granted this scope
         $user = $this->prepareUser([
             [
                 'center' => $centerA, 'permissionsGroup' => [
@@ -344,7 +323,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
+        $entity = $this->prophesize();
         $entity->willImplement(HasCentersInterface::class);
         $entity->willImplement(HasScopesInterface::class);
         $entity->getCenters()->willReturn([$centerA, $centerB]);
@@ -353,11 +332,29 @@ final class AuthorizationHelperTest extends KernelTestCase
         $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
     }
 
+    public function testUserHasAccessEntityIsCenter()
+    {
+        $centerA = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(2, 'centerB');
+        $user = $this->prepareUser([
+            [
+                'center' => $centerA, 'permissionsGroup' => [
+                    ['scope' => null, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+
+        $helper = $this->getAuthorizationHelper();
+
+        $this->assertFalse($helper->userHasAccess($user, $centerB, 'CHILL_ROLE'));
+        $this->assertTrue($helper->userHasAccess($user, $centerA, '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
+        $scopeB = $this->prepareScope(2, 'other'); // the user will be granted this scope
         $user = $this->prepareUser([
             [
                 'center' => $center, 'permissionsGroup' => [
@@ -366,7 +363,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
+        $entity = $this->prophesize();
         $entity->willImplement(HasCentersInterface::class);
         $entity->getCenters()->willReturn([$center, $centerB]);
 
@@ -385,8 +382,8 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity = $this->prophesize();
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
         $entity->getCenter()->willReturn($center);
 
         $this->assertTrue($helper->userHasAccess(
@@ -409,8 +406,8 @@ final class AuthorizationHelperTest extends KernelTestCase
         ]);
 
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity = $this->prophesize();
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
         $entity->getCenter()->willReturn($center);
 
         $this->assertTrue($helper->userHasAccess(
@@ -422,8 +419,8 @@ final class AuthorizationHelperTest extends KernelTestCase
 
     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
+        $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([
             [
@@ -433,9 +430,9 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
+        $entity = $this->prophesize();
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasScopeInterface::class);
         $entity->getCenter()->willReturn($centerB);
         $entity->getScope()->willReturn($scope);
 
@@ -454,8 +451,8 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity = $this->prophesize();
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
         $entity->getCenter()->willReturn($center);
 
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
@@ -473,9 +470,9 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
+        $entity = $this->prophesize();
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasScopeInterface::class);
         $entity->getCenter()->willReturn($center);
         $entity->getScope()->willReturn($scope);
 
@@ -505,8 +502,8 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity = $this->prophesize();
+        $entity->willImplement('\\'.\Chill\MainBundle\Entity\HasCenterInterface::class);
         $entity->getCenter()->willReturn($centerA);
 
         $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
@@ -515,8 +512,8 @@ final class AuthorizationHelperTest extends KernelTestCase
     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
+        $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' => [
@@ -525,7 +522,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
+        $entity = $this->prophesize();
         $entity->willImplement(HasCenterInterface::class);
         $entity->willImplement(HasScopeInterface::class);
         $entity->getCenter()->willReturn($center);
@@ -537,10 +534,10 @@ final class AuthorizationHelperTest extends KernelTestCase
     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
+        $centerB = $this->prepareCenter(2, 'centerB');
+        $scopeA = $this->prepareScope(3, 'other'); // the user will be granted this scope
+        $scopeB = $this->prepareScope(4, 'other'); // the user will be granted this scope
+        $scopeC = $this->prepareScope(5, 'other'); // the user will be granted this scope
         $user = $this->prepareUser([
             [
                 'center' => $centerA, 'permissionsGroup' => [
@@ -549,7 +546,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
+        $entity = $this->prophesize();
         $entity->willImplement(HasCentersInterface::class);
         $entity->willImplement(HasScopesInterface::class);
         $entity->getCenters()->willReturn([$centerA, $centerB]);
@@ -561,9 +558,9 @@ final class AuthorizationHelperTest extends KernelTestCase
     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
+        $centerB = $this->prepareCenter(2, 'centerB');
+        $centerC = $this->prepareCenter(3, 'centerC');
+        $scopeB = $this->prepareScope(4, 'other'); // the user will be granted this scope
         $user = $this->prepareUser([
             [
                 'center' => $center, 'permissionsGroup' => [
@@ -572,7 +569,7 @@ final class AuthorizationHelperTest extends KernelTestCase
             ],
         ]);
         $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
+        $entity = $this->prophesize();
         $entity->willImplement(HasCentersInterface::class);
         $entity->getCenters()->willReturn([$centerB, $centerC]);
 
@@ -585,6 +582,6 @@ final class AuthorizationHelperTest extends KernelTestCase
     private function getAuthorizationHelper()
     {
         return self::$container
-            ->get('chill.main.security.authorization.helper');
+            ->get(AuthorizationHelper::class);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
index 1fee5b4be..78956a1d9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
@@ -13,13 +13,11 @@ namespace Chill\MainBundle\Tests\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\PasswordRecover\TokenManager;
-use DateInterval;
-use DateTimeImmutable;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use UnexpectedValueException;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class TokenManagerTest extends KernelTestCase
@@ -36,15 +34,13 @@ final class TokenManagerTest extends KernelTestCase
         $this->tokenManager = new TokenManager('secret', $logger);
     }
 
-    public static function setUpBefore()
-    {
-    }
+    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);
 
@@ -58,12 +54,12 @@ final class TokenManagerTest extends KernelTestCase
 
     public function testGenerateEmptyUsernameCanonical()
     {
-        $this->expectException(UnexpectedValueException::class);
+        $this->expectException(\UnexpectedValueException::class);
 
         $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);
     }
@@ -72,7 +68,7 @@ final class TokenManagerTest extends KernelTestCase
     {
         $tokenManager = $this->tokenManager;
         $user = (new User())->setUsernameCanonical('test');
-        $expiration = new DateTimeImmutable('tomorrow');
+        $expiration = new \DateTimeImmutable('tomorrow');
 
         $tokens = $tokenManager->generate($user, $expiration);
 
@@ -85,8 +81,8 @@ final class TokenManagerTest extends KernelTestCase
         $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, (string) ($timestamp + 1)));
     }
@@ -95,7 +91,7 @@ final class TokenManagerTest extends KernelTestCase
     {
         $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);
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
index 9e9af1c81..ff4af29d4 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CenterResolverDispatcherTest extends KernelTestCase
@@ -30,6 +31,9 @@ final class CenterResolverDispatcherTest extends KernelTestCase
         $this->dispatcher = self::$container->get(CenterResolverDispatcher::class);
     }
 
+    /**
+     * @group legacy
+     */
     public function testResolveCenter()
     {
         $center = new Center();
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
index 30d50fca5..733e17fec 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
@@ -19,6 +19,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DefaultScopeResolverTest extends TestCase
@@ -34,10 +35,7 @@ final class DefaultScopeResolverTest extends TestCase
     {
         $scope = new Scope();
         $entity = new class ($scope) implements HasScopeInterface {
-            public function __construct(Scope $scope)
-            {
-                $this->scope = $scope;
-            }
+            public function __construct(private readonly Scope $scope) {}
 
             public function getScope()
             {
@@ -53,14 +51,11 @@ final 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)
-            {
-                $this->scopes = [$scopeA, $scopeB];
-            }
+            public function __construct(private readonly Scope $scopeA, private readonly Scope $scopeB) {}
 
             public function getScopes(): iterable
             {
-                return $this->scopes;
+                return [$this->scopeA, $this->scopeB];
             }
         };
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
index 31e5229bb..35245174c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
@@ -20,6 +20,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeResolverDispatcherTest extends TestCase
@@ -35,10 +36,7 @@ final class ScopeResolverDispatcherTest extends TestCase
     {
         $scope = new Scope();
         $entity = new class ($scope) implements HasScopeInterface {
-            public function __construct(Scope $scope)
-            {
-                $this->scope = $scope;
-            }
+            public function __construct(private readonly Scope $scope) {}
 
             public function getScope()
             {
@@ -53,6 +51,11 @@ final class ScopeResolverDispatcherTest extends TestCase
     public function testHasScopesInterface()
     {
         $entity = new class ($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
+            /**
+             * @var Scope[]
+             */
+            private array $scopes = [];
+
             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
index fb8aeae27..c820b615d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
@@ -12,11 +12,7 @@ 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;
@@ -24,6 +20,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DateNormalizerTest extends KernelTestCase
@@ -37,11 +34,11 @@ final class DateNormalizerTest extends KernelTestCase
 
     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');
+        $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' => '2021-06-05T15:05:01+0200', 'datetime8601' => '2021-06-05T15:05:01+02:00'],
             $datetime, 'json', null, 'simple normalization to json',
         ];
 
@@ -68,32 +65,26 @@ final class DateNormalizerTest extends KernelTestCase
 
     /**
      * @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)
+    public function testNormalize(mixed $expected, mixed $date, mixed $format, mixed $locale, mixed $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'));
+        $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
+    private function buildDateNormalizer(string $locale = null): DateNormalizer
     {
         $requestStack = $this->prophet->prophesize(RequestStack::class);
         $parameterBag = new ParameterBag();
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
index c7212c8e6..225f67b3b 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
@@ -19,6 +19,7 @@ use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DoctrineExistingEntityNormalizerTest extends KernelTestCase
@@ -51,10 +52,8 @@ final class DoctrineExistingEntityNormalizerTest extends KernelTestCase
 
     /**
      * @dataProvider dataProviderUserId
-     *
-     * @param mixed $userId
      */
-    public function testGetMappedClass($userId)
+    public function testGetMappedClass(mixed $userId)
     {
         $data = ['type' => 'user', 'id' => $userId];
         $supports = $this->normalizer->supportsDenormalization($data, User::class);
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
index af5a28d9f..eda761dc1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/PhonenumberNormalizerTest.php
@@ -21,6 +21,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PhonenumberNormalizerTest extends TestCase
@@ -38,12 +39,8 @@ final class PhonenumberNormalizerTest extends TestCase
 
     /**
      * @dataProvider dataProviderNormalizePhonenumber
-     *
-     * @param mixed $format
-     * @param mixed $context
-     * @param mixed $expected
      */
-    public function testNormalize(?Phonenumber $phonenumber, $format, $context, $expected)
+    public function testNormalize(?Phonenumber $phonenumber, mixed $format, mixed $context, mixed $expected)
     {
         $parameterBag = $this->prophesize(ParameterBagInterface::class);
         $parameterBag->get(Argument::exact('chill_main'))->willReturn(['phone_helper' => ['default_carrier_code' => 'BE']]);
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php
new file mode 100644
index 000000000..e3a29e285
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeCronJobTest.php
@@ -0,0 +1,68 @@
+<?php
+
+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 Services\AddressGeographicalUnit;
+
+use Chill\MainBundle\Entity\CronJobExecution;
+use Chill\MainBundle\Service\AddressGeographicalUnit\CollateAddressWithReferenceOrPostalCodeCronJob;
+use Chill\MainBundle\Service\AddressGeographicalUnit\CollateAddressWithReferenceOrPostalCodeInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class CollateAddressWithReferenceOrPostalCodeCronJobTest extends TestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @dataProvider provideDataCanRun
+     */
+    public function testCanRun(\DateTimeImmutable $now, ?\DateTimeImmutable $lastExecution, bool $expected): void
+    {
+        $execution = match ($lastExecution) {
+            null => null,
+            default => (new CronJobExecution('collate-address'))->setLastStart($lastExecution),
+        };
+
+        $clock = new MockClock($now);
+        $collator = $this->prophesize(CollateAddressWithReferenceOrPostalCodeInterface::class);
+
+        $job = new CollateAddressWithReferenceOrPostalCodeCronJob($clock, $collator->reveal());
+
+        self::assertEquals($expected, $job->canRun($execution));
+    }
+
+    public function testRun(): void
+    {
+        $clock = new MockClock();
+        $collator = $this->prophesize(CollateAddressWithReferenceOrPostalCodeInterface::class);
+        $collator->__invoke(0)->shouldBeCalledOnce();
+        $collator->__invoke(0)->willReturn(1);
+
+        $job = new CollateAddressWithReferenceOrPostalCodeCronJob($clock, $collator->reveal());
+
+        $actual = $job->run(['last-max-id' => 0]);
+        self::assertEquals(['last-max-id' => 1], $actual);
+    }
+
+    public static function provideDataCanRun(): iterable
+    {
+        yield [new \DateTimeImmutable('2023-07-10T12:00:00'), new \DateTimeImmutable('2023-07-10T11:00:00'), false];
+        yield [new \DateTimeImmutable('2023-07-10T12:00:00'), new \DateTimeImmutable('2023-07-10T05:00:00'), true];
+        yield [new \DateTimeImmutable('2023-07-10T12:00:00'), new \DateTimeImmutable('2023-07-01T12:00:00'), true];
+        yield [new \DateTimeImmutable('2023-07-10T12:00:00'), null, true];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeTest.php b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeTest.php
new file mode 100644
index 000000000..9d6af705a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/CollateAddressWithReferenceOrPostalCodeTest.php
@@ -0,0 +1,45 @@
+<?php
+
+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 Services\AddressGeographicalUnit;
+
+use Chill\MainBundle\Service\AddressGeographicalUnit\CollateAddressWithReferenceOrPostalCode;
+use Doctrine\DBAL\Connection;
+use Psr\Log\NullLogger;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class CollateAddressWithReferenceOrPostalCodeTest extends KernelTestCase
+{
+    private Connection $connection;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->connection = self::$container->get(Connection::class);
+    }
+
+    public function testRun(): void
+    {
+        $collator = new CollateAddressWithReferenceOrPostalCode(
+            $this->connection,
+            new NullLogger()
+        );
+
+        $result = $collator(0);
+
+        self::assertGreaterThan(0, $result);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJobTest.php b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJobTest.php
index 687d5df2b..827dc7e47 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJobTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/AddressGeographicalUnit/RefreshAddressToGeographicalUnitMaterializedViewCronJobTest.php
@@ -12,85 +12,69 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Services\AddressGeographicalUnit;
 
 use Chill\MainBundle\Entity\CronJobExecution;
-use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Clock\MockClock;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RefreshAddressToGeographicalUnitMaterializedViewCronJobTest extends KernelTestCase
 {
-    private Connection $connection;
-
-    protected function setUp(): void
-    {
-        parent::bootKernel();
-        $this->connection = self::$container->get(Connection::class);
-    }
+    use ProphecyTrait;
 
     public function testCanRun(): void
     {
         // As the can run is executed one of ten, this should be executed at least one after
         // 10 + 5 executions
         $job = new \Chill\MainBundle\Service\AddressGeographicalUnit\RefreshAddressToGeographicalUnitMaterializedViewCronJob(
-            $this->connection
+            $this->prophesize(Connection::class)->reveal(),
+            new MockClock(new \DateTimeImmutable('2023-07-01T00:00:00'))
         );
 
-        $lastExecution = new CronJobExecution($job->getKey());
-        $lastExecution->setLastStart(new DateTimeImmutable('2 days ago'));
+        $hoursAgo23 = new CronJobExecution($job->getKey());
+        $hoursAgo23->setLastStart(new \DateTimeImmutable('2023-06-30T01:00:00'));
+        $hoursAgo25 = new CronJobExecution($job->getKey());
+        $hoursAgo25->setLastStart(new \DateTimeImmutable('2023-06-29T23:00:00'));
 
-        $executedForFirstTime = 0;
-        $executedAfterPreviousExecution = 0;
+        $executedForFirstTime = $executedAfter23 = $executedAfter25 = 0;
 
-        for ($round = 0; 20 > $round; ++$round) {
+        for ($round = 0; 50 > $round; ++$round) {
             if ($job->canRun(null)) {
                 ++$executedForFirstTime;
             }
 
-            if ($job->canRun($lastExecution)) {
-                ++$executedAfterPreviousExecution;
+            if ($job->canRun($hoursAgo23)) {
+                ++$executedAfter23;
+            }
+
+            if ($job->canRun($hoursAgo25)) {
+                ++$executedAfter25;
             }
         }
 
         $this->assertGreaterThan(0, $executedForFirstTime);
-        $this->assertGreaterThan(0, $executedAfterPreviousExecution);
-    }
-
-    public function testCanRunShouldReturnFalse(): void
-    {
-        // As the can run is executed one of ten, this should be executed at least one after
-        // 10 + 5 executions
-        $job = new \Chill\MainBundle\Service\AddressGeographicalUnit\RefreshAddressToGeographicalUnitMaterializedViewCronJob(
-            $this->connection
-        );
-
-        $lastExecution = new CronJobExecution($job->getKey());
-        $lastExecution->setLastStart(new DateTimeImmutable('2 hours ago'));
-
-        $executedAfterPreviousExecution = 0;
-
-        for ($round = 0; 20 > $round; ++$round) {
-            if ($job->canRun($lastExecution)) {
-                ++$executedAfterPreviousExecution;
-            }
-        }
-
-        $this->assertEquals(0, $executedAfterPreviousExecution);
+        $this->assertEquals(0, $executedAfter23);
+        $this->assertGreaterThan(0, $executedAfter25);
     }
 
     public function testFullRun(): void
     {
+        self::bootKernel();
+
         $job = new \Chill\MainBundle\Service\AddressGeographicalUnit\RefreshAddressToGeographicalUnitMaterializedViewCronJob(
-            $this->connection
+            self::$container->get(Connection::class),
+            new MockClock()
         );
 
         $lastExecution = new CronJobExecution($job->getKey());
-        $lastExecution->setLastStart(new DateTimeImmutable('2 days ago'));
+        $lastExecution->setLastStart(new \DateTimeImmutable('2 days ago'));
 
         $this->assertIsBool($job->canRun($lastExecution));
 
-        $job->run();
+        $job->run([]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php
index 2ef7f0143..84f0c9fc0 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressReferenceBaseImporterTest.php
@@ -20,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressReferenceBaseImporterTest extends KernelTestCase
@@ -46,7 +47,7 @@ final class AddressReferenceBaseImporterTest extends KernelTestCase
     public function testImportAddress(): void
     {
         $postalCode = (new PostalCode())
-            ->setRefPostalCodeId($postalCodeId = '1234' . uniqid())
+            ->setRefPostalCodeId($postalCodeId = '1234'.uniqid())
             ->setPostalCodeSource('testing')
             ->setCode('TEST456')
             ->setName('testing');
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressToReferenceMatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressToReferenceMatcherTest.php
index c07e9c978..1bc888d59 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressToReferenceMatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/AddressToReferenceMatcherTest.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Services\Import;
 
-use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Repository\AddressReferenceRepository;
 use Chill\MainBundle\Repository\CountryRepository;
@@ -24,6 +22,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class AddressToReferenceMatcherTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php
index 33198c500..de72492a9 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/GeographicalUnitBaseImporterTest.php
@@ -19,6 +19,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GeographicalUnitBaseImporterTest extends KernelTestCase
@@ -64,7 +65,7 @@ final class GeographicalUnitBaseImporterTest extends KernelTestCase
 
         $this->assertEquals($results['unitrefid'], 'layer_one');
         $this->assertEquals($results['unitname'], 'Layer one');
-        $this->assertEquals(json_decode($results['layername'], true), ['fr' => 'Test Layer']);
+        $this->assertEquals(json_decode((string) $results['layername'], true, 512, JSON_THROW_ON_ERROR), ['fr' => 'Test Layer']);
         $this->assertEquals($results['layerrefid'], 'test');
         $this->assertEquals($results['geom'], 'MULTIPOLYGON(((30 20,45 40,10 40,30 20)),((15 5,40 10,10 20,5 10,15 5)))');
 
@@ -93,7 +94,7 @@ final class GeographicalUnitBaseImporterTest extends KernelTestCase
 
         $this->assertEquals($results['unitrefid'], 'layer_one');
         $this->assertEquals($results['unitname'], 'Layer one fixed');
-        $this->assertEquals(json_decode($results['layername'], true), ['fr' => 'Test Layer fixed']);
+        $this->assertEquals(json_decode((string) $results['layername'], true, 512, JSON_THROW_ON_ERROR), ['fr' => 'Test Layer fixed']);
         $this->assertEquals($results['layerrefid'], 'test');
         $this->assertEquals($results['geom'], 'MULTIPOLYGON(((130 120,45 40,10 40,130 120)),((0 0,15 5,40 10,10 20,0 0)))');
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php
index ce9a7a432..19c824eff 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/Import/PostalCodeBaseImporterTest.php
@@ -19,6 +19,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PostalCodeBaseImporterTest extends KernelTestCase
@@ -47,9 +48,9 @@ final class PostalCodeBaseImporterTest extends KernelTestCase
     {
         $this->importer->importCode(
             'BE',
-            'tested with pattern ' . ($uniqid = uniqid()),
+            'tested with pattern '.($uniqid = uniqid()),
             '12345',
-            $refPostalCodeId = 'test' . uniqid(),
+            $refPostalCodeId = 'test'.uniqid(),
             'test',
             50.0,
             5.0,
@@ -59,7 +60,7 @@ final class PostalCodeBaseImporterTest extends KernelTestCase
         $this->importer->finalize();
 
         $postalCodes = $this->postalCodeRepository->findByPattern(
-            'with pattern ' . $uniqid,
+            'with pattern '.$uniqid,
             $this->countryRepository->findOneBy(['countryCode' => 'BE'])
         );
 
@@ -72,7 +73,7 @@ final class PostalCodeBaseImporterTest extends KernelTestCase
 
         $this->importer->importCode(
             'BE',
-            'tested with adapted pattern ' . ($uniqid = uniqid()),
+            'tested with adapted pattern '.($uniqid = uniqid()),
             '12345',
             $refPostalCodeId,
             'test',
@@ -84,7 +85,7 @@ final class PostalCodeBaseImporterTest extends KernelTestCase
         $this->importer->finalize();
 
         $postalCodes = $this->postalCodeRepository->findByPattern(
-            'with pattern ' . $uniqid,
+            'with pattern '.$uniqid,
             $this->countryRepository->findOneBy(['countryCode' => 'BE'])
         );
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
index 2df11c4f9..d365d3567 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Routing\RouteCollection;
  * This class provide functional test for MenuComposer.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class MenuComposerTest extends KernelTestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/RollingDate/RollingDateConverterTest.php b/src/Bundle/ChillMainBundle/Tests/Services/RollingDate/RollingDateConverterTest.php
index 6df2c889b..25f3d03e6 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/RollingDate/RollingDateConverterTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/RollingDate/RollingDateConverterTest.php
@@ -13,12 +13,11 @@ namespace Services\RollingDate;
 
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
-use DateTime;
-use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RollingDateConverterTest extends TestCase
@@ -63,7 +62,7 @@ final class RollingDateConverterTest extends TestCase
 
     public function testConversionFixedDate()
     {
-        $rollingDate = new RollingDate(RollingDate::T_FIXED_DATE, new DateTimeImmutable('2022-01-01'));
+        $rollingDate = new RollingDate(RollingDate::T_FIXED_DATE, new \DateTimeImmutable('2022-01-01'));
 
         $this->assertEquals(
             '2022-01-01',
@@ -78,7 +77,7 @@ final class RollingDateConverterTest extends TestCase
         $actual = $this->converter->convert($rollingDate);
 
         $this->assertEquals(
-            (int) (new DateTimeImmutable('now'))->format('Y') - 1,
+            (int) (new \DateTimeImmutable('now'))->format('Y') - 1,
             (int) $actual->format('Y')
         );
         $this->assertEquals(1, (int) $actual->format('m'));
@@ -90,11 +89,11 @@ final class RollingDateConverterTest extends TestCase
      */
     public function testConvertOnPivotDate(string $roll, string $expectedDateTime, string $format)
     {
-        $pivot = DateTimeImmutable::createFromFormat('Y-m-d His', '2022-11-07 000000');
+        $pivot = \DateTimeImmutable::createFromFormat('Y-m-d His', '2022-11-07 000000');
         $rollingDate = new RollingDate($roll, null, $pivot);
 
         $this->assertEquals(
-            DateTime::createFromFormat($format, $expectedDateTime),
+            \DateTime::createFromFormat($format, $expectedDateTime),
             $this->converter->convert($rollingDate)
         );
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php b/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
index e79e7cfc3..d4eb8afa8 100644
--- a/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
@@ -20,6 +20,7 @@ use PHPUnit\Framework\TestCase;
  * @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
diff --git a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
index 62bab9973..0fb6ff68c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
@@ -16,13 +16,11 @@ use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Templating\Entity\AddressRender;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AddressRenderTest extends KernelTestCase
@@ -32,7 +30,7 @@ final class AddressRenderTest extends KernelTestCase
         self::bootKernel();
     }
 
-    public function addressDataProviderBEWithBuilding(): Iterator
+    public function addressDataProviderBEWithBuilding(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -52,7 +50,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'Résidence "Les Bleuets" — Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
-    public function addressDataProviderBEWithSteps(): Iterator
+    public function addressDataProviderBEWithSteps(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -72,7 +70,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'esc 4 — Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
-    public function addressDataProviderFRWithBuilding(): Iterator
+    public function addressDataProviderFRWithBuilding(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -92,7 +90,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'Résidence "Les Bleuets" — 5, Rue ABC — 012345 Locality — France'];
     }
 
-    public function addressDataProviderFRWithSteps(): Iterator
+    public function addressDataProviderFRWithSteps(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -112,7 +110,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'esc 4 — 5, Rue ABC — 012345 Locality — France'];
     }
 
-    public function complexAddressDataProviderBE(): Iterator
+    public function complexAddressDataProviderBE(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -136,7 +134,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'Résidence "Les Bleuets" - appart 1 - ét 2 - coul 3 - esc 4 — Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
-    public function complexAddressDataProviderFR(): Iterator
+    public function complexAddressDataProviderFR(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -162,7 +160,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'appart 1 - ét 2 - coul 3 - esc 4 — Résidence "Les Bleuets" — 5, Rue ABC — A droite de la porte — 012345 Locality CEDEX — France'];
     }
 
-    public function noFullAddressDataProviderBE(): Iterator
+    public function noFullAddressDataProviderBE(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -179,7 +177,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, '012345 Locality — Belgium'];
     }
 
-    public function simpleAddressDataProviderBE(): Iterator
+    public function simpleAddressDataProviderBE(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -197,7 +195,7 @@ final class AddressRenderTest extends KernelTestCase
         yield [$addr, 'Rue ABC, 5 — 012345 Locality — Belgium'];
     }
 
-    public function simpleAddressDataProviderFR(): Iterator
+    public function simpleAddressDataProviderFR(): \Iterator
     {
         $addr = new Address();
         $country = (new Country())
@@ -220,7 +218,7 @@ final class AddressRenderTest extends KernelTestCase
      */
     public function testRenderComplexAddressBE(Address $addr, string $expectedString): void
     {
-        $engine = self::$container->get(EngineInterface::class);
+        $engine = self::$container->get(\Twig\Environment::class);
         $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
         $renderer = new AddressRender($engine, $translatableStringHelper);
 
@@ -232,7 +230,7 @@ final class AddressRenderTest extends KernelTestCase
      */
     public function testRenderComplexAddressFR(Address $addr, string $expectedString): void
     {
-        $engine = self::$container->get(EngineInterface::class);
+        $engine = self::$container->get(\Twig\Environment::class);
         $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
         $renderer = new AddressRender($engine, $translatableStringHelper);
 
@@ -244,7 +242,7 @@ final class AddressRenderTest extends KernelTestCase
      */
     public function testRenderNoFullAddressBE(Address $addr, string $expectedString): void
     {
-        $engine = self::$container->get(EngineInterface::class);
+        $engine = self::$container->get(\Twig\Environment::class);
         $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
         $renderer = new AddressRender($engine, $translatableStringHelper);
 
@@ -256,7 +254,7 @@ final class AddressRenderTest extends KernelTestCase
      */
     public function testRenderStringSimpleAddressBE(Address $addr, string $expectedString): void
     {
-        $engine = self::$container->get(EngineInterface::class);
+        $engine = self::$container->get(\Twig\Environment::class);
         $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
         $renderer = new AddressRender($engine, $translatableStringHelper);
 
@@ -268,7 +266,7 @@ final class AddressRenderTest extends KernelTestCase
      */
     public function testRenderStringSimpleAddressFR(Address $addr, string $expectedString): void
     {
-        $engine = self::$container->get(EngineInterface::class);
+        $engine = self::$container->get(\Twig\Environment::class);
         $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
         $renderer = new AddressRender($engine, $translatableStringHelper);
 
@@ -280,7 +278,7 @@ final class AddressRenderTest extends KernelTestCase
      */
     public function testRenderWithBuildingAddressBE(Address $addr, string $expectedString): void
     {
-        $engine = self::$container->get(EngineInterface::class);
+        $engine = self::$container->get(\Twig\Environment::class);
         $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
         $renderer = new AddressRender($engine, $translatableStringHelper);
 
@@ -292,7 +290,7 @@ final class AddressRenderTest extends KernelTestCase
      */
     public function testRenderWithBuildingAddressFR(Address $addr, string $expectedString): void
     {
-        $engine = self::$container->get(EngineInterface::class);
+        $engine = self::$container->get(\Twig\Environment::class);
         $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
         $renderer = new AddressRender($engine, $translatableStringHelper);
 
@@ -304,7 +302,7 @@ final class AddressRenderTest extends KernelTestCase
      */
     public function testRenderWithStepsAddressBE(Address $addr, string $expectedString): void
     {
-        $engine = self::$container->get(EngineInterface::class);
+        $engine = self::$container->get(\Twig\Environment::class);
         $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
         $renderer = new AddressRender($engine, $translatableStringHelper);
 
@@ -316,7 +314,7 @@ final class AddressRenderTest extends KernelTestCase
      */
     public function testRenderWithStepsAddressFR(Address $addr, string $expectedString): void
     {
-        $engine = self::$container->get(EngineInterface::class);
+        $engine = self::$container->get(\Twig\Environment::class);
         $translatableStringHelper = self::$container->get(TranslatableStringHelper::class);
         $renderer = new AddressRender($engine, $translatableStringHelper);
 
diff --git a/src/Bundle/ChillMainBundle/Tests/TestHelper.php b/src/Bundle/ChillMainBundle/Tests/TestHelper.php
index 79426270f..6c144a5fa 100644
--- a/src/Bundle/ChillMainBundle/Tests/TestHelper.php
+++ b/src/Bundle/ChillMainBundle/Tests/TestHelper.php
@@ -21,14 +21,11 @@ class TestHelper
     /**
      * create a client authenticated with an user.
      *
-     * @param mixed $username
-     * @param mixed $password
-     *
-     * @return \Symfony\Component\BrowserKit\Client authenticated client
+     * @return \Symfony\Component\BrowserKit\AbstractBrowser authenticated client
      */
     public static function getAuthenticatedClientOptions(
-        $username = 'center a_social',
-        $password = 'password'
+        mixed $username = 'center a_social',
+        mixed $password = 'password'
     ) {
         return [
             'PHP_AUTH_USER' => $username,
diff --git a/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php b/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
index b44e51f2e..9150c8ea1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
@@ -18,6 +18,7 @@ use PHPUnit\Framework\TestCase;
  * tests for CountriesInfos.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CountriesInfoTest extends TestCase
diff --git a/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php b/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
index d38870f85..e8d95233c 100644
--- a/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
@@ -12,36 +12,34 @@ 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;
 
 /**
  * @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)
+            ->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'
         );
         $this->assertEquals(
-            new DateTime('2010-12-01'),
+            new \DateTime('2010-12-01'),
             $cover->getIntersections()[0][1],
             'assert date end are the intersection'
         );
@@ -53,10 +51,10 @@ final class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover1NoCoveringWithNullDates()
     {
-        $cover = new DateRangeCovering(1, new DateTimeZone('Europe/Brussels'));
+        $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)
+            ->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());
@@ -64,12 +62,12 @@ final class DateRangeCoveringTest extends TestCase
 
     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)
+            ->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());
@@ -79,7 +77,7 @@ final class DateRangeCoveringTest extends TestCase
         $intersections = $cover->getIntersections();
 
         // sort the intersections to compare them in expected order
-        usort($intersections, static function ($a, $b) {
+        \usort($intersections, static function ($a, $b) {
             if ($a[0] === $b[0]) {
                 return $a[1] <=> $b[1];
             }
@@ -89,12 +87,12 @@ final 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'
         );
         $this->assertEquals(
-            new DateTime('2010-12-01'),
+            new \DateTime('2010-12-01'),
             $intersections[0][1],
             'assert date end are the intersection'
         );
@@ -106,12 +104,12 @@ final 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'
         );
         $this->assertEquals(
-            new DateTime('2019-12-01'),
+            new \DateTime('2019-12-01'),
             $intersections[1][1],
             'assert date end are the intersection'
         );
@@ -124,25 +122,25 @@ final 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)
+            ->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'
         );
         $this->assertEquals(
-            new DateTime('2010-09-01'),
+            new \DateTime('2010-09-01'),
             $cover->getIntersections()[0][1],
             'assert date end are the intersection'
         );
@@ -156,14 +154,14 @@ final 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)
+            ->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());
@@ -171,12 +169,12 @@ final class DateRangeCoveringTest extends TestCase
         $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'
         );
         $this->assertEquals(
-            new DateTime('2010-09-15'),
+            new \DateTime('2010-09-15'),
             $cover->getIntersections()[0][1],
             'assert date end are the intersection'
         );
@@ -191,14 +189,14 @@ final 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)
+            ->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());
@@ -206,12 +204,12 @@ final class DateRangeCoveringTest extends TestCase
         $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'
         );
         $this->assertEquals(
-            new DateTime('2010-09-15'),
+            new \DateTime('2010-09-15'),
             $cover->getIntersections()[0][1],
             'assert date end are the intersection'
         );
@@ -220,13 +218,13 @@ final class DateRangeCoveringTest extends TestCase
 
     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)
+            ->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());
diff --git a/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php b/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php
index 8cc190e65..fed7f2dce 100644
--- a/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Workflow/EventSubscriber/NotificationOnTransitionTest.php
@@ -23,19 +23,16 @@ use Prophecy\Argument;
 use Prophecy\Call\Call;
 use Prophecy\Exception\Prediction\FailedPredictionException;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionClass;
-use stdClass;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
 use Symfony\Component\Workflow\WorkflowInterface;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NotificationOnTransitionTest extends TestCase
@@ -51,10 +48,10 @@ final class NotificationOnTransitionTest extends TestCase
         $entityWorkflow = new EntityWorkflow();
         $entityWorkflow
             ->setWorkflowName('workflow_name')
-            ->setRelatedEntityClass(stdClass::class)
+            ->setRelatedEntityClass(\stdClass::class)
             ->setRelatedEntityId(1);
         // force an id to entityWorkflow:
-        $reflection = new ReflectionClass($entityWorkflow);
+        $reflection = new \ReflectionClass($entityWorkflow);
         $id = $reflection->getProperty('id');
         $id->setAccessible(true);
         $id->setValue($entityWorkflow, 1);
@@ -68,7 +65,7 @@ final class NotificationOnTransitionTest extends TestCase
         $em->persist(Argument::type(Notification::class))->should(
             static function ($args) use ($dest) {
                 /** @var Call[] $args */
-                if (1 !== count($args)) {
+                if (1 !== \count($args)) {
                     throw new FailedPredictionException('no notification sent');
                 }
 
@@ -84,7 +81,7 @@ final class NotificationOnTransitionTest extends TestCase
             }
         );
 
-        $engine = $this->prophesize(EngineInterface::class);
+        $engine = $this->prophesize(\Twig\Environment::class);
         $engine->render(Argument::type('string'), Argument::type('array'))
             ->willReturn('dummy text');
 
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
index 20fc1b48c..53d8faa16 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
@@ -11,29 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Timeline;
 
-use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\ResultSetMapping;
-use LogicException;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-
-use function array_key_exists;
-use function is_string;
+use Twig\Environment;
 
 /**
  * Build timeline.
  */
-class TimelineBuilder implements ContainerAwareInterface
+class TimelineBuilder
 {
-    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface
-     */
-    private $em;
-
     /**
      * Record provider.
      *
@@ -41,21 +28,16 @@ class TimelineBuilder implements ContainerAwareInterface
      *
      * @var TimelineProviderInterface[]
      */
-    private $providers = [];
+    private array $providers = [];
 
     /**
      * Record provider and their context.
      *
      * This array has the structure `[ 'context' => [ 'service id' ] ]`
-     *
-     * @var array
      */
-    private $providersByContext = [];
+    private array $providersByContext = [];
 
-    public function __construct(EntityManagerInterface $em)
-    {
-        $this->em = $em;
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly Environment $twig) {}
 
     /**
      * add a provider id.
@@ -63,7 +45,7 @@ class TimelineBuilder implements ContainerAwareInterface
      * @internal This function is called by the TimelineCompilerClass
      *
      * @param string $context the context of the service
-     * @param string $id the
+     * @param string $id      the
      */
     public function addProvider($context, $id, TimelineProviderInterface $provider)
     {
@@ -103,10 +85,9 @@ class TimelineBuilder implements ContainerAwareInterface
      */
     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"'
-                    . ' context', $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" context', $context));
         }
 
         $providers = [];
@@ -126,9 +107,9 @@ class TimelineBuilder implements ContainerAwareInterface
      * @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
+     * @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
      */
@@ -136,8 +117,8 @@ class TimelineBuilder implements ContainerAwareInterface
     {
         [$union, $parameters] = $this->buildUnionQuery($context, $args);
 
-        //add ORDER BY clause and LIMIT
-        $query = $union . sprintf(
+        // add ORDER BY clause and LIMIT
+        $query = $union.sprintf(
             ' ORDER BY date DESC LIMIT %d OFFSET %d',
             $number,
             $firstItem
@@ -168,8 +149,6 @@ class TimelineBuilder implements ContainerAwareInterface
      *
      * return $s;
      * }
-     *
-     * @param mixed $data
      */
 
     /**
@@ -185,15 +164,15 @@ class TimelineBuilder implements ContainerAwareInterface
 
         $sql = sprintf(
             'SELECT %s AS id, '
-                . '%s AS "date", '
-                . "'%s' AS type "
-                . 'FROM %s '
-                . 'WHERE %s',
+                .'%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]
+            \is_string($data['WHERE']) ? $data['WHERE'] : $data['WHERE'][0]
         );
 
         return [$sql, $data['WHERE'][1]];
@@ -204,20 +183,20 @@ class TimelineBuilder implements ContainerAwareInterface
      *
      * @uses self::buildSelectQuery to build individual SELECT queries
      *
-     * @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
+     *
+     * @throws \LogicException if no builder have been defined for this context
      */
     private function buildUnionQuery(string $context, array $args): array
     {
-        //append SELECT queries with UNION keyword between them
+        // append SELECT queries with UNION keyword between them
         $union = '';
         $parameters = [];
 
         foreach ($this->getProvidersByContext($context) as $provider) {
             $data = $provider->fetchQuery($context, $args);
             [$select, $selectParameters] = $this->buildSelectQuery($data);
-            $append = empty($union) ? $select : ' UNION ' . $select;
+            $append = empty($union) ? $select : ' UNION '.$select;
             $union .= $append;
             $parameters = array_merge($parameters, $selectParameters);
         }
@@ -232,23 +211,23 @@ class TimelineBuilder implements ContainerAwareInterface
      */
     private function getEntities(array $queriedIds, $context)
     {
-        //gather entities by type to pass all id with same type to the TimelineProvider.
+        // gather entities by type to pass all id with same type to the TimelineProvider.
         $idsByType = [];
 
         foreach ($queriedIds as $result) {
             $idsByType[$result['type']][] = $result['id'];
         }
 
-        //fetch entities from providers
+        // fetch entities from providers
         $entitiesByType = [];
 
         foreach ($idsByType as $type => $ids) {
-            //iterate providers for current context
+            // iterate providers for current context
             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
+                    break; // we assume that providers have unique keys => we break the loop
                 }
             }
         }
@@ -259,14 +238,13 @@ class TimelineBuilder implements ContainerAwareInterface
     /**
      * get the template data from the provider for the given entity, by type.
      *
-     * @param string $type
-     * @param mixed $entity
-     * @param string $context
+     * @param string  $type
+     * @param string  $context
      * @param mixed[] $args
      *
      * @return array the template data fetched from the provider
      */
-    private function getTemplateData($type, $entity, $context, array $args)
+    private function getTemplateData($type, mixed $entity, $context, array $args)
     {
         foreach ($this->getProvidersByContext($context) as $provider) {
             if ($provider->supportsType($type)) {
@@ -278,32 +256,32 @@ class TimelineBuilder implements ContainerAwareInterface
     /**
      * render the timeline as HTML.
      *
-     * @param string $context
+     * @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
+        // add results to a pretty array
         $timelineEntries = [];
 
         foreach ($fetched as $result) {
             $data = $this->getTemplateData(
                 $result['type'],
-                $entitiesByType[$result['type']][$result['id']], //the entity
+                $entitiesByType[$result['type']][$result['id']], // the entity
                 $context,
                 $args
             );
 
             $timelineEntries[] = [
-                'date' => new DateTime($result['date']),
+                'date' => new \DateTime($result['date']),
                 'template' => $data['template'],
                 'template_data' => $data['template_data'],
             ];
         }
 
-        return $this->container->get('templating')
+        return $this->twig
             ->render('@ChillMain/Timeline/chain_timelines.html.twig', [
                 'results' => $timelineEntries,
             ]);
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
index 2cef728c0..3f9f2889e 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Timeline;
 
-use LogicException;
-
 /**
  * Interface for service providing info to timeline.
  *
@@ -55,10 +53,11 @@ interface TimelineProviderInterface
      * `$context` and `$args` are defined by the bundle which will call the timeline
      * rendering.
      *
-     * @param string $context
-     * @param mixed[] $args the argument to the context.
+     * @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);
@@ -92,7 +91,7 @@ interface TimelineProviderInterface
      *
      * ```
      * array(
-     *    'template'      => 'ChillMyBundle:timeline:template.html.twig',
+     *    'template'      => '@ChillMy/timeline/template.html.twig',
      *    'template_data' => array(
      *             'accompanyingPeriod' => $entity,
      *              'person' => $args['person']
@@ -106,9 +105,9 @@ interface TimelineProviderInterface
      * @param type $entity
      * @param type $context
      *
-     * @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);
 
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
index 6ea51bd75..584e634ea 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
@@ -11,50 +11,22 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Timeline;
 
-use function strtr;
-
 class TimelineSingleQuery
 {
-    private ?string $date;
-
     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,
-        array $parameters = []
-    ) {
-        $this->id = $id;
-        $this->date = $date;
-        $this->key = $key;
-        $this->from = $from;
-        $this->where = $where;
-        $this->parameters = $parameters;
-    }
+    public function __construct(private ?string $id = null, private ?string $date = null, private ?string $key = null, private ?string $from = null, private ?string $where = null, private array $parameters = []) {}
 
     public function buildSql(): string
     {
         $parameters = [];
 
-        return strtr(
+        return \strtr(
             'SELECT {distinct} {id} AS id, '
-                . '{date} AS "date", '
-                . "'{key}' AS type "
-                . 'FROM {from} '
-                . 'WHERE {where}',
+                .'{date} AS "date", '
+                ."'{key}' AS type "
+                .'FROM {from} '
+                .'WHERE {where}',
             [
                 '{distinct}' => $this->distinct ? 'DISTINCT' : '',
                 '{id}' => $this->getId(),
diff --git a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
index 0955303a5..e368913e5 100644
--- a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
+++ b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
@@ -11,10 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Util;
 
-use UnexpectedValueException;
-
-use function array_key_exists;
-
 /**
  * Get information about countries.
  *
@@ -24,7 +20,7 @@ class CountriesInfo
 {
     private static $cacheCountriesCodeByContinent;
 
-    private static $preparedData;
+    private static ?array $preparedData = null;
 
     /**
      * get the information about country in arrays where :.
@@ -69,12 +65,11 @@ class CountriesInfo
     {
         self::prepareCacheCountriesByContinent();
 
-        if (array_key_exists($continent, self::$cacheCountriesCodeByContinent)) {
+        if (\array_key_exists($continent, self::$cacheCountriesCodeByContinent)) {
             return self::$cacheCountriesCodeByContinent[$continent];
         }
 
-        throw new UnexpectedValueException(sprintf('The continent with prefix '
-                    . '%s is unknown.', $continent));
+        throw new \UnexpectedValueException(sprintf('The continent with prefix %s is unknown.', $continent));
     }
 
     public static function getCountriesData()
diff --git a/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php b/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
index 488bb35b7..821c66e4e 100644
--- a/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
+++ b/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
@@ -11,23 +11,6 @@ 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.
  *
@@ -65,31 +48,28 @@ class DateRangeCovering
 
     private array $metadatas = [];
 
-    private int $minCover;
+    private readonly int $minCover;
 
     private array $sequence = [];
 
-    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, private readonly \DateTimeZone $tz)
     {
         if (0 > $minCover) {
-            throw new LogicException('argument minCover cannot be lower than 0');
+            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++;
@@ -98,7 +78,7 @@ class DateRangeCovering
 
         $this->addToSequence($start->getTimestamp(), $k, null);
         $this->addToSequence(
-            null === $end ? PHP_INT_MAX : $end->getTimestamp(),
+            null === $end ? \PHP_INT_MAX : $end->getTimestamp(),
             null,
             $k
         );
@@ -108,7 +88,7 @@ class DateRangeCovering
 
     public function compute(): self
     {
-        ksort($this->sequence);
+        \ksort($this->sequence);
 
         $currentPeriod = [];
         $currents = [];
@@ -116,34 +96,34 @@ 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) {
+            if (\count($currents) > $this->minCover && !$isOpen) {
                 $currentPeriod[0] = $ts;
                 $currentPeriod[2] = $currents;
                 $isOpen = true;
-            } elseif ($isOpen && count($currents) <= $this->minCover) {
+            } elseif ($isOpen && \count($currents) <= $this->minCover) {
                 $currentPeriod[1] = $ts;
                 $overs[] = $currentPeriod;
                 $currentPeriod = [];
                 $isOpen = false;
             } elseif ($isOpen) {
-                $currentPeriod[2] = array_merge($currentPeriod[2], $currents);
+                $currentPeriod[2] = \array_merge($currentPeriod[2], $currents);
             }
         }
 
         // process metadata
         foreach ($overs as [$start, $end, $metadata]) {
             $this->intersections[] = [
-                (new DateTimeImmutable('@' . $start))
+                (new \DateTimeImmutable('@'.$start))
                     ->setTimezone($this->tz),
-                PHP_INT_MAX === $end ? 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))
                     )
                 ),
             ];
@@ -157,8 +137,7 @@ class DateRangeCovering
     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;
@@ -167,16 +146,15 @@ class DateRangeCovering
     public function hasIntersections(): bool
     {
         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 count($this->intersections) > 0;
+        return \count($this->intersections) > 0;
     }
 
-    private function addToSequence($timestamp, ?int $start = null, ?int $end = null)
+    private function addToSequence($timestamp, int $start = null, int $end = null)
     {
-        if (!array_key_exists($timestamp, $this->sequence)) {
+        if (!\array_key_exists($timestamp, $this->sequence)) {
             $this->sequence[$timestamp] = ['s' => [], 'e' => []];
         }
 
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php b/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
index 2acc4a619..a379b9539 100644
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
@@ -21,7 +21,7 @@ class RoleScopeScopePresenceConstraint extends Constraint
     public $messageNullRequired = 'The role "%role%" should not be associated with a scope.';
 
     public $messagePresenceRequired = 'The role "%role%" require to be associated with '
-            . 'a scope.';
+            .'a scope.';
 
     public function getTargets()
     {
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
index 09620d2a9..0bbf1d373 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
@@ -15,56 +15,30 @@ use Chill\MainBundle\Entity\RoleScope;
 use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Validation\Constraint\RoleScopeScopePresenceConstraint;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function in_array;
-
 class RoleScopeScopePresence extends ConstraintValidator
 {
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var RoleProvider
-     */
-    private $roleProvider;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    public function __construct(
-        RoleProvider $roleProvider,
-        LoggerInterface $logger,
-        TranslatorInterface $translator
-    ) {
-        $this->roleProvider = $roleProvider;
-        $this->logger = $logger;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly RoleProvider $roleProvider, private readonly LoggerInterface $logger, private readonly TranslatorInterface $translator) {}
 
     public function validate($value, Constraint $constraint)
     {
         if (!$value instanceof RoleScope) {
-            throw new RuntimeException('The validated object is not an instance of 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');
+            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 the role scope should have a scope
         if (
-            !in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
-            && $value->getScope() === null
+            !\in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
+            && null === $value->getScope()
         ) {
             $this->context->buildViolation($constraint->messagePresenceRequired)
                 ->setParameter('%role%', $this->translator->trans($value->getRole()))
@@ -72,7 +46,7 @@ class RoleScopeScopePresence extends ConstraintValidator
             $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(), true)
+            \in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
             && null !== $value->getScope()
         ) {
             $this->context->buildViolation($constraint->messageNullRequired)
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php b/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
index 203f21703..a5a16cee0 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
@@ -15,7 +15,6 @@ 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
 {
@@ -32,16 +31,15 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
     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) {
+        if (null !== $value->getId()) {
             $countUsersByUsername = $this->em->createQuery(
                 sprintf(
                     'SELECT COUNT(u) FROM %s u '
-                    . 'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) '
-                    . 'AND u != :user',
+                    .'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) '
+                    .'AND u != :user',
                     User::class
                 )
             )
@@ -52,7 +50,7 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
             $countUsersByUsername = $this->em->createQuery(
                 sprintf(
                     'SELECT COUNT(u) FROM %s u '
-                    . 'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ',
+                    .'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ',
                     User::class
                 )
             )
@@ -70,12 +68,12 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
                 ->addViolation();
         }
 
-        if ($value->getId() !== null) {
+        if (null !== $value->getId()) {
             $countUsersByEmail = $this->em->createQuery(
                 sprintf(
                     'SELECT COUNT(u) FROM %s u '
-                    . 'WHERE u.emailCanonical = LOWER(UNACCENT(:email)) '
-                    . 'AND u != :user',
+                    .'WHERE u.emailCanonical = LOWER(UNACCENT(:email)) '
+                    .'AND u != :user',
                     User::class
                 )
             )
@@ -86,7 +84,7 @@ class UserUniqueEmailAndUsername extends ConstraintValidator
             $countUsersByEmail = $this->em->createQuery(
                 sprintf(
                     'SELECT COUNT(u) FROM %s u '
-                    . 'WHERE u.emailCanonical = LOWER(UNACCENT(:email))',
+                    .'WHERE u.emailCanonical = LOWER(UNACCENT(:email))',
                     User::class
                 )
             )
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
index 9305cbf09..0c02885ad 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
@@ -12,27 +12,16 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Validation\Validator;
 
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
 final class ValidPhonenumber extends ConstraintValidator
 {
-    private LoggerInterface $logger;
-
-    private PhoneNumberHelperInterface $phonenumberHelper;
-
-    public function __construct(
-        LoggerInterface $logger,
-        PhoneNumberHelperInterface $phonenumberHelper
-    ) {
-        $this->phonenumberHelper = $phonenumberHelper;
-        $this->logger = $logger;
-    }
+    public function __construct(private readonly LoggerInterface $logger, private readonly PhoneNumberHelperInterface $phonenumberHelper) {}
 
     /**
-     * @param string $value
+     * @param string                                                        $value
      * @param \Chill\MainBundle\Validation\Constraint\PhonenumberConstraint $constraint
      */
     public function validate($value, Constraint $constraint)
@@ -67,8 +56,7 @@ final class ValidPhonenumber extends ConstraintValidator
                 break;
 
             default:
-                throw new LogicException(sprintf("This type '%s' is not implemented. "
-                    . "Possible values are 'mobile', 'landline' or 'any'", $constraint->type));
+                throw new \LogicException(sprintf("This type '%s' is not implemented. Possible values are 'mobile', 'landline' or 'any'", $constraint->type));
         }
 
         if (false === $isValid) {
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
index 6955132d7..a18af30d4 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
@@ -15,8 +15,6 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
-use function call_user_func;
-
 class UserCircleConsistencyValidator extends ConstraintValidator
 {
     /**
@@ -30,13 +28,13 @@ class UserCircleConsistencyValidator extends ConstraintValidator
     }
 
     /**
-     * @param object $value
+     * @param object                $value
      * @param UserCircleConsistency $constraint
      */
     public function validate($value, Constraint $constraint)
     {
         /** @var \Chill\MainBundle\Entity\User $user */
-        $user = call_user_func([$value, $constraint->getUserFunction]);
+        $user = \call_user_func([$value, $constraint->getUserFunction]);
 
         if (null === $user) {
             return;
diff --git a/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php b/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
index 5340ac78b..a1b631265 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Counter/WorkflowByUserCounter.php
@@ -20,17 +20,9 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Workflow\Event\Event;
 
-final class WorkflowByUserCounter implements NotificationCounterInterface, EventSubscriberInterface
+final readonly class WorkflowByUserCounter implements NotificationCounterInterface, EventSubscriberInterface
 {
-    private CacheItemPoolInterface $cacheItemPool;
-
-    private EntityWorkflowStepRepository $workflowStepRepository;
-
-    public function __construct(EntityWorkflowStepRepository $workflowStepRepository, CacheItemPoolInterface $cacheItemPool)
-    {
-        $this->workflowStepRepository = $workflowStepRepository;
-        $this->cacheItemPool = $cacheItemPool;
-    }
+    public function __construct(private EntityWorkflowStepRepository $workflowStepRepository, private CacheItemPoolInterface $cacheItemPool) {}
 
     public function addNotification(UserInterface $u): int
     {
@@ -56,7 +48,7 @@ final class WorkflowByUserCounter implements NotificationCounterInterface, Event
 
     public static function generateCacheKeyWorkflowByUser(User $user): string
     {
-        return 'chill_main_workflow_by_u_' . $user->getId();
+        return 'chill_main_workflow_by_u_'.$user->getId();
     }
 
     public function getCountUnreadByUser(User $user): int
diff --git a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php
index 5be5f3fd9..9a1f52280 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EntityWorkflowManager.php
@@ -18,17 +18,9 @@ use Symfony\Component\Workflow\Registry;
 class EntityWorkflowManager
 {
     /**
-     * @var iterable|EntityWorkflowHandlerInterface[]
+     * @param \Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface[] $handlers
      */
-    private iterable $handlers;
-
-    private Registry $registry;
-
-    public function __construct(iterable $handlers, Registry $registry)
-    {
-        $this->handlers = $handlers;
-        $this->registry = $registry;
-    }
+    public function __construct(private readonly iterable $handlers, private readonly Registry $registry) {}
 
     public function getHandler(EntityWorkflow $entityWorkflow, array $options = []): EntityWorkflowHandlerInterface
     {
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
index 192ca0712..b1fa80458 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
@@ -14,32 +14,16 @@ namespace Chill\MainBundle\Workflow\EventSubscriber;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use DateTimeImmutable;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Event\GuardEvent;
 use Symfony\Component\Workflow\TransitionBlocker;
-use function array_key_exists;
 
 class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterface
 {
-    private LoggerInterface $chillLogger;
-
-    private Security $security;
-
-    private UserRender $userRender;
-
-    public function __construct(
-        LoggerInterface $chillLogger,
-        Security $security,
-        UserRender $userRender
-    ) {
-        $this->chillLogger = $chillLogger;
-        $this->security = $security;
-        $this->userRender = $userRender;
-    }
+    public function __construct(private readonly LoggerInterface $chillLogger, private readonly Security $security, private readonly UserRender $userRender) {}
 
     public function addDests(Event $event): void
     {
@@ -105,9 +89,7 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
                     [
                         '%users%' => implode(
                             ', ',
-                            $entityWorkflow->getCurrentStep()->getAllDestUser()->map(function (User $u) {
-                                return $this->userRender->renderString($u, []);
-                            })->toArray()
+                            $entityWorkflow->getCurrentStep()->getAllDestUser()->map(fn (User $u) => $this->userRender->renderString($u, []))->toArray()
                         ),
                     ]
                 ));
@@ -128,7 +110,7 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
         $placeMetadata = $event->getWorkflow()->getMetadataStore()
             ->getPlaceMetadata($step->getCurrentStep());
 
-        if (array_key_exists('isFinal', $placeMetadata) && true === $placeMetadata['isFinal']) {
+        if (\array_key_exists('isFinal', $placeMetadata) && true === $placeMetadata['isFinal']) {
             $step->setIsFinal(true);
         }
     }
@@ -145,7 +127,7 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
 
         $step
             ->setTransitionAfter($event->getTransition()->getName())
-            ->setTransitionAt(new DateTimeImmutable('now'))
+            ->setTransitionAt(new \DateTimeImmutable('now'))
             ->setTransitionBy($this->security->getUser());
 
         $this->chillLogger->info('[workflow] apply transition on entityWorkflow', [
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
index f02341ff7..e290a567e 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
@@ -18,36 +18,12 @@ use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Registry;
-use function in_array;
 
 class NotificationOnTransition implements EventSubscriberInterface
 {
-    private EngineInterface $engine;
-
-    private EntityManagerInterface $entityManager;
-
-    private MetadataExtractor $metadataExtractor;
-
-    private Registry $registry;
-
-    private Security $security;
-
-    public function __construct(
-        EntityManagerInterface $entityManager,
-        EngineInterface $engine,
-        MetadataExtractor $metadataExtractor,
-        Security $security,
-        Registry $registry
-    ) {
-        $this->entityManager = $entityManager;
-        $this->engine = $engine;
-        $this->metadataExtractor = $metadataExtractor;
-        $this->registry = $registry;
-        $this->security = $security;
-    }
+    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly \Twig\Environment $engine, private readonly MetadataExtractor $metadataExtractor, private readonly Security $security, private readonly Registry $registry) {}
 
     public static function getSubscribedEvents(): array
     {
@@ -109,9 +85,7 @@ class NotificationOnTransition implements EventSubscriberInterface
                 'dest' => $subscriber,
                 'place' => $place,
                 'workflow' => $workflow,
-                'is_dest' => in_array($subscriber->getId(), array_map(static function (User $u) {
-                    return $u->getId();
-                }, $entityWorkflow->futureDestUsers), true),
+                'is_dest' => \in_array($subscriber->getId(), array_map(static fn (User $u) => $u->getId(), $entityWorkflow->futureDestUsers), true),
             ];
 
             $notification = new Notification();
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php
index 7d0ad8280..90a6e19db 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/SendAccessKeyEventSubscriber.php
@@ -16,29 +16,11 @@ use Chill\MainBundle\Workflow\EntityWorkflowManager;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mime\Email;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Workflow\Registry;
 
 class SendAccessKeyEventSubscriber
 {
-    private EngineInterface $engine;
-
-    private EntityWorkflowManager $entityWorkflowManager;
-
-    private MailerInterface $mailer;
-
-    private MetadataExtractor $metadataExtractor;
-
-    private Registry $registry;
-
-    public function __construct(EngineInterface $engine, MetadataExtractor $metadataExtractor, Registry $registry, EntityWorkflowManager $entityWorkflowManager, MailerInterface $mailer)
-    {
-        $this->engine = $engine;
-        $this->metadataExtractor = $metadataExtractor;
-        $this->registry = $registry;
-        $this->entityWorkflowManager = $entityWorkflowManager;
-        $this->mailer = $mailer;
-    }
+    public function __construct(private readonly \Twig\Environment $engine, private readonly MetadataExtractor $metadataExtractor, private readonly Registry $registry, private readonly EntityWorkflowManager $entityWorkflowManager, private readonly MailerInterface $mailer) {}
 
     public function postPersist(EntityWorkflowStep $step): void
     {
diff --git a/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php b/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php
index ab3d2c98c..9d91b3357 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Exception/HandlerNotFoundException.php
@@ -11,8 +11,4 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Workflow\Exception;
 
-use RuntimeException;
-
-class HandlerNotFoundException extends RuntimeException
-{
-}
+class HandlerNotFoundException extends \RuntimeException {}
diff --git a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
index 071b31d35..dabe0cf8e 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
@@ -16,19 +16,10 @@ use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\WorkflowInterface;
-use function array_key_exists;
 
 class MetadataExtractor
 {
-    private Registry $registry;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(Registry $registry, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->registry = $registry;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly Registry $registry, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function availableWorkflowFor(string $relatedEntityClass, ?int $relatedEntityId = 0): array
     {
@@ -43,7 +34,7 @@ class MetadataExtractor
 
         foreach ($workflows as $workflow) {
             $metadata = $workflow->getMetadataStore()->getWorkflowMetadata();
-            $text = array_key_exists('label', $metadata) ?
+            $text = \array_key_exists('label', $metadata) ?
                 $this->translatableStringHelper->localize($metadata['label']) : $workflow->getName();
 
             $workflowsList[] = ['name' => $workflow->getName(), 'text' => $text];
@@ -52,14 +43,14 @@ class MetadataExtractor
         return $workflowsList;
     }
 
-    public function buildArrayPresentationForPlace(EntityWorkflow $entityWorkflow, ?EntityWorkflowStep $step = null): array
+    public function buildArrayPresentationForPlace(EntityWorkflow $entityWorkflow, EntityWorkflowStep $step = null): array
     {
         $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
         $step ??= $entityWorkflow->getCurrentStep();
 
         $markingMetadata = $workflow->getMetadataStore()->getPlaceMetadata($step->getCurrentStep());
 
-        $text = array_key_exists('label', $markingMetadata) ?
+        $text = \array_key_exists('label', $markingMetadata) ?
             $this->translatableStringHelper->localize($markingMetadata['label']) : $step->getCurrentStep();
 
         return ['name' => $step->getCurrentStep(), 'text' => $text];
@@ -76,7 +67,7 @@ class MetadataExtractor
 
                 return [
                     'name' => $transition->getName(),
-                    'text' => array_key_exists('label', $metadata) ?
+                    'text' => \array_key_exists('label', $metadata) ?
                         $this->translatableStringHelper->localize($metadata['label']) : $transition->getName(),
                     'isForward' => $metadata['isForward'] ?? null,
                 ];
@@ -89,7 +80,7 @@ class MetadataExtractor
     public function buildArrayPresentationForWorkflow(WorkflowInterface $workflow): array
     {
         $metadata = $workflow->getMetadataStore()->getWorkflowMetadata();
-        $text = array_key_exists('label', $metadata) ?
+        $text = \array_key_exists('label', $metadata) ?
             $this->translatableStringHelper->localize($metadata['label']) : $workflow->getName();
 
         return ['name' => $workflow->getName(), 'text' => $text];
diff --git a/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php b/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php
index d3e848d41..c9ba7cf79 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Notification/WorkflowNotificationHandler.php
@@ -20,21 +20,7 @@ use Symfony\Component\Security\Core\Security;
 
 class WorkflowNotificationHandler implements NotificationHandlerInterface
 {
-    private EntityWorkflowManager $entityWorkflowManager;
-
-    private EntityWorkflowRepository $entityWorkflowRepository;
-
-    private Security $security;
-
-    public function __construct(
-        EntityWorkflowRepository $entityWorkflowRepository,
-        EntityWorkflowManager $entityWorkflowManager,
-        Security $security
-    ) {
-        $this->entityWorkflowRepository = $entityWorkflowRepository;
-        $this->entityWorkflowManager = $entityWorkflowManager;
-        $this->security = $security;
-    }
+    public function __construct(private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly EntityWorkflowManager $entityWorkflowManager, private readonly Security $security) {}
 
     public function getTemplate(Notification $notification, array $options = []): string
     {
@@ -44,6 +30,7 @@ class WorkflowNotificationHandler implements NotificationHandlerInterface
     public function getTemplateData(Notification $notification, array $options = []): array
     {
         $entityWorkflow = $this->entityWorkflowRepository->find($notification->getRelatedEntityId());
+
         return [
             'entity_workflow' => $entityWorkflow,
             'handler' => $this->entityWorkflowManager->getHandler($entityWorkflow),
@@ -55,7 +42,7 @@ class WorkflowNotificationHandler implements NotificationHandlerInterface
     {
         $notificationCc = false;
 
-        if ($notification->getRelatedEntityClass() === EntityWorkflow::class) {
+        if (EntityWorkflow::class === $notification->getRelatedEntityClass()) {
             $relatedEntity = $this->entityWorkflowRepository->findOneBy(['id' => $notification->getRelatedEntityId()]);
 
             if ($relatedEntity->getCurrentStepCreatedBy() !== $this->security->getUser()) {
@@ -68,6 +55,6 @@ class WorkflowNotificationHandler implements NotificationHandlerInterface
 
     public function supports(Notification $notification, array $options = []): bool
     {
-        return $notification->getRelatedEntityClass() === EntityWorkflow::class;
+        return EntityWorkflow::class === $notification->getRelatedEntityClass();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php b/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php
index 700f06a4d..966b3317a 100644
--- a/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php
+++ b/src/Bundle/ChillMainBundle/Workflow/RelatedEntityWorkflowSupportsStrategy.php
@@ -23,8 +23,7 @@ class RelatedEntityWorkflowSupportsStrategy implements WorkflowSupportStrategyIn
             return false;
         }
 
-        foreach ($workflow->getMetadataStore()->getWorkflowMetadata()['related_entity']
-                 as $relatedEntityClass) {
+        foreach ($workflow->getMetadataStore()->getWorkflowMetadata()['related_entity'] as $relatedEntityClass) {
             if ($subject->getRelatedEntityClass() === $relatedEntityClass) {
                 return true;
             }
diff --git a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
index 1ea593b6d..f2b7d80db 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
@@ -23,29 +23,7 @@ use Twig\Extension\RuntimeExtensionInterface;
 
 class WorkflowTwigExtensionRuntime implements RuntimeExtensionInterface
 {
-    private EntityWorkflowManager $entityWorkflowManager;
-
-    private MetadataExtractor $metadataExtractor;
-
-    private NormalizerInterface $normalizer;
-
-    private Registry $registry;
-
-    private EntityWorkflowRepository $repository;
-
-    public function __construct(
-        EntityWorkflowManager $entityWorkflowManager,
-        Registry $registry,
-        EntityWorkflowRepository $repository,
-        MetadataExtractor $metadataExtractor,
-        NormalizerInterface $normalizer
-    ) {
-        $this->entityWorkflowManager = $entityWorkflowManager;
-        $this->registry = $registry;
-        $this->repository = $repository;
-        $this->metadataExtractor = $metadataExtractor;
-        $this->normalizer = $normalizer;
-    }
+    public function __construct(private readonly EntityWorkflowManager $entityWorkflowManager, private readonly Registry $registry, private readonly EntityWorkflowRepository $repository, private readonly MetadataExtractor $metadataExtractor, private readonly NormalizerInterface $normalizer) {}
 
     public function getTransitionByString(EntityWorkflow $entityWorkflow, string $key): ?Transition
     {
diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
index 0c8d1c72f..2020c7b52 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
@@ -18,20 +18,13 @@ use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Component\Workflow\WorkflowInterface;
-use function count;
 
 class EntityWorkflowCreationValidator extends \Symfony\Component\Validator\ConstraintValidator
 {
-    private EntityWorkflowManager $entityWorkflowManager;
-
-    public function __construct(EntityWorkflowManager $entityWorkflowManager)
-    {
-        $this->entityWorkflowManager = $entityWorkflowManager;
-    }
+    public function __construct(private readonly EntityWorkflowManager $entityWorkflowManager) {}
 
     /**
      * @param EntityWorkflow $value
-     * @param Constraint|EntityWorkflowCreation $constraint
      */
     public function validate($value, Constraint $constraint)
     {
@@ -45,7 +38,7 @@ class EntityWorkflowCreationValidator extends \Symfony\Component\Validator\Const
 
         try {
             $handler = $this->entityWorkflowManager->getHandler($value);
-        } catch (HandlerNotFoundException $e) {
+        } catch (HandlerNotFoundException) {
             $this->context->buildViolation($constraint->messageHandlerNotFound)
                 ->addViolation();
 
@@ -59,11 +52,9 @@ class EntityWorkflowCreationValidator extends \Symfony\Component\Validator\Const
 
         $workflows = $this->entityWorkflowManager->getSupportedWorkflows($value);
 
-        $matched = array_filter($workflows, static function (WorkflowInterface $workflow) use ($value) {
-            return $workflow->getName() === $value->getWorkflowName();
-        });
+        $matched = array_filter($workflows, static fn (WorkflowInterface $workflow) => $workflow->getName() === $value->getWorkflowName());
 
-        if (0 === count($matched)) {
+        if (0 === \count($matched)) {
             $this->context->buildViolation($constraint->messageWorkflowNotAvailable)
                 ->addViolation();
         }
diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
index 2c286fff9..37543aa6e 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
@@ -16,13 +16,11 @@ 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;
 
 class StepDestValidValidator extends ConstraintValidator
 {
     /**
      * @param EntityWorkflowStep $value
-     * @param Constraint|StepDestValid $constraint
      *
      * @return void
      */
@@ -36,12 +34,12 @@ class StepDestValidValidator extends ConstraintValidator
             throw new UnexpectedValueException($value, EntityWorkflowStep::class);
         }
 
-        if ($value->isFinal() && 0 < count($value->getDestUser())) {
+        if ($value->isFinal() && 0 < \count($value->getDestUser())) {
             $this->context->buildViolation($constraint->messageDestNotAllowed)
                 ->addViolation();
         }
 
-        if (!$value->isFinal() && 0 === count($value->getDestUser())) {
+        if (!$value->isFinal() && 0 === \count($value->getDestUser())) {
             $this->context->buildViolation($constraint->messageRequireDest)
                 ->addViolation();
         }
diff --git a/src/Bundle/ChillMainBundle/config/routes.yaml b/src/Bundle/ChillMainBundle/config/routes.yaml
index d25f2aaff..a0743359b 100644
--- a/src/Bundle/ChillMainBundle/config/routes.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes.yaml
@@ -2,38 +2,6 @@ chill_main_controllers:
     resource: '../Controller/'
     type: annotation
 
-chill_main_admin_permissionsgroup:
-    resource: "@ChillMainBundle/config/routes/permissionsgroup.yaml"
-    prefix:   "{_locale}/admin/permissionsgroup"
-
-chill_main_admin_scope:
-    resource: "@ChillMainBundle/config/routes/scope.yaml"
-    prefix:   "{_locale}/admin/scope"
-
-chill_main_admin:
-    resource: "@ChillMainBundle/config/routes/center.yaml"
-    prefix:   "{_locale}/admin/center"
-
-chill_main_exports:
-    resource: "@ChillMainBundle/config/routes/exports.yaml"
-    prefix:   "{_locale}/exports"
-
-chill_postal_code:
-    resource: "@ChillMainBundle/config/routes/postal-code.yaml"
-    prefix:   "{_locale}/postal-code"
-
-chill_password:
-    resource: "@ChillMainBundle/config/routes/password.yaml"
-    prefix: "{_locale}/password"
-
-chill_password_recover:
-    resource: "@ChillMainBundle/config/routes/password_recover.yaml"
-    prefix: "public/{_locale}/password"
-
-chill_main_notification:
-    resource: "@ChillMainBundle/config/routes/notification.yaml"
-    prefix:   "{_locale}/notification"
-
 chill_crud:
     resource: "@ChillMainBundle"
     type: CRUD
@@ -45,50 +13,6 @@ root:
        path: /homepage
        permanent: false
 
-chill_main_homepage_without_locale:
-    path:  /homepage
-    controller: Chill\MainBundle\Controller\DefaultController::indexWithoutLocaleAction
-
-chill_main_homepage:
-    path:  /{_locale}/homepage
-    controller: Chill\MainBundle\Controller\DefaultController::indexAction
-
-# chill_main_admin_central:
-#     path: /{_locale}/admin
-#     controller: Chill\MainBundle\Controller\AdminController::indexAction
-#     options:
-#         menus:
-#             admin_permissions:
-#                 order: 0
-#                 label: Main admin menu
-#
-
-chill_main_search:
-    path: /{_locale}/search.{_format}
-    controller: Chill\MainBundle\Controller\SearchController::searchAction
-    format: 'html'   # sf4 check
-    requirements:
-        _format: html|json
-
-chill_main_search_global:
-    path: '/api/1.0/search.{_format}'
-    controller: Chill\MainBundle\Controller\SearchController::searchApi
-    format: 'json'
-    requirements:
-        _format: 'json'
-
-chill_main_advanced_search:
-    path: /{_locale}/search/advanced/{name}
-    controller: Chill\MainBundle\Controller\SearchController::advancedSearchAction
-
-chill_main_advanced_search_list:
-    path: /{_locale}/search/advanced
-    controller: Chill\MainBundle\Controller\SearchController::advancedSearchListAction
-
-login:
-    path:     /login
-    controller: Chill\MainBundle\Controller\LoginController::loginAction
-
 login_check:
     path:    /login_check
 
diff --git a/src/Bundle/ChillMainBundle/config/routes/center.yaml b/src/Bundle/ChillMainBundle/config/routes/center.yaml
deleted file mode 100644
index c0bef7695..000000000
--- a/src/Bundle/ChillMainBundle/config/routes/center.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-admin_center:
-    path:     /
-    controller: Chill\MainBundle\Controller\CenterController::indexAction
-
-admin_center_new:
-    path:     /new
-    controller: Chill\MainBundle\Controller\CenterController::newAction
-
-admin_center_create:
-    path:     /create
-    controller: Chill\MainBundle\Controller\CenterController::createAction
-    methods:  POST
-
-admin_center_edit:
-    path:     /{id}/edit
-    controller: Chill\MainBundle\Controller\CenterController::editAction
-
-admin_center_update:
-    path:     /{id}/update
-    controller: Chill\MainBundle\Controller\CenterController::updateAction
-    methods:  [POST, PUT]
diff --git a/src/Bundle/ChillMainBundle/config/routes/exports.yaml b/src/Bundle/ChillMainBundle/config/routes/exports.yaml
deleted file mode 100644
index 2c3d65f2d..000000000
--- a/src/Bundle/ChillMainBundle/config/routes/exports.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-chill_main_export_index:
-    path: /
-    controller: Chill\MainBundle\Controller\ExportController::indexAction
-                
-chill_main_export_new:
-    path: /new/{alias}
-    controller: Chill\MainBundle\Controller\ExportController::newAction
-    
-chill_main_export_generate:
-    path: /generate/{alias}
-    controller: Chill\MainBundle\Controller\ExportController::generateAction
-    methods: [GET]
-
-chill_main_export_download:
-    path: /download/{alias}
-    controller: Chill\MainBundle\Controller\ExportController::downloadResultAction
-    methods: [ GET ]
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/config/routes/password.yaml b/src/Bundle/ChillMainBundle/config/routes/password.yaml
deleted file mode 100644
index 7a8f07e68..000000000
--- a/src/Bundle/ChillMainBundle/config/routes/password.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-change_my_password:
-    path:     /edit
-    controller: Chill\MainBundle\Controller\PasswordController::userPasswordAction
-    
diff --git a/src/Bundle/ChillMainBundle/config/routes/password_recover.yaml b/src/Bundle/ChillMainBundle/config/routes/password_recover.yaml
deleted file mode 100644
index e2ecfdc6d..000000000
--- a/src/Bundle/ChillMainBundle/config/routes/password_recover.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-password_recover:
-    path:     /recover
-    controller: Chill\MainBundle\Controller\PasswordController::recoverAction
-    
-password_request_recover:
-    path:     /request-recover
-    controller: Chill\MainBundle\Controller\PasswordController::requestRecoverAction
-    
-password_request_recover_confirm:
-    path:     /request-confirm
-    controller: Chill\MainBundle\Controller\PasswordController::requestRecoverConfirmAction
-    
-password_request_recover_changed:
-    path:     /request-changed
-    controller: Chill\MainBundle\Controller\PasswordController::changeConfirmedAction
diff --git a/src/Bundle/ChillMainBundle/config/routes/permissionsgroup.yaml b/src/Bundle/ChillMainBundle/config/routes/permissionsgroup.yaml
deleted file mode 100644
index 56f3a7569..000000000
--- a/src/Bundle/ChillMainBundle/config/routes/permissionsgroup.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-admin_permissionsgroup:
-    path:     /
-    controller: Chill\MainBundle\Controller\PermissionsGroupController::indexAction
-
-admin_permissionsgroup_show:
-    path:     /{id}/show
-    controller: Chill\MainBundle\Controller\PermissionsGroupController::showAction
-
-admin_permissionsgroup_new:
-    path:     /new
-    controller: Chill\MainBundle\Controller\PermissionsGroupController::newAction
-
-admin_permissionsgroup_create:
-    path:     /create
-    controller: Chill\MainBundle\Controller\PermissionsGroupController::createAction
-    methods:  POST
-
-admin_permissionsgroup_edit:
-    path:     /{id}/edit
-    controller: Chill\MainBundle\Controller\PermissionsGroupController::editAction
-
-admin_permissionsgroup_update:
-    path:     /{id}/update
-    controller: Chill\MainBundle\Controller\PermissionsGroupController::updateAction
-    methods:  [POST, PUT]
-
-admin_permissionsgroup_delete_role_scope:
-    path:     /{pgid}/delete_link_role_scope/{rsid}
-    controller: Chill\MainBundle\Controller\PermissionsGroupController::deleteLinkRoleScopeAction
-    methods: [DELETE]
-
-admin_permissionsgroup_add_role_scope:
-    path:     /{id}/add_link_role_scope
-    controller: Chill\MainBundle\Controller\PermissionsGroupController::addLinkRoleScopeAction
-    methods: [PUT]
diff --git a/src/Bundle/ChillMainBundle/config/routes/postal-code.yaml b/src/Bundle/ChillMainBundle/config/routes/postal-code.yaml
deleted file mode 100644
index 19d8fb37d..000000000
--- a/src/Bundle/ChillMainBundle/config/routes/postal-code.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-chill_main_postal_code_search:
-    path: /search
-    controller: Chill\MainBundle\Controller\PostalCodeController::searchAction
-    
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/config/routes/scope.yaml b/src/Bundle/ChillMainBundle/config/routes/scope.yaml
deleted file mode 100644
index 167aa401c..000000000
--- a/src/Bundle/ChillMainBundle/config/routes/scope.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-admin_scope:
-    path:     /
-    controller: Chill\MainBundle\Controller\ScopeController::indexAction
-
-admin_scope_new:
-    path:     /new
-    controller: Chill\MainBundle\Controller\ScopeController::newAction
-
-admin_scope_create:
-    path:     /create
-    controller: Chill\MainBundle\Controller\ScopeController::createAction
-    methods:  POST
-
-admin_scope_edit:
-    path:     /{id}/edit
-    controller: Chill\MainBundle\Controller\ScopeController::editAction
-
-admin_scope_update:
-    path:     /{id}/update
-    controller: Chill\MainBundle\Controller\ScopeController::updateAction
-    methods:  [POST, PUT]
diff --git a/src/Bundle/ChillMainBundle/config/services.yaml b/src/Bundle/ChillMainBundle/config/services.yaml
index 0dae1f853..47c96d291 100644
--- a/src/Bundle/ChillMainBundle/config/services.yaml
+++ b/src/Bundle/ChillMainBundle/config/services.yaml
@@ -1,6 +1,9 @@
 parameters:
 #    cl_chill_main.example.class: Chill\MainBundle\Example
 
+imports:
+    - ./services/clock.yaml
+
 services:
     _defaults:
         autowire: true
@@ -136,3 +139,7 @@ services:
         lazy: true
         arguments:
             $jobs: !tagged_iterator chill_main.cron_job
+
+    Chill\MainBundle\Service\EntityInfo\ViewEntityInfoManager:
+        arguments:
+            $vienEntityInfoProviders: !tagged_iterator chill_main.entity_info_provider
diff --git a/src/Bundle/ChillMainBundle/config/services/clock.yaml b/src/Bundle/ChillMainBundle/config/services/clock.yaml
new file mode 100644
index 000000000..0629cd869
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/config/services/clock.yaml
@@ -0,0 +1,4 @@
+# temporary, waiting for symfony 6.0 to load clock
+services:
+    Symfony\Component\Clock\NativeClock: ~
+    Symfony\Component\Clock\ClockInterface: '@Symfony\Component\Clock\NativeClock'
diff --git a/src/Bundle/ChillMainBundle/config/services/command.yaml b/src/Bundle/ChillMainBundle/config/services/command.yaml
index f9a863f10..29d6d4bf1 100644
--- a/src/Bundle/ChillMainBundle/config/services/command.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/command.yaml
@@ -12,7 +12,7 @@ services:
             $logger: '@Psr\Log\LoggerInterface'
             $em: '@Doctrine\ORM\EntityManagerInterface'
             $recoverPasswordHelper: '@Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper'
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $eventDispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
         tags:
             - { name: console.command }
 
@@ -67,3 +67,7 @@ services:
         autowire: true
         tags:
             - {name: console.command }
+
+    Chill\MainBundle\Command\SynchronizeEntityInfoViewsCommand:
+        tags:
+            - {name: console.command}
diff --git a/src/Bundle/ChillMainBundle/config/services/controller.yaml b/src/Bundle/ChillMainBundle/config/services/controller.yaml
index 16c545a81..428147961 100644
--- a/src/Bundle/ChillMainBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/controller.yaml
@@ -37,3 +37,6 @@ services:
     Chill\MainBundle\Controller\RegroupmentController:
         autowire: true
         autoconfigure: true
+
+    Chill\MainBundle\Controller\UserExportController:
+        tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillMainBundle/config/services/export.yaml b/src/Bundle/ChillMainBundle/config/services/export.yaml
index ea7328839..6bae6f9c0 100644
--- a/src/Bundle/ChillMainBundle/config/services/export.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/export.yaml
@@ -6,6 +6,8 @@ services:
     Chill\MainBundle\Export\Helper\:
         resource: '../../Export/Helper'
 
+    Chill\MainBundle\Export\ExportFormHelper: ~
+
     chill.main.export_element_validator:
         class: Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraintValidator
         tags:
@@ -50,3 +52,5 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csv_pivoted_list' }
+
+    Chill\MainBundle\Export\AccompanyingCourseExportHelper: ~
diff --git a/src/Bundle/ChillMainBundle/config/services/timeline.yaml b/src/Bundle/ChillMainBundle/config/services/timeline.yaml
index 7b7987f5a..96feac5cd 100644
--- a/src/Bundle/ChillMainBundle/config/services/timeline.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/timeline.yaml
@@ -5,10 +5,6 @@ services:
 
     chill_main.timeline_builder:
         class: Chill\MainBundle\Timeline\TimelineBuilder
-        arguments:
-            - "@doctrine.orm.entity_manager"
-        calls:
-            - [ setContainer, ["@service_container"]]
     # alias:
     Chill\MainBundle\Timeline\TimelineBuilder: '@chill_main.timeline_builder'
 
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php b/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php
index 5ae675b51..55f5a6420 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php
@@ -16,9 +16,7 @@ use Doctrine\Migrations\AbstractMigration;
 
 class Version20100000000000 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-    }
+    public function down(Schema $schema): void {}
 
     public function up(Schema $schema): void
     {
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
index 0c8b32978..e7672a7e1 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
@@ -13,132 +13,27 @@ namespace Chill\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
-use Doctrine\ORM\Query\ResultSetMapping;
-use RuntimeException;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-use function count;
 
 /**
  * Migrate association from
  *     ManyToMany between PermissionGroup <-> GroupCenter
  * to
  *     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
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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
-        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();
-
-            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 = ?',
-                    [
-                        $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', [
-                    '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 . ' '
-                        . 'FROM user_groupcenter WHERE groupcenter_id = '
-                        . $groupPermissionAssociation['groupcenter_id']);
-            } else {
-                throw new RuntimeException('Error in the data : we should not have two groupCenter '
-                        . 'with the same 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;
-    }
-
     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('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php b/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
index 3593a4a52..dade8044a 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
@@ -21,10 +21,10 @@ class Version20160310122322 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_main_address '
-              . 'DROP CONSTRAINT FK_165051F6EECBFDF1');
+              .'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');
@@ -33,36 +33,36 @@ class Version20160310122322 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
         $this->addSql('CREATE TABLE chill_main_address ('
-              . 'id INT NOT NULL, '
-              . 'postcode_id INT DEFAULT NULL, '
-              . 'streetAddress1 VARCHAR(255) NOT NULL, '
-              . 'streetAddress2 VARCHAR(255) NOT NULL, '
-              . 'validFrom DATE NOT NULL, '
-              . 'PRIMARY KEY(id))');
+              .'id INT NOT NULL, '
+              .'postcode_id INT DEFAULT NULL, '
+              .'streetAddress1 VARCHAR(255) NOT NULL, '
+              .'streetAddress2 VARCHAR(255) NOT NULL, '
+              .'validFrom DATE NOT NULL, '
+              .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_165051F6EECBFDF1 ON chill_main_address '
-              . '(postcode_id)');
+              .'(postcode_id)');
         $this->addSql('CREATE TABLE chill_main_postal_code ('
-              . 'id INT NOT NULL, '
-              . 'country_id INT DEFAULT NULL, '
-              . 'label VARCHAR(255) NOT NULL, '
-              . 'code VARCHAR(100) NOT NULL, '
-              . 'PRIMARY KEY(id))');
+              .'id INT NOT NULL, '
+              .'country_id INT DEFAULT NULL, '
+              .'label VARCHAR(255) NOT NULL, '
+              .'code VARCHAR(100) NOT NULL, '
+              .'PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_6CA145FAF92F3E70 ON chill_main_postal_code '
-              . '(country_id)');
+              .'(country_id)');
         $this->addSql('ALTER TABLE chill_main_address ADD CONSTRAINT '
-              . 'FK_165051F6EECBFDF1 '
-              . 'FOREIGN KEY (postcode_id) '
-              . 'REFERENCES chill_main_postal_code (id) '
-              . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'FK_165051F6EECBFDF1 '
+              .'FOREIGN KEY (postcode_id) '
+              .'REFERENCES chill_main_postal_code (id) '
+              .'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_main_postal_code ADD CONSTRAINT '
-              . 'FK_6CA145FAF92F3E70 '
-              . 'FOREIGN KEY (country_id) '
-              . 'REFERENCES Country (id) '
-              . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'FK_6CA145FAF92F3E70 '
+              .'FOREIGN KEY (country_id) '
+              .'REFERENCES Country (id) '
+              .'NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php b/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
index 397239e95..e9cdb4a31 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
@@ -13,7 +13,6 @@ namespace Chill\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
-use Exception;
 
 /**
  * Add index to postal code.
@@ -22,19 +21,19 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         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) {
+        } catch (\Exception) {
             $this->skipIf(true, 'Could not create extension pg_trgm');
         }
     }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php b/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
index 5da4509bf..a608b07bb 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
@@ -22,7 +22,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX UNIQ_1483A5E9F5A5DC32');
         $this->addSql('DROP INDEX UNIQ_1483A5E9885281E');
@@ -37,7 +37,7 @@ final class Version20180709181423 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE users ADD usernameCanonical VARCHAR(80) DEFAULT NULL');
         $this->addSql('UPDATE users SET usernameCanonical=LOWER(UNACCENT(username))');
@@ -49,18 +49,18 @@ final class Version20180709181423 extends AbstractMigration
         $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;
+            <<<'SQL_WRAP'
+            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
+            RETURN NEW;
+            END;
+            $BODY$ LANGUAGE PLPGSQL
+SQL_WRAP
         );
 
         $this->addSql(
@@ -74,16 +74,16 @@ final class Version20180709181423 extends AbstractMigration
         );
 
         $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;
+            <<<'SQL_WRAP'
+            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_WRAP
         );
 
         $this->addSql(
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php b/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
index 293ea7585..43ea86749 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
@@ -21,7 +21,7 @@ final class Version20210308111926 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_main_address DROP customs');
     }
@@ -33,7 +33,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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 d2f3bd206..c3c400c3c 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
@@ -21,7 +21,7 @@ final class Version20210414091001 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP EXTENSION IF NOT EXISTS postgis;');
     }
@@ -33,7 +33,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE EXTENSION IF NOT EXISTS postgis;');
     }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php b/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php
index fc9957ee7..040aadf38 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220302132728.php
@@ -14,7 +14,6 @@ namespace Chill\Migrations\Main;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 use libphonenumber\PhoneNumberUtil;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -43,7 +42,7 @@ final class Version20220302132728 extends AbstractMigration implements Container
             ->getParameter('chill_main')['phone_helper']['default_carrier_code'];
 
         if (null === $carrier_code) {
-            throw new RuntimeException('no carrier code');
+            throw new \RuntimeException('no carrier code');
         }
 
         $this->addSql('ALTER TABLE chill_main_location ALTER phonenumber1 TYPE VARCHAR(35)');
@@ -56,9 +55,9 @@ final class Version20220302132728 extends AbstractMigration implements Container
         $this->addSql('COMMENT ON COLUMN chill_main_location.phonenumber2 IS \'(DC2Type:phone_number)\'');
 
         $this->addSql(
-            'UPDATE chill_main_location SET ' .
-            $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber1') .
-            ', ' .
+            'UPDATE chill_main_location SET '.
+            $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber1').
+            ', '.
             $this->buildMigrationPhoneNumberClause($carrier_code, 'phonenumber2')
         );
     }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
index c46b40ee5..4bd9bd18f 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
@@ -16,9 +16,7 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220513151853 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-    }
+    public function down(Schema $schema): void {}
 
     public function getDescription(): string
     {
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php b/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php
index af76225d3..4fed9eb25 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220729205416.php
@@ -47,7 +47,7 @@ final class Version20220729205416 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_6CA145FA65FF1AEC ON chill_main_postal_code (updatedBy_id)');
         $this->addSql('CREATE INDEX IDX_6CA145FA3174800F ON chill_main_postal_code (createdBy_id)');
         $this->addSql('CREATE UNIQUE INDEX postal_code_import_unicity ON chill_main_postal_code (code, refpostalcodeid, postalcodesource) WHERE refpostalcodeid is not null');
-        //$this->addSql('ALTER TABLE chill_main_postal_code ADD CONSTRAINT chill_internal_postal_code_import_unicity '.
+        // $this->addSql('ALTER TABLE chill_main_postal_code ADD CONSTRAINT chill_internal_postal_code_import_unicity '.
         //    'EXCLUDE (code WITH =, refpostalcodeid WITH =, postalcodesource WITH =) WHERE (refpostalcodeid IS NOT NULL)');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230711152947.php b/src/Bundle/ChillMainBundle/migrations/Version20230711152947.php
new file mode 100644
index 000000000..d11a9f78a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20230711152947.php
@@ -0,0 +1,33 @@
+<?php
+
+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 Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230711152947 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add last execution data to cronjon execution table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_cronjob_execution ADD lastExecutionData JSONB DEFAULT \'{}\'::jsonb NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_cronjob_execution DROP COLUMN lastExecutionData');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230906134410.php b/src/Bundle/ChillMainBundle/migrations/Version20230906134410.php
new file mode 100644
index 000000000..6a4888801
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20230906134410.php
@@ -0,0 +1,36 @@
+<?php
+
+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 Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add property to center.
+ */
+final class Version20230906134410 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add the isActive property to the Center entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE centers ADD isActive BOOLEAN DEFAULT true NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE centers DROP isActive');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php b/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php
new file mode 100644
index 000000000..fa7b0458a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20230913114115.php
@@ -0,0 +1,133 @@
+<?php
+
+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 Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230913114115 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        // drop job_history
+        $this->addSql('ALTER TABLE chill_main_user_job_history DROP CONSTRAINT user_job_history_endate_null_or_after_startdate');
+        $this->addSql('ALTER TABLE chill_main_user_job_history DROP CONSTRAINT user_job_history_not_overlaps');
+        $this->addSql('DROP SEQUENCE chill_main_user_job_history_id_seq CASCADE');
+        $this->addSql('ALTER TABLE chill_main_user_job_history DROP CONSTRAINT FK_4E3BF4DDBE04EA9');
+        $this->addSql('ALTER TABLE chill_main_user_job_history DROP CONSTRAINT FK_4E3BF4DDA76ED395');
+        $this->addSql('DROP TABLE chill_main_user_job_history');
+
+        $this->addSql('ALTER TABLE users ADD userjob_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT fk_1483a5e964b65c5b FOREIGN KEY (userjob_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX idx_1483a5e964b65c5b ON users (userjob_id)');
+
+        // drop scope_history
+        $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT user_scope_history_endate_null_or_after_startdate');
+        $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT user_scope_history_not_overlaps');
+        $this->addSql('DROP SEQUENCE chill_main_user_scope_history_id_seq CASCADE');
+        $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT FK_48B969D7682B5931');
+        $this->addSql('ALTER TABLE chill_main_user_scope_history DROP CONSTRAINT FK_48B969D7A76ED395');
+        $this->addSql('DROP TABLE chill_main_user_scope_history');
+
+        $this->addSql('ALTER TABLE users ADD mainscope_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT fk_1483a5e9115e73f3 FOREIGN KEY (mainscope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX idx_1483a5e9115e73f3 ON users (mainscope_id)');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add new entities UserScopeHistory and UserJobHistory';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // create scope_history
+        $this->addSql('CREATE SEQUENCE chill_main_user_scope_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_main_user_scope_history ('
+            .'id INT NOT NULL,'
+            .'scope_id INT DEFAULT NULL,'
+            .'user_id INT DEFAULT NULL,'
+            .'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,'
+            .'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,'
+            .'PRIMARY KEY(id))');
+
+        $this->addSql('CREATE INDEX IDX_48B969D7682B5931 ON chill_main_user_scope_history (scope_id)');
+        $this->addSql('CREATE INDEX IDX_48B969D7A76ED395 ON chill_main_user_scope_history (user_id)');
+
+        $this->addSql('COMMENT ON COLUMN chill_main_user_scope_history.endDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_main_user_scope_history.startDate IS \'(DC2Type:datetime_immutable)\'');
+
+        $this->addSql('ALTER TABLE chill_main_user_scope_history ADD CONSTRAINT FK_48B969D7682B5931 '
+            .'FOREIGN KEY (scope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        $this->addSql('ALTER TABLE chill_main_user_scope_history ADD CONSTRAINT FK_48B969D7A76ED395 '
+            .'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        $this->addSql('ALTER TABLE chill_main_user_scope_history '
+            .'ADD CONSTRAINT user_scope_history_not_overlaps '
+            .'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) '
+            .'DEFERRABLE INITIALLY DEFERRED');
+
+        $this->addSql('ALTER TABLE chill_main_user_scope_history '
+            .'ADD CONSTRAINT user_scope_history_endate_null_or_after_startdate '
+            .'CHECK (startDate <= endDate OR endDate IS NULL)');
+
+        // insert user scope_history datas
+        $this->addSql('INSERT INTO chill_main_user_scope_history (id, startDate, endDate, user_id, scope_id) '
+            .'SELECT nextval(\'chill_main_user_scope_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, mainscope_id '
+            .'FROM users');
+
+        // remove mainscope
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT fk_1483a5e9115e73f3');
+        $this->addSql('ALTER TABLE users DROP mainscope_id');
+
+        // create job_history
+        $this->addSql('CREATE SEQUENCE chill_main_user_job_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_main_user_job_history ('
+            .'id INT NOT NULL,'
+            .'job_id INT DEFAULT NULL,'
+            .'user_id INT DEFAULT NULL,'
+            .'endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,'
+            .'startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,'
+            .'PRIMARY KEY(id))');
+
+        $this->addSql('CREATE INDEX IDX_4E3BF4DDBE04EA9 ON chill_main_user_job_history (job_id)');
+        $this->addSql('CREATE INDEX IDX_4E3BF4DDA76ED395 ON chill_main_user_job_history (user_id)');
+
+        $this->addSql('COMMENT ON COLUMN chill_main_user_job_history.endDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_main_user_job_history.startDate IS \'(DC2Type:datetime_immutable)\'');
+
+        $this->addSql('ALTER TABLE chill_main_user_job_history ADD CONSTRAINT FK_4E3BF4DDBE04EA9 '
+            .'FOREIGN KEY (job_id) REFERENCES chill_main_user_job (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        $this->addSql('ALTER TABLE chill_main_user_job_history ADD CONSTRAINT FK_4E3BF4DDA76ED395 '
+            .'FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        $this->addSql('ALTER TABLE chill_main_user_job_history '
+            .'ADD CONSTRAINT user_job_history_not_overlaps '
+            .'EXCLUDE USING GIST (user_id with =, tsrange(startDate, endDate) with &&) '
+            .'DEFERRABLE INITIALLY DEFERRED');
+
+        $this->addSql('ALTER TABLE chill_main_user_job_history '
+            .'ADD CONSTRAINT user_job_history_endate_null_or_after_startdate '
+            .'CHECK (startDate <= endDate OR endDate IS NULL)');
+
+        // insert user job_history datas
+        $this->addSql('INSERT INTO chill_main_user_job_history (id, startDate, endDate, user_id, job_id) '
+            .'SELECT nextval(\'chill_main_user_job_history_id_seq\'), \'1970-01-01\'::date, NULL, users.id, userjob_id '
+            .'FROM users');
+
+        // remove userjob
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT fk_1483a5e964b65c5b');
+        $this->addSql('ALTER TABLE users DROP userjob_id');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
index 263a57049..96b2edd98 100644
--- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -54,3 +54,12 @@ duration:
             few {# minutes}
             other {# minutes}
         }
+
+filter_order:
+    by_date:
+        From: Depuis le {from_date, date, long}
+        To: Jusqu'au {to_date, date, long}
+    By: Filtrer par
+    Search: Chercher dans la liste
+    By date: Filtrer par date
+    search_box: Filtrer par contenu
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index b8349ce2e..28615bc75 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -42,6 +42,7 @@ by_user: "par "
 lifecycleUpdate: Evenements de création et mise à jour
 address_fields: Données liées à l'adresse
 Datas: Données
+No title: Aucun titre
 
 inactive: inactif
 
@@ -285,6 +286,8 @@ The export will contains only data from the picked centers.: L'export ne contien
 This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les centres choisis.
 Go to export options: Vers la préparation de l'export
 Pick aggregated centers: Regroupement de centres
+uncheck all centers: Désélectionner tous les centres
+check all centers: Sélectionner tous les centres
 # export creation step 'export' : choose aggregators, filtering and formatter
 Formatter: Mise en forme
 Choose the formatter: Choisissez le format d'export voulu.
@@ -422,6 +425,12 @@ crud:
             add_new: Ajouter un regroupement
         title_new: Nouveau regroupement
         title_edit: Modifier un regroupement
+    center:
+        index:
+            title: Liste des centres
+            add_new: Ajouter un centre
+        title_new: Nouveau centre
+        title_edit: Modifier un centre
 
 No entities: Aucun élément
 
@@ -564,6 +573,7 @@ export:
         _as_string: Adresse formattée
         confidential: Adresse confidentielle ?
         isNoAddress: Adresse incomplète ?
+        steps: Escaliers
         _lat: Latitude
         _lon: Longitude
 
@@ -595,7 +605,10 @@ saved_export:
     Export is deleted: L'export est supprimé
     Saved export is saved!: L'export est enregistré
     Created on %date%: Créé le %date%
-
+    update_title_and_description: Modifier le titre et la description
+    update_filters_aggregators_and_execute: Modifier les filtres et regroupements et télécharger
+    execute: Télécharger
+    Update existing: Mettre à jour le rapport enregistré existant
 
 absence:
     # single letter for absence
@@ -609,3 +622,53 @@ absence:
     You are listed as absent, as of: Votre absence est indiquée à partir du
     No absence listed: Aucune absence indiquée.
     Is absent: Absent?
+
+admin:
+    users:
+        export_list_csv: Liste des utilisateurs (format CSV)
+        export_permissions_csv: Association utilisateurs - groupes de permissions - centre (format CSV)
+        export:
+            id: Identifiant
+            username: Nom d'utilisateur
+            email: Courriel
+            enabled: Activé
+            civility_id: Identifiant civilité
+            civility_abbreviation: Abbréviation civilité
+            civility_name: Civilité
+            label: Label
+            mainCenter_id: Identifiant centre principal
+            mainCenter_name: Centre principal
+            mainScope_id: Identifiant service principal
+            mainScope_name: Service principal
+            userJob_id: Identifiant métier
+            userJob_name: Métier
+            currentLocation_id: Identifiant localisation actuelle
+            currentLocation_name: Localisation actuelle
+            mainLocation_id: Identifiant localisation principale
+            mainLocation_name: Localisation principale
+            absenceStart: Absent à partir du
+            center_id: Identifiant du centre
+            center_name: Centre
+            permissionsGroup_id: Identifiant du groupe de permissions
+            permissionsGroup_name: Groupe de permissions
+        job_scope_histories:
+            Show history: Voir l'historique
+            index:
+                histories: Historique des services et des métiers
+                Back to user job: Revenir à l'utilisateur
+                job_history:
+                    title: Historique des métiers
+                    start: Du
+                    end: Jusque
+                    today: en cours
+                    undefined: non défini
+                    user: Utilisateur
+                    job: Métier
+                scope_history:
+                    title: Historique des services
+                    start: Du
+                    end: Jusque
+                    today: en cours
+                    undefined: non défini
+                    user: Utilisateur
+                    scope: Service
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
index 666febe9d..64d2b8f12 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/PersonAddressMoveEventSubscriber.php
@@ -16,33 +16,13 @@ use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Notification\NotificationPersisterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
-use DateTimeImmutable;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
 {
-    private EngineInterface $engine;
-
-    private NotificationPersisterInterface $notificationPersister;
-
-    private Security $security;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        EngineInterface $engine,
-        NotificationPersisterInterface $notificationPersister,
-        Security $security,
-        TranslatorInterface $translator
-    ) {
-        $this->engine = $engine;
-        $this->notificationPersister = $notificationPersister;
-        $this->security = $security;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly \Twig\Environment $engine, private readonly NotificationPersisterInterface $notificationPersister, private readonly Security $security, private readonly TranslatorInterface $translator) {}
 
     public static function getSubscribedEvents(): array
     {
@@ -59,7 +39,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
             $person = $event->getPerson();
 
             foreach ($person->getCurrentAccompanyingPeriods() as $period) {
-                if ($period->getStep() === AccompanyingPeriod::STEP_DRAFT) {
+                if (AccompanyingPeriod::STEP_DRAFT === $period->getStep()) {
                     continue;
                 }
 
@@ -67,7 +47,7 @@ class PersonAddressMoveEventSubscriber implements EventSubscriberInterface
                     $period->getPersonLocation() === $person
                         && (
                             $event->getMoveDate() >= $period->getLastLocationHistory()->getStartDate()
-                            || $event->willChangeBeActiveAt(new DateTimeImmutable('now'))
+                            || $event->willChangeBeActiveAt(new \DateTimeImmutable('now'))
                         )
                     && null !== $period->getUser()
                     && $period->getUser() !== $this->security->getUser()
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
index 8d7249928..084fe8ff5 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php
@@ -18,27 +18,12 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Workflow\Event\EnteredEvent;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserRefEventSubscriber implements EventSubscriberInterface
 {
-    private EngineInterface $engine;
-
-    private NotificationPersisterInterface $notificationPersister;
-
-    private Security $security;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(Security $security, TranslatorInterface $translator, EngineInterface $engine, NotificationPersisterInterface $notificationPersister)
-    {
-        $this->security = $security;
-        $this->translator = $translator;
-        $this->engine = $engine;
-        $this->notificationPersister = $notificationPersister;
-    }
+    public function __construct(private readonly Security $security, private readonly TranslatorInterface $translator, private readonly \Twig\Environment $engine, private readonly NotificationPersisterInterface $notificationPersister) {}
 
     public static function getSubscribedEvents()
     {
@@ -51,7 +36,10 @@ class UserRefEventSubscriber implements EventSubscriberInterface
 
     public function onStateEntered(EnteredEvent $enteredEvent): void
     {
-        if ($enteredEvent->getMarking()->has(AccompanyingPeriod::STEP_CONFIRMED)) {
+        if (
+            $enteredEvent->getMarking()->has(AccompanyingPeriod::STEP_CONFIRMED)
+            and 'confirm' === $enteredEvent->getTransition()->getName()
+        ) {
             $this->onPeriodConfirmed($enteredEvent->getSubject());
         }
     }
@@ -61,7 +49,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface
         if ($period->isChangedUser()
             && $period->getUser() !== $this->security->getUser()
             && null !== $period->getUser()
-            && $period->getStep() !== AccompanyingPeriod::STEP_DRAFT
+            && AccompanyingPeriod::STEP_DRAFT !== $period->getStep()
             && !$period->isPreventUserIsChangedNotification()
         ) {
             $this->generateNotificationToUser($period);
@@ -73,12 +61,12 @@ class UserRefEventSubscriber implements EventSubscriberInterface
         $notification = new Notification();
 
         $urgentStatement =
-            $period->isEmergency() ? strtoupper($this->translator->trans('accompanying_period.emergency')) . ' ' : '';
+            $period->isEmergency() ? strtoupper($this->translator->trans('accompanying_period.emergency')).' ' : '';
 
         $notification
             ->setRelatedEntityId($period->getId())
             ->setRelatedEntityClass(AccompanyingPeriod::class)
-            ->setTitle($urgentStatement . $this->translator->trans('period_notification.period_designated_subject'))
+            ->setTitle($urgentStatement.$this->translator->trans('period_notification.period_designated_subject'))
             ->setMessage($this->engine->render(
                 '@ChillPerson/Notification/accompanying_course_designation.md.twig',
                 [
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjob.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjob.php
new file mode 100644
index 000000000..0d362c581
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjob.php
@@ -0,0 +1,47 @@
+<?php
+
+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 Chill\PersonBundle\AccompanyingPeriod\Lifecycle;
+
+use Chill\MainBundle\Cron\CronJobInterface;
+use Chill\MainBundle\Entity\CronJobExecution;
+use Symfony\Component\Clock\ClockInterface;
+
+readonly class AccompanyingPeriodStepChangeCronjob implements CronJobInterface
+{
+    public function __construct(
+        private ClockInterface $clock,
+        private AccompanyingPeriodStepChangeRequestor $requestor,
+    ) {}
+
+    public function canRun(?CronJobExecution $cronJobExecution): bool
+    {
+        $now = $this->clock->now();
+
+        if (null !== $cronJobExecution && $now->sub(new \DateInterval('P1D')) < $cronJobExecution->getLastStart()) {
+            return false;
+        }
+
+        return in_array((int) $now->format('H'), [1, 2, 3, 4, 5, 6], true);
+    }
+
+    public function getKey(): string
+    {
+        return 'accompanying-period-step-change';
+    }
+
+    public function run(array $lastExecutionData): null|array
+    {
+        ($this->requestor)();
+
+        return null;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php
new file mode 100644
index 000000000..534672efc
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeMessageHandler.php
@@ -0,0 +1,36 @@
+<?php
+
+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 Chill\PersonBundle\AccompanyingPeriod\Lifecycle;
+
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+
+#[AsMessageHandler]
+class AccompanyingPeriodStepChangeMessageHandler implements MessageHandlerInterface
+{
+    private const LOG_PREFIX = '[accompanying period step change message handler] ';
+
+    public function __construct(
+        private readonly AccompanyingPeriodRepository $accompanyingPeriodRepository,
+        private readonly AccompanyingPeriodStepChanger $changer,
+    ) {}
+
+    public function __invoke(AccompanyingPeriodStepChangeRequestMessage $message): void
+    {
+        if (null === $period = $this->accompanyingPeriodRepository->find($message->getPeriodId())) {
+            throw new \RuntimeException(self::LOG_PREFIX.'Could not find period with this id: '.$message->getPeriodId());
+        }
+
+        ($this->changer)($period, $message->getTransition());
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestMessage.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestMessage.php
new file mode 100644
index 000000000..1d6a33614
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestMessage.php
@@ -0,0 +1,47 @@
+<?php
+
+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 Chill\PersonBundle\AccompanyingPeriod\Lifecycle;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+
+/**
+ * Message which will request a change in the step of accompanying period.
+ */
+class AccompanyingPeriodStepChangeRequestMessage
+{
+    private int $periodId;
+
+    public function __construct(
+        AccompanyingPeriod|int $period,
+        private readonly string $transition,
+    ) {
+        if (is_int($period)) {
+            $this->periodId = $period;
+        } else {
+            if (null !== $id = $period->getId()) {
+                $this->periodId = $id;
+            }
+
+            throw new \LogicException('This AccompanyingPeriod does not have and id yet');
+        }
+    }
+
+    public function getPeriodId(): int
+    {
+        return $this->periodId;
+    }
+
+    public function getTransition(): string
+    {
+        return $this->transition;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php
new file mode 100644
index 000000000..8cfb7b174
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeRequestor.php
@@ -0,0 +1,86 @@
+<?php
+
+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 Chill\PersonBundle\AccompanyingPeriod\Lifecycle;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodInfoRepositoryInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+/**
+ * Gather all the accompanying period which needs a change in step.
+ */
+class AccompanyingPeriodStepChangeRequestor
+{
+    private readonly \DateInterval $intervalForShortInactive;
+
+    private readonly \DateInterval $intervalForLongInactive;
+
+    private readonly bool $isMarkInactive;
+
+    public function __construct(
+        private readonly AccompanyingPeriodInfoRepositoryInterface $accompanyingPeriodInfoRepository,
+        private readonly LoggerInterface $logger,
+        private readonly MessageBusInterface $messageBus,
+        ParameterBagInterface $parameterBag,
+    ) {
+        $config = $parameterBag->get('chill_person')['accompanying_period_lifecycle_delays'];
+        $this->isMarkInactive = $config['mark_inactive'];
+        $this->intervalForShortInactive = new \DateInterval($config['mark_inactive_short_after']);
+        $this->intervalForLongInactive = new \DateInterval($config['mark_inactive_long_after']);
+    }
+
+    public function __invoke(): void
+    {
+        if (!$this->isMarkInactive) {
+            return;
+        }
+
+        // get the oldest ones first
+        foreach (
+            $olders = $this->accompanyingPeriodInfoRepository->findAccompanyingPeriodIdInactiveAfter(
+                $this->intervalForLongInactive,
+                [AccompanyingPeriod::STEP_CONFIRMED, AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT]
+            ) as $accompanyingPeriodId
+        ) {
+            $this->logger->debug('request mark period as inactive_short', ['period' => $accompanyingPeriodId]);
+            $this->messageBus->dispatch(new AccompanyingPeriodStepChangeRequestMessage($accompanyingPeriodId, 'mark_inactive_long'));
+        }
+
+        // the newest
+        foreach (
+            $this->accompanyingPeriodInfoRepository->findAccompanyingPeriodIdInactiveAfter(
+                $this->intervalForShortInactive,
+                [AccompanyingPeriod::STEP_CONFIRMED]
+            ) as $accompanyingPeriodId
+        ) {
+            if (in_array($accompanyingPeriodId, $olders, true)) {
+                continue;
+            }
+
+            $this->logger->debug('request mark period as inactive_long', ['period' => $accompanyingPeriodId]);
+            $this->messageBus->dispatch(new AccompanyingPeriodStepChangeRequestMessage($accompanyingPeriodId, 'mark_inactive_short'));
+        }
+
+        // a new event has been created => remove inactive long, or short
+        foreach (
+            $this->accompanyingPeriodInfoRepository->findAccompanyingPeriodIdActiveSince(
+                $this->intervalForShortInactive,
+                [AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT, AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG]
+            ) as $accompanyingPeriodId
+        ) {
+            $this->logger->debug('request mark period as active', ['period' => $accompanyingPeriodId]);
+            $this->messageBus->dispatch(new AccompanyingPeriodStepChangeRequestMessage($accompanyingPeriodId, 'mark_active'));
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChanger.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChanger.php
new file mode 100644
index 000000000..25a739ce0
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChanger.php
@@ -0,0 +1,57 @@
+<?php
+
+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 Chill\PersonBundle\AccompanyingPeriod\Lifecycle;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Workflow\Registry;
+
+/**
+ * Change the step of an accompanying period.
+ *
+ * This should be invoked through scripts (not in the in context of an http request, or an
+ * action from a user).
+ */
+class AccompanyingPeriodStepChanger
+{
+    private const LOG_PREFIX = '[AccompanyingPeriodStepChanger] ';
+
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly LoggerInterface $logger,
+        private readonly Registry $workflowRegistry,
+    ) {}
+
+    public function __invoke(AccompanyingPeriod $period, string $transition, string $workflowName = null): void
+    {
+        $workflow = $this->workflowRegistry->get($period, $workflowName);
+
+        if (!$workflow->can($period, $transition)) {
+            $this->logger->info(self::LOG_PREFIX.'not able to apply the transition on period', [
+                'period_id' => $period->getId(),
+                'transition' => $transition,
+            ]);
+
+            return;
+        }
+
+        $workflow->apply($period, $transition);
+
+        $this->entityManager->flush();
+
+        $this->logger->info(self::LOG_PREFIX.'could apply a transition', [
+            'period_id' => $period->getId(),
+            'transition' => $transition,
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
index 37f309929..6e6ea5ef8 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PrePersistEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 
diff --git a/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php b/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
index 83623a026..ac3363db0 100644
--- a/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
+++ b/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
@@ -16,30 +16,11 @@ use Symfony\Component\EventDispatcher\Event;
 /**
  * Event triggered when an entity attached to a person is removed.
  */
-class ActionEvent extends Event
+class ActionEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
-    public const DELETE = 'CHILL_PERSON.DELETE_ASSOCIATED_ENTITY';
+    final public const DELETE = 'CHILL_PERSON.DELETE_ASSOCIATED_ENTITY';
 
-    public const MOVE = 'CHILL_PERSON.MOVE_ASSOCIATED_ENTITY';
-
-    /**
-     * the FQDN class name as recorded in doctrine.
-     *
-     * @var string
-     */
-    protected $entity;
-
-    /**
-     * an array of key value data to describe the movement.
-     *
-     * @var array
-     */
-    protected $metadata;
-
-    /**
-     * @var int
-     */
-    protected $personId;
+    final public const MOVE = 'CHILL_PERSON.MOVE_ASSOCIATED_ENTITY';
 
     /**
      * @var string[]
@@ -52,19 +33,26 @@ class ActionEvent extends Event
     protected $preSql = [];
 
     /**
-     * the sql statement.
-     *
-     * @var string
+     * @param string  $entity
+     * @param mixed[] $metadata
+     * @param int     $personId
+     * @param string  $sqlStatement
      */
-    protected $sqlStatement;
-
-    public function __construct($personId, $entity, $sqlStatement, $metadata = [])
-    {
-        $this->personId = $personId;
-        $this->entity = $entity;
-        $this->sqlStatement = $sqlStatement;
-        $this->metadata = $metadata;
-    }
+    public function __construct(
+        protected $personId,
+        /**
+         * the FQDN class name as recorded in doctrine.
+         */
+        protected $entity,
+        /**
+         * the sql statement.
+         */
+        protected $sqlStatement,
+        /**
+         * an array of key value data to describe the movement.
+         */
+        protected $metadata = []
+    ) {}
 
     /**
      * Add Sql which will be executed **after** the delete statement.
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveAccompanyingPeriodParticipationHandler.php b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveAccompanyingPeriodParticipationHandler.php
new file mode 100644
index 000000000..2c342a9a5
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveAccompanyingPeriodParticipationHandler.php
@@ -0,0 +1,46 @@
+<?php
+
+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 Chill\PersonBundle\Actions\Remove\Handler;
+
+use Chill\PersonBundle\Actions\Remove\PersonMoveSqlHandlerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person;
+
+class PersonMoveAccompanyingPeriodParticipationHandler implements PersonMoveSqlHandlerInterface
+{
+    public function supports(string $className, string $field): bool
+    {
+        return AccompanyingPeriodParticipation::class === $className;
+    }
+
+    public function getSqls(string $className, string $field, Person $from, Person $to): array
+    {
+        $insertSql = sprintf(<<<'SQL'
+            INSERT INTO chill_person_accompanying_period_participation (person_id, accompanyingperiod_id, id, startdate, enddate)
+                SELECT %d, accompanyingperiod_id, nextval('chill_person_accompanying_period_id_seq'), startdate, enddate
+                    FROM chill_person_accompanying_period_participation cpapp
+                    WHERE person_id = %d
+                        AND NOT EXISTS (
+                        SELECT 1 FROM chill_person_accompanying_period_participation cpapp2
+                                 WHERE
+                                     person_id = %d
+                                   AND (cpapp.startdate, COALESCE(cpapp.enddate, 'infinity'::date)) OVERLAPS (cpapp2.startdate, COALESCE(cpapp2.enddate, 'infinity'::date))
+                                 );
+        SQL, $to->getId(), $from->getId(), $to->getId());
+
+        $deleteSql = sprintf(<<<'SQL'
+                DELETE FROM chill_person_accompanying_period_participation WHERE person_id = %d;
+                SQL, $from->getId());
+
+        return [$insertSql, $deleteSql];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveCenterHistoryHandler.php b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveCenterHistoryHandler.php
new file mode 100644
index 000000000..f08bd7dff
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveCenterHistoryHandler.php
@@ -0,0 +1,70 @@
+<?php
+
+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 Chill\PersonBundle\Actions\Remove\Handler;
+
+use Chill\PersonBundle\Actions\Remove\PersonMoveSqlHandlerInterface;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\Person\PersonCenterHistoryRepository;
+
+class PersonMoveCenterHistoryHandler implements PersonMoveSqlHandlerInterface
+{
+    public function __construct(
+        private readonly PersonCenterHistoryRepository $centerHistoryRepository,
+    ) {}
+
+    public function supports(string $className, string $field): bool
+    {
+        return Person\PersonCenterHistory::class === $className;
+    }
+
+    public function getSqls(string $className, string $field, Person $from, Person $to): array
+    {
+        $sqlStatements = [];
+        $oldestDateA = null;
+        $oldestDateB = null;
+
+        $oldestCenterHistoryB = null;
+        $oldestCenterHistoryA = null;
+
+        $centerHistoriesA = $this->centerHistoryRepository->findBy(['person' => $from]);
+        foreach ($centerHistoriesA as $ch) {
+            if (null === $oldestDateA || ($ch->getStartDate() < $oldestDateA)) {
+                $oldestDateA = $ch->getStartDate();
+                $oldestCenterHistoryA = $ch;
+            }
+        }
+
+        $centerHistoriesB = $this->centerHistoryRepository->findBy(['person' => $to]);
+        foreach ($centerHistoriesB as $ch) {
+            if (null === $oldestDateB || ($ch->getStartDate() < $oldestDateB)) {
+                $oldestDateB = $ch->getStartDate();
+                $oldestCenterHistoryB = $ch;
+            }
+        }
+
+        $sqlDelete = sprintf(<<<'SQL'
+                DELETE FROM chill_person_person_center_history WHERE person_id = %d;
+                SQL, $from->getId());
+
+        $sqlStatements = [$sqlDelete];
+
+        if ((null !== $oldestDateA && null !== $oldestDateB) && $oldestDateA <= $oldestDateB) {
+            $sqlInsert = sprintf(<<<'SQL'
+                UPDATE chill_person_person_center_history SET startDate = '%s' WHERE id = %d;
+                SQL, $oldestDateA->format('Y-m-d'), $oldestCenterHistoryB->getId());
+
+            $sqlStatements = [$sqlInsert, $sqlDelete];
+        }
+
+        return $sqlStatements;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveHouseholdHandler.php b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveHouseholdHandler.php
new file mode 100644
index 000000000..2fc5ca440
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveHouseholdHandler.php
@@ -0,0 +1,46 @@
+<?php
+
+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 Chill\PersonBundle\Actions\Remove\Handler;
+
+use Chill\PersonBundle\Actions\Remove\PersonMoveSqlHandlerInterface;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Person;
+
+class PersonMoveHouseholdHandler implements PersonMoveSqlHandlerInterface
+{
+    public function supports(string $className, string $field): bool
+    {
+        return HouseholdMember::class === $className;
+    }
+
+    public function getSqls(string $className, string $field, Person $from, Person $to): array
+    {
+        $sqlInsert = sprintf(<<<'SQL'
+            INSERT INTO chill_person_household_members (id, person_id, household_id, startdate, enddate, comment, sharedhousehold, position_id, holder)
+                SELECT nextval('chill_person_household_members_id_seq'), %d, household_id, startdate, enddate, comment, sharedhousehold, position_id, holder
+                    FROM chill_person_household_members cphm
+                    WHERE person_id = %d
+                        AND NOT EXISTS (
+                        SELECT 1 FROM chill_person_household_members cphm_inner
+                                 WHERE
+                                     person_id = %d
+                                   AND daterange(cphm.startdate, cphm.enddate) && daterange(cphm_inner.startdate, cphm_inner.enddate)
+                                 );
+        SQL, $to->getId(), $from->getId(), $to->getId());
+
+        $deleteSql = sprintf(<<<'SQL'
+                DELETE FROM chill_person_household_members WHERE person_id = %d;
+                SQL, $from->getId());
+
+        return [$sqlInsert, $deleteSql];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveRelationHandler.php b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveRelationHandler.php
new file mode 100644
index 000000000..9d8f4b5e1
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/Handler/PersonMoveRelationHandler.php
@@ -0,0 +1,47 @@
+<?php
+
+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 Chill\PersonBundle\Actions\Remove\Handler;
+
+use Chill\PersonBundle\Actions\Remove\PersonMoveSqlHandlerInterface;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
+
+class PersonMoveRelationHandler implements PersonMoveSqlHandlerInterface
+{
+    public function supports(string $className, string $field): bool
+    {
+        return Relationship::class === $className;
+    }
+
+    public function getSqls(string $className, string $field, Person $from, Person $to): array
+    {
+        $insertSql = sprintf(<<<'SQL'
+            INSERT INTO chill_person_relationships (id, relation_id, reverse, fromperson_id, toperson_id)
+                SELECT nextval('chill_person_relationships_id_seq'), relation_id, reverse, fromperson_id, toperson_id
+                    FROM chill_person_relationships cpr
+                    WHERE fromperson_id = %d OR toperson_id = %d
+                        AND NOT EXISTS (
+                        SELECT 1 FROM chill_person_relationships cpr2
+                                 WHERE
+                                     cpr2.fromperson_id = %d AND cpr2.toperson_id = %d
+                                    OR cpr2.fromperson_id = %d AND cpr2.toperson_id = %d
+                                 );
+        SQL, $from->getId(), $from->getId(), $to->getId(), $from->getId(), $from->getId(), $to->getId());
+
+        $deleteSql = [
+            sprintf('DELETE FROM chill_person_relationships WHERE fromperson_id = %d', $from->getId()),
+            sprintf('DELETE FROM chill_person_relationships WHERE toperson_id = %d', $from->getId()),
+        ];
+
+        return [$insertSql, ...$deleteSql];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
index 13a62094d..292c805a0 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
@@ -13,15 +13,13 @@ namespace Chill\PersonBundle\Actions\Remove;
 
 use Chill\PersonBundle\Actions\ActionEvent;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
 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
@@ -31,23 +29,11 @@ use function in_array;
  */
 class PersonMove
 {
-    /**
-     * @var EntityManagerInterface
-     */
-    protected $em;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-
     public function __construct(
-        EntityManagerInterface $em,
-        EventDispatcherInterface $eventDispatcher
-    ) {
-        $this->em = $em;
-        $this->eventDispatcher = $eventDispatcher;
-    }
+        private readonly EntityManagerInterface $em,
+        private readonly PersonMoveManager $personMoveManager,
+        private readonly EventDispatcherInterface $eventDispatcher
+    ) {}
 
     /**
      * Return the sql used to move or delete entities associated to a person to
@@ -76,7 +62,7 @@ class PersonMove
     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) {
@@ -84,8 +70,17 @@ class PersonMove
             }
 
             foreach ($metadata->getAssociationMappings() as $field => $mapping) {
-                if (Person::class === $mapping['targetEntity']) {
-                    if (in_array($metadata->getName(), $toDelete, true)) {
+                if ($this->personMoveManager->hasHandler($metadata->getName(), $field)) {
+                    $sqls = \array_merge($sqls, $this->personMoveManager->getSqls($metadata->getName(), $field, $from, $to));
+                    continue;
+                }
+
+                if (\in_array($mapping['sourceEntity'], $this->getIgnoredEntities(), true)) {
+                    continue;
+                }
+
+                if (Person::class === $mapping['targetEntity'] and true === $mapping['isOwningSide']) {
+                    if (\in_array($mapping['sourceEntity'], $toDelete, true)) {
                         $sql = $this->createDeleteSQL($metadata, $from, $field);
                         $event = new ActionEvent(
                             $from->getId(),
@@ -93,26 +88,18 @@ class PersonMove
                             $sql,
                             ['to' => $to->getId(), 'original_action' => 'move']
                         );
-                        $this->eventDispatcher->dispatch(ActionEvent::DELETE, $event);
+                        $this->eventDispatcher->dispatch($event, ActionEvent::DELETE);
+                        $sqls = \array_merge($sqls, $event->getPreSql(), [$event->getSqlStatement()], $event->getPostSql());
                     } else {
-                        $sql = $this->createMoveSQL($metadata, $from, $to, $field);
-                        $event = new ActionEvent(
-                            $from->getId(),
-                            $metadata->getName(),
-                            $sql,
-                            ['to' => $to->getId(), 'original_action' => 'move']
-                        );
-                        $this->eventDispatcher->dispatch(ActionEvent::MOVE, $event);
+                        $sqls = \array_merge($sqls, $this->createMoveSQLs($metadata, $from, $to, $field));
                     }
-
-                    $sqls = array_merge($sqls, $event->getPreSql(), [$event->getSqlStatement()], $event->getPostSql());
                 }
             }
         }
 
         $personMetadata = $this->em->getClassMetadata(Person::class);
         $sqls[] = sprintf(
-            'DELETE FROM %s WHERE id = %d',
+            'DELETE FROM %s WHERE id = %d;',
             $this->getTableName($personMetadata),
             $from->getId()
         );
@@ -120,56 +107,111 @@ class PersonMove
         return $sqls;
     }
 
-    protected function createDeleteSQL(ClassMetadata $metadata, Person $from, $field): string
+    private 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());
+        if (array_key_exists('joinTable', $mapping)) {
+            foreach ($mapping['joinTable']['joinColumns'] as $columns) {
+                $conditions[] = sprintf('%s = %d', $columns['referencedColumnName'], $from->getId());
+            }
+        } elseif (array_key_exists('joinColumns', $mapping)) {
+            foreach ($mapping['joinColumns'] as $columns) {
+                $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+            }
         }
 
         return sprintf(
-            'DELETE FROM %s WHERE %s',
+            '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
+    private function createMoveSQLs($metadata, Person $from, Person $to, $field): array
     {
         $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 = [];
+        $tableName = '';
 
-        foreach ($mapping['joinColumns'] as $columns) {
-            $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+        if (array_key_exists('joinTable', $mapping)) {
+            // there is a join_table: we have to find conflict
+            $tableName = (null !== ($mapping['joinTable']['schema'] ?? null) ? $mapping['joinTable']['schema'].'.' : '')
+                .$mapping['joinTable']['name'];
+
+            $sqlInsert = sprintf(
+                'INSERT INTO %s (%s, %s) SELECT %d, %s FROM %s WHERE %s = %d ON CONFLICT DO NOTHING;',
+                $tableName,
+                $mapping['joinTable']['inverseJoinColumns'][0]['name'], // person_id
+                $mapping['joinTable']['joinColumns'][0]['name'], // something_else_id
+                $to->getId(),
+                $mapping['joinTable']['joinColumns'][0]['name'], // something_else_id
+                $tableName,
+                $mapping['joinTable']['inverseJoinColumns'][0]['name'], // person_id
+                $from->getId()
+            );
+
+            $deleteSql = sprintf(
+                'DELETE FROM %s WHERE %s = %d;',
+                $tableName,
+                $mapping['joinTable']['inverseJoinColumns'][0]['name'], // person_id
+                $from->getId()
+            );
+
+            foreach ($mapping['joinTable']['inverseJoinColumns'] as $columns) {
+                $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
+            }
+
+            foreach ($mapping['joinTable']['inverseJoinColumns'] as $columns) {
+                $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+            }
+
+            return [
+                $sqlInsert, $deleteSql,
+            ];
+        }
+        if (array_key_exists('joinColumns', $mapping)) {
+            $tableName = $this->getTableName($metadata);
+            foreach ($mapping['joinColumns'] as $columns) {
+                $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
+            }
+
+            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 [sprintf(
+            'UPDATE %s SET %s WHERE %s;',
+            $tableName,
+            \implode(' ', $sets),
+            \implode(' AND ', $conditions)
+        )];
     }
 
     /**
      * return an array of classes where entities should be deleted
      * instead of moved.
      */
-    protected function getDeleteEntities(): array
+    private function getDeleteEntities(): array
     {
         return [
-            AccompanyingPeriod::class,
+            AccompanyingPeriod\AccompanyingPeriodWork::class,
+            Relationship::class,
+        ];
+    }
+
+    private function getIgnoredEntities(): array
+    {
+        return [
+            Person\PersonCurrentAddress::class,
+            PersonHouseholdAddress::class,
+            Person\PersonCenterCurrent::class,
         ];
     }
 
@@ -180,6 +222,6 @@ class PersonMove
     {
         return empty($metadata->getSchemaName()) ?
                 $metadata->getTableName() :
-                $metadata->getSchemaName() . '.' . $metadata->getTableName();
+                $metadata->getSchemaName().'.'.$metadata->getTableName();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveManager.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveManager.php
new file mode 100644
index 000000000..0c9230d90
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveManager.php
@@ -0,0 +1,54 @@
+<?php
+
+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 Chill\PersonBundle\Actions\Remove;
+
+use Chill\PersonBundle\Entity\Person;
+
+class PersonMoveManager
+{
+    public function __construct(
+        /**
+         * @var iterable<PersonMoveSqlHandlerInterface>
+         */
+        private readonly iterable $handlers,
+    ) {}
+
+    /**
+     * @param class-string $className
+     */
+    public function hasHandler(string $className, string $field): bool
+    {
+        foreach ($this->handlers as $handler) {
+            if ($handler->supports($className, $field)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param class-string $className
+     *
+     * @return array<string>
+     */
+    public function getSqls(string $className, string $field, Person $from, Person $to): array
+    {
+        foreach ($this->handlers as $handler) {
+            if ($handler->supports($className, $field)) {
+                return $handler->getSqls($className, $field, $from, $to);
+            }
+        }
+
+        return [];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveSqlHandlerInterface.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveSqlHandlerInterface.php
new file mode 100644
index 000000000..f30ca4914
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMoveSqlHandlerInterface.php
@@ -0,0 +1,29 @@
+<?php
+
+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 Chill\PersonBundle\Actions\Remove;
+
+use Chill\PersonBundle\Entity\Person;
+
+interface PersonMoveSqlHandlerInterface
+{
+    /**
+     * @param class-string $className
+     */
+    public function supports(string $className, string $field): bool;
+
+    /**
+     * @param class-string $className
+     *
+     * @return array<string>
+     */
+    public function getSqls(string $className, string $field, Person $from, Person $to): array;
+}
diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
index 7bd337f6b..12df5a0f9 100644
--- a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
@@ -14,10 +14,8 @@ namespace Chill\PersonBundle\CRUD\Controller;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\QueryBuilder;
-use Exception;
 use Symfony\Component\HttpFoundation\Request;
-
-use function array_merge;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Class EntityPersonCRUDController
@@ -67,25 +65,21 @@ class EntityPersonCRUDController extends CRUDController
     }
 
     /**
-     * @param mixed $entity
-     *
-     * @throws Exception
+     * @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__);
+            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)
+            \array_merge(['person' => $person], $defaultTemplateParameters)
         );
     }
 
@@ -121,7 +115,6 @@ class EntityPersonCRUDController extends CRUDController
 
     /**
      * @param string $action
-     * @param mixed $entity
      *
      * @return string
      */
@@ -131,58 +124,35 @@ class EntityPersonCRUDController extends CRUDController
             return $this->getActionConfig($action)['template'];
         }
 
-        switch ($action) {
-            case 'new':
-                return '@ChillPerson/CRUD/new.html.twig';
-
-            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);
-        }
+        return match ($action) {
+            'new' => '@ChillPerson/CRUD/new.html.twig',
+            'edit' => '@ChillPerson/CRUD/edit.html.twig',
+            'view' => '@ChillPerson/CRUD/view.html.twig',
+            'delete' => '@ChillPerson/CRUD/delete.html.twig',
+            'index' => '@ChillPerson/CRUD/index.html.twig',
+            default => parent::getTemplateFor($action, $entity, $request),
+        };
     }
 
-    /**
-     * @param mixed $entity
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
-     */
-    protected function onBeforeRedirectAfterSubmission(string $action, $entity, \Symfony\Component\Form\FormInterface $form, Request $request)
+    protected function onBeforeRedirectAfterSubmission(string $action, $entity, \Symfony\Component\Form\FormInterface $form, Request $request): ?Response
     {
         $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-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', [
-                    'id' => $entity->getId(),
-                    'person_id' => $this->getPerson($request)->getId(),
-                ]);
-
-            default:
-                return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', [
-                    'id' => $entity->getId(),
-                    'person_id' => $this->getPerson($request)->getId(),
-                ]);
-        }
+        return match ($next) {
+            'save-and-close' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index', [
+                'person_id' => $this->getPerson($request)->getId(),
+            ]),
+            'save-and-new' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_new', [
+                'person_id' => $this->getPerson($request)->getId(),
+            ]),
+            'new' => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', [
+                'id' => $entity->getId(),
+                'person_id' => $this->getPerson($request)->getId(),
+            ]),
+            default => $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', [
+                'id' => $entity->getId(),
+                'person_id' => $this->getPerson($request)->getId(),
+            ]),
+        };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
index b5f2cfeec..a163e9bbd 100644
--- a/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
@@ -11,10 +11,8 @@ 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;
@@ -22,9 +20,9 @@ use Symfony\Component\HttpFoundation\Response;
 
 class OneToOneEntityPersonCRUDController extends CRUDController
 {
-    protected function generateRedirectOnCreateRoute($action, Request $request, $entity)
+    protected function generateRedirectOnCreateRoute($action, Request $request, $entity): string
     {
-        throw new BadMethodCallException('Not implemented yet.');
+        throw new \BadMethodCallException('Not implemented yet.');
     }
 
     protected function getEntity($action, $id, Request $request): ?object
@@ -50,21 +48,12 @@ class OneToOneEntityPersonCRUDController extends CRUDController
             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');
-        }
+        return match ($action) {
+            'new' => '@ChillPerson/CRUD/new.html.twig',
+            'edit' => '@ChillPerson/CRUD/edit.html.twig',
+            'index' => '@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
diff --git a/src/Bundle/ChillPersonBundle/ChillPersonBundle.php b/src/Bundle/ChillPersonBundle/ChillPersonBundle.php
index d5ade1de0..8a48cccba 100644
--- a/src/Bundle/ChillPersonBundle/ChillPersonBundle.php
+++ b/src/Bundle/ChillPersonBundle/ChillPersonBundle.php
@@ -11,7 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle;
 
+use Chill\PersonBundle\Actions\Remove\PersonMoveSqlHandlerInterface;
 use Chill\PersonBundle\DependencyInjection\CompilerPass\AccompanyingPeriodTimelineCompilerPass;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
 use Chill\PersonBundle\Widget\PersonListWidgetFactory;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -25,6 +27,10 @@ class ChillPersonBundle extends Bundle
         $container->getExtension('chill_main')
             ->addWidgetFactory(new PersonListWidgetFactory());
 
-        $container->addCompilerPass(new AccompanyingPeriodTimelineCompilerPass());
+        $container->addCompilerPass(new AccompanyingPeriodTimelineCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->registerForAutoconfiguration(AccompanyingPeriodInfoUnionQueryPartInterface::class)
+            ->addTag('chill_person.accompanying_period_info_part');
+        $container->registerForAutoconfiguration(PersonMoveSqlHandlerInterface::class)
+            ->addTag('chill_person.person_move_handler');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
index 231f7b27d..fd86aefbf 100644
--- a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
@@ -21,26 +21,14 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use function ctype_digit;
-
 final class ChillPersonMoveCommand extends Command
 {
-    private LoggerInterface $chillLogger;
-
-    private EntityManagerInterface $em;
-
-    private PersonMove $mover;
-
     public function __construct(
-        PersonMove $mover,
-        EntityManagerInterface $em,
-        LoggerInterface $chillLogger
+        private readonly PersonMove $mover,
+        private readonly EntityManagerInterface $em,
+        private readonly LoggerInterface $chillLogger
     ) {
         parent::__construct('chill:person:move');
-
-        $this->mover = $mover;
-        $this->em = $em;
-        $this->chillLogger = $chillLogger;
     }
 
     protected function buildLoggingContext(Person $from, Person $to, $deleteEntities, $sqls)
@@ -51,11 +39,11 @@ final class ChillPersonMoveCommand extends Command
         ];
 
         foreach ($deleteEntities as $key => $de) {
-            $ctxt['delete_entity_' . $key] = $de;
+            $ctxt['delete_entity_'.$key] = $de;
         }
 
         foreach ($sqls as $key => $sql) {
-            $ctxt['sql_' . $key] = $sql;
+            $ctxt['sql_'.$key] = $sql;
         }
 
         return $ctxt;
@@ -73,7 +61,7 @@ final class ChillPersonMoveCommand extends Command
             ->addOption('delete-entity', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'entity to delete', []);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $repository = $this->em->getRepository(Person::class);
         $from = $repository->find($input->getOption('from'));
@@ -110,6 +98,8 @@ final class ChillPersonMoveCommand extends Command
 
             $this->chillLogger->notice('Move a person from command line succeeded', $ctxt);
         }
+
+        return 0;
     }
 
     protected function interact(InputInterface $input, OutputInterface $output)
@@ -126,9 +116,8 @@ final class ChillPersonMoveCommand extends Command
             }
             $id = $input->getOption($name);
 
-            if (ctype_digit($id) === false) {
-                throw new RuntimeException("The id in \"{$name}\" field does not contains "
-                    . "only digits: {$id}");
+            if (false === \ctype_digit((string) $id)) {
+                throw new RuntimeException("The id in \"{$name}\" field does not contains only digits: {$id}");
             }
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
index 91615935c..6c85548dd 100644
--- a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
@@ -11,51 +11,48 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Command;
 
-use Chill\PersonBundle\Service\Import\ChillImporter;
 use Chill\PersonBundle\Service\Import\SocialWorkMetadataInterface;
 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
 {
     protected EntityManagerInterface $em;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected ChillImporter $importer;
-
     public function __construct(
-        SocialWorkMetadataInterface $socialWorkMetadata
+        protected SocialWorkMetadataInterface $importer
     ) {
         parent::__construct('chill:person:import-socialwork');
-
-        $this->importer = $socialWorkMetadata;
     }
 
     protected function configure()
     {
+        $description = 'Imports a structured table containing social issues, social actions, objectives, results and evaluations.';
+        $help = 'File to csv format, no headers, semi-colon as delimiter, datas sorted by alphabetical order, column after column.'.PHP_EOL
+            .'Columns are: social issues parent, social issues child, social actions parent, social actions child, goals, results, evaluations.'.PHP_EOL
+            .PHP_EOL
+            .'See social_work_metadata.csv as example.'.PHP_EOL;
+
         $this
             ->setName('chill:person:import-socialwork')
             ->addOption('filepath', 'f', InputOption::VALUE_REQUIRED, 'The file to import.')
-            ->addOption('language', 'l', InputOption::VALUE_OPTIONAL, 'The default language');
+            ->addOption('language', 'l', InputOption::VALUE_OPTIONAL, 'The default language')
+            ->setDescription($description)
+            ->setHelp($help);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $filepath = $input->getOption('filepath');
 
         try {
             $csv = Reader::createFromPath($filepath);
-        } catch (Throwable $e) {
-            throw new Exception('Error while loading CSV.', 0, $e);
+        } catch (\Throwable $e) {
+            throw new \Exception('Error while loading CSV.', 0, $e);
         }
 
         $csv->setDelimiter(';');
diff --git a/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
index 8d43df0d3..f826c4d17 100644
--- a/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php
@@ -12,8 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Command;
 
 use Chill\PersonBundle\Service\AccompanyingPeriod\OldDraftAccompanyingPeriodRemoverInterface;
-use DateInterval;
-use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -22,16 +20,9 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class RemoveOldDraftAccompanyingPeriodCommand extends Command
 {
-    private LoggerInterface $logger;
-
-    private OldDraftAccompanyingPeriodRemoverInterface $remover;
-
-    public function __construct(LoggerInterface $logger, OldDraftAccompanyingPeriodRemoverInterface $remover)
+    public function __construct(private readonly LoggerInterface $logger, private readonly OldDraftAccompanyingPeriodRemoverInterface $remover)
     {
         parent::__construct('chill:person:remove-old-draft-period');
-
-        $this->logger = $logger;
-        $this->remover = $remover;
     }
 
     protected function configure(): void
@@ -43,21 +34,21 @@ class RemoveOldDraftAccompanyingPeriodCommand extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $this->logger->info('[' . $this->getName() . '] started', [
+        $this->logger->info('['.$this->getName().'] started', [
             'interval' => $input->getArgument('interval'),
         ]);
 
         try {
-            $interval = new DateInterval($input->getArgument('interval'));
-        } catch (Exception $e) {
-            $this->logger->error('[' . $this->getName() . '] bad interval');
+            $interval = new \DateInterval($input->getArgument('interval'));
+        } catch (\Exception $e) {
+            $this->logger->error('['.$this->getName().'] bad interval');
 
             throw $e;
         }
 
         $this->remover->remove($interval);
 
-        $this->logger->info('[' . $this->getName() . '] end of command');
+        $this->logger->info('['.$this->getName().'] end of command');
 
         return 0;
     }
diff --git a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
index 8c4be9477..3f233c174 100644
--- a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
+++ b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
@@ -17,16 +17,14 @@ namespace Chill\PersonBundle\Config;
 class ConfigPersonAltNamesHelper
 {
     /**
-     * the raw config, directly from the container parameter.
-     *
-     * @var array
+     * @param mixed[] $config
      */
-    private $config = [];
-
-    public function __construct($config)
-    {
-        $this->config = $config;
-    }
+    public function __construct(
+        /**
+         * the raw config, directly from the container parameter.
+         */
+        private $config
+    ) {}
 
     /**
      * get the choices as key => values.
@@ -42,11 +40,11 @@ class ConfigPersonAltNamesHelper
             $cur = reset($labels);
 
             while ($cur) {
-                if (key($labels) === 'lang') {
+                if ('lang' === key($labels)) {
                     $lang = current($labels);
                 }
 
-                if (key($labels) === 'label') {
+                if ('label' === key($labels)) {
                     $label = current($labels);
                 }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
index 70ea1d3c5..7819ebb46 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
@@ -29,8 +29,6 @@ use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateInterval;
-use DateTimeImmutable;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -43,41 +41,12 @@ use Symfony\Component\Serializer\Exception\RuntimeException;
 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;
 
 final class AccompanyingCourseApiController extends ApiController
 {
-    private AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository;
-
-    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
-
-    private EventDispatcherInterface $eventDispatcher;
-
-    private ReferralsSuggestionInterface $referralAvailable;
-
-    private Registry $registry;
-
-    private ValidatorInterface $validator;
-
-    public function __construct(
-        AccompanyingPeriodRepository $accompanyingPeriodRepository,
-        AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository,
-        EventDispatcherInterface $eventDispatcher,
-        ReferralsSuggestionInterface $referralAvailable,
-        Registry $registry,
-        ValidatorInterface $validator
-    ) {
-        $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
-        $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->referralAvailable = $referralAvailable;
-        $this->registry = $registry;
-        $this->validator = $validator;
-    }
+    public function __construct(private readonly AccompanyingPeriodRepository $accompanyingPeriodRepository, private readonly AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository, private readonly EventDispatcherInterface $eventDispatcher, private readonly ReferralsSuggestionInterface $referralAvailable, private readonly Registry $registry, private readonly ValidatorInterface $validator) {}
 
     public function commentApi($id, Request $request, string $_format): Response
     {
@@ -96,7 +65,7 @@ final class AccompanyingCourseApiController extends ApiController
             // throw new BadRequestException('It is not possible to confirm this period');
             $errors = $this->validator->validate($accompanyingPeriod, null, [$accompanyingPeriod::STEP_CONFIRMED]);
 
-            if (count($errors) > 0) {
+            if (\count($errors) > 0) {
                 return $this->json($errors, 422);
             }
         }
@@ -122,7 +91,7 @@ final class AccompanyingCourseApiController extends ApiController
             throw new AccessDeniedException();
         }
 
-        $since = (new DateTimeImmutable('now'))->sub(new DateInterval('P15D'));
+        $since = (new \DateTimeImmutable('now'))->sub(new \DateInterval('P15D'));
 
         $total = $this->accompanyingPeriodRepository->countByRecentUserHistory($user, $since);
 
@@ -169,12 +138,10 @@ final class AccompanyingCourseApiController extends ApiController
         $accompanyingPeriods = $person->getCurrentAccompanyingPeriods();
         $accompanyingPeriodsChecked = array_filter(
             $accompanyingPeriods,
-            function (AccompanyingPeriod $period) {
-                return $this->isGranted(AccompanyingPeriodVoter::SEE, $period);
-            }
+            fn (AccompanyingPeriod $period) => $this->isGranted(AccompanyingPeriodVoter::SEE, $period)
         );
 
-        return $this->json(array_values($accompanyingPeriodsChecked), Response::HTTP_OK, [], ['groups' => ['read']]);
+        return $this->json(\array_values($accompanyingPeriodsChecked), Response::HTTP_OK, [], ['groups' => ['read']]);
     }
 
     public function participationApi($id, Request $request, $_format)
@@ -192,20 +159,11 @@ final class AccompanyingCourseApiController extends ApiController
         //
         $this->onPostCheckACL('participation', $request, $_format, $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 BadRequestHttpException('This method is not supported');
-        }
+        $participation = match ($request->getMethod()) {
+            Request::METHOD_POST => $accompanyingPeriod->createParticipationFor($person),
+            Request::METHOD_DELETE => $accompanyingPeriod->closeParticipationFor($person),
+            default => throw new BadRequestHttpException('This method is not supported'),
+        };
 
         $errors = $this->validator->validate($accompanyingPeriod);
 
@@ -321,13 +279,12 @@ final class AccompanyingCourseApiController extends ApiController
 
     /**
      * @Route("/api/1.0/person/accompanying-course/{id}/confidential.json", name="chill_api_person_accompanying_period_confidential")
-     * @ParamConverter("accompanyingCourse", options={"id": "id"})
      *
-     * @param mixed $id
+     * @ParamConverter("accompanyingCourse", options={"id": "id"})
      */
-    public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, $id, Request $request)
+    public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, mixed $id, Request $request)
     {
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL, $accompanyingCourse);
 
             $accompanyingCourse->setConfidential(!$accompanyingCourse->isConfidential());
@@ -340,14 +297,15 @@ final class AccompanyingCourseApiController extends ApiController
 
     /**
      * @Route("/api/1.0/person/accompanying-course/{id}/intensity.json", name="chill_api_person_accompanying_period_intensity")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "id"})
      */
     public function toggleIntensityApi(AccompanyingPeriod $accompanyingCourse, Request $request)
     {
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_INTENSITY, $accompanyingCourse);
 
-            $status = $accompanyingCourse->getIntensity() === 'regular' ? 'occasional' : 'regular';
+            $status = 'regular' === $accompanyingCourse->getIntensity() ? 'occasional' : 'regular';
             $accompanyingCourse->setIntensity($status);
             $this->getDoctrine()->getManager()->flush();
         }
@@ -372,11 +330,11 @@ final class AccompanyingCourseApiController extends ApiController
     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(),
-            ])
+            ]),
+            AccompanyingPeriodPrivacyEvent::ACCOMPANYING_PERIOD_PRIVACY_EVENT
         );
 
         return null;
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
index 5a6946696..895011085 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php
@@ -16,7 +16,6 @@ use Chill\PersonBundle\Form\AccompanyingCourseCommentType;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodCommentVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
@@ -26,32 +25,18 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseCommentController extends AbstractController
 {
-    private EntityManagerInterface $entityManager;
-
-    private FormFactoryInterface $formFactory;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        EntityManagerInterface $entityManager,
-        FormFactoryInterface $formFactory,
-        TranslatorInterface $translator
-    ) {
-        $this->entityManager = $entityManager;
-        $this->formFactory = $formFactory;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly FormFactoryInterface $formFactory, private readonly TranslatorInterface $translator) {}
 
     /**
      * Page of comments in Accompanying Course section.
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}/comments", name="chill_person_accompanying_period_comment_list")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function commentAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response
@@ -80,13 +65,13 @@ class AccompanyingCourseCommentController extends AbstractController
             }
 
             if (!isset($editForm)) {
-                throw new NotFoundHttpException('comment with id ' . $request->query->getInt('edit') . ' is not found');
+                throw new NotFoundHttpException('comment with id '.$request->query->getInt('edit').' is not found');
             }
 
             if (isset($commentEdited)) {
                 $this->denyAccessUnlessGranted(AccompanyingPeriodCommentVoter::EDIT, $commentEdited);
             } else {
-                throw new LogicException('at this step, commentEdited should be set');
+                throw new \LogicException('at this step, commentEdited should be set');
             }
 
             $editForm->handleRequest($request);
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index f7e3b3800..8c60a6acb 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -19,7 +19,6 @@ 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\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -33,44 +32,16 @@ use Symfony\Component\Workflow\Registry;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_slice;
-use function is_array;
-
 /**
  * Class AccompanyingCourseController.
  */
-class AccompanyingCourseController extends Controller
+class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
 {
-    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,
-        Registry $registry,
-        TranslatorInterface $translator
-    ) {
-        $this->serializer = $serializer;
-        $this->dispatcher = $dispatcher;
-        $this->validator = $validator;
-        $this->workRepository = $workRepository;
-        $this->registry = $registry;
-        $this->translator = $translator;
-    }
+    public function __construct(protected SerializerInterface $serializer, protected EventDispatcherInterface $dispatcher, protected ValidatorInterface $validator, private readonly AccompanyingPeriodWorkRepository $workRepository, private readonly Registry $registry, private readonly TranslatorInterface $translator) {}
 
     /**
      * @Route("/{_locale}/parcours/{accompanying_period_id}/close", name="chill_person_accompanying_course_close")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function closeAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response
@@ -102,7 +73,7 @@ class AccompanyingCourseController extends Controller
             $this->addFlash('error', $this->translator->trans('It is not possible to close this course'));
 
             foreach ($errors as $e) {
-                /** @var ConstraintViolationInterface $e */
+                /* @var ConstraintViolationInterface $e */
                 $this->addFlash('error', $e->getMessage());
             }
         }
@@ -117,6 +88,7 @@ class AccompanyingCourseController extends Controller
      * Delete page of Accompanying Course section.
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}/delete", name="chill_person_accompanying_course_delete")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function deleteAction(Request $request, AccompanyingPeriod $accompanyingCourse)
@@ -134,7 +106,7 @@ class AccompanyingCourseController extends Controller
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -173,6 +145,7 @@ class AccompanyingCourseController extends Controller
      * 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
@@ -190,6 +163,7 @@ class AccompanyingCourseController extends Controller
      * 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
@@ -205,6 +179,7 @@ class AccompanyingCourseController extends Controller
      * Homepage of Accompanying Course section.
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}", name="chill_person_accompanying_course_index")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function indexAction(AccompanyingPeriod $accompanyingCourse): Response
@@ -226,7 +201,7 @@ class AccompanyingCourseController extends Controller
             ['date' => 'DESC', 'id' => 'DESC'],
         );
 
-        $activities = array_slice($activities, 0, 3);
+        $activities = \array_slice($activities, 0, 3);
 
         $works = $this->workRepository->findByAccompanyingPeriod(
             $accompanyingCourse,
@@ -254,7 +229,7 @@ class AccompanyingCourseController extends Controller
         if ($request->query->has('person_id')) {
             $personIds = $request->query->get('person_id');
 
-            if (false === is_array($personIds)) {
+            if (false === \is_array($personIds)) {
                 throw new BadRequestHttpException('person_id parameter should be an array');
             }
 
@@ -316,6 +291,7 @@ class AccompanyingCourseController extends Controller
 
     /**
      * @Route("/{_locale}/parcours/{accompanying_period_id}/open", name="chill_person_accompanying_course_reopen")
+     *
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
     public function reOpenAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
index b7c189155..2a9e4e9da 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
@@ -15,30 +15,23 @@ use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Serializer\Model\Counter;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
-use DateInterval;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
 class AccompanyingCourseWorkApiController extends ApiController
 {
-    private AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository;
-
-    public function __construct(AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository)
-    {
-        $this->accompanyingPeriodWorkRepository = $accompanyingPeriodWorkRepository;
-    }
+    public function __construct(private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository) {}
 
     /**
      * @Route("/api/1.0/person/accompanying-period/work/my-near-end")
      */
     public function myWorksNearEndDate(Request $request): JsonResponse
     {
-        $since = (new DateTimeImmutable('now'))
-            ->sub(new DateInterval('P' . $request->query->getInt('since', 15) . 'D'));
-        $until = (new DateTimeImmutable('now'))
-            ->add(new DateInterval('P' . $request->query->getInt('since', 15) . 'D'));
+        $since = (new \DateTimeImmutable('now'))
+            ->sub(new \DateInterval('P'.$request->query->getInt('since', 15).'D'));
+        $until = (new \DateTimeImmutable('now'))
+            ->add(new \DateInterval('P'.$request->query->getInt('since', 15).'D'));
         $total = $this->accompanyingPeriodWorkRepository
             ->countNearEndDateByUser($this->getUser(), $since, $until);
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
index 8d15ca30f..89ec1ae17 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
@@ -12,45 +12,36 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 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;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-class AccompanyingCourseWorkController extends AbstractController
+final class AccompanyingCourseWorkController extends AbstractController
 {
-    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,
-        LoggerInterface $chillLogger
-    ) {
-        $this->trans = $trans;
-        $this->serializer = $serializer;
-        $this->workRepository = $workRepository;
-        $this->paginator = $paginator;
-        $this->chillLogger = $chillLogger;
-    }
+        private readonly TranslatorInterface $trans,
+        private readonly SerializerInterface $serializer,
+        private readonly AccompanyingPeriodWorkRepository $workRepository,
+        private readonly PaginatorFactory $paginator,
+        private readonly LoggerInterface $chillLogger,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory
+    ) {}
 
     /**
      * @Route(
@@ -63,11 +54,11 @@ class AccompanyingCourseWorkController extends AbstractController
     {
         $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::CREATE, $period);
 
-        if ($period->getSocialIssues()->count() === 0) {
+        if (0 === $period->getSocialIssues()->count()) {
             $this->addFlash(
                 'error',
                 $this->trans->trans(
-                    'accompanying_work.You must add at least ' .
+                    'accompanying_work.You must add at least '.
                     'one social issue on accompanying period'
                 )
             );
@@ -100,7 +91,7 @@ class AccompanyingCourseWorkController extends AbstractController
 
         $form = $this->createDeleteForm($work->getId());
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -162,11 +153,21 @@ class AccompanyingCourseWorkController extends AbstractController
     {
         $this->denyAccessUnlessGranted(AccompanyingPeriodWorkVoter::SEE, $period);
 
+        $filter = $this->buildFilterOrder($period);
+
+        $filterData = [
+            'types' => $filter->hasEntityChoice('typesFilter') ? $filter->getEntityChoiceData('typesFilter') : [],
+            'before' => $filter->getDateRangeData('dateFilter')['to'],
+            'after' => $filter->getDateRangeData('dateFilter')['from'],
+            'user' => $filter->getUserPickerData('userFilter'),
+        ];
+
         $totalItems = $this->workRepository->countByAccompanyingPeriod($period);
         $paginator = $this->paginator->create($totalItems);
 
         $works = $this->workRepository->findByAccompanyingPeriodOpenFirst(
             $period,
+            $filterData,
             $paginator->getItemsPerPage(),
             $paginator->getCurrentPageFirstItemNumber()
         );
@@ -175,6 +176,7 @@ class AccompanyingCourseWorkController extends AbstractController
             'accompanyingCourse' => $period,
             'works' => $works,
             'paginator' => $paginator,
+            'filter' => $filter,
         ]);
     }
 
@@ -199,7 +201,7 @@ class AccompanyingCourseWorkController extends AbstractController
         ]);
     }
 
-    private function createDeleteForm(int $id): Form
+    private function createDeleteForm(int $id): FormInterface
     {
         $params = [];
         $params['id'] = $id;
@@ -210,4 +212,26 @@ class AccompanyingCourseWorkController extends AbstractController
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
     }
+
+    private function buildFilterOrder($associatedPeriod): FilterOrderHelper
+    {
+        $filterBuilder = $this->filterOrderHelperFactory->create(self::class);
+        $types = $this->workRepository->findActionTypeByPeriod($associatedPeriod);
+
+        $filterBuilder
+            ->addDateRange('dateFilter', 'accompanying_course_work.date_filter');
+
+        if (1 < count($types)) {
+            $filterBuilder
+                ->addEntityChoice('typesFilter', 'accompanying_course_work.types_filter', \Chill\PersonBundle\Entity\SocialWork\SocialAction::class, $types, [
+                    'choice_label' => fn (SocialAction $sa) => $this->translatableStringHelper->localize($sa->getTitle()),
+                ]);
+        }
+
+        $filterBuilder
+            ->addUserPicker('userFilter', 'accompanying_course_work.user_filter', ['required' => false])
+        ;
+
+        return $filterBuilder->build();
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php
new file mode 100644
index 000000000..21378b9d7
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php
@@ -0,0 +1,44 @@
+<?php
+
+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 Chill\PersonBundle\Controller;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+
+class AccompanyingCourseWorkEvaluationDocumentController extends AbstractController
+{
+    public function __construct(private readonly Security $security) {}
+
+    /**
+     * @Route(
+     *     "{_locale}/person/accompanying-period/work/evaluation/document/{id}/show",
+     *     name="chill_person_accompanying_period_work_evaluation_document_show",
+     *     methods={"GET"}
+     * )
+     */
+    public function showAccompanyingCourseWork(AccompanyingPeriodWorkEvaluationDocument $document): Response
+    {
+        $work = $document->getAccompanyingPeriodWorkEvaluation()->getAccompanyingPeriodWork();
+
+        return $this->redirectToRoute(
+            $this->security->isGranted(AccompanyingPeriodWorkVoter::UPDATE, $work) ?
+                'chill_person_accompanying_period_work_edit' : 'chill_person_accompanying_period_work_show',
+            [
+                'id' => $work->getId(),
+            ]
+        );
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index e9e27f9c9..c2e236aa9 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -18,7 +18,6 @@ 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;
@@ -27,17 +26,13 @@ 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.
  */
 class AccompanyingPeriodController extends AbstractController
 {
-    protected AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
-
     /**
      * @var EventDispatcherInterface
      */
@@ -49,17 +44,18 @@ class AccompanyingPeriodController extends AbstractController
     protected $validator;
 
     public function __construct(
-        AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
+        protected AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
         EventDispatcherInterface $eventDispatcher,
         ValidatorInterface $validator
     ) {
-        $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
         $this->eventDispatcher = $eventDispatcher;
         $this->validator = $validator;
     }
 
     /**
      * @throws \Exception
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/accompanying-period/close", name="chill_person_accompanying_period_close")
      */
     public function closeAction(int $person_id, Request $request): Response
     {
@@ -67,7 +63,7 @@ class AccompanyingPeriodController extends AbstractController
 
         $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person, 'You are not allowed to update this person');
 
-        if ($person->isOpen() === false) {
+        if (false === $person->isOpen()) {
             $this->get('session')->getFlashBag()
                 ->add('error', $this->get('translator')
                     ->trans(
@@ -75,11 +71,9 @@ class AccompanyingPeriodController extends AbstractController
                         ['%name%' => $person->__toString()]
                     ));
 
-            return $this->redirect(
-                $this->generateUrl('chill_person_accompanying_period_list', [
-                    'person_id' => $person->getId(),
-                ])
-            );
+            return $this->redirectToRoute('chill_person_accompanying_period_list', [
+                'person_id' => $person->getId(),
+            ]);
         }
 
         $current = $person->getCurrentAccompanyingPeriod();
@@ -89,14 +83,14 @@ class AccompanyingPeriodController extends AbstractController
             'center' => $person->getCenter(),
         ]);
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
                 $person->close($current);
                 $errors = $this->_validatePerson($person);
 
-                if (count($errors) === 0) {
+                if (0 === \count($errors)) {
                     $this->get('session')->getFlashBag()
                         ->add('success', $this->get('translator')
                             ->trans('An accompanying period has been closed.', [
@@ -105,11 +99,9 @@ class AccompanyingPeriodController extends AbstractController
 
                     $this->getDoctrine()->getManager()->flush();
 
-                    return $this->redirect(
-                        $this->generateUrl('chill_person_accompanying_period_list', [
-                            'person_id' => $person->getId(),
-                        ])
-                    );
+                    return $this->redirectToRoute('chill_person_accompanying_period_list', [
+                        'person_id' => $person->getId(),
+                    ]);
                 }
                 $this->get('session')->getFlashBag()
                     ->add('error', $this->get('translator')
@@ -119,7 +111,7 @@ class AccompanyingPeriodController extends AbstractController
                     $this->get('session')->getFlashBag()
                         ->add('info', $error->getMessage());
                 }
-            } else { //if form is not valid
+            } else { // if form is not valid
                 $this->get('session')->getFlashBag()
                     ->add(
                         'error',
@@ -134,13 +126,16 @@ class AccompanyingPeriodController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
             'accompanying_period' => $current,
         ]);
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/accompanying-period/create", name="chill_person_accompanying_period_create")
+     */
     public function createAction(int $person_id, Request $request): Response
     {
         $person = $this->_getPerson($person_id);
@@ -151,11 +146,11 @@ class AccompanyingPeriodController extends AbstractController
             'You are not allowed to update this person'
         );
 
-        $accompanyingPeriod = new AccompanyingPeriod(new DateTime('now'));
-        $accompanyingPeriod->setClosingDate(new DateTime('now'));
+        $accompanyingPeriod = new AccompanyingPeriod(new \DateTime('now'));
+        $accompanyingPeriod->setClosingDate(new \DateTime('now'));
 
         $accompanyingPeriod->addPerson($person);
-        //or $person->addAccompanyingPeriod($accompanyingPeriod);
+        // or $person->addAccompanyingPeriod($accompanyingPeriod);
 
         $form = $this->createForm(
             AccompanyingPeriodType::class,
@@ -166,14 +161,14 @@ class AccompanyingPeriodController extends AbstractController
             ]
         );
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
             $errors = $this->_validatePerson($person);
             $flashBag = $this->get('session')->getFlashBag();
 
             if (
                 $form->isValid(['Default', 'closed'])
-                && count($errors) === 0
+                && 0 === \count($errors)
             ) {
                 $em = $this->getDoctrine()->getManager();
                 $em->persist($accompanyingPeriod);
@@ -185,11 +180,9 @@ class AccompanyingPeriodController extends AbstractController
                     )
                 );
 
-                return $this->redirect(
-                    $this->generateUrl('chill_person_accompanying_period_list', [
-                        'person_id' => $person->getId(),
-                    ])
-                );
+                return $this->redirectToRoute('chill_person_accompanying_period_list', [
+                    'person_id' => $person->getId(),
+                ]);
             }
             $flashBag->add('error', $this->get('translator')
                 ->trans('Error! Period not created!'));
@@ -199,7 +192,7 @@ class AccompanyingPeriodController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
             'accompanying_period' => $accompanyingPeriod,
@@ -208,6 +201,8 @@ class AccompanyingPeriodController extends AbstractController
 
     /**
      * @ParamConverter("person", options={"id": "person_id"})
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/accompanying-period", name="chill_person_accompanying_period_list")
      */
     public function listAction(Person $person): Response
     {
@@ -217,19 +212,15 @@ class AccompanyingPeriodController extends AbstractController
             'element_class' => AccompanyingPeriod::class,
             'action' => 'list',
         ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-        $accompanyingPeriodsRaw = $this->accompanyingPeriodACLAwareRepository
-            ->findByPerson($person, AccompanyingPeriodVoter::SEE);
+        $accompanyingPeriods = $this->accompanyingPeriodACLAwareRepository
+            ->findByPerson($person, AccompanyingPeriodVoter::SEE, ['openingDate' => 'DESC', 'id' => 'DESC']);
 
-        usort($accompanyingPeriodsRaw, static function ($a, $b) {
-            return $b->getOpeningDate() > $a->getOpeningDate();
-        });
+        // usort($accompanyingPeriodsRaw, static fn ($a, $b) => $b->getOpeningDate() <=> $a->getOpeningDate());
 
         // filter visible or not visible
-        $accompanyingPeriods = array_filter($accompanyingPeriodsRaw, function (AccompanyingPeriod $ap) {
-            return $this->isGranted(AccompanyingPeriodVoter::SEE, $ap);
-        });
+        // $accompanyingPeriods = array_filter($accompanyingPeriodsRaw, fn (AccompanyingPeriod $ap) => $this->isGranted(AccompanyingPeriodVoter::SEE, $ap));
 
         return $this->render('@ChillPerson/AccompanyingPeriod/list.html.twig', [
             'accompanying_periods' => $accompanyingPeriods,
@@ -237,6 +228,9 @@ class AccompanyingPeriodController extends AbstractController
         ]);
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/accompanying-period/open", name="chill_person_accompanying_period_open")
+     */
     public function openAction(int $person_id, Request $request): Response
     {
         $person = $this->_getPerson($person_id);
@@ -247,7 +241,7 @@ class AccompanyingPeriodController extends AbstractController
             'You are not allowed to update this person'
         );
 
-        //in case the person is already open
+        // in case the person is already open
         if ($person->isOpen()) {
             $this->get('session')->getFlashBag()
                 ->add('error', $this->get('translator')
@@ -256,14 +250,12 @@ class AccompanyingPeriodController extends AbstractController
                         ['%name%' => $person->__toString()]
                     ));
 
-            return $this->redirect(
-                $this->generateUrl('chill_person_accompanying_period_list', [
-                    'person_id' => $person->getId(),
-                ])
-            );
+            return $this->redirectToRoute('chill_person_accompanying_period_list', [
+                'person_id' => $person->getId(),
+            ]);
         }
 
-        $accompanyingPeriod = new AccompanyingPeriod(new DateTime());
+        $accompanyingPeriod = new AccompanyingPeriod(new \DateTime());
 
         $form = $this->createForm(
             AccompanyingPeriodType::class,
@@ -274,7 +266,7 @@ class AccompanyingPeriodController extends AbstractController
             ]
         );
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -282,7 +274,7 @@ class AccompanyingPeriodController extends AbstractController
 
                 $errors = $this->_validatePerson($person);
 
-                if (count($errors) <= 0) {
+                if (\count($errors) <= 0) {
                     $this->get('session')->getFlashBag()
                         ->add('success', $this->get('translator')
                             ->trans(
@@ -292,11 +284,9 @@ class AccompanyingPeriodController extends AbstractController
 
                     $this->getDoctrine()->getManager()->flush();
 
-                    return $this->redirect(
-                        $this->generateUrl('chill_person_accompanying_period_list', [
-                            'person_id' => $person->getId(),
-                        ])
-                    );
+                    return $this->redirectToRoute('chill_person_accompanying_period_list', [
+                        'person_id' => $person->getId(),
+                    ]);
                 }
                 $this->get('session')->getFlashBag()
                     ->add('error', $this->get('translator')
@@ -316,24 +306,25 @@ class AccompanyingPeriodController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
             'accompanying_period' => $accompanyingPeriod,
         ]);
     }
 
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/accompanying-period/{period_id}/re-open", name="chill_person_accompanying_period_re_open")
+     */
     public function reOpenAction(int $person_id, int $period_id, Request $request): Response
     {
         /** @var Person $person */
         $person = $this->_getPerson($person_id);
 
         /** @var AccompanyingPeriod $period */
-        $period = array_filter(
+        $period = \array_filter(
             $person->getAccompanyingPeriods(),
-            static function (AccompanyingPeriod $p) use ($period_id) {
-                return $p->getId() === ($period_id);
-            }
+            static fn (AccompanyingPeriod $p) => $p->getId() === $period_id
         )[0] ?? null;
 
         if (null === $period) {
@@ -359,7 +350,7 @@ class AccompanyingPeriodController extends AbstractController
         }
 
         if (false === $confirm && $period->canBeReOpened($person)) {
-            return $this->render('ChillPersonBundle:AccompanyingPeriod:re_open.html.twig', [
+            return $this->render('@ChillPerson/AccompanyingPeriod/re_open.html.twig', [
                 'period' => $period,
                 'person' => $person,
             ]);
@@ -372,6 +363,8 @@ class AccompanyingPeriodController extends AbstractController
 
     /**
      * @throws Exception
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/accompanying-period/{period_id}/update", name="chill_person_accompanying_period_update")
      */
     public function updateAction(int $person_id, int $period_id, Request $request): Response
     {
@@ -381,7 +374,7 @@ class AccompanyingPeriodController extends AbstractController
         $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($period_id);
 
         if (null === $accompanyingPeriod) {
-            throw $this->createNotFoundException('Period with id ' . $period_id . ' is not found');
+            throw $this->createNotFoundException('Period with id '.$period_id.' is not found');
         }
 
         /** @var Person $person */
@@ -389,7 +382,7 @@ class AccompanyingPeriodController extends AbstractController
 
         // CHECK
         if (!$accompanyingPeriod->containsPerson($person)) {
-            throw new Exception('Accompanying period ' . $period_id . ' does not contain person ' . $person_id);
+            throw new Exception('Accompanying period '.$period_id.' does not contain person '.$person_id);
         }
 
         $this->denyAccessUnlessGranted(
@@ -407,14 +400,14 @@ class AccompanyingPeriodController extends AbstractController
             ]
         );
 
-        if ($request->getMethod() === 'POST') {
+        if ('POST' === $request->getMethod()) {
             $form->handleRequest($request);
             $errors = $this->_validatePerson($person);
             $flashBag = $this->get('session')->getFlashBag();
 
             if (
                 $form->isValid(['Default', 'closed'])
-                    && count($errors) === 0
+                    && 0 === \count($errors)
             ) {
                 $em->flush();
 
@@ -423,11 +416,9 @@ class AccompanyingPeriodController extends AbstractController
                     $this->get('translator')->trans('An accompanying period has been updated.')
                 );
 
-                return $this->redirect(
-                    $this->generateUrl('chill_person_accompanying_period_list', [
-                        'person_id' => $person->getId(),
-                    ])
-                );
+                return $this->redirectToRoute('chill_person_accompanying_period_list', [
+                    'person_id' => $person->getId(),
+                ]);
             }
 
             $flashBag->add('error', $this->get('translator')
@@ -438,7 +429,7 @@ class AccompanyingPeriodController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
             'accompanying_period' => $accompanyingPeriod,
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
index a91b0f5ff..f5516114f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php
@@ -28,31 +28,10 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 
 class AccompanyingPeriodRegulationListController
 {
-    private AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
-
-    private EngineInterface $engine;
-
-    private FormFactoryInterface $formFactory;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private Security $security;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository, EngineInterface $engine, FormFactoryInterface $formFactory, PaginatorFactory $paginatorFactory, Security $security, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
-        $this->engine = $engine;
-        $this->formFactory = $formFactory;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->security = $security;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository, private readonly \Twig\Environment $engine, private readonly FormFactoryInterface $formFactory, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     /**
      * @Route("/{_locale}/person/periods/undispatched", name="chill_person_course_list_regulation")
@@ -78,6 +57,7 @@ class AccompanyingPeriodRegulationListController
                 $form['jobs']->getData(),
                 $form['services']->getData(),
                 $form['locations']->getData(),
+                ['openingDate' => 'DESC', 'id' => 'DESC'],
                 $paginator->getItemsPerPage(),
                 $paginator->getCurrentPageFirstItemNumber()
             );
@@ -105,12 +85,8 @@ class AccompanyingPeriodRegulationListController
         $builder
             ->add('services', EntityType::class, [
                 'class' => Scope::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('s');
-                },
-                'choice_label' => function (Scope $s) {
-                    return $this->translatableStringHelper->localize($s->getName());
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('s'),
+                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
                 'multiple' => true,
                 'label' => 'Service',
                 'required' => false,
@@ -123,9 +99,7 @@ class AccompanyingPeriodRegulationListController
 
                     return $qb;
                 },
-                'choice_label' => function (UserJob $j) {
-                    return $this->translatableStringHelper->localize($j->getLabel());
-                },
+                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
                 'multiple' => true,
                 'label' => 'Métier',
                 'required' => false,
@@ -147,9 +121,7 @@ class AccompanyingPeriodRegulationListController
 
                     return $qb;
                 },
-                'choice_label' => static function (Location $l) {
-                    return $l->getName();
-                },
+                'choice_label' => static fn (Location $l) => $l->getName(),
                 'multiple' => true,
                 'group_by' => function (Location $l) {
                     if (null === $type = $l->getLocationType()) {
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
index e41ab07c7..60b8e9cff 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
@@ -27,34 +27,9 @@ use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
 
-use function count;
-use function in_array;
-
 class AccompanyingPeriodWorkEvaluationApiController
 {
-    private AccompanyingPeriodWorkEvaluationRepository $accompanyingPeriodWorkEvaluationRepository;
-
-    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private Security $security;
-
-    private SerializerInterface $serializer;
-
-    public function __construct(
-        AccompanyingPeriodWorkEvaluationRepository $accompanyingPeriodWorkEvaluationRepository,
-        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
-        SerializerInterface $serializer,
-        PaginatorFactory $paginatorFactory,
-        Security $security
-    ) {
-        $this->accompanyingPeriodWorkEvaluationRepository = $accompanyingPeriodWorkEvaluationRepository;
-        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
-        $this->serializer = $serializer;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->security = $security;
-    }
+    public function __construct(private readonly AccompanyingPeriodWorkEvaluationRepository $accompanyingPeriodWorkEvaluationRepository, private readonly DocGeneratorTemplateRepository $docGeneratorTemplateRepository, private readonly SerializerInterface $serializer, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security) {}
 
     /**
      * @Route("/api/1.0/person/docgen/template/by-evaluation/{id}.{_format}",
@@ -73,12 +48,12 @@ class AccompanyingPeriodWorkEvaluationApiController
                 static function (DocGeneratorTemplate $t) use ($evaluation) {
                     $ids = $t->getOptions()['evaluations'] ?? [];
 
-                    return in_array($evaluation->getId(), $ids, true);
+                    return \in_array($evaluation->getId(), $ids, true);
                 }
             );
 
-        $paginator = $this->paginatorFactory->create(count($evaluations));
-        $paginator->setItemsPerPage(count($evaluations));
+        $paginator = $this->paginatorFactory->create(\count($evaluations));
+        $paginator->setItemsPerPage(\count($evaluations));
 
         return new JsonResponse($this->serializer->serialize(
             new Collection(array_values($evaluations), $paginator),
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
index 37218d686..7f973d50a 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
@@ -24,7 +24,7 @@ class AdminController extends AbstractController
      */
     public function indexAccompanyingCourseAdminAction()
     {
-        return $this->render('ChillPersonBundle:Admin:indexAccompanyingCourse.html.twig');
+        return $this->render('@ChillPerson/Admin/indexAccompanyingCourse.html.twig');
     }
 
     /**
@@ -32,7 +32,7 @@ class AdminController extends AbstractController
      */
     public function indexHouseholdAdminAction()
     {
-        return $this->render('ChillPersonBundle:Admin:indexHousehold.html.twig');
+        return $this->render('@ChillPerson/Admin/indexHousehold.html.twig');
     }
 
     /**
@@ -40,7 +40,7 @@ class AdminController extends AbstractController
      */
     public function indexPersonAdminAction()
     {
-        return $this->render('ChillPersonBundle:Admin:indexPerson.html.twig');
+        return $this->render('@ChillPerson/Admin/indexPerson.html.twig');
     }
 
     /**
@@ -48,11 +48,13 @@ class AdminController extends AbstractController
      */
     public function indexSocialWorkAdminAction()
     {
-        return $this->render('ChillPersonBundle:Admin:indexSocialWork.html.twig');
+        return $this->render('@ChillPerson/Admin/indexSocialWork.html.twig');
     }
 
     /**
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/person_redirect_to_main", name="chill_person_admin_redirect_to_admin_index", options={null})
      */
     public function redirectToAdminIndexAction()
     {
diff --git a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
index 8a2e704ce..2943615f5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
@@ -52,7 +52,7 @@ class ClosingMotiveController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
+        /* @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.ordering', 'ASC');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
index 19080923e..a5b1081d5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
@@ -22,34 +22,16 @@ use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
 use Chill\PersonBundle\Repository\Household\HouseholdACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
-use DateTimeImmutable;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use function array_filter;
-use function array_values;
 
 class HouseholdApiController extends ApiController
 {
-    private EventDispatcherInterface $eventDispatcher;
-
-    private HouseholdACLAwareRepositoryInterface $householdACLAwareRepository;
-
-    private HouseholdRepository $householdRepository;
-
-    public function __construct(
-        EventDispatcherInterface $eventDispatcher,
-        HouseholdRepository $householdRepository,
-        HouseholdACLAwareRepositoryInterface $householdACLAwareRepository
-    ) {
-        $this->eventDispatcher = $eventDispatcher;
-        $this->householdRepository = $householdRepository;
-        $this->householdACLAwareRepository = $householdACLAwareRepository;
-    }
+    public function __construct(private readonly EventDispatcherInterface $eventDispatcher, private readonly HouseholdRepository $householdRepository, private readonly HouseholdACLAwareRepositoryInterface $householdACLAwareRepository) {}
 
     /**
      * @Route("/api/1.0/person/household/by-address-reference/{id}.json",
@@ -93,9 +75,9 @@ class HouseholdApiController extends ApiController
         $household->addAddress($address);
 
         foreach ($household->getMembersOnRange(
-            DateTimeImmutable::createFromMutable($address->getValidFrom()),
+            \DateTimeImmutable::createFromMutable($address->getValidFrom()),
             null === $address->getValidTo() ? null :
-                DateTimeImmutable::createFromMutable($address->getValidTo())
+                \DateTimeImmutable::createFromMutable($address->getValidTo())
         ) as $member) {
             /** @var HouseholdMember $member */
             $event = new PersonAddressMoveEvent($member->getPerson());
@@ -128,6 +110,7 @@ class HouseholdApiController extends ApiController
      *         "_format": "json"
      *     }
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function suggestAddressByHousehold(Household $household, string $_format)
@@ -160,11 +143,11 @@ class HouseholdApiController extends ApiController
         $actual = $household->getCurrentAddress();
 
         if (null !== $actual) {
-            $addresses = array_filter($addresses, static fn ($a) => $a !== $actual);
+            $addresses = \array_filter($addresses, static fn ($a) => $a !== $actual);
         }
 
         return $this->json(
-            array_values($addresses),
+            \array_values($addresses),
             Response::HTTP_OK,
             [],
             ['groups' => ['read']]
@@ -200,7 +183,7 @@ class HouseholdApiController extends ApiController
             }
 
             if (null !== $currentHouseholdPerson) {
-                $count = $count - 1;
+                --$count;
                 $paginator = $this->getPaginatorFactory()->create($count);
             }
         }
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index 43d35934b..00503ab3e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Form\HouseholdCompositionType;
 use Chill\PersonBundle\Repository\Household\HouseholdCompositionRepository;
 use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -31,58 +30,26 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HouseholdCompositionController extends AbstractController
 {
-    private EngineInterface $engine;
-
-    private EntityManagerInterface $entityManager;
-
-    private FormFactoryInterface $formFactory;
-
-    private HouseholdCompositionRepository $householdCompositionRepository;
-
-    private HouseholdRepository $householdRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private Security $security;
-
-    private TranslatorInterface $translator;
-
-    private UrlGeneratorInterface $urlGenerator;
-
     public function __construct(
-        Security $security,
-        HouseholdCompositionRepository $householdCompositionRepository,
-        HouseholdRepository $householdRepository,
-        PaginatorFactory $paginatorFactory,
-        FormFactoryInterface $formFactory,
-        EntityManagerInterface $entityManager,
-        TranslatorInterface $translator,
-        EngineInterface $engine,
-        UrlGeneratorInterface $urlGenerator
-    ) {
-        $this->security = $security;
-        $this->householdCompositionRepository = $householdCompositionRepository;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->formFactory = $formFactory;
-        $this->entityManager = $entityManager;
-        $this->translator = $translator;
-        $this->engine = $engine;
-        $this->urlGenerator = $urlGenerator;
-        $this->householdRepository = $householdRepository;
-    }
+        private readonly Security $security,
+        private readonly HouseholdCompositionRepository $householdCompositionRepository,
+        private readonly HouseholdRepository $householdRepository,
+        private readonly PaginatorFactory $paginatorFactory,
+        private readonly FormFactoryInterface $formFactory,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly TranslatorInterface $translator,
+        private readonly \Twig\Environment $engine,
+        private readonly UrlGeneratorInterface $urlGenerator
+    ) {}
 
     /**
      * @Route("/{_locale}/person/household/{household_id}/composition/{composition_id}/delete", name="chill_person_household_composition_delete")
-     *
-     * @param mixed $household_id
-     * @param mixed $composition_id
      */
-    public function deleteAction(Request $request, $household_id, $composition_id): Response
+    public function deleteAction(Request $request, mixed $household_id, mixed $composition_id): Response
     {
         $composition = $this->householdCompositionRepository->find($composition_id);
         $household = $this->householdRepository->find($household_id);
@@ -102,7 +69,7 @@ class HouseholdCompositionController extends AbstractController
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -119,7 +86,7 @@ class HouseholdCompositionController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:HouseholdComposition:delete.html.twig',
+            '@ChillPerson/HouseholdComposition/delete.html.twig',
             [
                 'household' => $household,
                 'composition' => $composition,
@@ -164,17 +131,15 @@ class HouseholdCompositionController extends AbstractController
             $isEdit = $request->query->has('edit');
 
             if ($isEdit) {
-                $householdCompositions = $household->getCompositions()->filter(static function (HouseholdComposition $composition) use ($request) {
-                    return $composition->getId() === $request->query->getInt('edit');
-                });
+                $householdCompositions = $household->getCompositions()->filter(static fn (HouseholdComposition $composition) => $composition->getId() === $request->query->getInt('edit'));
 
-                if ($householdCompositions->count() !== 1) {
+                if (1 !== $householdCompositions->count()) {
                     throw new BadRequestHttpException('could not find the composition with this id associated to the household');
                 }
                 $householdComposition = $householdCompositions->first();
             } else {
                 $householdComposition = (new HouseholdComposition())
-                    ->setStartDate(new DateTimeImmutable());
+                    ->setStartDate(new \DateTimeImmutable());
             }
             $form = $this->formFactory->create(HouseholdCompositionType::class, $householdComposition);
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
index dc332acdd..0d792d6ac 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Controller;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
-use UnexpectedValueException;
 
 class HouseholdCompositionTypeApiController extends ApiController
 {
@@ -23,14 +22,9 @@ class HouseholdCompositionTypeApiController extends ApiController
      */
     protected function customizeQuery(string $action, Request $request, $query): void
     {
-        switch ($action) {
-            case '_index':
-                $query->andWhere($query->expr()->eq('e.active', "'TRUE'"));
-
-                break;
-
-            default:
-                throw new UnexpectedValueException('unexepcted action: ' . $action);
-        }
+        match ($action) {
+            '_index' => $query->andWhere($query->expr()->eq('e.active', "'TRUE'")),
+            default => throw new \UnexpectedValueException('unexepcted action: '.$action),
+        };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 7b9eb0084..c85edaaf7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -29,33 +29,12 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function count;
-
 /**
  * @Route("/{_locale}/person/household")
  */
 class HouseholdController extends AbstractController
 {
-    private 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;
-    }
+    public function __construct(private readonly TranslatorInterface $translator, private readonly PositionRepository $positionRepository, private readonly SerializerInterface $serializer, private readonly Security $security) {}
 
     /**
      * @Route(
@@ -63,6 +42,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_accompanying_period",
      *     methods={"GET", "HEAD"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function accompanyingPeriod(Request $request, Household $household)
@@ -81,9 +61,7 @@ class HouseholdController extends AbstractController
             }
         }
 
-        usort($accompanyingPeriods, static function ($a, $b) {
-            return $b->getOpeningDate() <=> $a->getOpeningDate();
-        });
+        usort($accompanyingPeriods, static fn ($a, $b) => $b->getOpeningDate() <=> $a->getOpeningDate());
 
         $oldMembers = $household->getNonCurrentMembers();
         $accompanyingPeriodsOld = [];
@@ -97,7 +75,7 @@ class HouseholdController extends AbstractController
                 }
                 $id = $accompanyingPeriod->getId();
 
-                if (!array_key_exists($id, $accompanyingPeriodsOld) && !array_key_exists($id, $accompanyingPeriods)) {
+                if (!\array_key_exists($id, $accompanyingPeriodsOld) && !\array_key_exists($id, $accompanyingPeriods)) {
                     $accompanyingPeriodsOld[$id] = $accompanyingPeriod;
                 }
             }
@@ -119,6 +97,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_address_edit",
      *     methods={"GET", "HEAD", "POST"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function addressEdit(Request $request, Household $household)
@@ -145,17 +124,18 @@ class HouseholdController extends AbstractController
      *     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
+        // TODO put these lines into a validator constraint on household->getAddress
         $addresses = $household->getAddresses();
         $cond = true;
 
-        for ($i = 0; count($addresses) - 1 > $i; ++$i) {
+        for ($i = 0; \count($addresses) - 1 > $i; ++$i) {
             if ($addresses[$i]->getValidFrom() !== $addresses[$i + 1]->getValidTo()) {
                 $cond = false;
             }
@@ -175,6 +155,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_address_move",
      *     methods={"GET", "HEAD", "POST"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function addressMove(Request $request, Household $household)
@@ -195,6 +176,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_address_valid_from_edit",
      *     methods={"GET", "HEAD", "POST"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function addressValidFromEdit(Request $request, Household $household)
@@ -251,6 +233,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_members_metadata_edit",
      *     methods={"GET", "POST"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function editHouseholdMetadata(Request $request, Household $household)
@@ -282,6 +265,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_relationship",
      *     methods={"GET", "HEAD"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function showRelationship(Request $request, Household $household)
@@ -307,6 +291,7 @@ class HouseholdController extends AbstractController
      *     name="chill_person_household_summary",
      *     methods={"GET", "HEAD"}
      * )
+     *
      * @ParamConverter("household", options={"id": "household_id"})
      */
     public function summary(Request $request, Household $household)
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
index d286cb270..7f895d478 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
@@ -28,25 +28,9 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\Exception;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function count;
-
 class HouseholdMemberController extends ApiController
 {
-    private UrlGeneratorInterface $generator;
-
-    private AccompanyingPeriodRepository $periodRepository;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        UrlGeneratorInterface $generator,
-        TranslatorInterface $translator,
-        AccompanyingPeriodRepository $periodRepository
-    ) {
-        $this->generator = $generator;
-        $this->translator = $translator;
-        $this->periodRepository = $periodRepository;
-    }
+    public function __construct(private readonly UrlGeneratorInterface $generator, private readonly TranslatorInterface $translator, private readonly AccompanyingPeriodRepository $periodRepository) {}
 
     /**
      * @Route(
@@ -104,9 +88,8 @@ class HouseholdMemberController extends ApiController
         if ($request->query->has('persons')) {
             $ids = $request->query->get('persons', []);
 
-            if (0 === count($ids)) {
-                throw new BadRequestHttpException('parameters persons in query ' .
-                    'is not an array or empty');
+            if (0 === \count($ids)) {
+                throw new BadRequestHttpException('parameters persons in query is not an array or empty');
             }
 
             $persons = $em->getRepository(Person::class)
@@ -175,10 +158,8 @@ class HouseholdMemberController extends ApiController
      *     "/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
+    public function move(Request $request, mixed $_format): Response
     {
         try {
             /** @var MembersEditor $editor */
@@ -197,7 +178,7 @@ class HouseholdMemberController extends ApiController
         //
         $errors = $editor->validate();
 
-        if (count($errors) > 0) {
+        if (\count($errors) > 0) {
             return $this->json($errors, 422);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
index accb7996d..88ebd05e9 100644
--- a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
-use DateTime;
 use Symfony\Component\HttpFoundation\Request;
 
 class OpeningApiController extends ApiController
@@ -21,6 +20,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 59ef949cf..975b44436 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
@@ -19,8 +19,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-use function count;
-
 /**
  * Class PersonAddressController
  * Controller for addresses associated with person.
@@ -40,15 +38,17 @@ class PersonAddressController extends AbstractController
         $this->validator = $validator;
     }
 
-    public function createAction($person_id, Request $request)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/address/create", name="chill_person_address_create", methods={"POST"})
+     */
+    public function createAction(mixed $person_id, Request $request)
     {
         $person = $this->getDoctrine()->getManager()
             ->getRepository(\Chill\PersonBundle\Entity\Person::class)
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -67,7 +67,7 @@ class PersonAddressController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $validatePersonErrors = $this->validatePerson($person);
 
-            if (count($validatePersonErrors) !== 0) {
+            if (0 !== \count($validatePersonErrors)) {
                 foreach ($validatePersonErrors as $error) {
                     $this->addFlash('error', $error->getMessage());
                 }
@@ -89,21 +89,23 @@ class PersonAddressController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:Address:new.html.twig', [
+        return $this->render('@ChillPerson/Address/new.html.twig', [
             'person' => $person,
             'form' => $form->createView(),
         ]);
     }
 
-    public function editAction($person_id, $address_id)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/address/{address_id}/edit", name="chill_person_address_edit")
+     */
+    public function editAction(mixed $person_id, mixed $address_id)
     {
         $person = $this->getDoctrine()->getManager()
             ->getRepository(\Chill\PersonBundle\Entity\Person::class)
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -116,22 +118,24 @@ class PersonAddressController extends AbstractController
 
         $form = $this->createEditForm($person, $address);
 
-        return $this->render('ChillPersonBundle:Address:edit.html.twig', [
+        return $this->render('@ChillPerson/Address/edit.html.twig', [
             'person' => $person,
             'address' => $address,
             'form' => $form->createView(),
         ]);
     }
 
-    public function listAction($person_id)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/address/list", name="chill_person_address_list")
+     */
+    public function listAction(mixed $person_id)
     {
         $person = $this->getDoctrine()->getManager()
             ->getRepository(\Chill\PersonBundle\Entity\Person::class)
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -140,20 +144,22 @@ class PersonAddressController extends AbstractController
             'You are not allowed to edit this person.'
         );
 
-        return $this->render('ChillPersonBundle:Address:list.html.twig', [
+        return $this->render('@ChillPerson/Address/list.html.twig', [
             'person' => $person,
         ]);
     }
 
-    public function newAction($person_id)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/address/new", name="chill_person_address_new")
+     */
+    public function newAction(mixed $person_id)
     {
         $person = $this->getDoctrine()->getManager()
             ->getRepository(\Chill\PersonBundle\Entity\Person::class)
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -166,21 +172,23 @@ class PersonAddressController extends AbstractController
 
         $form = $this->createCreateForm($person, $address);
 
-        return $this->render('ChillPersonBundle:Address:new.html.twig', [
+        return $this->render('@ChillPerson/Address/new.html.twig', [
             'person' => $person,
             'form' => $form->createView(),
         ]);
     }
 
-    public function updateAction($person_id, $address_id, Request $request)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/address/{address_id}/update", name="chill_person_address_update")
+     */
+    public function updateAction(mixed $person_id, mixed $address_id, Request $request)
     {
         $person = $this->getDoctrine()->getManager()
             ->getRepository(\Chill\PersonBundle\Entity\Person::class)
             ->find($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                . ' found ');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found ');
         }
 
         $this->denyAccessUnlessGranted(
@@ -197,7 +205,7 @@ class PersonAddressController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $validatePersonErrors = $this->validatePerson($person);
 
-            if (count($validatePersonErrors) !== 0) {
+            if (0 !== \count($validatePersonErrors)) {
                 foreach ($validatePersonErrors as $error) {
                     $this->addFlash('error', $error->getMessage());
                 }
@@ -218,7 +226,7 @@ class PersonAddressController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:Address:edit.html.twig', [
+        return $this->render('@ChillPerson/Address/edit.html.twig', [
             'person' => $person,
             'address' => $address,
             'form' => $form->createView(),
@@ -269,9 +277,9 @@ class PersonAddressController extends AbstractController
     /**
      * @param int $address_id
      *
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the address id does not exists or is not associated with given person
-     *
      * @return Address
+     *
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the address id does not exists or is not associated with given person
      */
     protected function findAddressById(Person $person, $address_id)
     {
@@ -287,8 +295,6 @@ class PersonAddressController extends AbstractController
     }
 
     /**
-     * @param Chill\PersonBundle\Entity\Person $person
-     *
      * @return \Symfony\Component\Validator\ConstraintViolationListInterface
      */
     private function validatePerson(Person $person)
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
index bf0d998ff..01008f240 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
@@ -23,23 +23,16 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use function in_array;
 
 class PersonApiController extends ApiController
 {
-    private AuthorizedCenterOnPersonCreationInterface $authorizedCenterOnPersonCreation;
-
-    private ConfigPersonAltNamesHelper $configPersonAltNameHelper;
-
-    private bool $showCenters;
+    private readonly bool $showCenters;
 
     public function __construct(
-        AuthorizedCenterOnPersonCreationInterface $authorizedCenterOnPersonCreation,
-        ConfigPersonAltNamesHelper $configPersonAltNameHelper,
+        private readonly AuthorizedCenterOnPersonCreationInterface $authorizedCenterOnPersonCreation,
+        private readonly ConfigPersonAltNamesHelper $configPersonAltNameHelper,
         ParameterBagInterface $parameterBag
     ) {
-        $this->authorizedCenterOnPersonCreation = $authorizedCenterOnPersonCreation;
-        $this->configPersonAltNameHelper = $configPersonAltNameHelper;
         $this->showCenters = $parameterBag->get('chill_main')['acl']['form_show_centers'];
     }
 
@@ -56,7 +49,7 @@ class PersonApiController extends ApiController
             ['showCenters' => $this->showCenters, 'centers' => $centers],
             Response::HTTP_OK,
             [],
-            ['gropus' => ['read']]
+            ['groups' => ['read']]
         );
     }
 
@@ -96,6 +89,7 @@ class PersonApiController extends ApiController
      *         "_format": "json"
      *     }
      * )
+     *
      * @ParamConverter("person", options={"id": "person_id"})
      */
     public function suggestAddress(Person $person, Request $request, string $_format): Response
@@ -108,14 +102,10 @@ class PersonApiController extends ApiController
         $addresses = $person
             ->getAccompanyingPeriodParticipations()
             ->filter(
-                static function (AccompanyingPeriodParticipation $accompanyingPeriodParticipation): bool {
-                    return null !== $accompanyingPeriodParticipation->getAccompanyingPeriod()->getAddressLocation();
-                }
+                static fn (AccompanyingPeriodParticipation $accompanyingPeriodParticipation): bool => null !== $accompanyingPeriodParticipation->getAccompanyingPeriod()->getAddressLocation()
             )
             ->map(
-                static function (AccompanyingPeriodParticipation $accompanyingPeriodParticipation): ?Address {
-                    return $accompanyingPeriodParticipation->getAccompanyingPeriod()->getAddressLocation();
-                }
+                static fn (AccompanyingPeriodParticipation $accompanyingPeriodParticipation): ?Address => $accompanyingPeriodParticipation->getAccompanyingPeriod()->getAddressLocation()
             )
             ->filter(
                 // We remove potential null addresses.
@@ -125,7 +115,7 @@ class PersonApiController extends ApiController
                 static function (Address $address) use (&$seenAddressIds): bool {
                     $id = $address->getId();
 
-                    if (in_array($id, $seenAddressIds, true)) {
+                    if (\in_array($id, $seenAddressIds, true)) {
                         return false;
                     }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index ae12c566d..f9c24d2d4 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Controller;
 
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Household\Household;
@@ -23,9 +22,7 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTimeImmutable;
 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;
@@ -35,83 +32,27 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 use function hash;
-use function implode;
-use function in_array;
-use function is_array;
 
 final class PersonController extends AbstractController
 {
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    /**
-     * @var ConfigPersonAltNamesHelper
-     */
-    protected $configPersonAltNameHelper;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-
-    /**
-     * @var PersonRepository;
-     */
-    protected $personRepository;
-
-    /**
-     * @var SimilarPersonMatcher
-     */
-    protected $similarPersonMatcher;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    /**
-     * @var EntityManagerInterface
-     */
-    private $em;
-
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var ValidatorInterface
-     */
-    private $validator;
-
     public function __construct(
-        AuthorizationHelperInterface $authorizationHelper,
-        SimilarPersonMatcher $similarPersonMatcher,
-        TranslatorInterface $translator,
-        EventDispatcherInterface $eventDispatcher,
-        PersonRepository $personRepository,
-        ConfigPersonAltNamesHelper $configPersonAltNameHelper,
-        LoggerInterface $logger,
-        ValidatorInterface $validator,
-        EntityManagerInterface $em,
-    ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->similarPersonMatcher = $similarPersonMatcher;
-        $this->translator = $translator;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->configPersonAltNameHelper = $configPersonAltNameHelper;
-        $this->personRepository = $personRepository;
-        $this->logger = $logger;
-        $this->validator = $validator;
-        $this->em = $em;
-    }
+        private readonly AuthorizationHelperInterface $authorizationHelper,
+        private readonly SimilarPersonMatcher $similarPersonMatcher,
+        private readonly TranslatorInterface $translator,
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly PersonRepository $personRepository,
+        private readonly ConfigPersonAltNamesHelper $configPersonAltNameHelper,
+        private readonly ValidatorInterface $validator,
+        private readonly EntityManagerInterface $em,
+    ) {}
 
-    public function editAction($person_id, Request $request)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/general/edit", name="chill_person_general_edit")
+     */
+    public function editAction(int $person_id, Request $request)
     {
         $person = $this->_getPerson($person_id);
 
@@ -145,7 +86,7 @@ final class PersonController extends AbstractController
             $this->get('session')->getFlashBag()
                 ->add(
                     'success',
-                    $this->get('translator')
+                    $this->translator
                         ->trans('The person data has been updated')
                 );
 
@@ -155,7 +96,7 @@ final class PersonController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:Person:edit.html.twig',
+            '@ChillPerson/Person/edit.html.twig',
             ['person' => $person, 'form' => $form->createView()]
         );
     }
@@ -165,7 +106,7 @@ final class PersonController extends AbstractController
         $cFGroup = null;
 
         $cFDefaultGroup = $this->em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class)
-            ->findOneByEntity('Chill\\PersonBundle\\Entity\\Person');
+            ->findOneByEntity(\Chill\PersonBundle\Entity\Person::class);
 
         if ($cFDefaultGroup) {
             $cFGroup = $cFDefaultGroup->getCustomFieldsGroup();
@@ -180,6 +121,7 @@ final class PersonController extends AbstractController
      *     name="chill_person_household_person_history",
      *     methods={"GET", "POST"}
      * )
+     *
      * @ParamConverter("person", options={"id": "person_id"})
      */
     public function householdHistoryByPerson(Request $request, Person $person): Response
@@ -191,7 +133,7 @@ final class PersonController extends AbstractController
         );
 
         $event = new PrivacyEvent($person);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         return $this->render(
             '@ChillPerson/Person/household_history.html.twig',
@@ -209,14 +151,16 @@ 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".
+     *
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/new", name="chill_person_new")
      */
     public function newAction(Request $request): Response
     {
         $person = new Person();
 
-        $authorizedCenters =$this->authorizationHelper->getReachableCenters($this->getUser(), PersonVoter::CREATE);
+        $authorizedCenters = $this->authorizationHelper->getReachableCenters($this->getUser(), PersonVoter::CREATE);
 
-        if (1 === count($authorizedCenters)) {
+        if (1 === \count($authorizedCenters)) {
             $person->setCenter($authorizedCenters[0]);
         }
 
@@ -231,10 +175,10 @@ final class PersonController extends AbstractController
 
         $form->handleRequest($request);
 
-        if ($request->getMethod() === Request::METHOD_GET) {
+        if (Request::METHOD_GET === $request->getMethod()) {
             $this->lastPostDataReset();
         } elseif (
-            $request->getMethod() === Request::METHOD_POST
+            Request::METHOD_POST === $request->getMethod()
             && $form->isValid()
         ) {
             $alternatePersons = $this->similarPersonMatcher
@@ -242,7 +186,7 @@ final class PersonController extends AbstractController
 
             if (
                 false === $this->isLastPostDataChanges($form, $request, true)
-                || count($alternatePersons) === 0
+                || 0 === \count($alternatePersons)
             ) {
                 $this->em->persist($person);
 
@@ -257,7 +201,7 @@ final class PersonController extends AbstractController
 
                     $member = new HouseholdMember();
                     $member->setPerson($person);
-                    $member->setStartDate(new DateTimeImmutable());
+                    $member->setStartDate(new \DateTimeImmutable());
 
                     $household->addMember($member);
                     $household->setForceAddress($address);
@@ -291,7 +235,7 @@ final class PersonController extends AbstractController
                     ['person_id' => $person->getId()]
                 );
             }
-        } elseif ($request->getMethod() === Request::METHOD_POST && !$form->isValid()) {
+        } elseif (Request::METHOD_POST === $request->getMethod() && !$form->isValid()) {
             $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
@@ -304,13 +248,15 @@ final class PersonController extends AbstractController
         );
     }
 
-    public function viewAction($person_id)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/general", name="chill_person_view")
+     */
+    public function viewAction(int $person_id)
     {
         $person = $this->_getPerson($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-                    . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found on this server');
         }
 
         $this->denyAccessUnlessGranted(
@@ -320,10 +266,10 @@ final class PersonController extends AbstractController
         );
 
         $event = new PrivacyEvent($person);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         return $this->render(
-            'ChillPersonBundle:Person:view.html.twig',
+            '@ChillPerson/Person/view.html.twig',
             [
                 'person' => $person,
                 'cFGroup' => $this->getCFGroup(),
@@ -335,11 +281,9 @@ final class PersonController extends AbstractController
     /**
      * easy getting a person by his id.
      *
-     * @param mixed $id
-     *
      * @return \Chill\PersonBundle\Entity\Person
      */
-    private function _getPerson($id)
+    private function _getPerson(int $id)
     {
         return $this->personRepository->find($id);
     }
@@ -352,14 +296,14 @@ final class PersonController extends AbstractController
         $errors = $this->validator
             ->validate($person, null, ['creation']);
 
-        //validate accompanying periods
+        // validate accompanying periods
         $periods = $person->getAccompanyingPeriods();
 
         foreach ($periods as $period) {
             $period_errors = $this->validator
                 ->validate($period);
 
-            //group errors :
+            // group errors :
             foreach ($period_errors as $error) {
                 $errors->add($error);
             }
@@ -399,15 +343,15 @@ final class PersonController extends AbstractController
         $ignoredFields = ['form_status', '_token'];
 
         foreach ($request->request->all()[$form->getName()] as $field => $value) {
-            if (in_array($field, $ignoredFields, true)) {
+            if (\in_array($field, $ignoredFields, true)) {
                 continue;
             }
-            $fields[$field] = is_array($value) ?
-                implode(',', $value) : $value;
+            $fields[$field] = \is_array($value) ?
+                \implode(',', $value) : $value;
         }
         ksort($fields);
 
-        return hash('sha512', implode('&', $fields));
+        return \hash('sha512', \implode('&', $fields));
     }
 
     private function lastPostDataReset(): void
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index 928112d2e..034189674 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -25,55 +25,19 @@ 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\Contracts\Translation\TranslatorInterface;
-
 use function count;
 
-class PersonDuplicateController extends Controller
+class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
 {
-    /**
-     * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-     */
-    private $eventDispatcher;
+    public function __construct(private readonly SimilarPersonMatcher $similarPersonMatcher, private readonly TranslatorInterface $translator, private readonly PersonRepository $personRepository, private readonly PersonMove $personMove, private readonly EventDispatcherInterface $eventDispatcher) {}
 
     /**
-     * @var \Chill\PersonBundle\Actions\Remove\PersonMove
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person1_id}/duplicate/{person2_id}/confirm", name="chill_person_duplicate_confirm")
      */
-    private $personMove;
-
-    /**
-     * @var \Chill\PersonBundle\Repository\PersonRepository
-     */
-    private $personRepository;
-
-    /**
-     * @var \Chill\PersonBundle\Search\SimilarPersonMatcher
-     */
-    private $similarPersonMatcher;
-
-    /**
-     * @var \Symfony\Component\Translation\TranslatorInterface
-     */
-    private $translator;
-
-    public function __construct(
-        SimilarPersonMatcher $similarPersonMatcher,
-        TranslatorInterface $translator,
-        PersonRepository $personRepository,
-        PersonMove $personMove,
-        EventDispatcherInterface $eventDispatcher
-    ) {
-        $this->similarPersonMatcher = $similarPersonMatcher;
-        $this->translator = $translator;
-        $this->personRepository = $personRepository;
-        $this->personMove = $personMove;
-        $this->eventDispatcher = $eventDispatcher;
-    }
-
-    public function confirmAction($person1_id, $person2_id, Request $request)
+    public function confirmAction(mixed $person1_id, mixed $person2_id, Request $request)
     {
         if ($person1_id === $person2_id) {
             throw new InvalidArgumentException('Can not merge same person');
@@ -86,8 +50,7 @@ class PersonDuplicateController extends Controller
         $person2->counters = $this->_getCounters($person2_id);
 
         if (null === $person1) {
-            throw $this->createNotFoundException("Person with id {$person1_id} not"
-                . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person1_id} not".' found on this server');
         }
 
         $this->denyAccessUnlessGranted(
@@ -97,8 +60,7 @@ class PersonDuplicateController extends Controller
         );
 
         if (null === $person2) {
-            throw $this->createNotFoundException("Person with id {$person2_id} not"
-                . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person2_id} not".' found on this server');
         }
 
         $form = $this->createForm(PersonConfimDuplicateType::class);
@@ -111,7 +73,7 @@ class PersonDuplicateController extends Controller
                 'action' => 'move',
             ]);
             $event->addPerson($person2);
-            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+            $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
             $sqls = $this->personMove->getSQL($person2, $person1);
 
@@ -120,6 +82,7 @@ class PersonDuplicateController extends Controller
             $connection->beginTransaction();
 
             foreach ($sqls as $sql) {
+                dump($sql);
                 $connection->executeQuery($sql);
             }
             $connection->commit();
@@ -127,20 +90,22 @@ class PersonDuplicateController extends Controller
             return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
         }
 
-        return $this->render('ChillPersonBundle:PersonDuplicate:confirm.html.twig', [
+        return $this->render('@ChillPerson/PersonDuplicate/confirm.html.twig', [
             'person' => $person1,
             'person2' => $person2,
             'form' => $form->createView(),
         ]);
     }
 
-    public function findManuallyDuplicateAction($person_id, Request $request)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/find-manually", name="chill_person_find_manually_duplicate")
+     */
+    public function findManuallyDuplicateAction(mixed $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');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found on this server');
         }
 
         $this->denyAccessUnlessGranted(
@@ -157,8 +122,7 @@ class PersonDuplicateController extends Controller
             $person2 = $form->get('person')->getData();
 
             if (null === $person2) {
-                throw $this->createNotFoundException("Person with id {$person2->getId}() not"
-                  . ' found on this server');
+                throw $this->createNotFoundException("Person with id {$person2->getId}() not".' found on this server');
             }
 
             $direction = $form->get('direction')->getData();
@@ -178,13 +142,16 @@ class PersonDuplicateController extends Controller
             return $this->redirectToRoute('chill_person_duplicate_confirm', $params);
         }
 
-        return $this->render('ChillPersonBundle:PersonDuplicate:find_manually.html.twig', [
+        return $this->render('@ChillPerson/PersonDuplicate/find_manually.html.twig', [
             'person' => $person,
             'form' => $form->createView(),
         ]);
     }
 
-    public function notDuplicateAction($person1_id, $person2_id)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person1_id}/duplicate/{person2_id}/not-duplicate", name="chill_person_duplicate_not_duplicate")
+     */
+    public function notDuplicateAction(mixed $person1_id, mixed $person2_id)
     {
         [$person1, $person2] = $this->_getPersonsByPriority($person1_id, $person2_id);
 
@@ -210,7 +177,10 @@ class PersonDuplicateController extends Controller
         return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
     }
 
-    public function removeNotDuplicateAction($person1_id, $person2_id)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person1_id}/duplicate/{person2_id}/remove-not-duplicate", name="chill_person_remove_duplicate_not_duplicate")
+     */
+    public function removeNotDuplicateAction(mixed $person1_id, mixed $person2_id)
     {
         [$person1, $person2] = $this->_getPersonsByPriority($person1_id, $person2_id);
 
@@ -231,13 +201,15 @@ class PersonDuplicateController extends Controller
         return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
     }
 
-    public function viewAction($person_id, PersonNotDuplicateRepository $personNotDuplicateRepository)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/duplicate/view", name="chill_person_duplicate_view")
+     */
+    public function viewAction(mixed $person_id, PersonNotDuplicateRepository $personNotDuplicateRepository)
     {
         $person = $this->_getPerson($person_id);
 
         if (null === $person) {
-            throw $this->createNotFoundException("Person with id {$person_id} not"
-              . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person_id} not".' found on this server');
         }
 
         $this->denyAccessUnlessGranted(
@@ -247,11 +219,11 @@ class PersonDuplicateController extends Controller
         );
 
         $duplicatePersons = $this->similarPersonMatcher->
-            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
+            matchPerson($person, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL, false);
 
         $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 
-        return $this->render('ChillPersonBundle:PersonDuplicate:view.html.twig', [
+        return $this->render('@ChillPerson/PersonDuplicate/view.html.twig', [
             'person' => $person,
             'duplicatePersons' => $duplicatePersons,
             'notDuplicatePersons' => $notDuplicatePersons,
@@ -264,25 +236,23 @@ class PersonDuplicateController extends Controller
 
         $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_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_activity' => \count($nb_activity),
+            'nb_document' => \count($nb_document),
+            //            'nb_event' => count($nb_event),
             'nb_task' => $nb_task,
-            'nb_addresses' => count($person->getAddresses()),
+            'nb_addresses' => \count($person->getAddresses()),
         ];
     }
 
     /**
      * easy getting a person by his id.
-     *
-     * @param mixed $id
      */
-    private function _getPerson($id): ?Person
+    private function _getPerson(mixed $id): ?Person
     {
         return $this->personRepository->find($id);
     }
@@ -302,13 +272,11 @@ class PersonDuplicateController extends Controller
         }
 
         if (null === $person1) {
-            throw $this->createNotFoundException("Person with id {$person1_id} not"
-              . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person1_id} not".' found on this server');
         }
 
         if (null === $person2) {
-            throw $this->createNotFoundException("Person with id {$person2_id} not"
-              . ' found on this server');
+            throw $this->createNotFoundException("Person with id {$person2_id} not".' found on this server');
         }
 
         return [$person1, $person2];
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 6ba9ca558..a9d60d18e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -25,27 +25,12 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class PersonResourceController extends AbstractController
 {
-    private EntityManagerInterface $em;
+    public function __construct(private readonly PersonResourceRepository $personResourceRepository, private readonly PersonRepository $personRepository, private readonly EntityManagerInterface $em, private readonly TranslatorInterface $translator) {}
 
-    private PersonRepository $personRepository;
-
-    private PersonResourceRepository $personResourceRepository;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        PersonResourceRepository $personResourceRepository,
-        PersonRepository $personRepository,
-        EntityManagerInterface $em,
-        TranslatorInterface $translator
-    ) {
-        $this->personResourceRepository = $personResourceRepository;
-        $this->personRepository = $personRepository;
-        $this->em = $em;
-        $this->translator = $translator;
-    }
-
-    public function deleteAction(Request $request, $person_id, $resource_id): Response
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/resources/{resource_id}/delete", name="chill_person_resource_delete")
+     */
+    public function deleteAction(Request $request, mixed $person_id, mixed $resource_id): Response
     {
         $personOwner = $this->personRepository->find($person_id);
         $resource = $this->personResourceRepository->find($resource_id);
@@ -65,7 +50,7 @@ final class PersonResourceController extends AbstractController
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -82,7 +67,7 @@ final class PersonResourceController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:PersonResource:delete.html.twig',
+            '@ChillPerson/PersonResource/delete.html.twig',
             [
                 'person' => $personOwner,
                 'resource' => $resource,
@@ -91,7 +76,10 @@ final class PersonResourceController extends AbstractController
         );
     }
 
-    public function editAction(Request $request, $resource_id, $person_id): Response
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/resources/{resource_id}/edit", name="chill_person_resource_edit")
+     */
+    public function editAction(Request $request, mixed $resource_id, mixed $person_id): Response
     {
         $resource = $this->personResourceRepository->find($resource_id);
         $personOwner = $this->personRepository->find($person_id);
@@ -115,7 +103,7 @@ final class PersonResourceController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:PersonResource:edit.html.twig',
+            '@ChillPerson/PersonResource/edit.html.twig',
             [
                 'person' => $personOwner,
                 'resource' => $resource,
@@ -125,7 +113,10 @@ final class PersonResourceController extends AbstractController
         );
     }
 
-    public function listAction(Request $request, $person_id)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/resources/list", name="chill_person_resource_list")
+     */
+    public function listAction(Request $request, mixed $person_id)
     {
         $personOwner = $this->personRepository->find($person_id);
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $personOwner);
@@ -134,7 +125,7 @@ final class PersonResourceController extends AbstractController
         $personResources = $this->personResourceRepository->findBy(['personOwner' => $personOwner->getId()]);
 
         return $this->render(
-            'ChillPersonBundle:PersonResource:list.html.twig',
+            '@ChillPerson/PersonResource/list.html.twig',
             [
                 'person' => $personOwner,
                 'personResources' => $personResources,
@@ -142,7 +133,10 @@ final class PersonResourceController extends AbstractController
         );
     }
 
-    public function newAction(Request $request, $person_id)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/resources/new", name="chill_person_resource_new")
+     */
+    public function newAction(Request $request, mixed $person_id)
     {
         $personOwner = $this->personRepository->find($person_id);
         $personResource = new PersonResource();
@@ -164,7 +158,7 @@ final class PersonResourceController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:PersonResource:create.html.twig',
+            '@ChillPerson/PersonResource/create.html.twig',
             [
                 'form' => $form->createView(),
                 'person' => $personOwner,
diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
index 5b2de9f65..03b6975b4 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
@@ -20,6 +20,7 @@ use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\CallbackTransformer;
@@ -30,63 +31,23 @@ use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Validator\Constraints\NotIdenticalTo;
 use Symfony\Component\Validator\Constraints\NotNull;
-use function is_int;
 
 class ReassignAccompanyingPeriodController extends AbstractController
 {
-    private AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
-
-    private AccompanyingPeriodRepository $courseRepository;
-
-    private EntityManagerInterface $em;
-
-    private EngineInterface $engine;
-
-    private FormFactoryInterface $formFactory;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private Security $security;
-
-    private UserRender $userRender;
-
-    private UserRepository $userRepository;
-
-    public function __construct(
-        AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
-        UserRepository $userRepository,
-        AccompanyingPeriodRepository $courseRepository,
-        EngineInterface $engine,
-        FormFactoryInterface $formFactory,
-        PaginatorFactory $paginatorFactory,
-        Security $security,
-        UserRender $userRender,
-        EntityManagerInterface $em
-    ) {
-        $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
-        $this->engine = $engine;
-        $this->formFactory = $formFactory;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->security = $security;
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-        $this->courseRepository = $courseRepository;
-        $this->em = $em;
-    }
+    public function __construct(private readonly AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository, private readonly UserRepository $userRepository, private readonly AccompanyingPeriodRepository $courseRepository, private readonly \Twig\Environment $engine, private readonly FormFactoryInterface $formFactory, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly UserRender $userRender, private readonly EntityManagerInterface $em) {}
 
     /**
      * @Route("/{_locale}/person/accompanying-periods/reassign", name="chill_course_list_reassign")
      */
     public function listAction(Request $request): Response
     {
-        if (!$this->security->isGranted('ROLE_USER') || !$this->security->getUser() instanceof User) {
-            throw new AccessDeniedException();
+        if (!$this->security->isGranted(AccompanyingPeriodVoter::REASSIGN_BULK)) {
+            throw new AccessDeniedHttpException('no right to reassign bulk');
         }
 
         $form = $this->buildFilterForm();
@@ -96,9 +57,9 @@ class ReassignAccompanyingPeriodController extends AbstractController
         $userFrom = $form['user']->getData();
         $postalCodes = $form['postal_code']->getData() instanceof PostalCode ? [$form['postal_code']->getData()] : [];
 
-        $total = $this->accompanyingPeriodACLAwareRepository->countByUserOpenedAccompanyingPeriod($userFrom);
+        $total = $this->accompanyingPeriodACLAwareRepository->countByUserAndPostalCodesOpenedAccompanyingPeriod($userFrom, $postalCodes);
         $paginator = $this->paginatorFactory->create($total);
-        $paginator->setItemsPerPage(50);
+        $paginator->setItemsPerPage(100);
         $periods = $this->accompanyingPeriodACLAwareRepository
             ->findByUserAndPostalCodesOpenedAccompanyingPeriod(
                 $userFrom,
@@ -120,7 +81,8 @@ class ReassignAccompanyingPeriodController extends AbstractController
         $assignForm->handleRequest($request);
 
         if ($assignForm->isSubmitted() && $assignForm->isValid()) {
-            $assignPeriodIds = json_decode($assignForm->get('periods')->getData(), true);
+            $assignPeriodIds = json_decode((string) $assignForm->get('periods')->getData(), true, 512, JSON_THROW_ON_ERROR);
+            /** @var User $userTo */
             $userTo = $assignForm->get('userTo')->getData();
             $userFrom = $assignForm->get('userFrom')->getData();
 
@@ -129,6 +91,10 @@ class ReassignAccompanyingPeriodController extends AbstractController
 
                 if ($period->getUser() === $userFrom) {
                     $period->setUser($userTo, true);
+
+                    if (null !== $userTo->getUserJob() && $period->getJob() !== $userTo->getUserJob()) {
+                        $period->setJob($userTo->getUserJob());
+                    }
                 }
             }
 
@@ -175,11 +141,11 @@ class ReassignAccompanyingPeriodController extends AbstractController
         return $builder->getForm();
     }
 
-    private function buildReassignForm(array $periodIds, ?User $userFrom = null): FormInterface
+    private function buildReassignForm(array $periodIds, User $userFrom = null): FormInterface
     {
         $defaultData = [
             'userFrom' => $userFrom,
-            'periods' => json_encode($periodIds),
+            'periods' => json_encode($periodIds, JSON_THROW_ON_ERROR),
         ];
 
         $builder = $this->formFactory->createNamedBuilder('reassign', FormType::class, $defaultData);
@@ -214,7 +180,7 @@ class ReassignAccompanyingPeriodController extends AbstractController
                     return null;
                 }
 
-                if (!is_int((int) $id)) {
+                if (!\is_int((int) $id)) {
                     throw new TransformationFailedException('the user id is not a numeric');
                 }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php
index 572deb896..80cc8c79b 100644
--- a/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php
@@ -21,15 +21,7 @@ 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;
-    }
+    public function __construct(private readonly ValidatorInterface $validator, private readonly RelationshipRepository $repository) {}
 
     /**
      * @ParamConverter("person", options={"id": "person_id"})
diff --git a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
index e128b1486..4b8278f9d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php
@@ -27,21 +27,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class ResidentialAddressController extends AbstractController
 {
-    private UrlGeneratorInterface $generator;
-
-    private ResidentialAddressRepository $residentialAddressRepository;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        UrlGeneratorInterface $generator,
-        TranslatorInterface $translator,
-        ResidentialAddressRepository $residentialAddressRepository
-    ) {
-        $this->generator = $generator;
-        $this->translator = $translator;
-        $this->residentialAddressRepository = $residentialAddressRepository;
-    }
+    public function __construct(private readonly UrlGeneratorInterface $generator, private readonly TranslatorInterface $translator, private readonly ResidentialAddressRepository $residentialAddressRepository) {}
 
     /**
      * @Route("/{_locale}/person/residential-address/{id}/delete", name="chill_person_residential_address_delete")
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
index fd864f507..a866ceff7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
-use DateTimeImmutable;
 use Symfony\Component\HttpFoundation\Request;
 
 class SocialIssueApiController extends ApiController
@@ -26,7 +25,7 @@ class SocialIssueApiController extends ApiController
                 $query->expr()->isNull('e.desactivationDate')
             )
         );
-        $query->setParameter('now', new DateTimeImmutable());
+        $query->setParameter('now', new \DateTimeImmutable());
     }
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
index 769e90de7..7b1dd4211 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
@@ -13,13 +13,12 @@ namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
-use LogicException;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 class SocialIssueController extends CRUDController
 {
-    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    protected function createFormFor(string $action, $entity, string $formClass = null, array $formOptions = []): FormInterface
     {
         if ('new' === $action) {
             return parent::createFormFor($action, $entity, $formClass, ['step' => 'create']);
@@ -29,7 +28,7 @@ class SocialIssueController extends CRUDController
             return parent::createFormFor($action, $entity, $formClass, ['step' => 'edit']);
         }
 
-        throw new LogicException('action is not supported: ' . $action);
+        throw new \LogicException('action is not supported: '.$action);
     }
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
index bd12ec8c2..b97f2ed30 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
@@ -22,12 +22,7 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class SocialWorkEvaluationApiController extends AbstractController
 {
-    private PaginatorFactory $paginatorFactory;
-
-    public function __construct(PaginatorFactory $paginatorFactory)
-    {
-        $this->paginatorFactory = $paginatorFactory;
-    }
+    public function __construct(private readonly PaginatorFactory $paginatorFactory) {}
 
     /**
      * @Route("/api/1.0/person/social-work/evaluation/by-social-action/{action_id}.json",
@@ -36,6 +31,7 @@ class SocialWorkEvaluationApiController extends AbstractController
      *         "_format": "json"
      *     }
      * )
+     *
      * @ParamConverter("action", options={"id": "action_id"})
      */
     public function listEvaluationBySocialAction(SocialAction $action): Response
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
index 716aa0b2e..2a7f39712 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
@@ -21,15 +21,7 @@ use Symfony\Component\HttpFoundation\Response;
 
 class SocialWorkGoalApiController extends ApiController
 {
-    private GoalRepository $goalRepository;
-
-    private PaginatorFactory $paginator;
-
-    public function __construct(GoalRepository $goalRepository, PaginatorFactory $paginator)
-    {
-        $this->goalRepository = $goalRepository;
-        $this->paginator = $paginator;
-    }
+    public function __construct(private readonly GoalRepository $goalRepository, private readonly PaginatorFactory $paginator) {}
 
     public function listBySocialAction(Request $request, SocialAction $action): Response
     {
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php
index eee01a351..9b97d8129 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php
@@ -21,12 +21,7 @@ use Symfony\Component\HttpFoundation\Response;
 
 class SocialWorkResultApiController extends ApiController
 {
-    private ResultRepository $resultRepository;
-
-    public function __construct(ResultRepository $resultRepository)
-    {
-        $this->resultRepository = $resultRepository;
-    }
+    public function __construct(private readonly ResultRepository $resultRepository) {}
 
     public function listByGoal(Request $request, Goal $goal): Response
     {
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
index 3ae5c5b7c..6b341e926 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
@@ -16,22 +16,17 @@ use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
-use function count;
-
-class SocialWorkSocialActionApiController extends ApiController
+final class SocialWorkSocialActionApiController extends ApiController
 {
-    private PaginatorFactory $paginator;
-
-    private SocialIssueRepository $socialIssueRepository;
-
-    public function __construct(SocialIssueRepository $socialIssueRepository, PaginatorFactory $paginator)
-    {
-        $this->socialIssueRepository = $socialIssueRepository;
-        $this->paginator = $paginator;
-    }
+    public function __construct(
+        private readonly SocialIssueRepository $socialIssueRepository,
+        private readonly PaginatorFactory $paginator,
+        private readonly ClockInterface $clock,
+    ) {}
 
     public function listBySocialIssueApi($id, Request $request)
     {
@@ -42,15 +37,16 @@ class SocialWorkSocialActionApiController extends ApiController
             throw $this->createNotFoundException('socialIssue not found');
         }
 
-        $socialActions = $socialIssue->getRecursiveSocialActions()->toArray();
+        $socialActions = SocialAction::filterRemoveDeactivatedActions(
+            $socialIssue->getRecursiveSocialActions()->toArray(),
+            \DateTime::createFromImmutable($this->clock->now())
+        );
 
-        usort($socialActions, static function (SocialAction $sa, SocialAction $sb) {
-            return $sa->getOrdering() <=> $sb->getOrdering();
-        });
+        usort($socialActions, static fn (SocialAction $sa, SocialAction $sb) => $sa->getOrdering() <=> $sb->getOrdering());
 
-        $pagination = $this->paginator->create(count($socialActions));
+        $pagination = $this->paginator->create(\count($socialActions));
         // max one page
-        $pagination->setItemsPerPage(count($socialActions));
+        $pagination->setItemsPerPage(\count($socialActions));
 
         $collection = new Collection($socialActions, $pagination);
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php b/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
index 95446e59b..21792444e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
@@ -22,23 +22,12 @@ use Symfony\Component\HttpFoundation\Request;
 
 class TimelinePersonController extends AbstractController
 {
-    protected EventDispatcherInterface $eventDispatcher;
+    public function __construct(protected EventDispatcherInterface $eventDispatcher, protected TimelineBuilder $timelineBuilder, protected PaginatorFactory $paginatorFactory) {}
 
-    protected PaginatorFactory $paginatorFactory;
-
-    protected TimelineBuilder $timelineBuilder;
-
-    public function __construct(
-        EventDispatcherInterface $eventDispatcher,
-        TimelineBuilder $timelineBuilder,
-        PaginatorFactory $paginatorFactory
-    ) {
-        $this->eventDispatcher = $eventDispatcher;
-        $this->timelineBuilder = $timelineBuilder;
-        $this->paginatorFactory = $paginatorFactory;
-    }
-
-    public function personAction(Request $request, $person_id)
+    /**
+     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/timeline", name="chill_person_timeline")
+     */
+    public function personAction(Request $request, mixed $person_id)
     {
         $person = $this->getDoctrine()
             ->getRepository(Person::class)
@@ -58,10 +47,10 @@ class TimelinePersonController extends AbstractController
         $paginator = $this->paginatorFactory->create($nbItems);
 
         $event = new PrivacyEvent($person, ['action' => 'timeline']);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         return $this->render(
-            'ChillPersonBundle:Timeline:index.html.twig',
+            '@ChillPerson/Timeline/index.html.twig',
             [
                 'timeline' => $this->timelineBuilder->getTimelineHTML(
                     'person',
diff --git a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
index 658fdb7be..1f484fd91 100644
--- a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php
@@ -12,32 +12,38 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
 class UserAccompanyingPeriodController extends AbstractController
 {
-    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository, PaginatorFactory $paginatorFactory)
-    {
-        $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
-        $this->paginatorFactory = $paginatorFactory;
-    }
+    public function __construct(private readonly AccompanyingPeriodRepository $accompanyingPeriodRepository, private readonly PaginatorFactory $paginatorFactory) {}
 
     /**
      * @Route("/{_locale}/person/accompanying-periods/my", name="chill_person_accompanying_period_user")
      */
-    public function listAction(Request $request)
+    public function listAction(Request $request): Response
     {
-        $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => ['CONFIRMED', 'CLOSED']]);
+        $active = $request->query->getBoolean('active', true);
+        $steps = match ($active) {
+            true => [
+                AccompanyingPeriod::STEP_CONFIRMED,
+                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+            ],
+            false => [
+                AccompanyingPeriod::STEP_CLOSED,
+            ]
+        };
+
+        $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => $steps]);
         $pagination = $this->paginatorFactory->create($total);
         $accompanyingPeriods = $this->accompanyingPeriodRepository->findBy(
-            ['user' => $this->getUser(), 'step' => ['CONFIRMED', 'CLOSED']],
+            ['user' => $this->getUser(), 'step' => $steps],
             ['openingDate' => 'DESC'],
             $pagination->getItemsPerPage(),
             $pagination->getCurrentPageFirstItemNumber()
@@ -46,13 +52,14 @@ class UserAccompanyingPeriodController extends AbstractController
         return $this->render('@ChillPerson/AccompanyingPeriod/user_periods_list.html.twig', [
             'accompanyingPeriods' => $accompanyingPeriods,
             'pagination' => $pagination,
+            'active' => $active,
         ]);
     }
 
     /**
      * @Route("/{_locale}/person/accompanying-periods/my/drafts", name="chill_person_accompanying_period_draft_user")
      */
-    public function listDraftsAction(Request $request)
+    public function listDraftsAction(): Response
     {
         $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => 'DRAFT']);
         $pagination = $this->paginatorFactory->create($total);
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
index 130167428..c6cf3b5e1 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
@@ -14,9 +14,6 @@ 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;
@@ -41,11 +38,11 @@ trait PersonRandomHelper
                 ->select('p')
                 ->from(Person::class, 'p')
                 ->getQuery()
-                ->setFirstResult(random_int(0, $this->countPersons - $fetchBy))
+                ->setFirstResult(\random_int(0, $this->countPersons - $fetchBy))
                 ->setMaxResults($fetchBy)
                 ->getResult();
         }
 
-        return array_pop($this->randPersons);
+        return \array_pop($this->randPersons);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
index b84df6dd2..942f6cc5a 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
@@ -14,8 +14,6 @@ namespace Chill\PersonBundle\DataFixtures\Helper;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 
-use function random_int;
-
 trait RandomPersonHelperTrait
 {
     private ?int $nbOfPersons = null;
@@ -36,7 +34,7 @@ trait RandomPersonHelperTrait
         return $qb
             ->select('p')
             ->setMaxResults(1)
-            ->setFirstResult(random_int(0, $this->nbOfPersons))
+            ->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 cda7d76e7..fb836ed3a 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
@@ -58,7 +58,7 @@ class LoadAccompanyingPeriodClosingMotive extends AbstractFixture implements Ord
         foreach (static::$closingMotives as $ref => $new) {
             $motive = new ClosingMotive();
             $motive->setName($new['name'])
-                ->setActive(($new['active'] ?? true));
+                ->setActive($new['active'] ?? true);
 
             $manager->persist($motive);
             $this->addReference($ref, $motive);
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
index e55acc13b..8eb0688bd 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
@@ -21,11 +21,11 @@ use Doctrine\Persistence\ObjectManager;
  */
 class LoadAccompanyingPeriodOrigin extends AbstractFixture implements OrderedFixtureInterface
 {
-    public const ACCOMPANYING_PERIOD_ORIGIN = 'accompanying_period_origin';
+    final public const ACCOMPANYING_PERIOD_ORIGIN = 'accompanying_period_origin';
 
     public static $references = [];
 
-    private $phoneCall = ['en' => 'phone call', 'fr' => 'appel téléphonique'];
+    private array $phoneCall = ['en' => 'phone call', 'fr' => 'appel téléphonique'];
 
     public function getOrder()
     {
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
index 94c907689..44992ebef 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
@@ -17,13 +17,8 @@ use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
-use DateTimeImmutable;
 use Doctrine\Persistence\ObjectManager;
 
-use function array_pop;
-use function array_rand;
-use function count;
-
 class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Doctrine\Common\DataFixtures\DependentFixtureInterface
 {
     /**
@@ -31,17 +26,7 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
      */
     private array $cacheEvaluations = [];
 
-    private EvaluationRepository $evaluationRepository;
-
-    private AccompanyingPeriodRepository $periodRepository;
-
-    public function __construct(
-        AccompanyingPeriodRepository $periodRepository,
-        EvaluationRepository $evaluationRepository
-    ) {
-        $this->periodRepository = $periodRepository;
-        $this->evaluationRepository = $evaluationRepository;
-    }
+    public function __construct(private readonly AccompanyingPeriodRepository $periodRepository, private readonly EvaluationRepository $evaluationRepository) {}
 
     public function getDependencies()
     {
@@ -58,8 +43,8 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
 
         $i = 0;
 
-        while (null !== $period = array_pop($periods)) {
-            /** @var AccompanyingPeriod $period */
+        while (null !== $period = \array_pop($periods)) {
+            /* @var AccompanyingPeriod $period */
             ++$i;
 
             if (0 === $i % 15) {
@@ -76,11 +61,11 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
                 $work
                     ->setAccompanyingPeriod($period)
                     ->setSocialAction($action)
-                    ->setStartDate(new DateTimeImmutable('today'))
+                    ->setStartDate(new \DateTimeImmutable('today'))
                     ->addPerson($period->getPersons()->first())
-                    ->setCreatedAt(new DateTimeImmutable())
+                    ->setCreatedAt(new \DateTimeImmutable())
                     ->setCreatedBy($this->getReference('center a_social'))
-                    ->setUpdatedAt(new DateTimeImmutable())
+                    ->setUpdatedAt(new \DateTimeImmutable())
                     ->setUpdatedBy($this->getReference('center a_social'));
                 $manager->persist($work);
 
@@ -103,11 +88,11 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
                 $work
                     ->setAccompanyingPeriod($period)
                     ->setSocialAction($action)
-                    ->setStartDate(new DateTimeImmutable('today'))
+                    ->setStartDate(new \DateTimeImmutable('today'))
                     ->addPerson($period->getPersons()->first())
-                    ->setCreatedAt(new DateTimeImmutable())
+                    ->setCreatedAt(new \DateTimeImmutable())
                     ->setCreatedBy($this->getReference('center a_social'))
-                    ->setUpdatedAt(new DateTimeImmutable())
+                    ->setUpdatedAt(new \DateTimeImmutable())
                     ->setUpdatedBy($this->getReference('center a_social'));
                 $manager->persist($work);
                 $ev = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation();
@@ -124,20 +109,20 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
     {
         $actions = $socialIssue->getRecursiveSocialActions()->toArray();
 
-        if (0 === count($actions)) {
+        if (0 === \count($actions)) {
             return null;
         }
 
-        return $actions[array_rand($actions)];
+        return $actions[\array_rand($actions)];
     }
 
     private function getRandomEvaluation(): Evaluation
     {
-        if (0 === count($this->cacheEvaluations)) {
+        if (0 === \count($this->cacheEvaluations)) {
             $this->cacheEvaluations = $this->evaluationRepository
                 ->findAll();
         }
 
-        return $this->cacheEvaluations[array_rand($this->cacheEvaluations)];
+        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 14434be6e..30aa345e7 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
@@ -17,57 +17,29 @@ 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\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
-use RuntimeException;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
-class LoadCustomFields extends AbstractFixture implements
-    ContainerAwareInterface,
-    OrderedFixtureInterface
+class LoadCustomFields extends AbstractFixture implements OrderedFixtureInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    /**
-     * @var CustomField
-     */
-    private $customFieldChoice;
-
-    /**
-     * @var CustomField
-     */
-    private $customFieldText;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomField $cfText = null;
+
+    private ?\Chill\CustomFieldsBundle\Entity\CustomField $cfChoice = null;
 
     /**
+     * /**
      * LoadCustomFields constructor.
      */
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        TranslatorInterface $translator
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-    }
+        private readonly EntityManagerInterface $entityManager,
+        private readonly CustomFieldChoice $customFieldChoice,
+        private readonly CustomFieldText $customFieldText,
+    ) {}
 
-    //put your code here
+    // put your code here
     public function getOrder()
     {
         return 10003;
@@ -80,59 +52,40 @@ class LoadCustomFields extends AbstractFixture implements
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
-    {
-        if (null === $container) {
-            throw new RuntimeException('The given container should not be null');
-        }
-
-        $this->container = $container;
-    }
-
     private function createCustomFieldChoice()
     {
-        return new CustomFieldChoice(
-            $this->translator,
-            $this->container->get('templating'),
-            $this->translatableStringHelper
-        );
+        return $this->customFieldChoice;
     }
 
     private function createCustomFieldText()
     {
-        return new CustomFieldText(
-            $this->container->get('request_stack'),
-            $this->container->get('templating'),
-            $this->translatableStringHelper
-        );
+        return $this->customFieldText;
     }
 
     private function loadData(ObjectManager $manager)
     {
-        $personIds = $this->container->get('doctrine.orm.entity_manager')
+        $personIds = $this->entityManager
             ->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']
+            static fn ($a) => $a['slug'],
+            $this->cfChoice->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) {
+            if (1 === random_int(0, 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),
+                        ->serialize($faker->text(random_int(150, 250)), $this->cfText),
                     'document-d-identite' => $this->createCustomFieldChoice()
-                        ->serialize([$choices[array_rand($choices)]], $this->customFieldChoice),
+                        ->serialize([$choices[array_rand($choices)]], $this->cfChoice),
                 ]);
             }
         }
@@ -164,7 +117,7 @@ class LoadCustomFields extends AbstractFixture implements
         $manager->persist($customField0);
 
         // create text field
-        $this->customFieldText = (new CustomField())
+        $this->cfText = $customFieldText = (new CustomField())
             ->setActive(true)
             ->setName(['fr' => 'Remarques'])
             ->setSlug('remarques')
@@ -172,10 +125,10 @@ class LoadCustomFields extends AbstractFixture implements
             ->setType('text')
             ->setOptions(['maxLength' => 5000])
             ->setCustomFieldsGroup($cfGroup);
-        $manager->persist($this->customFieldText);
+        $manager->persist($customFieldText);
 
         // create choice field
-        $this->customFieldChoice = (new CustomField())
+        $this->cfChoice = $customFieldChoice = (new CustomField())
             ->setActive(true)
             ->setName(['fr' => "Document d'identité"])
             ->setSlug('document-d-identite')
@@ -206,6 +159,6 @@ class LoadCustomFields extends AbstractFixture implements
                     ],
                 ],
             ]);
-        $manager->persist($this->customFieldChoice);
+        $manager->persist($customFieldChoice);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
index 342dfb020..ba2c67a08 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
@@ -19,36 +19,22 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 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 Nelmio\Alice\Loader\NativeLoader;
 
-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 readonly NativeLoader $loader;
 
     private array $personIds;
 
-    public function __construct(MembersEditorFactory $editorFactory, EntityManagerInterface $em)
+    public function __construct(private readonly MembersEditorFactory $editorFactory, private readonly EntityManagerInterface $em)
     {
-        $this->editorFactory = $editorFactory;
-        $this->em = $em;
         $this->loader = new NativeLoader();
     }
 
@@ -70,43 +56,43 @@ 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 addAddressToHousehold(Household $household, DateTimeImmutable $date, ObjectManager $manager)
+    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'));
+            $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W'));
             ++$i;
         }
     }
@@ -126,7 +112,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
         return $objectSet->getObjects()['address1'];
     }
 
-    private function generateHousehold(ObjectManager $manager, DateTimeImmutable $startDate)
+    private function generateHousehold(ObjectManager $manager, \DateTimeImmutable $startDate)
     {
         for ($i = 0; self::NUMBER_OF_HOUSEHOLD > $i; ++$i) {
             $household = new Household();
@@ -140,7 +126,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
             $k = 0;
 
             foreach ($this->getRandomPersons(1, 3) as $person) {
-                $date = $startDate->add(new DateInterval('P' . random_int(1, 200) . 'W'));
+                $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');
@@ -149,7 +135,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
             // load children
             foreach ($this->getRandomPersons(0, 3) as $person) {
-                $date = $startDate->add(new DateInterval('P' . random_int(1, 200) . 'W'));
+                $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');
@@ -158,7 +144,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
             // load children out
             foreach ($this->getRandomPersons(0, 2) as $person) {
-                $date = $startDate->add(new DateInterval('P' . random_int(1, 200) . 'W'));
+                $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');
@@ -173,7 +159,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
     private function getPostalCode(): PostalCode
     {
-        $ref = LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)];
+        $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)];
 
         return $this->getReference($ref);
     }
@@ -182,10 +168,10 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
     {
         $persons = [];
 
-        $nb = random_int($min, $max);
+        $nb = \random_int($min, $max);
 
         for ($i = 0; $i < $nb; ++$i) {
-            $personId = array_pop($this->personIds)['id'];
+            $personId = \array_pop($this->personIds)['id'];
             $persons[] = $this->em->getRepository(Person::class)->find($personId);
         }
 
@@ -199,17 +185,17 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
         // @TODO: Remove this and make this service stateless
         $this->personIds = $this->em
             ->createQuery(
-                'SELECT p.id FROM ' . Person::class . ' p ' .
-                'WHERE EXISTS( ' .
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch ' .
-                    'JOIN pch.center c ' .
-                    'WHERE pch.person = p.id ' .
-                    'AND c.name IN (:authorized_centers)' .
+                'SELECT p.id FROM '.Person::class.' p '.
+                'WHERE EXISTS( '.
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch '.
+                    'JOIN pch.center c '.
+                    'WHERE pch.person = p.id '.
+                    'AND c.name IN (:authorized_centers)'.
                 ')'
             )
             ->setParameter('authorized_centers', $centers)
             ->getScalarResult();
 
-        shuffle($this->personIds);
+        \shuffle($this->personIds);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php
index 720e7ca38..c985f26d3 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdCompositionType.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectManager;
 
 class LoadHouseholdCompositionType extends AbstractFixture implements FixtureGroupInterface
 {
-    public const TYPES = [
+    final public const TYPES = [
         ['fr' => 'Couple avec enfant(s)'],
         ['fr' => 'Couple sans enfant'],
         ['fr' => 'Mère seule'],
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php
index cb1affa85..f5c28c8c2 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php
@@ -17,13 +17,13 @@ use Doctrine\Persistence\ObjectManager;
 
 class LoadHouseholdPosition extends Fixture
 {
-    public const ADULT = 'position_adulte';
+    final public const ADULT = 'position_adulte';
 
-    public const CHILD = 'position_enfant';
+    final public const CHILD = 'position_enfant';
 
-    public const CHILD_OUT = 'position_enfant_hors';
+    final public const CHILD_OUT = 'position_enfant_hors';
 
-    public const POSITIONS_DATA = [
+    final 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],
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
index 4add4ac2a..ddce77d6c 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
@@ -21,7 +21,7 @@ use Doctrine\Persistence\ObjectManager;
  */
 class LoadMaritalStatus extends AbstractFixture implements OrderedFixtureInterface
 {
-    private $maritalStatuses = [
+    private array $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 ']],
@@ -41,11 +41,11 @@ class LoadMaritalStatus extends AbstractFixture implements OrderedFixtureInterfa
         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);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index 4f43879fd..e8026d04b 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -12,7 +12,6 @@ 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;
@@ -29,13 +28,9 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Repository\MaritalStatusRepository;
 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 Exception;
 use Faker\Factory;
 use Faker\Generator;
 use Nelmio\Alice\Loader\NativeLoader;
@@ -43,10 +38,6 @@ use Nelmio\Alice\ObjectSet;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\Workflow\Registry;
 
-use function count;
-use function random_int;
-use function ucfirst;
-
 /**
  * Load people into database.
  */
@@ -54,7 +45,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-    public const PERSON = 'person';
+    final public const PERSON = 'person';
 
     /**
      * @var array|Center[]
@@ -86,27 +77,13 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
      */
     protected array $cacheUsers = [];
 
-    protected CenterRepository $centerRepository;
-
-    protected CountryRepository $countryRepository;
-
     protected Generator $faker;
 
     protected NativeLoader $loader;
 
-    protected MaritalStatusRepository $maritalStatusRepository;
+    private array $genders = [Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER];
 
-    protected ScopeRepository $scopeRepository;
-
-    protected SocialIssueRepository $socialIssueRepository;
-
-    protected UserRepository $userRepository;
-
-    protected Registry $workflowRegistry;
-
-    private $genders = [Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER];
-
-    private $peoples = [
+    private array $peoples = [
         [
             'lastName' => 'Depardieu',
             'firstName' => 'Gérard',
@@ -132,7 +109,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             ],
         ],
         [
-            //to have a person with same firstname as Gérard Depardieu
+            // to have a person with same firstname as Gérard Depardieu
             'lastName' => 'Depardieu',
             'firstName' => 'Jean',
             'birthdate' => '1960-10-12',
@@ -142,7 +119,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             'maritalStatus' => 'ms_divorce',
         ],
         [
-            //to have a person with same birthdate of Gérard Depardieu
+            // to have a person with same birthdate of Gérard Depardieu
             'lastName' => 'Van Snick',
             'firstName' => 'Bart',
             'birthdate' => '1948-12-27',
@@ -150,22 +127,23 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             'maritalStatus' => 'ms_legalco',
         ],
         [
-            //to have a woman with Depardieu as FirstName
+            // to have a woman with Depardieu as FirstName
             'lastName' => 'Depardieu',
             'firstName' => 'Charline',
+            'birthdate' => '1970-10-15',
             'gender' => Person::FEMALE_GENDER,
             'center' => 'Center A',
             'maritalStatus' => 'ms_legalco',
         ],
         [
-            //to have a special character in lastName
+            // to have a special character in lastName
             'lastName' => 'Manço',
             'firstName' => 'Étienne',
             'center' => 'Center A',
             'maritalStatus' => 'ms_unknown',
         ],
         [
-            //to have true duplicate person
+            // to have true duplicate person
             'lastName' => 'Depardieu',
             'firstName' => 'Jean',
             'birthdate' => '1960-10-12',
@@ -175,7 +153,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             'maritalStatus' => 'ms_divorce',
         ],
         [
-            //to have false duplicate person
+            // to have false duplicate person
             'lastName' => 'Depardieu',
             'firstName' => 'Jeanne',
             'birthdate' => '1966-11-13',
@@ -243,24 +221,17 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
     ];
 
     public function __construct(
-        Registry $workflowRegistry,
-        SocialIssueRepository $socialIssueRepository,
-        CenterRepository $centerRepository,
-        CountryRepository $countryRepository,
-        MaritalStatusRepository $maritalStatusRepository,
-        ScopeRepository $scopeRepository,
-        UserRepository $userRepository
+        protected Registry $workflowRegistry,
+        protected SocialIssueRepository $socialIssueRepository,
+        protected CenterRepository $centerRepository,
+        protected CountryRepository $countryRepository,
+        protected MaritalStatusRepository $maritalStatusRepository,
+        protected ScopeRepository $scopeRepository,
+        protected 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()
@@ -273,7 +244,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
      */
     public function getRandomCenter(): Center
     {
-        if (0 === count($this->cacheCenters)) {
+        if (0 === \count($this->cacheCenters)) {
             $this->cacheCenters = $this->centerRepository->findAll();
         }
 
@@ -283,15 +254,15 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
     /**
      * @internal This method is public and called by faker as a custom generator
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function getRandomCountry(int $nullPercentage = 20): ?Country
     {
-        if (0 === count($this->cacheCountries)) {
+        if (0 === \count($this->cacheCountries)) {
             $this->cacheCountries = $this->countryRepository->findAll();
         }
 
-        if (random_int(0, 100) > $nullPercentage) {
+        if (\random_int(0, 100) > $nullPercentage) {
             return null;
         }
 
@@ -309,15 +280,15 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
     /**
      * @internal This method is public and called by faker as a custom generator
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function getRandomMaritalStatus(int $nullPercentage = 50): ?MaritalStatus
     {
-        if (0 === count($this->cacheMaritalStatuses)) {
+        if (0 === \count($this->cacheMaritalStatuses)) {
             $this->cacheMaritalStatuses = $this->maritalStatusRepository->findAll();
         }
 
-        if (random_int(0, 100) > $nullPercentage) {
+        if (\random_int(0, 100) > $nullPercentage) {
             return null;
         }
 
@@ -355,22 +326,22 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
     /**
      * create a new person from array data.
      *
-     * @throws Exception
+     * @throws \Exception
      */
     private function addAPerson(Person $person, ObjectManager $manager)
     {
         $accompanyingPeriod = new AccompanyingPeriod(
-            (new DateTime())
+            (new \DateTime())
                 ->sub(
-                    new DateInterval('P' . random_int(0, 180) . 'D')
+                    new \DateInterval('P'.\random_int(0, 180).'D')
                 )
         );
         $accompanyingPeriod->setCreatedBy($this->getRandomUser())
-            ->setCreatedAt(new DateTimeImmutable('now'));
+            ->setCreatedAt(new \DateTimeImmutable('now'));
         $person->addAccompanyingPeriod($accompanyingPeriod);
         $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
 
-        if (random_int(0, 10) > 3) {
+        if (\random_int(0, 10) > 3) {
             // always add social scope:
             $accompanyingPeriod->addScope($this->getReference('scope_social'));
             $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN);
@@ -384,9 +355,8 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
 
         $manager->persist($person);
         $manager->persist($accompanyingPeriod);
-        echo "add person'" . $person->__toString() . "'\n";
 
-        $this->addReference(self::PERSON . $person->getId(), $person);
+        $this->addReference(self::PERSON.$person->getId(), $person);
     }
 
     private function createAddress(): Address
@@ -429,7 +399,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
         foreach ($default as $key => $value) {
             switch ($key) {
                 case 'birthdate':
-                    $person->setBirthdate(new DateTime($value));
+                    $person->setBirthdate(new \DateTime($value));
 
                     break;
 
@@ -492,7 +462,7 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
 
     private function getRandomSocialIssue(): SocialIssue
     {
-        if (0 === count($this->cacheSocialIssues)) {
+        if (0 === \count($this->cacheSocialIssues)) {
             $this->cacheSocialIssues = $this->socialIssueRepository->findAll();
         }
 
@@ -501,29 +471,10 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
 
     private function getRandomUser(): User
     {
-        if (0 === count($this->cacheUsers)) {
+        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 8cc15b9e0..4b57dd048 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
@@ -36,12 +36,10 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
             $permissionsGroup = $this->getReference($permissionsGroupRef);
             $scopeSocial = $this->getReference('scope_social');
 
-            //create permission group
+            // create permission group
             switch ($permissionsGroup->getName()) {
                 case 'social':
                 case 'direction':
-                    printf("Adding CHILL_PERSON_UPDATE & CHILL_PERSON_CREATE to %s permission group \n", $permissionsGroup->getName());
-
                     $permissionsGroup->addRoleScope(
                         (new RoleScope())
                             ->setRole(AccompanyingPeriodVoter::FULL)
@@ -80,7 +78,6 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
                     break;
 
                 case 'administrative':
-                    printf("Adding CHILL_PERSON_SEE to %s permission group \n", $permissionsGroup->getName());
                     $roleScopeSee = (new RoleScope())
                         ->setRole('CHILL_PERSON_SEE')
                         ->setScope(null);
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
index 480238639..529918377 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
@@ -18,9 +18,9 @@ use Doctrine\Persistence\ObjectManager;
 
 class LoadRelations extends Fixture implements FixtureGroupInterface
 {
-    public const RELATION_KEY = 'relations';
+    final public const RELATION_KEY = 'relations';
 
-    public const RELATIONS = [
+    final public const RELATIONS = [
         ['title' => ['fr' => 'Parent'], 'reverseTitle' => ['fr' => 'Enfant']],
         ['title' => ['fr' => 'En couple'], 'reverseTitle' => ['fr' => 'En couple']],
         ['title' => ['fr' => 'Beau parent'], 'reverseTitle' => ['fr' => 'Belle-fille·beau-fils']],
@@ -38,13 +38,13 @@ class LoadRelations extends Fixture implements FixtureGroupInterface
     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";
+            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);
+            $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
index 6b5cf0696..3efcc6386 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
@@ -15,25 +15,16 @@ 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 array_key_exists;
-use function count;
-
 class LoadRelationships extends Fixture implements DependentFixtureInterface
 {
     use PersonRandomHelper;
 
-    private EntityManagerInterface $em;
-
-    public function __construct(EntityManagerInterface $em)
-    {
-        $this->em = $em;
-    }
+    public function __construct(private readonly EntityManagerInterface $em) {}
 
     public function getDependencies(): array
     {
@@ -45,16 +36,17 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
 
     public function load(ObjectManager $manager): void
     {
+        /** @var array<int, array<int, 1>> $existing */
         $existing = [];
 
         for ($i = 0; 20 > $i; ++$i) {
             $user = $this->getRandomUser();
-            $date = new DateTimeImmutable();
+            $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)))
+                ->setRelation($this->getReference(LoadRelations::RELATION_KEY.
+                    random_int(0, \count(LoadRelations::RELATIONS) - 1)))
                 ->setReverse((bool) random_int(0, 1))
                 ->setCreatedBy($user)
                 ->setUpdatedBy($user)
@@ -62,15 +54,16 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
                 ->setUpdatedAt($date);
 
             // remove the potential duplicates
-            $set = $relationship->getFromPerson()->getId() < $relationship->getToPerson()->getId() ?
-                [$relationship->getFromPerson()->getId(), $relationship->getToPerson()->getId()] :
-                [$relationship->getToPerson()->getId(), $relationship->getFromPerson()->getId()];
+            $set = [
+                min($relationship->getFromPerson()->getId(), $relationship->getToPerson()->getId()),
+                max($relationship->getFromPerson()->getId(), $relationship->getToPerson()->getId()),
+            ];
 
-            if (array_key_exists($set[0], $existing) && array_key_exists($set[1], $existing[$set[0]])) {
+            if (\array_key_exists($set[0], $existing) && \array_key_exists($set[1], $existing[$set[0]])) {
                 continue;
             }
+            $existing[$set[0]][$set[1]] = 1;
 
-            $existing[$set[0]][$existing[$set[1]]] = 1;
             $manager->persist($relationship);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
index 12c85c59d..dc1e7b4dd 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
@@ -15,18 +15,11 @@ 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 Fixture implements OrderedFixtureInterface
 {
-    private SocialWorkMetadata $importer;
-
-    public function __construct(SocialWorkMetadata $importer)
-    {
-        $this->importer = $importer;
-    }
+    public function __construct(private readonly SocialWorkMetadata $importer) {}
 
     public function getOrder()
     {
@@ -36,9 +29,9 @@ class LoadSocialWorkMetadata extends Fixture implements OrderedFixtureInterface
     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 = Reader::createFromPath(__DIR__.'/data/social_work_metadata.csv');
+        } catch (\Throwable $e) {
+            throw new \Exception('Error while loading CSV.', 0, $e);
         }
 
         $csv->setDelimiter(';');
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index d60e15e41..c5d7a026b 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\DependencyInjection\MissingBundleException;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Chill\PersonBundle\Controller\HouseholdCompositionTypeApiController;
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodCommentVoter;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodResourceVoter;
 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;
@@ -27,8 +27,6 @@ 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.
@@ -38,7 +36,7 @@ use function array_key_exists;
 class ChillPersonExtension extends Extension implements PrependExtensionInterface
 {
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -72,7 +70,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         // 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/fixtures.yaml');
@@ -96,7 +94,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
 
         $loader->load('services/exports_person.yaml');
 
-        if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') {
+        if ('hidden' !== $container->getParameter('chill_person.accompanying_period')) {
             $loader->load('services/exports_accompanying_course.yaml');
             $loader->load('services/exports_social_actions.yaml');
             $loader->load('services/exports_evaluation.yaml');
@@ -116,7 +114,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $this->prependCruds($container);
         $this->prependWorkflows($container);
 
-        //add person_fields parameter as global
+        // add person_fields parameter as global
         $chillPersonConfig = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration(new Configuration(), $chillPersonConfig);
         $twigConfig = [
@@ -128,13 +126,13 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'fields' => $config['accompanying_periods_fields'],
                 ],
             ],
-            'form_themes' => ['ChillPersonBundle:Export:ListPersonFormFields.html.twig'],
+            'form_themes' => ['@ChillPerson/Export/ListPersonFormFields.html.twig'],
         ];
         $container->prependExtensionConfig('twig', $twigConfig);
 
         $this->declarePersonAsCustomizable($container);
 
-        //declare routes for person bundle
+        // declare routes for person bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
@@ -917,7 +915,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
      */
     protected function prependDoctrineDQL(ContainerBuilder $container)
     {
-        //add DQL function to ORM (default entity_manager)
+        // add DQL function to ORM (default entity_manager)
 
         $container->prependExtensionConfig('doctrine', [
             'orm' => [
@@ -982,11 +980,8 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     AccompanyingPeriodVoter::EDIT,
                     AccompanyingPeriodVoter::DELETE,
                 ],
-                AccompanyingPeriodVoter::REASSIGN_BULK => [
-                    AccompanyingPeriodVoter::CONFIDENTIAL_CRUD,
-                ],
-                AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL => [
-                    AccompanyingPeriodVoter::CONFIDENTIAL_CRUD,
+                AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL_ALL => [
+                    AccompanyingPeriodVoter::SEE_CONFIDENTIAL_ALL,
                 ],
             ],
         ]);
@@ -1006,22 +1001,46 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         'property' => 'step',
                     ],
                     'supports' => [
-                        'Chill\PersonBundle\Entity\AccompanyingPeriod',
+                        \Chill\PersonBundle\Entity\AccompanyingPeriod::class,
                     ],
                     'initial_marking' => 'DRAFT',
                     'places' => [
-                        'DRAFT',
-                        'CONFIRMED',
-                        'CLOSED',
+                        AccompanyingPeriod::STEP_DRAFT,
+                        AccompanyingPeriod::STEP_CONFIRMED,
+                        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+                        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+                        AccompanyingPeriod::STEP_CLOSED,
                     ],
                     'transitions' => [
                         'confirm' => [
-                            'from' => 'DRAFT',
-                            'to' => 'CONFIRMED',
+                            'from' => AccompanyingPeriod::STEP_DRAFT,
+                            'to' => AccompanyingPeriod::STEP_CONFIRMED,
+                        ],
+                        'mark_inactive_short' => [
+                            'from' => AccompanyingPeriod::STEP_CONFIRMED,
+                            'to' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+                        ],
+                        'mark_inactive_long' => [
+                            'from' => [
+                                AccompanyingPeriod::STEP_CONFIRMED,
+                                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+                            ],
+                            'to' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+                        ],
+                        'mark_active' => [
+                            'from' => [
+                                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+                                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+                            ],
+                            'to' => AccompanyingPeriod::STEP_CONFIRMED,
                         ],
                         'close' => [
-                            'from' => 'CONFIRMED',
-                            'to' => 'CLOSED',
+                            'from' => [
+                                AccompanyingPeriod::STEP_CONFIRMED,
+                                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+                                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+                            ],
+                            'to' => AccompanyingPeriod::STEP_CLOSED,
                         ],
                     ],
                 ],
@@ -1043,15 +1062,12 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $container->prependExtensionConfig(
             'chill_custom_fields',
             ['customizables_entities' => [
-                ['class' => 'Chill\PersonBundle\Entity\Person', 'name' => 'PersonEntity'],
+                ['class' => \Chill\PersonBundle\Entity\Person::class, 'name' => 'PersonEntity'],
             ],
             ]
         );
     }
 
-    /**
-     * @param $config
-     */
     private function handleAccompanyingPeriodsFieldsParameters(ContainerBuilder $container, $config)
     {
         $container->setParameter('chill_person.accompanying_period_fields', $config);
@@ -1062,36 +1078,26 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     break;
 
                 default:
-                    $container->setParameter('chill_person.accompanying_period_fields.' . $key, $value);
+                    $container->setParameter('chill_person.accompanying_period_fields.'.$key, $value);
 
                     break;
             }
         }
     }
 
-    /**
-     * @param $config
-     */
     private function handlePersonFieldsParameters(ContainerBuilder $container, $config)
     {
-        if (array_key_exists('enabled', $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;
-            }
+            match ($key) {
+                'accompanying_period' => $container->setParameter('chill_person.accompanying_period', $value),
+                default => $container->setParameter('chill_person.person_fields.'.$key, $value),
+            };
         }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php b/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
index ac8ca6593..c010196f8 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
@@ -14,8 +14,6 @@ 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`.
@@ -25,7 +23,7 @@ class AccompanyingPeriodTimelineCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         // remove services when accompanying period are hidden
-        if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') {
+        if ('hidden' !== $container->getParameter('chill_person.accompanying_period')) {
             return;
         }
 
@@ -52,7 +50,7 @@ class AccompanyingPeriodTimelineCompilerPass implements CompilerPassInterface
 
             $definition->removeMethodCall('addProvider');
 
-            if (false === in_array($arguments[1], $definitions, true)) {
+            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 f9686c900..3579407f2 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@@ -11,8 +11,6 @@ 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;
 
@@ -23,14 +21,14 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
  */
 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 string $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';
 
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('cl_chill_person');
-        $rootNode = $treeBuilder->getRootNode('cl_chill_person');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->canBeDisabled()
@@ -48,19 +46,19 @@ class Configuration implements ConfigurationInterface
             ->validate()
             ->ifTrue(static function ($period) {
                 try {
-                    $interval = new DateInterval($period);
-                } catch (Exception $ex) {
+                    $interval = new \DateInterval($period);
+                } catch (\Exception) {
                     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')
+                                                .'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() // validation, parent = children of root
             ->end() // children of root, parent = root
             ->booleanNode('create_person_allowed')
             ->defaultTrue()
@@ -107,7 +105,7 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->end()
-            ->end() //children for 'person_fields', parent = array 'person_fields'
+            ->end() // children for 'person_fields', parent = array 'person_fields'
             ->end() // person_fields, parent = children of root
             ->arrayNode('accompanying_periods_fields')
             ->canBeDisabled()
@@ -122,12 +120,21 @@ class Configuration implements ConfigurationInterface
             ->append($this->addFieldNode('anonymous'))
             ->append($this->addFieldNode('emergency'))
             ->append($this->addFieldNode('confidential'))
-            ->end() //children for 'accompanying_person_fields', parent = array 'person_fields'
+            ->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()
+            ->arrayNode('accompanying_period_lifecycle_delays')
+            ->addDefaultsIfNotSet()
+            ->info('Delays before marking an accompanying period as inactive')
+            ->children()
+            ->booleanNode('mark_inactive')->defaultTrue()->end()
+            ->scalarNode('mark_inactive_short_after')->defaultValue('P6M')->end()
+            ->scalarNode('mark_inactive_long_after')->defaultValue('P2Y')->end()
+            ->end()
+            ->end() // end of 'accompanying_period_lifecycle_delays
             ->end() // children of 'root', parent = root
         ;
 
@@ -137,19 +144,12 @@ class Configuration implements ConfigurationInterface
     private function addFieldNode($key)
     {
         $tree = new TreeBuilder($key, 'enum');
-        $node = $tree->getRootNode($key);
+        $node = $tree->getRootNode();
 
-        switch ($key) {
-            case 'accompanying_period':
-                $info = 'If the accompanying periods are shown';
-
-                break;
-
-            default:
-                $info = "If the field {$key} must be shown";
-
-                break;
-        }
+        $info = match ($key) {
+            'accompanying_period' => 'If the accompanying periods are shown',
+            default => "If the field {$key} must be shown",
+        };
 
         $node
             ->values(['hidden', 'visible'])
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
index 5cfdd1fd6..38d13ea43 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
@@ -40,20 +40,14 @@ abstract class AddressPart extends FunctionNode
         'country_id',
     ];
 
-    /**
-     * @var \Doctrine\ORM\Query\AST\Node
-     */
-    private $date;
+    private null|\Doctrine\ORM\Query\AST\Node|string $date = null;
 
     /**
      * @var \Doctrine\ORM\Query\AST\Node
      */
     private $part;
 
-    /**
-     * @var \Doctrine\ORM\Query\AST\Node
-     */
-    private $pid;
+    private ?\Doctrine\ORM\Query\AST\PathExpression $pid = null;
 
     /**
      * return the part of the address.
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 510e1c327..4302a17f4 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity;
 
+use Chill\CalendarBundle\Entity\Calendar;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\Address;
@@ -37,37 +38,36 @@ use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOve
 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\Common\Collections\Criteria;
 use Doctrine\Common\Collections\ReadableCollection;
+use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
-use Iterator;
-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 array_key_exists;
-use const SORT_REGULAR;
-
 /**
  * AccompanyingPeriod Class.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "accompanying_period": AccompanyingPeriod::class
  * })
+ *
  * @Assert\GroupSequenceProvider
+ *
  * @AccompanyingPeriodValidity(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
+ *
  * @LocationValidity(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
+ *
  * @ConfidentialCourseMustHaveReferrer(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
  */
 class AccompanyingPeriod implements
@@ -77,21 +77,21 @@ class AccompanyingPeriod implements
     TrackCreationInterface,
     TrackUpdateInterface
 {
-    public const INTENSITIES = [self::INTENSITY_OCCASIONAL, self::INTENSITY_REGULAR];
+    final public const INTENSITIES = [self::INTENSITY_OCCASIONAL, self::INTENSITY_REGULAR];
 
     /**
      * Mark an accompanying period as "occasional".
      *
      * used in INTENSITY
      */
-    public const INTENSITY_OCCASIONAL = 'occasional';
+    final public const INTENSITY_OCCASIONAL = 'occasional';
 
     /**
      * Mark an accompanying period as "regular".
      *
      * used in INTENSITY
      */
-    public const INTENSITY_REGULAR = 'regular';
+    final public const INTENSITY_REGULAR = 'regular';
 
     /**
      * Mark an accompanying period as "closed".
@@ -99,7 +99,7 @@ class AccompanyingPeriod implements
      * This means that the accompanying period **is**
      * closed by the creator
      */
-    public const STEP_CLOSED = 'CLOSED';
+    final public const STEP_CLOSED = 'CLOSED';
 
     /**
      * Mark an accompanying period as "confirmed".
@@ -107,7 +107,25 @@ class AccompanyingPeriod implements
      * This means that the accompanying period **is**
      * confirmed by the creator
      */
-    public const STEP_CONFIRMED = 'CONFIRMED';
+    final public const STEP_CONFIRMED = 'CONFIRMED';
+
+    /**
+     * Mark an accompanying period as confirmed, but inactive.
+     *
+     * this means that the accompanying period **is**
+     * confirmed, but no activity (Activity, AccompanyingPeriod, ...)
+     * has been associated, or updated, within this accompanying period.
+     */
+    final public const STEP_CONFIRMED_INACTIVE_SHORT = 'CONFIRMED_INACTIVE_SHORT';
+
+    /**
+     * Mark an accompanying period as confirmed, but inactive.
+     *
+     * this means that the accompanying period **is**
+     * confirmed, but no activity (Activity, AccompanyingPeriod, ...)
+     * has been associated, or updated, within this accompanying period.
+     */
+    final public const STEP_CONFIRMED_INACTIVE_LONG = 'CONFIRMED_INACTIVE_LONG';
 
     /**
      * Mark an accompanying period as "draft".
@@ -115,7 +133,7 @@ class AccompanyingPeriod implements
      * This means that the accompanying period is not yet
      * confirmed by the creator
      */
-    public const STEP_DRAFT = 'DRAFT';
+    final public const STEP_DRAFT = 'DRAFT';
 
     /**
      * @ORM\ManyToOne(
@@ -126,37 +144,43 @@ class AccompanyingPeriod implements
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     *
      * @Groups({"read", "write"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private ?Location $administrativeLocation = null;
 
     /**
+     * @var Collection&Selectable<int, Calendar>
+     *
      * @ORM\OneToMany(targetEntity="Chill\CalendarBundle\Entity\Calendar", mappedBy="accompanyingPeriod")
      */
-    private Collection $calendars;
+    private Collection&Selectable $calendars;
 
     /**
-     * @var DateTime
-     *
      * @ORM\Column(type="date", nullable=true)
+     *
      * @Groups({"read", "write", "docgen:read"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CLOSED})
+     *
      * @Assert\GreaterThanOrEqual(
      *     propertyPath="openingDate",
      *     groups={AccompanyingPeriod::STEP_CLOSED},
      *     message="The closing date must be later than the date of creation"
      * )
      */
-    private ?DateTime $closingDate = null;
+    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;
@@ -167,80 +191,102 @@ class AccompanyingPeriod implements
      *     cascade={"persist", "remove"},
      *     orphanRemoval=true
      * )
+     *
+     * @ORM\OrderBy({"createdAt": "DESC", "id": "DESC"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_DRAFT})
+     *
+     * @var Collection<Comment>
      */
     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;
+    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;
 
     /**
-     * @var string
      * @ORM\Column(type="string", nullable=true)
+     *
      * @Groups({"read"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
-    private $intensity = self::INTENSITY_OCCASIONAL;
+    private ?string $intensity = self::INTENSITY_OCCASIONAL;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=UserJob::class
      * )
+     *
      * @Groups({"read", "write"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private ?UserJob $job = null;
 
     /**
+     * @var Collection<AccompanyingPeriodLocationHistory>
+     *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodLocationHistory::class,
      * mappedBy="period", cascade={"persist", "remove"}, orphanRemoval=true)
      */
     private Collection $locationHistories;
 
     /**
-     * @var DateTime
-     *
      * @ORM\Column(type="date")
+     *
      * @Groups({"read", "write", "docgen:read"})
+     *
      * @Assert\LessThan(value="tomorrow", groups={AccompanyingPeriod::STEP_CONFIRMED})
+     *
      * @Assert\LessThanOrEqual(propertyPath="closingDate", groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
-    private ?DateTime $openingDate = null;
+    private ?\DateTime $openingDate = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Origin::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "write"})
+     *
      * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
     private ?Origin $origin = null;
@@ -249,8 +295,12 @@ class AccompanyingPeriod implements
      * @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})
+     *
+     * @var Collection<AccompanyingPeriodParticipation>
      */
     private Collection $participations;
 
@@ -267,7 +317,9 @@ class AccompanyingPeriod implements
      *     targetEntity=Comment::class,
      *     cascade={"persist"},
      * )
+     *
      * @Groups({"read"})
+     *
      * @ORM\JoinColumn(onDelete="SET NULL")
      */
     private ?Comment $pinnedComment = null;
@@ -276,74 +328,97 @@ class AccompanyingPeriod implements
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Groups({"read", "write"})
      */
     private string $remark = '';
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     *
      * @Groups({"read", "write", "docgen:read"})
      */
     private bool $requestorAnonymous = false;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodRequested")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?Person $requestorPerson = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
     private ?ThirdParty $requestorThirdParty = null;
 
     /**
+     * @var Collection<resource>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\Resource",
      *     mappedBy="accompanyingPeriod",
      *     cascade={"persist", "remove"},
      *     orphanRemoval=true
      * )
+     *
      * @Groups({"read", "docgen:read"})
+     *
      * @ResourceDuplicateCheck(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED, "Default", "default"})
      */
     private Collection $resources;
 
     /**
+     * @var Collection<Scope>
+     *
      * @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;
 
     /**
+     * @var Collection<SocialIssue>
+     *
      * @ORM\ManyToMany(
      *     targetEntity=SocialIssue::class
      * )
+     *
      * @ORM\JoinTable(
      *     name="chill_person_accompanying_period_social_issues"
      * )
+     *
      * @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"})
+     *
+     * @var AccompanyingPeriod::STEP_*
      */
-    private string $step = self::STEP_DRAFT;
+    private ?string $step = self::STEP_DRAFT;
 
     /**
+     * @var Collection<AccompanyingPeriodStepHistory>
+     *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodStepHistory::class,
      * mappedBy="period", cascade={"persist", "remove"}, orphanRemoval=true)
      */
@@ -352,7 +427,7 @@ class AccompanyingPeriod implements
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
      */
-    private ?DateTimeInterface $updatedAt = null;
+    private ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(
@@ -363,7 +438,9 @@ class AccompanyingPeriod implements
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "write", "docgen:read"})
      */
     private ?User $user = null;
@@ -372,7 +449,7 @@ class AccompanyingPeriod implements
      * @ORM\OneToMany(targetEntity=UserHistory::class, mappedBy="accompanyingPeriod", orphanRemoval=true,
      * cascade={"persist", "remove"})
      *
-     * @var Collection|UserHistory[]
+     * @var Collection<UserHistory>
      */
     private Collection $userHistories;
 
@@ -386,10 +463,13 @@ class AccompanyingPeriod implements
     private ?User $userPrevious = null;
 
     /**
+     * @var Collection<AccompanyingPeriodWork>
+     *
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriodWork::class,
      *     mappedBy="accompanyingPeriod"
      * )
+     *
      * @Assert\Valid(traverse=true)
      */
     private Collection $works;
@@ -397,11 +477,9 @@ class AccompanyingPeriod implements
     /**
      * AccompanyingPeriod constructor.
      *
-     * @param DateTime $dateOpening
-     *
      * @uses AccompanyingPeriod::setClosingDate()
      */
-    public function __construct(?DateTime $dateOpening = null)
+    public function __construct(\DateTime $dateOpening = null)
     {
         $this->calendars = new ArrayCollection(); // TODO we cannot add a dependency between AccompanyingPeriod and calendars
         $this->participations = new ArrayCollection();
@@ -413,7 +491,7 @@ class AccompanyingPeriod implements
         $this->userHistories = new ArrayCollection();
         $this->locationHistories = new ArrayCollection();
         $this->stepHistories = new ArrayCollection();
-        $this->setOpeningDate($dateOpening ?? new DateTime('now'));
+        $this->setOpeningDate($dateOpening ?? new \DateTime('now'));
     }
 
     /**
@@ -436,7 +514,7 @@ class AccompanyingPeriod implements
         foreach ($participations as $p) {
             $households[] = $p->getPerson()->getCurrentHousehold();
         }
-        $households = array_unique($households, SORT_REGULAR);
+        $households = array_unique($households, \SORT_REGULAR);
 
         $array = [];
 
@@ -466,7 +544,7 @@ class AccompanyingPeriod implements
 
     public function addLocationHistory(AccompanyingPeriodLocationHistory $history): self
     {
-        if ($this->getStep() === self::STEP_DRAFT) {
+        if (self::STEP_DRAFT === $this->getStep()) {
             return $this;
         }
 
@@ -479,7 +557,7 @@ class AccompanyingPeriod implements
         $criteria = new Criteria();
         $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
 
-        /** @var Iterator $locations */
+        /** @var \Iterator $locations */
         $locations = $this->getLocationHistories()->matching($criteria)->getIterator();
         $locations->rewind();
 
@@ -497,7 +575,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function addPerson(?Person $person = null): self
+    public function addPerson(Person $person = null): self
     {
         if (null !== $person) {
             $this->createParticipationFor($person);
@@ -548,7 +626,7 @@ class AccompanyingPeriod implements
      */
     public function canBeReOpened(Person $person): bool
     {
-        if ($this->isOpen() === true) {
+        if (true === $this->isOpen()) {
             return false;
         }
 
@@ -568,15 +646,13 @@ class AccompanyingPeriod implements
      *
      * Search for the person's participation and set the end date at
      * 'now'.
-     *
-     * @param mixed $person
      */
-    public function closeParticipationFor($person): ?AccompanyingPeriodParticipation
+    public function closeParticipationFor(mixed $person): ?AccompanyingPeriodParticipation
     {
         $participation = $this->getOpenParticipationContainsPerson($person);
 
         if ($participation instanceof AccompanyingPeriodParticipation) {
-            $participation->setEndDate(new DateTime('now'));
+            $participation->setEndDate(new \DateTime('now'));
         }
 
         return $participation;
@@ -636,7 +712,7 @@ class AccompanyingPeriod implements
 
     public function getCenter(): ?Center
     {
-        if ($this->getPersons()->count() === 0) {
+        if (0 === $this->getPersons()->count()) {
             return null;
         }
 
@@ -650,7 +726,7 @@ class AccompanyingPeriod implements
         foreach ($this->getPersons() as $person) {
             if (
                 null !== $person->getCenter()
-                && !array_key_exists(spl_object_hash($person->getCenter()), $centers)
+                && !\array_key_exists(spl_object_hash($person->getCenter()), $centers)
             ) {
                 $centers[spl_object_hash($person->getCenter())] = $person->getCenter();
             }
@@ -661,10 +737,8 @@ class AccompanyingPeriod implements
 
     /**
      * Get closingDate.
-     *
-     * @return DateTime
      */
-    public function getClosingDate(): ?DateTime
+    public function getClosingDate(): ?\DateTime
     {
         return $this->closingDate;
     }
@@ -676,6 +750,7 @@ class AccompanyingPeriod implements
 
     /**
      * @Groups({"read"})
+     *
      * @return ReadableCollection<(int|string), Comment>
      */
     public function getComments(): ReadableCollection
@@ -686,10 +761,11 @@ class AccompanyingPeriod implements
             ->comments
             ->filter(
                 static fn (Comment $c): bool => $c !== $pinnedComment
-            );
+            )
+        ;
     }
 
-    public function getCreatedAt(): ?DateTime
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -709,19 +785,17 @@ class AccompanyingPeriod implements
 
     public function getGroupSequence()
     {
-        if ($this->getStep() === self::STEP_DRAFT) {
+        if (self::STEP_DRAFT === $this->getStep()) {
             return [[self::STEP_DRAFT]];
         }
-
-        if ($this->getStep() === self::STEP_CONFIRMED) {
+        if (str_starts_with($this->getStep(), 'CONFIRM')) {
             return [[self::STEP_DRAFT, self::STEP_CONFIRMED]];
         }
-
-        if ($this->getStep() === self::STEP_CLOSED) {
+        if (self::STEP_CLOSED === $this->getStep()) {
             return [[self::STEP_DRAFT, self::STEP_CONFIRMED, self::STEP_CLOSED]];
         }
 
-        throw new LogicException('no validation group permitted with this step: ' . $this->getStep());
+        throw new \LogicException('no validation group permitted with this step: '.$this->getStep());
     }
 
     public function getId(): ?int
@@ -755,7 +829,7 @@ class AccompanyingPeriod implements
      *
      * @Groups({"read"})
      */
-    public function getLocation(?DateTimeImmutable $at = null): ?Address
+    public function getLocation(\DateTimeImmutable $at = null): ?Address
     {
         if ($this->getPersonLocation() instanceof Person) {
             return $this->getPersonLocation()->getCurrentPersonAddress();
@@ -765,7 +839,7 @@ class AccompanyingPeriod implements
     }
 
     /**
-     * @return Collection|AccompanyingPeriodLocationHistory[]
+     * @return Collection<AccompanyingPeriodLocationHistory>
      */
     public function getLocationHistories(): Collection
     {
@@ -776,6 +850,8 @@ class AccompanyingPeriod implements
      * Get where the location is.
      *
      * @Groups({"read"})
+     *
+     * @return 'person'|'address'|'none'
      */
     public function getLocationStatus(): string
     {
@@ -790,12 +866,12 @@ class AccompanyingPeriod implements
         return 'none';
     }
 
-    public function getNextCalendarsForPerson(Person $person, $limit = 5): Collection
+    public function getNextCalendarsForPerson(Person $person, $limit = 5): ReadableCollection
     {
-        $today = new DateTimeImmutable('today');
+        $today = new \DateTimeImmutable('today');
         $criteria = Criteria::create()
             ->where(Criteria::expr()->gte('startDate', $today))
-            //->andWhere(Criteria::expr()->memberOf('persons', $person))
+            // ->andWhere(Criteria::expr()->memberOf('persons', $person))
             ->orderBy(['startDate' => 'DESC'])
             ->setMaxResults($limit * 2);
 
@@ -810,10 +886,8 @@ class AccompanyingPeriod implements
 
     /**
      * Get openingDate.
-     *
-     * @return DateTime
      */
-    public function getOpeningDate(): ?DateTime
+    public function getOpeningDate(): ?\DateTime
     {
         return $this->openingDate;
     }
@@ -828,9 +902,7 @@ class AccompanyingPeriod implements
         $collection = $this
             ->getParticipationsContainsPerson($person)
             ->filter(
-                static function (AccompanyingPeriodParticipation $participation): bool {
-                    return null === $participation->getEndDate();
-                }
+                static fn (AccompanyingPeriodParticipation $participation): bool => null === $participation->getEndDate()
             );
 
         return $collection->count() > 0 ? $collection->first() : null;
@@ -844,9 +916,7 @@ class AccompanyingPeriod implements
         return $this
             ->getParticipations()
             ->filter(
-                static function (AccompanyingPeriodParticipation $participation): bool {
-                    return null === $participation->getEndDate();
-                }
+                static fn (AccompanyingPeriodParticipation $participation): bool => null === $participation->getEndDate()
             );
     }
 
@@ -857,6 +927,8 @@ class AccompanyingPeriod implements
 
     /**
      * Get Participations Collection.
+     *
+     * @return Collection<AccompanyingPeriodParticipation>
      */
     public function getParticipations(): Collection
     {
@@ -865,6 +937,7 @@ class AccompanyingPeriod implements
 
     /**
      * Get the participation containing a person.
+     *
      * @return ReadableCollection<(int|string), AccompanyingPeriodParticipation>
      */
     public function getParticipationsContainsPerson(Person $person): ReadableCollection
@@ -913,7 +986,7 @@ class AccompanyingPeriod implements
 
     /**
      * @return Collection|SocialAction[] All the descendant social actions of all
-     * the descendants of the entity
+     *                                   the descendants of the entity
      */
     public function getRecursiveSocialActions(): Collection
     {
@@ -954,10 +1027,9 @@ class AccompanyingPeriod implements
     }
 
     /**
-     * @return Person|ThirdParty
      * @Groups({"read"})
      */
-    public function getRequestor()
+    public function getRequestor(): null|Person|ThirdParty
     {
         return $this->requestorPerson ?? $this->requestorThirdParty;
     }
@@ -1089,11 +1161,11 @@ class AccompanyingPeriod implements
 
     public function isOpen(): bool
     {
-        if ($this->getOpeningDate() > new DateTimeImmutable('now')) {
+        if ($this->getOpeningDate() > new \DateTimeImmutable('now')) {
             return false;
         }
 
-        if ($this->getClosingDate() === null) {
+        if (null === $this->getClosingDate()) {
             return true;
         }
 
@@ -1185,15 +1257,16 @@ class AccompanyingPeriod implements
     /**
      * @Groups({"write"})
      */
-    public function setAddressLocation(?Address $addressLocation = null): self
+    public function setAddressLocation(Address $addressLocation = null): self
     {
         if ($this->addressLocation !== $addressLocation) {
             $this->addressLocation = $addressLocation;
 
             if (null !== $addressLocation) {
+                $this->setPersonLocation(null);
                 $locationHistory = new AccompanyingPeriodLocationHistory();
                 $locationHistory
-                    ->setStartDate(new DateTimeImmutable('now'))
+                    ->setStartDate(new \DateTimeImmutable('now'))
                     ->setAddressLocation($addressLocation);
 
                 $this->addLocationHistory($locationHistory);
@@ -1215,18 +1288,16 @@ class AccompanyingPeriod implements
      *
      * For closing a Person file, you should use Person::setClosed instead.
      *
-     * @param mixed $closingDate
-     *
      * @return AccompanyingPeriod
      */
-    public function setClosingDate($closingDate)
+    public function setClosingDate(mixed $closingDate)
     {
         $this->closingDate = $closingDate;
 
         return $this;
     }
 
-    public function setClosingMotive(?ClosingMotive $closingMotive = null): self
+    public function setClosingMotive(ClosingMotive $closingMotive = null): self
     {
         $this->closingMotive = $closingMotive;
 
@@ -1240,7 +1311,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $datetime): self
+    public function setCreatedAt(\DateTimeInterface $datetime): self
     {
         $this->createdAt = $datetime;
 
@@ -1278,11 +1349,9 @@ class AccompanyingPeriod implements
     /**
      * Set openingDate.
      *
-     * @param mixed $openingDate
-     *
      * @return AccompanyingPeriod
      */
-    public function setOpeningDate($openingDate)
+    public function setOpeningDate(mixed $openingDate)
     {
         if ($this->openingDate !== $openingDate) {
             $this->openingDate = $openingDate;
@@ -1303,15 +1372,16 @@ class AccompanyingPeriod implements
     /**
      * @Groups({"write"})
      */
-    public function setPersonLocation(?Person $person = null): self
+    public function setPersonLocation(Person $person = null): self
     {
         if ($this->personLocation !== $person) {
             $this->personLocation = $person;
 
             if (null !== $person) {
+                $this->setAddressLocation(null);
                 $locationHistory = new AccompanyingPeriodLocationHistory();
                 $locationHistory
-                    ->setStartDate(new DateTimeImmutable('now'))
+                    ->setStartDate(new \DateTimeImmutable('now'))
                     ->setPersonLocation($person);
 
                 $this->addLocationHistory($locationHistory);
@@ -1324,7 +1394,7 @@ class AccompanyingPeriod implements
     /**
      * @Groups({"write"})
      */
-    public function setPinnedComment(?Comment $comment = null): self
+    public function setPinnedComment(Comment $comment = null): self
     {
         if (null !== $this->pinnedComment) {
             $this->addComment($this->pinnedComment);
@@ -1335,7 +1405,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function setRemark(?string $remark = null): self
+    public function setRemark(string $remark = null): self
     {
         $this->remark = (string) $remark;
 
@@ -1349,7 +1419,9 @@ class AccompanyingPeriod implements
      * instance of Person
      *
      * @param $requestor Person|ThirdParty
+     *
      * @throw UnexpectedValueException if the requestor is not a Person or ThirdParty
+     *
      * @Groups({"write"})
      */
     public function setRequestor($requestor): self
@@ -1364,7 +1436,7 @@ class AccompanyingPeriod implements
             $this->setRequestorPerson(null);
             $this->setRequestorThirdParty(null);
         } else {
-            throw new UnexpectedValueException('requestor is not an instance of Person or ThirdParty');
+            throw new \UnexpectedValueException('requestor is not an instance of Person or ThirdParty');
         }
 
         return $this;
@@ -1390,7 +1462,7 @@ class AccompanyingPeriod implements
         if (self::STEP_DRAFT !== $this->step && $previous !== $step) {
             // we create a new history
             $history = new AccompanyingPeriodStepHistory();
-            $history->setStep($this->step)->setStartDate(new DateTimeImmutable('now'));
+            $history->setStep($this->step)->setStartDate(new \DateTimeImmutable('now'));
 
             $this->addStepHistory($history);
         }
@@ -1398,7 +1470,7 @@ class AccompanyingPeriod implements
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
         $this->updatedAt = $datetime;
 
@@ -1421,7 +1493,7 @@ class AccompanyingPeriod implements
 
             foreach ($this->userHistories as $history) {
                 if (null === $history->getEndDate()) {
-                    $history->setEndDate(new DateTimeImmutable('now'));
+                    $history->setEndDate(new \DateTimeImmutable('now'));
                 }
             }
 
@@ -1451,7 +1523,7 @@ class AccompanyingPeriod implements
         // first location history
         $locationHistory = new AccompanyingPeriodLocationHistory();
         $locationHistory
-            ->setStartDate(new DateTimeImmutable('now'))
+            ->setStartDate(new \DateTimeImmutable('now'))
             ->setPersonLocation($this->getPersonLocation())
             ->setAddressLocation($this->getAddressLocation());
         $this->addLocationHistory($locationHistory);
@@ -1463,7 +1535,7 @@ class AccompanyingPeriod implements
         $criteria = new Criteria();
         $criteria->orderBy(['startDate' => Criteria::ASC, 'id' => Criteria::ASC]);
 
-        /** @var Iterator $steps */
+        /** @var \Iterator $steps */
         $steps = $this->getStepHistories()->matching($criteria)->getIterator();
         $steps->rewind();
 
@@ -1478,7 +1550,7 @@ class AccompanyingPeriod implements
 
         if ($this->getOpeningDate()->format('Y-m-d') !== $current->getStartDate()->format('Y-m-d')
             && ($this->getOpeningDate() <= $current->getEndDate() || null === $current->getEndDate())) {
-            $current->setStartDate(DateTimeImmutable::createFromMutable($this->getOpeningDate()));
+            $current->setStartDate(\DateTimeImmutable::createFromMutable($this->getOpeningDate()));
         }
 
         // then we set all the end date to the start date of the next one
@@ -1494,14 +1566,14 @@ class AccompanyingPeriod implements
         } while ($steps->valid());
     }
 
-    private function setRequestorPerson(?Person $requestorPerson = null): self
+    private function setRequestorPerson(Person $requestorPerson = null): self
     {
         $this->requestorPerson = $requestorPerson;
 
         return $this;
     }
 
-    private function setRequestorThirdParty(?ThirdParty $requestorThirdParty = null): self
+    private function setRequestorThirdParty(ThirdParty $requestorThirdParty = null): self
     {
         $this->requestorThirdParty = $requestorThirdParty;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodInfo.php
new file mode 100644
index 000000000..d68292927
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodInfo.php
@@ -0,0 +1,88 @@
+<?php
+
+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 Chill\PersonBundle\Entity\AccompanyingPeriod;
+
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Informations about AccompanyingPeriod.
+ *
+ * This entity allow access to some basic information about the AccompanyingPeriod. It is
+ * populated from a SQL view, dynamically build from various sources.
+ *
+ * Usage:
+ *
+ * - get the user involved with an accompanying period
+ *
+ * @ORM\Entity()
+ *
+ * @ORM\Table(name="view_chill_person_accompanying_period_info")
+ */
+class AccompanyingPeriodInfo
+{
+    public function __construct(
+        /**
+         * @var AccompanyingPeriod
+         *
+         * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class)
+         */
+        public readonly AccompanyingPeriod $accompanyingPeriod,
+
+        /**
+         * @var string
+         *
+         * @ORM\Column(type="text")
+         *
+         * @ORM\Id
+         */
+        public readonly string $relatedEntity,
+
+        /**
+         * @var int
+         *
+         * @ORM\Column(type="integer")
+         *
+         * @ORM\Id
+         */
+        public readonly int $relatedEntityId,
+
+        /**
+         * @var User
+         *
+         * @ORM\ManyToOne(targetEntity=User::class)
+         */
+        public readonly ?User $user,
+
+        /**
+         * @var \DateTimeImmutable
+         *
+         * @ORM\Column(type="datetime_immutable")
+         */
+        public readonly \DateTimeImmutable $infoDate,
+
+        /**
+         * @var array
+         *
+         * @ORM\Column(type="json")
+         */
+        public readonly array $metadata,
+
+        /**
+         * @var string
+         *
+         * @ORM\Column(type="text")
+         */
+        public readonly string $discriminator,
+    ) {}
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php
index 8b2839636..700076506 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodLocationHistory.php
@@ -16,11 +16,11 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_person_accompanying_period_location_history")
  */
 class AccompanyingPeriodLocationHistory implements TrackCreationInterface
@@ -35,11 +35,13 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -57,14 +59,14 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
     /**
      * @ORM\Column(type="date_immutable")
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     public function getAddressLocation(): ?Address
     {
         return $this->addressLocation;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -84,7 +86,7 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
         return $this->personLocation;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -96,7 +98,7 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): AccompanyingPeriodLocationHistory
+    public function setEndDate(?\DateTimeImmutable $endDate): AccompanyingPeriodLocationHistory
     {
         $this->endDate = $endDate;
 
@@ -120,7 +122,7 @@ class AccompanyingPeriodLocationHistory implements TrackCreationInterface
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): AccompanyingPeriodLocationHistory
+    public function setStartDate(?\DateTimeImmutable $startDate): AccompanyingPeriodLocationHistory
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php
index f9baffa35..15b2f0d2e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php
@@ -17,11 +17,11 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_person_accompanying_period_step_history")
  */
 class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpdateInterface
@@ -33,11 +33,13 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -50,14 +52,14 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
     /**
      * @ORM\Column(type="date_immutable")
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\Column(type="text", nullable=false)
      */
     private string $step;
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -72,7 +74,7 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
         return $this->period;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -82,7 +84,7 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
         return $this->step;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): self
+    public function setEndDate(?\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -99,7 +101,7 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): self
+    public function setStartDate(?\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 5361012b3..8dfb9155a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -22,18 +22,18 @@ use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 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\Common\Collections\ReadableCollection;
 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_accompanying_period_work")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -45,7 +45,9 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 {
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class)
+     *
      * @Serializer\Groups({"read", "read:accompanyingPeriodWork:light"})
+     *
      * @Serializer\Context(normalizationContext={"groups": {"read"}}, groups={"read:accompanyingPeriodWork:light"})
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
@@ -57,56 +59,70 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      *     cascade={"remove", "persist"},
      *     orphanRemoval=true
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @ORM\OrderBy({"startDate": "DESC", "id": "DESC"})
      *
+     * @var Collection<AccompanyingPeriodWorkEvaluation>
+     *
      * @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
      */
     private Collection $accompanyingPeriodWorkEvaluations;
 
     /**
      * @ORM\Column(type="datetime_immutable")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      */
     private bool $createdAutomatically = false;
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      */
     private string $createdAutomaticallyReason = '';
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      */
     private ?User $createdBy = null;
 
     /**
      * @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", "docgen:read", "read:accompanyingPeriodWork:light"})
+     *
      * @Assert\GreaterThanOrEqual(propertyPath="startDate",
      *     message="accompanying_course_work.The endDate should be greater or equal than the start date"
      * )
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
+     * @var Collection<AccompanyingPeriodWorkGoal>
+     *
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriodWorkGoal::class,
      *     mappedBy="accompanyingPeriodWork",
      *     cascade={"persist"},
      *     orphanRemoval=true
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      */
@@ -114,6 +130,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      *
@@ -123,21 +140,29 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light", "read:evaluation:include-work"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Serializer\Groups({"read", "accompanying_period_work:edit", "docgen:read"})
      */
     private string $note = '';
 
     /**
+     * @var Collection<Person>
+     *
      * @ORM\ManyToMany(targetEntity=Person::class)
+     *
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_person")
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"accompanying_period_work:create"})
@@ -146,22 +171,25 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
+     *
      * @Serializer\Groups({"read", "accompanying_period_work:edit"})
      */
     private PrivateCommentEmbeddable $privateComment;
 
     /**
-     * @ORM\ManyToMany(targetEntity=User::class)
-     * @ORM\JoinTable(name="chill_person_accompanying_period_work_referrer")
-     * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
-     * @Serializer\Groups({"accompanying_period_work:edit"})
-     * @Serializer\Groups({"accompanying_period_work:create"})
+     * @var Collection<int, AccompanyingPeriodWorkReferrerHistory>
+     *
+     * @ORM\OneToMany(targetEntity=AccompanyingPeriodWorkReferrerHistory::class, cascade={"persist", "remove"}, mappedBy="accompanyingPeriodWork", orphanRemoval=true)
      */
-    private Collection $referrers;
+    private Collection $referrersHistory;
 
     /**
+     * @var Collection<Result>
+     *
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorks")
+     *
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_result")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      */
@@ -169,25 +197,32 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\ManyToOne(targetEntity=SocialAction::class)
+     *
      * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
      * @Serializer\Groups({"accompanying_period_work:create"})
+     *
      * @Serializer\Context(normalizationContext={"groups": {"read"}}, groups={"read:accompanyingPeriodWork:light"})
      */
     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", "read:accompanyingPeriodWork:light"})
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
+     * @var Collection<ThirdParty>
+     *
      * @ORM\ManyToMany(targetEntity=ThirdParty::class)
+     *
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_third_party")
      *
      * In schema : intervenants
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      */
@@ -195,13 +230,16 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\Column(type="datetime_immutable")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?User $updatedBy = null;
@@ -214,7 +252,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         $this->thirdParties = new ArrayCollection();
         $this->persons = new ArrayCollection();
         $this->accompanyingPeriodWorkEvaluations = new ArrayCollection();
-        $this->referrers = new ArrayCollection();
+        $this->referrersHistory = new ArrayCollection();
     }
 
     public function addAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self
@@ -248,8 +286,9 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     public function addReferrer(User $referrer): self
     {
-        if (!$this->referrers->contains($referrer)) {
-            $this->referrers[] = $referrer;
+        if (!$this->getReferrers()->contains($referrer)) {
+            $this->referrersHistory[] =
+                new AccompanyingPeriodWorkReferrerHistory($this, $referrer, new \DateTimeImmutable('today'));
         }
 
         return $this;
@@ -278,12 +317,15 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->accompanyingPeriod;
     }
 
+    /**
+     * @return Collection<AccompanyingPeriodWorkEvaluation>
+     */
     public function getAccompanyingPeriodWorkEvaluations(): Collection
     {
         return $this->accompanyingPeriodWorkEvaluations;
     }
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -303,7 +345,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->createdBy;
     }
 
-    public function getEndDate(): ?DateTimeInterface
+    public function getEndDate(): ?\DateTimeInterface
     {
         return $this->endDate;
     }
@@ -342,15 +384,26 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     }
 
     /**
-     * @return Collection|User[]
+     * @return ReadableCollection<int, User>
+     *
+     * @Serializer\Groups({"read", "docgen:read", "read:accompanyingPeriodWork:light"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"accompanying_period_work:create"})
      */
-    public function getReferrers(): Collection
+    public function getReferrers(): ReadableCollection
     {
-        return $this->referrers;
+        return $this->referrersHistory
+            ->filter(fn (AccompanyingPeriodWorkReferrerHistory $h) => null === $h->getEndDate())
+            ->map(fn (AccompanyingPeriodWorkReferrerHistory $h) => $h->getUser());
+    }
+
+    public function getReferrersHistory(): Collection
+    {
+        return $this->referrersHistory;
     }
 
     /**
-     * @return Collection|Result[]
+     * @return Collection<int, Result>
      */
     public function getResults(): Collection
     {
@@ -367,7 +420,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return new ArrayCollection([$this->getSocialAction()->getIssue()]);
     }
 
-    public function getStartDate(): ?DateTimeInterface
+    public function getStartDate(): ?\DateTimeInterface
     {
         return $this->startDate;
     }
@@ -385,7 +438,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->getThirdParties();
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -425,7 +478,16 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     public function removeReferrer(User $referrer): self
     {
-        $this->referrers->removeElement($referrer);
+        foreach ($this->referrersHistory as $history) {
+            if ($history->isOpen() && $referrer === $history->getUser()) {
+                $history->setEndDate(new \DateTimeImmutable('today'));
+
+                if ($history->isDateRangeEmpty()) {
+                    $history->removeAccompanyingPeriodWork();
+                    $this->referrersHistory->removeElement($history);
+                }
+            }
+        }
 
         return $this;
     }
@@ -461,7 +523,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
             $this->accompanyingPeriod instanceof AccompanyingPeriod
             && $accompanyingPeriod !== $this->accompanyingPeriod
         ) {
-            throw new LogicException('A work cannot change accompanyingPeriod');
+            throw new \LogicException('A work cannot change accompanyingPeriod');
         }
 
         $this->accompanyingPeriod = $accompanyingPeriod;
@@ -469,7 +531,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -497,7 +559,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
-    public function setEndDate(?DateTimeInterface $endDate = null): self
+    public function setEndDate(\DateTimeInterface $endDate = null): self
     {
         $this->endDate = $endDate;
 
@@ -532,14 +594,14 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
-    public function setStartDate(DateTimeInterface $startDate): self
+    public function setStartDate(\DateTimeInterface $startDate): self
     {
         $this->startDate = $startDate;
 
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): TrackUpdateInterface
+    public function setUpdatedAt(\DateTimeInterface $datetime): TrackUpdateInterface
     {
         $this->updatedAt = $datetime;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 8780f7d17..7f2fc981c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -16,18 +16,16 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 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,
  * })
@@ -39,13 +37,16 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     targetEntity=AccompanyingPeriodWork::class,
      *     inversedBy="accompanyingPeriodWorkEvaluations"
      * )
+     *
      * @Serializer\Groups({"read:evaluation:include-work"})
+     *
      * @Serializer\Context(normalizationContext={"groups": {"read:accompanyingPeriodWork:light"}}, groups={"read:evaluation:include-work"})
      */
     private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
@@ -54,14 +55,16 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
-    private ?DateTimeImmutable $createdAt = null;
+    private ?\DateTimeImmutable $createdAt = null;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=User::class
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?User $createdBy = null;
@@ -77,23 +80,29 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      *     cascade={"remove", "persist"},
      *     orphanRemoval=true
      * )
+     *
      * @ORM\OrderBy({"createdAt": "DESC", "id": "DESC"})
+     *
      * @Serializer\Groups({"read"})
+     *
+     * @var Collection<AccompanyingPeriodWorkEvaluationDocument>
      */
     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;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=Evaluation::class
      * )
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
@@ -101,8 +110,11 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
@@ -117,51 +129,55 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
-     *
-     * @var mixed
      */
     private $key;
 
     /**
      * @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 $maxDate = null;
+    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;
+    private ?\DateTimeImmutable $startDate = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    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;
+    private ?\DateInterval $warningInterval = null;
 
     /**
      * @ORM\Column(type="integer", nullable=true)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
@@ -193,7 +209,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this->comment;
     }
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -204,14 +220,14 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     }
 
     /**
-     * @return Collection
+     * @return Collection<AccompanyingPeriodWorkEvaluationDocument>
      */
     public function getDocuments()
     {
         return $this->documents;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -228,25 +244,23 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
 
     /**
      * Arbitrary data, used for client.
-     *
-     * @return mixed
      */
     public function getKey()
     {
         return $this->key;
     }
 
-    public function getMaxDate(): ?DateTimeImmutable
+    public function getMaxDate(): ?\DateTimeImmutable
     {
         return $this->maxDate;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -259,7 +273,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     /**
      * @Serializer\Groups({"docgen:read"})
      */
-    public function getWarningDate(): ?DateTimeImmutable
+    public function getWarningDate(): ?\DateTimeImmutable
     {
         if (null === $this->getEndDate() || null === $this->getWarningInterval()) {
             return null;
@@ -268,7 +282,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this->getEndDate()->sub($this->getWarningInterval());
     }
 
-    public function getWarningInterval(): ?DateInterval
+    public function getWarningInterval(): ?\DateInterval
     {
         return $this->warningInterval;
     }
@@ -293,8 +307,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
             && $this->accompanyingPeriodWork instanceof AccompanyingPeriodWork
             && $this->accompanyingPeriodWork->getId() !== $accompanyingPeriodWork->getId()
         ) {
-            throw new RuntimeException('Changing the ' .
-            'accompanyingPeriodWork is not allowed');
+            throw new \RuntimeException('Changing the accompanyingPeriodWork is not allowed');
         }
 
         $this->accompanyingPeriodWork = $accompanyingPeriodWork;
@@ -310,11 +323,9 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     }
 
     /**
-     * @param DateTimeImmutable|null $createdAt
-     *
-     * @return AccompanyingPeriodWorkEvaluation
+     * @param \DateTimeImmutable|null $createdAt
      */
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -328,7 +339,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): AccompanyingPeriodWorkEvaluation
+    public function setEndDate(?\DateTimeImmutable $endDate): AccompanyingPeriodWorkEvaluation
     {
         $this->endDate = $endDate;
 
@@ -353,7 +364,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         ) {
             $cl = AccompanyingPeriodWorkEvaluation::class;
 
-            throw new LogicException("once set, an {$cl}  cannot
+            throw new \LogicException("once set, an {$cl}  cannot
                 change or remove the linked Evaluation::class");
         }
 
@@ -364,26 +375,22 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
 
     /**
      * Arbitrary data, used for client.
-     *
-     * @param mixed $key
-     *
-     * @return AccompanyingPeriodWorkEvaluation
      */
-    public function setKey($key): self
+    public function setKey(mixed $key): self
     {
         $this->key = $key;
 
         return $this;
     }
 
-    public function setMaxDate(?DateTimeImmutable $maxDate): AccompanyingPeriodWorkEvaluation
+    public function setMaxDate(?\DateTimeImmutable $maxDate): AccompanyingPeriodWorkEvaluation
     {
         $this->maxDate = $maxDate;
 
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): AccompanyingPeriodWorkEvaluation
+    public function setStartDate(?\DateTimeImmutable $startDate): AccompanyingPeriodWorkEvaluation
     {
         $this->startDate = $startDate;
 
@@ -391,11 +398,9 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
     }
 
     /**
-     * @param DateTimeImmutable|null $updatedAt
-     *
-     * @return AccompanyingPeriodWorkEvaluation
+     * @param \DateTimeImmutable|null $updatedAt
      */
-    public function setUpdatedAt(DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
@@ -409,7 +414,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU
         return $this;
     }
 
-    public function setWarningInterval(?DateInterval $warningInterval): AccompanyingPeriodWorkEvaluation
+    public function setWarningInterval(?\DateInterval $warningInterval): AccompanyingPeriodWorkEvaluation
     {
         $this->warningInterval = $warningInterval;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
index 1b2bbea44..e5ddc059a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
@@ -16,13 +16,14 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Doctrine\ORM\Mapping as ORM;
-use RuntimeException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_person_accompanying_period_work_evaluation_document")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "accompanying_period_work_evaluation_document": AccompanyingPeriodWorkEvaluationDocument::class
  * })
@@ -43,11 +44,15 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
 
     /**
      * @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"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
@@ -63,8 +68,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
-     *
-     * @var mixed
      */
     private $key;
 
@@ -72,9 +75,11 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * @ORM\ManyToOne(
      *     targetEntity=StoredObject::class,
      * )
+     *
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     *
      * @Assert\Valid
      */
     private ?StoredObject $storedObject = null;
@@ -83,6 +88,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * @ORM\ManyToOne(
      *     targetEntity=DocGeneratorTemplate::class
      * )
+     *
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
@@ -90,6 +96,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
 
     /**
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     *
      * @Serializer\Groups({"read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
@@ -106,9 +113,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         return $this->id;
     }
 
-    /**
-     * @return mixed
-     */
     public function getKey()
     {
         return $this->key;
@@ -138,7 +142,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
             && $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;
@@ -147,11 +151,9 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
     }
 
     /**
-     * @param mixed $key
-     *
      * @return AccompanyingPeriodWorkEvaluationDocument
      */
-    public function setKey($key)
+    public function setKey(mixed $key)
     {
         $this->key = $key;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
index 9222a66b8..a569f3a9d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
@@ -16,12 +16,13 @@ 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={
@@ -34,10 +35,11 @@ class AccompanyingPeriodWorkGoal
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriodWork::class, inversedBy="goals")
      */
-    private $accompanyingPeriodWork;
+    private ?\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork $accompanyingPeriodWork = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Goal::class)
+     *
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read", "docgen:read"})
      */
@@ -45,22 +47,30 @@ class AccompanyingPeriodWorkGoal
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read"})
      */
-    private ?string $note = null;
+    private string $note = '';
 
     /**
+     * @var Collection<Result>
+     *
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorkGoals")
+     *
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_goal_result")
+     *
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read", "docgen:read"})
      */
@@ -122,7 +132,7 @@ class AccompanyingPeriodWorkGoal
             && $accompanyingPeriodWork !== $this->accompanyingPeriodWork
             && 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;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php
new file mode 100644
index 000000000..0086faab2
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkReferrerHistory.php
@@ -0,0 +1,123 @@
+<?php
+
+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 Chill\PersonBundle\Entity\AccompanyingPeriod;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ *
+ * @ORM\Table(name="chill_person_accompanying_period_work_referrer")
+ */
+class AccompanyingPeriodWorkReferrerHistory implements TrackCreationInterface, TrackUpdateInterface
+{
+    use TrackCreationTrait;
+    use TrackUpdateTrait;
+
+    /**
+     * @ORM\Id
+     *
+     * @ORM\GeneratedValue
+     *
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     */
+    private ?\DateTimeImmutable $endDate = null;
+
+    public function __construct(
+        /**
+         * @ORM\ManyToOne(targetEntity=AccompanyingPeriodWork::class, inversedBy="referrersHistory")
+         */
+        private ?AccompanyingPeriodWork $accompanyingPeriodWork,
+        /**
+         * @var User
+         *
+         * @ORM\ManyToOne(targetEntity=User::class)
+         */
+        private User $user,
+        /**
+         * @var \DateTimeImmutable
+         *
+         * @ORM\Column(type="date_immutable", nullable=false)
+         */
+        private \DateTimeImmutable $startDate
+    ) {}
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function setEndDate(?\DateTimeImmutable $endDate): AccompanyingPeriodWorkReferrerHistory
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function getAccompanyingPeriodWork(): AccompanyingPeriodWork
+    {
+        return $this->accompanyingPeriodWork;
+    }
+
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    public function getStartDate(): \DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    /**
+     * to be used when the history is removed (when startDate = endDate).
+     */
+    public function removeAccompanyingPeriodWork(): self
+    {
+        $this->accompanyingPeriodWork = null;
+
+        return $this;
+    }
+
+    /**
+     * @return bool true if the endDate is null
+     */
+    public function isOpen(): bool
+    {
+        return null === $this->getEndDate();
+    }
+
+    /**
+     * return true if the date range is empty (start date and end date are equal).
+     *
+     * @return bool true if the start date and end date are equal
+     */
+    public function isDateRangeEmpty(): bool
+    {
+        return $this->getStartDate()->format('Y-m-d') === $this->getEndDate()?->format('Y-m-d');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
index 08dca4537..97938dafc 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
@@ -20,6 +20,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * ClosingMotive give an explanation why we closed the Accompanying period.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_closingmotive")
  */
 class ClosingMotive
@@ -32,6 +33,8 @@ class ClosingMotive
     /**
      * Child Accompanying periods.
      *
+     * @var Collection<ClosingMotive>
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive",
      * mappedBy="parent")
@@ -39,18 +42,21 @@ class ClosingMotive
     private Collection $children;
 
     /**
-     * @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="json")
+     *
      * @Serializer\Groups({"docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
@@ -61,14 +67,17 @@ class ClosingMotive
     private float $ordering = 0.0;
 
     /**
-     * @var self
-     *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive",
      * inversedBy="children")
      */
     private ?ClosingMotive $parent = null;
 
+    /**
+     * @ORM\Column(type="boolean", nullable=false, options={"default": false})
+     */
+    private bool $isCanceledAccompanyingPeriod = false;
+
     /**
      * ClosingMotive constructor.
      */
@@ -84,7 +93,7 @@ class ClosingMotive
         }
 
         $this->children->add($child);
-        $child->setParent($this);
+        $child->setParent($this)->setIsCanceledAccompanyingPeriod($this->getIsCanceledAccompanyingPeriod());
 
         return $this;
     }
@@ -127,6 +136,11 @@ class ClosingMotive
         return $this->parent;
     }
 
+    public function getIsCanceledAccompanyingPeriod(): bool
+    {
+        return $this->isCanceledAccompanyingPeriod;
+    }
+
     public function hasParent(): bool
     {
         return null !== $this->parent;
@@ -144,7 +158,7 @@ class ClosingMotive
 
     public function isLeaf(): bool
     {
-        return $this->children->count() === 0;
+        return 0 === $this->children->count();
     }
 
     public function isParent(): bool
@@ -152,6 +166,11 @@ class ClosingMotive
         return $this->children->count() > 0;
     }
 
+    public function isCanceledAccompanyingPeriod(): bool
+    {
+        return $this->isCanceledAccompanyingPeriod;
+    }
+
     public function removeChildren(ClosingMotive $child): ClosingMotive
     {
         if ($this->children->removeElement($child)) {
@@ -213,7 +232,18 @@ class ClosingMotive
         $this->parent = $parent;
 
         if (null !== $parent) {
-            //$parent->addChildren($this);
+            // $parent->addChildren($this);
+        }
+
+        return $this;
+    }
+
+    public function setIsCanceledAccompanyingPeriod(bool $isCanceledAP): ClosingMotive
+    {
+        $this->isCanceledAccompanyingPeriod = $isCanceledAP;
+
+        foreach ($this->getChildren() as $child) {
+            $child->setIsCanceledAccompanyingPeriod($isCanceledAP);
         }
 
         return $this;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
index 592c833d3..81a84c64a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
@@ -15,7 +15,6 @@ 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;
@@ -23,7 +22,9 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_comment")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "accompanying_period_comment": Comment::class
  * })
@@ -34,63 +35,76 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod",
      * inversedBy="comments")
+     *
      * @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\Column(type="text")
+     *
      * @Groups({"read", "write", "docgen:read"})
+     *
      * @Assert\NotBlank
+     *
      * @Assert\NotNull
      */
-    private ?string $content;
+    private string $content = '';
 
     /**
      * @ORM\Column(type="datetime")
+     *
      * @Groups({"read", "docgen:read"})
      */
-    private ?DateTimeInterface $createdAt;
+    private ?\DateTimeInterface $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"read", "docgen:read"})
      */
-    private ?User $creator;
+    private ?User $creator = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Groups({"read", "docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="datetime")
+     *
      * @Groups({"read"})
      */
-    private ?DateTimeInterface $updatedAt;
+    private ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"read"})
      */
-    private ?User $updatedBy;
+    private ?User $updatedBy = null;
 
     public function getAccompanyingPeriod(): ?AccompanyingPeriod
     {
         return $this->accompanyingPeriod;
     }
 
-    public function getContent(): ?string
+    public function getContent(): string
     {
         return $this->content;
     }
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -105,7 +119,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this->id;
     }
 
-    public function getUpdatedAt(): ?DateTimeInterface
+    public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
@@ -134,7 +148,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -153,7 +167,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
index b7cfd0e0c..979fd4581 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
@@ -11,13 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_origin")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -28,24 +29,30 @@ class Origin
 {
     /**
      * @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="date_immutable", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateTimeImmutable $noActiveAfter = null;
+    private ?\DateTimeImmutable $noActiveAfter = null;
 
     public function getId(): ?int
     {
@@ -57,7 +64,7 @@ class Origin
         return $this->label;
     }
 
-    public function getNoActiveAfter(): ?DateTimeImmutable
+    public function getNoActiveAfter(): ?\DateTimeImmutable
     {
         return $this->noActiveAfter;
     }
@@ -69,7 +76,7 @@ class Origin
         return $this;
     }
 
-    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 aa8a16229..515816637 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
@@ -17,19 +17,21 @@ 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;
 
 /**
  * **About denormalization**: this operation is operated by @see{AccompanyingPeriodResourdeNormalizer}.
  *
  * @ORM\Entity
+ *
  * @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
  * })
@@ -41,34 +43,43 @@ class Resource
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod",
      *     inversedBy="resources"
      * )
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?string $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 $person = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"docgen:read"})
      */
     private ?ThirdParty $thirdParty = null;
@@ -94,10 +105,9 @@ class Resource
     }
 
     /**
-     * @return Person|ThirdParty
      * @Groups({"read"})
      */
-    public function getResource()
+    public function getResource(): null|\Chill\PersonBundle\Entity\Person|\Chill\ThirdPartyBundle\Entity\ThirdParty
     {
         return $this->person ?? $this->thirdParty;
     }
@@ -114,7 +124,7 @@ class Resource
         return $this;
     }
 
-    public function setComment(?string $comment = null): self
+    public function setComment(string $comment = null): self
     {
         $this->comment = (string) $comment;
 
@@ -136,12 +146,7 @@ class 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;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
index 2e073e50e..ab9ca7c7d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
@@ -15,59 +15,57 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table("chill_person_accompanying_period_user_history")
  */
 class UserHistory implements TrackCreationInterface
 {
     use TrackCreationTrait;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="userHistories")
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private ?AccompanyingPeriod $accompanyingPeriod;
-
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
 
-    /**
-     * @ORM\Column(type="datetime_immutable", nullable=false)
-     */
-    private DateTimeImmutable $startDate;
+    public function __construct(
+        /**
+         * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="userHistories")
+         *
+         * @ORM\JoinColumn(nullable=false)
+         */
+        private ?AccompanyingPeriod $accompanyingPeriod,
+        /**
+         * @ORM\ManyToOne(targetEntity=User::class)
+         *
+         * @ORM\JoinColumn(nullable=false)
+         */
+        private User $user,
 
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private User $user;
-
-    public function __construct(AccompanyingPeriod $accompanyingPeriod, User $user, ?DateTimeImmutable $startDate = null)
-    {
-        $this->startDate = $startDate ?? new DateTimeImmutable('now');
-        $this->accompanyingPeriod = $accompanyingPeriod;
-        $this->user = $user;
-    }
+        /**
+         * @ORM\Column(type="datetime_immutable", nullable=false, options={"default": "now()"})
+         */
+        private \DateTimeImmutable $startDate = new \DateTimeImmutable('now')
+    ) {}
 
     public function getAccompanyingPeriod(): AccompanyingPeriod
     {
         return $this->accompanyingPeriod;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -77,7 +75,7 @@ class UserHistory implements TrackCreationInterface
         return $this->id;
     }
 
-    public function getStartDate(): DateTimeImmutable
+    public function getStartDate(): \DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -87,7 +85,7 @@ class UserHistory implements TrackCreationInterface
         return $this->user;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): UserHistory
+    public function setEndDate(?\DateTimeImmutable $endDate): UserHistory
     {
         $this->endDate = $endDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
index 9e5174217..964f66f1a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity;
 
-use DateTime;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
@@ -21,51 +19,55 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * AccompanyingPeriodParticipation Class.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_accompanying_period_participation")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "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;
+    private ?\DateTime $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodParticipations")
-     * @ORM\JoinColumn(name="person_id", referencedColumnName="id", nullable=false)
-     * @Groups({"read", "docgen:read"})
-     */
-    private ?Person $person = null;
-
     /**
      * @ORM\Column(type="date", nullable=false)
+     *
      * @Groups({"read", "docgen:read"})
      */
-    private ?DateTime $startDate = null;
+    private ?\DateTime $startDate = null;
 
-    public function __construct(AccompanyingPeriod $accompanyingPeriod, Person $person)
-    {
-        $this->startDate = new DateTime('now');
-        $this->accompanyingPeriod = $accompanyingPeriod;
-        $this->person = $person;
+    public function __construct(/**
+     * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="participations", cascade={"persist"})
+     *
+     * @ORM\JoinColumn(name="accompanyingperiod_id", referencedColumnName="id", nullable=false)
+     */
+        private ?AccompanyingPeriod $accompanyingPeriod, /**
+     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodParticipations")
+     *
+     * @ORM\JoinColumn(name="person_id", referencedColumnName="id", nullable=false)
+     *
+     * @Groups({"read", "docgen:read"})
+     */
+        private ?Person $person
+    ) {
+        $this->startDate = new \DateTime('now');
         $person->getAccompanyingPeriodParticipations()->add($this);
     }
 
@@ -74,7 +76,7 @@ class AccompanyingPeriodParticipation
         return $this->accompanyingPeriod;
     }
 
-    public function getEndDate(): ?DateTimeInterface
+    public function getEndDate(): ?\DateTimeInterface
     {
         return $this->endDate;
     }
@@ -89,7 +91,7 @@ class AccompanyingPeriodParticipation
         return $this->person;
     }
 
-    public function getStartDate(): ?DateTimeInterface
+    public function getStartDate(): ?\DateTimeInterface
     {
         return $this->startDate;
     }
@@ -106,7 +108,7 @@ class AccompanyingPeriodParticipation
         return $this;
     }
 
-    public function setEndDate(?DateTime $endDate): self
+    public function setEndDate(?\DateTime $endDate): self
     {
         $this->endDate = $endDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/HasPerson.php b/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
index ab0854a57..ba4f3699d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
+++ b/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
@@ -18,5 +18,5 @@ interface HasPerson
 {
     public function getPerson(): ?Person;
 
-    public function setPerson(?Person $person = null): HasPerson;
+    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 b463312c8..6d5bdf674 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -11,33 +11,31 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity\Household;
 
-use ArrayIterator;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder;
-use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\ReadableCollection;
+use Doctrine\Common\Collections\Selectable;
 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 function count;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_person_household"
  * )
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "household": Household::class
  * })
+ *
  * @MaxHolder(groups={"household_memberships"})
  */
 class Household
@@ -45,11 +43,16 @@ class Household
     /**
      * Addresses.
      *
+     * @var Collection<Address>
+     *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\Address",
      * cascade={"persist", "remove", "merge", "detach"})
+     *
      * @ORM\JoinTable(name="chill_person_household_to_addresses")
+     *
      * @ORM\OrderBy({"validFrom": "DESC", "id": "DESC"})
+     *
      * @Serializer\Groups({"write"})
      */
     private Collection $addresses;
@@ -60,45 +63,57 @@ class Household
     private CommentEmbeddable $commentMembers;
 
     /**
+     * @var Collection&Selectable<int, HouseholdComposition>
+     *
      * @ORM\OneToMany(
      *     targetEntity=HouseholdComposition::class,
      *     mappedBy="household",
      *     orphanRemoval=true,
      *     cascade={"persist"}
      * )
+     *
      * @ORM\OrderBy({"startDate": "DESC"})
+     *
      * @Assert\Valid(traverse=true, groups={"household_composition"})
      */
-    private Collection $compositions;
+    private Collection&Selectable $compositions;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
+     * @var Collection<HouseholdMember>
+     *
      * @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()
     {
@@ -146,9 +161,9 @@ class Household
      *
      * @Assert\Callback(methods={"validate"})
      *
-     * @return \Chill\MainBundle\Entity\Address[]
+     * @return Collection<Address>
      */
-    public function getAddresses()
+    public function getAddresses(): Collection
     {
         return $this->addresses;
     }
@@ -196,17 +211,16 @@ class Household
 
     /**
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\SerializedName("current_address")
      */
-    public function getCurrentAddress(?DateTime $at = null): ?Address
+    public function getCurrentAddress(\DateTime $at = null): ?Address
     {
-        $at = null === $at ? new DateTime('today') : $at;
+        $at ??= new \DateTime('today');
 
-        $addrs = $this->getAddresses()->filter(static function (Address $a) use ($at) {
-            return $a->getValidFrom() <= $at && (
-                null === $a->getValidTo() || $a->getValidTo() > $at
-            );
-        });
+        $addrs = $this->getAddresses()->filter(static fn (Address $a) => $a->getValidFrom() <= $at && (
+            null === $a->getValidTo() || $a->getValidTo() > $at
+        ));
 
         if ($addrs->count() > 0) {
             return $addrs->first();
@@ -215,9 +229,14 @@ class Household
         return null;
     }
 
-    public function getCurrentComposition(?DateTimeImmutable $at = null): ?HouseholdComposition
+    /**
+     * @Serializer\Groups({"docgen:read"})
+     *
+     * @Serializer\SerializedName("current_composition")
+     */
+    public function getCurrentComposition(\DateTimeImmutable $at = null): ?HouseholdComposition
     {
-        $at ??= new DateTimeImmutable('today');
+        $at ??= new \DateTimeImmutable('today');
         $criteria = new Criteria();
         $expr = Criteria::expr();
 
@@ -243,12 +262,12 @@ class Household
     /**
      * @Serializer\Groups({"docgen:read"})
      */
-    public function getCurrentMembers(?DateTimeImmutable $now = null): Collection
+    public function getCurrentMembers(\DateTimeImmutable $now = null): Collection
     {
         return $this->getMembers()->matching($this->buildCriteriaCurrentMembers($now));
     }
 
-    public function getCurrentMembersByPosition(Position $position, ?DateTimeInterface $now = null)
+    public function getCurrentMembersByPosition(Position $position, \DateTimeInterface $now = null)
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -264,9 +283,10 @@ class Household
      * Used in serialization
      *
      * @Serializer\Groups({"read"})
+     *
      * @Serializer\SerializedName("current_members_id")
      */
-    public function getCurrentMembersIds(?DateTimeImmutable $now = null): ReadableCollection
+    public function getCurrentMembersIds(\DateTimeImmutable $now = null): ReadableCollection
     {
         return $this->getCurrentMembers($now)->map(
             static fn (HouseholdMember $m) => $m->getId()
@@ -276,22 +296,22 @@ class Household
     /**
      * @return HouseholdMember[]
      */
-    public function getCurrentMembersOrdered(?DateTimeImmutable $now = null): Collection
+    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) {
+                    if (null === $a->getPosition()) {
+                        if (null === $b->getPosition()) {
                             return 0;
                         }
 
                         return -1;
                     }
 
-                    if ($b->getPosition() === null) {
+                    if (null === $b->getPosition()) {
                         return 1;
                     }
 
@@ -318,7 +338,7 @@ class Household
         return $members;
     }
 
-    public function getCurrentMembersWithoutPosition(?DateTimeInterface $now = null)
+    public function getCurrentMembersWithoutPosition(\DateTimeInterface $now = null)
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -335,12 +355,10 @@ class Household
      *
      * @return ReadableCollection<(int|string), Person>
      */
-    public function getCurrentPersons(?DateTimeImmutable $now = null): ReadableCollection
+    public function getCurrentPersons(\DateTimeImmutable $now = null): ReadableCollection
     {
         return $this->getCurrentMembers($now)
-            ->map(static function (HouseholdMember $m) {
-                return $m->getPerson();
-            });
+            ->map(static fn (HouseholdMember $m) => $m->getPerson());
     }
 
     public function getId(): ?int
@@ -367,9 +385,7 @@ class Household
             $membership->getStartDate(),
             $membership->getEndDate()
         )->filter(
-            static function (HouseholdMember $m) use ($membership) {
-                return $m->getPerson() !== $membership->getPerson();
-            }
+            static fn (HouseholdMember $m) => $m->getPerson() !== $membership->getPerson()
         );
     }
 
@@ -385,7 +401,7 @@ class Household
         return $this->getMembers()->matching($criteria);
     }
 
-    public function getMembersOnRange(DateTimeImmutable $from, ?DateTimeImmutable $to): ReadableCollection
+    public function getMembersOnRange(\DateTimeImmutable $from, ?\DateTimeImmutable $to): ReadableCollection
     {
         return $this->getMembers()->filter(static function (HouseholdMember $m) use ($from, $to) {
             if (null === $m->getEndDate() && null !== $to) {
@@ -408,11 +424,11 @@ class Household
         });
     }
 
-    public function getNonCurrentMembers(?DateTimeImmutable $now = null): Collection
+    public function getNonCurrentMembers(\DateTimeImmutable $now = null): Collection
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
-        $date = null === $now ? (new DateTimeImmutable('today')) : $now;
+        $date = $now ?? new \DateTimeImmutable('today');
 
         $criteria
             ->where(
@@ -428,7 +444,7 @@ class Household
         return $this->getMembers()->matching($criteria);
     }
 
-    public function getNonCurrentMembersByPosition(Position $position, ?DateTimeInterface $now = null)
+    public function getNonCurrentMembersByPosition(Position $position, \DateTimeInterface $now = null)
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -438,7 +454,7 @@ class Household
         return $this->getNonCurrentMembers($now)->matching($criteria);
     }
 
-    public function getNonCurrentMembersWithoutPosition(?DateTimeInterface $now = null)
+    public function getNonCurrentMembersWithoutPosition(\DateTimeInterface $now = null)
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -472,7 +488,7 @@ class Household
 
     public function getPreviousAddressOf(Address $address): ?Address
     {
-        $iterator = new ArrayIterator($this->getAddressesOrdered());
+        $iterator = new \ArrayIterator($this->getAddressesOrdered());
         $iterator->rewind();
 
         while ($iterator->valid()) {
@@ -494,7 +510,7 @@ class Household
         return $this->waitingForBirth;
     }
 
-    public function getWaitingForBirthDate(): ?DateTimeImmutable
+    public function getWaitingForBirthDate(): ?\DateTimeImmutable
     {
         return $this->waitingForBirthDate;
     }
@@ -508,12 +524,10 @@ class Household
 
         usort(
             $compositionOrdered,
-            static function (HouseholdComposition $a, HouseholdComposition $b) {
-                return $a->getStartDate() <=> $b->getStartDate();
-            }
+            static fn (HouseholdComposition $a, HouseholdComposition $b) => $a->getStartDate() <=> $b->getStartDate()
         );
 
-        $iterator = new ArrayIterator($compositionOrdered);
+        $iterator = new \ArrayIterator($compositionOrdered);
         $iterator->rewind();
 
         /** @var ?HouseholdComposition $previous */
@@ -535,7 +549,7 @@ class Household
 
     public function makeAddressConsistent(): void
     {
-        $iterator = new ArrayIterator($this->getAddressesOrdered());
+        $iterator = new \ArrayIterator($this->getAddressesOrdered());
 
         $iterator->rewind();
 
@@ -597,7 +611,7 @@ class Household
      */
     public function setForceAddress(Address $address)
     {
-        $address->setValidFrom(new DateTime('today'));
+        $address->setValidFrom(new \DateTime('today'));
         $this->addAddress($address);
     }
 
@@ -608,7 +622,7 @@ class Household
         return $this;
     }
 
-    public function setWaitingForBirthDate(?DateTimeImmutable $waitingForBirthDate): self
+    public function setWaitingForBirthDate(?\DateTimeImmutable $waitingForBirthDate): self
     {
         $this->waitingForBirthDate = $waitingForBirthDate;
 
@@ -620,7 +634,7 @@ class Household
         $addresses = $this->getAddresses();
         $cond = true;
 
-        for ($i = 0; count($addresses) - 1 > $i; ++$i) {
+        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.')
@@ -630,11 +644,11 @@ class Household
         }
     }
 
-    private function buildCriteriaCurrentMembers(?DateTimeImmutable $now = null): Criteria
+    private function buildCriteriaCurrentMembers(\DateTimeImmutable $now = null): Criteria
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
-        $date = null === $now ? (new DateTimeImmutable('today')) : $now;
+        $date = $now ?? new \DateTimeImmutable('today');
 
         $criteria
             ->where($expr->orX(
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
index f11d1402b..d8eab9bef 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
@@ -16,16 +16,17 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_person_household_composition"
  * )
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "household_composition_type": HouseholdCompositionType::class
  * })
@@ -43,42 +44,59 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Assert\GreaterThanOrEqual(propertyPath="startDate", groups={"Default", "household_composition"})
+     *
+     * @Serializer\Groups({"docgen:read"})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Household::class, inversedBy="compositions")
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private ?Household $household = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=HouseholdCompositionType::class)
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
+     * @Serializer\Groups({"docgen:read"})
      */
-    private ?HouseholdCompositionType  $householdCompositionType = null;
+    private ?HouseholdCompositionType $householdCompositionType = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="integer", nullable=true, options={"default": null})
+     *
      * @Assert\NotNull
+     *
      * @Assert\GreaterThanOrEqual(0, groups={"Default", "household_composition"})
+     *
+     * @Serializer\Groups({"docgen:read"})
      */
     private ?int $numberOfChildren = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=false)
+     *
      * @Assert\NotNull(groups={"Default", "household_composition"})
+     *
+     * @Serializer\Groups({"docgen:read"})
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     public function __construct()
     {
@@ -90,7 +108,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this->comment;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -115,7 +133,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this->numberOfChildren;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -127,7 +145,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): HouseholdComposition
+    public function setEndDate(?\DateTimeImmutable $endDate): HouseholdComposition
     {
         $this->endDate = $endDate;
 
@@ -159,7 +177,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): HouseholdComposition
+    public function setStartDate(?\DateTimeImmutable $startDate): HouseholdComposition
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php
index 5fca56c3c..cb1fe2703 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php
@@ -16,9 +16,11 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(
  *     name="chill_person_household_composition_type"
  * )
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "household_composition_type": HouseholdCompositionType::class
  * })
@@ -32,15 +34,20 @@ class HouseholdCompositionType
 
     /**
      * @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 = [];
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index e5e5e4626..ccce246c8 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -12,14 +12,13 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Entity\Household;
 
 use Chill\PersonBundle\Entity\Person;
-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"
  * )
@@ -28,59 +27,71 @@ class HouseholdMember
 {
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?string $comment = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Assert\GreaterThanOrEqual(
      *     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="boolean", options={"default": false})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     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"})
      */
     private ?Position $position = null;
@@ -92,17 +103,19 @@ class HouseholdMember
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Assert\NotNull(groups={"household_memberships"})
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     public function getComment(): ?string
     {
         return $this->comment;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -135,14 +148,14 @@ class HouseholdMember
         return $this->shareHousehold;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
 
-    public function isCurrent(?DateTimeImmutable $at = null): bool
+    public function isCurrent(\DateTimeImmutable $at = null): bool
     {
-        $at = null === $at ? new DateTimeImmutable('now') : $at;
+        $at ??= new \DateTimeImmutable('now');
 
         return $this->getStartDate() < $at && (
             null === $this->getEndDate() || $this->getEndDate() > $at
@@ -161,7 +174,7 @@ class HouseholdMember
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate = null): self
+    public function setEndDate(\DateTimeImmutable $endDate = null): self
     {
         $this->endDate = $endDate;
 
@@ -178,8 +191,7 @@ class HouseholdMember
     public function setHousehold(?Household $household): self
     {
         if ($this->household instanceof Household) {
-            throw new LogicException('You cannot change household ' .
-                'on a membership');
+            throw new \LogicException('You cannot change household on a membership');
         }
 
         $this->household = $household;
@@ -190,8 +202,7 @@ class HouseholdMember
     public function setPerson(?Person $person): self
     {
         if ($this->person instanceof Person) {
-            throw new LogicException('You cannot change person ' .
-                'on a membership');
+            throw new \LogicException('You cannot change person on a membership');
         }
 
         $this->person = $person;
@@ -203,8 +214,7 @@ class HouseholdMember
     public function setPosition(?Position $position): self
     {
         if ($this->position instanceof Position && $this->position !== $position) {
-            throw new LogicException('The position is already set. You cannot change ' .
-                'a position of a membership');
+            throw new \LogicException('The position is already set. You cannot change a position of a membership');
         }
 
         $this->position = $position;
@@ -223,7 +233,7 @@ class HouseholdMember
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
index 5fecc04b6..453176334 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
@@ -13,8 +13,6 @@ namespace Chill\PersonBundle\Entity\Household;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -42,30 +40,37 @@ use Doctrine\ORM\Mapping as ORM;
  * 3. 3st entity: from 2021-12-01 to NULL, household V, address T;
  *
  * @ORM\Entity(readOnly=true)
+ *
  * @ORM\Table(name="view_chill_person_household_address")
  */
 class PersonHouseholdAddress
 {
     /**
      * @ORM\Id
+     *
      * @ORM\ManyToOne(targetEntity=Address::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
-    private $address;
+    private ?\Chill\MainBundle\Entity\Address $address = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\ManyToOne(targetEntity=Household::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
-    private $household;
+    private ?\Chill\PersonBundle\Entity\Household\Household $household = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
      * @ORM\Column(type="date_immutable")
@@ -98,7 +103,7 @@ class PersonHouseholdAddress
      * (this is not the startdate of the household, not
      * the startdate of the address)
      */
-    public function getValidFrom(): ?DateTimeInterface
+    public function getValidFrom(): ?\DateTimeInterface
     {
         return $this->validFrom;
     }
@@ -109,7 +114,7 @@ class PersonHouseholdAddress
      * (this is not the enddate of the household, not
      * the enddate of the address)
      */
-    public function getValidTo(): ?DateTimeImmutable
+    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 64409c809..2252fca97 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
@@ -16,7 +16,9 @@ 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
  * })
@@ -25,33 +27,41 @@ class Position
 {
     /**
      * @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"})
      */
     private float $ordering = 0.00;
 
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $shareHouseHold = true;
diff --git a/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php b/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
index e23038715..36834542a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
+++ b/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
@@ -17,15 +17,16 @@ use Doctrine\ORM\Mapping as ORM;
  * MaritalStatus.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_marital_status")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class MaritalStatus
 {
     /**
-     * @var string
-     *
      * @ORM\Id
+     *
      * @ORM\Column(type="string", length=7)
      */
     private ?string $id;
@@ -60,8 +61,6 @@ class MaritalStatus
 
     /**
      * Set id.
-     *
-     * @return MaritalStatus
      */
     public function setId(string $id): self
     {
@@ -74,8 +73,6 @@ class MaritalStatus
      * Set name.
      *
      * @param string array $name
-     *
-     * @return MaritalStatus
      */
     public function setName(array $name): self
     {
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 27c34ba23..57c1a0314 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -11,9 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity;
 
-use ArrayIterator;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Entity\Resource;
+use Chill\CalendarBundle\Entity\Calendar;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\Address;
@@ -22,6 +22,7 @@ use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\Language;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use Chill\PersonBundle\Entity\Household\Household;
@@ -35,27 +36,23 @@ use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequen
 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 libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use UnexpectedValueException;
-use function count;
-use function in_array;
 
 /**
  * Person Class.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_person",
  *     indexes={
+ *
  *         @ORM\Index(
  *             name="person_names",
  *             columns={"firstName", "lastName"}
@@ -65,35 +62,37 @@ use function in_array;
  *             columns={"birthdate"}
  *         )
  *     })
+ *
  *     @ORM\HasLifecycleCallbacks
+ *
  *     @DiscriminatorMap(typeProperty="type", mapping={
  *         "person": Person::class
  *     })
+ *
  *     @PersonHasCenter
+ *
  *     @HouseholdMembershipSequential(
  *         groups={"household_memberships"}
  *     )
  */
-class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateInterface
+class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateInterface, \Stringable
 {
-    public const BOTH_GENDER = 'both';
+    final public const BOTH_GENDER = 'both';
 
     // have days in commun
-    public const ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD = 2; // where there exist
+    final public const ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD = 2; // where there exist
 
-    public const ERROR_PERIODS_ARE_COLLAPSING = 1; // when two different periods
+    final public const ERROR_PERIODS_ARE_COLLAPSING = 1; // when two different periods
 
-    public const FEMALE_GENDER = 'woman';
+    final public const FEMALE_GENDER = 'woman';
 
-    public const MALE_GENDER = 'man';
+    final public const MALE_GENDER = 'man';
 
-    public const NO_INFORMATION = 'unknown';
+    final public const NO_INFORMATION = 'unknown';
 
     /**
      * Accept receiving email.
      *
-     * @var bool
-     *
      * @ORM\Column(type="boolean", options={"default": false})
      */
     private ?bool $acceptEmail = false;
@@ -101,8 +100,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Accept short text message (aka SMS).
      *
-     * @var bool
-     *
      * @ORM\Column(type="boolean", options={"default": false})
      */
     private ?bool $acceptSMS = false;
@@ -110,14 +107,15 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's accompanying periods (when the person was accompanied by the center).
      *
-     * @var Collection
+     * @var Collection<AccompanyingPeriodParticipation>
      *
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
      *     mappedBy="person",
      * cascade={"persist", "remove", "merge", "detach"})
+     *
      * @ORM\OrderBy({"startDate": "DESC"})
      */
-    private $accompanyingPeriodParticipations;
+    private Collection $accompanyingPeriodParticipations;
 
     /**
      * The accompanying period requested by the Person.
@@ -125,25 +123,27 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\OneToMany(targetEntity=AccompanyingPeriod::class,
      * mappedBy="requestorPerson")
      *
-     * @var AccompanyingPeriod[]|Collection
+     * @var Collection<AccompanyingPeriod>
      */
     private Collection $accompanyingPeriodRequested;
 
     /**
      * Addresses.
      *
-     * @var Collection
+     * @var Collection<Address>
      *
      * @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;
+    private Collection $addresses;
 
     /**
-     * @var Collection
+     * @var Collection<PersonAltName>
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\PersonAltName",
@@ -151,19 +151,20 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     cascade={"persist", "remove", "merge", "detach"},
      * orphanRemoval=true)
      */
-    private $altNames;
+    private Collection $altNames;
 
     /**
      * The person's birthdate.
      *
-     * @var DateTime
-     *
      * @ORM\Column(type="date", nullable=true)
+     *
      * @Birthdate
      */
-    private $birthdate;
+    private ?\DateTime $birthdate = null;
 
     /**
+     * @var Collection<Charge>
+     *
      * @ORM\OneToMany(
      *     targetEntity=Charge::class,
      *     mappedBy="person"
@@ -172,6 +173,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private Collection $budgetCharges;
 
     /**
+     * @var Collection<resource>
+     *
      * @ORM\OneToMany(
      *     targetEntity=Resource::class,
      *     mappedBy="person"
@@ -180,6 +183,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private Collection $budgetResources;
 
     /**
+     * @var Collection<int, Calendar>
+     *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\CalendarBundle\Entity\Calendar",
      *     mappedBy="persons"
@@ -202,63 +207,57 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private ?PersonCenterCurrent $centerCurrent = null;
 
     /**
-     * @ORM\OneToMany(targetEntity=PersonCenterHistory::class, mappedBy="person", cascade={"persist"})
+     * @ORM\OneToMany(targetEntity=PersonCenterHistory::class, mappedBy="person", cascade={"persist", "remove"})
      *
-     * @var Collection|PersonCenterHistory[]
+     * @var Collection<PersonCenterHistory>
      */
     private Collection $centerHistory;
 
     /**
      * Array where customfield's data are stored.
      *
-     * @var array
-     *
      * @ORM\Column(type="json")
      */
-    private $cFData;
+    private ?array $cFData = null;
 
     /**
      * The marital status of the person.
      *
-     * @var Civility
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Civility")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
-    private $civility;
+    private ?\Chill\MainBundle\Entity\Civility $civility = null;
 
     /**
      * Contact information for contacting the person.
      *
-     * @var string
-     *
      * @ORM\Column(type="text", nullable=true)
      */
-    private $contactInfo = '';
+    private ?string $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;
+    private ?\Chill\MainBundle\Entity\Country $countryOfBirth = null;
 
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
      */
-    private $createdAt;
+    private ?\DateTimeInterface $createdAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
+     *
      * @ORM\JoinColumn(nullable=true)
      */
-    private $createdBy;
+    private ?\Chill\MainBundle\Entity\User $createdBy = null;
 
     /**
      * Cache the computation of household.
@@ -282,32 +281,32 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's deathdate.
      *
-     * @var DateTimeImmutable
-     *
      * @ORM\Column(type="date_immutable", nullable=true)
+     *
      * @Assert\Date
+     *
      * @Assert\GreaterThanOrEqual(propertyPath="birthdate")
+     *
      * @Assert\LessThanOrEqual("today")
      */
-    private ?DateTimeImmutable $deathdate = null;
+    private ?\DateTimeImmutable $deathdate = null;
 
     /**
      * The person's email.
      *
-     * @var string
-     *
      * @ORM\Column(type="text", nullable=true)
-     * @Assert\Email(
-     *     checkMX=true
-     * )
+     *
+     * @Assert\Email()
      */
-    private $email = '';
+    private ?string $email = '';
 
     /**
      * The person's first name.
      *
      * @ORM\Column(type="string", length=255)
+     *
      * @Assert\NotBlank(message="The firstname cannot be empty")
+     *
      * @Assert\Length(
      *     max=255,
      * )
@@ -320,17 +319,16 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @ORM\Column(type="text", nullable=true)
      */
-    private string $fullnameCanonical = '';
+    private ?string $fullnameCanonical = '';
 
     /**
      * The person's gender.
      *
-     * @var string
-     *
      * @ORM\Column(type="string", length=9, nullable=true)
+     *
      * @Assert\NotNull(message="The gender must be set")
      */
-    private $gender;
+    private ?string $gender = null;
 
     /**
      * Comment on gender.
@@ -342,6 +340,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Read-only field, computed by the database.
      *
+     * @var Collection<PersonHouseholdAddress>
+     *
      * @ORM\OneToMany(
      *     targetEntity=PersonHouseholdAddress::class,
      *     mappedBy="person"
@@ -355,7 +355,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     mappedBy="person"
      * )
      *
-     * @var Collection|HouseholdMember[]
+     * @var Collection<HouseholdMember>
      */
     private Collection $householdParticipations;
 
@@ -363,7 +363,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's id.
      *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;
@@ -372,7 +374,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's last name.
      *
      * @ORM\Column(type="string", length=255)
+     *
      * @Assert\NotBlank(message="The lastname cannot be empty")
+     *
      * @Assert\Length(
      *     max=255,
      * )
@@ -382,12 +386,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The marital status of the person.
      *
-     * @var MaritalStatus
-     *
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\MaritalStatus")
+     *
      * @ORM\JoinColumn(nullable=true)
      */
-    private $maritalStatus;
+    private ?\Chill\PersonBundle\Entity\MaritalStatus $maritalStatus = null;
 
     /**
      * Comment on marital status.
@@ -399,26 +402,24 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The date of the last marital status change of the person.
      *
-     * @var DateTime
-     *
      * @ORM\Column(type="date", nullable=true)
+     *
      * @Assert\Date
      */
-    private ?DateTime $maritalStatusDate = null;
+    private ?\DateTime $maritalStatusDate = null;
 
     /**
      * A remark over the person.
      *
-     * @var string
-     *
      * @ORM\Column(type="text")
      */
-    private $memo = ''; // TO-CHANGE in remark
+    private string $memo = '';
 
     /**
      * The person's mobile phone number.
      *
      * @PhonenumberConstraint(type="mobile")
+     *
      * @ORM\Column(type="phone_number", nullable=true)
      */
     private ?PhoneNumber $mobilenumber = null;
@@ -426,27 +427,23 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's nationality.
      *
-     * @var Country
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
      *
      *    sf4 check: option inversedBy="nationals" return error mapping !!
      *
      * @ORM\JoinColumn(nullable=true)
      */
-    private $nationality;
+    private ?\Chill\MainBundle\Entity\Country $nationality = null;
 
     /**
      * Number of children.
      *
-     * @var int
-     *
      * @ORM\Column(type="integer", nullable=true)
      */
     private ?int $numberOfChildren = null;
 
     /**
-     * @var Collection
+     * @var Collection<PersonPhone>
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\PersonPhone",
@@ -454,17 +451,20 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *     cascade={"persist", "remove", "merge", "detach"},
      *     orphanRemoval=true
      * )
+     *
      * @Assert\Valid(
      *     traverse=true,
      * )
      */
-    private $otherPhoneNumbers;
+    private Collection $otherPhoneNumbers;
 
     /**
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriod::class,
      *     mappedBy="personLocation"
      * )
+     *
+     * @var Collection<AccompanyingPeriod>
      */
     private Collection $periodLocatedOn;
 
@@ -472,6 +472,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's phonenumber.
      *
      * @ORM\Column(type="phone_number", nullable=true)
+     *
      * @PhonenumberConstraint(
      *     type="landline",
      * )
@@ -481,59 +482,57 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * The person's place of birth.
      *
-     * @var string
-     *
      * @ORM\Column(type="string", length=255, name="place_of_birth")
      */
-    private $placeOfBirth = '';
+    private string $placeOfBirth = '';
 
     /**
-     * @var bool
-     *
      * @deprecated
      *
      * @ORM\Column(type="boolean")
      */
-    private $proxyAccompanyingPeriodOpenState = false; //TO-DELETE ?
+    private bool $proxyAccompanyingPeriodOpenState = false; // TO-DELETE ?
 
     /**
      * @ORM\OneToMany(targetEntity=PersonResource::class, mappedBy="personOwner")
      *
-     * @var Collection|PersonResource[];
+     * @var Collection<PersonResource>
      */
     private Collection $resources;
 
     /**
      * The person's spoken languages.
      *
-     * @var ArrayCollection
+     * @var Collection<Language>
      *
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\Language")
+     *
      * @ORM\JoinTable(
      *     name="persons_spoken_languages",
      *     joinColumns={@ORM\JoinColumn(name="person_id", referencedColumnName="id")},
      *     inverseJoinColumns={@ORM\JoinColumn(name="language_id", referencedColumnName="id")}
      * )
      */
-    private $spokenLanguages;
+    private Collection $spokenLanguages;
 
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
      */
-    private $updatedAt;
+    private ?\DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(
      *     targetEntity=User::class
      * )
      */
-    private $updatedBy;
+    private ?\Chill\MainBundle\Entity\User $updatedBy = null;
 
     /**
      * Person constructor.
      */
     public function __construct()
     {
+        $this->calendars = new \Doctrine\Common\Collections\ArrayCollection();
         $this->accompanyingPeriodParticipations = new ArrayCollection();
         $this->spokenLanguages = new ArrayCollection();
         $this->addresses = new ArrayCollection();
@@ -551,10 +550,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->centerHistory = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->getLabel();
     }
@@ -628,13 +624,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * the person are not collapsing (i.e. have not shared days) or having
      * a period after an open period.
      *
-     * @return true | array True if the accompanying periods are not collapsing,
-     * an array with data for displaying the error
+     * @return true|array True if the accompanying periods are not collapsing,
+     *                    an array with data for displaying the error
      */
-    public function checkAccompanyingPeriodsAreNotCollapsing()
+    public function checkAccompanyingPeriodsAreNotCollapsing(): array|bool
     {
         $periods = $this->getAccompanyingPeriodsOrdered();
-        $periodsNbr = count($periods);
+        $periodsNbr = \count($periods);
         $i = 0;
 
         while ($periodsNbr - 1 > $i) {
@@ -673,9 +669,9 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * To check if the Person and its accompanying period are consistent, use validation.
      *
-     * @throws Exception if two lines of the accompanying period are open.
+     * @throws \Exception if two lines of the accompanying period are open
      */
-    public function close(?AccompanyingPeriod $accompanyingPeriod = null): void
+    public function close(AccompanyingPeriod $accompanyingPeriod = null): void
     {
         $this->proxyAccompanyingPeriodOpenState = false;
     }
@@ -713,7 +709,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
             }
         }
 
-        if (0 < count($closeCandidates)) {
+        if (0 < \count($closeCandidates)) {
             return $closeCandidates[0];
         }
 
@@ -737,7 +733,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * * 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
+     * @param bool $asRequestor       add accompanying period where the person is requestor
      *
      * @return AccompanyingPeriod[]|Collection
      */
@@ -749,8 +745,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
         if ($asParticipantOpen) {
             foreach ($this->getAccompanyingPeriodParticipations()
-                ->map(fn (AccompanyingPeriodParticipation $app) => $app->getAccompanyingPeriod())
-               as $period
+                ->map(fn (AccompanyingPeriodParticipation $app) => $app->getAccompanyingPeriod()) as $period
             ) {
                 if (!$result->contains($period)) {
                     $result->add($period);
@@ -775,9 +770,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     ): int {
         // TODO should be optimized to avoid loading accompanying period ?
         return $this->getAccompanyingPeriodInvolved($asParticipantOpen, $asRequestor)
-            ->filter(function (AccompanyingPeriod $p) {
-                return $p->getStep() !== AccompanyingPeriod::STEP_DRAFT;
-            })
+            ->filter(fn (AccompanyingPeriod $p) => AccompanyingPeriod::STEP_DRAFT !== $p->getStep())
             ->count();
     }
 
@@ -807,7 +800,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $accompanyingPeriods = [];
 
         foreach ($this->accompanyingPeriodParticipations as $participation) {
-            /** @var AccompanyingPeriodParticipation $participation */
+            /* @var AccompanyingPeriodParticipation $participation */
             $accompanyingPeriods[] = $participation->getAccompanyingPeriod();
         }
 
@@ -821,7 +814,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     {
         $periods = $this->getAccompanyingPeriods();
 
-        //order by date :
+        // order by date :
         usort($periods, static function ($a, $b) {
             $dateA = $a->getOpeningDate();
             $dateB = $b->getOpeningDate();
@@ -859,17 +852,17 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * @deprecated since chill2.0, address is linked to the household. Use @see{Person::getCurrentHouseholdAddress}
      *
-     * @throws Exception
+     * @throws \Exception
      */
-    public function getAddressAt(?DateTimeInterface $at = null): ?Address
+    public function getAddressAt(\DateTimeInterface $at = null): ?Address
     {
-        $at ??= new DateTime('now');
+        $at ??= new \DateTime('now');
 
-        if ($at instanceof DateTimeImmutable) {
-            $at = DateTime::createFromImmutable($at);
+        if ($at instanceof \DateTimeImmutable) {
+            $at = \DateTime::createFromImmutable($at);
         }
 
-        /** @var ArrayIterator $addressesIterator */
+        /** @var \ArrayIterator $addressesIterator */
         $addressesIterator = $this->getAddresses()
             ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $at)
             ->getIterator();
@@ -897,12 +890,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      *
      * If the person has a deathdate, calculate the age at the deathdate.
      *
-     * @param string $at A valid string to create a DateTime.
+     * @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) {
+        if ($this->birthdate instanceof \DateTimeInterface) {
+            if ($this->deathdate instanceof \DateTimeInterface) {
                 return (int) date_diff($this->birthdate, $this->deathdate)->format('%y');
             }
 
@@ -917,7 +910,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->altNames;
     }
 
-    public function getBirthdate(): ?DateTime
+    public function getBirthdate(): ?\DateTime
     {
         return $this->birthdate;
     }
@@ -938,6 +931,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->budgetResources;
     }
 
+    /**
+     * @return Collection<int, Calendar>
+     */
+    public function getCalendars(): Collection
+    {
+        return $this->calendars;
+    }
+
     public function getCenter(): ?Center
     {
         if (null !== $this->centerCurrent) {
@@ -993,7 +994,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->countryOfBirth;
     }
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTimeInterface
     {
         return $this->createdAt;
     }
@@ -1021,7 +1022,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     public function getCurrentAccompanyingPeriods(): array
     {
         $currentAccompanyingPeriods = [];
-        $currentDate = new DateTime();
+        $currentDate = new \DateTime();
 
         foreach ($this->accompanyingPeriodParticipations as $participation) {
             $endDate = $participation->getEndDate();
@@ -1034,7 +1035,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $currentAccompanyingPeriods;
     }
 
-    public function getCurrentHousehold(?DateTimeImmutable $at = null): ?Household
+    public function getCurrentHousehold(\DateTimeImmutable $at = null): ?Household
     {
         $participation = $this->getCurrentHouseholdParticipationShareHousehold($at);
 
@@ -1049,11 +1050,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * if the given date is 'now', use instead @see{getCurrentPersonAddress}, which is optimized on
      * database side.
      */
-    public function getCurrentHouseholdAddress(?DateTimeImmutable $at = null): ?Address
+    public function getCurrentHouseholdAddress(\DateTimeImmutable $at = null): ?Address
     {
         if (
             null === $at
-            || $at->format('Ymd') === (new DateTime('today'))->format('Ymd')
+            || $at->format('Ymd') === (new \DateTime('today'))->format('Ymd')
         ) {
             return $this->currentPersonAddress instanceof PersonCurrentAddress
                 ? $this->currentPersonAddress->getAddress() : null;
@@ -1083,11 +1084,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return null;
     }
 
-    public function getCurrentHouseholdParticipationShareHousehold(?DateTimeImmutable $at = null): ?HouseholdMember
+    public function getCurrentHouseholdParticipationShareHousehold(\DateTimeImmutable $at = null): ?HouseholdMember
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
-        $date = null === $at ? new DateTimeImmutable('today') : $at;
+        $date = $at ?? new \DateTimeImmutable('today');
         $datef = $date->format('Y-m-d');
 
         if (
@@ -1127,7 +1128,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->currentPersonAddress->getAddress();
     }
 
-    public function getDeathdate(): ?DateTimeInterface
+    public function getDeathdate(): ?\DateTimeInterface
     {
         return $this->deathdate;
     }
@@ -1167,19 +1168,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     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;
-        }
+        return match ($this->getGender()) {
+            self::FEMALE_GENDER => 1,
+            self::MALE_GENDER => 0,
+            self::BOTH_GENDER => 2,
+            default => -1,
+        };
     }
 
     public function getHouseholdAddresses(): Collection
@@ -1249,20 +1243,20 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     public function getLabel()
     {
-        return $this->getFirstName() . ' ' . $this->getLastName();
+        return $this->getFirstName().' '.$this->getLastName();
     }
 
     /**
      * @deprecated Use @see{Person::getCurrentPersonAddress} or @see{Person::getCurrentHouseholdAddress} instead
      *
-     * @throws Exception
-     *
      * @return false|mixed|null
+     *
+     * @throws \Exception
      */
-    public function getLastAddress(?DateTime $from = null)
+    public function getLastAddress(\DateTime $from = null)
     {
         return $this->getCurrentHouseholdAddress(
-            null !== $from ? DateTimeImmutable::createFromMutable($from) : null
+            null !== $from ? \DateTimeImmutable::createFromMutable($from) : null
         );
     }
 
@@ -1281,7 +1275,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->maritalStatusComment;
     }
 
-    public function getMaritalStatusDate(): ?DateTimeInterface
+    public function getMaritalStatusDate(): ?\DateTimeInterface
     {
         return $this->maritalStatusDate;
     }
@@ -1311,7 +1305,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     public function getOpenedAccompanyingPeriod(): ?AccompanyingPeriod
     {
-        if ($this->isOpen() === false) {
+        if (false === $this->isOpen()) {
             return null;
         }
 
@@ -1337,13 +1331,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $criteria = Criteria::create();
         $criteria
             ->andWhere(Criteria::expr()->eq('endDate', null))
-            ->orWhere(Criteria::expr()->gt('endDate', new DateTime('now')));
+            ->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();
-            });
+            ->filter(static fn (AccompanyingPeriodParticipation $app) => AccompanyingPeriod::STEP_CLOSED !== $app->getAccompanyingPeriod()->getStep());
     }
 
     public function getOtherPhoneNumbers(): Collection
@@ -1364,7 +1356,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * @return PersonResource[]|Collection
      */
-    public function getResources()
+    public function getResources(): array|\Doctrine\Common\Collections\Collection
     {
         return $this->resources;
     }
@@ -1372,14 +1364,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     /**
      * Get spokenLanguages.
      *
-     * @return ArrayCollection
+     * @return Collection<Language>
      */
     public function getSpokenLanguages()
     {
         return $this->spokenLanguages;
     }
 
-    public function getUpdatedAt(): ?DateTimeInterface
+    public function getUpdatedAt(): ?\DateTimeInterface
     {
         return $this->updatedAt;
     }
@@ -1389,7 +1381,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->updatedBy;
     }
 
-    public function hasCurrentHouseholdAddress(?DateTimeImmutable $at = null): bool
+    public function hasCurrentHouseholdAddress(\DateTimeImmutable $at = null): bool
     {
         return null !== $this->getCurrentHouseholdAddress($at);
     }
@@ -1405,7 +1397,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         foreach ($this->addresses as $ad) {
             $validDate = $ad->getValidFrom()->format('Y-m-d');
 
-            if (in_array($validDate, $validYMDDates, true)) {
+            if (\in_array($validDate, $validYMDDates, true)) {
                 return true;
             }
             $validYMDDates[] = $validDate;
@@ -1476,7 +1468,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return false;
     }
 
-    public function isSharingHousehold(?DateTimeImmutable $at = null): bool
+    public function isSharingHousehold(\DateTimeImmutable $at = null): bool
     {
         return null !== $this->getCurrentHousehold($at);
     }
@@ -1505,7 +1497,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $participation = $this->participationsContainAccompanyingPeriod($accompanyingPeriod);
 
         if (!null === $participation) {
-            $participation->setEndDate(new DateTime());
+            $participation->setEndDate(new \DateTime());
             $this->accompanyingPeriodParticipations->removeElement($participation);
         }
     }
@@ -1570,7 +1562,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     }
 
     /**
-     * @param DateTime $birthdate
+     * @param \DateTime $birthdate
      */
     public function setBirthdate($birthdate): self
     {
@@ -1586,7 +1578,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     public function setCenter(?Center $center): self
     {
-        $modification = new DateTimeImmutable('now');
+        $modification = new \DateTimeImmutable('now');
 
         foreach ($this->centerHistory as $centerHistory) {
             if (null === $centerHistory->getEndDate()) {
@@ -1610,9 +1602,16 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * @return Person
-     */
+    public function addCenterHistory(PersonCenterHistory $newCenterHistory): self
+    {
+        if (!$this->centerHistory->contains($newCenterHistory)) {
+            $this->centerHistory[] = $newCenterHistory;
+            $newCenterHistory->setPerson($this);
+        }
+
+        return $this;
+    }
+
     public function setCFData(?array $cFData): self
     {
         $this->cFData = $cFData;
@@ -1620,7 +1619,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setCivility(?Civility $civility = null): self
+    public function setCivility(Civility $civility = null): self
     {
         $this->civility = $civility;
 
@@ -1638,14 +1637,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setCountryOfBirth(?Country $countryOfBirth = null): self
+    public function setCountryOfBirth(Country $countryOfBirth = null): self
     {
         $this->countryOfBirth = $countryOfBirth;
 
         return $this;
     }
 
-    public function setCreatedAt(DateTimeInterface $datetime): self
+    public function setCreatedAt(\DateTimeInterface $datetime): self
     {
         $this->createdAt = $datetime;
 
@@ -1659,7 +1658,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setDeathdate(?DateTimeInterface $deathdate): self
+    public function setDeathdate(?\DateTimeInterface $deathdate): self
     {
         $this->deathdate = $deathdate;
 
@@ -1708,7 +1707,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setMaritalStatus(?MaritalStatus $maritalStatus = null): self
+    public function setMaritalStatus(MaritalStatus $maritalStatus = null): self
     {
         $this->maritalStatus = $maritalStatus;
 
@@ -1722,7 +1721,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setMaritalStatusDate(?DateTimeInterface $maritalStatusDate): self
+    public function setMaritalStatusDate(?\DateTimeInterface $maritalStatusDate): self
     {
         $this->maritalStatusDate = $maritalStatusDate;
 
@@ -1749,7 +1748,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setNationality(?Country $nationality = null): self
+    public function setNationality(Country $nationality = null): self
     {
         $this->nationality = $nationality;
 
@@ -1798,7 +1797,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setUpdatedAt(DateTimeInterface $datetime): self
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
     {
         $this->updatedAt = $datetime;
 
@@ -1819,7 +1818,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         }
 
         $criteria = Criteria::create();
-        $now = new DateTimeImmutable('now');
+        $now = new \DateTimeImmutable('now');
         $criteria->where(Criteria::expr()->lte('startDate', $now))
             ->andWhere(Criteria::expr()->orX(
                 Criteria::expr()->isNull('endDate'),
@@ -1828,16 +1827,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
         $histories = $this->centerHistory->matching($criteria);
 
-        switch ($histories->count()) {
-            case 0:
-                return null;
-
-            case 1:
-                return $histories->first();
-
-            default:
-                throw new UnexpectedValueException('It should not contains more than one center at a time');
-        }
+        return match ($histories->count()) {
+            0 => null,
+            1 => $histories->first(),
+            default => throw new \UnexpectedValueException('It should not contains more than one center at a time'),
+        };
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
index 6d67fbbbb..551f8fd03 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -23,7 +22,9 @@ use Doctrine\ORM\Mapping as ORM;
  * using a SQL view.
  *
  * @ORM\Entity(readOnly=true)
+ *
  * @ORM\Table(name="view_chill_person_person_center_history_current")
+ *
  * @psalm-internal Chill\PersonBundle\Entity
  */
 class PersonCenterCurrent
@@ -36,23 +37,24 @@ class PersonCenterCurrent
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="centerCurrent")
+     * @ORM\OneToOne(targetEntity=Person::class, inversedBy="centerCurrent")
      */
     private Person $person;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=false)
      */
-    private DateTimeImmutable $startDate;
+    private \DateTimeImmutable $startDate;
 
     /**
      * Populate the properties person, center, start and end date from history.
@@ -75,7 +77,7 @@ class PersonCenterCurrent
         return $this->center;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -93,7 +95,7 @@ class PersonCenterCurrent
         return $this->person;
     }
 
-    public function getStartDate(): DateTimeImmutable
+    public function getStartDate(): \DateTimeImmutable
     {
         return $this->startDate;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php
index 034ab81ec..04cad642b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php
@@ -17,13 +17,13 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Associate a Person with a Center. The association may change on date intervals.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_person_center_history")
  */
 class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterface
@@ -32,46 +32,41 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
 
     use TrackUpdateTrait;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=Center::class)
-     */
-    private ?Center $center = null;
-
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="centerHistory")
-     */
-    private ?Person $person = null;
-
-    /**
-     * @ORM\Column(type="date_immutable", nullable=false)
-     */
-    private ?DateTimeImmutable $startDate = null;
-
-    public function __construct(?Person $person = null, ?Center $center = null, ?DateTimeImmutable $startDate = null)
-    {
-        $this->person = $person;
-        $this->center = $center;
-        $this->startDate = $startDate;
-    }
+    public function __construct(
+        /**
+         * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="centerHistory")
+         */
+        private ?Person $person = null,
+        /**
+         * @ORM\ManyToOne(targetEntity=Center::class)
+         */
+        private ?Center $center = null,
+        /**
+         * @ORM\Column(type="date_immutable", nullable=false)
+         */
+        private ?\DateTimeImmutable $startDate = null
+    ) {}
 
     public function getCenter(): ?Center
     {
         return $this->center;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -86,7 +81,7 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         return $this->person;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -98,7 +93,7 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): self
+    public function setEndDate(?\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -112,7 +107,7 @@ class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterfac
         return $this;
     }
 
-    public function setStartDate(?DateTimeImmutable $startDate): self
+    public function setStartDate(?\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
index d95f4c7c8..1ec28f423 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\Person;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -26,6 +25,7 @@ use Doctrine\ORM\Mapping as ORM;
  * household membership and address validity. See @see{PersonHouseholdAddress}
  *
  * @ORM\Entity(readOnly=true)
+ *
  * @ORM\Table("view_chill_person_current_address")
  */
 class PersonCurrentAddress
@@ -37,7 +37,9 @@ class PersonCurrentAddress
 
     /**
      * @ORM\Id
+     *
      * @ORM\OneToOne(targetEntity=Person::class, inversedBy="currentPersonAddress")
+     *
      * @ORM\JoinColumn(name="person_id", referencedColumnName="id")
      */
     protected Person $person;
@@ -45,12 +47,12 @@ class PersonCurrentAddress
     /**
      * @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 = null;
 
     public function getAddress(): Address
     {
@@ -66,7 +68,7 @@ class PersonCurrentAddress
      * This date is the intersection of household membership
      * and address validity.
      */
-    public function getValidFrom(): DateTimeImmutable
+    public function getValidFrom(): \DateTimeImmutable
     {
         return $this->validFrom;
     }
@@ -75,7 +77,7 @@ class PersonCurrentAddress
      * This date is the intersection of household membership
      * and address validity.
      */
-    public function getValidTo(): ?DateTimeImmutable
+    public function getValidTo(): ?\DateTimeImmutable
     {
         return $this->validTo;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 576380476..c5c2c8d08 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -26,7 +26,9 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_resource")
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "personResource": personResource::class
  * })
@@ -39,27 +41,34 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private CommentEmbeddable $comment;
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?string $freeText = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Groups({"read", "docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=PersonResourceKind::class, inversedBy="personResources")
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?PersonResourceKind $kind = null;
@@ -68,7 +77,9 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
      * The person which host the owner of this resource.
      *
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?Person $person = null;
@@ -77,14 +88,18 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
      * The person linked with this resource.
      *
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="resources")
+     *
      * @ORM\JoinColumn(nullable=false)
+     *
      * @Groups({"read"})
      */
     private ?Person $personOwner = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class, inversedBy="personResources")
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read", "docgen:read"})
      */
     private ?ThirdParty $thirdParty = null;
@@ -221,10 +236,8 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @Assert\Callback
-     *
-     * @param mixed $payload
      */
-    public function validate(ExecutionContextInterface $context, $payload)
+    public function validate(ExecutionContextInterface $context, mixed $payload)
     {
         if (null === $this->person && null === $this->thirdParty && (null === $this->freeText || '' === $this->freeText)) {
             $context->buildViolation('You must associate at least one entity')
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
index cf70fa206..f036e4b4a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
@@ -16,14 +16,18 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_resource_kind")
  */
 class PersonResourceKind
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?int $id = null;
@@ -35,7 +39,9 @@ class PersonResourceKind
 
     /**
      * @ORM\Column(type="json", length=255)
+     *
      * @Serializer\Groups({"docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
index 26e57ad00..acd312190 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
@@ -16,20 +16,22 @@ use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Context;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity(repositoryClass=ResidentialAddressRepository::class)
+ *
  * @ORM\Table(name="chill_person_residential_address")
  */
 class ResidentialAddress
 {
     /**
      * @ORM\ManyToOne(targetEntity=Address::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read"})
      */
     private ?Address $address = null;
@@ -41,43 +43,53 @@ class ResidentialAddress
 
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
+     *
      * @Groups({"read"})
      */
-    private ?DateTimeImmutable $endDate = null;
+    private ?\DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read"})
+     *
      * @Context(normalizationContext={"groups": {"minimal"}})
      */
     private ?Person $hostPerson = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     *
      * @ORM\JoinColumn(nullable=true)
+     *
      * @Groups({"read"})
      */
     private ?ThirdParty $hostThirdParty = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
+     *
      * @ORM\JoinColumn(nullable=false)
      */
     private Person $person;
 
     /**
      * @ORM\Column(type="datetime_immutable")
+     *
      * @Groups({"read"})
      */
-    private ?DateTimeImmutable $startDate = null;
+    private ?\DateTimeImmutable $startDate = null;
 
     public function __construct()
     {
@@ -94,7 +106,7 @@ class ResidentialAddress
         return $this->comment;
     }
 
-    public function getEndDate(): ?DateTimeImmutable
+    public function getEndDate(): ?\DateTimeImmutable
     {
         return $this->endDate;
     }
@@ -119,7 +131,7 @@ class ResidentialAddress
         return $this->person;
     }
 
-    public function getStartDate(): ?DateTimeImmutable
+    public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
     }
@@ -138,7 +150,7 @@ class ResidentialAddress
         return $this;
     }
 
-    public function setEndDate(?DateTimeImmutable $endDate): self
+    public function setEndDate(?\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
@@ -166,7 +178,7 @@ class ResidentialAddress
         return $this;
     }
 
-    public function setStartDate(DateTimeImmutable $startDate): self
+    public function setStartDate(\DateTimeImmutable $startDate): self
     {
         $this->startDate = $startDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
index fbf238ac4..9b6b24621 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
@@ -18,44 +18,41 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * PersonAltName.
  *
  * @ORM\Table(name="chill_person_alt_name")
+ *
  * @ORM\Entity
  */
 class PersonAltName
 {
     /**
-     * @var int
-     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="key", type="string", length=255)
+     *
      * @Groups({"write"})
      */
-    private $key;
+    private string $key = '';
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="label", type="text")
+     *
      * @Groups({"write"})
      */
-    private $label;
+    private string $label = '';
 
     /**
-     * @var Person
-     *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\Person",
      *     inversedBy="altNames"
      * )
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
      * Get id.
@@ -95,13 +92,11 @@ class PersonAltName
     /**
      * Set key.
      *
-     * @param string $key
-     *
      * @return PersonAltName
      */
-    public function setKey($key)
+    public function setKey(?string $key)
     {
-        $this->key = $key;
+        $this->key = (string) $key;
 
         return $this;
     }
@@ -109,13 +104,11 @@ class PersonAltName
     /**
      * Set label.
      *
-     * @param string $label
-     *
      * @return PersonAltName
      */
-    public function setLabel($label)
+    public function setLabel(?string $label)
     {
-        $this->label = $label;
+        $this->label = (string) $label;
 
         return $this;
     }
@@ -123,7 +116,7 @@ class PersonAltName
     /**
      * @return $this
      */
-    public function setPerson(?Person $person = null)
+    public function setPerson(Person $person = null)
     {
         $this->person = $person;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
index 6959fc5e3..ad0f4236f 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
@@ -19,51 +19,45 @@ use Doctrine\ORM\Mapping as ORM;
  * PersonNotDuplicate.
  *
  * @ORM\Table(name="chill_person_not_duplicate")
+ *
  * @ORM\Entity
  */
 class PersonNotDuplicate
 {
     /**
-     * @var DateTime
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private \DateTime $date;
 
     /**
      * The person's id.
      *
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var Person
-     *
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private $person1;
+    private ?\Chill\PersonBundle\Entity\Person $person1 = null;
 
     /**
-     * @var Person
-     *
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private $person2;
+    private ?\Chill\PersonBundle\Entity\Person $person2 = null;
 
     /**
-     * @var User
-     *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private $user;
+    private ?\Chill\MainBundle\Entity\User $user = null;
 
     public function __construct()
     {
-        $this->date = new DateTime();
+        $this->date = new \DateTime();
     }
 
     public function getDate()
@@ -91,7 +85,7 @@ class PersonNotDuplicate
         return $this->user;
     }
 
-    public function setDate(DateTime $date)
+    public function setDate(\DateTime $date)
     {
         $this->date = $date;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
index 5013ac9b7..c994e487b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
@@ -19,8 +19,10 @@ use libphonenumber\PhoneNumber;
  * Person Phones.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_phone",
  *     indexes={
+ *
  *         @ORM\Index(name="phonenumber", columns={"phonenumber"})
  *     })
  */
@@ -29,7 +31,7 @@ class PersonPhone
     /**
      * @ORM\Column(type="datetime", nullable=false)
      */
-    private DateTime $date;
+    private \DateTime $date;
 
     /**
      * @ORM\Column(type="text", nullable=true)
@@ -38,10 +40,12 @@ class PersonPhone
 
     /**
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(
@@ -59,14 +63,14 @@ class PersonPhone
     /**
      * @ORM\Column(type="text", length=40, nullable=true)
      */
-    private ?string $type;
+    private ?string $type = null;
 
     public function __construct()
     {
-        $this->date = new DateTime();
+        $this->date = new \DateTime();
     }
 
-    public function getDate(): DateTime
+    public function getDate(): \DateTime
     {
         return $this->date;
     }
@@ -102,7 +106,7 @@ class PersonPhone
             && null === $this->getPhonenumber();
     }
 
-    public function setDate(DateTime $date): void
+    public function setDate(\DateTime $date): void
     {
         $this->date = $date;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
index cd36db8aa..a8c542622 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
@@ -17,7 +17,9 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_relations")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "relation": Relation::class
  * })
@@ -26,28 +28,36 @@ class Relation
 {
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen: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 = [];
diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
index a89b56ad3..f736913ae 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
@@ -16,8 +16,6 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\DiscriminatorColumn;
 use RuntimeException;
@@ -27,11 +25,15 @@ 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
  * })
+ *
  * @RelationshipNoDuplicate
  */
 class Relationship implements TrackCreationInterface, TrackUpdateInterface
@@ -39,52 +41,67 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime_immutable")
      */
-    private ?DateTimeImmutable $createdAt = null;
+    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;
@@ -92,14 +109,14 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $updatedAt = null;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      */
     private ?User $updatedBy = null;
 
-    public function getCreatedAt(): ?DateTimeImmutable
+    public function getCreatedAt(): ?\DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -130,7 +147,7 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
     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');
+            throw new \RuntimeException('the counterpart is neither the from nor to person for this relationship');
         }
 
         if ($this->fromPerson === $counterpart) {
@@ -155,7 +172,7 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
         return $this->toPerson;
     }
 
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -165,7 +182,7 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
         return $this->updatedBy;
     }
 
-    public function setCreatedAt(DateTimeInterface $createdAt): self
+    public function setCreatedAt(\DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
 
@@ -207,7 +224,7 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setUpdatedAt(?DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(?\DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
index 08dc0f425..4ec5bcf78 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -19,7 +19,9 @@ 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
  * })
@@ -33,25 +35,32 @@ class Evaluation
 
     /**
      * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateInterval $delay = null;
+    private ?\DateInterval $delay = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     *
      * @Serializer\Groups({"read"})
      */
-    private ?DateInterval $notificationDelay = null;
+    private ?\DateInterval $notificationDelay = null;
 
     /**
+     * @var Collection<SocialAction>
+     *
      * @ORM\ManyToMany(
      *     targetEntity=SocialAction::class,
      *     mappedBy="evaluations"
@@ -61,13 +70,16 @@ class Evaluation
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
+     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title = [];
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?string $url = null;
@@ -89,7 +101,7 @@ class Evaluation
         return $this;
     }
 
-    public function getDelay(): ?DateInterval
+    public function getDelay(): ?\DateInterval
     {
         return $this->delay;
     }
@@ -99,7 +111,7 @@ class Evaluation
         return $this->id;
     }
 
-    public function getNotificationDelay(): ?DateInterval
+    public function getNotificationDelay(): ?\DateInterval
     {
         return $this->notificationDelay;
     }
@@ -132,7 +144,7 @@ class Evaluation
     public function removeSocialAction(SocialAction $socialAction): self
     {
         if ($this->socialActions->contains($socialAction)) {
-            $this->socialActions->remove($socialAction);
+            $this->socialActions->removeElement($socialAction);
         }
 
         return $this;
@@ -145,14 +157,14 @@ class Evaluation
         return $this;
     }
 
-    public function setDelay(?DateInterval $delay): self
+    public function setDelay(?\DateInterval $delay): self
     {
         $this->delay = $delay;
 
         return $this;
     }
 
-    public function setNotificationDelay(?DateInterval $notificationDelay): self
+    public function setNotificationDelay(?\DateInterval $notificationDelay): self
     {
         $this->notificationDelay = $notificationDelay;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
index a51ba1a59..856e565eb 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
@@ -11,7 +11,6 @@ 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;
@@ -19,7 +18,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_social_work_goal")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -32,30 +33,40 @@ class Goal
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $desactivationDate;
+    private ?\DateTimeInterface $desactivationDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
+     * @var Collection<Result>
+     *
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="goals")
+     *
      * @ORM\JoinTable(name="chill_person_social_work_goal_result")
      */
     private Collection $results;
 
     /**
+     * @var Collection<SocialAction>
+     *
      * @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 = [];
@@ -84,7 +95,7 @@ class Goal
         return $this;
     }
 
-    public function getDesactivationDate(): ?DateTimeInterface
+    public function getDesactivationDate(): ?\DateTimeInterface
     {
         return $this->desactivationDate;
     }
@@ -129,7 +140,7 @@ class Goal
         return $this;
     }
 
-    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
     {
         $this->desactivationDate = $desactivationDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
index 823f31426..c8afb0456 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
@@ -14,7 +14,6 @@ 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;
@@ -22,7 +21,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_social_work_result")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -33,11 +34,15 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 class Result
 {
     /**
+     * @var Collection<AccompanyingPeriodWorkGoal>
+     *
      * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWorkGoal::class, mappedBy="results")
      */
     private Collection $accompanyingPeriodWorkGoals;
 
     /**
+     * @var Collection<AccompanyingPeriodWork>
+     *
      * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWork::class, mappedBy="results")
      */
     private Collection $accompanyingPeriodWorks;
@@ -45,29 +50,38 @@ class Result
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private ?DateTime $desactivationDate;
+    private ?\DateTime $desactivationDate = null;
 
     /**
+     * @var Collection<Goal>
+     *
      * @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;
 
     /**
+     * @var Collection<SocialAction>
+     *
      * @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 = [];
@@ -132,7 +146,7 @@ class Result
         return $this->accompanyingPeriodWorks;
     }
 
-    public function getDesactivationDate(): ?DateTimeInterface
+    public function getDesactivationDate(): ?\DateTimeInterface
     {
         return $this->desactivationDate;
     }
@@ -191,7 +205,7 @@ class Result
         return $this;
     }
 
-    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
     {
         $this->desactivationDate = $desactivationDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
index a8c68c8ce..8361399f5 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
@@ -12,15 +12,17 @@ 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\Common\Collections\ReadableCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_social_action")
+ *
  * @Serializer\DiscriminatorMap(
  *     typeProperty="type",
  *     mapping={
@@ -31,35 +33,45 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 class SocialAction
 {
     /**
+     * @var Collection<SocialAction>
+     *
      * @ORM\OneToMany(targetEntity=SocialAction::class, mappedBy="parent")
      */
-    private $children;
+    private Collection $children;
 
     /**
      * @ORM\Column(type="dateinterval", nullable=true)
      */
-    private $defaultNotificationDelay;
+    private ?\DateInterval $defaultNotificationDelay = null;
 
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $desactivationDate;
+    private ?\DateTimeInterface $desactivationDate = null;
 
     /**
+     * @var Collection<Evaluation>
+     *
      * @ORM\ManyToMany(targetEntity=Evaluation::class, inversedBy="socialActions")
+     *
      * @ORM\JoinTable(name="chill_person_social_work_evaluation_action")
      */
     private Collection $evaluations;
 
     /**
+     * @var Collection<Goal>
+     *
      * @ORM\ManyToMany(targetEntity=Goal::class, inversedBy="socialActions")
+     *
      * @ORM\JoinTable(name="chill_person_social_action_goal")
      */
-    private $goals;
+    private Collection $goals;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
     private ?int $id = null;
@@ -67,7 +79,7 @@ class SocialAction
     /**
      * @ORM\ManyToOne(targetEntity=SocialIssue::class, inversedBy="socialActions")
      */
-    private $issue;
+    private ?\Chill\PersonBundle\Entity\SocialWork\SocialIssue $issue = null;
 
     /**
      * @ORM\Column(type="float", name="ordering", options={"default": 0.0})
@@ -77,18 +89,21 @@ class SocialAction
     /**
      * @ORM\ManyToOne(targetEntity=SocialAction::class, inversedBy="children")
      */
-    private $parent;
+    private ?\Chill\PersonBundle\Entity\SocialWork\SocialAction $parent = null;
 
     /**
+     * @var Collection<Result>
+     *
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="socialActions")
+     *
      * @ORM\JoinTable(name="chill_person_social_action_result")
      */
-    private $results;
+    private Collection $results;
 
     /**
      * @ORM\Column(type="json")
      */
-    private $title = [];
+    private array $title = [];
 
     public function __construct()
     {
@@ -151,7 +166,7 @@ class SocialAction
      *
      * @return Collection|SocialAction[] a list with the elements of the given list which are parent of other elements in the given list
      */
-    public static function findAncestorSocialActions(Collection $socialActions): Collection
+    public static function findAncestorSocialActions(array|\Doctrine\Common\Collections\Collection $socialActions): Collection
     {
         $ancestors = new ArrayCollection();
 
@@ -182,12 +197,12 @@ class SocialAction
         return $this->children;
     }
 
-    public function getDefaultNotificationDelay(): ?DateInterval
+    public function getDefaultNotificationDelay(): ?\DateInterval
     {
         return $this->defaultNotificationDelay;
     }
 
-    public function getDesactivationDate(): ?DateTimeInterface
+    public function getDesactivationDate(): ?\DateTimeInterface
     {
         return $this->desactivationDate;
     }
@@ -231,7 +246,7 @@ class SocialAction
     /**
      * @param Collection|SocialAction[] $socialActions
      */
-    public static function getDescendantsWithThisForActions($socialActions): Collection
+    public static function getDescendantsWithThisForActions(array|\Doctrine\Common\Collections\Collection $socialActions): Collection
     {
         $unique = [];
 
@@ -295,6 +310,19 @@ class SocialAction
         return 0 < $this->getChildren()->count();
     }
 
+    public function isDesactivated(\DateTime $atDate): bool
+    {
+        if (null !== $this->desactivationDate && $this->desactivationDate < $atDate) {
+            return true;
+        }
+
+        if ($this->hasParent()) {
+            return $this->parent->isDesactivated($atDate);
+        }
+
+        return false;
+    }
+
     public function hasParent(): bool
     {
         return $this->getParent() instanceof self;
@@ -351,14 +379,14 @@ class SocialAction
         return $this;
     }
 
-    public function setDefaultNotificationDelay(DateInterval $defaultNotificationDelay): self
+    public function setDefaultNotificationDelay(\DateInterval $defaultNotificationDelay): self
     {
         $this->defaultNotificationDelay = $defaultNotificationDelay;
 
         return $this;
     }
 
-    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
     {
         $this->desactivationDate = $desactivationDate;
 
@@ -401,4 +429,14 @@ class SocialAction
 
         return $this;
     }
+
+    public static function filterRemoveDeactivatedActions(array|ReadableCollection $actions, \DateTime $comparisonDate): array|ReadableCollection
+    {
+        $filterFn = fn (SocialAction $socialAction) => !$socialAction->isDesactivated($comparisonDate);
+
+        return match ($actions instanceof ReadableCollection) {
+            true => $actions->filter($filterFn),
+            false => array_filter($actions, $filterFn)
+        };
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
index 675a1a923..12e1c1742 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
@@ -11,7 +11,6 @@ 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;
@@ -20,7 +19,9 @@ use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_person_social_issue")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "social_issue": SocialIssue::class
  * })
@@ -28,21 +29,25 @@ use Symfony\Component\Serializer\Annotation\Groups;
 class SocialIssue
 {
     /**
+     * @var Collection<SocialIssue>
+     *
      * @ORM\OneToMany(targetEntity=SocialIssue::class, mappedBy="parent")
      */
-    private $children;
+    private Collection $children;
 
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private $desactivationDate;
+    private ?\DateTimeInterface $desactivationDate = null;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="float", name="ordering", options={"default": 0.0})
@@ -52,18 +57,21 @@ class SocialIssue
     /**
      * @ORM\ManyToOne(targetEntity=SocialIssue::class, inversedBy="children")
      */
-    private $parent;
+    private ?\Chill\PersonBundle\Entity\SocialWork\SocialIssue $parent = null;
 
     /**
+     * @var Collection<SocialAction>
+     *
      * @ORM\OneToMany(targetEntity=SocialAction::class, mappedBy="issue")
      */
-    private $socialActions;
+    private Collection $socialActions;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Groups({"read"})
      */
-    private $title = [];
+    private array $title = [];
 
     public function __construct()
     {
@@ -74,8 +82,6 @@ class SocialIssue
     /**
      * @internal use @see{SocialIssue::setParent} instead
      *
-     * @param SocialIssue $child
-     *
      * @return $this
      */
     public function addChild(self $child): self
@@ -91,7 +97,7 @@ class SocialIssue
     {
         if (!$this->socialActions->contains($socialAction)) {
             $this->socialActions[] = $socialAction;
-            $socialAction->setSocialIssue($this);
+            $socialAction->setIssue($this);
         }
 
         return $this;
@@ -109,7 +115,7 @@ class SocialIssue
      *
      * @return Collection|SocialIssue[]
      */
-    public static function findAncestorSocialIssues(Collection $socialIssues): Collection
+    public static function findAncestorSocialIssues(array|\Doctrine\Common\Collections\Collection $socialIssues): Collection
     {
         $ancestors = new ArrayCollection();
 
@@ -162,7 +168,7 @@ class SocialIssue
         return $this->children;
     }
 
-    public function getDesactivationDate(): ?DateTimeInterface
+    public function getDesactivationDate(): ?\DateTimeInterface
     {
         return $this->desactivationDate;
     }
@@ -224,7 +230,7 @@ class SocialIssue
     /**
      * @param array|SocialIssue[] $socialIssues
      */
-    public static function getDescendantsWithThisForIssues(array $socialIssues): Collection
+    public static function getDescendantsWithThisForIssues(array|Collection $socialIssues): Collection
     {
         $unique = [];
 
@@ -253,8 +259,8 @@ class SocialIssue
     }
 
     /**
-     * @return Collection|SocialAction[] All the descendant social actions of all
-     * the descendants of the entity
+     * @return Collection<SocialAction> All the descendant social actions of all
+     *                                  the descendants of the entity
      */
     public function getRecursiveSocialActions(): Collection
     {
@@ -272,7 +278,7 @@ class SocialIssue
     }
 
     /**
-     * @return Collection|SocialAction[]
+     * @return Collection<SocialAction>
      */
     public function getSocialActions(): Collection
     {
@@ -327,15 +333,15 @@ class SocialIssue
     {
         if ($this->socialActions->removeElement($socialAction)) {
             // set the owning side to null (unless already changed)
-            if ($socialAction->getSocialIssue() === $this) {
-                $socialAction->setSocialIssue(null);
+            if ($socialAction->getIssue() === $this) {
+                $socialAction->setIssue(null);
             }
         }
 
         return $this;
     }
 
-    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
     {
         $this->desactivationDate = $desactivationDate;
 
diff --git a/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php b/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
index f4a8f6520..cf15018fd 100644
--- a/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
+++ b/src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
@@ -15,29 +15,21 @@ use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use DateTimeImmutable;
 use Symfony\Contracts\EventDispatcher\Event;
 
 class PersonAddressMoveEvent extends Event
 {
-    public const PERSON_MOVE_POST = 'chill_person.person_move_post';
+    final public const PERSON_MOVE_POST = 'chill_person.person_move_post';
 
     private ?Address $nextAddress = null;
 
     private ?HouseholdMember $nextMembership = null;
 
-    private Person $person;
-
     private ?Address $previousAddress = null;
 
     private ?HouseholdMember $previousMembership = null;
 
-    public function __construct(
-        Person $person
-    ) {
-        $this->person = $person;
-    }
+    public function __construct(private readonly Person $person) {}
 
     /**
      * Get the date of the move.
@@ -48,7 +40,7 @@ class PersonAddressMoveEvent extends Event
      * * or the date of the move
      * * or the date when the household leaving take place (the end date of the previous membership)
      */
-    public function getMoveDate(): DateTimeImmutable
+    public function getMoveDate(): \DateTimeImmutable
     {
         if ($this->personLeaveWithoutHousehold()) {
             return $this->getPreviousMembership()->getEndDate();
@@ -59,7 +51,7 @@ class PersonAddressMoveEvent extends Event
         }
 
         // person is changing address without household
-        return DateTimeImmutable::createFromMutable($this->getNextAddress()->getValidFrom());
+        return \DateTimeImmutable::createFromMutable($this->getNextAddress()->getValidFrom());
     }
 
     public function getNextAddress(): ?Address
@@ -67,8 +59,7 @@ class PersonAddressMoveEvent extends Event
         if (null !== $this->getNextMembership()) {
             return $this->getNextMembership()->getHousehold()
                 ->getCurrentAddress(
-                    $this->getMoveDate() === null ? null :
-                            DateTime::createFromImmutable($this->getMoveDate())
+                    \DateTime::createFromImmutable($this->getMoveDate())
                 );
         }
 
@@ -99,8 +90,7 @@ class PersonAddressMoveEvent extends Event
         if (null !== $this->getPreviousMembership()) {
             return $this->getPreviousMembership()->getHousehold()
                 ->getCurrentAddress(
-                    null === $this->getMoveDate() ? null :
-                        DateTime::createFromImmutable($this->getMoveDate())
+                    \DateTime::createFromImmutable($this->getMoveDate())
                 );
         }
 
@@ -172,7 +162,7 @@ class PersonAddressMoveEvent extends Event
     /**
      * Will the change affect this date ?
      */
-    public function willChangeBeActiveAt(DateTimeImmutable $date): bool
+    public function willChangeBeActiveAt(\DateTimeImmutable $date): bool
     {
         if ($this->getMoveDate() < $date && $this->personLeaveWithoutHousehold()) {
             return true;
diff --git a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
index 2e3a3aaef..c6b366fc8 100644
--- a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
+++ b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php
@@ -17,12 +17,7 @@ use Symfony\Component\Security\Core\Security;
 
 class AccompanyingPeriodWorkEventListener
 {
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private readonly Security $security) {}
 
     public function prePersistAccompanyingPeriodWork(AccompanyingPeriodWork $work): void
     {
diff --git a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
index 1d1fcb4b0..e94c6e923 100644
--- a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
+++ b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
@@ -14,8 +14,6 @@ namespace Chill\PersonBundle\EventListener;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
 
-use const MB_CASE_TITLE;
-
 class PersonEventListener
 {
     public function prePersistAltName(PersonAltName $altname)
@@ -26,7 +24,7 @@ class PersonEventListener
 
     public function prePersistPerson(Person $person): void
     {
-        $firstnameCaps = mb_convert_case(mb_strtolower($person->getFirstName()), MB_CASE_TITLE, 'UTF-8');
+        $firstnameCaps = mb_convert_case(mb_strtolower($person->getFirstName()), \MB_CASE_TITLE, 'UTF-8');
         $firstnameCaps = ucwords(strtolower($firstnameCaps), " \t\r\n\f\v'-");
         $person->setFirstName($firstnameCaps);
 
diff --git a/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php b/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
index 730aa84d3..d0e610687 100644
--- a/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
+++ b/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
@@ -12,29 +12,25 @@ 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
+     * @throws \LogicException if the "person" alias is not present and attaching accompanying period is not possible
      */
     protected function addJoinAccompanyingPeriod(QueryBuilder $query): void
     {
-        if (false === in_array('person', $query->getAllAliases(), true)) {
-            throw new LogicException("the alias 'person' does not exists in "
-                . 'query builder');
+        if (false === \in_array('person', $query->getAllAliases(), true)) {
+            throw new \LogicException("the alias 'person' does not exists in ".'query builder');
         }
 
-        if (!in_array('acppart', $query->getAllAliases(), true)) {
+        if (!\in_array('acppart', $query->getAllAliases(), true)) {
             $query->join('person.accompanyingPeriodParticipations', 'acppart');
         }
 
-        if (!in_array('acp', $query->getAllAliases(), true)) {
+        if (!\in_array('acp', $query->getAllAliases(), true)) {
             $query->join('acppart.accompanyingPeriod', 'acp');
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
index 96deac574..522b2ecdd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
@@ -17,21 +17,10 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class AdministrativeLocationAggregator implements AggregatorInterface
 {
-    private LocationRepository $locationRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        LocationRepository $locationRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->locationRepository = $locationRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly LocationRepository $locationRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -40,7 +29,7 @@ class AdministrativeLocationAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acploc', $qb->getAllAliases(), true)) {
+        if (!\in_array('acploc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.administrativeLocation', 'acploc');
         }
 
@@ -58,6 +47,11 @@ class AdministrativeLocationAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
@@ -71,7 +65,7 @@ class AdministrativeLocationAggregator implements AggregatorInterface
 
             $l = $this->locationRepository->find($value);
 
-            return $l->getName() . ' (' . $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ')';
+            return $l->getName().' ('.$this->translatableStringHelper->localize($l->getLocationType()->getTitle()).')';
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php
index 2dffccbbb..8f4797302 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php
@@ -26,7 +26,7 @@ class ByActionNumberAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data): void
     {
-        $qb->addSelect('(SELECT COUNT(acp_by_action_action.id) FROM ' . AccompanyingPeriodWork::class . ' acp_by_action_action WHERE acp_by_action_action.accompanyingPeriod = acp) AS acp_by_action_number_aggregator')
+        $qb->addSelect('(SELECT COUNT(acp_by_action_action.id) FROM '.AccompanyingPeriodWork::class.' acp_by_action_action WHERE acp_by_action_action.accompanyingPeriod = acp) AS acp_by_action_number_aggregator')
             ->addGroupBy('acp_by_action_number_aggregator');
     }
 
@@ -40,6 +40,11 @@ class ByActionNumberAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return static function ($value) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
index 342958361..259d5fb66 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
@@ -20,17 +20,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ClosingMotiveAggregator implements AggregatorInterface
 {
-    private ClosingMotiveRepositoryInterface $motiveRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        ClosingMotiveRepositoryInterface $motiveRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->motiveRepository = $motiveRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly ClosingMotiveRepositoryInterface $motiveRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -53,6 +43,11 @@ class ClosingMotiveAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
index e9b9e28fa..0e3e5f735 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
@@ -14,19 +14,12 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ConfidentialAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -49,6 +42,11 @@ class ConfidentialAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
@@ -56,16 +54,11 @@ class ConfidentialAggregator implements AggregatorInterface
                 return 'Confidentiality';
             }
 
-            switch ($value) {
-                case true:
-                    return $this->translator->trans('is confidential');
-
-                case false:
-                    return $this->translator->trans('is not confidential');
-
-                default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
-            }
+            return match ($value) {
+                true => $this->translator->trans('is confidential'),
+                false => $this->translator->trans('is not confidential'),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
+            };
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php
index c336a8887..32afe5247 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php
@@ -11,27 +11,24 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CreatorJobAggregator implements AggregatorInterface
 {
-    private UserJobRepository $jobRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'acp_agg_creator_job';
 
     public function __construct(
-        UserJobRepository $jobRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->jobRepository = $jobRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly UserJobRepository $jobRepository,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -40,12 +37,41 @@ class CreatorJobAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acp_creator', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('acp.createdBy', 'acp_creator');
-        }
+        $p = self::PREFIX;
 
-        $qb->addSelect('IDENTITY(acp_creator.userJob) AS acp_creator_job_aggregator')
-            ->addGroupBy('acp_creator_job_aggregator');
+        $qb
+            ->leftJoin(
+                'acp.userHistories',
+                "{$p}_userHistory",
+                Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
+                    $qb->expr()->andX(
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
+                        )
+                    )
+                )
+            )
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_jobHistory",
+                Expr\Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_jobHistory.user", "{$p}_userHistory.createdBy"), // et si il est null ?
+                    $qb->expr()->andX(
+                        $qb->expr()->lte("{$p}_jobHistory.startDate", "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_jobHistory.endDate"),
+                            $qb->expr()->gt("{$p}_jobHistory.endDate", "{$p}_userHistory.startDate")
+                        )
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_jobHistory.job) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
     public function applyOn(): string
@@ -53,9 +79,11 @@ class CreatorJobAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // No form needed
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -77,11 +105,11 @@ class CreatorJobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['acp_creator_job_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
     {
-        return 'Group by creator job';
+        return 'export.aggregator.course.by_creator_job.Group by creator job';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
index 0dc66e81e..5d0b0e87f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
@@ -13,14 +13,12 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
-use DateTimeImmutable;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-final class DurationAggregator implements AggregatorInterface
+final readonly class DurationAggregator implements AggregatorInterface
 {
     private const CHOICES = [
         'month',
@@ -28,12 +26,7 @@ final class DurationAggregator implements AggregatorInterface
         'day',
     ];
 
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -42,29 +35,16 @@ final class DurationAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        switch ($data['precision']) {
-            case 'day':
-                $qb->addSelect('(COALESCE(acp.closingDate, :now) - acp.openingDate)  AS duration_aggregator');
-
-                break;
-
-            case 'week':
-                $qb->addSelect('(COALESCE(acp.closingDate, :now) - acp.openingDate) / 7  AS duration_aggregator');
-
-                break;
-
-            case 'month':
-                $qb->addSelect('(EXTRACT (MONTH FROM AGE(COALESCE(acp.closingDate, :now), acp.openingDate)) * 12 +
-                    EXTRACT (MONTH FROM AGE(COALESCE(acp.closingDate, :now), acp.openingDate))) AS duration_aggregator');
-
-                break;
-
-            default:
-                throw new LogicException('precision not supported: ' . $data['precision']);
-        }
+        match ($data['precision']) {
+            'day' => $qb->addSelect('(COALESCE(acp.closingDate, :now) - acp.openingDate)  AS duration_aggregator'),
+            'week' => $qb->addSelect('(COALESCE(acp.closingDate, :now) - acp.openingDate) / 7  AS duration_aggregator'),
+            'month' => $qb->addSelect('(EXTRACT (MONTH FROM AGE(COALESCE(acp.closingDate, :now), acp.openingDate)) * 12 +
+                    EXTRACT (MONTH FROM AGE(COALESCE(acp.closingDate, :now), acp.openingDate))) AS duration_aggregator'),
+            default => throw new \LogicException('precision not supported: '.$data['precision']),
+        };
 
         $qb
-            ->setParameter('now', new DateTimeImmutable('now'))
+            ->setParameter('now', new \DateTimeImmutable('now'))
             ->addGroupBy('duration_aggregator')
             ->addOrderBy('duration_aggregator');
     }
@@ -79,17 +59,22 @@ final class DurationAggregator implements AggregatorInterface
         $builder->add('precision', ChoiceType::class, [
             'choices' => array_combine(self::CHOICES, self::CHOICES),
             'label' => 'export.aggregator.course.duration.Precision',
-            'choice_label' => static fn (string $c) => 'export.aggregator.course.duration.' . $c,
+            'choice_label' => static fn (string $c) => 'export.aggregator.course.duration.'.$c,
             'multiple' => false,
             'expanded' => true,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return static function ($value) use ($data) {
             if ('_header' === $value) {
-                return 'export.aggregator.course.duration.' . $data['precision'];
+                return 'export.aggregator.course.duration.'.$data['precision'];
             }
 
             if (null === $value) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
index 02f9f5cd9..0217166d2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
@@ -14,19 +14,12 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class EmergencyAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -49,6 +42,11 @@ class EmergencyAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
@@ -56,16 +54,11 @@ class EmergencyAggregator implements AggregatorInterface
                 return 'Emergency';
             }
 
-            switch ($value) {
-                case true:
-                    return $this->translator->trans('is emergency');
-
-                case false:
-                    return $this->translator->trans('is not emergency');
-
-                default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
-            }
+            return match ($value) {
+                true => $this->translator->trans('is emergency'),
+                false => $this->translator->trans('is not emergency'),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
+            };
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
index b6436efc0..a90896ccd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
@@ -17,21 +17,10 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class EvaluationAggregator implements AggregatorInterface
+final readonly class EvaluationAggregator implements AggregatorInterface
 {
-    private EvaluationRepository $evaluationRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        EvaluationRepository $evaluationRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->evaluationRepository = $evaluationRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private EvaluationRepository $evaluationRepository, private TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -40,11 +29,11 @@ final class EvaluationAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.works', 'acpw');
         }
 
-        if (!in_array('workeval', $qb->getAllAliases(), true)) {
+        if (!\in_array('workeval', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
         }
 
@@ -62,6 +51,11 @@ final class EvaluationAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
index 80781b823..25205d46a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -25,25 +25,10 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use UnexpectedValueException;
 
-final class GeographicalUnitStatAggregator implements AggregatorInterface
+final readonly class GeographicalUnitStatAggregator implements AggregatorInterface
 {
-    private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->geographicalUnitLayerRepository = $geographicalUnitLayerRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private TranslatableStringHelperInterface $translatableStringHelper, private RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -98,7 +83,7 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
             'acp_geog_units'
         );
 
-        $qb->andWhere($qb->expr()->eq('acp_geog_units.layer', ':acp_geog_unit_layer'));
+        $qb->andWhere($qb->expr()->in('acp_geog_units.layer', ':acp_geog_unit_layer'));
 
         $qb->setParameter('acp_geog_unit_layer', $data['level']);
 
@@ -121,51 +106,50 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'Compute geographical location at date',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ])
             ->add('level', EntityType::class, [
                 'label' => 'Geographical layer',
                 'placeholder' => 'Select a geographical layer',
                 'class' => GeographicalUnitLayer::class,
                 'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
-                'choice_label' => function (GeographicalUnitLayer $item) {
-                    return $this->translatableStringHelper->localize($item->getName());
-                },
+                'choice_label' => fn (GeographicalUnitLayer $item) => $this->translatableStringHelper->localize($item->getName()),
+                'multiple' => true,
+                'expanded' => true,
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
-            case 'acp_geog_agg_unitname':
-                return static function ($value): string {
-                    if ('_header' === $value) {
-                        return 'acp_geog_agg_unitname';
-                    }
+        return match ($key) {
+            'acp_geog_agg_unitname' => static function ($value): string {
+                if ('_header' === $value) {
+                    return 'acp_geog_agg_unitname';
+                }
 
-                    if (null === $value || '' === $value) {
-                        return '';
-                    }
+                if (null === $value || '' === $value) {
+                    return '';
+                }
 
-                    return $value;
-                };
+                return $value;
+            },
+            'acp_geog_agg_unitrefid' => static function ($value): string {
+                if ('_header' === $value) {
+                    return 'acp_geog_agg_unitrefid';
+                }
 
-            case 'acp_geog_agg_unitrefid':
-                return static function ($value): string {
-                    if ('_header' === $value) {
-                        return 'acp_geog_agg_unitrefid';
-                    }
+                if (null === $value) {
+                    return '';
+                }
 
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-
-            default:
-                throw new UnexpectedValueException('this value should not happens');
-        }
+                return $value;
+            },
+            default => throw new \UnexpectedValueException('this value should not happens'),
+        };
     }
 
     public function getQueryKeys($data): array
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
index a3618f40f..de42039c1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
@@ -14,19 +14,12 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class IntensityAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -49,6 +42,11 @@ class IntensityAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
@@ -56,16 +54,11 @@ class IntensityAggregator implements AggregatorInterface
                 return 'Intensity';
             }
 
-            switch ($value) {
-                case 'occasional':
-                    return $this->translator->trans('is occasional');
-
-                case 'regular':
-                    return $this->translator->trans('is regular');
-
-                default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
-            }
+            return match ($value) {
+                'occasional' => $this->translator->trans('is occasional'),
+                'regular' => $this->translator->trans('is regular'),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
+            };
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php
new file mode 100644
index 000000000..69f443300
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php
@@ -0,0 +1,110 @@
+<?php
+
+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 Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Entity\User\UserJobHistory;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface
+{
+    private const PREFIX = 'acp_agg_user_job_working_on_course';
+
+    public function __construct(
+        private UserJobRepositoryInterface $userJobRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {}
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $p = self::PREFIX;
+
+        $qb
+            ->leftJoin(
+                AccompanyingPeriodInfo::class,
+                'acpinfo',
+                Join::WITH,
+                $qb->expr()->eq('IDENTITY(acpinfo.accompanyingPeriod)', 'acp.id')
+            )
+            ->leftJoin('acpinfo.user', "{$p}_user")
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // job_at based on _info.infoDate
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'acpinfo.infoDate'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'acpinfo.infoDate')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
+    {
+        return function (null|int|string $jobId) {
+            if (null === $jobId || '' === $jobId) {
+                return '';
+            }
+
+            if ('_header' === $jobId) {
+                return 'export.aggregator.course.by_job_working.job';
+            }
+
+            if (null === $job = $this->userJobRepository->find((int) $jobId)) {
+                return '';
+            }
+
+            return $this->translatableStringHelper->localize($job->getLabel());
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return [self::PREFIX.'_select'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.course.by_job_working.title';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
index 37d0c7b20..6061f36ca 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
@@ -19,20 +19,16 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 final class OriginAggregator implements AggregatorInterface
 {
-    private EntityRepository $repository;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private readonly EntityRepository $repository;
 
     public function __construct(
         EntityManagerInterface $em,
-        TranslatableStringHelper $translatableStringHelper
+        private readonly TranslatableStringHelper $translatableStringHelper
     ) {
         $this->repository = $em->getRepository(Origin::class);
-        $this->translatableStringHelper = $translatableStringHelper;
     }
 
     public function addRole(): ?string
@@ -42,7 +38,7 @@ final class OriginAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acporigin', $qb->getAllAliases(), true)) {
+        if (!\in_array('acporigin', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.origin', 'acporigin');
         }
 
@@ -60,6 +56,11 @@ final class OriginAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
index a09097fd2..823b10d86 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
@@ -21,27 +21,13 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-final class ReferrerAggregator implements AggregatorInterface
+final readonly class ReferrerAggregator implements AggregatorInterface
 {
     private const A = 'acp_ref_agg_uhistory';
 
     private const P = 'acp_ref_agg_date';
 
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private UserRender $userRender;
-
-    private UserRepository $userRepository;
-
-    public function __construct(
-        UserRepository $userRepository,
-        UserRender $userRender,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private UserRepository $userRepository, private UserRender $userRender, private RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -51,17 +37,17 @@ final class ReferrerAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb
-            ->addSelect('IDENTITY(' . self::A . '.user) AS referrer_aggregator')
+            ->addSelect('IDENTITY('.self::A.'.user) AS referrer_aggregator')
             ->addGroupBy('referrer_aggregator')
             ->leftJoin('acp.userHistories', self::A)
             ->andWhere(
                 $qb->expr()->orX(
                     $qb->expr()->isNull(self::A),
                     $qb->expr()->andX(
-                        $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
+                        $qb->expr()->lte(self::A.'.startDate', ':'.self::P),
                         $qb->expr()->orX(
-                            $qb->expr()->isNull(self::A . '.endDate'),
-                            $qb->expr()->gt(self::A . '.endDate', ':' . self::P)
+                            $qb->expr()->isNull(self::A.'.endDate'),
+                            $qb->expr()->gt(self::A.'.endDate', ':'.self::P)
                         )
                     )
                 )
@@ -81,12 +67,16 @@ final class ReferrerAggregator implements AggregatorInterface
     {
         $builder
             ->add('date_calc', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
                 'label' => 'export.aggregator.course.by_referrer.Computation date for referrer',
                 'required' => true,
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
index ccbd21da1..9f58b6539 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
@@ -11,36 +11,23 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class ReferrerScopeAggregator implements AggregatorInterface
+readonly class ReferrerScopeAggregator implements AggregatorInterface
 {
-    private const SCOPE_KEY = 'acp_agg_refscope_user_history_ref_scope_name';
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
+    private const PREFIX = 'acp_agg_referrer_scope';
 
     public function __construct(
-        ScopeRepositoryInterface $scopeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+        private ScopeRepositoryInterface $scopeRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {}
 
     public function addRole(): ?string
     {
@@ -49,49 +36,53 @@ class ReferrerScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $userHistory = 'acp_agg_refscope_user_history';
-        $ref = 'acp_agg_refscope_user_history_ref';
-        $scopeName = self::SCOPE_KEY;
-        $dateCalc = 'acp_agg_refscope_user_history_date_calc';
+        $p = self::PREFIX;
 
         $qb
-            ->leftJoin('acp.userHistories', $userHistory)
-            ->leftJoin($userHistory . '.user', $ref)
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull($userHistory),
+            ->leftJoin(
+                'acp.userHistories',
+                "{$p}_userHistory",
+                Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
                     $qb->expr()->andX(
-                        $qb->expr()->lte($userHistory . '.startDate', ':' . $dateCalc),
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
                         $qb->expr()->orX(
-                            $qb->expr()->isNull($userHistory . '.endDate'),
-                            $qb->expr()->gt($userHistory . '.endDate', ':' . $dateCalc)
+                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
                         )
                     )
                 )
             )
-            ->setParameter(
-                $dateCalc,
-                $this->rollingDateConverter->convert($data['date_calc'])
-            );
-
-        // add groups
-        $qb
-            ->addSelect('IDENTITY(' . $ref . '.mainScope) AS ' . $scopeName)
-            ->addGroupBy($scopeName);
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_scopeHistory",
+                Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_scopeHistory.user", "{$p}_userHistory.user"),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte("{$p}_scopeHistory.startDate", "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_scopeHistory.endDate"),
+                            $qb->expr()->gt("{$p}_scopeHistory.endDate", "{$p}_userHistory.startDate")
+                        )
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_scopeHistory.scope) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        $builder->add('date_calc', PickRollingDateType::class, [
-            'data' => new RollingDate(RollingDate::T_TODAY),
-            'label' => 'export.aggregator.course.by_user_scope.Computation date for referrer',
-            'required' => true,
-        ]);
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -108,19 +99,19 @@ class ReferrerScopeAggregator implements AggregatorInterface
             $scope = $this->scopeRepository->find($value);
 
             if (null === $scope) {
-                throw new LogicException('no scope found with this id: ' . $value);
+                throw new \LogicException('no scope found with this id: '.$value);
             }
 
             return $this->translatableStringHelper->localize($scope->getName());
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
-        return [self::SCOPE_KEY];
+        return [self::PREFIX.'_select'];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
         return 'export.aggregator.course.by_user_scope.Group course by referrer\'s scope';
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
index 7b5cf0edd..ec168ceaf 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php
@@ -16,17 +16,10 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
-final class RequestorAggregator implements AggregatorInterface
+final readonly class RequestorAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-    }
+    public function __construct(private TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -35,7 +28,7 @@ final class RequestorAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acppart', $qb->getAllAliases(), true)) {
+        if (!\in_array('acppart', $qb->getAllAliases(), true)) {
             $qb->join('acp.participations', 'acppart');
         }
 
@@ -70,6 +63,11 @@ final class RequestorAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
index 8f34661bb..06dbc906d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
@@ -17,21 +17,10 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class ScopeAggregator implements AggregatorInterface
+final readonly class ScopeAggregator implements AggregatorInterface
 {
-    private ScopeRepository $scopeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        ScopeRepository $scopeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private ScopeRepository $scopeRepository, private TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -40,7 +29,7 @@ final class ScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpscope', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpscope', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.scopes', 'acpscope');
         }
 
@@ -58,6 +47,11 @@ final class ScopeAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
@@ -86,6 +80,6 @@ final class ScopeAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group course by scope';
+        return 'export.aggregator.course.by_scope.Group course by scope';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php
new file mode 100644
index 000000000..8b3466158
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php
@@ -0,0 +1,110 @@
+<?php
+
+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 Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Entity\User\UserScopeHistory;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterface
+{
+    private const PREFIX = 'acp_agg_user_scope_working_on_course';
+
+    public function __construct(
+        private ScopeRepositoryInterface $scopeRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {}
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $p = self::PREFIX;
+
+        $qb
+            ->leftJoin(
+                AccompanyingPeriodInfo::class,
+                'acpinfo',
+                Join::WITH,
+                $qb->expr()->eq('IDENTITY(acpinfo.accompanyingPeriod)', 'acp.id')
+            )
+            ->leftJoin('acpinfo.user', "{$p}_user")
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // scope_at based on _info.infoDate
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", 'acpinfo.infoDate'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", 'acpinfo.infoDate')
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
+    {
+        return function (null|int|string $scopeId) {
+            if (null === $scopeId || '' === $scopeId) {
+                return '';
+            }
+
+            if ('_header' === $scopeId) {
+                return 'export.aggregator.course.by_scope_working.scope';
+            }
+
+            if (null === $scope = $this->scopeRepository->find((int) $scopeId)) {
+                return '';
+            }
+
+            return $this->translatableStringHelper->localize($scope->getName());
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return [self::PREFIX.'_select'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.course.by_scope_working.title';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
index 3bdd6549e..7abad2602 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
@@ -17,21 +17,10 @@ use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class SocialActionAggregator implements AggregatorInterface
+final readonly class SocialActionAggregator implements AggregatorInterface
 {
-    private SocialActionRender $actionRender;
-
-    private SocialActionRepository $actionRepository;
-
-    public function __construct(
-        SocialActionRender $actionRender,
-        SocialActionRepository $actionRepository
-    ) {
-        $this->actionRender = $actionRender;
-        $this->actionRepository = $actionRepository;
-    }
+    public function __construct(private SocialActionRender $actionRender, private SocialActionRepository $actionRepository) {}
 
     public function addRole(): ?string
     {
@@ -40,7 +29,7 @@ final class SocialActionAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             // here, we will only see accompanying period linked with a socialAction
             $qb->join('acp.works', 'acpw');
         }
@@ -59,6 +48,11 @@ final class SocialActionAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
index 12fa5a454..8c0cbfbd5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
@@ -17,21 +17,10 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class SocialIssueAggregator implements AggregatorInterface
+final readonly class SocialIssueAggregator implements AggregatorInterface
 {
-    private SocialIssueRender $issueRender;
-
-    private SocialIssueRepository $issueRepository;
-
-    public function __construct(
-        SocialIssueRepository $issueRepository,
-        SocialIssueRender $issueRender
-    ) {
-        $this->issueRepository = $issueRepository;
-        $this->issueRender = $issueRender;
-    }
+    public function __construct(private SocialIssueRepository $issueRepository, private SocialIssueRender $issueRender) {}
 
     public function addRole(): ?string
     {
@@ -40,7 +29,7 @@ final class SocialIssueAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpsocialissue', $qb->getAllAliases(), true)) {
             // we will see accompanying period linked with social issues
             $qb->join('acp.socialIssues', 'acpsocialissue');
         }
@@ -59,6 +48,11 @@ final class SocialIssueAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
index 84dbd4e69..dd5c26371 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
@@ -20,25 +20,14 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
-final class StepAggregator implements AggregatorInterface
+final readonly class StepAggregator implements AggregatorInterface
 {
     private const A = 'acpstephistories';
 
     private const P = 'acp_step_agg_date';
 
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter,
-        TranslatorInterface $translator
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-        $this->translator = $translator;
-    }
+    public function __construct(private RollingDateConverterInterface $rollingDateConverter, private TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -47,20 +36,20 @@ final class StepAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array(self::A, $qb->getAllAliases(), true)) {
+        if (!\in_array(self::A, $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.stepHistories', self::A);
         }
 
         $qb
-            ->addSelect(self::A . '.step AS step_aggregator')
+            ->addSelect(self::A.'.step AS step_aggregator')
             ->andWhere(
                 $qb->expr()->orX(
-                    $qb->expr()->isNull(self::A . '.step'),
+                    $qb->expr()->isNull(self::A.'.step'),
                     $qb->expr()->andX(
-                        $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
+                        $qb->expr()->lte(self::A.'.startDate', ':'.self::P),
                         $qb->expr()->orX(
-                            $qb->expr()->isNull(self::A . '.endDate'),
-                            $qb->expr()->lt(self::A . '.endDate', ':' . self::P)
+                            $qb->expr()->isNull(self::A.'.endDate'),
+                            $qb->expr()->lt(self::A.'.endDate', ':'.self::P)
                         )
                     )
                 )
@@ -76,9 +65,12 @@ final class StepAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('on_date', PickRollingDateType::class, [
-            'data' => new RollingDate(RollingDate::T_TODAY),
-        ]);
+        $builder->add('on_date', PickRollingDateType::class, []);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function getLabels($key, array $values, $data)
@@ -86,13 +78,19 @@ final class StepAggregator implements AggregatorInterface
         return function ($value): string {
             switch ($value) {
                 case AccompanyingPeriod::STEP_DRAFT:
-                    return $this->translator->trans('Draft');
+                    return $this->translator->trans('course.draft');
 
                 case AccompanyingPeriod::STEP_CONFIRMED:
-                    return $this->translator->trans('Confirmed');
+                    return $this->translator->trans('course.confirmed');
 
                 case AccompanyingPeriod::STEP_CLOSED:
-                    return $this->translator->trans('Closed');
+                    return $this->translator->trans('course.closed');
+
+                case AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT:
+                    return $this->translator->trans('course.inactive_short');
+
+                case AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG:
+                    return $this->translator->trans('course.inactive_long');
 
                 case '_header':
                     return 'Step';
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
index a8acdcf12..0702edf6f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
@@ -11,27 +11,23 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class UserJobAggregator implements AggregatorInterface
+final readonly class UserJobAggregator implements AggregatorInterface
 {
-    private UserJobRepository $jobRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'acp_agg_user_job';
 
     public function __construct(
-        UserJobRepository $jobRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->jobRepository = $jobRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private UserJobRepository $jobRepository,
+        private TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -40,12 +36,41 @@ final class UserJobAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpuser', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('acp.user', 'acpuser');
-        }
+        $p = self::PREFIX;
 
-        $qb->addSelect('IDENTITY(acpuser.userJob) AS job_aggregator');
-        $qb->addGroupBy('job_aggregator');
+        $qb
+            ->leftJoin(
+                'acp.userHistories',
+                "{$p}_userHistory",
+                Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
+                    $qb->expr()->andX(
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
+                        )
+                    )
+                )
+            )
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_jobHistory",
+                Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_jobHistory.user", "{$p}_userHistory.user"),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte("{$p}_jobHistory.startDate", "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_jobHistory.endDate"),
+                            $qb->expr()->gt("{$p}_jobHistory.endDate", "{$p}_userHistory.startDate")
+                        )
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_jobHistory.job) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
     public function applyOn(): string
@@ -53,9 +78,11 @@ final class UserJobAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // no form
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -69,7 +96,9 @@ final class UserJobAggregator implements AggregatorInterface
                 return '';
             }
 
-            $j = $this->jobRepository->find($value);
+            if (null === $j = $this->jobRepository->find($value)) {
+                return '';
+            }
 
             return $this->translatableStringHelper->localize(
                 $j->getLabel()
@@ -79,11 +108,11 @@ final class UserJobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['job_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
     {
-        return 'Group by user job';
+        return 'export.aggregator.course.by_user_job.Group by user job';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php
new file mode 100644
index 000000000..b27477fd8
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php
@@ -0,0 +1,99 @@
+<?php
+
+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 Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class UserWorkingOnCourseAggregator implements AggregatorInterface
+{
+    private const COLUMN_NAME = 'user_working_on_course_user_id';
+
+    public function __construct(
+        private UserRender $userRender,
+        private UserRepositoryInterface $userRepository,
+    ) {}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add here
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
+    {
+        return function (null|int|string $userId) {
+            if (null === $userId || '' === $userId) {
+                return '';
+            }
+
+            if ('_header' === $userId) {
+                return 'export.aggregator.course.by_user_working.user';
+            }
+
+            if (null === $user = $this->userRepository->find((int) $userId)) {
+                return '';
+            }
+
+            return $this->userRender->renderString($user, []);
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [self::COLUMN_NAME];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.course.by_user_working.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('acpinfo', $qb->getAllAliases(), true)) {
+            $qb->leftJoin(
+                AccompanyingPeriodInfo::class,
+                'acpinfo',
+                Join::WITH,
+                'acp.id = IDENTITY(acpinfo.accompanyingPeriod)'
+            );
+        }
+
+        if (!in_array('acpinfo_user', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('acpinfo.user', 'acpinfo_user');
+        }
+
+        $qb->addSelect('acpinfo_user.id AS '.self::COLUMN_NAME);
+        $qb->addGroupBy('acpinfo_user.id');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php
index 2f4275c49..07c182421 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php
@@ -14,12 +14,10 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
-class ByEndDateAggregator implements AggregatorInterface
+final class ByEndDateAggregator implements AggregatorInterface
 {
     private const CHOICES = [
         'by week' => 'week',
@@ -29,8 +27,6 @@ class ByEndDateAggregator implements AggregatorInterface
 
     private const DEFAULT_CHOICE = 'year';
 
-    private TranslatorInterface $translator;
-
     public function addRole(): ?string
     {
         return null;
@@ -38,25 +34,12 @@ class ByEndDateAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        switch ($data['frequency']) {
-            case 'week':
-                $fmt = 'YYYY-IW';
-
-                break;
-
-            case 'month':
-                $fmt = 'YYYY-MM';
-
-                break;
-
-            case 'year':
-                $fmt = 'YYYY';
-
-                break;
-
-            default:
-                throw new LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
-        }
+        $fmt = match ($data['frequency']) {
+            'week' => 'YYYY-IW',
+            'month' => 'YYYY-MM',
+            'year' => 'YYYY',
+            default => throw new \LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency'])),
+        };
 
         $qb->addSelect(sprintf("TO_CHAR(workeval.endDate, '%s') AS eval_by_end_date_aggregator", $fmt));
         $qb->addGroupBy(' eval_by_end_date_aggregator');
@@ -75,10 +58,14 @@ class ByEndDateAggregator implements AggregatorInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['frequency' => self::DEFAULT_CHOICE];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return static function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php
index 9283fd9dc..9193dc5a9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php
@@ -14,12 +14,10 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
-class ByMaxDateAggregator implements AggregatorInterface
+final class ByMaxDateAggregator implements AggregatorInterface
 {
     private const CHOICES = [
         'by week' => 'week',
@@ -29,8 +27,6 @@ class ByMaxDateAggregator implements AggregatorInterface
 
     private const DEFAULT_CHOICE = 'year';
 
-    private TranslatorInterface $translator;
-
     public function addRole(): ?string
     {
         return null;
@@ -38,25 +34,12 @@ class ByMaxDateAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        switch ($data['frequency']) {
-            case 'week':
-                $fmt = 'YYYY-IW';
-
-                break;
-
-            case 'month':
-                $fmt = 'YYYY-MM';
-
-                break;
-
-            case 'year':
-                $fmt = 'YYYY';
-
-                break;
-
-            default:
-                throw new LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
-        }
+        $fmt = match ($data['frequency']) {
+            'week' => 'YYYY-IW',
+            'month' => 'YYYY-MM',
+            'year' => 'YYYY',
+            default => throw new \LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency'])),
+        };
 
         $qb->addSelect(sprintf("TO_CHAR(workeval.maxDate, '%s') AS eval_by_max_date_aggregator", $fmt));
         $qb->addGroupBy(' eval_by_max_date_aggregator');
@@ -75,10 +58,14 @@ class ByMaxDateAggregator implements AggregatorInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['frequency' => self::DEFAULT_CHOICE];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return static function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
index cd183b25e..e797d5ae7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
@@ -14,12 +14,10 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
-class ByStartDateAggregator implements AggregatorInterface
+final class ByStartDateAggregator implements AggregatorInterface
 {
     private const CHOICES = [
         'by week' => 'week',
@@ -29,8 +27,6 @@ class ByStartDateAggregator implements AggregatorInterface
 
     private const DEFAULT_CHOICE = 'year';
 
-    private TranslatorInterface $translator;
-
     public function addRole(): ?string
     {
         return null;
@@ -38,25 +34,12 @@ class ByStartDateAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        switch ($data['frequency']) {
-            case 'week':
-                $fmt = 'YYYY-IW';
-
-                break;
-
-            case 'month':
-                $fmt = 'YYYY-MM';
-
-                break;
-
-            case 'year':
-                $fmt = 'YYYY';
-
-                break;
-
-            default:
-                throw new LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
-        }
+        $fmt = match ($data['frequency']) {
+            'week' => 'YYYY-IW',
+            'month' => 'YYYY-MM',
+            'year' => 'YYYY',
+            default => throw new \LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency'])),
+        };
 
         $qb->addSelect(sprintf("TO_CHAR(workeval.startDate, '%s') AS eval_by_start_date_aggregator", $fmt));
         $qb->addGroupBy(' eval_by_start_date_aggregator');
@@ -75,10 +58,14 @@ class ByStartDateAggregator implements AggregatorInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['frequency' => self::DEFAULT_CHOICE];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return static function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
index 0c13611cb..9ff2ad50a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
@@ -20,17 +20,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class EvaluationTypeAggregator implements AggregatorInterface
 {
-    private EvaluationRepository $evaluationRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        EvaluationRepository $evaluationRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->evaluationRepository = $evaluationRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly EvaluationRepository $evaluationRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -53,6 +43,11 @@ class EvaluationTypeAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php
index e33bb326f..4dfddab81 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php
@@ -14,18 +14,12 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HavingEndDateAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -49,6 +43,11 @@ class HavingEndDateAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
@@ -56,16 +55,11 @@ class HavingEndDateAggregator implements AggregatorInterface
                 return 'export.aggregator.eval.by_end_date.Has end date ?';
             }
 
-            switch ($value) {
-                case true:
-                    return $this->translator->trans('export.aggregator.eval.by_end_date.enddate is specified');
-
-                case false:
-                    return $this->translator->trans('export.aggregator.eval.by_end_date.enddate is not specified');
-
-                default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
-            }
+            return match ($value) {
+                true => $this->translator->trans('export.aggregator.eval.by_end_date.enddate is specified'),
+                false => $this->translator->trans('export.aggregator.eval.by_end_date.enddate is not specified'),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
+            };
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
index 0c9bc623f..b73b2e600 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
@@ -20,21 +20,10 @@ use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class ChildrenNumberAggregator implements AggregatorInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->translator = $translator;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly TranslatorInterface $translator, private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -43,7 +32,7 @@ class ChildrenNumberAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition_children', $qb->getAllAliases(), true)) {
+        if (!\in_array('composition_children', $qb->getAllAliases(), true)) {
             $clause = $qb->expr()->andX(
                 $qb->expr()->lte('composition_children.startDate', ':ondate_composition_children'),
                 $qb->expr()->orX(
@@ -72,9 +61,12 @@ class ChildrenNumberAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('on_date', PickRollingDateType::class, [
-            'data' => new RollingDate(RollingDate::T_TODAY),
-        ]);
+        $builder->add('on_date', PickRollingDateType::class, []);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function getLabels($key, array $values, $data)
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
index 52bcd88e5..3dc3a1398 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
@@ -21,25 +21,10 @@ use Chill\PersonBundle\Repository\Household\HouseholdCompositionTypeRepository;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CompositionAggregator implements AggregatorInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private HouseholdCompositionTypeRepository $typeRepository;
-
-    public function __construct(
-        HouseholdCompositionTypeRepository $typeRepository,
-        TranslatableStringHelper $translatableStringHelper,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->typeRepository = $typeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly HouseholdCompositionTypeRepository $typeRepository, private readonly TranslatableStringHelper $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -48,7 +33,7 @@ class CompositionAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition_type', $qb->getAllAliases(), true)) {
+        if (!\in_array('composition_type', $qb->getAllAliases(), true)) {
             $clause = $qb->expr()->andX(
                 $qb->expr()->lte('composition_type.startDate', ':ondate_composition_type'),
                 $qb->expr()->orX(
@@ -77,9 +62,12 @@ class CompositionAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('on_date', PickRollingDateType::class, [
-            'data' => new RollingDate(RollingDate::T_TODAY),
-        ]);
+        $builder->add('on_date', PickRollingDateType::class, []);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function getLabels($key, array $values, $data)
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
index 365a73704..2ca286b57 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
@@ -13,21 +13,18 @@ namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use DateTime;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
-final class AgeAggregator implements AggregatorInterface, ExportElementValidatedInterface
+final readonly class AgeAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
 
     public function addRole(): ?string
     {
@@ -37,7 +34,7 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('DATE_DIFF(:date_age_calculation, person.birthdate)/365 as person_age');
-        $qb->setParameter('date_age_calculation', $data['date_age_calculation']);
+        $qb->setParameter('date_age_calculation', $this->rollingDateConverter->convert($data['date_age_calculation']));
         $qb->addGroupBy('person_age');
     }
 
@@ -48,15 +45,16 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('date_age_calculation', DateType::class, [
+        $builder->add('date_age_calculation', PickRollingDateType::class, [
             'label' => 'Calculate age in relation to this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
-            'widget' => 'single_text',
-            'format' => 'dd-MM-yyyy',
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_age_calculation' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value) {
@@ -64,11 +62,7 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
                 return 'Age';
             }
 
-            if (null === $value) {
-                return $this->translator->trans('without data');
-            }
-
-            return $value;
+            return $value ?? '';
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
index 80f0faa17..af1018f6e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/ByHouseholdCompositionAggregator.php
@@ -27,21 +27,7 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
 {
     private const PREFIX = 'acp_by_household_compo_agg';
 
-    private HouseholdCompositionTypeRepositoryInterface $householdCompositionTypeRepository;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter,
-        HouseholdCompositionTypeRepositoryInterface $householdCompositionTypeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->householdCompositionTypeRepository = $householdCompositionTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter, private readonly HouseholdCompositionTypeRepositoryInterface $householdCompositionTypeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -94,10 +80,14 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
     {
         $builder->add('date_calc', PickRollingDateType::class, [
             'label' => 'export.aggregator.person.by_household_composition.Calc date',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value) {
@@ -119,7 +109,7 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
 
     public function getQueryKeys($data)
     {
-        return [self::PREFIX . '_select'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle()
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php
new file mode 100644
index 000000000..4881241f4
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php
@@ -0,0 +1,101 @@
+<?php
+
+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 Chill\PersonBundle\Export\Aggregator\PersonAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class CenterAggregator implements AggregatorInterface
+{
+    private const COLUMN_NAME = 'person_center_aggregator';
+
+    public function __construct(
+        private CenterRepositoryInterface $centerRepository,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('at_date', PickRollingDateType::class, [
+            'label' => 'export.aggregator.person.by_center.at_date',
+        ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'at_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
+    {
+        return function (null|int|string $value) {
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            if ('_header' === $value) {
+                return 'export.aggregator.person.by_center.center';
+            }
+
+            return (string) $this->centerRepository->find((int) $value)?->getName();
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [self::COLUMN_NAME];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.person.by_center.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $alias = 'pers_center_agg';
+        $atDate = 'pers_center_agg_at_date';
+
+        $qb->leftJoin('person.centerHistory', $alias);
+        $qb
+            ->andWhere(
+                $qb->expr()->lte($alias.'.startDate', ':'.$atDate),
+            )->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull($alias.'.endDate'),
+                    $qb->expr()->gt($alias.'.endDate', ':'.$atDate)
+                )
+            );
+        $qb->setParameter($atDate, $this->rollingDateConverter->convert($data['at_date']));
+
+        $qb->addSelect("IDENTITY({$alias}.center) AS ".self::COLUMN_NAME);
+        $qb->addGroupBy(self::COLUMN_NAME);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
index 395070a8a..b8d204dc5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CountryOfBirthAggregator.php
@@ -18,52 +18,36 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Util\CountriesInfo;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
-final class CountryOfBirthAggregator implements AggregatorInterface, ExportElementValidatedInterface
+final readonly class CountryOfBirthAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    private CountryRepository $countriesRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        CountryRepository $countriesRepository,
-        TranslatableStringHelper $translatableStringHelper,
-        TranslatorInterface $translator
-    ) {
-        $this->countriesRepository = $countriesRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-    }
+    public function __construct(private CountryRepository $countriesRepository, private TranslatableStringHelper $translatableStringHelper, private TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         // add a clause in select part
         if ('country' === $data['group_by_level']) {
             $qb->addSelect('countryOfBirth.countryCode as country_of_birth_aggregator');
         } 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\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_europe_codes) THEN \'EU\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_north_america_codes) THEN \'NA\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_south_america_codes) THEN \'SA\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_oceania_codes) THEN \'OC\' '
-                    . 'WHEN countryOfBirth.countryCode IN(:cob_antartica_codes) THEN \'AN\' '
-                    . 'ELSE \'\' '
-                    . 'END as country_of_birth_aggregator ';
+                    .'WHEN countryOfBirth.countryCode IN(:cob_africa_codes) THEN \'AF\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_asia_codes) THEN \'AS\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_europe_codes) THEN \'EU\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_north_america_codes) THEN \'NA\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_south_america_codes) THEN \'SA\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_oceania_codes) THEN \'OC\' '
+                    .'WHEN countryOfBirth.countryCode IN(:cob_antartica_codes) THEN \'AN\' '
+                    .'ELSE \'\' '
+                    .'END as country_of_birth_aggregator ';
             $qb->addSelect($clause);
             $params =
                     [
@@ -80,11 +64,10 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
                 $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.');
         }
 
-        if (!in_array('countryOfBirth', $qb->getAllAliases(), true)) {
+        if (!\in_array('countryOfBirth', $qb->getAllAliases(), true)) {
             $qb->leftJoin('person.countryOfBirth', 'countryOfBirth');
         }
 
@@ -109,6 +92,11 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         $labels = [];
@@ -147,9 +135,7 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
             ];
         }
 
-        return static function (string $value) use ($labels): string {
-            return $labels[$value];
-        };
+        return static fn (?string $value): string => $labels[(string) $value];
     }
 
     public function getQueryKeys($data)
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
index f76420047..0181c6e7b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GenderAggregator.php
@@ -15,18 +15,12 @@ use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-final class GenderAggregator implements AggregatorInterface
+final readonly class GenderAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -45,8 +39,11 @@ final class GenderAggregator implements AggregatorInterface
         return Declarations::PERSON_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -73,7 +70,7 @@ final class GenderAggregator implements AggregatorInterface
                     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));
             }
         };
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
index 6193f3c61..5b885eca4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/GeographicalUnitAggregator.php
@@ -20,27 +20,12 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class GeographicalUnitAggregator implements AggregatorInterface
 {
-    private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->geographicalUnitLayerRepository = $geographicalUnitLayerRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -93,19 +78,23 @@ class GeographicalUnitAggregator implements AggregatorInterface
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'Address valid at this date',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ])
             ->add('level', EntityType::class, [
                 'label' => 'Geographical layer',
                 'placeholder' => 'Select a geographical layer',
                 'class' => GeographicalUnitLayer::class,
                 'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
-                'choice_label' => function (GeographicalUnitLayer $item) {
-                    return $this->translatableStringHelper->localize($item->getName());
-                },
+                'choice_label' => fn (GeographicalUnitLayer $item) => $this->translatableStringHelper->localize($item->getName()),
+                'multiple' => true,
+                'expanded' => true,
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public static function getDefaultAlias(): string
     {
         return 'person_geog_agg';
@@ -113,36 +102,31 @@ class GeographicalUnitAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
-            case 'geog_unit_name':
-                return static function ($value): string {
-                    if ('_header' === $value) {
-                        return 'acp_geog_agg_unitname';
-                    }
+        return match ($key) {
+            'geog_unit_name' => static function ($value): string {
+                if ('_header' === $value) {
+                    return 'acp_geog_agg_unitname';
+                }
 
-                    if (null === $value) {
-                        return '';
-                    }
+                if (null === $value) {
+                    return '';
+                }
 
-                    return $value;
-                };
+                return $value;
+            },
+            'geog_unit_key' => static function ($value): string {
+                if ('_header' === $value) {
+                    return 'acp_geog_agg_unitrefid';
+                }
 
-            case 'geog_unit_key':
-                return static function ($value): string {
-                    if ('_header' === $value) {
-                        return 'acp_geog_agg_unitrefid';
-                    }
+                if (null === $value) {
+                    return '';
+                }
 
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-
-            default:
-                throw new LogicException('key not supported');
-        }
+                return $value;
+            },
+            default => throw new \LogicException('key not supported'),
+        };
     }
 
     public function getQueryKeys($data)
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
index 107634803..eb1e52d9b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
@@ -25,29 +25,10 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
-final class HouseholdPositionAggregator implements AggregatorInterface, ExportElementValidatedInterface
+final readonly class HouseholdPositionAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    private PositionRepository $positionRepository;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator,
-        TranslatableStringHelper $translatableStringHelper,
-        PositionRepository $positionRepository,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->translator = $translator;
-        $this->positionRepository = $positionRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private TranslatorInterface $translator, private TranslatableStringHelper $translatableStringHelper, private PositionRepository $positionRepository, private RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -56,11 +37,11 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('householdmember', $qb->getAllAliases(), true)) {
+        if (!\in_array('householdmember', $qb->getAllAliases(), true)) {
             $qb->join(HouseholdMember::class, 'householdmember', Expr\Join::WITH, 'householdmember.person = person');
         }
 
-        if (!in_array('center', $qb->getAllAliases(), true)) {
+        if (!\in_array('center', $qb->getAllAliases(), true)) {
             $qb->join('person.center', 'center');
         }
 
@@ -90,10 +71,14 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
     {
         $builder->add('date_position', PickRollingDateType::class, [
             'label' => 'Household position in relation to this date',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_position' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
index 08bde4bda..1555a5a12 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php
@@ -17,19 +17,10 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\MaritalStatusRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class MaritalStatusAggregator implements AggregatorInterface
+final readonly class MaritalStatusAggregator implements AggregatorInterface
 {
-    private MaritalStatusRepository $maritalStatusRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(MaritalStatusRepository $maritalStatusRepository, TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->maritalStatusRepository = $maritalStatusRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private MaritalStatusRepository $maritalStatusRepository, private TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -38,7 +29,7 @@ final class MaritalStatusAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('personmarital', $qb->getAllAliases(), true)) {
+        if (!\in_array('personmarital', $qb->getAllAliases(), true)) {
             $qb->join('person.maritalStatus', 'personmarital');
         }
 
@@ -56,6 +47,11 @@ final class MaritalStatusAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
index 1eced58d3..9daca5b34 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/NationalityAggregator.php
@@ -17,29 +17,14 @@ use Chill\MainBundle\Repository\CountryRepository;
 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\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-final class NationalityAggregator implements AggregatorInterface, ExportElementValidatedInterface
+final readonly class NationalityAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    private CountryRepository $countriesRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        CountryRepository $countriesRepository,
-        TranslatableStringHelper $translatableStringHelper,
-        TranslatorInterface $translator
-    ) {
-        $this->countriesRepository = $countriesRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-    }
+    public function __construct(private CountryRepository $countriesRepository, private TranslatableStringHelper $translatableStringHelper, private TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -53,15 +38,15 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
             $qb->addSelect('nationality.countryCode as nationality_aggregator');
         } elseif ('continent' === $data['group_by_level']) {
             $clause = 'CASE '
-                    . 'WHEN nationality.countryCode IN(:africa_codes) THEN \'AF\' '
-                    . 'WHEN nationality.countryCode IN(:asia_codes) THEN \'AS\' '
-                    . 'WHEN nationality.countryCode IN(:europe_codes) THEN \'EU\' '
-                    . 'WHEN nationality.countryCode IN(:north_america_codes) THEN \'NA\' '
-                    . 'WHEN nationality.countryCode IN(:south_america_codes) THEN \'SA\' '
-                    . 'WHEN nationality.countryCode IN(:oceania_codes) THEN \'OC\' '
-                    . 'WHEN nationality.countryCode IN(:antartica_codes) THEN \'AN\' '
-                    . 'ELSE \'\' '
-                    . 'END as nationality_aggregator ';
+                    .'WHEN nationality.countryCode IN(:africa_codes) THEN \'AF\' '
+                    .'WHEN nationality.countryCode IN(:asia_codes) THEN \'AS\' '
+                    .'WHEN nationality.countryCode IN(:europe_codes) THEN \'EU\' '
+                    .'WHEN nationality.countryCode IN(:north_america_codes) THEN \'NA\' '
+                    .'WHEN nationality.countryCode IN(:south_america_codes) THEN \'SA\' '
+                    .'WHEN nationality.countryCode IN(:oceania_codes) THEN \'OC\' '
+                    .'WHEN nationality.countryCode IN(:antartica_codes) THEN \'AN\' '
+                    .'ELSE \'\' '
+                    .'END as nationality_aggregator ';
             $qb->addSelect($clause);
             $params =
                     [
@@ -78,8 +63,7 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
                 $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');
@@ -103,6 +87,13 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'group_by_level' => 'country',
+        ];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         $labels = [];
@@ -141,9 +132,7 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
             ];
         }
 
-        return static function ($value) use ($labels): string {
-            return $labels[$value];
-        };
+        return static fn ($value): string => $labels[$value];
     }
 
     public function getQueryKeys($data)
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
index c1fccb968..9abf5c1e7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
@@ -18,31 +18,11 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class ActionTypeAggregator implements AggregatorInterface
+final readonly class ActionTypeAggregator implements AggregatorInterface
 {
-    private SocialActionRender $actionRender;
-
-    private SocialActionRepository $socialActionRepository;
-
-    private SocialIssueRender $socialIssueRender;
-
-    private SocialIssueRepository $socialIssueRepository;
-
-    public function __construct(
-        SocialActionRepository $socialActionRepository,
-        SocialActionRender $actionRender,
-        SocialIssueRender $socialIssueRender,
-        SocialIssueRepository $socialIssueRepository
-    ) {
-        $this->socialActionRepository = $socialActionRepository;
-        $this->actionRender = $actionRender;
-        $this->socialIssueRender = $socialIssueRender;
-        $this->socialIssueRepository = $socialIssueRepository;
-    }
+    public function __construct(private SocialActionRepository $socialActionRepository, private SocialActionRender $actionRender, private SocialIssueRender $socialIssueRender, private SocialIssueRepository $socialIssueRepository) {}
 
     public function addRole(): ?string
     {
@@ -51,11 +31,11 @@ final class ActionTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpwsocialaction', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpwsocialaction', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.socialAction', 'acpwsocialaction');
         }
 
-        if (!in_array('acpwsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpwsocialissue', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpwsocialaction.issue', 'acpwsocialissue');
         }
 
@@ -76,38 +56,38 @@ final class ActionTypeAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
-            case 'action_type_aggregator':
-                return function ($value): string {
-                    if ('_header' === $value) {
-                        return 'Social Action Type';
-                    }
+        return match ($key) {
+            'action_type_aggregator' => function ($value): string {
+                if ('_header' === $value) {
+                    return 'Social Action Type';
+                }
 
-                    if (null === $value || '' === $value || null === $sa = $this->socialActionRepository->find($value)) {
-                        return '';
-                    }
+                if (null === $value || '' === $value || null === $sa = $this->socialActionRepository->find($value)) {
+                    return '';
+                }
 
-                    return $this->actionRender->renderString($sa, []);
-                };
+                return $this->actionRender->renderString($sa, []);
+            },
+            'social_action_type_aggregator' => function ($value): string {
+                if ('_header' === $value) {
+                    return 'Social Issue';
+                }
 
-            case 'social_action_type_aggregator':
-                return function ($value): string {
-                    if ('_header' === $value) {
-                        return 'Social Issue';
-                    }
+                if (null === $value || null === $si = $this->socialIssueRepository->find($value)) {
+                    return '';
+                }
 
-                    if (null === $value || null === $si = $this->socialIssueRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->socialIssueRender->renderString($si, []);
-                };
-
-            default:
-                throw new LogicException('this key is not supported: ' . $key);
-        }
+                return $this->socialIssueRender->renderString($si, []);
+            },
+            default => throw new \LogicException('this key is not supported: '.$key),
+        };
     }
 
     public function getQueryKeys($data)
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php
index 58fcb2874..a9f8e020a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php
@@ -14,18 +14,12 @@ namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class CurrentActionAggregator implements AggregatorInterface
 {
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -52,6 +46,11 @@ class CurrentActionAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
@@ -59,16 +58,11 @@ class CurrentActionAggregator implements AggregatorInterface
                 return 'export.aggregator.course_work.by_current_action.Current action ?';
             }
 
-            switch ($value) {
-                case true:
-                    return $this->translator->trans('export.aggregator.course_work.by_current_action.Current action');
-
-                case false:
-                    return $this->translator->trans('export.aggregator.course_work.by_current_action.Not current action');
-
-                default:
-                    throw new LogicException(sprintf('The value %s is not valid', $value));
-            }
+            return match ($value) {
+                true => $this->translator->trans('export.aggregator.course_work.by_current_action.Current action'),
+                false => $this->translator->trans('export.aggregator.course_work.by_current_action.Not current action'),
+                default => throw new \LogicException(sprintf('The value %s is not valid', $value)),
+            };
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
index 8cc6a25da..ce1e381f2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
@@ -17,19 +17,10 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class GoalAggregator implements AggregatorInterface
+final readonly class GoalAggregator implements AggregatorInterface
 {
-    private GoalRepository $goalRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(GoalRepository $goalRepository, TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->goalRepository = $goalRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private GoalRepository $goalRepository, private TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -38,7 +29,7 @@ final class GoalAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('goal', $qb->getAllAliases(), true)) {
+        if (!\in_array('goal', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.goals', 'goal');
         }
 
@@ -56,6 +47,11 @@ final class GoalAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
index 17b263d7e..e1549f315 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php
@@ -17,27 +17,11 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class GoalResultAggregator implements AggregatorInterface
 {
-    private GoalRepository $goalRepository;
-
-    private ResultRepository $resultRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        ResultRepository $resultRepository,
-        GoalRepository $goalRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->resultRepository = $resultRepository;
-        $this->goalRepository = $goalRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly ResultRepository $resultRepository, private readonly GoalRepository $goalRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -46,11 +30,11 @@ class GoalResultAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('goal', $qb->getAllAliases(), true)) {
+        if (!\in_array('goal', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.goals', 'goal');
         }
 
-        if (!in_array('goalresult', $qb->getAllAliases(), true)) {
+        if (!\in_array('goalresult', $qb->getAllAliases(), true)) {
             $qb->leftJoin('goal.results', 'goalresult');
         }
 
@@ -69,6 +53,11 @@ class GoalResultAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value) use ($key): string {
@@ -100,7 +89,7 @@ class GoalResultAggregator implements AggregatorInterface
                     );
 
                 default:
-                    throw new LogicException();
+                    throw new \LogicException();
             }
         };
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
index cbf07091f..c8336b09b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
@@ -11,27 +11,24 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
+use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
 use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class JobAggregator implements AggregatorInterface
+final readonly class JobAggregator implements AggregatorInterface
 {
-    private UserJobRepository $jobRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'acp_work_action_agg_user_job';
 
     public function __construct(
-        UserJobRepository $jobRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->jobRepository = $jobRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private UserJobRepository $jobRepository,
+        private TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -40,12 +37,20 @@ final class JobAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('acpw.referrers', 'acpwuser');
-        }
+        $p = self::PREFIX;
 
-        $qb->addSelect('IDENTITY(acpwuser.userJob) as job_aggregator')
-            ->addGroupBy('job_aggregator');
+        $qb
+            ->leftJoin(
+                UserJob::class,
+                "{$p}_job",
+                Expr\Join::WITH,
+                'EXISTS (SELECT 1 FROM '.AccompanyingPeriodWorkReferrerHistory::class." {$p}_ref_history
+                JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.jobHistories {$p}_job_history
+                WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND IDENTITY({$p}_job_history.job) = {$p}_job.id AND {$p}_job_history.startDate <= {$p}_ref_history.startDate
+                AND ({$p}_job_history.endDate IS NULL or {$p}_job_history.endDate >= {$p}_ref_history.startDate))"
+            )
+            ->addSelect("{$p}_job.id as {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
     public function applyOn(): string
@@ -53,9 +58,11 @@ final class JobAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // no form
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -69,7 +76,9 @@ final class JobAggregator implements AggregatorInterface
                 return '';
             }
 
-            $j = $this->jobRepository->find($value);
+            if (null === $j = $this->jobRepository->find($value)) {
+                return '';
+            }
 
             return $this->translatableStringHelper->localize(
                 $j->getLabel()
@@ -79,11 +88,11 @@ final class JobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['job_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
     {
-        return 'Group by treating agent job';
+        return 'export.aggregator.course_work.by_agent_job.Group by treating agent job';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
index 0fe53b707..c97229048 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
@@ -12,26 +12,24 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class ReferrerAggregator implements AggregatorInterface
+final readonly class ReferrerAggregator implements AggregatorInterface
 {
-    private UserRender $userRender;
-
-    private UserRepository $userRepository;
+    private const PREFIX = 'acpw_referrer_aggregator';
 
     public function __construct(
-        UserRepository $userRepository,
-        UserRender $userRender
-    ) {
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-    }
+        private UserRepository $userRepository,
+        private UserRender $userRender,
+        private RollingDateConverterInterface $rollingDateConverter
+    ) {}
 
     public function addRole(): ?string
     {
@@ -40,11 +38,16 @@ final class ReferrerAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('acpw.referrers', 'acpwuser');
-        }
+        $p = self::PREFIX;
 
-        $qb->addSelect('acpwuser.id AS referrer_aggregator');
+        $qb
+            ->leftJoin('acpw.referrersHistory', $p.'_acpwusers_history')
+            ->andWhere("{$p}_acpwusers_history.startDate <= :{$p}_calc_date AND ({$p}_acpwusers_history.endDate IS NULL or {$p}_acpwusers_history.endDate > :{$p}_calc_date)");
+
+        $qb->setParameter("{$p}_calc_date", $this->rollingDateConverter->convert(
+            $data['referrer_at'] ?? new RollingDate(RollingDate::T_TODAY)
+        ));
+        $qb->addSelect("IDENTITY({$p}_acpwusers_history.user) AS referrer_aggregator");
         $qb->addGroupBy('referrer_aggregator');
     }
 
@@ -55,7 +58,16 @@ final class ReferrerAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        // no form
+        $builder->add('referrer_at', PickRollingDateType::class, [
+            'label' => 'export.aggregator.course_work.by_treating_agent.Calc date',
+        ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'referrer_at' => new RollingDate(RollingDate::T_TODAY),
+        ];
     }
 
     public function getLabels($key, array $values, $data)
@@ -71,7 +83,7 @@ final class ReferrerAggregator implements AggregatorInterface
 
             $r = $this->userRepository->find($value);
 
-            return $this->userRender->renderString($r, []);
+            return $this->userRender->renderString($r, ['absence' => false, 'user_job' => false, 'main_scope' => false]);
         };
     }
 
@@ -82,6 +94,6 @@ final class ReferrerAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group by treating agent';
+        return 'export.aggregator.course_work.by_treating_agent.Group by treating agent';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
index 2e46673da..63a037f21 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
@@ -17,19 +17,10 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class ResultAggregator implements AggregatorInterface
+final readonly class ResultAggregator implements AggregatorInterface
 {
-    private ResultRepository $resultRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(ResultRepository $resultRepository, TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->resultRepository = $resultRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private ResultRepository $resultRepository, private TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -38,7 +29,7 @@ final class ResultAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('result', $qb->getAllAliases(), true)) {
+        if (!\in_array('result', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.results', 'result');
         }
 
@@ -56,6 +47,11 @@ final class ResultAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
index 243263b83..dfffaa9e4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
@@ -11,27 +11,24 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
 
+use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
 use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-final class ScopeAggregator implements AggregatorInterface
+final readonly class ScopeAggregator implements AggregatorInterface
 {
-    private ScopeRepository $scopeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'acp_work_action_agg_user_scope';
 
     public function __construct(
-        ScopeRepository $scopeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private ScopeRepository $scopeRepository,
+        private TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -40,12 +37,20 @@ final class ScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('acpw.referrers', 'acpwuser');
-        }
+        $p = self::PREFIX;
 
-        $qb->addSelect('IDENTITY(acpwuser.mainScope) as scope_aggregator');
-        $qb->addGroupBy('scope_aggregator');
+        $qb
+            ->leftJoin(
+                Scope::class,
+                "{$p}_scope",
+                Expr\Join::WITH,
+                'EXISTS (SELECT 1 FROM '.AccompanyingPeriodWorkReferrerHistory::class." {$p}_ref_history
+                JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.scopeHistories {$p}_scope_history
+                WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND IDENTITY({$p}_scope_history.scope) = {$p}_scope.id AND {$p}_scope_history.startDate <= {$p}_ref_history.startDate
+                AND ({$p}_scope_history.endDate IS NULL or {$p}_scope_history.endDate >= {$p}_ref_history.startDate))"
+            )
+            ->addSelect("{$p}_scope.id as {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
     public function applyOn(): string
@@ -53,9 +58,11 @@ final class ScopeAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
     {
-        // no form
+        return [];
     }
 
     public function getLabels($key, array $values, $data)
@@ -69,7 +76,9 @@ final class ScopeAggregator implements AggregatorInterface
                 return '';
             }
 
-            $s = $this->scopeRepository->find($value);
+            if (null === $s = $this->scopeRepository->find($value)) {
+                return '';
+            }
 
             return $this->translatableStringHelper->localize(
                 $s->getName()
@@ -79,11 +88,11 @@ final class ScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['scope_aggregator'];
+        return [self::PREFIX.'_select'];
     }
 
     public function getTitle(): string
     {
-        return 'Group by treating agent scope';
+        return 'export.aggregator.course_work.by_agent_scope.Group by treating agent scope';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Declarations.php b/src/Bundle/ChillPersonBundle/Export/Declarations.php
index 507f02041..4186861cb 100644
--- a/src/Bundle/ChillPersonBundle/Export/Declarations.php
+++ b/src/Bundle/ChillPersonBundle/Export/Declarations.php
@@ -16,15 +16,18 @@ namespace Chill\PersonBundle\Export;
  */
 abstract class Declarations
 {
-    public const ACP_TYPE = 'accompanying_period';
+    final public const ACP_TYPE = 'accompanying_period';
 
-    public const EVAL_TYPE = 'evaluation';
+    final public const EVAL_TYPE = 'evaluation';
 
-    public const HOUSEHOLD_TYPE = 'household';
+    final public const HOUSEHOLD_TYPE = 'household';
 
-    public const PERSON_IMPLIED_IN = 'person_implied_in';
+    /**
+     * @deprecated consider using the PERSON_TYPE instead
+     */
+    final public const PERSON_IMPLIED_IN = 'person_implied_in';
 
-    public const PERSON_TYPE = 'person';
+    final public const PERSON_TYPE = 'person';
 
-    public const SOCIAL_WORK_ACTION_TYPE = 'social_actions';
+    final public const SOCIAL_WORK_ACTION_TYPE = 'social_actions';
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
index a9f794888..a710cccf7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -22,7 +23,6 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
@@ -30,7 +30,7 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->repository = $em->getRepository(AccompanyingPeriod::class);
     }
@@ -40,6 +40,11 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
         // Nothing to add here
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -58,15 +63,13 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            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];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -91,9 +94,7 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('acp');
 
@@ -101,10 +102,9 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
             ->andWhere('acp.step != :count_acp_step')
             ->leftJoin('acp.participations', 'acppart')
             ->leftJoin('acppart.person', 'person')
-            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
@@ -112,6 +112,8 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
             ->setParameter('count_acp_step', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('authorized_centers', $centers);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         $qb->select('COUNT(DISTINCT acp.id) AS export_result');
 
         return $qb;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
index 40253ea0b..e1e771222 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -21,24 +22,22 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInterface
 {
-    protected EntityManagerInterface $em;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->em = $em;
-    }
+    public function __construct(protected EntityManagerInterface $em) {}
 
     public function buildForm(FormBuilderInterface $builder): void
     {
         // No form necessary?
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -57,15 +56,13 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            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];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -90,9 +87,7 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->em->createQueryBuilder();
 
@@ -101,10 +96,9 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
             ->join('acpw.accompanyingPeriod', 'acp')
             ->join('acp.participations', 'acppart')
             ->join('acppart.person', 'person')
-            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
@@ -113,6 +107,8 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
 
         $qb->select('COUNT(DISTINCT acpw.id) as export_result');
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         return $qb;
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
index 578cc1452..ad32e0a03 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -20,22 +21,17 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountEvaluation implements ExportInterface, GroupedExportInterface
 {
-    private EntityManagerInterface $entityManager;
+    public function __construct(private readonly EntityManagerInterface $entityManager) {}
 
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->entityManager = $em;
-    }
+    public function buildForm(FormBuilderInterface $builder) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function getFormDefaultData(): array
     {
-        // TODO: Implement buildForm() method.
+        return [];
     }
 
     public function getAllowedFormattersTypes(): array
@@ -56,15 +52,13 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            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];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -89,9 +83,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -101,16 +93,17 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
             ->join('acpw.accompanyingPeriod', 'acp')
             ->join('acp.participations', 'acppart')
             ->join('acppart.person', 'person')
-            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         $qb->select('COUNT(DISTINCT workeval.id) AS export_result');
 
         return $qb;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
index f1eaeb4cb..9d4d22085 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
@@ -23,35 +23,28 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountHousehold implements ExportInterface, GroupedExportInterface
 {
     private const TR_PREFIX = 'export.export.nb_household_with_course.';
 
-    private EntityManagerInterface $entityManager;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        EntityManagerInterface $em,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->entityManager = $em;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
             ->add('calc_date', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-                'label' => self::TR_PREFIX . 'Date of calculation of household members',
+                'label' => self::TR_PREFIX.'Date of calculation of household members',
                 'required' => false,
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -59,7 +52,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
 
     public function getDescription(): string
     {
-        return self::TR_PREFIX . 'Count household with accompanying course by various parameters.';
+        return self::TR_PREFIX.'Count household with accompanying course by various parameters.';
     }
 
     public function getGroup(): string
@@ -71,16 +64,11 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
     {
         return static function ($value) use ($key) {
             if ('_header' === $value) {
-                switch ($key) {
-                    case 'household_export_result':
-                        return self::TR_PREFIX . 'Count households';
-
-                    case 'acp_export_result':
-                        return self::TR_PREFIX . 'Count accompanying periods';
-
-                    default:
-                        throw new LogicException('Key not supported: ' . $key);
-                }
+                return match ($key) {
+                    'household_export_result' => self::TR_PREFIX.'Count households',
+                    'acp_export_result' => self::TR_PREFIX.'Count accompanying periods',
+                    default => throw new \LogicException('Key not supported: '.$key),
+                };
             }
 
             if (null === $value) {
@@ -103,7 +91,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
 
     public function getTitle(): string
     {
-        return self::TR_PREFIX . 'Count households with accompanying course';
+        return self::TR_PREFIX.'Count households with accompanying course';
     }
 
     public function getType(): string
@@ -113,9 +101,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -128,7 +114,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
             ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
index 07a307563..a9635791a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
@@ -20,24 +20,22 @@ use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountPerson implements ExportInterface, GroupedExportInterface
 {
-    protected PersonRepository $personRepository;
-
-    public function __construct(
-        PersonRepository $personRepository
-    ) {
-        $this->personRepository = $personRepository;
-    }
+    public function __construct(protected PersonRepository $personRepository) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
         // No form necessary
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -56,15 +54,13 @@ class CountPerson implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            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];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data)
@@ -94,16 +90,14 @@ class CountPerson implements ExportInterface, GroupedExportInterface
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->personRepository->createQueryBuilder('person');
 
         $qb->select('COUNT(DISTINCT person.id) AS export_result')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
                 )
             )
             ->setParameter('authorized_centers', $centers);
@@ -120,8 +114,6 @@ class CountPerson implements ExportInterface, GroupedExportInterface
     {
         return [
             Declarations::PERSON_TYPE,
-            Declarations::PERSON_IMPLIED_IN,
-            //Declarations::ACP_TYPE
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
index 7acbd09cf..a582d987f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -21,16 +22,14 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExportInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->repository = $em->getRepository(AccompanyingPeriod::class);
     }
@@ -40,6 +39,11 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
         // TODO: Implement buildForm() method.
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -58,15 +62,13 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
     public function getLabels($key, array $values, $data)
     {
         if ('export_result' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
+            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];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -91,26 +93,26 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('acp');
 
-        if (!in_array('acppart', $qb->getAllAliases(), true)) {
+        if (!\in_array('acppart', $qb->getAllAliases(), true)) {
             $qb->join('acp.participations', 'acppart');
         }
 
-        if (!in_array('partperson', $qb->getAllAliases(), true)) {
+        if (!\in_array('partperson', $qb->getAllAliases(), true)) {
             $qb->join('acppart.person', 'person');
         }
 
         $qb->andWhere(
             $qb->expr()->exists(
-                'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
             )
         )->setParameter('authorized_centers', $centers);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         $qb->select('COUNT(DISTINCT person.id) AS export_result');
 
         return $qb;
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
index 8c96906fc..cd6eb2e81 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
@@ -11,124 +11,30 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
-use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\MainBundle\Export\Helper\DateTimeHelper;
-use Chill\MainBundle\Export\Helper\ExportAddressHelper;
-use Chill\MainBundle\Export\Helper\UserHelper;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Export\Declarations;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Export\Helper\ListAccompanyingPeriodHelper;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function strlen;
 
-class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
+final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
 {
-    private const FIELDS = [
-        'id',
-        'step',
-        'stepSince',
-        'openingDate',
-        'closingDate',
-        'referrer',
-        'referrerSince',
-        'administrativeLocation',
-        'locationIsPerson',
-        'locationIsTemp',
-        'locationPersonName',
-        'locationPersonId',
-        'origin',
-        'closingMotive',
-        'confidential',
-        'emergency',
-        'intensity',
-        'job',
-        'isRequestorPerson',
-        'isRequestorThirdParty',
-        'requestorPerson',
-        'requestorPersonId',
-        'requestorThirdParty',
-        'requestorThirdPartyId',
-        'scopes',
-        'socialIssues',
-        'createdAt',
-        'createdBy',
-        'updatedAt',
-        'updatedBy',
-    ];
-
-    private ExportAddressHelper $addressHelper;
-
-    private DateTimeHelper $dateTimeHelper;
-
-    private EntityManagerInterface $entityManager;
-
-    private PersonRenderInterface $personRender;
-
-    private PersonRepository $personRepository;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private SocialIssueRender $socialIssueRender;
-
-    private SocialIssueRepository $socialIssueRepository;
-
-    private ThirdPartyRender $thirdPartyRender;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private UserHelper $userHelper;
-
     public function __construct(
-        ExportAddressHelper $addressHelper,
-        DateTimeHelper $dateTimeHelper,
-        EntityManagerInterface $entityManager,
-        PersonRenderInterface $personRender,
-        PersonRepository $personRepository,
-        ThirdPartyRepository $thirdPartyRepository,
-        ThirdPartyRender $thirdPartyRender,
-        SocialIssueRepository $socialIssueRepository,
-        SocialIssueRender $socialIssueRender,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        RollingDateConverterInterface $rollingDateConverter,
-        UserHelper $userHelper
-    ) {
-        $this->addressHelper = $addressHelper;
-        $this->dateTimeHelper = $dateTimeHelper;
-        $this->entityManager = $entityManager;
-        $this->personRender = $personRender;
-        $this->personRepository = $personRepository;
-        $this->socialIssueRender = $socialIssueRender;
-        $this->socialIssueRepository = $socialIssueRepository;
-        $this->thirdPartyRender = $thirdPartyRender;
-        $this->thirdPartyRepository = $thirdPartyRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-        $this->userHelper = $userHelper;
-    }
+        private EntityManagerInterface $entityManager,
+        private RollingDateConverterInterface $rollingDateConverter,
+        private ListAccompanyingPeriodHelper $listAccompanyingPeriodHelper,
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
@@ -140,6 +46,13 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'calc_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_LIST];
@@ -157,120 +70,12 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
 
     public function getLabels($key, array $values, $data)
     {
-        if (substr($key, 0, strlen('address_fields')) === 'address_fields') {
-            return $this->addressHelper->getLabel($key, $values, $data, 'address_fields');
-        }
-
-        switch ($key) {
-            case 'stepSince':
-            case 'openingDate':
-            case 'closingDate':
-            case 'referrerSince':
-            case 'createdAt':
-            case 'updatedAt':
-                return $this->dateTimeHelper->getLabel('export.list.acp.' . $key);
-
-            case 'origin':
-            case 'closingMotive':
-            case 'job':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $this->translatableStringHelper->localize(json_decode($value, true));
-                };
-
-            case 'locationPersonName':
-            case 'requestorPerson':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value || null === $person = $this->personRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->personRender->renderString($person, []);
-                };
-
-            case 'requestorThirdParty':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value || null === $thirdparty = $this->thirdPartyRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->thirdPartyRender->renderString($thirdparty, []);
-                };
-
-            case 'scopes':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return implode(
-                        '|',
-                        array_map(
-                            fn ($s) => $this->translatableStringHelper->localize($s),
-                            json_decode($value, true)
-                        )
-                    );
-                };
-
-            case 'socialIssues':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return implode(
-                        '|',
-                        array_map(
-                            fn ($s) => $this->socialIssueRender->renderString($this->socialIssueRepository->find($s), []),
-                            json_decode($value, true)
-                        )
-                    );
-                };
-
-            default:
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acp.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-        }
+        return $this->listAccompanyingPeriodHelper->getLabels($key, $values, $data);
     }
 
     public function getQueryKeys($data)
     {
-        return array_merge(
-            self::FIELDS,
-            $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields')
-        );
+        return $this->listAccompanyingPeriodHelper->getQueryKeys($data);
     }
 
     public function getResult($query, $data)
@@ -290,9 +95,7 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -301,8 +104,8 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
             ->andWhere('acp.step != :list_acp_step')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
-                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
@@ -310,7 +113,14 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
             ->setParameter('list_acp_step', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('authorized_centers', $centers);
 
-        $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
+        $this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
+
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
+        $qb
+            ->addOrderBy('acp.openingDate')
+            ->addOrderBy('acp.closingDate')
+            ->addOrderBy('acp.id');
 
         return $qb;
     }
@@ -326,95 +136,4 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
             Declarations::ACP_TYPE,
         ];
     }
-
-    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calcDate): void
-    {
-        // add the regular fields
-        foreach (['id', 'openingDate', 'closingDate', 'confidential', 'emergency', 'intensity', 'createdAt', 'updatedAt'] as $field) {
-            $qb->addSelect(sprintf('acp.%s AS %s', $field, $field));
-        }
-
-        // add the field which are simple association
-        foreach (['origin' => 'label', 'closingMotive' => 'name', 'job' => 'label', 'createdBy' => 'label', 'updatedBy' => 'label', 'administrativeLocation' => 'name'] as $entity => $field) {
-            $qb
-                ->leftJoin(sprintf('acp.%s', $entity), "{$entity}_t")
-                ->addSelect(sprintf('%s_t.%s AS %s', $entity, $field, $entity));
-        }
-
-        // step at date
-        $qb
-            ->addSelect('stepHistory.step AS step')
-            ->addSelect('stepHistory.startDate AS stepSince')
-            ->leftJoin('acp.stepHistories', 'stepHistory')
-            ->andWhere(
-                $qb->expr()->andX(
-                    $qb->expr()->lte('stepHistory.startDate', ':calcDate'),
-                    $qb->expr()->orX($qb->expr()->isNull('stepHistory.endDate'), $qb->expr()->gt('stepHistory.endDate', ':calcDate'))
-                )
-            );
-
-        // referree at date
-        $qb
-            ->addSelect('referrer_t.label AS referrer')
-            ->addSelect('userHistory.startDate AS referrerSince')
-            ->leftJoin('acp.userHistories', 'userHistory')
-            ->leftJoin('userHistory.user', 'referrer_t')
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('userHistory'),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte('userHistory.startDate', ':calcDate'),
-                        $qb->expr()->orX($qb->expr()->isNull('userHistory.endDate'), $qb->expr()->gt('userHistory.endDate', ':calcDate'))
-                    )
-                )
-            );
-
-        // location of the acp
-        $qb
-            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 1 ELSE 0 END AS locationIsPerson')
-            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 0 ELSE 1 END AS locationIsTemp')
-            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonName')
-            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonId')
-            ->leftJoin('acp.locationHistories', 'locationHistory')
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('locationHistory'),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte('locationHistory.startDate', ':calcDate'),
-                        $qb->expr()->orX($qb->expr()->isNull('locationHistory.endDate'), $qb->expr()->gt('locationHistory.endDate', ':calcDate'))
-                    )
-                )
-            )
-            ->leftJoin(PersonHouseholdAddress::class, 'personAddress', Join::WITH, 'locationHistory.personLocation = personAddress.person')
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('personAddress'),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte('personAddress.validFrom', ':calcDate'),
-                        $qb->expr()->orX($qb->expr()->isNull('personAddress.validTo'), $qb->expr()->gt('personAddress.validTo', ':calcDate'))
-                    )
-                )
-            )
-            ->leftJoin(Address::class, 'acp_address', Join::WITH, 'COALESCE(IDENTITY(locationHistory.addressLocation), IDENTITY(personAddress.address)) = acp_address.id');
-
-        $this->addressHelper->addSelectClauses(ExportAddressHelper::F_ALL, $qb, 'acp_address', 'address_fields');
-
-        // requestor
-        $qb
-            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 1 ELSE 0 END AS isRequestorPerson')
-            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 0 ELSE 1 END AS isRequestorThirdParty')
-            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPersonId')
-            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdPartyId')
-            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPerson')
-            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdParty');
-
-        $qb
-            // scopes
-            ->addSelect('(SELECT AGGREGATE(scope.name) FROM ' . Scope::class . ' scope WHERE scope MEMBER OF acp.scopes) AS scopes')
-            // social issues
-            ->addSelect('(SELECT AGGREGATE(socialIssue.id) FROM ' . SocialIssue::class . ' socialIssue WHERE socialIssue MEMBER OF acp.socialIssues) AS socialIssues');
-
-        // add parameter
-        $qb->setParameter('calcDate', $calcDate);
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
index d0c1863c3..6c9b5d202 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\Helper\AggregateStringHelper;
@@ -24,6 +25,7 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
@@ -39,7 +41,6 @@ use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -69,6 +70,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
         'personsName',
         'thirdParties',
         'handlingThierParty',
+        // 'acpwReferrers',
         'referrers',
         'createdAt',
         'createdBy',
@@ -76,57 +78,20 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
         'updatedBy',
     ];
 
-    private AggregateStringHelper $aggregateStringHelper;
-
-    private DateTimeHelper $dateTimeHelper;
-
-    private EntityManagerInterface $entityManager;
-
-    private LabelPersonHelper $personHelper;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private SocialActionRender $socialActionRender;
-
-    private SocialActionRepository $socialActionRepository;
-
-    private SocialIssueRender $socialIssueRender;
-
-    private SocialIssueRepository $socialIssueRepository;
-
-    private LabelThirdPartyHelper $thirdPartyHelper;
-
-    private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
-
-    private UserHelper $userHelper;
-
     public function __construct(
-        EntityManagerInterface $entityManager,
-        DateTimeHelper $dateTimeHelper,
-        UserHelper $userHelper,
-        LabelPersonHelper $personHelper,
-        LabelThirdPartyHelper $thirdPartyHelper,
-        TranslatableStringExportLabelHelper $translatableStringExportLabelHelper,
-        SocialIssueRender $socialIssueRender,
-        SocialIssueRepository $socialIssueRepository,
-        SocialActionRender $socialActionRender,
-        RollingDateConverterInterface $rollingDateConverter,
-        AggregateStringHelper $aggregateStringHelper,
-        SocialActionRepository $socialActionRepository
-    ) {
-        $this->entityManager = $entityManager;
-        $this->dateTimeHelper = $dateTimeHelper;
-        $this->userHelper = $userHelper;
-        $this->personHelper = $personHelper;
-        $this->thirdPartyHelper = $thirdPartyHelper;
-        $this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
-        $this->socialIssueRender = $socialIssueRender;
-        $this->socialIssueRepository = $socialIssueRepository;
-        $this->socialActionRender = $socialActionRender;
-        $this->rollingDateConverter = $rollingDateConverter;
-        $this->aggregateStringHelper = $aggregateStringHelper;
-        $this->socialActionRepository = $socialActionRepository;
-    }
+        private readonly EntityManagerInterface $entityManager,
+        private readonly DateTimeHelper $dateTimeHelper,
+        private readonly UserHelper $userHelper,
+        private readonly LabelPersonHelper $personHelper,
+        private readonly LabelThirdPartyHelper $thirdPartyHelper,
+        private readonly TranslatableStringExportLabelHelper $translatableStringExportLabelHelper,
+        private readonly SocialIssueRender $socialIssueRender,
+        private readonly SocialIssueRepository $socialIssueRepository,
+        private readonly SocialActionRender $socialActionRender,
+        private readonly RollingDateConverterInterface $rollingDateConverter,
+        private readonly AggregateStringHelper $aggregateStringHelper,
+        private readonly SocialActionRepository $socialActionRepository
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
@@ -135,10 +100,14 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
                 'label' => 'export.list.acpw.Date of calculation for associated elements',
                 'help' => 'export.list.acpw.help_description',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_LIST];
@@ -156,89 +125,56 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
-            case 'startDate':
-            case 'endDate':
-            case 'createdAt':
-            case 'updatedAt':
-                return $this->dateTimeHelper->getLabel('export.list.acpw.' . $key);
+        return match ($key) {
+            'startDate', 'endDate', 'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel('export.list.acpw.'.$key),
+            'socialAction' => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.acpw.'.$key;
+                }
 
-            case 'socialAction':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acpw.' . $key;
-                    }
+                if (null === $value) {
+                    return '';
+                }
 
-                    if (null === $value) {
-                        return '';
-                    }
+                return $this->socialActionRender->renderString(
+                    $this->socialActionRepository->find($value),
+                    []
+                );
+            },
+            'socialIssue' => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.acpw.'.$key;
+                }
 
-                    return $this->socialActionRender->renderString(
-                        $this->socialActionRepository->find($value),
-                        []
-                    );
-                };
+                if (null === $value) {
+                    return '';
+                }
 
-            case 'socialIssue':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acpw.' . $key;
-                    }
+                return $this->socialIssueRender->renderString(
+                    $this->socialIssueRepository->find($value),
+                    []
+                );
+            },
+            'createdBy', 'updatedBy', 'acp_user' => $this->userHelper->getLabel($key, $values, 'export.list.acpw.'.$key),
+            'referrers' => $this->userHelper->getLabel($key, $values, 'export.list.acpw.'.$key),
+            // 'acpwReferrers' => $this->userHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key),
+            'personsName' => $this->personHelper->getLabelMulti($key, $values, 'export.list.acpw.'.$key),
+            'handlingThierParty' => $this->thirdPartyHelper->getLabel($key, $values, 'export.list.acpw.'.$key),
+            'thirdParties' => $this->thirdPartyHelper->getLabelMulti($key, $values, 'export.list.acpw.'.$key),
+            'personsId', 'goalsId', 'goalResultsId', 'resultsId', 'evaluationsId' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.acpw.'.$key),
+            'goalsTitle', 'goalResultsTitle', 'resultsTitle', 'evaluationsTitle' => $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, 'export.list.acpw.'.$key),
+            default => static function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.acpw.'.$key;
+                }
 
-                    if (null === $value) {
-                        return '';
-                    }
+                if (null === $value) {
+                    return '';
+                }
 
-                    return $this->socialIssueRender->renderString(
-                        $this->socialIssueRepository->find($value),
-                        []
-                    );
-                };
-
-            case 'createdBy':
-            case 'updatedBy':
-            case 'acp_user':
-                return $this->userHelper->getLabel($key, $values, 'export.list.acpw.' . $key);
-
-            case 'referrers':
-                //$date = $this->rollDateConverter->convert($data['calc_date'])->format('d/m/Y');
-                return $this->userHelper->getLabel($key, $values, 'export.list.acpw.' . $key);
-
-            case 'personsName':
-                return $this->personHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key);
-
-            case 'handlingThierParty':
-                return $this->thirdPartyHelper->getLabel($key, $values, 'export.list.acpw.' . $key);
-
-            case 'thirdParties':
-                return $this->thirdPartyHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key);
-
-            case 'personsId':
-            case 'goalsId':
-            case 'goalResultsId':
-            case 'resultsId':
-            case 'evaluationsId':
-                return $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key);
-
-            case 'goalsTitle':
-            case 'goalResultsTitle':
-            case 'resultsTitle':
-            case 'evaluationsTitle':
-                return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key);
-
-            default:
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.acpw.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-        }
+                return $value;
+            },
+        };
     }
 
     public function getQueryKeys($data)
@@ -248,7 +184,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
 
     public function getResult($query, $data)
     {
-        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
+        return dump($query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR));
     }
 
     public function getTitle(): string
@@ -263,9 +199,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -282,7 +216,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
             ->andWhere('acppart.startDate <= :calc_date AND (acppart.endDate > :calc_date OR acppart.endDate IS NULL)')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
@@ -290,6 +224,8 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
             ->setParameter('authorized_centers', $centers)
             ->setParameter('calc_date', $this->rollingDateConverter->convert($data['calc_date']));
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
 
         return $qb;
@@ -309,7 +245,7 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
         ];
     }
 
-    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calcDate): void
+    private function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calcDate): void
     {
         // add regular fields
         foreach ([
@@ -345,51 +281,62 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
 
         // persons
         $qb
-            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM ' . Person::class . ' person_acpw_member '
-                . 'WHERE person_acpw_member MEMBER OF acpw.persons) AS personsId')
-            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM ' . Person::class . ' person1_acpw_member '
-                . 'WHERE person1_acpw_member MEMBER OF acpw.persons) AS personsName');
+            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM '.Person::class.' person_acpw_member '
+                .'WHERE person_acpw_member MEMBER OF acpw.persons) AS personsId')
+            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM '.Person::class.' person1_acpw_member '
+                .'WHERE person1_acpw_member MEMBER OF acpw.persons) AS personsName');
 
         // referrers => at date XXXX
         $qb
-            ->addSelect('(SELECT IDENTITY(history.user) FROM ' . UserHistory::class . ' history ' .
+            ->addSelect('(SELECT JSON_BUILD_OBJECT(\'uid\', IDENTITY(history.user), \'d\', history.startDate) FROM '.UserHistory::class.' history '.
             'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calcDate AND (history.endDate IS NULL OR history.endDate > :calcDate)) AS referrers');
 
+        /*
+        // acpwReferrers at date XXX
+        $qb
+            ->addSelect('(
+            SELECT IDENTITY(acpw_ref_history.accompanyingPeriodWork) AS acpw_ref_history_id,
+            JSON_BUILD_OBJECT(\'uid\', IDENTITY(acpw_ref_history.user), \'d\', acpw_ref_history.startDate)
+            FROM ' . AccompanyingPeriodWorkReferrerHistory::class . ' acpw_ref_history ' .
+            'WHERE acpw_ref_history.accompanyingPeriodWork = acpw AND acpw_ref_history.startDate <= :calcDate AND (acpw_ref_history.endDate IS NULL or acpw_ref_history.endDate > :calcDate) GROUP BY acpw_ref_history_id) AS acpwReferrers'
+            );
+         */
+
         // thirdparties
         $qb
-            ->addSelect('(SELECT AGGREGATE(tp.id) FROM ' . ThirdParty::class . ' tp '
-                . 'WHERE tp MEMBER OF acpw.thirdParties) AS thirdParties');
+            ->addSelect('(SELECT AGGREGATE(tp.id) FROM '.ThirdParty::class.' tp '
+                .'WHERE tp MEMBER OF acpw.thirdParties) AS thirdParties');
 
         // goals
         $qb
-            ->addSelect('(SELECT AGGREGATE(IDENTITY(goal.goal)) FROM ' . AccompanyingPeriodWorkGoal::class . ' goal '
-                . 'WHERE goal MEMBER OF acpw.goals) AS goalsId')
-            ->addSelect('(SELECT AGGREGATE(g.title) FROM ' . AccompanyingPeriodWorkGoal::class . ' goal1 '
-                . 'LEFT JOIN ' . Goal::class . ' g WITH goal1.goal = g.id WHERE goal1 MEMBER OF acpw.goals) AS goalsTitle');
+            ->addSelect('(SELECT AGGREGATE(IDENTITY(goal.goal)) FROM '.AccompanyingPeriodWorkGoal::class.' goal '
+                .'WHERE goal MEMBER OF acpw.goals) AS goalsId')
+            ->addSelect('(SELECT AGGREGATE(g.title) FROM '.AccompanyingPeriodWorkGoal::class.' goal1 '
+                .'LEFT JOIN '.Goal::class.' g WITH goal1.goal = g.id WHERE goal1 MEMBER OF acpw.goals) AS goalsTitle');
 
         // goals results
         $qb
-            ->addSelect('(SELECT AGGREGATE(wr.id) FROM ' . Result::class . ' wr '
-                . 'JOIN ' . AccompanyingPeriodWorkGoal::class . ' wg WITH wr MEMBER OF wg.results '
-                . 'WHERE wg MEMBER OF acpw.goals) AS goalResultsId')
-            ->addSelect('(SELECT AGGREGATE(wr1.title) FROM ' . Result::class . ' wr1 '
-                . 'JOIN ' . AccompanyingPeriodWorkGoal::class . ' wg1 WITH wr1 MEMBER OF wg1.results '
-                . 'WHERE wg1 MEMBER OF acpw.goals) AS goalResultsTitle');
+            ->addSelect('(SELECT AGGREGATE(wr.id) FROM '.Result::class.' wr '
+                .'JOIN '.AccompanyingPeriodWorkGoal::class.' wg WITH wr MEMBER OF wg.results '
+                .'WHERE wg MEMBER OF acpw.goals) AS goalResultsId')
+            ->addSelect('(SELECT AGGREGATE(wr1.title) FROM '.Result::class.' wr1 '
+                .'JOIN '.AccompanyingPeriodWorkGoal::class.' wg1 WITH wr1 MEMBER OF wg1.results '
+                .'WHERE wg1 MEMBER OF acpw.goals) AS goalResultsTitle');
 
         // results
         $qb
-            ->addSelect('(SELECT AGGREGATE(result.id) FROM ' . Result::class . ' result '
-                . 'WHERE result MEMBER OF acpw.results ) AS resultsId ')
-            ->addSelect('(SELECT AGGREGATE (result1.title) FROM ' . Result::class . ' result1 '
-                . 'WHERE result1 MEMBER OF acpw.results ) AS resultsTitle ');
+            ->addSelect('(SELECT AGGREGATE(result.id) FROM '.Result::class.' result '
+                .'WHERE result MEMBER OF acpw.results ) AS resultsId ')
+            ->addSelect('(SELECT AGGREGATE (result1.title) FROM '.Result::class.' result1 '
+                .'WHERE result1 MEMBER OF acpw.results ) AS resultsTitle ');
 
         // evaluations
         $qb
-            ->addSelect('(SELECT AGGREGATE(IDENTITY(we.evaluation)) FROM ' . AccompanyingPeriodWorkEvaluation::class . ' we '
-                . 'WHERE we MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsId ')
-            ->addSelect('(SELECT AGGREGATE(ev.title) FROM ' . AccompanyingPeriodWorkEvaluation::class . ' we1 '
-                . 'LEFT JOIN ' . Evaluation::class . ' ev WITH we1.evaluation = ev.id '
-                . 'WHERE we1 MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsTitle ');
+            ->addSelect('(SELECT AGGREGATE(IDENTITY(we.evaluation)) FROM '.AccompanyingPeriodWorkEvaluation::class.' we '
+                .'WHERE we MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsId ')
+            ->addSelect('(SELECT AGGREGATE(ev.title) FROM '.AccompanyingPeriodWorkEvaluation::class.' we1 '
+                .'LEFT JOIN '.Evaluation::class.' ev WITH we1.evaluation = ev.id '
+                .'WHERE we1 MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsTitle ');
 
         $qb->setParameter('calcDate', $calcDate);
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
index 010618733..653075dbc 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\Helper\AggregateStringHelper;
@@ -19,7 +20,7 @@ use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
 use Chill\MainBundle\Export\Helper\UserHelper;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
-//use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
+// use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
@@ -33,7 +34,6 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -68,53 +68,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
         'updatedBy',
     ];
 
-    private AggregateStringHelper $aggregateStringHelper;
-
-    private DateTimeHelper $dateTimeHelper;
-
-    private EntityManagerInterface $entityManager;
-
-    private LabelPersonHelper $personHelper;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private SocialActionRender $socialActionRender;
-
-    private SocialActionRepository $socialActionRepository;
-
-    private SocialIssueRender $socialIssueRender;
-
-    private SocialIssueRepository $socialIssueRepository;
-
-    private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
-
-    private UserHelper $userHelper;
-
-    public function __construct(
-        EntityManagerInterface $entityManager,
-        SocialIssueRender $socialIssueRender,
-        SocialIssueRepository $socialIssueRepository,
-        SocialActionRender $socialActionRender,
-        SocialActionRepository $socialActionRepository,
-        UserHelper $userHelper,
-        LabelPersonHelper $personHelper,
-        DateTimeHelper $dateTimeHelper,
-        TranslatableStringExportLabelHelper $translatableStringExportLabelHelper,
-        AggregateStringHelper $aggregateStringHelper,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->entityManager = $entityManager;
-        $this->socialIssueRender = $socialIssueRender;
-        $this->socialIssueRepository = $socialIssueRepository;
-        $this->socialActionRender = $socialActionRender;
-        $this->socialActionRepository = $socialActionRepository;
-        $this->userHelper = $userHelper;
-        $this->personHelper = $personHelper;
-        $this->dateTimeHelper = $dateTimeHelper;
-        $this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
-        $this->aggregateStringHelper = $aggregateStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly SocialIssueRender $socialIssueRender, private readonly SocialIssueRepository $socialIssueRepository, private readonly SocialActionRender $socialActionRender, private readonly SocialActionRepository $socialActionRepository, private readonly UserHelper $userHelper, private readonly LabelPersonHelper $personHelper, private readonly DateTimeHelper $dateTimeHelper, private readonly TranslatableStringExportLabelHelper $translatableStringExportLabelHelper, private readonly AggregateStringHelper $aggregateStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
@@ -123,10 +77,14 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
                 'label' => 'export.list.eval.Date of calculation for associated elements',
                 'help' => 'export.list.eval.help_description',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_LIST];
@@ -144,79 +102,54 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
-            case 'startDate':
-            case 'endDate':
-            case 'maxDate':
-            case 'acpw_startDate':
-            case 'acpw_endDate':
-            case 'createdAt':
-            case 'updatedAt':
-                return $this->dateTimeHelper->getLabel('export.list.eval.' . $key);
+        return match ($key) {
+            'startDate', 'endDate', 'maxDate', 'acpw_startDate', 'acpw_endDate', 'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel('export.list.eval.'.$key),
+            'acpw_socialaction' => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.eval.'.$key;
+                }
 
-            case 'acpw_socialaction':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.eval.' . $key;
-                    }
+                if (null === $value || '' === $value) {
+                    return '';
+                }
 
-                    if (null === $value || '' === $value) {
-                        return '';
-                    }
+                return $this->socialActionRender->renderString(
+                    $this->socialActionRepository->find($value),
+                    []
+                );
+            },
+            'acpw_socialissue' => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.eval.'.$key;
+                }
 
-                    return $this->socialActionRender->renderString(
-                        $this->socialActionRepository->find($value),
-                        []
-                    );
-                };
+                if (null === $value || '' === $value) {
+                    return '';
+                }
 
-            case 'acpw_socialissue':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.eval.' . $key;
-                    }
+                return $this->socialIssueRender->renderString(
+                    $this->socialIssueRepository->find($value),
+                    []
+                );
+            },
+            'createdBy', 'updatedBy', 'acpw_acp_user' => $this->userHelper->getLabel($key, $values, 'export.list.eval.'.$key),
+            'acpw_referrers' => $this->userHelper->getLabelMulti($key, $values, 'export.list.eval.'.$key),
+            'acpw_persons_id' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.eval.'.$key),
+            'acpw_persons' => $this->personHelper->getLabelMulti($key, $values, 'export.list.eval.'.$key),
+            'eval_title' => $this->translatableStringExportLabelHelper
+                ->getLabel($key, $values, 'export.list.eval.'.$key),
+            default => static function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.eval.'.$key;
+                }
 
-                    if (null === $value || '' === $value) {
-                        return '';
-                    }
+                if (null === $value) {
+                    return '';
+                }
 
-                    return $this->socialIssueRender->renderString(
-                        $this->socialIssueRepository->find($value),
-                        []
-                    );
-                };
-
-            case 'createdBy':
-            case 'updatedBy':
-            case 'acpw_acp_user':
-                return $this->userHelper->getLabel($key, $values, 'export.list.eval.' . $key);
-
-            case 'acpw_referrers':
-                return $this->userHelper->getLabel($key, $values, 'export.list.eval.' . $key);
-
-            case 'acpw_persons_id':
-                return $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key);
-
-            case 'acpw_persons':
-                return $this->personHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key);
-
-            case 'eval_title':
-                return $this->translatableStringExportLabelHelper
-                    ->getLabel($key, $values, 'export.list.eval.' . $key);
-
-            default:
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.eval.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    return $value;
-                };
-        }
+                return $value;
+            },
+        };
     }
 
     public function getQueryKeys($data)
@@ -241,9 +174,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -261,7 +192,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
             ->andWhere('acppart.startDate <= :calc_date AND (acppart.endDate > :calc_date OR acppart.endDate IS NULL)')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                         AND acl_count_person_history.center IN (:authorized_centers)
                         '
                 )
@@ -269,6 +200,8 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
             ->setParameter('authorized_centers', $centers)
             ->setParameter('calc_date', $this->rollingDateConverter->convert($data['calc_date']));
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
 
         return $qb;
@@ -289,7 +222,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
         ];
     }
 
-    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calc_date): void
+    private function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calc_date): void
     {
         // add the regular fields
         foreach (['startDate', 'endDate', 'maxDate', 'warningInterval', 'comment', 'createdAt', 'updatedAt'] as $field) {
@@ -305,7 +238,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
         }
 
         foreach (['id', 'startDate', 'endDate', 'note'] as $field) {
-            $qb->addSelect(sprintf('acpw.%s AS %s', $field, 'acpw_' . $field));
+            $qb->addSelect(sprintf('acpw.%s AS %s', $field, 'acpw_'.$field));
         }
 
         // join socialaction
@@ -322,15 +255,15 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
 
         // referrers => at date XXXX
         $qb
-            ->addSelect('(SELECT IDENTITY(history.user) FROM ' . UserHistory::class . ' history ' .
-                'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calc_date AND (history.endDate IS NULL OR history.endDate > :calc_date)) AS acpw_referrers');
+            ->addSelect('(SELECT JSON_BUILD_OBJECT(\'uid\', IDENTITY(history.user), \'d\', history.startDate) FROM '.UserHistory::class.' history '.
+                'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calc_date AND (history.endDate IS NULL OR history.endDate > :calc_date)) AS referrers');
 
         // persons
         $qb
-            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM ' . Person::class . ' person_acpw_member '
-                . 'WHERE person_acpw_member MEMBER OF acpw.persons) AS acpw_persons_id')
-            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM ' . Person::class . ' person1_acpw_member '
-                . 'WHERE person1_acpw_member MEMBER OF acpw.persons) AS acpw_persons');
+            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM '.Person::class.' person_acpw_member '
+                .'WHERE person_acpw_member MEMBER OF acpw.persons) AS acpw_persons_id')
+            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM '.Person::class.' person1_acpw_member '
+                .'WHERE person1_acpw_member MEMBER OF acpw.persons) AS acpw_persons');
 
         // join evaluation
         $qb
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
index fc72de77b..2d332969d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
@@ -26,12 +26,10 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
-use DateTimeImmutable;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function strlen;
 
 class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
 {
@@ -45,29 +43,13 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
         'compositionType',
     ];
 
-    private ExportAddressHelper $addressHelper;
-
-    private AggregateStringHelper $aggregateStringHelper;
-
-    private EntityManagerInterface $entityManager;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringExportLabelHelper $translatableStringHelper;
-
     public function __construct(
-        ExportAddressHelper $addressHelper,
-        AggregateStringHelper $aggregateStringHelper,
-        EntityManagerInterface $entityManager,
-        RollingDateConverterInterface $rollingDateConverter,
-        TranslatableStringExportLabelHelper $translatableStringHelper
-    ) {
-        $this->addressHelper = $addressHelper;
-        $this->aggregateStringHelper = $aggregateStringHelper;
-        $this->entityManager = $entityManager;
-        $this->rollingDateConverter = $rollingDateConverter;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly ExportAddressHelper $addressHelper,
+        private readonly AggregateStringHelper $aggregateStringHelper,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly RollingDateConverterInterface $rollingDateConverter,
+        private readonly TranslatableStringExportLabelHelper $translatableStringHelper
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
@@ -75,11 +57,15 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'export.list.household.Date of calculation for associated elements',
                 'help' => 'export.list.household.help_description',
-                'data' => new RollingDate(RollingDate::T_TODAY),
                 'required' => true,
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_LIST];
@@ -97,28 +83,21 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
 
     public function getLabels($key, array $values, $data)
     {
-        if (substr($key, 0, strlen('address_fields')) === 'address_fields') {
+        if (str_starts_with($key, 'address_fields')) {
             return $this->addressHelper->getLabel($key, $values, $data, 'address_fields');
         }
 
-        switch ($key) {
-            case 'membersId':
-            case 'membersName':
-                return $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.household.' . $key);
+        return match ($key) {
+            'membersId', 'membersName' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.household.'.$key),
+            'compositionType' => $this->translatableStringHelper->getLabel($key, $values, 'export.list.household.'.$key),
+            default => static function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.household.'.$key;
+                }
 
-            case 'compositionType':
-                //dump($values);
-                return $this->translatableStringHelper->getLabel($key, $values, 'export.list.household.' . $key);
-
-            default:
-                return static function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.list.household.' . $key;
-                    }
-
-                    return (string) $value;
-                };
-        }
+                return (string) $value;
+            },
+        };
     }
 
     public function getQueryKeys($data): array
@@ -146,9 +125,7 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -163,7 +140,7 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
             ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
@@ -191,36 +168,36 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
         ];
     }
 
-    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calcDate): void
+    private function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calcDate): void
     {
         // members at date
         $qb
-            ->addSelect('(SELECT COUNT(members0) FROM ' . HouseholdMember::class . ' members0 '
-                . 'WHERE members0.startDate <= :calcDate AND (members0.endDate IS NULL OR members0.endDate > :calcDate) '
-                . 'AND members0 MEMBER OF household.members) AS membersCount')
+            ->addSelect('(SELECT COUNT(members0) FROM '.HouseholdMember::class.' members0 '
+                .'WHERE members0.startDate <= :calcDate AND (members0.endDate IS NULL OR members0.endDate > :calcDate) '
+                .'AND members0 MEMBER OF household.members) AS membersCount')
 
-            ->addSelect('(SELECT AGGREGATE(IDENTITY(members1.person)) FROM ' . HouseholdMember::class . ' members1 '
-                . 'WHERE members1.startDate <= :calcDate AND (members1.endDate IS NULL OR members1.endDate > :calcDate) '
-                . 'AND members1 MEMBER OF household.members) AS membersId')
+            ->addSelect('(SELECT AGGREGATE(IDENTITY(members1.person)) FROM '.HouseholdMember::class.' members1 '
+                .'WHERE members1.startDate <= :calcDate AND (members1.endDate IS NULL OR members1.endDate > :calcDate) '
+                .'AND members1 MEMBER OF household.members) AS membersId')
 
-            ->addSelect("(SELECT AGGREGATE(CONCAT(person2.firstName, ' ', person2.lastName)) FROM " . HouseholdMember::class . ' members2 '
-                . 'JOIN members2.person person2 '
-                . 'WHERE members2.startDate <= :calcDate AND (members2.endDate IS NULL OR members2.endDate > :calcDate) '
-                . 'AND members2 MEMBER OF household.members) AS membersName');
+            ->addSelect("(SELECT AGGREGATE(CONCAT(person2.firstName, ' ', person2.lastName)) FROM ".HouseholdMember::class.' members2 '
+                .'JOIN members2.person person2 '
+                .'WHERE members2.startDate <= :calcDate AND (members2.endDate IS NULL OR members2.endDate > :calcDate) '
+                .'AND members2 MEMBER OF household.members) AS membersName');
 
         // composition at date
         $qb
-            ->addSelect('(SELECT compo.numberOfChildren FROM ' . HouseholdComposition::class . ' compo '
-                . 'WHERE compo.startDate <= :calcDate AND (compo.endDate IS NULL OR compo.endDate > :calcDate) '
-                . 'AND compo MEMBER OF household.compositions) AS compositionNumberOfChildren')
+            ->addSelect('(SELECT compo.numberOfChildren FROM '.HouseholdComposition::class.' compo '
+                .'WHERE compo.startDate <= :calcDate AND (compo.endDate IS NULL OR compo.endDate > :calcDate) '
+                .'AND compo MEMBER OF household.compositions) AS compositionNumberOfChildren')
 
-            ->addSelect('(SELECT compo1.comment.comment FROM ' . HouseholdComposition::class . ' compo1 '
-                . 'WHERE compo1.startDate <= :calcDate AND (compo1.endDate IS NULL OR compo1.endDate > :calcDate) '
-                . 'AND compo1 MEMBER OF household.compositions) AS compositionComment')
+            ->addSelect('(SELECT compo1.comment.comment FROM '.HouseholdComposition::class.' compo1 '
+                .'WHERE compo1.startDate <= :calcDate AND (compo1.endDate IS NULL OR compo1.endDate > :calcDate) '
+                .'AND compo1 MEMBER OF household.compositions) AS compositionComment')
 
             ->addSelect('(
                 SELECT type2.label
-                FROM ' . HouseholdComposition::class . ' compo2
+                FROM '.HouseholdComposition::class.' compo2
                 JOIN compo2.householdCompositionType type2
                 WHERE compo2.startDate <= :calcDate AND (compo2.endDate IS NULL OR compo2.endDate > :calcDate)
                 AND compo2 MEMBER OF household.compositions
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
index acaeb498c..8beda5ef5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
@@ -34,45 +34,20 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-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 strlen;
-use function uniqid;
-
 /**
  * Render a list of people.
  */
 class ListPerson implements ExportElementValidatedInterface, ListInterface, GroupedExportInterface
 {
-    private ExportAddressHelper $addressHelper;
-
-    private CustomFieldProvider $customFieldProvider;
-
-    private EntityManagerInterface $entityManager;
-
-    private ListPersonHelper $listPersonHelper;
-
-    private $slugs = [];
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private array $slugs = [];
 
     public function __construct(
-        ExportAddressHelper $addressHelper,
-        CustomFieldProvider $customFieldProvider,
-        ListPersonHelper $listPersonHelper,
-        EntityManagerInterface $em,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->addressHelper = $addressHelper;
-        $this->customFieldProvider = $customFieldProvider;
-        $this->listPersonHelper = $listPersonHelper;
-        $this->entityManager = $em;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        private readonly ExportAddressHelper $addressHelper,
+        private readonly CustomFieldProvider $customFieldProvider,
+        private readonly ListPersonHelper $listPersonHelper,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
@@ -92,7 +67,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
             '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, 7) === 'address' || 'center' === $val || 'household' === $val) {
+                if (str_starts_with($val, 'address') || 'center' === $val || 'household' === $val) {
                     return ['data-display-target' => 'address_date'];
                 }
 
@@ -100,25 +75,36 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
             },
             'constraints' => [new Callback([
                 'callback' => static function ($selected, ExecutionContextInterface $context) {
-                    if (count($selected) === 0) {
+                    if (0 === \count($selected)) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
                     }
                 },
             ])],
-            'data' => array_values($choices),
         ]);
 
         // add a date  field for addresses
         $builder->add('address_date', ChillDateType::class, [
             'label' => 'Data valid at this date',
             'help' => 'Data regarding center, addresses, and so on will be computed at this date',
-            'data' => new DateTimeImmutable(),
             'input' => 'datetime_immutable',
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        $choices = array_combine(ListPersonHelper::FIELDS, ListPersonHelper::FIELDS);
+
+        foreach ($this->getCustomFields() as $cf) {
+            $choices[$this->translatableStringHelper->localize($cf->getName())]
+                =
+                $cf->getSlug();
+        }
+
+        return ['fields' => array_values($choices), 'address_date' => new \DateTimeImmutable()];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_LIST];
@@ -136,7 +122,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
 
     public function getLabels($key, array $values, $data)
     {
-        if (in_array($key, $this->listPersonHelper->getAllPossibleFields(), true)) {
+        if (\in_array($key, $this->listPersonHelper->getAllPossibleFields(), true)) {
             return $this->listPersonHelper->getLabels($key, $values, $data);
         }
 
@@ -148,18 +134,18 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         $fields = [];
 
         foreach (ListPersonHelper::FIELDS as $key) {
-            if (!in_array($key, $data['fields'], true)) {
+            if (!\in_array($key, $data['fields'], true)) {
                 continue;
             }
 
-            if (substr($key, 0, strlen('address_fields')) === 'address_fields') {
-                $fields = array_merge($fields, $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields'));
+            if (str_starts_with($key, 'address_fields')) {
+                $fields = \array_merge($fields, $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields'));
 
                 continue;
             }
 
             if ('lifecycleUpdate' === $key) {
-                $fields = array_merge($fields, ['createdAt', 'createdBy', 'updatedAt', 'updatedBy']);
+                $fields = \array_merge($fields, ['createdAt', 'createdBy', 'updatedAt', 'updatedBy']);
 
                 continue;
             }
@@ -168,7 +154,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         }
 
         // add the key from slugs and return
-        return array_merge($fields, array_keys($this->slugs));
+        return \array_merge($fields, \array_keys($this->slugs));
     }
 
     public function getResult($query, $data)
@@ -191,14 +177,11 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $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();
@@ -207,7 +190,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
             ->from(Person::class, 'person')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . Person\PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                    'SELECT 1 FROM '.Person\PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
                 )
             )
             ->setParameter('authorized_centers', $centers);
@@ -217,7 +200,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         $this->listPersonHelper->addSelect($qb, $fields, $data['address_date']);
 
         foreach ($this->getCustomFields() as $cf) {
-            if (!in_array($cf->getSlug(), $fields, true)) {
+            if (!\in_array($cf->getSlug(), $fields, true)) {
                 continue;
             }
 
@@ -258,7 +241,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
 
     public function supportsModifiers()
     {
-        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN];
+        return [Declarations::PERSON_TYPE];
     }
 
     public function validateForm($data, ExecutionContextInterface $context)
@@ -266,13 +249,13 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
         // get the field starting with address_
         $addressFields = array_filter(
             ListPersonHelper::FIELDS,
-            static fn (string $el): bool => substr($el, 0, 8) === 'address_'
+            static fn (string $el): bool => str_starts_with($el, 'address_')
         );
 
         // check if there is one field starting with address in data
-        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
+        if (\count(array_intersect($data['fields'], $addressFields)) > 0) {
             // if a field address is checked, the date must not be empty
-            if (!$data['address_date'] instanceof DateTimeImmutable) {
+            if (!$data['address_date'] instanceof \DateTimeImmutable) {
                 $context
                     ->buildViolation('You must set this date if an address is checked')
                     ->atPath('address_date')
@@ -287,11 +270,9 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
     }
 
     /**
-     * @param mixed $slug
-     *
      * @return array An array with keys = 'slug', 'type', 'additionnalInfo'
      */
-    private function extractInfosFromSlug($slug): array
+    private function extractInfosFromSlug(mixed $slug): array
     {
         return $this->slugs[$slug];
     }
@@ -305,12 +286,12 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
     {
         return $this->entityManager
             ->createQuery('SELECT cf '
-                . 'FROM ChillCustomFieldsBundle:CustomField cf '
-                . 'JOIN cf.customFieldGroup g '
-                . 'WHERE cf.type != :title AND g.entity LIKE :entity')
+                .'FROM ChillCustomFieldsBundle:CustomField cf '
+                .'JOIN cf.customFieldGroup g '
+                .'WHERE cf.type != :title AND g.entity LIKE :entity')
             ->setParameters([
                 'title' => 'title',
-                'entity' => addcslashes(Person::class, '\\'),
+                'entity' => \addcslashes(Person::class, '\\'),
             ])
             ->getResult();
     }
@@ -334,7 +315,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
 
             return $this->customFieldProvider
                 ->getCustomFieldByType($cf->getType())
-                ->render(json_decode($value, true), $cf, 'csv');
+                ->render(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR), $cf, 'csv');
         };
 
         if ($cfType instanceof CustomFieldChoice && $cfType->isMultiple($cf)) {
@@ -344,13 +325,13 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
                 if (null === $value) {
                     return '';
                 }
-                $decoded = json_decode($value, true);
+                $decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 
                 if ('_header' === $value) {
                     $label = $cfType->getChoices($cf)[$slugChoice];
 
                     return $this->translatableStringHelper->localize($cf->getName())
-                            . ' | ' . $label;
+                            .' | '.$label;
                 }
 
                 if ('_other' === $slugChoice && $cfType->isChecked($cf, $slugChoice, $decoded)) {
@@ -369,7 +350,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
      */
     private function slugToDQL(string $slug, string $type = 'default', array $additionalInfos = []): string
     {
-        $uid = 'slug_' . uniqid('', false);
+        $uid = 'slug_'.\uniqid('', false);
 
         $this->slugs[$uid] = [
             'slug' => $slug,
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
index e40ffccce..1a1fd0316 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
@@ -47,37 +47,29 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
      */
     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,
+        private readonly TranslatorInterface $translator,
+        private readonly UrlGeneratorInterface $router,
         $routeParameters
     ) {
         $this->entityManager = $em;
-        $this->translator = $translator;
-        $this->router = $router;
-        $this->baseUrl = $routeParameters['scheme'] .
-            '://' . $routeParameters['host'];
+        $this->baseUrl = $routeParameters['scheme'].
+            '://'.$routeParameters['host'];
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('precision', NumberType::class, [
             'label' => 'Precision',
-            'data' => self::PRECISION_DEFAULT_VALUE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['precision' => self::PRECISION_DEFAULT_VALUE];
+    }
+
     public function generate(array $acl, array $data = []): Response
     {
         $values = [];
@@ -90,11 +82,11 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
                 $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']]),
             ];
         }
 
@@ -103,14 +95,14 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
 
         // Make links clickable
         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());
+            $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,9 +135,7 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
         return PersonVoter::DUPLICATE;
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-    }
+    public function validateForm($data, ExecutionContextInterface $context) {}
 
     protected function getHeaders(): array
     {
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonHavingAccompanyingPeriod.php
similarity index 74%
rename from src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriod.php
rename to src/Bundle/ChillPersonBundle/Export/Export/ListPersonHavingAccompanyingPeriod.php
index bab67fb39..7cc2a4c35 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonHavingAccompanyingPeriod.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -30,34 +31,20 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function strlen;
 
-class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterface, ListInterface, GroupedExportInterface
+/**
+ * List the persons, having an accompanying period.
+ *
+ * Details of the accompanying period are not included
+ */
+class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterface, ListInterface, GroupedExportInterface
 {
-    private ExportAddressHelper $addressHelper;
-
-    private EntityManagerInterface $entityManager;
-
-    private ListPersonHelper $listPersonHelper;
-
-    public function __construct(
-        ExportAddressHelper $addressHelper,
-        ListPersonHelper $listPersonHelper,
-        EntityManagerInterface $em
-    ) {
-        $this->addressHelper = $addressHelper;
-        $this->listPersonHelper = $listPersonHelper;
-        $this->entityManager = $em;
-    }
+    public function __construct(private readonly ExportAddressHelper $addressHelper, private readonly ListPersonHelper $listPersonHelper, private readonly EntityManagerInterface $entityManager) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
         $choices = array_combine(ListPersonHelper::FIELDS, ListPersonHelper::FIELDS);
 
-        // Add a checkbox to select fields
         $builder->add('fields', ChoiceType::class, [
             'multiple' => true,
             'expanded' => true,
@@ -65,7 +52,7 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
             '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, 7) === 'address' || 'center' === $val || 'household' === $val) {
+                if (str_starts_with($val, 'address') || 'center' === $val || 'household' === $val) {
                     return ['data-display-target' => 'address_date'];
                 }
 
@@ -73,25 +60,29 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
             },
             'constraints' => [new Callback([
                 'callback' => static function ($selected, ExecutionContextInterface $context) {
-                    if (count($selected) === 0) {
+                    if (0 === \count($selected)) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
                     }
                 },
             ])],
-            'data' => array_values($choices),
         ]);
 
-        // add a date  field for addresses
         $builder->add('address_date', ChillDateType::class, [
             'label' => 'Data valid at this date',
             'help' => 'Data regarding center, addresses, and so on will be computed at this date',
-            'data' => new DateTimeImmutable(),
             'input' => 'datetime_immutable',
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        $choices = array_combine(ListPersonHelper::FIELDS, ListPersonHelper::FIELDS);
+
+        return ['fields' => array_values($choices), 'address_date' => new \DateTimeImmutable()];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_LIST];
@@ -117,11 +108,11 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
         $fields = [];
 
         foreach (ListPersonHelper::FIELDS as $key) {
-            if (!in_array($key, $data['fields'], true)) {
+            if (!\in_array($key, $data['fields'], true)) {
                 continue;
             }
 
-            if (substr($key, 0, strlen('address_fields')) === 'address_fields') {
+            if (str_starts_with($key, 'address_fields')) {
                 $fields = array_merge($fields, $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields'));
 
                 continue;
@@ -159,14 +150,11 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
      */
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $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();
@@ -174,10 +162,10 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
         $qb->from(Person::class, 'person')
             ->join('person.accompanyingPeriodParticipations', 'acppart')
             ->join('acppart.accompanyingPeriod', 'acp')
-            ->andWhere($qb->expr()->neq('acp.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
+            ->andWhere($qb->expr()->neq('acp.step', "'".AccompanyingPeriod::STEP_DRAFT."'"))
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
                 )
             )->setParameter('authorized_centers', $centers);
 
@@ -185,6 +173,13 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
 
         $this->listPersonHelper->addSelect($qb, $fields, $data['address_date']);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
+        $qb
+            ->addOrderBy('person.lastName')
+            ->addOrderBy('person.firstName')
+            ->addOrderBy('person.id');
+
         return $qb;
     }
 
@@ -195,7 +190,7 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
 
     public function supportsModifiers()
     {
-        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN, Declarations::ACP_TYPE];
+        return [Declarations::PERSON_TYPE, Declarations::ACP_TYPE];
     }
 
     public function validateForm($data, ExecutionContextInterface $context)
@@ -203,13 +198,13 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
         // get the field starting with address_
         $addressFields = array_filter(
             ListPersonHelper::FIELDS,
-            static fn (string $el): bool => substr($el, 0, 8) === 'address_'
+            static fn (string $el): bool => str_starts_with($el, 'address_')
         );
 
         // check if there is one field starting with address in data
-        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
+        if (\count(array_intersect($data['fields'], $addressFields)) > 0) {
             // if a field address is checked, the date must not be empty
-            if (!$data['address_date'] instanceof DateTimeImmutable) {
+            if (!$data['address_date'] instanceof \DateTimeImmutable) {
                 $context
                     ->buildViolation('You must set this date if an address is checked')
                     ->atPath('address_date')
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php
new file mode 100644
index 000000000..22be5ceca
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php
@@ -0,0 +1,147 @@
+<?php
+
+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 Chill\PersonBundle\Export\Export;
+
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Export\Helper\ListAccompanyingPeriodHelper;
+use Chill\PersonBundle\Export\Helper\ListPersonHelper;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use DateTimeImmutable;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * List the persons having an accompanying period, with the accompanying period details.
+ */
+final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInterface, GroupedExportInterface
+{
+    public function __construct(
+        private ListPersonHelper $listPersonHelper,
+        private ListAccompanyingPeriodHelper $listAccompanyingPeriodHelper,
+        private EntityManagerInterface $entityManager,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('address_date', PickRollingDateType::class, [
+            'label' => 'Data valid at this date',
+            'help' => 'Data regarding center, addresses, and so on will be computed at this date',
+        ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['address_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_LIST];
+    }
+
+    public function getDescription()
+    {
+        return 'export.list.person_with_acp.Create a list of people having an accompaying periods with details of period, according to various filters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of persons';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if (\in_array($key, $this->listPersonHelper->getAllKeys(), true)) {
+            return $this->listPersonHelper->getLabels($key, $values, $data);
+        }
+
+        return $this->listAccompanyingPeriodHelper->getLabels($key, $values, $data);
+    }
+
+    public function getQueryKeys($data)
+    {
+        return array_merge(
+            $this->listPersonHelper->getAllKeys(),
+            $this->listAccompanyingPeriodHelper->getQueryKeys($data),
+        );
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
+    }
+
+    public function getTitle()
+    {
+        return 'export.list.person_with_acp.List peoples having an accompanying period with period details';
+    }
+
+    public function getType()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    /**
+     * param array{fields: string[], address_date: DateTimeImmutable} $data.
+     */
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
+
+        $qb = $this->entityManager->createQueryBuilder();
+
+        $qb->from(Person::class, 'person')
+            ->join('person.accompanyingPeriodParticipations', 'acppart')
+            ->join('acppart.accompanyingPeriod', 'acp')
+            ->andWhere($qb->expr()->neq('acp.step', "'".AccompanyingPeriod::STEP_DRAFT."'"))
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                )
+            )->setParameter('authorized_centers', $centers);
+
+        $this->listPersonHelper->addSelect($qb, ListPersonHelper::FIELDS, $this->rollingDateConverter->convert($data['address_date']));
+        $this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['address_date']));
+
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
+        $qb
+            ->addOrderBy('person.lastName')
+            ->addOrderBy('person.firstName')
+            ->addOrderBy('person.id')
+            ->addOrderBy('acp.id');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return PersonVoter::LISTS;
+    }
+
+    public function supportsModifiers()
+    {
+        return [Declarations::PERSON_TYPE, Declarations::ACP_TYPE];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php b/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
index c124f0227..01cc94aa8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
+use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -19,20 +20,18 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
     ) {
         $this->repository = $em->getRepository(AccompanyingPeriod::class);
     }
@@ -41,10 +40,14 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
     {
         $builder->add('closingdate', ChillDateType::class, [
             'label' => 'Closingdate to apply',
-            'data' => new DateTime('now'),
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['closingdate' => new \DateTime('now')];
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -64,22 +67,13 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
     {
         return static function ($value) use ($key) {
             if ('_header' === $value) {
-                switch ($key) {
-                    case 'avg_export_result':
-                        return 'export.export.acp_stats.avg_duration';
-
-                    case 'count_acppart_export_result':
-                        return 'export.export.acp_stats.count_participations';
-
-                    case 'count_acp_export_result':
-                        return 'export.export.acp_stats.count_acps';
-
-                    case 'count_pers_export_result':
-                        return 'export.export.acp_stats.count_persons';
-
-                    default:
-                        throw new LogicException('key not supported: ' . $key);
-                }
+                return match ($key) {
+                    'avg_export_result' => 'export.export.acp_stats.avg_duration',
+                    'count_acppart_export_result' => 'export.export.acp_stats.count_participations',
+                    'count_acp_export_result' => 'export.export.acp_stats.count_acps',
+                    'count_pers_export_result' => 'export.export.acp_stats.count_persons',
+                    default => throw new \LogicException('key not supported: '.$key),
+                };
             }
 
             if (null === $value) {
@@ -112,9 +106,7 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('acp');
 
@@ -133,7 +125,7 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
             ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
@@ -141,6 +133,8 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
             ->setParameter('count_acp_step', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('authorized_centers', $centers);
 
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
         return $qb;
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
index 3fa8d711f..6bcb4f8b8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
@@ -22,12 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ActiveOnDateFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(RollingDateConverterInterface $rollingDateConverter)
-    {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -67,9 +62,12 @@ class ActiveOnDateFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('on_date', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-            ]);
+            ->add('on_date', PickRollingDateType::class, []);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function describeAction($data, $format = 'string'): array
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
index f713e8a97..3b7c4fe25 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
@@ -21,12 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ActiveOneDayBetweenDatesFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(RollingDateConverterInterface $rollingDateConverter)
-    {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -56,12 +51,13 @@ class ActiveOneDayBetweenDatesFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('date_from', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
-            ])
-            ->add('date_to', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-            ]);
+            ->add('date_from', PickRollingDateType::class, [])
+            ->add('date_to', PickRollingDateType::class, []);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function describeAction($data, $format = 'string'): array
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
index c74e309b2..915a2c9e6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
@@ -20,13 +20,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class AdministrativeLocationFilter implements FilterInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -54,6 +48,11 @@ class AdministrativeLocationFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $locations = [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
index 07e61b42e..7fb032050 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
@@ -22,13 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ClosingMotiveFilter implements FilterInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -59,14 +53,17 @@ class ClosingMotiveFilter implements FilterInterface
     {
         $builder->add('accepted_closingmotives', EntityType::class, [
             'class' => ClosingMotive::class,
-            'choice_label' => function (ClosingMotive $cm) {
-                return $this->translatableStringHelper->localize($cm->getName());
-            },
+            'choice_label' => fn (ClosingMotive $cm) => $this->translatableStringHelper->localize($cm->getName()),
             'multiple' => true,
             'expanded' => true,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $motives = [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
index 8fcd874fe..4c8baf147 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
@@ -22,18 +22,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class ConfidentialFilter implements FilterInterface
 {
     private const CHOICES = [
-        'is not confidential' => false,
-        'is confidential' => true,
+        'is not confidential' => 'false',
+        'is confidential' => 'true',
     ];
 
-    private const DEFAULT_CHOICE = false;
+    private const DEFAULT_CHOICE = 'false';
 
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -67,10 +62,14 @@ class ConfidentialFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_confidentials' => self::DEFAULT_CHOICE];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php
index b13947e60..a73f82f69 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CreatorFilter implements FilterInterface
 {
@@ -28,7 +27,7 @@ class CreatorFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acp_creator', $qb->getAllAliases(), true)) {
+        if (!\in_array('acp_creator', $qb->getAllAliases(), true)) {
             $qb->join('acp.createdBy', 'acp_creator');
         }
 
@@ -51,6 +50,11 @@ class CreatorFilter implements FilterInterface
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
index 62cf49d6d..cc7e21b08 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
@@ -11,29 +11,25 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CreatorJobFilter implements FilterInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private UserJobRepositoryInterface $userJobRepository;
+    private const PREFIX = 'acp_filter_creator_job';
 
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        UserJobRepositoryInterface $userJobRepository
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->userJobRepository = $userJobRepository;
-    }
+        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly UserJobRepositoryInterface $userJobRepository
+    ) {}
 
     public function addRole(): ?string
     {
@@ -42,13 +38,44 @@ class CreatorJobFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acp_creator', $qb->getAllAliases(), true)) {
-            $qb->join('acp.createdBy', 'acp_creator');
-        }
+        $p = self::PREFIX;
 
         $qb
-            ->andWhere($qb->expr()->in('acp_creator.userJob', ':creator_job'))
-            ->setParameter('creator_job', $data['creator_job']);
+            ->join(
+                'acp.userHistories',
+                "{$p}_userHistory",
+                Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
+                    $qb->expr()->andX(
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
+                        )
+                    )
+                )
+            )
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_history.user", "{$p}_userHistory.createdBy"),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte("{$p}_history.startDate", "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_history.endDate"),
+                            $qb->expr()->gt("{$p}_history.endDate", "{$p}_userHistory.startDate")
+                        )
+                    )
+                )
+            )
+            ->andWhere($qb->expr()->in("{$p}_history.job", ":{$p}_jobs"))
+            ->setParameter(
+                "{$p}_jobs",
+                $data['creator_job'],
+            );
     }
 
     public function applyOn(): string
@@ -58,18 +85,17 @@ class CreatorJobFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('creator_job', EntityType::class, [
-            'class' => UserJob::class,
-            'choices' => $this->userJobRepository->findAllActive(),
-            'choice_label' => function (UserJob $j) {
-                return $this->translatableStringHelper->localize(
+        $builder
+            ->add('creator_job', EntityType::class, [
+                'class' => UserJob::class,
+                'choices' => $this->userJobRepository->findAllActive(),
+                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize(
                     $j->getLabel()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true,
-            'label' => 'Job',
-        ]);
+                ),
+                'multiple' => true,
+                'expanded' => true,
+                'label' => 'Job',
+            ]);
     }
 
     public function describeAction($data, $format = 'string'): array
@@ -87,8 +113,15 @@ class CreatorJobFilter implements FilterInterface
         ]];
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'creator_job' => [],
+        ];
+    }
+
     public function getTitle(): string
     {
-        return 'Filter by creator job';
+        return 'export.filter.course.creator_job.Filter by creator job';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
index afdb717f0..671b87407 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
@@ -22,18 +22,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class EmergencyFilter implements FilterInterface
 {
     private const CHOICES = [
-        'is emergency' => true,
-        'is not emergency' => false,
+        'is emergency' => 'true',
+        'is not emergency' => 'false',
     ];
 
-    private const DEFAULT_CHOICE = false;
+    private const DEFAULT_CHOICE = 'false';
 
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -67,10 +62,14 @@ class EmergencyFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_emergency' => self::DEFAULT_CHOICE];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
index 1839268e1..bec01c249 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
@@ -19,21 +19,10 @@ use Chill\PersonBundle\Repository\SocialWork\EvaluationRepositoryInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class EvaluationFilter implements FilterInterface
 {
-    private EvaluationRepositoryInterface $evaluationRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        EvaluationRepositoryInterface $evaluationRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->evaluationRepository = $evaluationRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly EvaluationRepositoryInterface $evaluationRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -42,15 +31,15 @@ class EvaluationFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             $qb->join('acp.works', 'acpw');
         }
 
-        if (!in_array('workeval', $qb->getAllAliases(), true)) {
+        if (!\in_array('workeval', $qb->getAllAliases(), true)) {
             $qb->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
         }
 
-        if (!in_array('eval', $qb->getAllAliases(), true)) {
+        if (!\in_array('eval', $qb->getAllAliases(), true)) {
             $qb->join('workeval.evaluation', 'eval');
         }
 
@@ -69,15 +58,18 @@ class EvaluationFilter implements FilterInterface
         $builder->add('accepted_evaluations', EntityType::class, [
             'class' => Evaluation::class,
             'choices' => $this->evaluationRepository->findAllActive(),
-            'choice_label' => function (Evaluation $ev) {
-                return $this->translatableStringHelper->localize($ev->getTitle());
-            },
+            'choice_label' => fn (Evaluation $ev) => $this->translatableStringHelper->localize($ev->getTitle()),
             'multiple' => true,
             'expanded' => false,
             'attr' => ['class' => 'select2'],
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $evaluations = [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
index 5bbb22e53..695831f9c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
@@ -32,25 +32,7 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class GeographicalUnitStatFilter implements FilterInterface
 {
-    private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository;
-
-    private GeographicalUnitRepositoryInterface $geographicalUnitRepository;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        GeographicalUnitRepositoryInterface $geographicalUnitRepository,
-        GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->geographicalUnitRepository = $geographicalUnitRepository;
-        $this->geographicalUnitLayerRepository = $geographicalUnitLayerRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly GeographicalUnitRepositoryInterface $geographicalUnitRepository, private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -62,10 +44,10 @@ class GeographicalUnitStatFilter implements FilterInterface
         $subQueryDql =
             'SELECT
                 1
-            FROM ' . AccompanyingPeriod\AccompanyingPeriodLocationHistory::class . ' acp_geog_filter_location_history
-            LEFT JOIN ' . PersonHouseholdAddress::class . ' acp_geog_filter_address_person_location
+            FROM '.AccompanyingPeriod\AccompanyingPeriodLocationHistory::class.' acp_geog_filter_location_history
+            LEFT JOIN '.PersonHouseholdAddress::class.' acp_geog_filter_address_person_location
                 WITH IDENTITY(acp_geog_filter_location_history.personLocation) = IDENTITY(acp_geog_filter_address_person_location.person)
-            LEFT JOIN ' . Address::class . ' acp_geog_filter_address
+            LEFT JOIN '.Address::class.' acp_geog_filter_address
                 WITH COALESCE(IDENTITY(acp_geog_filter_address_person_location.address), IDENTITY(acp_geog_filter_location_history.addressLocation)) = acp_geog_filter_address.id
             LEFT JOIN acp_geog_filter_address.geographicalUnits acp_geog_filter_units
             WHERE
@@ -100,16 +82,13 @@ class GeographicalUnitStatFilter implements FilterInterface
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'Compute geographical location at date',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ])
             ->add('units', ChoiceType::class, [
                 'label' => 'Geographical unit',
                 'placeholder' => 'Select a geographical unit',
                 'choices' => $this->geographicalUnitRepository->findAll(),
                 'choice_value' => static fn (SimpleGeographicalUnitDTO $item) => $item->id,
-                'choice_label' => function (SimpleGeographicalUnitDTO $item) {
-                    return $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()) . ' > ' . $item->unitName;
-                },
+                'choice_label' => fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()).' > '.$item->unitName,
                 'attr' => [
                     'class' => 'select2',
                 ],
@@ -117,6 +96,11 @@ class GeographicalUnitStatFilter implements FilterInterface
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return ['Filtered by geographic unit: computed at %date%, only in %units%', [
@@ -124,9 +108,7 @@ class GeographicalUnitStatFilter implements FilterInterface
             '%units' => implode(
                 ', ',
                 array_map(
-                    function (SimpleGeographicalUnitDTO $item) {
-                        return $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()) . ' > ' . $item->unitName;
-                    },
+                    fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()).' > '.$item->unitName,
                     $data['units']
                 )
             ),
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
index 54c28d027..3ac083b32 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
@@ -26,7 +26,7 @@ class HasNoActionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data): void
     {
-        $qb->andWhere('NOT EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' work WHERE work.accompanyingPeriod = acp)');
+        $qb->andWhere('NOT EXISTS (SELECT 1 FROM '.AccompanyingPeriodWork::class.' work WHERE work.accompanyingPeriod = acp)');
     }
 
     public function applyOn(): string
@@ -39,6 +39,11 @@ class HasNoActionFilter implements FilterInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return ['Filtered acp which has no actions'];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
index 4c682a56a..72bcce39e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
@@ -22,13 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class HasNoReferrerFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -40,7 +34,7 @@ class HasNoReferrerFilter implements FilterInterface
         $qb
             ->andWhere('
                 NOT EXISTS (
-                    SELECT 1 FROM ' . UserHistory::class . ' uh
+                    SELECT 1 FROM '.UserHistory::class.' uh
                     WHERE uh.startDate <= :has_no_referrer_filter_date
                     AND (
                         uh.endDate IS NULL
@@ -65,10 +59,14 @@ class HasNoReferrerFilter implements FilterInterface
         $builder
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'Has no referrer on this date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return ['Filtered acp which has no referrer on date: %date%', [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php
index 615ace4c6..88d1d6933 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php
@@ -17,19 +17,12 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class HasTemporaryLocationFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -47,20 +40,11 @@ class HasTemporaryLocationFilter implements FilterInterface
                 $this->rollingDateConverter->convert($data['calc_date'])
             );
 
-        switch ($data['having_temporarily']) {
-            case true:
-                $qb->andWhere('acp_having_temporarily_location.addressLocation IS NOT NULL');
-
-                break;
-
-            case false:
-                $qb->andWhere('acp_having_temporarily_location.personLocation IS NOT NULL');
-
-                break;
-
-            default:
-                throw new LogicException('value not supported');
-        }
+        match ($data['having_temporarily']) {
+            true => $qb->andWhere('acp_having_temporarily_location.addressLocation IS NOT NULL'),
+            false => $qb->andWhere('acp_having_temporarily_location.personLocation IS NOT NULL'),
+            default => throw new \LogicException('value not supported'),
+        };
     }
 
     public function applyOn(): string
@@ -77,37 +61,29 @@ class HasTemporaryLocationFilter implements FilterInterface
                     'export.filter.course.having_temporarily.Having a temporarily location' => true,
                     'export.filter.course.having_temporarily.Having a person\'s location' => false,
                 ],
-                'choice_label' => static function ($choice) {
-                    switch ($choice) {
-                        case true:
-                            return 'export.filter.course.having_temporarily.Having a temporarily location';
-
-                        case false:
-                            return 'export.filter.course.having_temporarily.Having a person\'s location';
-
-                        default:
-                            throw new LogicException('this choice is not supported');
-                    }
+                'choice_label' => static fn ($choice) => match ($choice) {
+                    true => 'export.filter.course.having_temporarily.Having a temporarily location',
+                    false => 'export.filter.course.having_temporarily.Having a person\'s location',
+                    default => throw new \LogicException('this choice is not supported'),
                 },
             ])
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'export.filter.course.having_temporarily.Calculation date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
-        switch ($data['having_temporarily']) {
-            case true:
-                return ['export.filter.course.having_temporarily.Having a temporarily location', []];
-
-            case false:
-                return ['export.filter.course.having_temporarily.Having a person\'s location', []];
-
-            default:
-                throw new LogicException('value not supported');
-        }
+        return match ($data['having_temporarily']) {
+            true => ['export.filter.course.having_temporarily.Having a temporarily location', []],
+            false => ['export.filter.course.having_temporarily.Having a person\'s location', []],
+            default => throw new \LogicException('value not supported'),
+        };
     }
 
     public function getTitle(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php
new file mode 100644
index 000000000..d6436f8b4
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php
@@ -0,0 +1,91 @@
+<?php
+
+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 Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Filter accompanying course which have a row in AccompanyingPeriodInfo within the given
+ * interval.
+ */
+final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements FilterInterface
+{
+    public function __construct(
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.having_info_within_interval.start_date',
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.having_info_within_interval.end_date',
+            ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['start_date' => new RollingDate(RollingDate::T_TODAY), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.course.having_info_within_interval.title';
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.course.having_info_within_interval.Only course with events between %startDate% and %endDate%',
+            [
+                '%startDate%' => $this->rollingDateConverter->convert($data['start_date'])->format('d-m-Y'),
+                '%endDate%' => $this->rollingDateConverter->convert($data['end_date'])->format('d-m-Y'),
+            ],
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $ai = 'having_ai_within_interval_acc_info';
+        $as = 'having_ai_within_interval_start_date';
+        $ae = 'having_ai_within_interval_end_date';
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriodInfo::class." {$ai} WHERE {$ai}.infoDate BETWEEN :{$as} AND :{$ae} AND IDENTITY({$ai}.accompanyingPeriod) = acp.id"
+                )
+            )
+            ->setParameter($as, $this->rollingDateConverter->convert($data['start_date']), Types::DATETIME_IMMUTABLE)
+            ->setParameter($ae, $this->rollingDateConverter->convert($data['end_date']), Types::DATETIME_IMMUTABLE);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
index b0c2205a0..3eb8bbb24 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
@@ -28,12 +28,7 @@ class IntensityFilter implements FilterInterface
 
     private const DEFAULT_CHOICE = 'occasional';
 
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -67,10 +62,14 @@ class IntensityFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_intensities' => self::DEFAULT_CHOICE];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php
new file mode 100644
index 000000000..5f0cf373b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php
@@ -0,0 +1,141 @@
+<?php
+
+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 Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Entity\User\UserJobHistory;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Filter course where a user with the given job is "working" on it.
+ *
+ * Makes use of AccompanyingPeriodInfo
+ */
+readonly class JobWorkingOnCourseFilter implements FilterInterface
+{
+    private const PREFIX = 'acp_filter_user_job_working_on_course';
+
+    public function __construct(
+        private UserJobRepositoryInterface $userJobRepository,
+        private RollingDateConverterInterface $rollingDateConverter,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {}
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $p = self::PREFIX;
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriodInfo::class." {$p}_info "
+                    ."JOIN {$p}_info.user {$p}_user "
+                    .'JOIN '.UserJobHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE IDENTITY({$p}_info.accompanyingPeriod) = acp.id "
+                    ."AND {$p}_history.job IN (:{$p}_jobs) "
+                    // job_at based on _info.infoDate
+                    ."AND {$p}_history.startDate <= {$p}_info.infoDate "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > {$p}_info.infoDate) "
+                    ."AND {$p}_info.infoDate >= :{$p}_start and {$p}_info.infoDate < :{$p}_end"
+                )
+            )
+            ->setParameter("{$p}_jobs", $data['jobs'])
+            ->setParameter(
+                "{$p}_start",
+                $this->rollingDateConverter->convert($data['start_date']),
+            )
+            ->setParameter(
+                "{$p}_end",
+                $this->rollingDateConverter->convert($data['end_date'])
+            )
+        ;
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $jobs = $this->userJobRepository->findAllActive();
+        usort($jobs, fn (UserJob $a, UserJob $b) => $this->translatableStringHelper->localize($a->getLabel()) <=> $this->translatableStringHelper->localize($b->getLabel()));
+
+        $builder
+            ->add('jobs', EntityType::class, [
+                'class' => UserJob::class,
+                'choices' => $jobs,
+                'choice_label' => fn (UserJob $userJob) => $this->translatableStringHelper->localize($userJob->getLabel()),
+                'multiple' => true,
+                'expanded' => true,
+            ])
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_job_working.Job working after',
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_job_working.Job working before',
+            ])
+            // ->add('job_at', PickRollingDateType::class, [
+            //    'label' => 'bla',
+            //    'help' => 'bli',
+            //    'required' => false,
+            // ])
+        ;
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.course.by_job_working.Filtered by job working on course: only %jobs%, between %start_date% and %end_date%', [
+                '%jobs%' => implode(
+                    ', ',
+                    array_map(
+                        fn (UserJob $userJob) => $this->translatableStringHelper->localize($userJob->getLabel()),
+                        $data['jobs']
+                    )
+                ),
+                '%start_date%' => $this->rollingDateConverter->convert($data['start_date'])?->format('d-m-Y'),
+                '%end_date%' => $this->rollingDateConverter->convert($data['end_date'])?->format('d-m-Y'),
+            ],
+        ];
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'jobs' => [],
+            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
+            'end_date' => new RollingDate(RollingDate::T_TODAY),
+            // 'job_at' => null,
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.course.by_job_working.title';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
index 07ca1de75..1b85f6cd7 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
@@ -22,12 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class OpenBetweenDatesFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(RollingDateConverterInterface $rollingDateConverter)
-    {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -38,7 +33,7 @@ class OpenBetweenDatesFilter implements FilterInterface
     {
         $clause = $qb->expr()->andX(
             $qb->expr()->gte('acp.openingDate', ':datefrom'),
-            $qb->expr()->lte('acp.openingDate', ':dateto')
+            $qb->expr()->lt('acp.openingDate', ':dateto')
         );
 
         $qb->andWhere($clause);
@@ -54,12 +49,13 @@ class OpenBetweenDatesFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('date_from', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_MONTH_PREVIOUS_START),
-            ])
-            ->add('date_to', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-            ]);
+            ->add('date_from', PickRollingDateType::class, [])
+            ->add('date_to', PickRollingDateType::class, []);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_MONTH_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function describeAction($data, $format = 'string'): array
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
index 445535734..617577cde 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
@@ -22,13 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class OriginFilter implements FilterInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -59,14 +53,17 @@ class OriginFilter implements FilterInterface
     {
         $builder->add('accepted_origins', EntityType::class, [
             'class' => Origin::class,
-            'choice_label' => function (Origin $o) {
-                return $this->translatableStringHelper->localize($o->getLabel());
-            },
+            'choice_label' => fn (Origin $o) => $this->translatableStringHelper->localize($o->getLabel()),
             'multiple' => true,
             'expanded' => true,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $origins = [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
index 2a3e5d17e..30f67f664 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -29,13 +28,7 @@ class ReferrerFilter implements FilterInterface
 
     private const PU = 'acp_referrer_filter_users';
 
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -48,15 +41,15 @@ class ReferrerFilter implements FilterInterface
             ->join('acp.userHistories', self::A)
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
+                    $qb->expr()->lte(self::A.'.startDate', ':'.self::P),
                     $qb->expr()->orX(
-                        $qb->expr()->isNull(self::A . '.endDate'),
-                        $qb->expr()->gt(self::A . '.endDate', ':' . self::P)
+                        $qb->expr()->isNull(self::A.'.endDate'),
+                        $qb->expr()->gt(self::A.'.endDate', ':'.self::P)
                     )
                 )
             )
             ->andWhere(
-                $qb->expr()->in(self::A . '.user', ':' . self::PU)
+                $qb->expr()->in(self::A.'.user', ':'.self::PU)
             )
             ->setParameter(self::PU, $data['accepted_referrers'])
             ->setParameter(
@@ -77,12 +70,16 @@ class ReferrerFilter implements FilterInterface
                 'multiple' => true,
             ])
             ->add('date_calc', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
                 'label' => 'export.filter.course.by_referrer.Computation date for referrer',
                 'required' => true,
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY), 'accepted_referrers' => []];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $users = [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
index 3295a5b57..0b7ce6994 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
@@ -16,13 +16,11 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
-use Exception;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
-final class RequestorFilter implements FilterInterface
+final readonly class RequestorFilter implements FilterInterface
 {
     private const DEFAULT_CHOICE = 'participation';
 
@@ -33,17 +31,7 @@ final class RequestorFilter implements FilterInterface
         'no requestor' => 'no_requestor',
     ];
 
-    private EntityManagerInterface $em;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator,
-        EntityManagerInterface $em
-    ) {
-        $this->translator = $translator;
-        $this->em = $em;
-    }
+    public function __construct(private TranslatorInterface $translator, private EntityManagerInterface $em) {}
 
     public function addRole(): ?string
     {
@@ -56,7 +44,7 @@ final class RequestorFilter implements FilterInterface
 
         switch ($data['accepted_choices']) {
             case 'participation':
-                if (!in_array('acppart', $qb->getAllAliases(), true)) {
+                if (!\in_array('acppart', $qb->getAllAliases(), true)) {
                     $qb->join('acp.participations', 'acppart');
                 }
 
@@ -102,7 +90,7 @@ final class RequestorFilter implements FilterInterface
                 break;
 
             default:
-                throw new Exception('Uncaught choice exception');
+                throw new \Exception('Uncaught choice exception');
         }
 
         if ($where instanceof Andx) {
@@ -126,10 +114,14 @@ final class RequestorFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_choices' => self::DEFAULT_CHOICE];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $choice = array_flip(self::REQUESTOR_CHOICES)[$data['accepted_choices']];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php
new file mode 100644
index 000000000..36ec27357
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php
@@ -0,0 +1,135 @@
+<?php
+
+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 Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Filter course where a user with the given scope is "working" on it.
+ *
+ * Makes use of AccompanyingPeriodInfo
+ */
+readonly class ScopeWorkingOnCourseFilter implements FilterInterface
+{
+    private const PREFIX = 'acp_filter_user_scope_working_on_course';
+
+    public function __construct(
+        private ScopeRepositoryInterface $scopeRepository,
+        private RollingDateConverterInterface $rollingDateConverter,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {}
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $p = self::PREFIX;
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriodInfo::class." {$p}_info  "
+                    ."JOIN {$p}_info.user {$p}_user "
+                    .'JOIN '.UserScopeHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
+                    ."WHERE IDENTITY({$p}_info.accompanyingPeriod) = acp.id "
+                    ."AND {$p}_history.scope IN ( :{$p}_scopes ) "
+                    // scope_at based on _info.infoDate
+                    ."AND {$p}_history.startDate <= {$p}_info.infoDate "
+                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > {$p}_info.infoDate) "
+                    ."AND {$p}_info.infoDate >= :{$p}_start AND {$p}_info.infoDate < :{$p}_end"
+                )
+            )
+            ->setParameter("{$p}_scopes", $data['scopes'])
+            ->setParameter(
+                "{$p}_start",
+                $this->rollingDateConverter->convert($data['start_date']),
+            )
+            ->setParameter(
+                "{$p}_end",
+                $this->rollingDateConverter->convert($data['end_date'])
+            )
+        ;
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $scopes = $this->scopeRepository->findAllActive();
+        usort($scopes, fn (Scope $a, Scope $b) => $this->translatableStringHelper->localize($a->getName()) <=> $this->translatableStringHelper->localize($b->getName()));
+
+        $builder
+            ->add('scopes', EntityType::class, [
+                'class' => Scope::class,
+                'choices' => $scopes,
+                'choice_label' => fn (Scope $scope) => $this->translatableStringHelper->localize($scope->getName()),
+                'multiple' => true,
+                'expanded' => true,
+            ])
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_scope_working.Scope working after',
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_scope_working.Scope working before',
+            ])
+        ;
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.course.by_scope_working.Filtered by scope working on course: only %scopes%, between %start_date% and %end_date%', [
+                '%scopes%' => implode(
+                    ', ',
+                    array_map(
+                        fn (Scope $scope) => $this->translatableStringHelper->localize($scope->getName()),
+                        $data['scopes']
+                    )
+                ),
+                '%start_date%' => $this->rollingDateConverter->convert($data['start_date'])?->format('d-m-Y'),
+                '%end_date%' => $this->rollingDateConverter->convert($data['end_date'])?->format('d-m-Y'),
+            ],
+        ];
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'scopes' => [],
+            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
+            'end_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.course.by_scope_working.title';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
index bc1f368da..cba86c257 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
@@ -12,28 +12,17 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Form\Type\PickSocialActionType;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class SocialActionFilter implements FilterInterface
+final readonly class SocialActionFilter implements FilterInterface
 {
-    private SocialActionRender $actionRender;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        SocialActionRender $actionRender
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->actionRender = $actionRender;
-    }
+    public function __construct(private SocialActionRender $actionRender) {}
 
     public function addRole(): ?string
     {
@@ -42,21 +31,17 @@ class SocialActionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
-            $qb->join('acp.works', 'acpw');
-        }
+        $qb->andWhere(
+            $qb->expr()->exists(
+                sprintf(
+                    'SELECT 1 FROM %s acp_by_social_action_filter WHERE acp_by_social_action_filter.socialAction '
+                    .'IN (:acp_by_social_action_filter_actions) AND acp_by_social_action_filter.accompanyingPeriod = acp',
+                    AccompanyingPeriod\AccompanyingPeriodWork::class
+                )
+            )
+        );
 
-        if (!in_array('acpwsocialaction', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.socialAction', 'acpwsocialaction');
-        }
-
-        $clause = $qb->expr()->in('acpwsocialaction.id', ':socialactions');
-
-        $qb->andWhere($clause)
-            ->setParameter(
-                'socialactions',
-                SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions'])->toArray()
-            );
+        $qb->setParameter('acp_by_social_action_filter_actions', SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions']));
     }
 
     public function applyOn(): string
@@ -71,6 +56,11 @@ class SocialActionFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $actions = [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
index 917e129bf..7b5bb81dc 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
@@ -19,7 +19,6 @@ use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class SocialIssueFilter implements FilterInterface
 {
@@ -28,14 +27,11 @@ class SocialIssueFilter implements FilterInterface
      */
     protected $translator;
 
-    private SocialIssueRender $socialIssueRender;
-
     public function __construct(
         TranslatorInterface $translator,
-        SocialIssueRender $socialIssueRender
+        private readonly SocialIssueRender $socialIssueRender
     ) {
         $this->translator = $translator;
-        $this->socialIssueRender = $socialIssueRender;
     }
 
     public function addRole(): ?string
@@ -45,7 +41,7 @@ class SocialIssueFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpsocialissue', $qb->getAllAliases(), true)) {
+        if (!\in_array('acpsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('acp.socialIssues', 'acpsocialissue');
         }
 
@@ -70,6 +66,11 @@ class SocialIssueFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $issues = [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php
new file mode 100644
index 000000000..9d49f820b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php
@@ -0,0 +1,114 @@
+<?php
+
+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 Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class StepFilterBetweenDates implements FilterInterface
+{
+    private const DEFAULT_CHOICE = [
+        AccompanyingPeriod::STEP_CONFIRMED,
+        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+    ];
+
+    private const STEPS = [
+        'course.draft' => AccompanyingPeriod::STEP_DRAFT,
+        'course.confirmed' => AccompanyingPeriod::STEP_CONFIRMED,
+        'course.closed' => AccompanyingPeriod::STEP_CLOSED,
+        'course.inactive_short' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+        'course.inactive_long' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+    ];
+
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter, private readonly TranslatorInterface $translator) {}
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $alias = 'acp_filter_by_step_between_dat_alias';
+        $steps = 'acp_filter_by_step_between_dat_steps';
+        $from = 'acp_filter_by_step_between_dat_from';
+        $to = 'acp_filter_by_step_between_dat_to';
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriod\AccompanyingPeriodStepHistory::class." {$alias} ".
+                    "WHERE {$alias}.step IN (:{$steps}) AND OVERLAPSI ({$alias}.startDate, {$alias}.endDate),(:{$from}, :{$to}) = TRUE ".
+                    "AND {$alias}.period = acp"
+                )
+            )
+            ->setParameter($from, $this->rollingDateConverter->convert($data['date_from']))
+            ->setParameter($to, $this->rollingDateConverter->convert($data['date_to']))
+            ->setParameter($steps, $data['accepted_steps_multi']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('accepted_steps_multi', ChoiceType::class, [
+                'label' => 'export.filter.course.by_step.steps',
+                'choices' => self::STEPS,
+                'multiple' => true,
+                'expanded' => true,
+            ])
+            ->add('date_from', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_step.date_from',
+            ])
+            ->add('date_to', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_step.date_to',
+            ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'accepted_steps_multi' => self::DEFAULT_CHOICE,
+            'date_from' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
+            'date_to' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $steps = array_map(fn (string $step) => $this->translator->trans(array_flip(self::STEPS)[$step]), $data['accepted_steps_multi']);
+
+        return ['export.filter.course.by_step.Filtered by steps: only %step% and between %date_from% and %date_to%', [
+            '%step%' => implode(', ', $steps),
+            '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
+            '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'export.filter.course.by_step.Filter by step between dates';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
similarity index 52%
rename from src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php
rename to src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
index 240b093b5..bca812b86 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
@@ -21,36 +21,28 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
-class StepFilter implements FilterInterface
+class StepFilterOnDate implements FilterInterface
 {
     private const A = 'acp_filter_bystep_stephistories';
 
-    private const DEFAULT_CHOICE = AccompanyingPeriod::STEP_CONFIRMED;
+    private const DEFAULT_CHOICE = [
+        AccompanyingPeriod::STEP_CONFIRMED,
+        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+    ];
 
     private const P = 'acp_step_filter_date';
 
     private const STEPS = [
-        'Draft' => AccompanyingPeriod::STEP_DRAFT,
-        'Confirmed' => AccompanyingPeriod::STEP_CONFIRMED,
-        'Closed' => AccompanyingPeriod::STEP_CLOSED,
+        'course.draft' => AccompanyingPeriod::STEP_DRAFT,
+        'course.confirmed' => AccompanyingPeriod::STEP_CONFIRMED,
+        'course.closed' => AccompanyingPeriod::STEP_CLOSED,
+        'course.inactive_short' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+        'course.inactive_long' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
     ];
 
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter,
-        TranslatorInterface $translator
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter, private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -59,25 +51,25 @@ class StepFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array(self::A, $qb->getAllAliases(), true)) {
+        if (!\in_array(self::A, $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.stepHistories', self::A);
         }
 
         $qb
             ->andWhere(
                 $qb->expr()->andX(
-                    $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
+                    $qb->expr()->lte(self::A.'.startDate', ':'.self::P),
                     $qb->expr()->orX(
-                        $qb->expr()->isNull(self::A . '.endDate'),
-                        $qb->expr()->lt(self::A . '.endDate', ':' . self::P)
+                        $qb->expr()->isNull(self::A.'.endDate'),
+                        $qb->expr()->lt(self::A.'.endDate', ':'.self::P)
                     )
                 )
             )
             ->andWhere(
-                $qb->expr()->in(self::A . '.step', ':acp_filter_by_step_steps')
+                $qb->expr()->in(self::A.'.step', ':acp_filter_by_step_steps')
             )
             ->setParameter(self::P, $this->rollingDateConverter->convert($data['calc_date']))
-            ->setParameter('acp_filter_by_step_steps', $data['accepted_steps']);
+            ->setParameter('acp_filter_by_step_steps', $data['accepted_steps_multi']);
     }
 
     public function applyOn()
@@ -88,30 +80,36 @@ class StepFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('accepted_steps', ChoiceType::class, [
+            ->add('accepted_steps_multi', ChoiceType::class, [
+                'label' => 'export.filter.course.by_step.steps',
                 'choices' => self::STEPS,
-                'multiple' => false,
+                'multiple' => true,
                 'expanded' => true,
-                'empty_data' => self::DEFAULT_CHOICE,
-                'data' => self::DEFAULT_CHOICE,
             ])
             ->add('calc_date', PickRollingDateType::class, [
-                'label' => 'export.acp.filter.by_step.date_calc',
-                'data' => new RollingDate(RollingDate::T_TODAY),
+                'label' => 'export.filter.course.by_step.date_calc',
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'accepted_steps_multi' => self::DEFAULT_CHOICE,
+            'calc_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
     public function describeAction($data, $format = 'string')
     {
-        $step = array_flip(self::STEPS)[$data['accepted_steps']];
+        $steps = array_map(fn (string $step) => $this->translator->trans(array_flip(self::STEPS)[$step]), $data['accepted_steps_multi']);
 
         return ['Filtered by steps: only %step%', [
-            '%step%' => $this->translator->trans($step),
+            '%step%' => implode(', ', $steps),
         ]];
     }
 
     public function getTitle()
     {
-        return 'Filter by step';
+        return 'export.filter.course.by_step.Filter by step';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
index 05d84d7b2..df8afefa9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
@@ -11,44 +11,25 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
+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\Security;
 
 class UserJobFilter implements FilterInterface
 {
-    private const A = 'acp_ujob_filter_uhistory';
-
-    private const AU = 'acp_ujob_filter_uhistory_user';
-
-    private const P = 'acp_ujob_filter_date';
-
-    private const PJ = 'acp_ujob_filter_job';
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private UserJobRepositoryInterface $userJobRepository;
+    private const PREFIX = 'acp_filter_user_job';
 
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        UserJobRepositoryInterface $userJobRepository,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->userJobRepository = $userJobRepository;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly UserJobRepositoryInterface $userJobRepository,
+    ) {}
 
     public function addRole(): ?string
     {
@@ -57,26 +38,45 @@ class UserJobFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $p = self::PREFIX;
+
         $qb
-            ->join('acp.userHistories', self::A)
-            ->andWhere(
+            ->leftJoin(
+                'acp.userHistories',
+                "{$p}_userHistory",
+                Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull(self::A . '.endDate'),
-                        $qb->expr()->gt(self::A . '.endDate', ':' . self::P)
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
+                    $qb->expr()->andX(
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
+                        )
                     )
                 )
             )
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_jobHistory",
+                Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_jobHistory.user", "{$p}_userHistory.user"),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte("{$p}_jobHistory.startDate", "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_jobHistory".'.endDate'),
+                            $qb->expr()->gt("{$p}_jobHistory.endDate", "{$p}_userHistory.startDate")
+                        )
+                    )
+                )
+            )
+            ->andWhere($qb->expr()->in("{$p}_jobHistory.job", ":{$p}_job"))
             ->setParameter(
-                self::P,
-                $this->rollingDateConverter->convert($data['date_calc'])
+                "{$p}_job",
+                $data['jobs'],
             )
-            ->join(self::A . '.user', self::AU)
-            ->andWhere(
-                $qb->expr()->in(self::AU . '.userJob', ':' . self::PJ)
-            )
-            ->setParameter(self::PJ, $data['jobs']);
+        ;
     }
 
     public function applyOn()
@@ -94,18 +94,13 @@ class UserJobFilter implements FilterInterface
                 'expanded' => true,
                 'choice_label' => fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()),
                 'label' => 'Job',
-            ])
-            ->add('date_calc', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-                'label' => 'export.filter.course.by_user_scope.Computation date for referrer',
-                'required' => true,
             ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
         return [
-            'Filtered by user job: only %job%', [
+            'export.filter.course.by_user_job.Filtered by user job: only %job%', [
                 '%job%' => implode(
                     ', ',
                     array_map(
@@ -117,8 +112,15 @@ class UserJobFilter implements FilterInterface
         ];
     }
 
-    public function getTitle()
+    public function getFormDefaultData(): array
     {
-        return 'Filter by user job';
+        return [
+            'jobs' => [],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.course.by_user_job.Filter by user job';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
index bbffa4bca..f9ee7dcd9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
@@ -12,48 +12,24 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
+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\Security;
 
 class UserScopeFilter implements FilterInterface
 {
-    private const A = 'acp_uscope_filter_uhistory';
-
-    private const AU = 'acp_uscope_filter_uhistory_user';
-
-    private const P = 'acp_uscope_filter_date';
-
-    private const PS = 'acp_uscope_filter_scopes';
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private Security $security;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'acp_filter_main_scope';
 
     public function __construct(
-        ScopeRepositoryInterface $scopeRepository,
-        Security $security,
-        TranslatableStringHelper $translatableStringHelper,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->security = $security;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+        private readonly ScopeRepositoryInterface $scopeRepository,
+        private readonly TranslatableStringHelper $translatableStringHelper,
+    ) {}
 
     public function addRole(): ?string
     {
@@ -62,29 +38,48 @@ class UserScopeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $p = self::PREFIX;
+
         $qb
-            ->join('acp.userHistories', self::A)
-            ->andWhere(
+            ->join(
+                'acp.userHistories',
+                "{$p}_userHistory",
+                Join::WITH,
                 $qb->expr()->andX(
-                    $qb->expr()->lte(self::A . '.startDate', ':' . self::P),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull(self::A . '.endDate'),
-                        $qb->expr()->gt(self::A . '.endDate', ':' . self::P)
+                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
+                    $qb->expr()->andX(
+                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
+                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
+                        )
                     )
                 )
             )
+            ->join(
+                UserScopeHistory::class,
+                "{$p}_scopeHistory",
+                Join::WITH,
+                $qb->expr()->andX(
+                    $qb->expr()->eq("{$p}_scopeHistory.user", "{$p}_userHistory.user"),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte("{$p}_scopeHistory.startDate", "{$p}_userHistory.startDate"),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull("{$p}_scopeHistory.endDate"),
+                            $qb->expr()->gt("{$p}_scopeHistory.endDate", "{$p}_userHistory.startDate")
+                        )
+                    )
+                )
+            )
+            ->andWhere($qb->expr()->in("{$p}_scopeHistory.scope", ":{$p}_scopes"))
             ->setParameter(
-                self::P,
-                $this->rollingDateConverter->convert($data['date_calc'])
+                "{$p}_scopes",
+                $data['scopes'],
             )
-            ->join(self::A . '.user', self::AU)
-            ->andWhere(
-                $qb->expr()->in(self::AU . '.mainScope', ':' . self::PS)
-            )
-            ->setParameter(self::PS, $data['scopes']);
+        ;
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }
@@ -98,18 +93,13 @@ class UserScopeFilter implements FilterInterface
                 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
                 'multiple' => true,
                 'expanded' => true,
-            ])
-            ->add('date_calc', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-                'label' => 'export.filter.course.by_user_scope.Computation date for referrer',
-                'required' => true,
             ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
         return [
-            'Filtered by user main scope: only %scope%', [
+            'export.filter.course.by_user_scope.Filtered by user main scope: only %scope%', [
                 '%scope%' => implode(
                     ', ',
                     array_map(
@@ -121,16 +111,15 @@ class UserScopeFilter implements FilterInterface
         ];
     }
 
-    public function getTitle()
+    public function getFormDefaultData(): array
     {
-        return 'Filter by user scope';
+        return [
+            'scopes' => [],
+        ];
     }
 
-    private function getUserMainScope(): Scope
+    public function getTitle(): string
     {
-        /** @var User $user */
-        $user = $this->security->getUser();
-
-        return $user->getMainScope();
+        return 'export.filter.course.by_user_scope.Filter by user scope';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php
new file mode 100644
index 000000000..e73ef234a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php
@@ -0,0 +1,113 @@
+<?php
+
+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 Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Filter course where a user is "working" on it.
+ *
+ * Makes use of AccompanyingPeriodInfo
+ */
+readonly class UserWorkingOnCourseFilter implements FilterInterface
+{
+    public function __construct(
+        private UserRender $userRender,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('users', PickUserDynamicType::class, [
+                'multiple' => true,
+            ])
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_user_working.User working after',
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_user_working.User working before',
+            ])
+        ;
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'users' => [],
+            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
+            'end_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.course.by_user_working.title';
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.course.by_user_working.Filtered by user working on course: only %users%, between %start_date% and %end_date%', [
+                '%users%' => implode(
+                    ', ',
+                    array_map(
+                        fn (User $u) => $this->userRender->renderString($u, []),
+                        $data['users']
+                    )
+                ),
+                '%start_date%' => $this->rollingDateConverter->convert($data['start_date'])?->format('d-m-Y'),
+                '%end_date%' => $this->rollingDateConverter->convert($data['end_date'])?->format('d-m-Y'),
+            ],
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $ai_alias = 'user_working_on_course_filter_acc_info';
+        $ai_users = 'user_working_on_course_filter_users';
+        $start = 'acp_use_work_on_start';
+        $end = 'acp_use_work_on_end';
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriod\AccompanyingPeriodInfo::class." {$ai_alias}  ".
+                    "WHERE {$ai_alias}.user IN (:{$ai_users}) AND IDENTITY({$ai_alias}.accompanyingPeriod) = acp.id AND {$ai_alias}.infoDate >= :{$start} and {$ai_alias}.infoDate < :{$end}"
+                )
+            )
+            ->setParameter($ai_users, $data['users'])
+            ->setParameter($start, $this->rollingDateConverter->convert($data['start_date']))
+            ->setParameter($end, $this->rollingDateConverter->convert($data['end_date']))
+        ;
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
index de86604e6..a0d8d0033 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
@@ -21,12 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByEndDateFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(RollingDateConverterInterface $rollingDateConverter)
-    {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -57,14 +52,17 @@ class ByEndDateFilter implements FilterInterface
         $builder
             ->add('start_date', PickRollingDateType::class, [
                 'label' => 'start period date',
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
             ])
             ->add('end_date', PickRollingDateType::class, [
                 'label' => 'end period date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['start_date' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return ['Filtered by end date: between %start_date% and %end_date%', [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
index 27518599c..401cd79a5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
@@ -21,12 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByStartDateFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(RollingDateConverterInterface $rollingDateConverter)
-    {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -57,14 +52,17 @@ class ByStartDateFilter implements FilterInterface
         $builder
             ->add('start_date', PickRollingDateType::class, [
                 'label' => 'start period date',
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
             ])
             ->add('end_date', PickRollingDateType::class, [
                 'label' => 'end period date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['start_date' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return ['Filtered by start date: between %start_date% and %end_date%', [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
index 140f6c3cb..360b47f2d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
@@ -35,7 +35,12 @@ class CurrentEvaluationsFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder): void
     {
-        //no form needed
+        // no form needed
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
     }
 
     public function describeAction($data, $format = 'string'): array
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
index 65e38f41e..eed856985 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
@@ -20,15 +20,9 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
-final class EvaluationTypeFilter implements FilterInterface
+final readonly class EvaluationTypeFilter implements FilterInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -59,14 +53,17 @@ final class EvaluationTypeFilter implements FilterInterface
     {
         $builder->add('accepted_evaluationtype', EntityType::class, [
             'class' => Evaluation::class,
-            'choice_label' => function (Evaluation $ev): string {
-                return $this->translatableStringHelper->localize($ev->getTitle());
-            },
+            'choice_label' => fn (Evaluation $ev): string => $this->translatableStringHelper->localize($ev->getTitle()),
             'multiple' => true,
             'expanded' => true,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $evals = [];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
index 4a65452a1..6094d56ee 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
@@ -25,12 +25,7 @@ class MaxDateFilter implements FilterInterface
         'maxdate is not specified' => false,
     ];
 
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function addRole(): ?string
     {
@@ -62,6 +57,11 @@ class MaxDateFilter implements FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         return ['Filtered by maxdate: only %choice%', [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
index 922702418..733e41480 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
@@ -22,46 +22,37 @@ use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class CompositionFilter implements FilterInterface
+readonly class CompositionFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+        private TranslatableStringHelper $translatableStringHelper,
+        private RollingDateConverterInterface $rollingDateConverter
+    ) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
-        if (!in_array('composition_type_filter', $qb->getAllAliases(), true)) {
-            $clause =
-                $qb->expr()->andX(
-                    $qb->expr()->lte('composition_type_filter.startDate', ':ondate_composition_type_filter'),
-                    $qb->expr()->orX(
-                        $qb->expr()->gt('composition_type_filter.endDate', ':ondate_composition_type_filter'),
-                        $qb->expr()->isNull('composition_type_filter.endDate')
-                    )
-                );
+        // there is no test on the aliases here: the name should be unique
+        $clause =
+            $qb->expr()->andX(
+                $qb->expr()->lte('composition_type_filter_composition.startDate', ':ondate_composition_type_filter'),
+                $qb->expr()->orX(
+                    $qb->expr()->gt('composition_type_filter_composition.endDate', ':ondate_composition_type_filter'),
+                    $qb->expr()->isNull('composition_type_filter_composition.endDate')
+                )
+            );
 
-            $qb->join('household.compositions', 'composition', Expr\Join::WITH, $clause);
-        }
+        $qb->join('household.compositions', 'composition_type_filter_composition', Expr\Join::WITH, $clause);
 
-        $whereClause = $qb->expr()->in('composition_type_filter.householdCompositionType', ':compositions');
+        $whereClause = $qb->expr()->in('composition_type_filter_composition.householdCompositionType', ':compositions_composition_type_filter');
 
         $qb->andWhere($whereClause);
-        $qb->setParameter('compositions', $data['accepted_composition']);
+        $qb->setParameter('compositions_composition_type_filter', $data['accepted_composition']);
         $qb->setParameter(
             'ondate_composition_type_filter',
             $this->rollingDateConverter->convert($data['on_date'])
@@ -73,22 +64,23 @@ class CompositionFilter implements FilterInterface
         return Declarations::HOUSEHOLD_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('accepted_composition', EntityType::class, [
                 'class' => HouseholdCompositionType::class,
-                'choice_label' => function (HouseholdCompositionType $type) {
-                    return $this->translatableStringHelper->localize(
-                        $type->getLabel()
-                    );
-                },
+                'choice_label' => fn (HouseholdCompositionType $type) => $this->translatableStringHelper->localize(
+                    $type->getLabel()
+                ),
                 'multiple' => true,
                 'expanded' => true,
             ])
-            ->add('on_date', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-            ]);
+            ->add('on_date', PickRollingDateType::class, []);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function describeAction($data, $format = 'string'): array
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
index 0fe1973e9..6430b5e99 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
@@ -24,14 +23,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -42,7 +34,7 @@ class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
     {
         $subQuery =
             'SELECT 1
-            FROM ' . PersonHouseholdAddress::class . ' person_filter_having_address_to_review_person_household_address
+            FROM '.PersonHouseholdAddress::class.' person_filter_having_address_to_review_person_household_address
             JOIN person_filter_having_address_to_review_person_household_address.address person_filter_having_address_to_review_address
             WHERE
                 person_filter_having_address_to_review_person_household_address.validFrom <= :person_filter_having_address_to_review_date
@@ -76,20 +68,21 @@ class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'Compute address at date',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ])
             ->add('ref_statuses', ChoiceType::class, [
                 'label' => 'export.filter.person.by_address_ref_status.Status',
                 'choices' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW, Address::ADDR_REFERENCE_STATUS_REVIEWED, Address::ADDR_REFERENCE_STATUS_MATCH],
-                'choice_label' => function (string $item) {
-                    return 'export.filter.person.by_address_ref_status.'.$item;
-                },
+                'choice_label' => fn (string $item) => 'export.filter.person.by_address_ref_status.'.$item,
                 'multiple' => true,
                 'expanded' => true,
-                'data' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW]
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY), 'ref_statuses' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW]];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return [
@@ -99,9 +92,7 @@ class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
                 '%statuses%' => implode(
                     ', ',
                     array_map(
-                        function (string $item) {
-                            return 'export.filter.person.by_address_ref_status.'.$item;
-                        },
+                        fn (string $item) => 'export.filter.person.by_address_ref_status.'.$item,
                         $data['ref_statuses'] ?? RollingDate::T_TODAY
                     )
                 ),
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
index 0bf175ce4..aa97ad54c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
-use DateInterval;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
@@ -26,12 +25,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 class AgeFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(RollingDateConverterInterface $rollingDateConverter)
-    {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -42,12 +36,12 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
     {
         $where = $qb->getDQLPart('where');
 
-        $min = null !== $data['min_age'] ? $data['min_age'] : 0;
-        $max = null !== $data['max_age'] ? $data['max_age'] : 150;
+        $min = $data['min_age'] ?? 0;
+        $max = $data['max_age'] ?? 150;
         $calc = $this->rollingDateConverter->convert($data['date_calc']);
 
-        $minDate = $calc->sub(new DateInterval('P' . $max . 'Y'));
-        $maxDate = $calc->sub(new DateInterval('P' . $min . 'Y'));
+        $minDate = $calc->sub(new \DateInterval('P'.$max.'Y'));
+        $maxDate = $calc->sub(new \DateInterval('P'.$min.'Y'));
 
         $clause = $qb->expr()->andX(
             $qb->expr()->gte(
@@ -92,10 +86,19 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'min_age' => 0,
+            'max_age' => 120,
+            'date_calc' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s age: '
-        . 'between %min_age% and %max_age%', [
+        .'between %min_age% and %max_age%', [
             '%min_age%' => $data['min_age'],
             '%max_age%' => $data['max_age'],
         ], ];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
index 7ae22ddd8..dd14c71ef 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
@@ -24,12 +24,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(RollingDateConverterInterface $rollingDateConverter)
-    {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -71,19 +66,22 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
     {
         $builder->add('date_from', PickRollingDateType::class, [
             'label' => 'Born after this date',
-            'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
         ]);
 
         $builder->add('date_to', PickRollingDateType::class, [
             'label' => 'Born before this date',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s birthdate: '
-            . 'between %date_from% and %date_to%', [
+            .'between %date_from% and %date_to%', [
                 '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
                 '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
             ], ];
@@ -101,13 +99,13 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
 
         if (null === $date_from) {
             $context->buildViolation('The "date from" should not be empty')
-                //->atPath('date_from')
+                // ->atPath('date_from')
                 ->addViolation();
         }
 
         if (null === $date_to) {
             $context->buildViolation('The "date to" should not be empty')
-                //->atPath('date_to')
+                // ->atPath('date_to')
                 ->addViolation();
         }
 
@@ -116,7 +114,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
             && $date_from >= $date_to
         ) {
             $context->buildViolation('The date "date to" should be after the '
-                . 'date given in "date from" field')
+                .'date given in "date from" field')
                 ->addViolation();
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php
index 9b59549f1..fdd799ab9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php
@@ -28,21 +28,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByHouseholdCompositionFilter implements FilterInterface
 {
-    private HouseholdCompositionTypeRepositoryInterface $householdCompositionTypeRepository;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        HouseholdCompositionTypeRepositoryInterface $householdCompositionTypeRepository,
-        RollingDateConverterInterface $rollingDateConverter,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->householdCompositionTypeRepository = $householdCompositionTypeRepository;
-        $this->rollingDateConverter = $rollingDateConverter;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly HouseholdCompositionTypeRepositoryInterface $householdCompositionTypeRepository, private readonly RollingDateConverterInterface $rollingDateConverter, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -56,11 +42,11 @@ class ByHouseholdCompositionFilter implements FilterInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . HouseholdMember::class . " {$p}_hm  " .
-                    'JOIN ' . HouseholdComposition::class . " {$p}_compo WITH {$p}_hm.household = {$p}_compo.household  " .
-                    "WHERE {$p}_hm.person = person AND {$p}_hm.shareHousehold = 'TRUE' " .
-                    "AND ({$p}_hm.startDate <= :{$p}_date AND ({$p}_hm.endDate IS NULL OR {$p}_hm.endDate > :{$p}_date)) " .
-                    "AND ({$p}_compo.startDate <= :{$p}_date AND ({$p}_compo.endDate IS NULL OR {$p}_compo.endDate > :{$p}_date)) " .
+                    'SELECT 1 FROM '.HouseholdMember::class." {$p}_hm  ".
+                    'JOIN '.HouseholdComposition::class." {$p}_compo WITH {$p}_hm.household = {$p}_compo.household  ".
+                    "WHERE {$p}_hm.person = person AND {$p}_hm.shareHousehold = 'TRUE' ".
+                    "AND ({$p}_hm.startDate <= :{$p}_date AND ({$p}_hm.endDate IS NULL OR {$p}_hm.endDate > :{$p}_date)) ".
+                    "AND ({$p}_compo.startDate <= :{$p}_date AND ({$p}_compo.endDate IS NULL OR {$p}_compo.endDate > :{$p}_date)) ".
                     "AND {$p}_compo.householdCompositionType IN (:{$p}_accepted)"
                 )
             )
@@ -86,10 +72,14 @@ class ByHouseholdCompositionFilter implements FilterInterface
             ])
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'export.filter.person.by_composition.Date calc',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         $compos = array_map(
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
index 384d6698a..82cda25ed 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
@@ -23,13 +23,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class DeadOrAliveFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -102,14 +96,18 @@ class DeadOrAliveFilter implements FilterInterface
 
         $builder->add('date_calc', PickRollingDateType::class, [
             'label' => 'Filter in relation to this date',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by a state of %deadOrAlive%: '
-        . 'at this date %date_calc%', [
+        .'at this date %date_calc%', [
             '%date_calc%' => $this->rollingDateConverter->convert($data['date_calc'])->format('d-m-Y'),
             '%deadOrAlive%' => $data['person_state'],
         ], ];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
index 0ac4b3173..1bc32d9bb 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
@@ -24,13 +24,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 class DeathdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -72,19 +66,22 @@ class DeathdateFilter implements ExportElementValidatedInterface, FilterInterfac
     {
         $builder->add('date_from', PickRollingDateType::class, [
             'label' => 'Death after this date',
-            'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
         ]);
 
         $builder->add('date_to', PickRollingDateType::class, [
             'label' => 'Deathdate before',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s deathdate: '
-            . 'between %date_from% and %date_to%', [
+            .'between %date_from% and %date_to%', [
                 '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
                 '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
             ], ];
@@ -102,13 +99,13 @@ class DeathdateFilter implements ExportElementValidatedInterface, FilterInterfac
 
         if (null === $date_from) {
             $context->buildViolation('The "date from" should not be empty')
-                //->atPath('date_from')
+                // ->atPath('date_from')
                 ->addViolation();
         }
 
         if (null === $date_to) {
             $context->buildViolation('The "date to" should not be empty')
-                //->atPath('date_to')
+                // ->atPath('date_to')
                 ->addViolation();
         }
 
@@ -117,7 +114,7 @@ class DeathdateFilter implements ExportElementValidatedInterface, FilterInterfac
             && $date_from >= $date_to
         ) {
             $context->buildViolation('The date "date to" should be after the '
-                . 'date given in "date from" field')
+                .'date given in "date from" field')
                 ->addViolation();
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
index 228749c34..12ab0ad02 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
@@ -22,12 +22,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_filter;
-use function count;
-use function implode;
-use function in_array;
-use function is_array;
-
 class GenderFilter implements
     ExportElementValidatedInterface,
     FilterInterface
@@ -52,7 +46,7 @@ class GenderFilter implements
         $where = $qb->getDQLPart('where');
         $isIn = $qb->expr()->in('person.gender', ':person_gender');
 
-        if (!in_array('null', $data['accepted_genders'], true)) {
+        if (!\in_array('null', $data['accepted_genders'], true)) {
             $clause = $isIn;
         } else {
             $clause = $qb->expr()->orX($isIn, $qb->expr()->isNull('person.gender'));
@@ -65,11 +59,9 @@ class GenderFilter implements
         }
 
         $qb->add('where', $where);
-        $qb->setParameter('person_gender', array_filter(
+        $qb->setParameter('person_gender', \array_filter(
             $data['accepted_genders'],
-            static function ($el) {
-                return 'null' !== $el;
-            }
+            static fn ($el) => 'null' !== $el
         ));
     }
 
@@ -92,6 +84,11 @@ class GenderFilter implements
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         $genders = [];
@@ -106,7 +103,7 @@ class GenderFilter implements
 
         return [
             'Filtering by genders: only %genders%',
-            ['%genders%' => implode(', ', $genders)],
+            ['%genders%' => \implode(', ', $genders)],
         ];
     }
 
@@ -122,7 +119,7 @@ class GenderFilter implements
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if (!is_array($data['accepted_genders']) || count($data['accepted_genders']) === 0) {
+        if (!\is_array($data['accepted_genders']) || 0 === \count($data['accepted_genders'])) {
             $context->buildViolation('You should select an option')
                 ->addViolation();
         }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
index 9bdb3f2d4..d54842b47 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
@@ -26,25 +26,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
 {
-    private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository;
-
-    private GeographicalUnitRepositoryInterface $geographicalUnitRepository;
-
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        GeographicalUnitRepositoryInterface $geographicalUnitRepository,
-        GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->geographicalUnitRepository = $geographicalUnitRepository;
-        $this->geographicalUnitLayerRepository = $geographicalUnitLayerRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly GeographicalUnitRepositoryInterface $geographicalUnitRepository, private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -55,7 +37,7 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
     {
         $subQuery =
             'SELECT 1
-            FROM ' . PersonHouseholdAddress::class . ' person_filter_geog_person_household_address
+            FROM '.PersonHouseholdAddress::class.' person_filter_geog_person_household_address
             JOIN person_filter_geog_person_household_address.address person_filter_geog_address
             JOIN person_filter_geog_address.geographicalUnits person_filter_geog_unit
             WHERE
@@ -91,16 +73,13 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'Compute geographical location at date',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ])
             ->add('units', ChoiceType::class, [
                 'label' => 'Geographical unit',
                 'placeholder' => 'Select a geographical unit',
                 'choices' => $this->geographicalUnitRepository->findAll(),
                 'choice_value' => static fn (SimpleGeographicalUnitDTO $item) => $item->id,
-                'choice_label' => function (SimpleGeographicalUnitDTO $item) {
-                    return $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()) . ' > ' . $item->unitName;
-                },
+                'choice_label' => fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()).' > '.$item->unitName,
                 'attr' => [
                     'class' => 'select2',
                 ],
@@ -108,6 +87,11 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return [
@@ -117,9 +101,7 @@ class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
                 '%units%' => implode(
                     ', ',
                     array_map(
-                        function (SimpleGeographicalUnitDTO $item) {
-                            return $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()) . ' > ' . $item->unitName;
-                        },
+                        fn (SimpleGeographicalUnitDTO $item) => $this->translatableStringHelper->localize($this->geographicalUnitLayerRepository->find($item->layerId)->getName()).' > '.$item->unitName,
                         $data['units']
                     )
                 ),
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
index aad98a394..6c4cdf802 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
@@ -19,13 +19,7 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 
 class MaritalStatusFilter implements FilterInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -49,16 +43,19 @@ class MaritalStatusFilter implements FilterInterface
     {
         $builder->add('maritalStatus', EntityType::class, [
             'class' => MaritalStatus::class,
-            'choice_label' => function (MaritalStatus $ms) {
-                return $this->translatableStringHelper->localize(
-                    $ms->getName()
-                );
-            },
+            'choice_label' => fn (MaritalStatus $ms) => $this->translatableStringHelper->localize(
+                $ms->getName()
+            ),
             'multiple' => true,
             'expanded' => true,
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s marital status'];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
index 1156527cc..4c83fafe3 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
@@ -26,15 +26,7 @@ class NationalityFilter implements
     ExportElementValidatedInterface,
     FilterInterface
 {
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $helper)
-    {
-        $this->translatableStringHelper = $helper;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -68,13 +60,16 @@ class NationalityFilter implements
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         $countries = $data['nationalities'];
 
-        $names = array_map(function (Country $c) {
-            return $this->translatableStringHelper->localize($c->getName());
-        }, [$countries]);
+        $names = array_map(fn (Country $c) => $this->translatableStringHelper->localize($c->getName()), [$countries]);
 
         return [
             'Filtered by nationality : %nationalities%',
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
index 90003c6bf..ea8e01baf 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
@@ -23,21 +23,10 @@ use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class ResidentialAddressAtThirdpartyFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
@@ -46,19 +35,19 @@ class ResidentialAddressAtThirdpartyFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('resaddr', $qb->getAllAliases(), true)) {
+        if (!\in_array('resaddr', $qb->getAllAliases(), true)) {
             $qb->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = person');
         }
 
-        if (!in_array('center', $qb->getAllAliases(), true)) {
+        if (!\in_array('center', $qb->getAllAliases(), true)) {
             $qb->join('person.center', 'center');
         }
 
-        if (!in_array('tparty', $qb->getAllAliases(), true)) {
+        if (!\in_array('tparty', $qb->getAllAliases(), true)) {
             $qb->join('resaddr.hostThirdParty', 'tparty');
         }
 
-        if (!in_array('tpartycat', $qb->getAllAliases(), true)) {
+        if (!\in_array('tpartycat', $qb->getAllAliases(), true)) {
             $qb->join('tparty.categories', 'tpartycat');
         }
 
@@ -100,19 +89,21 @@ class ResidentialAddressAtThirdpartyFilter implements FilterInterface
         $builder->add('thirdparty_cat', EntityType::class, [
             'class' => ThirdPartyCategory::class,
             'label' => 'Category',
-            'choice_label' => function (ThirdPartyCategory $tpc) {
-                return $this->translatableStringHelper->localize($tpc->getName());
-            },
+            'choice_label' => fn (ThirdPartyCategory $tpc) => $this->translatableStringHelper->localize($tpc->getName()),
             'multiple' => true,
             'expanded' => true,
         ]);
 
         $builder->add('date_calc', PickRollingDateType::class, [
             'label' => 'Date during which residential address was valid',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s who have a residential address located at a thirdparty of type %thirdparty_type% and valid on %date_calc%', [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
index bd55c5b80..3c2d7a3a6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
@@ -20,17 +20,10 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
-use function in_array;
 
 class ResidentialAddressAtUserFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -39,11 +32,11 @@ class ResidentialAddressAtUserFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('resaddr', $qb->getAllAliases(), true)) {
+        if (!\in_array('resaddr', $qb->getAllAliases(), true)) {
             $qb->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = person');
         }
 
-        if (!in_array('center', $qb->getAllAliases(), true)) {
+        if (!\in_array('center', $qb->getAllAliases(), true)) {
             $qb->join('person.center', 'center');
         }
 
@@ -82,10 +75,14 @@ class ResidentialAddressAtUserFilter implements FilterInterface
     {
         $builder->add('date_calc', PickRollingDateType::class, [
             'label' => 'Date during which residential address was valid',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ["Filtered by person's who have a residential address located at another user"];
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php
index c4644fc11..c34c7eb40 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php
@@ -24,13 +24,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class WithoutHouseholdComposition implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -45,10 +39,10 @@ class WithoutHouseholdComposition implements FilterInterface
             ->andWhere(
                 $qb->expr()->not(
                     $qb->expr()->exists(
-                        'SELECT 1 FROM ' . HouseholdMember::class . " {$p}_hm  " .
-                        'JOIN ' . HouseholdComposition::class . " {$p}_compo WITH {$p}_hm.household = {$p}_compo.household  " .
-                        "WHERE {$p}_hm.person = person AND {$p}_hm.shareHousehold = 'TRUE' " .
-                        "AND ({$p}_hm.startDate <= :{$p}_date AND ({$p}_hm.endDate IS NULL OR {$p}_hm.endDate > :{$p}_date)) " .
+                        'SELECT 1 FROM '.HouseholdMember::class." {$p}_hm  ".
+                        'JOIN '.HouseholdComposition::class." {$p}_compo WITH {$p}_hm.household = {$p}_compo.household  ".
+                        "WHERE {$p}_hm.person = person AND {$p}_hm.shareHousehold = 'TRUE' ".
+                        "AND ({$p}_hm.startDate <= :{$p}_date AND ({$p}_hm.endDate IS NULL OR {$p}_hm.endDate > :{$p}_date)) ".
                         "AND ({$p}_compo.startDate <= :{$p}_date AND ({$p}_compo.endDate IS NULL OR {$p}_compo.endDate > :{$p}_date)) "
                     )
                 )
@@ -66,10 +60,14 @@ class WithoutHouseholdComposition implements FilterInterface
         $builder
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'export.filter.person.by_no_composition.Date calc',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ['export.filter.person.by_no_composition.Persons filtered by no composition at %date%', [
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php
new file mode 100644
index 000000000..373572e54
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php
@@ -0,0 +1,115 @@
+<?php
+
+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 Chill\PersonBundle\Export\Filter\SocialWorkFilters;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class AccompanyingPeriodWorkEndDateBetweenDateFilter implements FilterInterface
+{
+    public function __construct(
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.work.end_between_dates.start_date',
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.work.end_between_dates.end_date',
+            ])
+            ->add('keep_null', CheckboxType::class, [
+                'label' => 'export.filter.work.end_between_dates.keep_null',
+                'help' => 'export.filter.work.end_between_dates.keep_null_help',
+            ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['start_date' => new RollingDate(RollingDate::T_TODAY), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.work.end_between_dates.title';
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.work.end_between_dates.Only where end date is between %endDate% and %endDate%',
+            [
+                '%startDate%' => null !== $data['start_date'] ? $this->rollingDateConverter->convert($data['start_date'])->format('d-m-Y') : '',
+                '%endDate%' => null !== $data['end_date'] ? $this->rollingDateConverter->convert($data['end_date'])->format('d-m-Y') : '',
+            ],
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $as = 'acc_pe_work_end_between_filter_start';
+        $ae = 'acc_pe_work_end_between_filter_end';
+
+        $start = match ($data['keep_null']) {
+            true => $qb->expr()->orX(
+                $qb->expr()->lte('acpw.endDate', ':'.$ae),
+                $qb->expr()->isNull('acpw.endDate')
+            ),
+            false => $qb->expr()->andX(
+                $qb->expr()->lte('acpw.endDate', ':'.$ae),
+                $qb->expr()->isNotNull('acpw.endDate')
+            ),
+            default => throw new \LogicException('This value is not supported'),
+        };
+        $end = match ($data['keep_null']) {
+            true => $qb->expr()->orX(
+                $qb->expr()->gt('acpw.endDate', ':'.$as),
+                $qb->expr()->isNull('acpw.endDate')
+            ),
+            false => $qb->expr()->andX(
+                $qb->expr()->gt('acpw.endDate', ':'.$as),
+                $qb->expr()->isNotNull('acpw.endDate')
+            ),
+            default => throw new \LogicException('This value is not supported'),
+        };
+
+        if (null !== $data['start_date']) {
+            $qb
+                ->andWhere($start)
+                ->setParameter($as, $this->rollingDateConverter->convert($data['start_date']));
+        }
+
+        if (null !== $data['end_date']) {
+            $qb
+                ->andWhere($end)
+                ->setParameter($ae, $this->rollingDateConverter->convert($data['end_date']));
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php
new file mode 100644
index 000000000..880543355
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php
@@ -0,0 +1,115 @@
+<?php
+
+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 Chill\PersonBundle\Export\Filter\SocialWorkFilters;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class AccompanyingPeriodWorkStartDateBetweenDateFilter implements FilterInterface
+{
+    public function __construct(
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.work.start_between_dates.start_date',
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.work.start_between_dates.end_date',
+            ])
+            ->add('keep_null', CheckboxType::class, [
+                'label' => 'export.filter.work.start_between_dates.keep_null',
+                'help' => 'export.filter.work.start_between_dates.keep_null_help',
+            ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return ['start_date' => new RollingDate(RollingDate::T_TODAY), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.work.start_between_dates.title';
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.work.start_between_dates.Only where start date is between %startDate% and %endDate%',
+            [
+                '%startDate%' => null !== $data['start_date'] ? $this->rollingDateConverter->convert($data['start_date'])->format('d-m-Y') : '',
+                '%endDate%' => null !== $data['end_date'] ? $this->rollingDateConverter->convert($data['end_date'])->format('d-m-Y') : '',
+            ],
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $as = 'acc_pe_work_start_between_filter_start';
+        $ae = 'acc_pe_work_start_between_filter_end';
+
+        $start = match ($data['keep_null']) {
+            true => $qb->expr()->orX(
+                $qb->expr()->lte('acpw.startDate', ':'.$ae),
+                $qb->expr()->isNull('acpw.startDate')
+            ),
+            false => $qb->expr()->andX(
+                $qb->expr()->lte('acpw.startDate', ':'.$ae),
+                $qb->expr()->isNotNull('acpw.startDate')
+            ),
+            default => throw new \LogicException('This value is not supported'),
+        };
+        $end = match ($data['keep_null']) {
+            true => $qb->expr()->orX(
+                $qb->expr()->gt('acpw.startDate', ':'.$as),
+                $qb->expr()->isNull('acpw.startDate')
+            ),
+            false => $qb->expr()->andX(
+                $qb->expr()->gt('acpw.startDate', ':'.$as),
+                $qb->expr()->isNotNull('acpw.startDate')
+            ),
+            default => throw new \LogicException('This value is not supported'),
+        };
+
+        if (null !== $data['start_date']) {
+            $qb
+                ->andWhere($start)
+                ->setParameter($as, $this->rollingDateConverter->convert($data['start_date']));
+        }
+
+        if (null !== $data['end_date']) {
+            $qb
+                ->andWhere($end)
+                ->setParameter($ae, $this->rollingDateConverter->convert($data['end_date']));
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
index cbdb64d8d..b11d2a93c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
@@ -35,16 +35,21 @@ class CurrentActionFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder): void
     {
-        //no form
+        // no form
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
     }
 
     public function describeAction($data, $format = 'string'): array
     {
-        return ['Filtered by current action'];
+        return ['Filtered actions without end date'];
     }
 
     public function getTitle(): string
     {
-        return 'Filter by current actions';
+        return 'Filter actions without end date';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
index a69e1ac76..d3e54f2a5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
@@ -13,28 +13,23 @@ namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class JobFilter implements FilterInterface
 {
-    protected TranslatorInterface $translator;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'acp_work_action_filter_user_job';
 
     public function __construct(
-        TranslatorInterface $translator,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translator = $translator;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        protected TranslatorInterface $translator,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -43,40 +38,35 @@ class JobFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.referrers', 'acpwuser');
-        }
+        $p = self::PREFIX;
 
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('acpwuser.userJob', ':job');
+        $qb->andWhere(
+            'EXISTS (SELECT 1 FROM '.AccompanyingPeriodWorkReferrerHistory::class." {$p}_ref_history
+                JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.jobHistories {$p}_job_history
+                WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND {$p}_job_history.job IN (:{$p}_job) AND {$p}_job_history.startDate <= {$p}_ref_history.startDate
+                AND ({$p}_job_history.endDate IS NULL or {$p}_job_history.endDate >= {$p}_ref_history.startDate))"
+        );
 
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('job', $data['job']);
+        $qb->setParameter("{$p}_job", $data['job']);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('job', EntityType::class, [
-            'class' => UserJob::class,
-            'choice_label' => function (UserJob $j) {
-                return $this->translatableStringHelper->localize(
+        $builder
+            ->add('job', EntityType::class, [
+                'class' => UserJob::class,
+                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize(
                     $j->getLabel()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
+                ),
+                'multiple' => true,
+                'expanded' => true,
+            ])
+        ;
     }
 
     public function describeAction($data, $format = 'string')
@@ -89,13 +79,21 @@ class JobFilter implements FilterInterface
             );
         }
 
-        return ['Filtered by treating agent job: only %jobs%', [
+        return ['export.filter.work.by_user_job.Filtered by treating agent job: only %jobs%', [
             '%jobs%' => implode(', ', $userjobs),
         ]];
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'job' => [],
+            'job_at' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
     public function getTitle(): string
     {
-        return 'Filter by treating agent job';
+        return 'export.filter.work.by_user_job.Filter by treating agent job';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
index 8d0da32fb..4d456fdb2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
@@ -12,16 +12,20 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
-use Chill\MainBundle\Templating\Entity\UserRender;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class ReferrerFilter implements FilterInterface
+final readonly class ReferrerFilter implements FilterInterface
 {
+    private const PREFIX = 'acpw_referrer_filter';
+
+    public function __construct(private RollingDateConverterInterface $rollingDateConverter) {}
+
     public function addRole(): ?string
     {
         return null;
@@ -29,21 +33,19 @@ class ReferrerFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.referrers', 'acpwuser');
-        }
+        $p = self::PREFIX;
 
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('acpwuser', ':agents');
+        $qb
+            ->leftJoin('acpw.referrersHistory', $p.'_acpwusers_history')
+            ->andWhere("{$p}_acpwusers_history.startDate <= :{$p}_calc_date AND ({$p}_acpwusers_history.endDate IS NULL or {$p}_acpwusers_history.endDate > :{$p}_calc_date)")
+            ->andWhere("{$p}_acpwusers_history.user IN (:{$p}_agents)");
 
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('agents', $data['accepted_agents']);
+        $qb
+            ->setParameter("{$p}_agents", $data['accepted_agents'])
+            ->setParameter("{$p}_calc_date", $this->rollingDateConverter->convert(
+                $data['agent_at'] ?? new RollingDate(RollingDate::T_TODAY)
+            ))
+        ;
     }
 
     public function applyOn(): string
@@ -53,9 +55,24 @@ class ReferrerFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_agents', PickUserDynamicType::class, [
-            'multiple' => true,
-        ]);
+        $builder
+            ->add('accepted_agents', PickUserDynamicType::class, [
+                'multiple' => true,
+                'label' => 'export.filter.work.by_treating_agent.Accepted agents',
+            ])
+            ->add('agent_at', PickRollingDateType::class, [
+                'label' => 'export.filter.work.by_treating_agent.Calc date',
+                'help' => 'export.filter.work.by_treating_agent.calc_date_help',
+            ])
+        ;
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'accepted_agents' => [],
+            'agent_at' => new RollingDate(RollingDate::T_TODAY),
+        ];
     }
 
     public function describeAction($data, $format = 'string'): array
@@ -67,13 +84,14 @@ class ReferrerFilter implements FilterInterface
         }
 
         return [
-            'Filtered by treating agent: only %agents%', [
-                '%agents' => implode(', ', $users),
+            'exports.filter.work.by_treating_agent.Filtered by treating agent at date', [
+                'agents' => implode(', ', $users),
+                'agent_at' => $this->rollingDateConverter->convert($data['agent_at'] ?? new RollingDate(RollingDate::T_TODAY)),
             ], ];
     }
 
     public function getTitle(): string
     {
-        return 'Filter by treating agent';
+        return 'export.filter.work.by_treating_agent.Filter by treating agent';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
index 8cb2f6421..d4867a884 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
@@ -13,28 +13,23 @@ namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
 
 class ScopeFilter implements FilterInterface
 {
-    protected TranslatorInterface $translator;
-
-    private TranslatableStringHelper $translatableStringHelper;
+    private const PREFIX = 'acp_work_action_filter_user_scope';
 
     public function __construct(
-        TranslatorInterface $translator,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->translator = $translator;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+        protected TranslatorInterface $translator,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -43,21 +38,15 @@ class ScopeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.referrers', 'acpwuser');
-        }
+        $p = self::PREFIX;
 
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('acpwuser.mainScope', ':scope');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('scope', $data['scope']);
+        $qb->andWhere(
+            'EXISTS (SELECT 1 FROM '.AccompanyingPeriodWorkReferrerHistory::class." {$p}_ref_history
+                JOIN {$p}_ref_history.user {$p}_ref_history_user JOIN {$p}_ref_history_user.scopeHistories {$p}_scope_history
+                WHERE {$p}_ref_history.accompanyingPeriodWork = acpw AND {$p}_scope_history.scope IN (:{$p}_scope) AND {$p}_scope_history.startDate <= {$p}_ref_history.startDate
+                AND ({$p}_scope_history.endDate IS NULL or {$p}_scope_history.endDate >= {$p}_ref_history.startDate))"
+        )
+            ->setParameter("{$p}_scope", $data['scope']);
     }
 
     public function applyOn()
@@ -67,19 +56,19 @@ class ScopeFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('scope', EntityType::class, [
-            'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
+        $builder
+            ->add('scope', EntityType::class, [
+                'class' => Scope::class,
+                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
                     $s->getName()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
+                ),
+                'multiple' => true,
+                'expanded' => true,
+            ])
+        ;
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, $format = 'string'): array
     {
         $scopes = [];
 
@@ -89,13 +78,21 @@ class ScopeFilter implements FilterInterface
             );
         }
 
-        return ['Filtered by treating agent scope: only %scopes%', [
+        return ['export.filter.work.by_user_scope.Filtered by treating agent scope: only %scopes%', [
             '%scopes%' => implode(', ', $scopes),
         ]];
     }
 
-    public function getTitle()
+    public function getFormDefaultData(): array
     {
-        return 'Filter by treating agent scope';
+        return [
+            'scope' => [],
+            'scope_at' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.work.by_user_scope.Filter by treating agent scope';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
index 853d50744..3476bc33e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
@@ -23,26 +23,10 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
-use function count;
-use function in_array;
 
 class SocialWorkTypeFilter implements FilterInterface
 {
-    private EntityManagerInterface $em;
-
-    private SocialActionRender $socialActionRender;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        SocialActionRender $socialActionRender,
-        TranslatableStringHelper $translatableStringHelper,
-        EntityManagerInterface $em
-    ) {
-        $this->socialActionRender = $socialActionRender;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->em = $em;
-    }
+    public function __construct(private readonly SocialActionRender $socialActionRender, private readonly TranslatableStringHelper $translatableStringHelper, private readonly EntityManagerInterface $em) {}
 
     public function addRole(): ?string
     {
@@ -51,14 +35,14 @@ class SocialWorkTypeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (count($data['actionType']) > 0) {
+        if (\count($data['actionType']) > 0) {
             $qb
                 ->andWhere($qb->expr()->in('acpw.socialAction', ':actionType'))
                 ->setParameter('actionType', $data['actionType']);
         }
 
-        if (count($data['goal']) > 0) {
-            if (!in_array('acpw_goal', $qb->getAllAliases(), true)) {
+        if (\count($data['goal']) > 0) {
+            if (!\in_array('acpw_goal', $qb->getAllAliases(), true)) {
                 $qb->join('acpw.goals', 'acpw_goal');
             }
 
@@ -69,10 +53,10 @@ class SocialWorkTypeFilter implements FilterInterface
                 $andX->add($qb->expr()->eq('acpw_goal.goal', $goalId = ':goal_'.uniqid()));
                 $qb->setParameter($goalId, $goal);
 
-                if (count($data['result']) > 0) {
+                if (\count($data['result']) > 0) {
                     $orXResult = $qb->expr()->orX();
                     foreach ($data['result'] as $result) {
-                        /** @var Result $result */
+                        /* @var Result $result */
                         $orXResult->add($qb->expr()->isMemberOf($resultId = ':result_'.uniqid(), 'acpw_goal.results'));
                         $qb->setParameter($resultId, $result);
                     }
@@ -111,6 +95,11 @@ class SocialWorkTypeFilter implements FilterInterface
             );
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['action_type' => [], 'goal' => [], 'result' => []];
+    }
+
     public function describeAction($data, $format = 'string'): array
     {
         $actionTypes = [];
@@ -136,7 +125,7 @@ class SocialWorkTypeFilter implements FilterInterface
         }
 
         return ['Filtered actions by type, goals and results: %selected%', [
-            '%selected%' => implode(', ', array_merge($actionTypes, $goals, $results)),
+            '%selected%' => implode(', ', [...$actionTypes, ...$goals, ...$results]),
         ]];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Helper/LabelPersonHelper.php b/src/Bundle/ChillPersonBundle/Export/Helper/LabelPersonHelper.php
index 2cfc8d3cf..7e752395c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Helper/LabelPersonHelper.php
+++ b/src/Bundle/ChillPersonBundle/Export/Helper/LabelPersonHelper.php
@@ -13,20 +13,10 @@ namespace Chill\PersonBundle\Export\Helper;
 
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use function count;
-use const SORT_NUMERIC;
 
 class LabelPersonHelper
 {
-    private PersonRenderInterface $personRender;
-
-    private PersonRepository $personRepository;
-
-    public function __construct(PersonRepository $personRepository, PersonRenderInterface $personRender)
-    {
-        $this->personRepository = $personRepository;
-        $this->personRender = $personRender;
-    }
+    public function __construct(private readonly PersonRepository $personRepository, private readonly PersonRenderInterface $personRender) {}
 
     public function getLabelMulti(string $key, array $values, string $header): callable
     {
@@ -39,9 +29,9 @@ class LabelPersonHelper
                 return '';
             }
 
-            $decoded = json_decode($value);
+            $decoded = json_decode((string) $value, null, 512, JSON_THROW_ON_ERROR);
 
-            if (0 === count($decoded)) {
+            if (0 === \count($decoded)) {
                 return '';
             }
 
@@ -60,7 +50,7 @@ class LabelPersonHelper
                         },
                         array_unique(
                             array_filter($decoded, static fn (?int $id) => null !== $id),
-                            SORT_NUMERIC
+                            \SORT_NUMERIC
                         )
                     )
                 );
diff --git a/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php b/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php
new file mode 100644
index 000000000..30233bb39
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php
@@ -0,0 +1,296 @@
+<?php
+
+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 Chill\PersonBundle\Export\Helper;
+
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Export\Helper\DateTimeHelper;
+use Chill\MainBundle\Export\Helper\ExportAddressHelper;
+use Chill\MainBundle\Export\Helper\UserHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final readonly class ListAccompanyingPeriodHelper
+{
+    public const FIELDS = [
+        'acpId',
+        'step',
+        'stepSince',
+        'openingDate',
+        'closingDate',
+        'referrer',
+        'referrerSince',
+        'administrativeLocation',
+        'locationIsPerson',
+        'locationIsTemp',
+        'locationPersonName',
+        'locationPersonId',
+        'origin',
+        'closingMotive',
+        'confidential',
+        'emergency',
+        'intensity',
+        'job',
+        'isRequestorPerson',
+        'isRequestorThirdParty',
+        'requestorPerson',
+        'requestorPersonId',
+        'requestorThirdParty',
+        'requestorThirdPartyId',
+        'scopes',
+        'socialIssues',
+        'acpCreatedAt',
+        'acpCreatedBy_id',
+        'acpCreatedBy',
+        'acpUpdatedAt',
+        'acpUpdatedBy_id',
+        'acpUpdatedBy',
+    ];
+
+    public function __construct(
+        private ExportAddressHelper $addressHelper,
+        private DateTimeHelper $dateTimeHelper,
+        private PersonRenderInterface $personRender,
+        private PersonRepository $personRepository,
+        private ThirdPartyRepository $thirdPartyRepository,
+        private ThirdPartyRender $thirdPartyRender,
+        private SocialIssueRepository $socialIssueRepository,
+        private SocialIssueRender $socialIssueRender,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private TranslatorInterface $translator,
+        private UserHelper $userHelper,
+    ) {}
+
+    public function getQueryKeys($data)
+    {
+        return array_merge(
+            ListAccompanyingPeriodHelper::FIELDS,
+            $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'acp_address_fields')
+        );
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if (str_starts_with((string) $key, 'acp_address_fields')) {
+            return $this->addressHelper->getLabel($key, $values, $data, 'acp_address_fields');
+        }
+
+        return match ($key) {
+            'stepSince', 'openingDate', 'closingDate', 'referrerSince', 'acpCreatedAt', 'acpUpdatedAt' => $this->dateTimeHelper->getLabel('export.list.acp.'.$key),
+            'origin', 'closingMotive', 'job' => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.acp.'.$key;
+                }
+
+                if (null === $value) {
+                    return '';
+                }
+
+                return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR));
+            },
+            'acpCreatedBy', 'acpUpdatedBy', 'referrer' => $this->userHelper->getLabel($key, $values, 'export.list.acp.'.$key),
+            'locationPersonName', 'requestorPerson' => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.acp.'.$key;
+                }
+
+                if (null === $value || null === $person = $this->personRepository->find($value)) {
+                    return '';
+                }
+
+                return $this->personRender->renderString($person, []);
+            },
+            'requestorThirdParty' => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.acp.'.$key;
+                }
+
+                if (null === $value || null === $thirdparty = $this->thirdPartyRepository->find($value)) {
+                    return '';
+                }
+
+                return $this->thirdPartyRender->renderString($thirdparty, []);
+            },
+            'scopes' => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.acp.'.$key;
+                }
+
+                if (null === $value) {
+                    return '';
+                }
+
+                return implode(
+                    '|',
+                    array_map(
+                        fn ($s) => $this->translatableStringHelper->localize($s),
+                        json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR)
+                    )
+                );
+            },
+            'socialIssues' => function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.acp.'.$key;
+                }
+
+                if (null === $value) {
+                    return '';
+                }
+
+                return implode(
+                    '|',
+                    array_map(
+                        fn ($s) => $this->socialIssueRender->renderString($this->socialIssueRepository->find($s), []),
+                        json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR)
+                    )
+                );
+            },
+            'step' => fn ($value) => match ($value) {
+                '_header' => 'export.list.acp.step',
+                null => '',
+                AccompanyingPeriod::STEP_DRAFT => $this->translator->trans('course.draft'),
+                AccompanyingPeriod::STEP_CONFIRMED => $this->translator->trans('course.confirmed'),
+                AccompanyingPeriod::STEP_CLOSED => $this->translator->trans('course.closed'),
+                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT => $this->translator->trans('course.inactive_short'),
+                AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG => $this->translator->trans('course.inactive_long'),
+                default => $value,
+            },
+            'intensity' => fn ($value) => match ($value) {
+                '_header' => 'export.list.acp.intensity',
+                null => '',
+                AccompanyingPeriod::INTENSITY_OCCASIONAL => $this->translator->trans('occasional'),
+                AccompanyingPeriod::INTENSITY_REGULAR => $this->translator->trans('regular'),
+                default => $value,
+            },
+            default => static function ($value) use ($key) {
+                if ('_header' === $value) {
+                    return 'export.list.acp.'.$key;
+                }
+
+                if (null === $value) {
+                    return '';
+                }
+
+                return $value;
+            },
+        };
+    }
+
+    public function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calcDate): void
+    {
+        $qb->addSelect('acp.id AS acpId');
+        $qb->addSelect('acp.createdAt AS acpCreatedAt');
+        $qb->addSelect('acp.updatedAt AS acpUpdatedAt');
+
+        // add the regular fields
+        foreach (['openingDate', 'closingDate', 'confidential', 'emergency', 'intensity'] as $field) {
+            $qb->addSelect(sprintf('acp.%s AS %s', $field, $field));
+        }
+
+        // add the field which are simple association
+        $qb
+            ->addSelect('IDENTITY(acp.createdBy) AS acpCreatedBy_id')
+            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(acp.createdBy), \'d\', acp.createdAt) AS acpCreatedBy');
+        $qb
+            ->addSelect('IDENTITY(acp.updatedBy) AS acpUpdatedBy_id')
+            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(acp.updatedBy), \'d\', acp.updatedAt) AS acpUpdatedBy');
+
+        foreach (['origin' => 'label', 'closingMotive' => 'name', 'job' => 'label', 'administrativeLocation' => 'name'] as $entity => $field) {
+            $qb
+                ->leftJoin(sprintf('acp.%s', $entity), "{$entity}_t")
+                ->addSelect(sprintf('%s_t.%s AS %s', $entity, $field, $entity));
+        }
+
+        // step at date
+        $qb
+            ->addSelect('stepHistory.step AS step')
+            ->addSelect('stepHistory.startDate AS stepSince')
+            ->leftJoin('acp.stepHistories', 'stepHistory')
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte('stepHistory.startDate', ':calcDate'),
+                    $qb->expr()->orX($qb->expr()->isNull('stepHistory.endDate'), $qb->expr()->gt('stepHistory.endDate', ':calcDate'))
+                )
+            );
+
+        // referree at date
+        $qb
+            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(userHistory.user), \'d\', userHistory.startDate) AS referrer')
+            ->addSelect('userHistory.startDate AS referrerSince')
+            ->leftJoin('acp.userHistories', 'userHistory')
+            ->leftJoin('userHistory.user', 'referrer_t')
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('userHistory'),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte('userHistory.startDate', ':calcDate'),
+                        $qb->expr()->orX($qb->expr()->isNull('userHistory.endDate'), $qb->expr()->gt('userHistory.endDate', ':calcDate'))
+                    )
+                )
+            );
+
+        // location of the acp
+        $qb
+            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 1 ELSE 0 END AS locationIsPerson')
+            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 0 ELSE 1 END AS locationIsTemp')
+            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonName')
+            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonId')
+            ->leftJoin('acp.locationHistories', 'locationHistory')
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('locationHistory'),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte('locationHistory.startDate', ':calcDate'),
+                        $qb->expr()->orX($qb->expr()->isNull('locationHistory.endDate'), $qb->expr()->gt('locationHistory.endDate', ':calcDate'))
+                    )
+                )
+            )
+            ->leftJoin(
+                PersonHouseholdAddress::class,
+                'acpPersonAddress',
+                Join::WITH,
+                'locationHistory.personLocation = acpPersonAddress.person AND (acpPersonAddress.validFrom <= :calcDate AND (acpPersonAddress.validTo IS NULL OR acpPersonAddress.validTo > :calcDate))'
+            )
+            ->leftJoin(Address::class, 'acp_address', Join::WITH, 'COALESCE(IDENTITY(locationHistory.addressLocation), IDENTITY(acpPersonAddress.address)) = acp_address.id');
+
+        $this->addressHelper->addSelectClauses(ExportAddressHelper::F_ALL, $qb, 'acp_address', 'acp_address_fields');
+
+        // requestor
+        $qb
+            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 1 ELSE 0 END AS isRequestorPerson')
+            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 0 ELSE 1 END AS isRequestorThirdParty')
+            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPersonId')
+            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdPartyId')
+            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPerson')
+            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdParty');
+
+        $qb
+            // scopes
+            ->addSelect('(SELECT AGGREGATE(scope.name) FROM '.Scope::class.' scope WHERE scope MEMBER OF acp.scopes) AS scopes')
+            // social issues
+            ->addSelect('(SELECT AGGREGATE(socialIssue.id) FROM '.SocialIssue::class.' socialIssue WHERE socialIssue MEMBER OF acp.socialIssues) AS socialIssues');
+
+        // add parameter
+        $qb->setParameter('calcDate', $calcDate);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php b/src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
index de8870674..576885f2d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
+++ b/src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Helper;
 
+use Chill\MainBundle\Entity\Language;
 use Chill\MainBundle\Export\Helper\ExportAddressHelper;
 use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\CivilityRepositoryInterface;
@@ -20,16 +21,11 @@ use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\MaritalStatusRepositoryInterface;
-use DateTime;
 use DateTimeImmutable;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
-use Exception;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
-use RuntimeException;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function in_array;
-use function strlen;
 
 /**
  * Helper for list person: provide:.
@@ -41,8 +37,8 @@ use function strlen;
  */
 class ListPersonHelper
 {
-    public const FIELDS = [
-        'id',
+    final public const FIELDS = [
+        'personId',
         'civility',
         'firstName',
         'lastName',
@@ -73,57 +69,43 @@ class ListPersonHelper
         'lifecycleUpdate',
     ];
 
-    private ExportAddressHelper $addressHelper;
+    public function __construct(private readonly ExportAddressHelper $addressHelper, private readonly CenterRepositoryInterface $centerRepository, private readonly CivilityRepositoryInterface $civilityRepository, private readonly CountryRepository $countryRepository, private readonly LanguageRepositoryInterface $languageRepository, private readonly MaritalStatusRepositoryInterface $maritalStatusRepository, private readonly TranslatableStringHelper $translatableStringHelper, private readonly TranslatorInterface $translator, private readonly UserRepositoryInterface $userRepository) {}
 
-    private CenterRepositoryInterface $centerRepository;
-
-    private CivilityRepositoryInterface $civilityRepository;
-
-    private CountryRepository $countryRepository;
-
-    private LanguageRepositoryInterface $languageRepository;
-
-    private MaritalStatusRepositoryInterface $maritalStatusRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    private UserRepositoryInterface $userRepository;
-
-    public function __construct(
-        ExportAddressHelper $addressHelper,
-        CenterRepositoryInterface $centerRepository,
-        CivilityRepositoryInterface $civilityRepository,
-        CountryRepository $countryRepository,
-        LanguageRepositoryInterface $languageRepository,
-        MaritalStatusRepositoryInterface $maritalStatusRepository,
-        TranslatableStringHelper $translatableStringHelper,
-        TranslatorInterface $translator,
-        UserRepositoryInterface $userRepository
-    ) {
-        $this->addressHelper = $addressHelper;
-        $this->centerRepository = $centerRepository;
-        $this->civilityRepository = $civilityRepository;
-        $this->countryRepository = $countryRepository;
-        $this->languageRepository = $languageRepository;
-        $this->maritalStatusRepository = $maritalStatusRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-        $this->userRepository = $userRepository;
+    /**
+     * Those keys are the "direct" keys, which are created when we decide to use to list all the keys.
+     *
+     * This method must be used in `getKeys` instead of the `self::FIELDS`
+     *
+     * @return array<string>
+     */
+    public function getAllKeys(): array
+    {
+        return [
+            ...array_filter(
+                ListPersonHelper::FIELDS,
+                fn (string $key) => !\in_array($key, ['address_fields', 'lifecycleUpdate'], true)
+            ),
+            ...$this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields'),
+            ...['createdAt', 'createdBy', 'updatedAt', 'updatedBy'],
+        ];
     }
 
     /**
-     * @param array|value-of<self::FIELDS>[] $fields
+     * @param array<value-of<self::FIELDS>> $fields
      */
-    public function addSelect(QueryBuilder $qb, array $fields, DateTimeImmutable $computedDate): void
+    public function addSelect(QueryBuilder $qb, array $fields, \DateTimeImmutable $computedDate): void
     {
         foreach (ListPersonHelper::FIELDS as $f) {
-            if (!in_array($f, $fields, true)) {
+            if (!\in_array($f, $fields, true)) {
                 continue;
             }
 
             switch ($f) {
+                case 'personId':
+                    $qb->addSelect('person.id AS personId');
+
+                    break;
+
                 case 'countryOfBirth':
                 case 'nationality':
                     $qb->addSelect(sprintf('IDENTITY(person.%s) as %s', $f, $f));
@@ -138,25 +120,7 @@ class ListPersonHelper
                     break;
 
                 case 'spokenLanguages':
-                    $qb
-                        ->leftJoin('person.spokenLanguages', 'spokenLanguage')
-                        ->addSelect('AGGREGATE(spokenLanguage.id) AS spokenLanguages')
-                        ->addGroupBy('person');
-
-                    if (in_array('center', $fields, true)) {
-                        $qb->addGroupBy('center');
-                    }
-
-                    if (in_array('address_fields', $fields, true)) {
-                        $qb
-                            ->addGroupBy('address_fieldsid')
-                            ->addGroupBy('address_fieldscountry_t.id')
-                            ->addGroupBy('address_fieldspostcode_t.id');
-                    }
-
-                    if (in_array('household_id', $fields, true)) {
-                        $qb->addGroupBy('household_id');
-                    }
+                    $qb->addSelect('(SELECT AGGREGATE(language.id) FROM '.Language::class.' language WHERE language MEMBER OF person.spokenLanguages) AS spokenLanguages');
 
                     break;
 
@@ -237,7 +201,7 @@ class ListPersonHelper
 
     public function getLabels($key, array $values, $data): callable
     {
-        if (substr($key, 0, strlen('address_fields')) === 'address_fields') {
+        if (str_starts_with((string) $key, 'address_fields')) {
             return $this->addressHelper->getLabel($key, $values, $data, 'address_fields');
         }
 
@@ -272,18 +236,17 @@ class ListPersonHelper
                     }
 
                     // warning: won't work with DateTimeImmutable as we reset time a few lines later
-                    $date = DateTime::createFromFormat('Y-m-d', $value);
+                    $date = \DateTime::createFromFormat('Y-m-d', $value);
                     $hasTime = false;
 
                     if (false === $date) {
-                        $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                        $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
                         $hasTime = true;
                     }
 
                     // check that the creation could occurs.
                     if (false === $date) {
-                        throw new Exception(sprintf('The value %s could '
-                            . 'not be converted to %s', $value, DateTime::class));
+                        throw new \Exception(sprintf('The value %s could not be converted to %s', $value, \DateTime::class));
                     }
 
                     if (!$hasTime) {
@@ -361,7 +324,7 @@ class ListPersonHelper
                         return '';
                     }
 
-                    $ids = json_decode($value);
+                    $ids = json_decode((string) $value, null, 512, JSON_THROW_ON_ERROR);
 
                     return
                         implode(
@@ -401,8 +364,8 @@ class ListPersonHelper
                 };
 
             default:
-                if (!in_array($key, self::getAllPossibleFields(), true)) {
-                    throw new RuntimeException("this key is not supported by this helper: {$key}");
+                if (!\in_array($key, self::getAllPossibleFields(), true)) {
+                    throw new \RuntimeException("this key is not supported by this helper: {$key}");
                 }
 
                 // for fields which are associated with person
@@ -416,9 +379,9 @@ class ListPersonHelper
         }
     }
 
-    private function addCurrentAddressAt(QueryBuilder $qb, DateTimeImmutable $date): void
+    private function addCurrentAddressAt(QueryBuilder $qb, \DateTimeImmutable $date): void
     {
-        if (!(in_array('personHouseholdAddress', $qb->getAllAliases(), true))) {
+        if (!\in_array('personHouseholdAddress', $qb->getAllAliases(), true)) {
             $qb
                 ->leftJoin('person.householdAddresses', 'personHouseholdAddress')
                 ->andWhere(
diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
index f6bf4962e..77c27c86d 100644
--- a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
+++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
@@ -22,7 +22,6 @@ 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.
@@ -49,7 +48,7 @@ class AccompanyingPeriodType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        //if the period_action is close, date opening should not be seen
+        // if the period_action is close, date opening should not be seen
         if ('close' !== $options['period_action']) {
             $builder
                 ->add('openingDate', DateType::class, [
@@ -81,7 +80,7 @@ class AccompanyingPeriodType extends AbstractType
         if ('visible' === $this->config['user']) {
             $builder->add('user', UserPickerType::class, [
                 'center' => $options['center'],
-                'role' => new Role(PersonVoter::SEE),
+                'role' => PersonVoter::SEE,
             ]);
         }
 
@@ -98,7 +97,7 @@ class AccompanyingPeriodType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\PersonBundle\Entity\AccompanyingPeriod',
+            'data_class' => \Chill\PersonBundle\Entity\AccompanyingPeriod::class,
         ]);
 
         $resolver
diff --git a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
index 0e63fe580..8031de926 100644
--- a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+++ b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
@@ -13,14 +13,9 @@ namespace Chill\PersonBundle\Form\ChoiceLoader;
 
 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.
  */
@@ -30,19 +25,10 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
 
     protected array $lazyLoadedPersons = [];
 
-    protected PersonRepository $personRepository;
-
-    /**
-     * PersonChoiceLoader constructor.
-     *
-     * @param EntityRepository $personRepository
-     */
     public function __construct(
-        PersonRepository $personRepository,
-        ?array $centers = null
+        protected PersonRepository $personRepository,
+        array $centers = null
     ) {
-        $this->personRepository = $personRepository;
-
         if (null !== $centers) {
             $this->centers = $centers;
         }
@@ -55,9 +41,7 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
     {
         return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
             $this->lazyLoadedPersons,
-            static function (Person $p) use ($value) {
-                return call_user_func($value, $p);
-            }
+            static fn (Person $p) => \call_user_func($value, $p)
         );
     }
 
@@ -79,9 +63,9 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
 
             if (
                 $this->hasCenterFilter()
-                && !in_array($person->getCenter(), $this->centers, true)
+                && !\in_array($person->getCenter(), $this->centers, true)
             ) {
-                throw new RuntimeException('chosen a person not in correct center');
+                throw new \RuntimeException('chosen a person not in correct center');
             }
 
             $choices[] = $person;
@@ -106,7 +90,7 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
                 continue;
             }
 
-            $id = call_user_func($value, $choice);
+            $id = \call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedPersons[$id] = $choice;
         }
@@ -119,6 +103,6 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
      */
     protected function hasCenterFilter()
     {
-        return count($this->centers) > 0;
+        return \count($this->centers) > 0;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php b/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
index 35dc502b9..fd7ef3ecb 100644
--- a/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
+++ b/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
@@ -19,12 +19,15 @@ 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;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class ClosingMotiveType.
  */
 class ClosingMotiveType extends AbstractType
 {
+    public function __construct(private readonly TranslatorInterface $translator) {}
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
@@ -46,6 +49,11 @@ class ClosingMotiveType extends AbstractType
                 'placeholder' => 'closing_motive.any parent',
                 'multiple' => false,
                 'only_leaf' => false,
+            ])
+            ->add('isCanceledAccompanyingPeriod', CheckboxType::class, [
+                'label' => $this->translator->trans('Consider canceled'),
+                'required' => false,
+                'help' => $this->translator->trans('Canceled parcours help'),
             ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 5548d6c5e..01814af38 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -40,19 +40,13 @@ final class CreationPersonType extends AbstractType
     // TODO: See if this is still valid and update accordingly.
     public const NAME = 'chill_personbundle_person_creation';
 
-    private bool $askCenters;
-
-    private ConfigPersonAltNamesHelper $configPersonAltNamesHelper;
-
-    private EventDispatcherInterface $dispatcher;
+    private readonly bool $askCenters;
 
     public function __construct(
-        ConfigPersonAltNamesHelper $configPersonAltNamesHelper,
-        EventDispatcherInterface $dispatcher,
+        private readonly ConfigPersonAltNamesHelper $configPersonAltNamesHelper,
+        private readonly EventDispatcherInterface $dispatcher,
         ParameterBagInterface $parameterBag
     ) {
-        $this->configPersonAltNamesHelper = $configPersonAltNamesHelper;
-        $this->dispatcher = $dispatcher;
         $this->askCenters = $parameterBag->get('chill_main')['acl']['form_show_centers'];
     }
 
@@ -120,7 +114,7 @@ final class CreationPersonType extends AbstractType
         $resolver->setDefaults([
             'data_class' => Person::class,
             'constraints' => [
-                new Callback([$this, 'validateCheckedAddress']),
+                new Callback($this->validateCheckedAddress(...)),
             ],
         ]);
     }
diff --git a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
index 5b12430c8..0fc25eefe 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
@@ -17,9 +17,6 @@ use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
-use function array_key_exists;
-use function is_array;
-
 class PersonAltNameDataMapper implements DataMapperInterface
 {
     public function mapDataToForms($viewData, $forms)
@@ -35,12 +32,12 @@ class PersonAltNameDataMapper implements DataMapperInterface
         $mapIndexToKey = [];
 
         foreach ($viewData->getIterator() as $key => $altName) {
-            /** @var PersonAltName $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());
             }
         }
@@ -48,13 +45,13 @@ class PersonAltNameDataMapper implements DataMapperInterface
 
     /**
      * @param FormInterface[] $forms
-     * @param Collection $viewData
+     * @param Collection      $viewData
      */
     public function mapFormsToData($forms, &$viewData)
     {
         $mapIndexToKey = [];
 
-        if (is_array($viewData)) {
+        if (\is_array($viewData)) {
             $dataIterator = $viewData;
         } else {
             $dataIterator = $viewData instanceof ArrayCollection ?
@@ -62,14 +59,14 @@ class PersonAltNameDataMapper implements DataMapperInterface
         }
 
         foreach ($dataIterator as $key => $altName) {
-            /** @var PersonAltName $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 {
@@ -81,7 +78,7 @@ class PersonAltNameDataMapper implements DataMapperInterface
                         ->setKey($key)
                         ->setLabel($form->getData());
 
-                    if (is_array($viewData)) {
+                    if (\is_array($viewData)) {
                         $viewData[] = $altName;
                     } else {
                         $viewData->add($altName);
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php
index d6919cc5d..2df66039f 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdCompositionType.php
@@ -22,15 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class HouseholdCompositionType extends AbstractType
 {
-    private HouseholdCompositionTypeRepository $householdCompositionTypeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(HouseholdCompositionTypeRepository $householdCompositionTypeRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->householdCompositionTypeRepository = $householdCompositionTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly HouseholdCompositionTypeRepository $householdCompositionTypeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -40,9 +32,7 @@ class HouseholdCompositionType extends AbstractType
             ->add('householdCompositionType', EntityType::class, [
                 'class' => \Chill\PersonBundle\Entity\Household\HouseholdCompositionType::class,
                 'choices' => $types,
-                'choice_label' => function (\Chill\PersonBundle\Entity\Household\HouseholdCompositionType $type) {
-                    return $this->translatableStringHelper->localize($type->getLabel());
-                },
+                'choice_label' => fn (\Chill\PersonBundle\Entity\Household\HouseholdCompositionType $type) => $this->translatableStringHelper->localize($type->getLabel()),
                 'label' => 'household_composition.Household composition',
             ])
             ->add('startDate', ChillDateType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php
index b9dfad240..1d7697332 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php
@@ -11,7 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form;
 
-use Chill\PersonBundle\Form\Type\PickPersonType;
+use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -21,7 +21,7 @@ class PersonFindManuallyDuplicateType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('person', PickPersonType::class, [
+            ->add('person', PickPersonDynamicType::class, [
                 'label' => 'Find duplicate',
                 'mapped' => false,
             ])
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
index 8427dec13..2063b0e21 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -29,21 +29,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class PersonResourceType extends AbstractType
 {
-    private PersonRenderInterface $personRender;
-
-    private ResourceKindRender $resourceKindRender;
-
-    private ThirdPartyRender $thirdPartyRender;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(ResourceKindRender $resourceKindRender, PersonRenderInterface $personRender, ThirdPartyRender $thirdPartyRender, TranslatorInterface $translator)
-    {
-        $this->resourceKindRender = $resourceKindRender;
-        $this->personRender = $personRender;
-        $this->thirdPartyRender = $thirdPartyRender;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly ResourceKindRender $resourceKindRender, private readonly PersonRenderInterface $personRender, private readonly ThirdPartyRender $thirdPartyRender, private readonly TranslatorInterface $translator) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php
index 15888c015..c971495b6 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@@ -20,7 +20,6 @@ use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Form\Type\Select2CountryType;
 use Chill\MainBundle\Form\Type\Select2LanguageType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
@@ -29,7 +28,6 @@ use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
 use Chill\PersonBundle\Form\Type\PersonPhoneType;
 use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -57,23 +55,16 @@ class PersonType extends AbstractType
      */
     protected $configAltNamesHelper;
 
-    protected TranslatableStringHelper $translatableStringHelper;
-
-    private ParameterBagInterface $parameterBag;
-
     /**
      * @param string[] $personFieldsConfiguration configuration of visibility of some fields
      */
     public function __construct(
         array $personFieldsConfiguration,
         ConfigPersonAltNamesHelper $configAltNamesHelper,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        ParameterBagInterface $parameterBag
+        protected TranslatableStringHelperInterface $translatableStringHelper,
     ) {
         $this->config = $personFieldsConfiguration;
         $this->configAltNamesHelper = $configAltNamesHelper;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->parameterBag = $parameterBag;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -118,12 +109,8 @@ class PersonType extends AbstractType
             ]);
 
             $builder->get('placeOfBirth')->addModelTransformer(new CallbackTransformer(
-                static function ($string) {
-                    return strtoupper((string) $string);
-                },
-                static function ($string) {
-                    return strtoupper((string) $string);
-                }
+                static fn ($string) => strtoupper((string) $string),
+                static fn ($string) => strtoupper((string) $string)
             ));
         }
 
@@ -167,9 +154,7 @@ class PersonType extends AbstractType
             'allow_delete' => true,
             'by_reference' => false,
             'label' => false,
-            'delete_empty' => static function (?PersonPhone $pp = null) {
-                return null === $pp || $pp->isEmpty();
-            },
+            'delete_empty' => static fn (PersonPhone $pp = null) => null === $pp || $pp->isEmpty(),
             'error_bubbling' => false,
             'empty_collection_explain' => 'No additional phone numbers',
         ]);
@@ -250,7 +235,7 @@ class PersonType extends AbstractType
 
         $resolver->setAllowedTypes(
             'cFGroup',
-            ['null', 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup']
+            ['null', \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class]
         );
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
index 6d07bf64f..a6f55e917 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
@@ -46,9 +46,7 @@ class GoalType extends AbstractType
                 'class' => Result::class,
                 'required' => false,
                 'multiple' => true,
-                'choice_label' => function (Result $r) {
-                    return $this->translatableStringHelper->localize($r->getTitle());
-                },
+                'choice_label' => fn (Result $r) => $this->translatableStringHelper->localize($r->getTitle()),
                 'attr' => ['class' => 'select2 '],
             ])
             ->add('desactivationDate', ChillDateType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
index 5a6095f7b..0b6cbe73d 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
@@ -50,16 +50,12 @@ class SocialActionType extends AbstractType
             ->add('issue', EntityType::class, [
                 'class' => SocialIssue::class,
                 'label' => 'socialAction.socialIssue',
-                'choice_label' => function (SocialIssue $issue) {
-                    return $this->translatableStringHelper->localize($issue->getTitle());
-                },
+                'choice_label' => fn (SocialIssue $issue) => $this->translatableStringHelper->localize($issue->getTitle()),
             ])
             ->add('parent', EntityType::class, [
                 'class' => SocialAction::class,
                 'required' => false,
-                'choice_label' => function (SocialAction $issue) {
-                    return $this->translatableStringHelper->localize($issue->getTitle());
-                },
+                'choice_label' => fn (SocialAction $issue) => $this->translatableStringHelper->localize($issue->getTitle()),
             ])
             ->add('ordering', NumberType::class, [
                 'required' => true,
@@ -70,9 +66,7 @@ class SocialActionType extends AbstractType
                 'required' => false,
                 'multiple' => true,
                 'attr' => ['class' => 'select2'],
-                'choice_label' => function (Result $r) {
-                    return $this->translatableStringHelper->localize($r->getTitle());
-                },
+                'choice_label' => fn (Result $r) => $this->translatableStringHelper->localize($r->getTitle()),
             ])
 
             ->add('goals', EntityType::class, [
@@ -80,9 +74,7 @@ class SocialActionType extends AbstractType
                 'required' => false,
                 'multiple' => true,
                 'attr' => ['class' => 'select2'],
-                'choice_label' => function (Goal $g) {
-                    return $this->translatableStringHelper->localize($g->getTitle());
-                },
+                'choice_label' => fn (Goal $g) => $this->translatableStringHelper->localize($g->getTitle()),
             ])
 
             ->add('evaluations', EntityType::class, [
@@ -90,9 +82,7 @@ class SocialActionType extends AbstractType
                 'required' => false,
                 'multiple' => true,
                 'attr' => ['class' => 'select2'],
-                'choice_label' => function (Evaluation $e) {
-                    return $this->translatableStringHelper->localize($e->getTitle());
-                },
+                'choice_label' => fn (Evaluation $e) => $this->translatableStringHelper->localize($e->getTitle()),
             ])
 
             ->add('defaultNotificationDelay', DateIntervalType::class, [
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
index 0435b5573..0d7a3bb4b 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
@@ -23,13 +23,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class SocialIssueType extends AbstractType
 {
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
index 2f96d4966..49e23f7c6 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
@@ -60,18 +60,14 @@ class ClosingMotivePickerType extends AbstractType
             'class' => ClosingMotive::class,
             'empty_data' => null,
             'placeholder' => 'Choose a motive',
-            'choice_label' => function (ClosingMotive $cm) {
-                return $this->entityRenderExtension->renderString($cm);
-            },
+            'choice_label' => fn (ClosingMotive $cm) => $this->entityRenderExtension->renderString($cm),
             'only_leaf' => true,
         ]);
 
         $resolver
             ->setAllowedTypes('only_leaf', 'bool')
-            ->setNormalizer('choices', function (Options $options) {
-                return $this->repository
-                    ->getActiveClosingMotive($options['only_leaf']);
-            });
+            ->setNormalizer('choices', fn (Options $options) => $this->repository
+                ->getActiveClosingMotive($options['only_leaf']));
     }
 
     /**
@@ -82,10 +78,7 @@ class ClosingMotivePickerType extends AbstractType
         return 'closing_motive';
     }
 
-    /**
-     * @return string|null
-     */
-    public function getParent()
+    public function getParent(): ?string
     {
         return EntityType::class;
     }
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
index e2f144b2a..6d983be37 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
@@ -21,23 +21,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonAltNameType extends AbstractType
 {
-    /**
-     * @var ConfigPersonAltNamesHelper
-     */
-    private $configHelper;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    public function __construct(
-        ConfigPersonAltNamesHelper $configHelper,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->configHelper = $configHelper;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly ConfigPersonAltNamesHelper $configHelper, private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
index 1c31d2b64..0e84bfc83 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
@@ -24,15 +24,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonPhoneType extends AbstractType
 {
-    private EntityManagerInterface $em;
-
-    private PhonenumberHelper $phonenumberHelper;
-
-    public function __construct(PhonenumberHelper $phonenumberHelper, EntityManagerInterface $em)
-    {
-        $this->phonenumberHelper = $phonenumberHelper;
-        $this->em = $em;
-    }
+    public function __construct(private readonly PhonenumberHelper $phonenumberHelper, private readonly EntityManagerInterface $em) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
index 8ed0b7f37..c14472cdd 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -26,21 +26,7 @@ use Symfony\Component\Serializer\SerializerInterface;
  */
 class PickPersonDynamicType extends AbstractType
 {
-    private DenormalizerInterface $denormalizer;
-
-    private NormalizerInterface $normalizer;
-
-    private SerializerInterface $serializer;
-
-    public function __construct(
-        DenormalizerInterface $denormalizer,
-        SerializerInterface $serializer,
-        NormalizerInterface $normalizer
-    ) {
-        $this->denormalizer = $denormalizer;
-        $this->serializer = $serializer;
-        $this->normalizer = $normalizer;
-    }
+    public function __construct(private readonly DenormalizerInterface $denormalizer, private readonly SerializerInterface $serializer, private readonly NormalizerInterface $normalizer) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
index 501af5b9d..d29b4cd41 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
@@ -18,7 +18,6 @@ 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\OptionsResolver\Options;
@@ -29,9 +28,6 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function in_array;
-use function is_array;
-
 /**
  * This type allow to pick a person.
  *
@@ -107,21 +103,17 @@ class PickPersonType extends AbstractType
             ->addAllowedTypes('centers', ['array', Center::class, 'null'])
             ->setDefault('centers', null)
             ->setDefined('role')
-            ->addAllowedTypes('role', [Role::class, 'null'])
+            ->addAllowedTypes('role', ['string', 'null'])
             ->setDefault('role', null);
 
         // add the default options
         $resolver->setDefaults([
             'class' => Person::class,
-            'choice_label' => static function (Person $p) {
-                return $p->getFirstname() . ' ' . $p->getLastname();
-            },
+            'choice_label' => static fn (Person $p) => $p->getFirstname().' '.$p->getLastname(),
             'placeholder' => 'Pick a person',
-            'choice_attr' => static function (Person $p) {
-                return [
-                    'data-center' => $p->getCenter()->getId(),
-                ];
-            },
+            'choice_attr' => static fn (Person $p) => [
+                'data-center' => $p->getCenter()->getId(),
+            ],
             'attr' => ['class' => 'select2 '],
             'choice_loader' => function (Options $options) {
                 $centers = $this->filterCentersfom($options);
@@ -139,9 +131,7 @@ class PickPersonType extends AbstractType
     protected function filterCentersfom(Options $options)
     {
         if (null === $options['role']) {
-            $centers = array_map(static function (GroupCenter $g) {
-                return $g->getCenter();
-            }, $this->user->getGroupCenters()->toArray());
+            $centers = array_map(static fn (GroupCenter $g) => $g->getCenter(), $this->user->getGroupCenters()->toArray());
         } else {
             $centers = $this->authorizationHelper
                 ->getReachableCenters($this->user, $options['role']->getRole());
@@ -152,21 +142,18 @@ class PickPersonType extends AbstractType
             $selectedCenters = $centers;
         } else {
             $selectedCenters = [];
-            $optionsCenters = is_array($options['centers']) ?
+            $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);
+                    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();
-                        },
+                    !\in_array($c->getId(), array_map(
+                        static fn (Center $c) => $c->getId(),
                         $centers
                     ), true)
                 ) {
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php
index 7c0da43b1..19258f23d 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php
@@ -20,17 +20,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PickSocialActionType extends AbstractType
 {
-    private SocialActionRender $actionRender;
-
-    private SocialActionRepository $actionRepository;
-
-    public function __construct(
-        SocialActionRender $actionRender,
-        SocialActionRepository $actionRepository
-    ) {
-        $this->actionRender = $actionRender;
-        $this->actionRepository = $actionRepository;
-    }
+    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $actionRepository) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
@@ -38,9 +28,7 @@ class PickSocialActionType extends AbstractType
             ->setDefaults([
                 'class' => SocialAction::class,
                 'choices' => $this->actionRepository->findAllActive(),
-                'choice_label' => function (SocialAction $sa) {
-                    return $this->actionRender->renderString($sa, []);
-                },
+                'choice_label' => fn (SocialAction $sa) => $this->actionRender->renderString($sa, []),
                 'placeholder' => 'Pick a social action',
                 'required' => false,
                 'attr' => ['class' => 'select2'],
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php
index e79c17191..b61343423 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php
@@ -20,17 +20,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PickSocialIssueType extends AbstractType
 {
-    private SocialIssueRender $issueRender;
-
-    private SocialIssueRepository $issueRepository;
-
-    public function __construct(
-        SocialIssueRender $issueRender,
-        SocialIssueRepository $issueRepository
-    ) {
-        $this->issueRender = $issueRender;
-        $this->issueRepository = $issueRepository;
-    }
+    public function __construct(private readonly SocialIssueRender $issueRender, private readonly SocialIssueRepository $issueRepository) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
@@ -38,9 +28,7 @@ class PickSocialIssueType extends AbstractType
             ->setDefaults([
                 'class' => SocialIssue::class,
                 'choices' => $this->issueRepository->findAllActive(),
-                'choice_label' => function (SocialIssue $si) {
-                    return $this->issueRender->renderString($si, []);
-                },
+                'choice_label' => fn (SocialIssue $si) => $this->issueRender->renderString($si, []),
                 'placeholder' => 'Pick a social issue',
                 'required' => false,
                 'attr' => ['class' => 'select2'],
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
index 0099e6367..b820aa86f 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
@@ -20,40 +20,29 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use const SORT_FLAG_CASE;
-use const SORT_STRING;
-
 /**
  * A type to select the marital status.
  */
 class Select2MaritalStatusType extends AbstractType
 {
-    private EntityManagerInterface $em;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper, EntityManagerInterface $em)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->em = $em;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly EntityManagerInterface $em) {}
 
     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::class);
         $builder->addModelTransformer($transformer);
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $maritalStatuses = $this->em->getRepository('Chill\PersonBundle\Entity\MaritalStatus')->findAll();
+        $maritalStatuses = $this->em->getRepository(\Chill\PersonBundle\Entity\MaritalStatus::class)->findAll();
         $choices = [];
 
         foreach ($maritalStatuses as $ms) {
             $choices[$ms->getId()] = $this->translatableStringHelper->localize($ms->getName());
         }
 
-        asort($choices, SORT_STRING | SORT_FLAG_CASE);
+        asort($choices, \SORT_STRING | \SORT_FLAG_CASE);
 
         $resolver->setDefaults([
             'class' => MaritalStatus::class,
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index bdb7a8eca..3f89202e1 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -16,49 +16,46 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
-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 Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use function in_array;
-use function spl_object_hash;
 
 class MembersEditor
 {
-    public const VALIDATION_GROUP_AFFECTED = 'household_memberships';
+    final public const VALIDATION_GROUP_AFFECTED = 'household_memberships';
 
-    public const VALIDATION_GROUP_COMPOSITION = 'household_composition';
+    final public const VALIDATION_GROUP_COMPOSITION = 'household_composition';
 
-    public const VALIDATION_GROUP_CREATED = 'household_memberships_created';
-
-    private EventDispatcherInterface $eventDispatcher;
+    final public const VALIDATION_GROUP_CREATED = 'household_memberships_created';
 
     private array $events = [];
 
-    private ?Household $household = null;
-
     private array $membershipsAffected = [];
 
     private array $oldMembershipsHashes = [];
 
     private array $persistables = [];
 
-    private ValidatorInterface $validator;
+    public function __construct(
+        private readonly ValidatorInterface $validator,
+        private readonly ?Household $household,
+        private readonly EventDispatcherInterface $eventDispatcher
+    ) {}
 
-    public function __construct(ValidatorInterface $validator, ?Household $household, EventDispatcherInterface $eventDispatcher)
-    {
-        $this->validator = $validator;
-        $this->household = $household;
-        $this->eventDispatcher = $eventDispatcher;
-    }
-
-    public function addMovement(DateTimeImmutable $date, Person $person, ?Position $position, ?bool $holder = false, ?string $comment = null): self
+    /**
+     * Add a person to the household.
+     *
+     * The person is added to the household associated with this editor's instance.
+     *
+     * If the person is also a member of another household, or the same household at the same position, the person
+     * is not associated any more with the previous household.
+     */
+    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');
+            throw new \LogicException('You must define a household first');
         }
 
         $membership = (new HouseholdMember())
@@ -69,68 +66,66 @@ class MembersEditor
             ->setComment($comment);
         $this->household->addMember($membership);
 
-        if (null !== $position) {
-            if ($position->getShareHousehold()) {
-                // launch event only if moving to a "share household" position,
-                // and if the destination household is different than the previous one
-                $event = new PersonAddressMoveEvent($person);
-                $event->setNextMembership($membership);
+        if ($membership->getShareHousehold()) {
+            // launch event only if moving to a "share household" position,
+            // and if the destination household is different than the previous one
+            $event = new PersonAddressMoveEvent($person);
+            $event->setNextMembership($membership);
 
-                $counter = 0;
+            $counter = 0;
 
-                foreach ($person->getHouseholdParticipationsShareHousehold() as $participation) {
-                    if ($participation === $membership) {
-                        continue;
-                    }
-
-                    if ($participation->getStartDate() > $membership->getStartDate()) {
-                        continue;
-                    }
-
-                    ++$counter;
-
-                    if ($participation->getEndDate() === null || $participation->getEndDate() > $date) {
-                        $participation->setEndDate($date);
-                        $this->membershipsAffected[] = $participation;
-                        $this->oldMembershipsHashes[] = spl_object_hash($participation);
-
-                        if ($participation->getHousehold() !== $this->household) {
-                            $event->setPreviousMembership($participation);
-                            $this->events[] = $event;
-                        }
-                    }
+            foreach ($person->getHouseholdParticipationsShareHousehold() as $participation) {
+                if ($participation === $membership) {
+                    continue;
                 }
 
-                // send also the event if there was no participation before
-                if (0 === $counter) {
-                    $this->events[] = $event;
+                if ($participation->getStartDate() > $membership->getStartDate()) {
+                    continue;
                 }
 
-                foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
-                    if ($participation->getHousehold() === $this->household
-                        && $participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate()
-                        && $participation->getStartDate() <= $membership->getStartDate()
-                    ) {
-                        $participation->setEndDate($membership->getStartDate());
+                ++$counter;
+
+                if (null === $participation->getEndDate() || $participation->getEndDate() > $date) {
+                    $participation->setEndDate($date);
+                    $this->membershipsAffected[] = $participation;
+                    $this->oldMembershipsHashes[] = \spl_object_hash($participation);
+
+                    if ($participation->getHousehold() !== $this->household) {
+                        $event->setPreviousMembership($participation);
+                        $this->events[] = $event;
                     }
                 }
-            } else {
-                // if a members is moved to the same household than the one he belongs to,
-                // we should make it leave the household
-                if ($person->getCurrentHousehold($date) === $this->household) {
-                    $this->leaveMovement($date, $person);
+            }
+
+            // send also the event if there was no participation before
+            if (0 === $counter) {
+                $this->events[] = $event;
+            }
+
+            foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
+                if ($participation->getHousehold() === $this->household
+                    && null === $participation->getEndDate() || $participation->getEndDate() > $membership->getStartDate()
+                    && $participation->getStartDate() <= $membership->getStartDate()
+                ) {
+                    $participation->setEndDate($membership->getStartDate());
+                }
+            }
+        } else {
+            // if there are multiple belongings not sharing household, close the others
+            foreach ($person->getHouseholdParticipations() as $participation) {
+                if ($participation === $membership) {
+                    continue;
                 }
 
-                // if there are multiple belongings not sharing household, close the others
-                foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
-                    if ($participation === $membership) {
-                        continue;
-                    }
-
-                    if ($participation->getHousehold() === $this->household
-                        && ($participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate())
-                        && $participation->getStartDate() <= $membership->getStartDate()
-                    ) {
+                if ($participation->getHousehold() === $this->household
+                    && (null === $participation->getEndDate() || $participation->getEndDate() > $membership->getStartDate())
+                    && $participation->getStartDate() <= $membership->getStartDate()
+                ) {
+                    if ($participation->getShareHousehold()) {
+                        // if a members is moved to the same household than the one he belongs to,
+                        // we should make it leave the household
+                        $this->leaveMovement($date, $person);
+                    } else {
                         $participation->setEndDate($membership->getStartDate());
                     }
                 }
@@ -158,8 +153,15 @@ class MembersEditor
         return null !== $this->household;
     }
 
+    /**
+     * Makes a person leave the household.
+     *
+     * Makes a person leave the household **associated with this editor**.
+     *
+     * @return $this
+     */
     public function leaveMovement(
-        DateTimeImmutable $date,
+        \DateTimeImmutable $date,
         Person $person
     ): self {
         $criteria = new Criteria();
@@ -167,8 +169,9 @@ class MembersEditor
 
         $criteria->where(
             $expr->andX(
-                $expr->lt('startDate', $date),
-                $expr->isNull('endDate', $date)
+                $expr->lte('startDate', $date),
+                $expr->isNull('endDate'),
+                $expr->eq('shareHousehold', true)
             )
         );
 
@@ -202,7 +205,7 @@ class MembersEditor
         }
 
         foreach ($this->membershipsAffected as $m) {
-            if (in_array(spl_object_hash($m), $this->oldMembershipsHashes, true)) {
+            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,
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php b/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
index 07a917d6b..7f98fe120 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
@@ -17,19 +17,9 @@ use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 class MembersEditorFactory
 {
-    private EventDispatcherInterface $eventDispatcher;
+    public function __construct(private readonly EventDispatcherInterface $eventDispatcher, private readonly ValidatorInterface $validator) {}
 
-    private ValidatorInterface $validator;
-
-    public function __construct(
-        EventDispatcherInterface $eventDispatcher,
-        ValidatorInterface $validator
-    ) {
-        $this->validator = $validator;
-        $this->eventDispatcher = $eventDispatcher;
-    }
-
-    public function createEditor(?Household $household = null): MembersEditor
+    public function createEditor(Household $household = null): MembersEditor
     {
         return new MembersEditor($this->validator, $household, $this->eventDispatcher);
     }
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index c956f78b6..79cd19db9 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -25,20 +25,14 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected Registry $registry;
-
-    protected Security $security;
-
     /**
      * @var TranslatorInterface
      */
     protected $translator;
 
-    public function __construct(TranslatorInterface $translator, Registry $registry, Security $security)
+    public function __construct(TranslatorInterface $translator, protected Registry $registry, protected Security $security)
     {
         $this->translator = $translator;
-        $this->registry = $registry;
-        $this->security = $security;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
index 074c27027..d30adaf5d 100644
--- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
@@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HouseholdMenuBuilder implements LocalMenuBuilderInterface
@@ -22,7 +24,7 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $translator;
 
-    public function __construct(TranslatorInterface $translator)
+    public function __construct(TranslatorInterface $translator, private readonly Security $security)
     {
         $this->translator = $translator;
     }
@@ -53,12 +55,14 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
             ], ])
             ->setExtras(['order' => 17]);
 
-        $menu->addChild($this->translator->trans('household.Accompanying period'), [
-            'route' => 'chill_person_household_accompanying_period',
-            'routeParameters' => [
-                'household_id' => $household->getId(),
-            ], ])
-            ->setExtras(['order' => 20]);
+        if ($this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['household'])) {
+            $menu->addChild($this->translator->trans('household.Accompanying period'), [
+                'route' => 'chill_person_household_accompanying_period',
+                'routeParameters' => [
+                    'household_id' => $household->getId(),
+                ], ])
+                ->setExtras(['order' => 20]);
+        }
 
         $menu->addChild($this->translator->trans('household.Addresses'), [
             'route' => 'chill_person_household_addresses',
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 39ac557fb..5dce8c477 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 /**
  * Add menu entrie to person menu.
@@ -38,28 +38,18 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $showAccompanyingPeriod;
 
-    protected TranslatorInterface $translator;
-
-    private ResidentialAddressRepository $residentialAddressRepo;
-
-    private Security $security;
-
     public function __construct(
         ParameterBagInterface $parameterBag,
-        Security $security,
-        TranslatorInterface $translator,
-        ResidentialAddressRepository $residentialAddressRepo
+        private readonly Security $security,
+        protected TranslatorInterface $translator,
+        private readonly ResidentialAddressRepository $residentialAddressRepo
     ) {
         $this->showAccompanyingPeriod = $parameterBag->get('chill_person.accompanying_period');
-        $this->security = $security;
-        $this->translator = $translator;
-        $this->residentialAddressRepo = $residentialAddressRepo;
     }
 
     /**
-     * @param $menuId
-     * @param MenuItem $menu
      * @param array{person: Person} $parameters
+     *
      * @return void
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
@@ -106,17 +96,19 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
             ->setExtras([
                 'order' => 99999,
             ]);
-        /*
-        $menu->addChild($this->translator->trans('Person duplicate'), [
-            'route' => 'chill_person_duplicate_view',
-            'routeParameters' => [
-                'person_id' => $parameters['person']->getId(),
-            ],
-        ])
-            ->setExtras([
-                'order' => 99999,
-            ]);
-         */
+
+        if ($this->security->isGranted(PersonVoter::DUPLICATE, $parameters['person'])) {
+            $menu->addChild($this->translator->trans('Person duplicate'), [
+                'route' => 'chill_person_duplicate_view',
+                'routeParameters' => [
+                    'person_id' => $parameters['person']->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 99999,
+                ]);
+        }
+
         if (
             'visible' === $this->showAccompanyingPeriod
             && $this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['person'])
diff --git a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
index 396d67912..c82038b40 100644
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@@ -25,25 +25,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected ParameterBagInterface $parameterBag;
-
-    protected TranslatorInterface $translator;
-
-    private Security $security;
-
     /**
      * SectionMenuBuilder constructor.
      */
-    public function __construct(ParameterBagInterface $parameterBag, Security $security, TranslatorInterface $translator)
-    {
-        $this->parameterBag = $parameterBag;
-        $this->security = $security;
-        $this->translator = $translator;
-    }
+    public function __construct(protected ParameterBagInterface $parameterBag, private readonly Security $security, protected TranslatorInterface $translator) {}
 
-    /**
-     * @param $menuId
-     */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if ($this->security->isGranted(PersonVoter::CREATE) && $this->parameterBag->get('chill_person.create_person_allowed')) {
diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php
index 486209453..668f868ae 100644
--- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php
+++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationHandler.php
@@ -16,18 +16,13 @@ use Chill\MainBundle\Notification\NotificationHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 
-final class AccompanyingPeriodNotificationHandler implements NotificationHandlerInterface
+final readonly class AccompanyingPeriodNotificationHandler implements NotificationHandlerInterface
 {
-    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
-
-    public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository)
-    {
-        $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
-    }
+    public function __construct(private AccompanyingPeriodRepository $accompanyingPeriodRepository) {}
 
     public function getTemplate(Notification $notification, array $options = []): string
     {
-        return 'ChillPersonBundle:AccompanyingPeriod:showInNotification.html.twig';
+        return '@ChillPerson/AccompanyingPeriod/showInNotification.html.twig';
     }
 
     public function getTemplateData(Notification $notification, array $options = []): array
@@ -40,6 +35,6 @@ final class AccompanyingPeriodNotificationHandler implements NotificationHandler
 
     public function supports(Notification $notification, array $options = []): bool
     {
-        return $notification->getRelatedEntityClass() === AccompanyingPeriod::class;
+        return AccompanyingPeriod::class === $notification->getRelatedEntityClass();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkEvaluationDocumentNotificationHandler.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkEvaluationDocumentNotificationHandler.php
new file mode 100644
index 000000000..40aff8570
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkEvaluationDocumentNotificationHandler.php
@@ -0,0 +1,41 @@
+<?php
+
+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 Chill\PersonBundle\Notification;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Notification\NotificationHandlerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocumentRepository;
+
+final readonly class AccompanyingPeriodWorkEvaluationDocumentNotificationHandler implements NotificationHandlerInterface
+{
+    public function __construct(private AccompanyingPeriodWorkEvaluationDocumentRepository $accompanyingPeriodWorkEvaluationDocumentRepository) {}
+
+    public function getTemplate(Notification $notification, array $options = []): string
+    {
+        return '@ChillPerson/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig';
+    }
+
+    public function getTemplateData(Notification $notification, array $options = []): array
+    {
+        return [
+            'notification' => $notification,
+            'document' => $doc = $this->accompanyingPeriodWorkEvaluationDocumentRepository->find($notification->getRelatedEntityId()),
+            'evaluation' => $doc?->getAccompanyingPeriodWorkEvaluation(),
+        ];
+    }
+
+    public function supports(Notification $notification, array $options = []): bool
+    {
+        return AccompanyingPeriodWorkEvaluationDocument::class === $notification->getRelatedEntityClass();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkNotificationHandler.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkNotificationHandler.php
new file mode 100644
index 000000000..e147fa520
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodWorkNotificationHandler.php
@@ -0,0 +1,40 @@
+<?php
+
+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 Chill\PersonBundle\Notification;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Notification\NotificationHandlerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+
+final readonly class AccompanyingPeriodWorkNotificationHandler implements NotificationHandlerInterface
+{
+    public function __construct(private AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository) {}
+
+    public function getTemplate(Notification $notification, array $options = []): string
+    {
+        return '@ChillPerson/AccompanyingCourseWork/showInNotification.html.twig';
+    }
+
+    public function getTemplateData(Notification $notification, array $options = []): array
+    {
+        return [
+            'notification' => $notification,
+            'work' => $this->accompanyingPeriodWorkRepository->find($notification->getRelatedEntityId()),
+        ];
+    }
+
+    public function supports(Notification $notification, array $options = []): bool
+    {
+        return AccompanyingPeriodWork::class === $notification->getRelatedEntityClass();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
index eb22a671d..739387941 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
@@ -32,21 +32,12 @@ namespace Chill\PersonBundle\Privacy;
  */
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Symfony\Component\EventDispatcher\Event;
 
-class AccompanyingPeriodPrivacyEvent extends Event
+class AccompanyingPeriodPrivacyEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
-    public const ACCOMPANYING_PERIOD_PRIVACY_EVENT = 'chill_person.accompanying_period_privacy_event';
+    final public const ACCOMPANYING_PERIOD_PRIVACY_EVENT = 'chill_person.accompanying_period_privacy_event';
 
-    protected array $args;
-
-    protected AccompanyingPeriod $period;
-
-    public function __construct($period, $args = [])
-    {
-        $this->period = $period;
-        $this->args = $args;
-    }
+    public function __construct(protected $period, protected $args = []) {}
 
     public function getArgs(): array
     {
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
index b691c4e89..df57a08fd 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
@@ -32,9 +32,6 @@ namespace Chill\PersonBundle\Privacy;
  */
 
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\EventDispatcher\Event;
-
-use function count;
 
 /**
  * Class PrivacyEvent.
@@ -42,33 +39,16 @@ use function count;
  * Array $args expects arguments with the following keys: 'element_class', 'element_id', 'action'
  * By default, action is set to 'show'
  */
-class PrivacyEvent extends Event
+class PrivacyEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
-    public const PERSON_PRIVACY_EVENT = 'chill_person.privacy_event';
+    final public const PERSON_PRIVACY_EVENT = 'chill_person.privacy_event';
 
-    /**
-     * @var array
-     */
-    private $args;
-
-    /**
-     * @var Person
-     */
-    private $person;
-
-    /**
-     * @var array
-     */
-    private $persons = [];
+    private array $persons = [];
 
     /**
      * PrivacyEvent constructor.
      */
-    public function __construct(Person $person, array $args = ['action' => 'show'])
-    {
-        $this->person = $person;
-        $this->args = $args;
-    }
+    public function __construct(private readonly Person $person, private readonly array $args = ['action' => 'show']) {}
 
     public function addPerson(Person $person)
     {
@@ -106,6 +86,6 @@ class PrivacyEvent extends Event
      */
     public function hasPersons()
     {
-        return count($this->persons) >= 1;
+        return \count($this->persons) >= 1;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
index 0b67537cb..88eb2b172 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
@@ -36,8 +36,6 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
-use function array_map;
-
 class PrivacyEventSubscriber implements EventSubscriberInterface
 {
     /**
@@ -76,9 +74,7 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
         $involved = $this->getInvolved();
         $involved['period_id'] = $event->getPeriod()->getId();
         $involved['persons'] = $event->getPeriod()->getPersons()
-            ->map(static function (Person $p) {
-                return $p->getId();
-            })
+            ->map(static fn (Person $p) => $p->getId())
             ->toArray();
 
         $this->logger->notice(
@@ -91,7 +87,7 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
     {
         $persons = [];
 
-        if ($event->hasPersons() === true) {
+        if (true === $event->hasPersons()) {
             foreach ($event->getPersons() as $person) {
                 $persons[] = $person->getId();
             }
@@ -101,10 +97,8 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
         $involved['person_id'] = $event->getPerson()->getId();
 
         if ($event->hasPersons()) {
-            $involved['persons'] = array_map(
-                static function (Person $p) {
-                    return $p->getId();
-                },
+            $involved['persons'] = \array_map(
+                static fn (Person $p) => $p->getId(),
                 $event->getPersons()
             );
         }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php
new file mode 100644
index 000000000..0f68efabb
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepository.php
@@ -0,0 +1,90 @@
+<?php
+
+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 Chill\PersonBundle\Repository\AccompanyingPeriod;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Component\Clock\ClockInterface;
+
+readonly class AccompanyingPeriodInfoRepository implements AccompanyingPeriodInfoRepositoryInterface
+{
+    private EntityRepository $entityRepository;
+
+    public function __construct(
+        private ClockInterface $clock,
+        private EntityManagerInterface $em,
+    ) {
+        $this->entityRepository = $em->getRepository($this->getClassName());
+    }
+
+    public function findAccompanyingPeriodIdInactiveAfter(\DateInterval $interval, array $statuses = []): array
+    {
+        $query = $this->em->createQuery();
+        $baseDql = 'SELECT DISTINCT IDENTITY(ai.accompanyingPeriod) FROM '.AccompanyingPeriodInfo::class.' ai JOIN ai.accompanyingPeriod a WHERE NOT EXISTS
+            (SELECT 1 FROM '.AccompanyingPeriodInfo::class.' aiz WHERE aiz.infoDate > :after AND IDENTITY(aiz.accompanyingPeriod) = IDENTITY(ai.accompanyingPeriod))';
+
+        if ([] !== $statuses) {
+            $dql = $baseDql.' AND a.step IN (:statuses)';
+            $query->setParameter('statuses', $statuses);
+        } else {
+            $dql = $baseDql;
+        }
+
+        return $query->setDQL($dql)
+            ->setParameter('after', $this->clock->now()->sub($interval))
+            ->getSingleColumnResult();
+    }
+
+    public function findAccompanyingPeriodIdActiveSince(\DateInterval $interval, array $statuses = []): array
+    {
+        $query = $this->em->createQuery();
+        $baseDql = 'SELECT DISTINCT IDENTITY(ai.accompanyingPeriod) FROM '.AccompanyingPeriodInfo::class.' ai
+            JOIN ai.accompanyingPeriod a WHERE ai.infoDate > :after';
+
+        if ([] !== $statuses) {
+            $dql = $baseDql.' AND a.step IN (:statuses)';
+            $query->setParameter('statuses', $statuses);
+        } else {
+            $dql = $baseDql;
+        }
+
+        return $query->setDQL($dql)
+            ->setParameter('after', $this->clock->now()->sub($interval))
+            ->getSingleColumnResult();
+    }
+
+    public function find($id): never
+    {
+        throw new \LogicException('Calling an accompanying period info by his id does not make sense');
+    }
+
+    public function findAll(): array
+    {
+        return $this->entityRepository->findAll();
+    }
+
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
+    {
+        return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?AccompanyingPeriodInfo
+    {
+        return $this->entityRepository->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return AccompanyingPeriodInfo::class;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepositoryInterface.php
new file mode 100644
index 000000000..3f85d303e
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodInfoRepositoryInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+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 Chill\PersonBundle\Repository\AccompanyingPeriod;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Doctrine\Persistence\ObjectRepository;
+
+/**
+ * @template-extends ObjectRepository<AccompanyingPeriodInfo>
+ */
+interface AccompanyingPeriodInfoRepositoryInterface extends ObjectRepository
+{
+    /**
+     * Return a list of id for inactive accompanying periods.
+     *
+     * @param list<AccompanyingPeriod::STEP_*> $statuses
+     *
+     * @return list<int>
+     */
+    public function findAccompanyingPeriodIdInactiveAfter(\DateInterval $interval, array $statuses = []): array;
+
+    /**
+     * @param list<AccompanyingPeriod::STEP_*> $statuses
+     *
+     * @return list<int>
+     */
+    public function findAccompanyingPeriodIdActiveSince(\DateInterval $interval, array $statuses = []): array;
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php
index 7aa8fde00..a0364188a 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocumentRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 class AccompanyingPeriodWorkEvaluationDocumentRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -39,12 +39,12 @@ class AccompanyingPeriodWorkEvaluationDocumentRepository implements ObjectReposi
     }
 
     /**
-     * @param null|mixed $limit
-     * @param null|mixed $offset
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return array|object[]|AccompanyingPeriodWorkEvaluationDocument[]
      */
-    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);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
index 3cd9284df..840c44304 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
@@ -12,8 +12,8 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -21,7 +21,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -53,7 +53,7 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
      *
      * @return array|AccompanyingPeriodWorkEvaluation[]
      */
-    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);
     }
@@ -91,13 +91,15 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
                     $qb->expr()->gte(':now', $qb->expr()->diff('e.maxDate', 'e.warningInterval')),
                     $qb->expr()->orX(
                         $qb->expr()->eq('period.user', ':user'),
-                        $qb->expr()->isMemberOf(':user', 'work.referrers')
+                        $qb->expr()->exists(
+                            'SELECT 1 FROM '.AccompanyingPeriodWork::class.' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = work.id AND subw_ref_history.user = :user'
+                        )
                     )
                 )
             )
             ->setParameters([
                 'user' => $user,
-                'now' => new DateTimeImmutable('now'),
+                'now' => new \DateTimeImmutable('now'),
             ]);
 
         return $qb;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
index a80964325..4e092beb0 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
@@ -23,7 +23,7 @@ use Doctrine\ORM\EntityRepository;
  */
 final class AccompanyingPeriodWorkGoalRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
index bf2d34aae..f0f00183d 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -23,16 +22,13 @@ use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class AccompanyingPeriodWorkRepository implements ObjectRepository
+final readonly class AccompanyingPeriodWorkRepository implements ObjectRepository
 {
-    private EntityManagerInterface $em;
-
     private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(private EntityManagerInterface $em)
     {
-        $this->em = $entityManager;
-        $this->repository = $entityManager->getRepository(AccompanyingPeriodWork::class);
+        $this->repository = $em->getRepository(AccompanyingPeriodWork::class);
     }
 
     public function countByAccompanyingPeriod(AccompanyingPeriod $period): int
@@ -50,13 +46,13 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
             ->getSingleScalarResult();
     }
 
-    public function countNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until): int
+    public function countNearEndDateByUser(User $user, \DateTimeImmutable $since, \DateTimeImmutable $until): int
     {
         return $this->buildQueryNearEndDateByUser($user, $since, $until)
             ->select('count(w)')->getQuery()->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -71,7 +67,7 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    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);
     }
@@ -94,31 +90,104 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
      * * first, opened works
      * * then, closed works
      *
+     * @param array{types?: list<SocialAction>, user?: list<User>, after?: \DateTimeImmutable|null, before?: \DateTimeImmutable|null} $filters
+     *
      * @return AccompanyingPeriodWork[]
      */
-    public function findByAccompanyingPeriodOpenFirst(AccompanyingPeriod $period, int $limit = 10, int $offset = 0): array
+    public function findByAccompanyingPeriodOpenFirst(AccompanyingPeriod $period, array $filters, int $limit = 10, int $offset = 0): array
     {
         $rsm = new ResultSetMappingBuilder($this->em);
         $rsm->addRootEntityFromClassMetadata(AccompanyingPeriodWork::class, 'w');
 
         $sql = "SELECT {$rsm} FROM chill_person_accompanying_period_work w
-                     WHERE accompanyingPeriod_id = :periodId
-                     ORDER BY
-                         CASE WHEN enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC,
-                         startdate DESC,
-                         enddate DESC,
-                         id DESC
-        LIMIT :limit OFFSET :offset";
+                    LEFT JOIN chill_person_accompanying_period_work_referrer AS rw ON accompanyingperiodwork_id = w.id
+                    WHERE accompanyingPeriod_id = :periodId";
+
+        // implement filters
+
+        if ([] !== ($filters['types'] ?? [])) {
+            $sql .= ' AND w.socialaction_id IN (:types)';
+        }
+
+        if ([] !== ($filters['user'] ?? [])) {
+            $sql .= ' AND rw.user_id IN ('
+                .implode(
+                    ', ',
+                    // we add a user_xx for each key of the 'user' list
+                    array_map(fn (User $u, int $idx) => ':user_'.$idx, $filters['user'], array_keys($filters['user']))
+                )
+                .')';
+        }
+
+        $sql .= " AND daterange(:after::date, :before::date) && daterange(w.startDate, w.endDate, '[]')";
+
+        // if the start and end date were inversed, we inverse the order to avoid an error
+        if (null !== ($filters['after'] ?? null) && null !== $filters['before'] && $filters['after'] > $filters['before']) {
+            $before = $filters['after'];
+            $after = $filters['before'];
+        } else {
+            $before = $filters['before'];
+            $after = $filters['after'];
+        }
+
+        // set limit and offset
+        $sql .= " ORDER BY
+                     CASE WHEN w.enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC,
+                     w.startdate DESC,
+                     w.enddate DESC,
+                     w.id DESC";
+
+        $sql .= ' LIMIT :limit OFFSET :offset';
+
+        $typeIds = [];
+        foreach ($filters['types'] as $type) {
+            $typeIds[] = $type->getId();
+        }
 
         $nq = $this->em->createNativeQuery($sql, $rsm)
             ->setParameter('periodId', $period->getId(), Types::INTEGER)
+            ->setParameter('types', $typeIds)
+            ->setParameter('after', $after)
+            ->setParameter('before', $before)
             ->setParameter('limit', $limit, Types::INTEGER)
             ->setParameter('offset', $offset, Types::INTEGER);
 
+        foreach ($filters['user'] as $key => $user) {
+            $nq->setParameter('user_'.$key, $user);
+        }
+
         return $nq->getResult();
     }
 
-    public function findNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until, int $limit = 20, int $offset = 0): array
+    /**
+     * Return a list of types of social actions associated to the accompanying period.
+     *
+     * @return array<SocialAction>
+     */
+    public function findActionTypeByPeriod(AccompanyingPeriod $period): array
+    {
+        $in = $this->em->createQueryBuilder();
+        $in
+            ->select('1')
+            ->from(AccompanyingPeriodWork::class, 'apw');
+
+        $in->andWhere('apw.accompanyingPeriod = :period')->setParameter('period', $period);
+
+        // join between the embedded exist query and the main query
+        $in->andWhere('apw.socialAction = sa');
+
+        $qb = $this->em->createQueryBuilder()->setParameters($in->getParameters());
+        $qb
+            ->select('sa')
+            ->from(SocialAction::class, 'sa')
+            ->where(
+                $qb->expr()->exists($in->getDQL())
+            );
+
+        return $qb->getQuery()->getResult();
+    }
+
+    public function findNearEndDateByUser(User $user, \DateTimeImmutable $since, \DateTimeImmutable $until, int $limit = 20, int $offset = 0): array
     {
         return $this->buildQueryNearEndDateByUser($user, $since, $until)
             ->select('w')
@@ -156,7 +225,7 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
         return $qb;
     }
 
-    private function buildQueryNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until): QueryBuilder
+    private function buildQueryNearEndDateByUser(User $user, \DateTimeImmutable $since, \DateTimeImmutable $until): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('w');
 
@@ -168,7 +237,9 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
                     $qb->expr()->lte('w.startDate', ':until'),
                     $qb->expr()->orX(
                         $qb->expr()->eq('period.user', ':user'),
-                        $qb->expr()->isMemberOf(':user', 'w.referrers')
+                        $qb->expr()->exists(
+                            'SELECT 1 FROM '.AccompanyingPeriodWork::class.' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = w.id AND subw_ref_history.user = :user and subw.ref_history.endDate IS NULL'
+                        )
                     )
                 )
             )
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
index 6422c7e0e..c60bdf4a7 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
@@ -16,15 +16,12 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 
-final class ClosingMotiveRepository implements ClosingMotiveRepositoryInterface
+final readonly class ClosingMotiveRepository implements ClosingMotiveRepositoryInterface
 {
-    private EntityManagerInterface $entityManager;
-
     private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(private EntityManagerInterface $entityManager)
     {
-        $this->entityManager = $entityManager;
         $this->repository = $entityManager->getRepository(ClosingMotive::class);
     }
 
@@ -44,7 +41,7 @@ final class ClosingMotiveRepository implements ClosingMotiveRepositoryInterface
     /**
      * @return array|ClosingMotive[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -54,15 +51,12 @@ final class ClosingMotiveRepository implements ClosingMotiveRepositoryInterface
         return $this->findOneBy($criteria);
     }
 
-    /**
-     * @return mixed
-     */
     public function getActiveClosingMotive(bool $onlyLeaf = true)
     {
         $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 ';
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
index 88c52a5b0..49464bbd4 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepositoryInterface.php
@@ -15,8 +15,5 @@ use Doctrine\Persistence\ObjectRepository;
 
 interface ClosingMotiveRepositoryInterface extends ObjectRepository
 {
-    /**
-     * @return mixed
-     */
     public function getActiveClosingMotive(bool $onlyLeaf = true);
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
index 207864ae2..3759cf2cd 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class CommentRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
index 3b3b6283d..1668b456e 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class OriginRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
index d8bc4e306..a5dbf4b69 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class ResourceRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
index 0aaabd05f..0a43697c8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -12,107 +12,77 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository;
 
 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
-use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use DateTime;
-
-use DateTimeImmutable;
-use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
+use Repository\AccompanyingPeriodACLAwareRepositoryTest;
 use Symfony\Component\Security\Core\Security;
-use function count;
 
-final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodACLAwareRepositoryInterface
+/**
+ * @see AccompanyingPeriodACLAwareRepositoryTest
+ */
+final readonly class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodACLAwareRepositoryInterface
 {
-    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
-
-    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;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-    }
+        private AccompanyingPeriodRepository $accompanyingPeriodRepository,
+        private Security $security,
+        private AuthorizationHelperForCurrentUserInterface $authorizationHelper,
+        private CenterResolverManagerInterface $centerResolver
+    ) {}
 
-    /**
-     * @param array|PostalCode[]
-     *
-     * @return QueryBuilder
-     */
-    public function buildQueryOpenedAccompanyingCourseByUser(?User $user, array $postalCodes = [])
+    public function buildQueryOpenedAccompanyingCourseByUserAndPostalCodes(?User $user, array $postalCodes = []): QueryBuilder
     {
         $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
 
         $qb->where($qb->expr()->eq('ap.user', ':user'))
             ->andWhere(
                 $qb->expr()->neq('ap.step', ':draft'),
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('ap.closingDate'),
-                    $qb->expr()->gt('ap.closingDate', ':now')
-                )
+                $qb->expr()->neq('ap.step', ':closed'),
             )
             ->setParameter('user', $user)
-            ->setParameter('now', new DateTime('now'))
-            ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT);
+            ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT)
+            ->setParameter('closed', AccompanyingPeriod::STEP_CLOSED);
 
         if ([] !== $postalCodes) {
-            $qb->join('ap.locationHistories', 'location_history')
-                ->leftJoin(PersonHouseholdAddress::class, 'person_address', Join::WITH, 'IDENTITY(location_history.personLocation) = IDENTITY(person_address.person)')
+            $qb->join('ap.locationHistories', 'location_history', Join::WITH, 'location_history.endDate IS NULL')
+                ->leftJoin(Person\PersonCurrentAddress::class, 'person_address', Join::WITH, 'IDENTITY(location_history.personLocation) = IDENTITY(person_address.person)')
                 ->join(
                     Address::class,
                     'address',
                     Join::WITH,
-                    'COALESCE(IDENTITY(location_history.addressLocation), IDENTITY(person_address.address)) = address.id'
-                )
-                ->andWhere(
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull('person_address'),
-                        $qb->expr()->andX(
-                            $qb->expr()->lte('person_address.validFrom', ':now'),
-                            $qb->expr()->orX(
-                                $qb->expr()->isNull('person_address.validTo'),
-                                $qb->expr()->lt('person_address.validTo', ':now')
-                            )
-                        )
-                    )
-                )
-                ->andWhere(
-                    $qb->expr()->isNull('location_history.endDate')
+                    'COALESCE(IDENTITY(person_address.address), IDENTITY(location_history.addressLocation)) = address.id'
                 )
                 ->andWhere(
                     $qb->expr()->in('address.postcode', ':postal_codes')
                 )
-                ->setParameter('now', new DateTimeImmutable('now'), Types::DATE_IMMUTABLE)
                 ->setParameter('postal_codes', $postalCodes);
         }
 
         return $qb;
     }
 
+    /**
+     * @throws NonUniqueResultException
+     * @throws NoResultException
+     */
     public function countByUnDispatched(array $jobs, array $services, array $administrativeLocations): int
     {
-        $qb = $this->addACLByUnDispatched($this->buildQueryUnDispatched($jobs, $services, $administrativeLocations));
+        $qb = $this->addACLMultiCenterOnQuery(
+            $this->buildQueryUnDispatched($jobs, $services, $administrativeLocations),
+            $this->buildCenterOnScope()
+        );
 
         $qb->select('COUNT(ap)');
 
@@ -125,52 +95,77 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
             return 0;
         }
 
-        return $this->buildQueryOpenedAccompanyingCourseByUser($user, $postalCodes)
-            ->select('COUNT(ap)')
-            ->getQuery()
-            ->getSingleScalarResult();
-    }
+        $qb = $this->buildQueryOpenedAccompanyingCourseByUserAndPostalCodes($user, $postalCodes);
+        $qb = $this->addACLMultiCenterOnQuery($qb, $this->buildCenterOnScope(), false);
 
-    public function countByUserOpenedAccompanyingPeriod(?User $user): int
-    {
-        if (null === $user) {
-            return 0;
-        }
+        $qb->select('COUNT(DISTINCT ap)');
 
-        return $this->buildQueryOpenedAccompanyingCourseByUser($user)
-            ->select('COUNT(ap)')
-            ->getQuery()
-            ->getSingleScalarResult();
+        return $qb->getQuery()->getSingleScalarResult();
     }
 
     public function findByPerson(
         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(),
+            ->getReachableScopes(
                 $role,
-                $this->centerResolverDispatcher->resolveCenter($person)
+                $this->centerResolver->resolveCenters($person)
+            );
+        $scopesCanSeeConfidential = $this->authorizationHelper
+            ->getReachableScopes(
+                AccompanyingPeriodVoter::SEE_CONFIDENTIAL_ALL,
+                $this->centerResolver->resolveCenters($person)
             );
 
-        if (0 === count($scopes)) {
+        if (0 === \count($scopes)) {
             return [];
         }
 
         $qb
             ->join('ap.participations', 'participation')
             ->where($qb->expr()->eq('participation.person', ':person'))
-            ->andWhere(
-                $qb->expr()->orX(
-                    'ap.confidential = FALSE',
-                    $qb->expr()->eq('ap.user', ':user')
-                )
-            )
+            ->setParameter('person', $person);
+
+        $qb = $this->addACLClauses($qb, $scopes, $scopesCanSeeConfidential);
+        $qb = $this->addOrderLimitClauses($qb, $orderBy, $limit, $offset);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    public function addOrderLimitClauses(QueryBuilder $qb, array $orderBy = null, int $limit = null, int $offset = null): QueryBuilder
+    {
+        if (null !== $orderBy) {
+            foreach ($orderBy as $field => $order) {
+                $qb->addOrderBy('ap.'.$field, $order);
+            }
+        }
+
+        if (null !== $limit) {
+            $qb->setMaxResults($limit);
+        }
+
+        if (null !== $offset) {
+            $qb->setFirstResult($offset);
+        }
+
+        return $qb;
+    }
+
+    /**
+     * Add clause for scope on a query, based on no.
+     *
+     * @param QueryBuilder $qb                       where the accompanying period have the `ap` alias
+     * @param array<Scope> $scopesCanSee
+     * @param array<Scope> $scopesCanSeeConfidential
+     */
+    public function addACLClauses(QueryBuilder $qb, array $scopesCanSee, array $scopesCanSeeConfidential): QueryBuilder
+    {
+        $qb
             ->andWhere(
                 $qb->expr()->orX(
                     $qb->expr()->neq('ap.step', ':draft'),
@@ -181,40 +176,67 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
                 )
             )
             ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT)
-            ->setParameter('person', $person)
             ->setParameter('user', $this->security->getUser())
             ->setParameter('creator', $this->security->getUser());
+
         // add join condition for scopes
         $orx = $qb->expr()->orX(
+            // even if the scope is not in one authorized, the user can see the course if it is in DRAFT state
             $qb->expr()->eq('ap.step', ':draft')
         );
 
-        foreach ($scopes as $key => $scope) {
-            $orx->add($qb->expr()->orX(
-                $qb->expr()->isMemberOf(':scope_' . $key, 'ap.scopes'),
+        foreach ($scopesCanSee as $key => $scope) {
+            // for each scope:
+            // - either the user is the referrer of the course
+            // - or the accompanying course is one of the reachable scopes
+            // - and the parcours is not confidential OR the user is the referrer OR the user can see the confidential course
+
+            $orOnScope = $qb->expr()->orX(
+                $qb->expr()->isMemberOf(':scope_'.$key, 'ap.scopes'),
                 $qb->expr()->eq('ap.user', ':user')
-            ));
-            $qb->setParameter('scope_' . $key, $scope);
-            $qb->setParameter('user', $this->security->getUser());
+            );
+
+            if (in_array($scope, $scopesCanSeeConfidential, true)) {
+                $orx->add($orOnScope);
+            } else {
+                // we must add a condition: the course is not confidential or the user is the referrer
+                $andXOnScope = $qb->expr()->andX(
+                    $orOnScope,
+                    $qb->expr()->orX(
+                        'ap.confidential = FALSE',
+                        $qb->expr()->eq('ap.user', ':user')
+                    )
+                );
+                $orx->add($andXOnScope);
+            }
+            $qb->setParameter('scope_'.$key, $scope);
         }
         $qb->andWhere($orx);
 
-        return $qb->getQuery()->getResult();
+        return $qb;
     }
 
-    public function findByUnDispatched(array $jobs, array $services, array $administrativeLocations, ?int $limit = null, ?int $offset = null): array
+    public function buildCenterOnScope(): array
     {
-        $qb = $this->addACLByUnDispatched($this->buildQueryUnDispatched($jobs, $services, $administrativeLocations));
+        $centerOnScopes = [];
+        foreach ($this->authorizationHelper->getReachableCenters(AccompanyingPeriodVoter::SEE) as $center) {
+            $centerOnScopes[] = [
+                'center' => $center,
+                'scopeOnRole' => $this->authorizationHelper->getReachableScopes(AccompanyingPeriodVoter::SEE, $center),
+                'scopeCanSeeConfidential' => $this->authorizationHelper->getReachableScopes(AccompanyingPeriodVoter::SEE_CONFIDENTIAL_ALL, $center),
+            ];
+        }
 
+        return $centerOnScopes;
+    }
+
+    public function findByUnDispatched(array $jobs, array $services, array $administrativeAdministrativeLocations, array $orderBy = null, int $limit = null, int $offset = null): array
+    {
+        $qb = $this->buildQueryUnDispatched($jobs, $services, $administrativeAdministrativeLocations);
         $qb->select('ap');
 
-        if (null !== $limit) {
-            $qb->setMaxResults($limit);
-        }
-
-        if (null !== $offset) {
-            $qb->setFirstResult($offset);
-        }
+        $qb = $this->addACLMultiCenterOnQuery($qb, $this->buildCenterOnScope(), false);
+        $qb = $this->addOrderLimitClauses($qb, $orderBy, $limit, $offset);
 
         return $qb->getQuery()->getResult();
     }
@@ -225,87 +247,89 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
             return [];
         }
 
-        $qb = $this->buildQueryOpenedAccompanyingCourseByUser($user);
-
-        $qb->setFirstResult($offset)
-            ->setMaxResults($limit);
-
-        foreach ($orderBy as $field => $direction) {
-            $qb->addOrderBy('ap.' . $field, $direction);
-        }
+        $qb = $this->buildQueryOpenedAccompanyingCourseByUserAndPostalCodes($user, $postalCodes);
+        $qb = $this->addACLMultiCenterOnQuery($qb, $this->buildCenterOnScope(), false);
+        $qb = $this->addOrderLimitClauses($qb, $orderBy, $limit, $offset);
 
         return $qb->getQuery()->getResult();
     }
 
     /**
-     * @return array|AccompanyingPeriod[]
+     * @param list<array{center: Center, scopeOnRole: list<Scope>, scopeCanSeeConfidential: list<Scope>}> $centerScopes
+     * @param bool                                                                                        $allowNoCenter if true, will allow to see the periods linked to person which does not have any center. Very few edge case when some Person are not associated to a center.
      */
-    public function findByUserOpenedAccompanyingPeriod(?User $user, array $orderBy = [], int $limit = 0, int $offset = 50): array
+    public function addACLMultiCenterOnQuery(QueryBuilder $qb, array $centerScopes, bool $allowNoCenter = false): QueryBuilder
     {
-        if (null === $user) {
-            return [];
-        }
+        $user = $this->security->getUser();
 
-        $qb = $this->buildQueryOpenedAccompanyingCourseByUser($user);
-
-        $qb->setFirstResult($offset)
-            ->setMaxResults($limit);
-
-        foreach ($orderBy as $field => $direction) {
-            $qb->addOrderBy('ap.' . $field, $direction);
-        }
-
-        return $qb->getQuery()->getResult();
-    }
-
-    private function addACLByUnDispatched(QueryBuilder $qb): QueryBuilder
-    {
-        $centers = $this->authorizationHelper->getReachableCenters(
-            $this->security->getUser(),
-            AccompanyingPeriodVoter::SEE
-        );
-
-        $orX = $qb->expr()->orX();
-
-        if (0 === count($centers)) {
+        if (0 === \count($centerScopes) || !$user instanceof User) {
             return $qb->andWhere("'FALSE' = 'TRUE'");
         }
 
-        foreach ($centers as $key => $center) {
-            $scopes = $this->authorizationHelper
-                ->getReachableCircles(
-                    $this->security->getUser(),
-                    AccompanyingPeriodVoter::SEE,
-                    $center
-                );
+        $orX = $qb->expr()->orX();
 
+        $idx = 0;
+        foreach ($centerScopes as ['center' => $center, 'scopeOnRole' => $scopes, 'scopeCanSeeConfidential' => $scopesCanSeeConfidential]) {
             $and = $qb->expr()->andX(
-                $qb->expr()->exists('SELECT part FROM ' . AccompanyingPeriodParticipation::class . ' part ' .
-                    "JOIN part.person p WHERE part.accompanyingPeriod = ap.id AND p.center = :center_{$key}")
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class." part_{$idx} ".
+                    "JOIN part_{$idx}.person p{$idx} LEFT JOIN p{$idx}.centerCurrent centerCurrent_{$idx} ".
+                    "WHERE part_{$idx}.accompanyingPeriod = ap.id AND (centerCurrent_{$idx}.center = :center_{$idx}"
+                    .($allowNoCenter ? " OR centerCurrent_{$idx}.id IS NULL)" : ')')
+                )
             );
-            $qb->setParameter('center_' . $key, $center);
-            $orScope = $qb->expr()->orX();
+            $qb->setParameter('center_'.$idx, $center);
 
-            foreach ($scopes as $skey => $scope) {
-                $orScope->add(
-                    $qb->expr()->isMemberOf(':scope_' . $key . '_' . $skey, 'ap.scopes')
+            $orScopeInsideCenter = $qb->expr()->orX(
+                // even if the scope is not in one authorized, the user can see the course if it is in DRAFT state
+                $qb->expr()->eq('ap.step', ':draft')
+            );
+
+            ++$idx;
+            foreach ($scopes as $scope) {
+                // for each scope:
+                // - either the user is the referrer of the course
+                // - or the accompanying course is one of the reachable scopes
+                // - and the parcours is not confidential OR the user is the referrer OR the user can see the confidential course
+                $orOnScope = $qb->expr()->orX(
+                    $qb->expr()->isMemberOf(':scope_'.$idx, 'ap.scopes'),
+                    $qb->expr()->eq('ap.user', ':user_executing')
                 );
-                $qb->setParameter('scope_' . $key . '_' . $skey, $scope);
+                $qb->setParameter('user_executing', $user);
+
+                if (in_array($scope, $scopesCanSeeConfidential, true)) {
+                    $orScopeInsideCenter->add($orOnScope);
+                } else {
+                    // we must add a condition: the course is not confidential or the user is the referrer
+                    $andXOnScope = $qb->expr()->andX(
+                        $orOnScope,
+                        $qb->expr()->orX(
+                            'ap.confidential = FALSE',
+                            $qb->expr()->eq('ap.user', ':user_executing')
+                        )
+                    );
+                    $orScopeInsideCenter->add($andXOnScope);
+                }
+                $qb->setParameter('scope_'.$idx, $scope);
+
+                ++$idx;
             }
 
-            $and->add($orScope);
+            $and->add($orScopeInsideCenter);
             $orX->add($and);
+
+            ++$idx;
         }
 
         return $qb->andWhere($orX);
     }
 
     /**
-     * @param array|UserJob[] $jobs
-     * @param array|Scope[] $services
+     * @param array|UserJob[]  $jobs
+     * @param array|Scope[]    $services
      * @param array|Location[] $locations
      */
-    private function buildQueryUnDispatched(array $jobs, array $services, array $locations): QueryBuilder
+    public function buildQueryUnDispatched(array $jobs, array $services, array $locations): QueryBuilder
     {
         $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
 
@@ -319,22 +343,22 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
             ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('closed', AccompanyingPeriod::STEP_CLOSED);
 
-        if (0 < count($jobs)) {
+        if (0 < \count($jobs)) {
             $qb->andWhere($qb->expr()->in('ap.job', ':jobs'))
                 ->setParameter('jobs', $jobs);
         }
 
-        if (0 < count($locations)) {
+        if (0 < \count($locations)) {
             $qb->andWhere($qb->expr()->in('ap.administrativeLocation', ':locations'))
                 ->setParameter('locations', $locations);
         }
 
-        if (0 < count($services)) {
+        if (0 < \count($services)) {
             $or = $qb->expr()->orX();
 
             foreach ($services as $key => $service) {
-                $or->add($qb->expr()->isMemberOf(':scope_' . $key, 'ap.scopes'));
-                $qb->setParameter('scope_' . $key, $service);
+                $or->add($qb->expr()->isMemberOf(':scopef_'.$key, 'ap.scopes'));
+                $qb->setParameter('scopef_'.$key, $service);
             }
             $qb->andWhere($or);
         }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
index 0cca1a5f4..645a4d996 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Repository;
 
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@@ -21,8 +22,9 @@ use Chill\PersonBundle\Entity\Person;
 interface AccompanyingPeriodACLAwareRepositoryInterface
 {
     /**
-     * @param array|UserJob[] $jobs
-     * @param array|Scope[] $services
+     * @param array|UserJob[]  $jobs
+     * @param array|Scope[]    $services
+     * @param array|Location[] $administrativeLocations
      */
     public function countByUnDispatched(array $jobs, array $services, array $administrativeLocations): int;
 
@@ -31,28 +33,30 @@ interface AccompanyingPeriodACLAwareRepositoryInterface
      */
     public function countByUserAndPostalCodesOpenedAccompanyingPeriod(?User $user, array $postalCodes): int;
 
-    public function countByUserOpenedAccompanyingPeriod(?User $user): int;
-
+    /**
+     * @return array<AccompanyingPeriod>
+     */
     public function findByPerson(
         Person $person,
         string $role,
         ?array $orderBy = [],
-        ?int $limit = null,
-        ?int $offset = null
+        int $limit = null,
+        int $offset = null
     ): array;
 
     /**
-     * @param array|UserJob[] $jobs if empty, does not take this argument into account
-     * @param array|Scope[] $services if empty, does not take this argument into account
+     * @param array|UserJob[]  $jobs                    if empty, does not take this argument into account
+     * @param array|Scope[]    $services                if empty, does not take this argument into account
+     * @param array|Location[] $administrativeLocations
      *
-     * @return array|AccompanyingPeriod[]
+     * @return list<AccompanyingPeriod>
      */
-    public function findByUnDispatched(array $jobs, array $services, array $administrativeLocations, ?int $limit = null, ?int $offset = null): array;
+    public function findByUnDispatched(array $jobs, array $services, array $administrativeLocations, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     /**
      * @param array|PostalCode[] $postalCodes
+     *
+     * @return list<AccompanyingPeriod>
      */
     public function findByUserAndPostalCodesOpenedAccompanyingPeriod(?User $user, array $postalCodes, array $orderBy = [], int $limit = 0, int $offset = 50): array;
-
-    public function findByUserOpenedAccompanyingPeriod(?User $user, array $orderBy = [], int $limit = 0, int $offset = 50): array;
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
index 5384a1cdd..616c56eb0 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class AccompanyingPeriodParticipationRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index 8a8bb943f..88979be1b 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Repository;
 
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -21,7 +20,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class AccompanyingPeriodRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -33,14 +32,14 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return $this->repository->count($criteria);
     }
 
-    public function countByRecentUserHistory(User $user, DateTimeImmutable $since): int
+    public function countByRecentUserHistory(User $user, \DateTimeImmutable $since): int
     {
         $qb = $this->buildQueryByRecentUserHistory($user, $since);
 
         return $qb->select('count(a)')->getQuery()->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -58,7 +57,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    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);
     }
@@ -66,7 +65,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
     /**
      * @return array|AccompanyingPeriod[]
      */
-    public function findByRecentUserHistory(User $user, DateTimeImmutable $since, ?int $limit = 20, ?int $offset = 0): array
+    public function findByRecentUserHistory(User $user, \DateTimeImmutable $since, ?int $limit = 20, ?int $offset = 0): array
     {
         $qb = $this->buildQueryByRecentUserHistory($user, $since);
 
@@ -98,14 +97,14 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return AccompanyingPeriod::class;
     }
 
-    private function buildQueryByRecentUserHistory(User $user, DateTimeImmutable $since): QueryBuilder
+    private function buildQueryByRecentUserHistory(User $user, \DateTimeImmutable $since): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('a');
 
         $qb
             ->join('a.userHistories', 'userHistory')
             ->where($qb->expr()->eq('a.user', ':user'))
-            ->andWhere($qb->expr()->neq('a.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
+            ->andWhere($qb->expr()->neq('a.step', "'".AccompanyingPeriod::STEP_DRAFT."'"))
             ->andWhere($qb->expr()->gte('userHistory.startDate', ':since'))
             ->andWhere($qb->expr()->isNull('userHistory.endDate'))
             ->setParameter('user', $user)
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
index a8cc9d069..26121ffdc 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
@@ -15,25 +15,13 @@ use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Security\Core\Security;
 
-final class HouseholdACLAwareRepository implements HouseholdACLAwareRepositoryInterface
+final readonly class HouseholdACLAwareRepository implements HouseholdACLAwareRepositoryInterface
 {
-    private AuthorizationHelper $authorizationHelper;
-
-    private EntityManagerInterface $em;
-
-    private Security $security;
-
-    public function __construct(EntityManagerInterface $em, AuthorizationHelper $authorizationHelper, Security $security)
-    {
-        $this->em = $em;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->security = $security;
-    }
+    public function __construct(private EntityManagerInterface $em, private AuthorizationHelper $authorizationHelper, private Security $security) {}
 
     public function addACL(QueryBuilder $qb, string $alias = 'h'): QueryBuilder
     {
@@ -48,10 +36,11 @@ final class HouseholdACLAwareRepository implements HouseholdACLAwareRepositoryIn
         }
 
         $qb
-            ->join($alias . '.members', 'members')
+            ->join($alias.'.members', 'members')
             ->join('members.person', 'person')
+            ->join('person.centerCurrent', 'person_center_current')
             ->andWhere(
-                $qb->expr()->in('person.center', ':centers')
+                $qb->expr()->in('person_center_current.center', ':centers')
             )
             ->setParameter('centers', $centers);
 
@@ -78,7 +67,7 @@ final class HouseholdACLAwareRepository implements HouseholdACLAwareRepositoryIn
                     )
                 )
             )
-            ->setParameter('today', new DateTime('today'));
+            ->setParameter('today', new \DateTime('today'));
 
         return $qb;
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
index e25d0c867..bf9ffb1ff 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
@@ -18,7 +18,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class HouseholdCompositionRepository implements HouseholdCompositionRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -49,7 +49,7 @@ final class HouseholdCompositionRepository implements HouseholdCompositionReposi
      *
      * @return array|object[]|HouseholdComposition[]
      */
-    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);
     }
@@ -57,7 +57,7 @@ final class HouseholdCompositionRepository implements HouseholdCompositionReposi
     /**
      * @return array|HouseholdComposition[]|object[]
      */
-    public function findByHousehold(Household $household, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findByHousehold(Household $household, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->findBy(['household' => $household], $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
index 84c62392b..3fc4bb46f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
@@ -32,12 +32,12 @@ interface HouseholdCompositionRepositoryInterface extends ObjectRepository
      *
      * @return array|object[]|HouseholdComposition[]
      */
-    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 array|HouseholdComposition[]|object[]
      */
-    public function findByHousehold(Household $household, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findByHousehold(Household $household, array $orderBy = null, int $limit = null, int $offset = null): array;
 
     public function findOneBy(array $criteria): ?HouseholdComposition;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
index 04110942b..d13b17fe4 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class HouseholdCompositionTypeRepository implements HouseholdCompositionTypeRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -46,12 +46,12 @@ final class HouseholdCompositionTypeRepository implements HouseholdCompositionTy
     }
 
     /**
-     * @param $limit
-     * @param $offset
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return array|HouseholdCompositionType[]|object[]
      */
-    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);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php
index 5fede423a..4041430d8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionTypeRepositoryInterface.php
@@ -29,12 +29,12 @@ interface HouseholdCompositionTypeRepositoryInterface extends ObjectRepository
     public function findAllActive(): array;
 
     /**
-     * @param $limit
-     * @param $offset
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return array|HouseholdCompositionType[]|object[]
      */
-    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;
 
     public function findOneBy(array $criteria): ?HouseholdCompositionType;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
index 564c17732..e76e88fc3 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class HouseholdMembersRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
index 5123e8eb1..5fa3f22de 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
@@ -18,8 +18,6 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-use function strtr;
-
 final class HouseholdRepository implements ObjectRepository
 {
     private const SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION = <<<'SQL'
@@ -42,9 +40,9 @@ final class HouseholdRepository implements ObjectRepository
         SELECT {select} FROM households {limits}
         SQL;
 
-    private EntityManagerInterface $em;
+    private readonly EntityManagerInterface $em;
 
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -67,7 +65,7 @@ final class HouseholdRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -94,12 +92,12 @@ 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}' => '',
             ]);
         } 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}",
             ]);
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
index bc8fddf4e..58c89fb7b 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class PersonHouseholdAddressRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -44,12 +44,12 @@ final class PersonHouseholdAddressRepository implements ObjectRepository
      *
      * @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 findOneBy(array $criteria, ?array $orderBy = null): ?PersonHouseholdAddress
+    public function findOneBy(array $criteria, array $orderBy = null): ?PersonHouseholdAddress
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
index 734d83156..b2fc2b2d1 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
@@ -12,15 +12,15 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\Position;
-//use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-//use Doctrine\Persistence\ManagerRegistry;
+// use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+// use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
 
 final class PositionRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -28,8 +28,6 @@ final class PositionRepository implements ObjectRepository
     }
 
     /**
-     * @param mixed $id
-     *
      * @return Position
      */
     public function find($id)
@@ -51,7 +49,7 @@ final class PositionRepository implements ObjectRepository
      *
      * @return Position[]
      */
-    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);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
index 8697f9346..b2409eace 100644
--- a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 class MaritalStatusRepository implements MaritalStatusRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -34,7 +34,7 @@ class MaritalStatusRepository implements MaritalStatusRepositoryInterface
         return $this->repository->findAll();
     }
 
-    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);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepositoryInterface.php
index 1f51060e9..13be6842e 100644
--- a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepositoryInterface.php
@@ -19,7 +19,7 @@ interface MaritalStatusRepositoryInterface
 
     public function findAll(): array;
 
-    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;
 
     public function findOneBy(array $criteria): ?MaritalStatus;
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php
index c1bb427fd..fc5d0606d 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php
@@ -13,6 +13,4 @@ namespace Chill\PersonBundle\Repository\Person;
 
 use Doctrine\Persistence\ObjectRepository;
 
-interface PersonCenterHistoryInterface extends ObjectRepository
-{
-}
+interface PersonCenterHistoryInterface extends ObjectRepository {}
diff --git a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php
index a29c4f93a..bf8ec9344 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 class PersonCenterHistoryRepository implements PersonCenterHistoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -40,7 +40,7 @@ class PersonCenterHistoryRepository implements PersonCenterHistoryInterface
     /**
      * @return array|PersonCenterHistory[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index cc9e7b145..0b6b96339 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -18,53 +18,26 @@ use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\Query;
 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
+final readonly class PersonACLAwareRepository implements PersonACLAwareRepositoryInterface
 {
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    private CountryRepository $countryRepository;
-
-    private EntityManagerInterface $em;
-
-    private Security $security;
-
-    public function __construct(
-        Security $security,
-        EntityManagerInterface $em,
-        CountryRepository $countryRepository,
-        AuthorizationHelperInterface $authorizationHelper
-    ) {
-        $this->security = $security;
-        $this->em = $em;
-        $this->countryRepository = $countryRepository;
-        $this->authorizationHelper = $authorizationHelper;
-    }
+    public function __construct(private Security $security, private EntityManagerInterface $em, private CountryRepository $countryRepository, private AuthorizationHelperInterface $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
+        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,
@@ -83,16 +56,16 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
     }
 
     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
+        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,
@@ -117,16 +90,16 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
      * @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
+        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
@@ -138,25 +111,25 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         $andWhereSearchClauseArgs = [];
 
         if ('' !== trim($default)) {
-            foreach (explode(' ', $default) as $str) {
+            foreach (\explode(' ', $default) as $str) {
                 if ('' === trim($str)) {
                     continue;
                 }
                 $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 + " .
+                    '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);
+                \array_push($pertinenceArgs, $str, $str, $str, $str);
 
                 $andWhereSearchClause[] =
-                    '(LOWER(UNACCENT(?)) <<% person.fullnamecanonical OR ' .
+                    '(LOWER(UNACCENT(?)) <<% person.fullnamecanonical OR '.
                     "person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%' )";
-                array_push($andWhereSearchClauseArgs, $str, $str);
+                \array_push($andWhereSearchClauseArgs, $str, $str);
             }
 
             $query->andWhereClause(
-                implode(' AND ', $andWhereSearchClause),
+                \implode(' AND ', $andWhereSearchClause),
                 $andWhereSearchClauseArgs
             );
         } else {
@@ -164,7 +137,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
             $pertinenceArgs = [];
         }
         $query
-            ->setSelectPertinence(implode(' + ', $pertinence), $pertinenceArgs);
+            ->setSelectPertinence(\implode(' + ', $pertinence), $pertinenceArgs);
 
         if (null !== $birthdate) {
             $query->andWhereClause(
@@ -206,16 +179,16 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
                 "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');
+            $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 ' .
+            $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) {
+            foreach (\explode(' ', $city) as $cityStr) {
                 $query->andWhereClause(
                     "(UNACCENT(LOWER(cmpc.label)) LIKE '%' || UNACCENT(LOWER(?)) || '%' OR cmpc.code LIKE '%' || UNACCENT(LOWER(?)) || '%')",
                     [$cityStr, $city]
@@ -224,7 +197,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         }
 
         if (null !== $countryCode) {
-            $query->setFromClause($query->getFromClause() . ' JOIN country ON person.nationality_id = country.id');
+            $query->setFromClause($query->getFromClause().' JOIN country ON person.nationality_id = country.id');
             $query->andWhereClause('country.countrycode = UPPER(?)', [$countryCode]);
         }
 
@@ -257,33 +230,33 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         $query->addSelectClause($rsm->generateSelectClause());
 
         $nql = $this->em->createNativeQuery(
-            $query->buildQuery() . ' ORDER BY pertinence DESC OFFSET ? LIMIT ?',
+            $query->buildQuery().' ORDER BY pertinence DESC OFFSET ? LIMIT ?',
             $rsm
-        )->setParameters(array_merge($query->buildParameters(), [$start, $limit]));
+        )->setParameters(\array_merge($query->buildParameters(), [$start, $limit]));
 
         return $nql->getResult();
     }
 
     /**
+     * @return array|Person[]
+     *
      * @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,
-        ?DateTimeInterface $birthdate = null,
-        ?DateTimeInterface $birthdateBefore = null,
-        ?DateTimeInterface $birthdateAfter = null,
-        ?string $gender = null,
-        ?string $countryCode = null,
-        ?string $phonenumber = null,
-        ?string $city = 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 {
         $query = $this->buildAuthorizedQuery(
             $default,
@@ -311,20 +284,18 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         }
 
         return $query
-            ->setFromClause($query->getFromClause() . ' JOIN view_chill_person_person_center_history_current vcppchc ON vcppchc.person_id = person.id', $query->getFromParams())
+            ->setFromClause($query->getFromClause().' JOIN view_chill_person_person_center_history_current vcppchc ON vcppchc.person_id = person.id', $query->getFromParams())
             ->andWhereClause(
                 strtr(
                     'vcppchc.center_id IN ({{ center_ids }})',
                     [
-                        '{{ center_ids }}' => implode(
+                        '{{ center_ids }}' => \implode(
                             ', ',
-                            array_fill(0, count($authorizedCenters), '?')
+                            \array_fill(0, \count($authorizedCenters), '?')
                         ),
                     ]
                 ),
-                array_map(static function (Center $c) {
-                    return $c->getId();
-                }, $authorizedCenters)
+                \array_map(static fn (Center $c) => $c->getId(), $authorizedCenters)
             );
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
index 1e35f03f3..b9f62b89f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
@@ -13,34 +13,33 @@ namespace Chill\PersonBundle\Repository;
 
 use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\PersonBundle\Entity\Person;
-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
+        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
+        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
     );
 
     /**
@@ -50,15 +49,15 @@ interface PersonACLAwareRepositoryInterface
         int $start,
         int $limit,
         bool $simplify = false,
-        ?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
+        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;
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
index 41a9efe63..4a1ee1dd6 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class PersonAltNameRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
index 146357715..6694f0e32 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
@@ -18,7 +18,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class PersonNotDuplicateRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
index a38df8787..0d951e3bd 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
@@ -16,15 +16,10 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use Exception;
 
-use function count;
-use function in_array;
-use function str_replace;
-
-final class PersonRepository implements ObjectRepository
+class PersonRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -32,8 +27,6 @@ final class PersonRepository implements ObjectRepository
     }
 
     /**
-     * @param $centers
-     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -51,7 +44,7 @@ final class PersonRepository implements ObjectRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -66,7 +59,7 @@ final class PersonRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
@@ -77,13 +70,7 @@ final class PersonRepository implements ObjectRepository
     }
 
     /**
-     * @param $centers
-     * @param $firstResult
-     * @param $maxResults
-     *
-     * @throws Exception
-     *
-     * @return mixed
+     * @throws \Exception
      */
     public function findByPhone(
         string $phonenumber,
@@ -116,43 +103,40 @@ final class PersonRepository implements ObjectRepository
 
     private function addByCenters(QueryBuilder $qb, array $centers): void
     {
-        if (count($centers) > 0) {
+        if (\count($centers) > 0) {
             $qb->andWhere($qb->expr()->in('p.center', ':centers'));
             $qb->setParameter('centers', $centers);
         }
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     private function addPhoneNumber(QueryBuilder $qb, string $phonenumber, array $only): void
     {
-        if (count($only) === 0) {
-            throw new Exception('No array field to search');
+        if (0 === \count($only)) {
+            throw new \Exception('No array field to search');
         }
 
         $phonenumber = $this->parsePhoneNumber($phonenumber);
 
         $orX = $qb->expr()->orX();
 
-        if (in_array('mobile', $only, true)) {
+        if (\in_array('mobile', $only, true)) {
             $orX->add($qb->expr()->like("REPLACE(p.mobilenumber, ' ', '')", ':phonenumber'));
         }
 
-        if (in_array('phone', $only, true)) {
+        if (\in_array('phone', $only, true)) {
             $orX->add($qb->expr()->like("REPLACE(p.phonenumber, ' ', '')", ':phonenumber'));
         }
 
         $qb->andWhere($orX);
 
-        $qb->setParameter('phonenumber', '%' . $phonenumber . '%');
+        $qb->setParameter('phonenumber', '%'.$phonenumber.'%');
     }
 
-    /**
-     * @param $phonenumber
-     */
     private function parsePhoneNumber(string $phonenumber): string
     {
-        return str_replace(' ', '', $phonenumber);
+        return \str_replace(' ', '', $phonenumber);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
index 75f205cbc..04d8d09f9 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
@@ -14,17 +14,23 @@ namespace Chill\PersonBundle\Repository;
 use Chill\PersonBundle\Entity\Person\PersonResource;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
 final class PersonResourceRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(PersonResource::class);
     }
 
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function find($id): ?PersonResource
     {
         return $this->repository->find($id);
@@ -44,7 +50,7 @@ final class PersonResourceRepository implements ObjectRepository
      *
      * @return PersonResource[]
      */
-    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);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
index 111f122a7..d66d14572 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 class RelationRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -35,7 +35,7 @@ class RelationRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    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);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
index 442ce1c55..26ae266d8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
@@ -20,9 +20,9 @@ use Doctrine\Persistence\ObjectRepository;
 
 class RelationshipRepository implements ObjectRepository
 {
-    private EntityManagerInterface $em;
+    private readonly EntityManagerInterface $em;
 
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -48,7 +48,7 @@ class RelationshipRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
-    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);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
index 424411a72..a866d5eec 100644
--- a/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
-use DateTimeImmutable;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
@@ -42,9 +41,9 @@ class ResidentialAddressRepository extends ServiceEntityRepository
             ->getSingleScalarResult();
     }
 
-    public function buildQueryFindCurrentResidentialAddresses(Person $person, ?DateTimeImmutable $at = null): QueryBuilder
+    public function buildQueryFindCurrentResidentialAddresses(Person $person, \DateTimeImmutable $at = null): QueryBuilder
     {
-        $date = null === $at ? new DateTimeImmutable('today') : $at;
+        $date = $at ?? new \DateTimeImmutable('today');
         $qb = $this->createQueryBuilder('ra');
 
         $dateFilter = $qb->expr()->andX(
@@ -67,7 +66,7 @@ class ResidentialAddressRepository extends ServiceEntityRepository
     /**
      * @return array|ResidentialAddress[]|null
      */
-    public function findCurrentResidentialAddressByPerson(Person $person, ?DateTimeImmutable $at = null): array
+    public function findCurrentResidentialAddressByPerson(Person $person, \DateTimeImmutable $at = null): array
     {
         return $this->buildQueryFindCurrentResidentialAddresses($person, $at)
             ->select('ra')
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
index e8de5a278..8391132f1 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
@@ -17,7 +17,7 @@ use Doctrine\ORM\EntityRepository;
 
 final class EvaluationRepository implements EvaluationRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -48,12 +48,12 @@ final class EvaluationRepository implements EvaluationRepositoryInterface
      *
      * @return array<int, Evaluation>
      */
-    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 findOneBy(array $criteria, ?array $orderBy = null): ?Evaluation
+    public function findOneBy(array $criteria, array $orderBy = null): ?Evaluation
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php
index aa1de34eb..cba57efe0 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php
@@ -34,9 +34,9 @@ interface EvaluationRepositoryInterface extends ObjectRepository
      *
      * @return array<int, Evaluation>
      */
-    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;
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Evaluation;
+    public function findOneBy(array $criteria, array $orderBy = null): ?Evaluation;
 
     /**
      * @return class-string
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
index c667eafbf..8a2831996 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -21,7 +20,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class GoalRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -57,7 +56,7 @@ final class GoalRepository implements ObjectRepository
      *
      * @return array<int, Goal>
      */
-    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);
     }
@@ -65,7 +64,7 @@ final class GoalRepository implements ObjectRepository
     /**
      * @return Goal[]
      */
-    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], ?int $limit = null, ?int $offset = null): array
+    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], int $limit = null, int $offset = null): array
     {
         $qb = $this->buildQueryBySocialActionWithDescendants($action);
         $qb->select('g');
@@ -76,10 +75,10 @@ final class GoalRepository implements ObjectRepository
                 $qb->expr()->gt('g.desactivationDate', ':now')
             )
         )
-            ->setParameter('now', new DateTime('now'));
+            ->setParameter('now', new \DateTime('now'));
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('g.' . $sort, $order);
+            $qb->addOrderBy('g.'.$sort, $order);
         }
 
         return $qb
@@ -89,7 +88,7 @@ final class GoalRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Goal
+    public function findOneBy(array $criteria, array $orderBy = null): ?Goal
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
index 747611500..8b8fbfc2b 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
@@ -21,7 +21,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class ResultRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -67,24 +67,22 @@ final class ResultRepository implements ObjectRepository
      *
      * @return array<int, Result>
      */
-    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);
     }
 
     /**
-     * @param mixed|null $orderBy
-     * @param mixed|null $limit
-     * @param mixed|null $offset
-     *
-     * @return Result[]
+     * @return array<Result>
      */
-    public function findByGoal(Goal $goal, $orderBy = null, $limit = null, $offset = null): array
+    public function findByGoal(Goal $goal, array $orderBy = null, int $limit = null, int $offset = null): array
     {
         $qb = $this->buildQueryByGoal($goal);
 
-        foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('r.' . $sort, $order);
+        if (null !== $orderBy) {
+            foreach ($orderBy as $sort => $order) {
+                $qb->addOrderBy('r.'.$sort, $order);
+            }
         }
 
         return $qb
@@ -98,13 +96,13 @@ final class ResultRepository implements ObjectRepository
     /**
      * @return Result[]
      */
-    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], ?int $limit = null, ?int $offset = null): array
+    public function findBySocialActionWithDescendants(SocialAction $action, array $orderBy = [], int $limit = null, int $offset = null): array
     {
         $qb = $this->buildQueryBySocialActionWithDescendants($action);
         $qb->select('r');
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('r.' . $sort, $order);
+            $qb->addOrderBy('r.'.$sort, $order);
         }
 
         return $qb
@@ -114,7 +112,7 @@ final class ResultRepository implements ObjectRepository
             ->getResult();
     }
 
-    public function findOneBy(array $criteria, ?array $orderBy = null): ?Result
+    public function findOneBy(array $criteria, array $orderBy = null): ?Result
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
index 62ca3d853..2fc3b35df 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -20,14 +19,14 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class SocialActionRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(SocialAction::class);
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -59,12 +58,12 @@ final class SocialActionRepository implements ObjectRepository
      *
      * @return array<int, SocialAction>
      */
-    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 findOneBy(array $criteria, ?array $orderBy = null): ?SocialAction
+    public function findOneBy(array $criteria, array $orderBy = null): ?SocialAction
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -84,7 +83,7 @@ final class SocialActionRepository implements ObjectRepository
         $qb->where('sa.desactivationDate is null')
             ->orWhere('sa.desactivationDate > :now')
             ->orderBy('sa.ordering', 'ASC')
-            ->setParameter('now', new DateTime('now'));
+            ->setParameter('now', new \DateTime('now'));
 
         return $qb;
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
index 63dfcc510..d3e6fa10f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -20,7 +19,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 final class SocialIssueRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
@@ -54,12 +53,12 @@ final class SocialIssueRepository implements ObjectRepository
      *
      * @return array<int, SocialIssue>
      */
-    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 findOneBy(array $criteria, ?array $orderBy = null): ?SocialIssue
+    public function findOneBy(array $criteria, array $orderBy = null): ?SocialIssue
     {
         return $this->repository->findOneBy($criteria, $orderBy);
     }
@@ -79,7 +78,7 @@ final class SocialIssueRepository implements ObjectRepository
         $qb->where('si.desactivationDate is null')
             ->orWhere('si.desactivationDate > :now')
             ->orderBy('si.ordering', 'ASC')
-            ->setParameter('now', new DateTime('now'));
+            ->setParameter('now', new \DateTime('now'));
 
         return $qb;
     }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 59a9b05db..24f947100 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -207,10 +207,11 @@ div.banner {
             span.badge-member {
                 flex-shrink: 0; flex-grow: 0; flex-basis: auto;
                 color: $white;
+                background-color: transparentize($white, 0.85);
                 border: 1px solid transparentize($white, 0.75);
                 border-bottom: 3px solid transparentize( shade-color( $chill-green, 20%), 0.3);
                 border-radius: 8px;
-                padding: 0.2em 0.7em;
+                padding: 0.0em 0.5em;
                 margin-bottom: 0.2em;
                 margin-right: 0.3em;
 
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 a12f1554c..e82029a1f 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,3 +1,25 @@
+.badge-accompanying-work-type {
+    display: inline-block;
+    background-color: #f3f3f3;
+
+    .title_label {
+        @include chill_badge(#e2793d);
+    }
+
+    .title_action {
+        padding: var(--bs-badge-padding-y) var(--bs-badge-padding-x);
+        margin-right: 1rem;
+
+        font-size: var(--bs-badge-font-size);
+        font-weight: var(--bs-badge-font-weight);
+        line-height: 1;
+        color: var(--bs-badge-color);
+        text-align: center;
+        white-space: nowrap;
+        vertical-align: baseline;
+    }
+}
+
 /// AccompanyingCourse Work Pages
 div.accompanying-course-work {
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index 51fc2c1d0..c66214b0b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -14,7 +14,7 @@
    <scopes></scopes>
    <referrer></referrer>
    <resources></resources>
-   <start-date v-if="accompanyingCourse.step === 'CONFIRMED'"></start-date>
+   <start-date v-if="accompanyingCourse.step.startsWith('CONFIRMED')"></start-date>
    <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
    <confirm v-if="accompanyingCourse.step === 'DRAFT'"></confirm>
 
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 dcade7e0f..fb8a09784 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -11,12 +11,22 @@
             {{ $t('course.step.draft') }}
          </span>
       </span>
-      <span v-else-if="accompanyingCourse.step === 'CONFIRMED'" class="text-md-end">
-         <span class="d-md-block mb-md-3">
+      <span v-else-if="accompanyingCourse.step === 'CONFIRMED' || accompanyingCourse.step === 'CONFIRMED_INACTIVE_SHORT' || accompanyingCourse.step === 'CONFIRMED_INACTIVE_LONG'" class="text-md-end">
+         <span v-if="accompanyingCourse.step === 'CONFIRMED'" class="d-md-block mb-md-3">
             <span class="badge bg-primary">
                {{ $t('course.step.active') }}
             </span>
          </span>
+         <span v-else-if="accompanyingCourse.step === 'CONFIRMED_INACTIVE_SHORT'" class="d-md-block mb-md-3">
+            <span class="badge bg-chill-yellow text-primary">
+               {{ $t('course.step.inactive_short') }}
+            </span>
+         </span>
+         <span v-else-if="accompanyingCourse.step === 'CONFIRMED_INACTIVE_LONG'" class="d-md-block mb-md-3">
+            <span class="badge bg-chill-pink">
+               {{ $t('course.step.inactive_long') }}
+            </span>
+         </span>
          <span class="d-md-block">
             <span class="d-md-block ms-3 ms-md-0">
                <i>{{ $t('course.open_at') }}{{ $d(accompanyingCourse.openingDate.datetime, 'text') }}</i>
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 8bbd5c4ca..1a46a79ca 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -21,7 +21,9 @@ const appMessages = {
          step: {
             draft: "Brouillon",
             active: "En file active",
-            closed: "Cloturé"
+            closed: "Cloturé",
+            inactive_short: "Hors file active",
+            inactive_long: "Pré-archivé",
          },
          open_at: "ouvert le ",
          by: "par ",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 755e4455c..ad386992e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -122,7 +122,8 @@
          <add-evaluation
             v-for="e in pickedEvaluations"
             v-bind:key="e.key"
-            v-bind:evaluation="e">
+            v-bind:evaluation="e"
+            v-bind:docAnchorId="this.docAnchorId">
          </add-evaluation>
 
          <!-- box to add new evaluation -->
@@ -296,7 +297,21 @@
             @go-to-generate-workflow="goToGenerateWorkflow"
          ></list-workflow-modal>
       </li>
-
+      
+      <li>
+         <button v-if="AmIRefferer"
+             class="btn btn-notify"
+             @click="goToGenerateNotification(false)"
+         ></button>
+         <template v-else>
+            <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" :title="$t('notification_send')" data-bs-toggle="dropdown" aria-expanded="false">&nbsp;</button>
+            <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+               <li><a class="dropdown-item" @click="goToGenerateNotification(true)">{{ $t('notification_notify_referrer') }}</a></li>
+               <li><a class="dropdown-item" @click="goToGenerateNotification(false)">{{ $t('notification_notify_any') }}</a></li>
+            </ul>
+         </template>
+      </li>
+      
       <li v-if="!isPosting">
          <button class="btn btn-save" @click="submit">
             {{ $t('action.save') }}
@@ -366,7 +381,10 @@ const i18n = {
          no_referrers: "Aucun agent traitant",
          choose_referrers: "Choisir des agents traitants",
          remove_referrer: "Enlever l'agent",
-         private_comment: "Commentaire privé"
+         private_comment: "Commentaire privé",
+         notification_notify_referrer: "Notifier le référent",
+         notification_notify_any: "Notifier d'autres utilisateurs",
+         notification_send: "Envoyer une notification",
       }
    }
 };
@@ -389,6 +407,7 @@ export default {
    i18n,
    data() {
       return {
+         docAnchorId: null,
          isExpanded: false,
          editor: ClassicEditor,
          showAddObjective: false,
@@ -428,7 +447,14 @@ export default {
          },
       };
    },
-   computed: {
+   beforeMount() {
+       const urlParams = new URLSearchParams(window.location.search);
+       this.docAnchorId = urlParams.get('doc_id');
+   },
+   mounted() {
+     this.scrollToElement(this.docAnchorId);
+   },
+  computed: {
       ...mapState([
          'work',
          'resultsForAction',
@@ -441,6 +467,7 @@ export default {
          'isPosting',
          'errors',
          'templatesAvailablesForAction',
+         'me',
       ]),
       ...mapGetters([
          'hasResultsForAction',
@@ -498,6 +525,10 @@ export default {
             this.$store.commit('setPersonsPickedIds', v);
          }
       },
+      AmIRefferer() {
+         return (!(this.work.accompanyingPeriod.user && this.me
+            && (this.work.accompanyingPeriod.user.id !== this.me.id)));
+      }
    },
    methods: {
       toggleSelect() {
@@ -548,6 +579,19 @@ export default {
          return this.$store.dispatch('submit', callback)
             .catch(e => { console.log(e); throw e; });
       },
+      goToGenerateNotification(tos) {
+         console.log('save before leave to notification');
+         const callback = (data) => {
+            if (tos === true) {
+               window.location.assign(`/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&tos[0]=${this.work.accompanyingPeriod.user.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`);
+            } else {
+               window.location.assign(`/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`);
+            }
+         }
+
+         return this.$store.dispatch('submit', callback)
+             .catch(e => {console.log(e); throw e});
+      },
       submit() {
          this.$store.dispatch('submit').catch((error) => {
             if (error.name === 'ValidationException' || error.name === 'AccessException') {
@@ -559,7 +603,7 @@ export default {
          });
       },
       saveFormOnTheFly(payload) {
-         console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+         // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
 
          let body = { type: payload.type };
          body.name = payload.data.text;
@@ -581,6 +625,12 @@ export default {
                      this.$toast.open({message: 'An error occurred'});
                }
             })
+      },
+      scrollToElement(docAnchorId) {
+         const documentEl = document.getElementById(`document_${docAnchorId}`);
+         if (documentEl) {
+           documentEl.scrollIntoView({behavior: 'smooth'});
+         }
       }
    }
 };
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 411c386a8..baa3fa798 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -11,7 +11,7 @@
       </div>
 
       <div>
-         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation"></form-evaluation>
+         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation" :docAnchorId="docAnchorId"></form-evaluation>
 
         <ul class="record_actions">
            <li v-if="evaluation.workflows_availables.length > 0">
@@ -85,7 +85,7 @@ export default {
       Modal,
       ListWorkflowModal,
    },
-   props: ['evaluation'],
+   props: ['evaluation', 'docAnchorId'],
    i18n,
    data() {
       return {
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 7dcb595a3..4ea00f73a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -79,8 +79,8 @@
        <h5>{{ $t('Documents') }} :</h5>
 
        <div class="flex-table">
-         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
-           <div class="item-row">
+         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id" :class="[parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing']">
+           <div :id="`document_${d.id}`" class="item-row">
             <div class="input-group input-group-lg mb-3 row">
                   <label class="col-sm-3 col-form-label">Titre du document:</label>
                   <div class="col-sm-9">
@@ -92,7 +92,7 @@
                         :data-key="i"
                         @input="onInputDocumentTitle"/>
                 </div>
-               </div>
+           </div>
            </div>
            <div class="item-row">
                <div class="item-col item-meta">
@@ -102,27 +102,32 @@
             </div>
             <div class="item-row">
                <div class="item-col">
-                 <ul class="record_actions" >
-                   <li v-if="d.workflows_availables.length > 0">
-                     <list-workflow-modal
-                         :workflows="d.workflows"
-                         :allowCreate="true"
-                         relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
-                         :relatedEntityId="d.id"
-                         :workflowsAvailables="d.workflows_availables"
-                         :preventDefaultMoveToGenerate="true"
-                         :goToGenerateWorkflowPayload="{doc: d}"
-                         @go-to-generate-workflow="goToGenerateWorkflowEvaluationDocument"
-                     ></list-workflow-modal>
-                   </li>
+                 <ul class="record_actions">
+                    <li v-if="d.workflows_availables.length > 0">
+                       <list-workflow-modal
+                          :workflows="d.workflows"
+                          :allowCreate="true"
+                          relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
+                          :relatedEntityId="d.id"
+                          :workflowsAvailables="d.workflows_availables"
+                          :preventDefaultMoveToGenerate="true"
+                          :goToGenerateWorkflowPayload="{doc: d}"
+                          @go-to-generate-workflow="goToGenerateWorkflowEvaluationDocument"
+                       ></list-workflow-modal>
+                    </li>
                    <li>
-                     <add-async-upload
-                        :buttonTitle="$t('replace')"
-                        :options="asyncUploadOptions"
-                        :btnClasses="{'btn': true, 'btn-edit': true}"
-                        @addDocument="(arg) => replaceDocument(d, arg)"
-                     >
-                     </add-async-upload>
+                      <button
+                         v-if="AmIRefferer"
+                         class="btn btn-notify"
+                         @click="goToGenerateDocumentNotification(d, false)">
+                      </button>
+                      <template v-else>
+                         <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" :title="$t('notification_send')" data-bs-toggle="dropdown" aria-expanded="false">&nbsp;</button>
+                         <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+                            <li><a class="dropdown-item" @click="goToGenerateDocumentNotification(d, true)">{{ $t('notification_notify_referrer') }}</a></li>
+                            <li><a class="dropdown-item" @click="goToGenerateDocumentNotification(d, false)">{{ $t('notification_notify_any') }}</a></li>
+                         </ul>
+                      </template>
                    </li>
                    <li>
                      <document-action-buttons-group
@@ -133,6 +138,15 @@
                          @on-stored-object-status-change="onStatusDocumentChanged"
                      ></document-action-buttons-group>
                    </li>
+                    <li>
+                       <add-async-upload
+                          :buttonTitle="$t('replace')"
+                          :options="asyncUploadOptions"
+                          :btnClasses="{'btn': true, 'btn-edit': true}"
+                          @addDocument="(arg) => replaceDocument(d, arg)"
+                       >
+                       </add-async-upload>
+                    </li>
                    <li v-if="d.workflows.length === 0">
                      <a class="btn btn-delete" @click="removeDocument(d)">
                      </a>
@@ -187,6 +201,7 @@ import AddAsyncUpload from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUpload
 import AddAsyncUploadDownloader from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUploadDownloader.vue';
 import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
 import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
+import {buildLinkCreate as buildLinkCreateNotification} from 'ChillMainAssets/lib/entity-notification/api';
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
 
 const i18n = {
@@ -214,14 +229,17 @@ const i18n = {
          template_title: "Nom du template",
          browse: "Ajouter un document",
          replace: "Remplacer",
-         download: "Télécharger le fichier existant"
+         download: "Télécharger le fichier existant",
+         notification_notify_referrer: "Notifier le référent",
+         notification_notify_any: "Notifier d'autres utilisateurs",
+         notification_send: "Envoyer une notification",
       }
    }
 };
 
 export default {
    name: "FormEvaluation",
-   props: ['evaluation'],
+   props: ['evaluation', 'docAnchorId'],
    components: {
       ckeditor: CKEditor.component,
       PickTemplate,
@@ -260,8 +278,14 @@ export default {
    },
    computed: {
       ...mapState([
-         'isPosting'
+         'isPosting',
+         'work',
+         'me',
       ]),
+      AmIRefferer() {
+         return (!(this.$store.state.work.accompanyingPeriod.user && this.$store.state.me
+            && (this.$store.state.work.accompanyingPeriod.user.id !== this.$store.state.me.id)));
+      },
       getTemplatesAvailables() {
          return this.$store.getters.getTemplatesAvailablesForEvaluation(this.evaluation.evaluation);
       },
@@ -390,6 +414,20 @@ export default {
          return this.$store.dispatch('submit', callback)
             .catch(e => { console.log(e); throw e; });
       },
+       goToGenerateDocumentNotification(document, tos) {
+          const callback = (data) => {
+             let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
+             let updatedDocument = evaluation.documents.find(d => d.key === document.key);
+             window.location.assign(buildLinkCreateNotification(
+                 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument',
+                 updatedDocument.id,
+                 tos === true ? this.$store.state.work.accompanyingPeriod.user.id : null,
+                 window.location.pathname + window.location.search + window.location.hash
+             ));
+          };
+           return this.$store.dispatch('submit', callback)
+               .catch(e => {console.log(e); throw e});
+       }
    },
 }
 </script>
@@ -402,4 +440,19 @@ export default {
    ul.document-upload {
       justify-content: flex-start;
    }
+
+   .bg-blink{
+     color: #050000;
+     padding: 10px;
+     display: inline-block;
+     border-radius: 5px;
+     animation: blinkingBackground 2.2s infinite;
+     animation-iteration-count: 2;
+   }
+
+   @keyframes blinkingBackground{
+     0%		{ background-color: #ed776d;}
+     50%		{ background-color: #ffffff;}
+     100%	  { background-color: #ed776d;}
+   }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 47e4b2d3f..9a46b741a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -35,6 +35,7 @@ const store = createStore({
     referrers: window.accompanyingCourseWork.referrers,
     isPosting: false,
     errors: [],
+    me: null
   },
   getters: {
     socialAction(state) {
@@ -130,6 +131,9 @@ const store = createStore({
     }
   },
   mutations: {
+    setWhoAmiI(state, me) {
+        state.me = me;
+    },
     setEvaluationsPicked(state, evaluations) {
       state.evaluationsPicked = evaluations.map((e, index) => {
         var k = Object.assign(e, {
@@ -385,6 +389,19 @@ const store = createStore({
     },
   },
   actions: {
+    getWhoAmI({ commit }) {
+        let url = `/api/1.0/main/whoami.json`;
+        window.fetch(url)
+            .then(response => {
+                if (response.ok) {
+                    return response.json();
+                }
+                throw { m: 'Error while retriving results for goal', s: response.status, b: response.body };
+            })
+            .then(data => {
+                commit('setWhoAmiI', data);
+            });
+    },
     updateThirdParty({ commit }, payload) {
       commit('updateThirdParty', payload);
     },
@@ -514,6 +531,7 @@ store.commit('setEvaluationsPicked', window.accompanyingCourseWork.accompanyingP
 store.dispatch('getReachablesResultsForAction');
 store.dispatch('getReachablesGoalsForAction');
 store.dispatch('getReachablesEvaluationsForAction');
+store.dispatch('getWhoAmI');
 
 store.state.evaluationsPicked.forEach(evaluation => {
   store.dispatch('fetchTemplatesAvailablesForEvaluation', evaluation.evaluation)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
index cb9a02d51..8f61a74d1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
@@ -1,7 +1,7 @@
 <template>
   <ckeditor
       name="content"
-      v-bind:placeholder="$t('comment.content')"
+      v-bind:placeholder="$t('household_members_editor.positioning.comment_placeholder')"
       :editor="editor"
       v-model="content"
       tag-name="textarea">
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 66246058f..170b2651b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -53,6 +53,7 @@ const appMessages = {
          persons_to_positionnate: 'Usagers à positionner',
          holder: "Titulaire",
          comment: "Commentaire",
+         comment_placeholder: "Associer un commentaire",
        },
       app: {
        next: 'Suivant',
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 740eb0039..ca9385990 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -68,27 +68,45 @@
               <ul class="list-content fa-ul">
                 <li v-if="person.current_household_id">
                   <i class="fa fa-li fa-map-marker"></i>
-                  <address-render-box v-if="person.current_household_address"
-                                      :address="person.current_household_address"
-                                      :isMultiline="isMultiline">
-                  </address-render-box>
-                  <p v-else class="chill-no-data-statement">
-                    {{ $t('renderbox.household_without_address') }}
-                  </p>
+                  <address-render-box v-if="person.current_household_address" :address="person.current_household_address" :isMultiline="isMultiline"></address-render-box>
+                  <p v-else class="chill-no-data-statement">{{ $t('renderbox.household_without_address') }}</p>
                   <a v-if="options.addHouseholdLink === true"
                      :href="getCurrentHouseholdUrl"
                      :title="$t('persons_associated.show_household_number', {id: person.current_household_id})">
-                                <span class="badge rounded-pill bg-chill-beige">
-                                    <i class="fa fa-fw fa-home"></i><!--{{ $t('persons_associated.show_household') }}-->
-                                </span>
+                       <span class="badge rounded-pill bg-chill-beige">
+                           <i class="fa fa-fw fa-home"></i><!--{{ $t('persons_associated.show_household') }}-->
+                       </span>
                   </a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-map-marker"></i>
-                  <p class="chill-no-data-statement">
-                    {{ $t('renderbox.no_data') }}
-                  </p>
+                  <i class="fa fa-li fa-map-marker"></i><p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
                 </li>
+                
+                <template v-if="this.showResidentialAddresses && (person.current_residential_addresses || []).length > 0">
+                   <li v-for="(addr, i) in person.current_residential_addresses" :key="i">
+                      <i class="fa fa-li fa-map-marker"></i>
+                      <div v-if="addr.address">
+                         <span class="item-key">{{ $t('renderbox.residential_address') }}:</span>
+                         <div style="margin-top: -1em;">
+                           <address-render-box :address="addr.address" :isMultiline="isMultiline"></address-render-box>
+                         </div>
+                      </div>
+                      <div v-else-if="addr.hostPerson" class="mt-3">
+                         <p>{{ $t('renderbox.located_at') }}:</p>
+                         <span class="chill-entity entity-person badge-person">
+                             <person-text v-if="addr.hostPerson" :person="addr.hostPerson"></person-text>
+                         </span>
+                         <address-render-box v-if="addr.hostPerson.address" :address="addr.hostPerson.address" :isMultiline="isMultiline"></address-render-box>
+                      </div>
+                      <div v-else-if="addr.hostThirdParty" class="mt-3">
+                         <p>{{ $t('renderbox.located_at') }}:</p>
+                         <span class="chill-entity entity-person badge-thirdparty">
+                             <third-party-text v-if="addr.hostThirdParty" :thirdparty="addr.hostThirdParty"></third-party-text>
+                         </span>
+                         <address-render-box v-if="addr.hostThirdParty.address" :address="addr.hostThirdParty.address" :isMultiline="isMultiline"></address-render-box>
+                      </div>
+                   </li>
+                </template>
 
                 <li v-if="person.email">
                   <i class="fa fa-li fa-envelope-o"></i>
@@ -131,53 +149,6 @@
           </div>
         </div>
 
-        <div class="item-col mx-3"
-             v-if="this.showResidentialAddresses && (person.current_residential_addresses || []).length > 0">
-          <div class="float-button bottom">
-            <div class="box">
-              <ul class="list-content fa-ul">
-                <li v-for="(addr, i) in person.current_residential_addresses" :key="i">
-                  <i class="fa fa-li fa-map-marker"></i>
-                  <div v-if="addr.address">
-                    <address-render-box
-                        :address="addr.address"
-                        :isMultiline="isMultiline">
-                    </address-render-box>
-                    <p>({{ $t('renderbox.residential_address') }})</p>
-                  </div>
-                  <div v-else-if="addr.hostPerson" class="mt-3">
-                    <p>{{ $t('renderbox.located_at') }}:</p>
-                    <span class="chill-entity entity-person badge-person">
-                                    <person-text
-                                        v-if="addr.hostPerson"
-                                        :person="addr.hostPerson"
-                                    ></person-text>
-                                </span>
-                    <address-render-box v-if="addr.hostPerson.address"
-                                        :address="addr.hostPerson.address"
-                                        :isMultiline="isMultiline">
-                    </address-render-box>
-                  </div>
-                  <div v-else-if="addr.hostThirdParty" class="mt-3">
-                    <p>{{ $t('renderbox.located_at') }}:</p>
-                    <span class="chill-entity entity-person badge-thirdparty">
-                                    <third-party-text
-                                        v-if="addr.hostThirdParty"
-                                        :thirdparty="addr.hostThirdParty"
-                                    ></third-party-text>
-                                </span>
-                    <address-render-box v-if="addr.hostThirdParty.address"
-                                        :address="addr.hostThirdParty.address"
-                                        :isMultiline="isMultiline">
-                    </address-render-box>
-                  </div>
-
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-
       </div>
 
       <slot name="end-bloc"></slot>
@@ -207,7 +178,7 @@
 </template>
 
 <script>
-import {dateToISO} from 'ChillMainAssets/chill/js/date';
+import {dateToISO, ISOToDate} from 'ChillMainAssets/chill/js/date';
 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';
@@ -262,7 +233,7 @@ export default {
     },
     birthdate: function () {
       if (this.person.birthdate !== null || this.person.birthdate === "undefined") {
-        return new Date(this.person.birthdate.datetime);
+        return ISOToDate(this.person.birthdate.datetime);
       } else {
         return "";
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 16a76c780..46d78b77c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -329,12 +329,13 @@ export default {
       if (this.action !== 'create') {
          this.loadData();
       } else {
-        console.log('show centers', this.showCenters);
+        // console.log('show centers', this.showCenters);
         getCentersForPersonCreation()
             .then(params => {
-              this.config.centers = params.centers;
+              this.config.centers = params.centers.filter(c => c.isActive);
               this.showCenters = params.showCenters;
-              console.log('show centers inside', this.showCenters);
+              // console.log('centers', this.config.centers)
+              // console.log('show centers inside', this.showCenters);
               if (this.showCenters && this.config.centers.length === 1) {
                 this.person.center = this.config.centers[0];
               }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
index 8cb5ab59f..aac7df003 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title "Liste de parcours à répartir" %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index a9d51393d..f1dbf7e89 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -240,7 +240,7 @@
 
     <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 } %}
+        {% include '@ChillPerson/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig' with {'buttonText': false } %}
     </div>
 
     {% block contentActivity %}
@@ -258,7 +258,7 @@
         {% endif %}
 
         <h2 class="mb-3 visually-hidden">{{ 'Last activities' |trans }}</h2>
-        {% include 'ChillActivityBundle:Activity:list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
+        {% include '@ChillActivity/Activity/list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
     </div>
     {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 001ac1661..b53898602 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -5,7 +5,8 @@
 #  - displayAction: [true|false] default: false
 #  - displayFontSmall: [true|false] default: false
 #}
-<div class="item-bloc{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+<div
+    class="item-bloc{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
 
     <div class="item-row">
         <h2 class="badge-title">
@@ -111,9 +112,11 @@
     </div>
 
     {% if displayContent is not defined or displayContent == 'short' %}
-        <div class="item-row column{% if displayFontSmall is defined and displayFontSmall == true %} smallfont{% endif %}">
-            {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
-                'displayContent': displayContent
+        <div
+            class="item-row column{% if displayFontSmall is defined and displayFontSmall == true %} smallfont{% endif %}">
+            {% include '@ChillPerson/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig' with {
+                'displayContent': displayContent,
+                'onlyone': false
             } %}
         </div>
     {% endif %}
@@ -121,35 +124,56 @@
     {% if displayContent is not defined or displayContent == 'short' %}
         <div class="item-row separator">
 
-            {% import '@ChillPerson/AccompanyingCourseWork/_macros.html.twig' as macro  %}
+            {% import '@ChillPerson/AccompanyingCourseWork/_macros.html.twig' as macro %}
 
             <div class="item-col item-meta">
                 {{ macro.metadata(w) }}
             </div>
 
             {% if displayAction is defined and displayAction == true %}
-            <ul class="item-col record_actions">
-                <li>{{ macro.workflowButton(w) }}</li>
-                <li>
-                    <a class="btn btn-show" title="{{ 'Show'|trans }}"
-                       href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_show', {'id': w.id }) }}"
-                    ></a>
-                </li>
-                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
+                <ul class="item-col record_actions">
+                    <li>{{ macro.workflowButton(w) }}</li>
+                    {% if displayNotification is defined and displayNotification == true %}
+                        <li>
+                            <div class="d-grid gap-2 {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}btn-group{% endif %}" {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}role="group"{% endif %}>
+                                {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}
+                                    <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" title="{{ 'notification.Notify'|trans }}" data-bs-toggle="dropdown" aria-expanded="false">
+                                    </button>
+                                    <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+                                        <li>
+                                            <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': w.id, 'tos': [accompanyingCourse.user.id]}) }}">{{ 'notification.Notify referrer'|trans }}</a>
+                                        </li>
+                                        <li>
+                                            <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': w.id}) }}">{{ 'notification.Notify any'|trans }}</a>
+                                        </li>
+                                    </ul>
+                                {% else %}
+                                    <a class="btn btn-notify" title="{{ 'notification.Notify'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': w.id}) }}">
+                                    </a>
+                                {% endif %}
+                            </div>
+                        </li>
+                    {% endif %}
                     <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 class="btn btn-show" title="{{ 'Show'|trans }}"
+                           href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_show', {'id': w.id }) }}"
                         ></a>
                     </li>
-                {% endif %}
-                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', w) %}
-                    <li>
-                        <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
-                           href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
-                        ></a>
-                    </li>
-                {% endif %}
-            </ul>
+                    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
+                        <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>
+                    {% endif %}
+                    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE', w) %}
+                        <li>
+                            <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
+                               href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
+                            ></a>
+                        </li>
+                    {% endif %}
+                </ul>
             {% endif %}
         </div>
     {% endif %}
@@ -157,47 +181,51 @@
 </div>
 
 {#
- #   This is for 'long' version of content
- #   Note: this include is wrapped in a flex-table container.
- #   We start by closing the flex-table so we can add more.
- #   At the end we leave the last flex-table open, as it will be closed in the container.
+#   This is for 'long' version of content
+#   Note: this include is wrapped in a flex-table container.
+#   We start by closing the flex-table so we can add more.
+#   At the end we leave the last flex-table open, as it will be closed in the container.
 #}
 {% if displayContent is defined and displayContent == 'long' %}
+</div>
+
+{% if w.results|length > 0 or w.goals|length > 0 or w.accompanyingPeriodWorkEvaluations|length > 0 %}
+    <h2 class="chill-blue">{{ 'Dispositifs' }}</h2>
+
+    <div class="flex-table">{# new flex-table wrapper #}
+        <div
+            class="item-bloc colored{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+            {% include '@ChillPerson/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig' with {
+                'displayContent': displayContent,
+                'onlyone' : false
+            } %}
+        </div>
     </div>
+{% endif %}
 
-    {% if w.results|length > 0 or w.goals|length > 0 or w.accompanyingPeriodWorkEvaluations|length > 0 %}
-        <h2 class="chill-blue">{{ 'Dispositifs' }}</h2>
+<h2 class="chill-blue">{{ 'Comments'|trans }}</h2>
 
-        <div class="flex-table">{# new flex-table wrapper #}
-            <div class="item-bloc colored{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
-                {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
-                    'displayContent': displayContent
-                } %}
-            </div>
+<div class="flex-table">
+    <div
+        class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+        <h3 class="chill-beige">Public</h3>
+        {% if w.note is not empty %}
+            <blockquote class="chill-user-quote">
+                {{ w.note|chill_entity_render_box({'metadata': true }) }}
+            </blockquote>
+        {% else %}
+            <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
+        {% endif %}
+    </div>
+    {% if w.privateComment.hasCommentForUser(app.user) %}
+        <div
+            class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+            <h3 class="chill-beige">Privé</h3>
+            <blockquote class="chill-user-quote private-quote">
+                {{ w.privateComment.commentForUser(app.user)|chill_markdown_to_html }}
+            </blockquote>
         </div>
     {% endif %}
-
-    <h2 class="chill-blue">{{ 'Comments'|trans }}</h2>
-
-    <div class="flex-table">
-        <div class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
-            <h3 class="chill-beige">Public</h3>
-            {% if w.note is not empty %}
-                <blockquote class="chill-user-quote">
-                    {{ w.note|chill_entity_render_box({'metadata': true }) }}
-                </blockquote>
-            {% else %}
-                <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
-            {% endif %}
-        </div>
-        {% if w.privateComment.hasCommentForUser(app.user) %}
-            <div class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
-                <h3 class="chill-beige">Privé</h3>
-                <blockquote class="chill-user-quote private-quote">
-                    {{ w.privateComment.commentForUser(app.user)|chill_markdown_to_html }}
-                </blockquote>
-            </div>
-        {% endif %}
     {# Here flex-table stay open ! read above #}
 
-{% endif %}
+    {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_macros.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_macros.html.twig
index 10a0f94c7..b04e9483a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_macros.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_macros.html.twig
@@ -1,7 +1,17 @@
-{% macro metadata(w) %}
-    {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) %}
-    {% if notif_counter.total > 0 %}
-        {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) }}
+{% macro metadata(w, include_notif_counter = true) %}
+    {% if include_notif_counter == true %}
+        {% set more = [] %}
+        {% for e in w.accompanyingPeriodWorkEvaluations %}
+            {% for d in e.documents %}
+                {% set more = more|merge([{'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'relatedEntityId': d.id}]) %}
+            {% endfor %}
+        {% endfor %}
+
+        {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id, more) %}
+
+        {% if notif_counter.total > 0 %}
+        {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id, more) }}
+        {% endif %}
     {% endif %}
     {% import '@ChillPerson/Macro/updatedBy.html.twig' as macro %}
     {{ macro.updatedBy(w) }}
@@ -20,4 +30,4 @@
         {% endfor %}
     {% endfor %}
     {{ chill_entity_workflow_list('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id, [], suppEvaluations) }}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
index f4198a5c7..da6ec6e32 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -3,6 +3,7 @@
 #  - displayContent: [short|long] default: short
 #}
 {% if w.results|length > 0 %}
+
     <table class="obj-res-eval">
         <thead>
         <th class="obj"><h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4></th>
@@ -64,9 +65,11 @@
         </th>
         </thead>
         <tbody>
-        {% for e in w.accompanyingPeriodWorkEvaluations %}
-            <tr>
-                <td class="eval">
+        {% if onlyone|default(false) %}
+            {% for e in w.accompanyingPeriodWorkEvaluations %}
+                {% if evalId is defined and evalId == e.id %}
+                    <tr>
+                    <td class="eval">
                     <ul class="eval_title">
                         <li>
                             {{ e.evaluation.title|localize_translatable_string }}
@@ -78,13 +81,15 @@
 
                                 {% if e.endDate %}
                                     <li>
-                                        <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
                                         <b>{{ e.endDate|format_date('short') }}</b>
                                     </li>
                                 {% else %}
                                     {% if displayContent is defined and displayContent == 'long' %}
                                         <li>
-                                            <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
                                             <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
                                         </li>
                                     {% endif %}
@@ -92,13 +97,15 @@
 
                                 {% if e.maxDate %}
                                     <li>
-                                        <span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
                                         <b>{{ e.maxDate|format_date('short') }}</b>
                                     </li>
                                 {% else %}
                                     {% if displayContent is defined and displayContent == 'long' %}
                                         <li>
-                                            <span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
                                             <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
                                         </li>
                                     {% endif %}
@@ -107,13 +114,15 @@
                                 {% 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>
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
                                         {{ 'accompanying_course_work.%days% days before max_date'|trans({'%days%': days }) }}
                                     </li>
                                 {% else %}
                                     {% if displayContent is defined and displayContent == 'long' %}
                                         <li>
-                                            <span class="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
                                             <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
                                         </li>
                                     {% endif %}
@@ -122,45 +131,166 @@
                                 {% if e.timeSpent is not null and e.timeSpent > 0 %}
                                     <li>
                                         {% set minutes = (e.timeSpent / 60) %}
-                                        <span class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span> {{ 'duration.minute'|trans({ '{m}' : minutes }) }}
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span> {{ 'duration.minute'|trans({ '{m}' : minutes }) }}
                                     </li>
                                 {% elseif displayContent is defined and displayContent == 'long' %}
                                     <li>
-                                        <span class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span>
+                                        <span
+                                            class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span>
                                         <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
                                     </li>
                                 {% endif %}
                             </ul>
                         </li>
                     </ul>
-                    {% if displayContent is defined and displayContent == 'long' %}
+                {% endif %}
 
-                        {% if e.comment is not empty %}
-                            <blockquote class="chill-user-quote">{{ e.comment|chill_entity_render_box }}</blockquote>
+
+            {% endfor %}
+            {% if recordAction is defined %}
+                {{ recordAction }}
+            {% endif %}
+        {% else %}
+            {% for e in w.accompanyingPeriodWorkEvaluations %}
+                <tr>
+                    <td class="eval">
+                        <ul class="eval_title">
+                            <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>
+                                    {% else %}
+                                        {% if displayContent is defined and displayContent == 'long' %}
+                                            <li>
+                                                <span
+                                                    class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                                <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                                            </li>
+                                        {% endif %}
+                                    {% endif %}
+
+                                    {% if e.maxDate %}
+                                        <li>
+                                            <span
+                                                class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
+                                            <b>{{ e.maxDate|format_date('short') }}</b>
+                                        </li>
+                                    {% else %}
+                                        {% if displayContent is defined and displayContent == 'long' %}
+                                            <li>
+                                                <span
+                                                    class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
+                                                <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                                            </li>
+                                        {% endif %}
+                                    {% 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>
+                                    {% else %}
+                                        {% if displayContent is defined and displayContent == 'long' %}
+                                            <li>
+                                                <span
+                                                    class="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
+                                                <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                                            </li>
+                                        {% endif %}
+                                    {% endif %}
+
+                                    {% if e.timeSpent is not null and e.timeSpent > 0 %}
+                                        <li>
+                                            {% set minutes = (e.timeSpent / 60) %}
+                                            <span
+                                                class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span> {{ 'duration.minute'|trans({ '{m}' : minutes }) }}
+                                        </li>
+                                    {% elseif displayContent is defined and displayContent == 'long' %}
+                                        <li>
+                                            <span
+                                                class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span>
+                                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                                        </li>
+                                    {% endif %}
+                                </ul>
+                            </li>
+                        </ul>
+                        {% if recordAction is defined %}
+                            {{ recordAction }}
                         {% endif %}
 
-                        {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
-                        {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+                        {% if displayContent is defined and displayContent == 'long' %}
+
+                            {% if e.comment is not empty %}
+                                <blockquote
+                                    class="chill-user-quote">{{ e.comment|chill_entity_render_box }}</blockquote>
+                            {% endif %}
+
+                            {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+                            {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+                            {% if e.documents|length > 0 %}
+                                <table class="table table-hover align-middle mt-4 mx-auto">
+                                    {% for d in e.documents %}
+                                        <tr>
+                                            <td class="border-0">{{ d.title }}</td>
+                                            <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
+                                            <td class="border-0 text-end">
+                                                {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}
+                                                    <button id="btnGroupNotifyButtons" type="button" class="btn btn-sm btn-notify dropdown-toggle" title="{{ 'notification.Notify'|trans }}"
+                                                            data-bs-toggle="dropdown" aria-expanded="false">
+                                                    </button>
+                                                    <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+                                                        <li>
+                                                            <a class="dropdown-item"
+                                                               href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                                                                   'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument',
+                                                                   'entityId': d.id, 'tos': [accompanyingCourse.user.id]}) }}">{{ 'notification.Notify referrer'|trans }}</a>
+                                                        </li>
+                                                        <li>
+                                                            <a class="dropdown-item"
+                                                               href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                                                                   'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument',
+                                                                   'entityId': d.id}) }}">{{ 'notification.Notify any'|trans }}</a>
+                                                        </li>
+                                                    </ul>
+                                                {% else %}
+                                                    <a class="btn btn-notify btn-sm"
+                                                       title="{{ 'notification.Notify'|trans }}"
+                                                       href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                                                           'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument',
+                                                           'entityId': d.id }) }}"></a>
+                                                {% endif %}
+
+                                                {{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                </table>
+                            {% else %}
+                                <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
+                            {% endif %}
+
 
-                        {% if e.documents|length > 0 %}
-                            <table class="table mt-4 mx-auto">
-                                {% for d in e.documents %}
-                                    <tr class="border-0">
-                                        <td class="border-0">{{ d.title }}</td>
-                                        <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
-                                        <td class="border-0 text-end">{{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}</td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                        {% else %}
-                            <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
                         {% endif %}
-
-
-                    {% endif %}
-                </td>
-            </tr>
-        {% endfor %}
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endif %}
         </tbody>
     </table>
 {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
index 9214bd30d..1cedfa694 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
@@ -5,18 +5,23 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 
+
 {% block content %}
     <div class="accompanying-course-work">
 
         <h1>{{ block('title') }}</h1>
 
+        {{ filter|chill_render_filter_order_helper }}
+
         {% if works|length == 0 %}
             <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
         {% else %}
@@ -26,7 +31,8 @@
                         'displayAction': true,
                         'displayContent': 'short',
                         'displayFontSmall': true,
-                        'itemBlocClass': ''
+                        'itemBlocClass': '',
+                        'displayNotification': true
                     } %}
                 {% 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 92b2e3920..7ee296cc7 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,9 +1,11 @@
-  <div class="accompanying-course-work">
+<div class="accompanying-course-work">
     {% for w in works | slice(0,5) %}
 
-    <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 }}">
-
+        <a href="{%- if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) -%}
+            {{- chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) -}}
+        {%- elseif is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', w) -%}
+            {{- chill_path_add_return_path('chill_person_accompanying_period_work_show', { 'id': w.id }) -}}
+        {%- else %}#{% endif -%}" 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>
@@ -14,7 +16,7 @@
                         <b>{{ w.startDate|format_date('short') }}</b>
                     </li>
                     {% if w.endDate %}
-                    <li>
+                        <li>
                         <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
                         <b>{{ w.endDate|format_date('short') }}</b>
                     </li>
@@ -23,20 +25,20 @@
 
                 <ul class="small_in_title">
                     {% if w.handlingThierParty %}
-                    <li>
+                        <li>
                         <span class="item-key">{{ 'Thirdparty handling'|trans ~ ' : ' }}</span>
                         <span class="badge-thirdparty">{{ w.handlingThierParty|chill_entity_render_box }}</span>
                     </li>
                     {% endif %}
                     {% if w.referrers %}
-                    <li>
+                        <li>
                         <span class="item-key">{{ 'Referrers'|trans ~ ' : ' }}</span>
                         {% for u in w.referrers %}
                             <span class="badge-user">{{ u|chill_entity_render_box }}</span>
                         {% endfor %}
-                        {% if w.referrers|length == 0 %}
-                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-                        {% endif %}
+                            {% if w.referrers|length == 0 %}
+                                <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                            {% endif %}
                     </li>
                     {% endif %}
                     <li class="associated-persons">
@@ -54,7 +56,7 @@
                 </ul>
 
                 <ul class="small_in_title mb-3 ps-0">
-                    {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {} %}
+                    {% include '@ChillPerson/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig' with {} %}
                 </ul>
 
                 <div class="metadata text-end">
@@ -65,8 +67,8 @@
             </span>
         </div>
 
-    </a>
+        </a>
     {% endfor %}
-  </div>
+</div>
 
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
index bddffebdf..438a6fb7f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
@@ -27,7 +27,20 @@
                 'displayContent': 'long',
                 'itemBlocClass': 'uniq extended',
             } %}
-            <div class="p-3 mt-3">{{ macro.metadata(work) }}</div>
+            <div class="p-3 mt-3">{{ macro.metadata(work, false) }}</div>
+        </div>
+
+        <div class="notification notification-list">
+            {% set more = [] %}
+            {% for e in work.accompanyingPeriodWorkEvaluations %}
+                 {% for d in e.documents %}
+                     {% set more = more|merge([{'relatedEntityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'relatedEntityId': d.id}]) %}
+                 {% endfor %}
+            {% endfor %}
+            {% set notifications =  chill_list_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', work.id, more) %}
+            {% if notifications is not empty %}
+                {{ notifications|raw }}
+            {% endif %}
         </div>
 
         <ul class="record_actions sticky-form-buttons">
@@ -36,6 +49,25 @@
                    class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
             </li>
             <li>{{ macro.workflowButton(work) }}</li>
+            <li>
+                <div class="d-grid gap-2 {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}btn-group{% endif %}" {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}role="group"{% endif %}>
+                    {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}
+                        <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" title="{{ 'notification.Notify'|trans }}" data-bs-toggle="dropdown" aria-expanded="false">
+                        </button>
+                        <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+                            <li>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id, 'tos': [accompanyingCourse.user.id]}) }}">{{ 'notification.Notify referrer'|trans }}</a>
+                            </li>
+                            <li>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">{{ 'notification.Notify any'|trans }}</a>
+                            </li>
+                        </ul>
+                    {% else %}
+                        <a class="btn btn-notify" title="{{ 'notification.Notify'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">
+                        </a>
+                    {% endif %}
+                </div>
+            </li>
             {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', work) %}
                 <li>
                     <a class="btn btn-edit"
@@ -47,7 +79,8 @@
                 <li>
                     <a class="btn btn-delete"
                        href="{{ path('chill_person_accompanying_period_work_delete', { 'id': work.id } ) }}"
-                    >{{ 'Delete'|trans }}</a>
+                        title = "{{ 'Delete'|trans }}"
+                    ></a>
                 </li>
             {% endif %}
         </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
new file mode 100644
index 000000000..0341e42e5
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
@@ -0,0 +1,134 @@
+{% if document is not null %}
+    {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+    <div class="flex-table accompanying-course-work">
+        {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_DOCUMENT_SHOW', document) %}
+            {% set doc = document %}
+            <div class="item-bloc evaluation-item bg-chill-llight-gray">
+                <div class="item-row mb-2">
+                    <h1>{{ "Document"|trans }}: {{ doc.title }}</h1>
+                </div>
+                <div class="item-row mb-2">
+                    <h2 class="badge-title">
+                        <span class="title_label"></span>
+                        <span class="title_action">
+                        {{ evaluation.accompanyingPeriodWork.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>{{ evaluation.accompanyingPeriodWork.startDate|format_date('short') }}</b>
+                            </li>
+                            {% if evaluation.accompanyingPeriodWork.endDate %}
+                                <li>
+                                    <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                    <b>{{ evaluation.accompanyingPeriodWork.endDate|format_date('short') }}</b>
+                                </li>
+                            {% endif %}
+                        </ul>
+                    </span>
+                    </h2>
+                </div>
+                <div class="item-row mb-2">
+                    <div class="item-col" style="width: 17%;">
+                        <h4 class="title_label">
+                            {{ 'Participants'|trans }}
+                        </h4>
+                    </div>
+                    <div class="item-col list">
+                        {% for p in evaluation.accompanyingPeriodWork.persons %}
+                            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                targetEntity: { name: 'person', id: p.id },
+                                action: 'show',
+                                displayBadge: true,
+                                buttonText: p|chill_entity_render_string,
+                                isDead: p.deathdate is not null
+                            } %}
+                        {% endfor %}
+                    </div>
+                </div>
+                <div class="item-row column">
+                    <table class="obj-res-eval my-3">
+                        <thead>
+                        <tr>
+                            <th class="eval">
+                                <h4 class="title_label">
+                                    {{ 'Évaluation'|trans }}
+                                </h4>
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr>
+                            <td class="eval">
+                                <ul class="eval_title">
+                                    <li class="my-2">
+                                        {{ evaluation.evaluation.title|localize_translatable_string }}
+                                        <ul class="columns pt-2">
+                                            <li>
+                                                <span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
+                                                <b>{{ evaluation.startDate|format_date('short') }}</b>
+                                            </li>
+                                            {% if evaluation.endDate %}
+                                                <li>
+                                                    <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                                    <b>{{ evaluation.endDate|format_date('short') }}</b>
+                                                </li>
+                                            {% endif %}
+                                            {% if evaluation.maxDate %}
+                                                <li>
+                                                    <span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
+                                                    <b>{{ evaluation.maxDate|format_date('short') }}</b>
+                                                </li>
+                                            {% endif %}
+                                            {% if evaluation.warningInterval and evaluation.warningInterval.d > 0 %}
+                                                <li>
+                                                    {% set days = (evaluation.warningInterval.d + evaluation.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 %}
+                                            <li>
+                                                {% if evaluation.createdBy is not null %}
+                                                    <span class="item-key">créé par</span>
+                                                    <b>{{ evaluation.createdBy.username }}</b>
+                                                {% endif %}
+                                                {% if evaluation.createdAt is not null %}
+                                                    <span class="item-key">{{ 'le'|trans }}</span>
+                                                    <b>{{ evaluation.createdAt|format_date('short') }}</b>
+                                                {% endif %}
+                                            </li>
+                                        </ul>
+                                        {% if evaluation.comment %}
+                                            <blockquote class="chill-user-quote" style="margin-left: 0;">
+                                                {{ evaluation.comment }}
+                                            </blockquote>
+                                        {% endif %}
+                                    </li>
+                                </ul>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <div class="item-row">
+                    <ul class="record_actions">
+                        <li>
+                            <a class="btn btn-show"
+                               href="{{ path('chill_person_accompanying_period_work_show', { 'id': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork.id }) }}"
+                               title="{{ 'See the document'|trans }}"></a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+
+        {% else %}
+            <div class="alert alert-warning border-warning border-1">
+                {{ 'This is the minimal period details'|trans ~ ': ' ~ document.id }}<br>
+                {{ 'You are getting a notification for a period you are not allowed to see'|trans }}
+            </div>
+        {% endif %}
+    </div>
+{% else %}
+    <div class="alert alert-warning border-warning border-1">
+        {{ 'You are getting a notification for a period which does not exists any more'|trans }}
+    </div>
+{% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig
new file mode 100644
index 000000000..fdafcc040
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig
@@ -0,0 +1,30 @@
+{% macro recordAction(work) %}
+    <li>
+        <a class="btn btn-show" title="{{ 'Show'|trans }}"
+           href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_show', {'id': work.id }) }}"
+        ></a>
+    </li>
+{% endmacro %}
+{% if work is not null %}
+    <div class="flex-table accompanying-course-work">
+        {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', work) %}
+            {% include "@ChillPerson/AccompanyingCourseWork/_item.html.twig" with {
+                'itemBlocClass': 'bg-chill-llight-gray',
+                'displayAction': true,
+                'displayContent': 'short',
+                'displayFontSmall': true,
+                'displayNotification:':true,
+                'w': work
+            } %}
+        {% else %}
+            <div class="alert alert-warning border-warning border-1">
+                {{ 'This is the minimal period details'|trans ~ ': ' ~ work.id }}<br>
+                {{ 'You are getting a notification for a period you are not allowed to see'|trans }}
+            </div>
+        {% endif %}
+    </div>
+{% else %}
+    <div class="alert alert-warning border-warning border-1">
+        {{ 'You are getting a notification for a period which does not exists any more'|trans }}
+    </div>
+{% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index b140bb4c1..56c6d92c3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -63,7 +63,7 @@
 
     <div class="flex-table accompanyingcourse-list">
         {% for period in acps %}
-            {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
+            {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {
                 'recordAction': _self.recordAction(period, contextEntity)
             } %}
         {% else %}
@@ -100,7 +100,7 @@
 
                     <div class="flex-table accompanyingcourse-list">
                         {% for period in acpsClosed %}
-                            {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
+                            {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {
                                 'recordAction': _self.recordAction(period, contextEntity)
                             } %}
                         {% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
index 6c7fbf7c0..47b8c8a15 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
@@ -16,11 +16,13 @@
                 </div>
                 <div class="wh-col">
                     {% if period.step == 'DRAFT' %}
-                        <span class="badge bg-secondary">{{- 'Draft'|trans|upper -}}</span>
-                    {% elseif period.step == 'CONFIRMED' %}
-                        <span class="badge bg-primary">{{- 'Confirmed'|trans|upper -}}</span>
-                    {% else %}
-                        <span class="badge bg-danger">{{- 'Closed'|trans|upper -}}</span>
+                        <span class="badge bg-secondary" style="font-size: 85%;" title="{{ 'course.draft'|trans|e('html_attr') }}">{{ 'course.draft'|trans }}</span>
+                    {% elseif period.step == 'CLOSED' %}
+                        <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.closed'|trans|e('html_attr') }}">{{ 'course.closed'|trans }}</span>
+                    {% elseif period.step == 'CONFIRMED_INACTIVE_SHORT' %}
+                        <span class="badge bg-chill-yellow text-primary" style="font-size: 85%;" title="{{ 'course.inactive_short'|trans|e('html_attr') }}">{{ 'course.inactive_short'|trans }}</span>
+                    {% elseif period.step == 'CONFIRMED_INACTIVE_LONG' %}
+                        <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.inactive_long'|trans|e('html_attr') }}">{{ 'course.inactive_long'|trans }}</span>
                     {% endif %}
                 </div>
             </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
index f30bfc45a..0b3669b85 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
@@ -9,7 +9,7 @@
 
     <h1>{{ 'Accompanying period list'|trans }}</h1>
 
-    {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+    {% include '@ChillPerson/AccompanyingPeriod/_list.html.twig' %}
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
index c1144512d..c98dd253e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title 'period_by_user_list.Period by user'|trans %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig
index 630dcf100..37563c947 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/showInNotification.html.twig
@@ -8,7 +8,7 @@
 {% if period is not null %}
     <div class="flex-table">
         {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', period) %}
-            {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
+            {% include "@ChillPerson/AccompanyingPeriod/_list_item.html.twig" with {
                 'recordAction': _self.recordAction(notification.relatedEntityId),
                 'itemBlocClass': 'bg-chill-llight-gray'
             } %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
index 031e0728c..38e055378 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
@@ -17,6 +17,15 @@
     <div class="col-md-10">
         <h1>{{ 'My accompanying periods'|trans }}</h1>
 
+        <ul class="nav nav-pills justify-content-center">
+            <li class="nav-item">
+                <a class="nav-link {% if active == true %}active{% endif %}" aria-current="page" href="{{ chill_path_forward_return_path('chill_person_accompanying_period_user', {'active': true}) }}">{{ ['Confirmed'|trans, 'course.inactive_short'|trans, 'course.inactive_long'|trans]|join(', ') }}</a>
+            </li>
+            <li class="nav-item ">
+                <a class="nav-link {% if active == false %}active{% endif %}" href="{{ chill_path_forward_return_path('chill_person_accompanying_period_user', {'active': false}) }}">{{ 'course.closed'|trans }}</a>
+            </li>
+        </ul>
+
         <p>{{ 'Number of periods'|trans }}: <span class="badge rounded-pill bg-primary">{{ pagination.totalItems }}</span></p>
 
         <div class="flex-table accompanyingcourse-list">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/GenericDoc/evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/GenericDoc/evaluation_document.html.twig
new file mode 100644
index 000000000..ae54d077b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/GenericDoc/evaluation_document.html.twig
@@ -0,0 +1,76 @@
+{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+{% import '@ChillPerson/Macro/updatedBy.html.twig' as mmm %}
+
+{% set w = document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork %}
+
+<div class="item-bloc">
+    <div class="item-row">
+        <div class="item-col" style="width: unset">
+            {% if document.storedObject.isPending %}
+                <div class="badge text-bg-info" data-docgen-is-pending="{{ document.storedObject.id }}">{{ 'docgen.Doc generation is pending'|trans }}</div>
+            {% elseif document.storedObject.isFailure %}
+                <div class="badge text-bg-warning">{{ 'docgen.Doc generation failed'|trans }}</div>
+            {% endif %}
+            <div>
+                {% if context == 'person' %}
+                    <span class="badge bg-primary">
+                        <i class="fa fa-random"></i> {{ w.accompanyingPeriod.id }}
+                    </span>&nbsp;
+                {% endif %}
+                <div class="badge-accompanying-work-type">
+                    <span class="title_label"></span>
+                    <span class="title_action">{{ w.socialAction|chill_entity_render_string }} > {{ document.accompanyingPeriodWorkEvaluation.evaluation.title|localize_translatable_string }}</span>
+                </div>
+            </div>
+            <div class="denomination h2">
+                {{ document.title|chill_print_or_message("No title") }}
+            </div>
+            {% if document.storedObject.type is not empty %}
+                <div>
+                    {{ mm.mimeIcon(document.storedObject.type) }}
+                </div>
+            {% endif %}
+            {% if document.storedObject.hasTemplate %}
+                <div>
+                    <p>{{ document.storedObject.template.name|localize_translatable_string }}</p>
+                </div>
+            {% endif %}
+        </div>
+
+        <div class="item-col">
+            <div class="container">
+                <div class="dates row text-end">
+                    <span>{{ document.storedObject.createdAt|format_date('short') }}</span>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="item-row separator">
+        <div class="item-col item-meta">
+            {{ mmm.createdBy(document) }}
+        </div>
+        <ul class="item-col record_actions flex-shrink-1">
+            <li>
+                {{ chill_entity_workflow_list('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', document.id) }}
+            </li>
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_DOCUMENT_SHOW', document) %}
+                <li>
+                    {{ document.storedObject|chill_document_button_group(document.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork)) }}
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', w)%}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_show', {'id': w.id, 'docId': document.id}) }}" class="btn btn-show"></a>
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', {'id': w.id, 'docId': document.id}) }}" class="btn btn-edit"></a>
+                </li>
+            {% endif %}
+        </ul>
+
+    </div>
+</div>
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 acd251735..e473799ff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -7,7 +7,7 @@
 
     <h1>{{ block('title') }}</h1>
 
-    {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+    {% include '@ChillPerson/AccompanyingPeriod/_list.html.twig' %}
 
     {% if accompanying_periods_old|length > 0 %}
             <div class="accordion" id="nonCurrent">
@@ -28,7 +28,7 @@
                         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} %}
+                        {% include '@ChillPerson/AccompanyingPeriod/_list.html.twig' with {'accompanying_periods' : accompanying_periods_old} %}
                     </div>
                 </div>
             </div>
@@ -40,13 +40,14 @@
                 {{ 'Household summary'|trans }}
             </a>
         </li>
-        {# TODO: add ACL to check if user is allowed to edit household? #}
-        <li>
-            <a class="btn btn-create"
-                href="{{ path ('chill_household_accompanying_course_new', {'household_id' : household.id } ) }}" role="button">
-                {{ 'Create an accompanying period'|trans }}
-            </a>
-        </li>
+        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+            <li>
+                <a class="btn btn-create"
+                    href="{{ path ('chill_household_accompanying_course_new', {'household_id' : household.id } ) }}" role="button">
+                    {{ 'Create an accompanying period'|trans }}
+                </a>
+            </li>
+        {% endif %}
     </ul>
 
 </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
index ce9105795..76776567c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
@@ -59,7 +59,7 @@
                         <span class=" d-block d-sm-inline-block">
                             {{ address|chill_entity_render_box({
                                 'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true,
-                                'details_button': false
+                                'details_button': true
                             }) }}
                         </span>
                     {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
index 18f49a623..3d41c567e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig
@@ -56,13 +56,12 @@
                             {%- if address is not null -%}
                                 {{ address|chill_entity_render_box({
                                     'render': 'inline', 'multiline': false, 'with_picto': true, 'with_delimiter': true,
-                                    'details_button': false
+                                    'details_button': true
                                 }) }}
                             {%- endif -%}
                             {% if person.getCurrentHousehold is not null %}
-                                <a class="btn household-link text-end"
-                                    href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id' : person.getCurrentHousehold.id } ) }}"
-                                    title="{{ 'Show household'|trans }}">
+                                <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id' : person.getCurrentHousehold.id } ) }}"
+                                   class="btn btn-sm household-link" title="{{ 'Show household'|trans }}">
                                     <i class="fa fa-lg fa-home"></i>
                                 </a>
                             {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 03bece4d5..1ceb84395 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -25,9 +25,7 @@
     {% if alternatePersons is not empty %}
         <div class="alert alert-warning flash_message">
             <span>
-            {% transchoice alternatePersons|length with { '%nb%': alternatePersons|length } %}
-                %nb% person with similar name. Please verify that this is a new person
-            {% endtranschoice %}
+                {{ 'nb person with similar name. Please verify that this is a new person'|trans({'nb' : alternatePersons|length}) }}
             </span>
         </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
index 5423388e6..a76e87948 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig
@@ -18,7 +18,7 @@
     <h2>{{ title|default('Person search results')|trans }}</h2>
 
     <p>
-        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
+        {{ 'total persons matching the search pattern'|trans({'total' : total}) }}&nbsp;:
         <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
                     <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
         </a>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
index 754952df0..0bdfed628 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig
@@ -18,9 +18,9 @@
     <h2>{{ title|default('Person search results by phonenumber')|trans }}</h2>
 
     <p>
-        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
+        {{ 'total persons matching the search pattern'|trans({'total' : total}) }}&nbsp;:
         <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
-                    <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
+            <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
         </a>
     </p>
 
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 4497b8226..7dcf5a5bf 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
@@ -52,11 +52,13 @@
                             {% endif %}
 
                             {% if acp.step == 'DRAFT' %}
-                                <span class="badge bg-secondary" style="font-size: 85%;" title="{{ 'course.draft'|trans }}">{{ 'course.draft'|trans }}</span>
-                            {% endif %}
-
-                            {% if acp.step == 'CLOSED' %}
-                                <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.closed'|trans }}">{{ 'course.closed'|trans }}</span>
+                                <span class="badge bg-secondary" style="font-size: 85%;" title="{{ 'course.draft'|trans|e('html_attr') }}">{{ 'course.draft'|trans }}</span>
+                            {% elseif acp.step == 'CLOSED' %}
+                                <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.closed'|trans|e('html_attr') }}">{{ 'course.closed'|trans }}</span>
+                            {% elseif acp.step == 'CONFIRMED_INACTIVE_SHORT' %}
+                                <span class="badge bg-chill-yellow text-primary" style="font-size: 85%;" title="{{ 'course.inactive_short'|trans|e('html_attr') }}">{{ 'course.inactive_short'|trans }}</span>
+                            {% elseif acp.step == 'CONFIRMED_INACTIVE_LONG' %}
+                                <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.inactive_long'|trans|e('html_attr') }}">{{ 'course.inactive_long'|trans }}</span>
                             {% endif %}
                         </div>
                     </div>
@@ -199,9 +201,9 @@
     <h2>{{ title|default('Person search results')|trans }}</h2>
 
     <p>
-        {{ '%total% persons matching the search pattern:'|transchoice( total, { '%total%' : total}) }}
+        {{ 'total persons matching the search pattern'|trans({'total' : total}) }}&nbsp;:
         <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
-            <i class="fa fa-fw fa-search" aria-hidden="true"></i> {{ pattern }}
+            <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
         </a>
     </p>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index ceff2137d..094e23427 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -28,7 +28,7 @@ This view should receive those arguments:
     we define variables to include an edit form repeated multiple time across
     the page
 #}
-{% set edit_tmp_name = 'ChillPersonBundle:Form:go_to_form.html.twig'  %}
+{% set edit_tmp_name = '@ChillPerson/Form/go_to_form.html.twig'  %}
 {% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id },
       'form_path_key' : 'chill_person_general_edit' } %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
index 660fff7a6..b8edcc437 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
@@ -4,7 +4,7 @@
     <li><b>{{ 'gender'|trans }}</b>:
         {{ person.gender|trans }}</li>
     <li><b>{{ 'maritalStatus'|trans }}</b>:
-        {% if person.maritalStatus.name %}{{ person.maritalStatus.name|localize_translatable_string }}{% endif %}</li>
+        {% if person.maritalStatus %}{{ person.maritalStatus.name|localize_translatable_string }}{% endif %}</li>
     <li><b>{{ 'birthdate'|trans }}</b>:
         {% if person.birthdate is not null %}{{ person.birthdate|format_date('short') }}{% endif %}</li>
     <li><b>{{ 'placeOfBirth'|trans }}</b>:
@@ -39,7 +39,7 @@
     <li><b>{{ person.counters.nb_activity }}</b> {{ (person.counters.nb_activity > 1)? 'échanges' : 'échange' }}</li>
     <li><b>{{ person.counters.nb_task }}</b> {{ (person.counters.nb_task > 1)? 'tâches' : 'tâche' }}</li>
     <li><b>{{ person.counters.nb_document }}</b> {{ (person.counters.nb_document > 1)? 'documents' : 'document' }}</li>
-    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>
+{#    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>#}
     <li><b>{{ person.counters.nb_addresses }}</b> {{ (person.counters.nb_addresses > 1)? 'adresses' : 'adresse' }}</li>
 
 </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
index 304e78eb3..218b89f2a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
@@ -25,7 +25,7 @@
 
     <h1>{{ 'Merge duplicate persons folders'|trans }}</h1>
 
-    <div class="col-md-6">
+    <div class="col-md-11">
         <p><b>{{ 'Old person'|trans }}</b>:
             {{ 'Old person explain'|trans }}
         </p>
@@ -43,7 +43,7 @@
         </div>
     </div>
 
-    <div class="col-md-6">
+    <div class="col-md-11">
         <p><b>{{ 'New person'|trans }}</b>:
             {{ 'New person explain'|trans }}
         </p>
@@ -63,10 +63,10 @@
 
     {{ form_start(form) }}
 
-    <div class="col-md-4 centered">
+    <div class="col-md-12 centered">
 
         <div class="container-fluid" style="padding-top: 1em;">
-            <div class="col-1 clear" style="padding-top: 10px;">
+            <div class="clear" style="padding-top: 10px;">
                 {{ form_widget(form.confirm) }}
             </div>
             <div class="col-11">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
index 8769ae6da..982690f00 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
@@ -8,9 +8,9 @@
 
 {% block content %}
 <div class="person-duplicate">
-            
+
             <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>
-            
+
             {{ form_start(form) }}
             {{ form_rest(form) }}
 
@@ -29,3 +29,11 @@
 
 </div>
 {% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
index e78216f04..9e6c6e5aa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
@@ -20,7 +20,7 @@
                 <td>{{ entity.ordering }}</td>
                 <td>
                 {% if entity.desactivationDate is not null %}
-                    {{ entity.desactivationDate|date('Y-m-d') }}
+                    {{ entity.desactivationDate|format_date('medium') }}
                 {% endif %}
                 </td>
                 <td>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
index 9603cad17..89b24e27b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
@@ -1,8 +1,8 @@
-{# 
+{#
     if the `custom_fields` option is used, the custom fields are available
     under the customFields variable, with the custom field slug as key.
 #}
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person %}
+{% import '@ChillPerson/Person/macro.html.twig' as person %}
 <div class="col-8 centered">
     <h2>{{ 'Accompanyied people'|trans }}</h2>
     <table>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig
index 49cd37180..ee89af10a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig
@@ -3,6 +3,14 @@
         {{ 'workflow.SocialAction deleted'|trans }}
     </div>
 {% else %}
+    <div class="flex-table accompanying-course-work">
+        {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
+            'w': work,
+            'displayAction': false,
+            'displayContent': 'short',
+            'itemBlocClass': 'bg-chill-light-gray'
+        } %}
+    </div>
     {% if display_action is defined and display_action == true %}
         <ul class="record_actions">
             <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index 691a903ab..112d4089d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -123,7 +123,7 @@
         <ul class="record_actions">
             <li>{{ doc.storedObject|chill_document_button_group(doc.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork)) }}</li>
             <li>
-                <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
+                <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id, 'doc_id': doc.id}) }}">
                     {{ 'Show'|trans }}
                 </a>
             </li>
diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
index 7cd1849a3..9ca72ecac 100644
--- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
@@ -23,51 +23,20 @@ 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 libphonenumber\PhoneNumber;
-use libphonenumber\PhoneNumberUtil;
 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
 {
-    public const NAME = 'person_regular';
+    final public const NAME = 'person_regular';
 
     private const POSSIBLE_KEYS = [
         '_default', 'firstname', 'lastname', 'birthdate', 'birthdate-before',
         '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;
-    }
+    public function __construct(private readonly \Twig\Environment $templating, private readonly ExtractDateFromPattern $extractDateFromPattern, private readonly ExtractPhonenumberFromPattern $extractPhonenumberFromPattern, private readonly PaginatorFactory $paginatorFactory, private readonly PersonACLAwareRepositoryInterface $personACLAwareRepository) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
@@ -116,23 +85,23 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
     {
         $string = '@person ';
 
-        $string .= !isset($data['_default']) ? '' : $data['_default'] . ' ';
+        $string .= !isset($data['_default']) ? '' : $data['_default'].' ';
 
         foreach (['firstname', 'lastname', 'gender', 'city'] as $key) {
-            $string .= !isset($data[$key]) ? '' : $key . ':' .
+            $string .= !isset($data[$key]) ? '' : $key.':'.
                 // add quote if contains spaces
-                (strpos($data[$key], ' ') !== false ? '"' . $data[$key] . '"' : $data[$key])
-                . ' ';
+                (str_contains((string) $data[$key], ' ') ? '"'.$data[$key].'"' : $data[$key])
+                .' ';
         }
 
         foreach (['birthdate', 'birthdate-before', 'birthdate-after'] as $key) {
             $string .= !isset($data[$key]) ?
                 ''
                 :
-                $key . ':' . $data[$key]->format('Y-m-d') . ' ';
+                $key.':'.$data[$key]->format('Y-m-d').' ';
         }
 
-        $string .= !isset($data['phonenumber']) ? '' : 'phonenumber:' . $data['phonenumber']->getNationalNumber();
+        $string .= !isset($data['phonenumber']) ? '' : 'phonenumber:'.$data['phonenumber']->getNationalNumber();
 
         return $string;
     }
@@ -147,24 +116,22 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
 
         // 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 "
-                              . 'not parsable', 0, $ex);
+                    $date = new \DateTime($terms[$key]);
+                } catch (\Exception $ex) {
+                    throw new ParsingException("The date for {$key} is ".'not parsable', 0, $ex);
                 }
             }
             $data[$key] = $date ?? null;
         }
 
-        if (array_key_exists('phonenumber', $terms)) {
+        if (\array_key_exists('phonenumber', $terms)) {
             try {
                 $phonenumber = new PhoneNumber();
                 $phonenumber->setNationalNumber($terms['phonenumber']);
-            } catch (Exception $ex) {
-                throw new ParsingException("The data for phonenumber is "
-                    . 'not parsable', 0, $ex);
+            } catch (\Exception $ex) {
+                throw new ParsingException('The data for phonenumber is not parsable', 0, $ex);
             }
 
             $data['phonenumber'] = $phonenumber;
@@ -173,7 +140,7 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
         return $data;
     }
 
-    public function getAdvancedSearchTitle()
+    public function getAdvancedSearchTitle(): string
     {
         return 'Search within persons';
     }
@@ -216,7 +183,7 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
                     'persons' => $this->search($terms, $start, $limit, $options),
                     'pattern' => $this->recomposePattern(
                         $terms,
-                        array_filter(self::POSSIBLE_KEYS, static fn ($item) => '_default' !== $item),
+                        \array_filter(self::POSSIBLE_KEYS, static fn ($item) => '_default' !== $item),
                         $terms['_domain']
                     ),
                     'total' => $total,
@@ -227,9 +194,10 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
                 ]
             );
         }
+
         // format is "json"
         return [
-            'results' => $this->search($terms, $start, $limit, array_merge($options, ['simplify' => true])),
+            'results' => $this->search($terms, $start, $limit, \array_merge($options, ['simplify' => true])),
             'pagination' => [
                 'more' => $paginator->hasNextPage(),
             ],
@@ -254,32 +222,29 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
             'nationality' => $countryCode,
             'phonenumber' => $phonenumber,
             'city' => $city,
-        ] = $terms + array_fill_keys(self::POSSIBLE_KEYS, null);
+        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
 
         if (null !== $birthdate) {
             try {
-                $birthdate = new DateTime($birthdate);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdate = new \DateTime($birthdate);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
         if (null !== $birthdateBefore) {
             try {
-                $birthdateBefore = new DateTime($birthdateBefore);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdateBefore = new \DateTime($birthdateBefore);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
         if (null !== $birthdateAfter) {
             try {
-                $birthdateAfter = new DateTime($birthdateAfter);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdateAfter = new \DateTime($birthdateAfter);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
@@ -314,32 +279,29 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
             'nationality' => $countryCode,
             'phonenumber' => $phonenumber,
             'city' => $city,
-        ] = $terms + array_fill_keys(self::POSSIBLE_KEYS, null);
+        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
 
         if (null !== $birthdate) {
             try {
-                $birthdate = new DateTime($birthdate);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdate = new \DateTime($birthdate);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
         if (null !== $birthdateBefore) {
             try {
-                $birthdateBefore = new DateTime($birthdateBefore);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdateBefore = new \DateTime($birthdateBefore);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
         if (null !== $birthdateAfter) {
             try {
-                $birthdateAfter = new DateTime($birthdateAfter);
-            } catch (Exception $e) {
-                throw new ParsingException('The date is '
-                    . 'not parsable', 0, $e);
+                $birthdateAfter = new \DateTime($birthdateAfter);
+            } catch (\Exception $e) {
+                throw new ParsingException('The date is not parsable', 0, $e);
             }
         }
 
@@ -369,14 +331,14 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
         $terms['_default'] = $phoneResults->getFilteredSubject();
 
         if (
-            $datesResults->hasResult() && (!array_key_exists('birthdate', $terms)
+            $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)
+            $phoneResults->hasResult() && (!\array_key_exists('phonenumber', $terms)
             || null !== $terms['phonenumber'])
         ) {
             $terms['phonenumber'] = $phoneResults->getFound()[0];
diff --git a/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php b/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
index 819554252..6fdd66a84 100644
--- a/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
+++ b/src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
@@ -20,39 +20,9 @@ use Chill\PersonBundle\Repository\Household\HouseholdRepository;
 use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Symfony\Component\Security\Core\Security;
 
-use function array_map;
-use function count;
-use function in_array;
-
 class SearchHouseholdApiProvider implements SearchApiInterface
 {
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    private ExtractDateFromPattern $extractDateFromPattern;
-
-    private ExtractPhonenumberFromPattern $extractPhonenumberFromPattern;
-
-    private HouseholdRepository $householdRepository;
-
-    private PersonACLAwareRepositoryInterface $personACLAwareRepository;
-
-    private Security $security;
-
-    public function __construct(
-        HouseholdRepository $householdRepository,
-        PersonACLAwareRepositoryInterface $personACLAwareRepository,
-        Security $security,
-        AuthorizationHelperInterface $authorizationHelper,
-        ExtractDateFromPattern $extractDateFromPattern,
-        ExtractPhonenumberFromPattern $extractPhonenumberFromPattern
-    ) {
-        $this->householdRepository = $householdRepository;
-        $this->personACLAwareRepository = $personACLAwareRepository;
-        $this->security = $security;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->extractDateFromPattern = $extractDateFromPattern;
-        $this->extractPhonenumberFromPattern = $extractPhonenumberFromPattern;
-    }
+    public function __construct(private readonly HouseholdRepository $householdRepository, private readonly PersonACLAwareRepositoryInterface $personACLAwareRepository, private readonly Security $security, private readonly AuthorizationHelperInterface $authorizationHelper, private readonly ExtractDateFromPattern $extractDateFromPattern, private readonly ExtractPhonenumberFromPattern $extractPhonenumberFromPattern) {}
 
     public function getResult(string $key, array $metadata, float $pertinence)
     {
@@ -61,7 +31,7 @@ class SearchHouseholdApiProvider implements SearchApiInterface
 
     public function prepare(array $metadatas): void
     {
-        $ids = array_map(static fn ($m) => $m['id'], $metadatas);
+        $ids = \array_map(static fn ($m) => $m['id'], $metadatas);
 
         $this->householdRepository->findBy(['id' => $ids]);
     }
@@ -76,12 +46,12 @@ class SearchHouseholdApiProvider implements SearchApiInterface
             $filtered,
             null,
             null,
-            count($datesResult->getFound()) > 0 ? $datesResult->getFound()[0] : null,
+            \count($datesResult->getFound()) > 0 ? $datesResult->getFound()[0] : null,
             null,
             null,
             null,
             null,
-            count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
+            \count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
         );
 
         $previousFrom = $query->getFromClause();
@@ -90,7 +60,7 @@ class SearchHouseholdApiProvider implements SearchApiInterface
         $query
             ->setDistinct(true, 'cpphm.household_id')
             ->setFromClause(
-                $previousFrom . ' '.
+                $previousFrom.' '.
                 'JOIN chill_person_household_members AS cpphm ON cpphm.person_id = person.id',
                 $previousParams
             )
@@ -108,6 +78,6 @@ class SearchHouseholdApiProvider implements SearchApiInterface
 
     public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return in_array('household', $types, true);
+        return \in_array('household', $types, true);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php b/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
index cbf77910b..8444a41ec 100644
--- a/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
+++ b/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
@@ -20,39 +20,9 @@ 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;
-
-    private Security $security;
-
-    public function __construct(
-        PersonRepository $personRepository,
-        PersonACLAwareRepositoryInterface $personACLAwareRepository,
-        Security $security,
-        AuthorizationHelperInterface $authorizationHelper,
-        ExtractDateFromPattern $extractDateFromPattern,
-        ExtractPhonenumberFromPattern $extractPhonenumberFromPattern
-    ) {
-        $this->personRepository = $personRepository;
-        $this->personACLAwareRepository = $personACLAwareRepository;
-        $this->security = $security;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->extractDateFromPattern = $extractDateFromPattern;
-        $this->extractPhonenumberFromPattern = $extractPhonenumberFromPattern;
-    }
+    public function __construct(private readonly PersonRepository $personRepository, private readonly PersonACLAwareRepositoryInterface $personACLAwareRepository, private readonly Security $security, private readonly AuthorizationHelperInterface $authorizationHelper, private readonly ExtractDateFromPattern $extractDateFromPattern, private readonly ExtractPhonenumberFromPattern $extractPhonenumberFromPattern) {}
 
     public function getResult(string $key, array $metadata, float $pertinence)
     {
@@ -61,7 +31,7 @@ class SearchPersonApiProvider implements SearchApiInterface
 
     public function prepare(array $metadatas): void
     {
-        $ids = array_map(static fn ($m) => $m['id'], $metadatas);
+        $ids = \array_map(static fn ($m) => $m['id'], $metadatas);
 
         $this->personRepository->findByIds($ids);
     }
@@ -76,12 +46,12 @@ class SearchPersonApiProvider implements SearchApiInterface
             $filtered,
             null,
             null,
-            count($datesResult->getFound()) > 0 ? $datesResult->getFound()[0] : null,
+            \count($datesResult->getFound()) > 0 ? $datesResult->getFound()[0] : null,
             null,
             null,
             null,
             null,
-            count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
+            \count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
         )
             ->setSelectKey('person')
             ->setSelectJsonbMetadata("jsonb_build_object('id', person.id)");
@@ -94,6 +64,6 @@ class SearchPersonApiProvider implements SearchApiInterface
 
     public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return in_array('person', $types, true);
+        return \in_array('person', $types, true);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
index c77c0758e..74deb91e1 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
@@ -19,13 +19,11 @@ use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
-use function count;
-
 class SimilarPersonMatcher
 {
-    public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';
+    final public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';
 
-    public const SIMILAR_SEARCH_ORDER_BY_SIMILARITY = 'similarity';
+    final public const SIMILAR_SEARCH_ORDER_BY_SIMILARITY = 'similarity';
 
     /**
      * @var AuthorizationHelper
@@ -37,10 +35,6 @@ class SimilarPersonMatcher
      */
     protected $em;
 
-    protected PersonNotDuplicateRepository $personNotDuplicateRepository;
-
-    protected PersonRenderInterface $personRender;
-
     /**
      * @var TokenStorageInterface
      */
@@ -50,14 +44,12 @@ class SimilarPersonMatcher
         EntityManagerInterface $em,
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage,
-        PersonNotDuplicateRepository $personNotDuplicateRepository,
-        PersonRenderInterface $personRender
+        protected PersonNotDuplicateRepository $personNotDuplicateRepository,
+        protected PersonRenderInterface $personRender
     ) {
         $this->em = $em;
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
-        $this->personNotDuplicateRepository = $personNotDuplicateRepository;
-        $this->personRender = $personRender;
     }
 
     public function matchPerson(
@@ -102,13 +94,13 @@ class SimilarPersonMatcher
             $qb->setParameter('personBirthdate', $person->getBirthdate());
         }
 
-        if ($person->getId() !== null) {
+        if (null !== $person->getId()) {
             $qb->andWhere($qb->expr()->neq('p.id', ':personId'));
             $qb->setParameter('personId', $person->getId());
 
             $notDuplicatePersons = $this->personNotDuplicateRepository->findNotDuplicatePerson($person);
 
-            if (count($notDuplicatePersons)) {
+            if (\count($notDuplicatePersons)) {
                 $qb->andWhere($qb->expr()->notIn('p.id', ':notDuplicatePersons'));
                 $qb->setParameter('notDuplicatePersons', $notDuplicatePersons);
             }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php
index 1174bc2a0..3bba4f5c5 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php
@@ -15,20 +15,14 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
 
 class AccompanyingPeriodCommentVoter extends Voter
 {
-    public const DELETE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_COMMENT_DELETE';
+    final public const DELETE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_COMMENT_DELETE';
 
-    public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_COMMENT_EDIT';
+    final public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_COMMENT_EDIT';
 
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private readonly Security $security) {}
 
     protected function supports($attribute, $subject)
     {
@@ -37,16 +31,10 @@ class AccompanyingPeriodCommentVoter extends Voter
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        /** @var Comment $subject */
-        switch ($attribute) {
-            case self::EDIT:
-                return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod());
-
-            case self::DELETE:
-                return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod());
-
-            default:
-                throw new UnexpectedValueException("This attribute {$attribute} is not supported");
-        }
+        return match ($attribute) {
+            self::EDIT => $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod()),
+            self::DELETE => $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod()),
+            default => throw new \UnexpectedValueException("This attribute {$attribute} is not supported"),
+        };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php
index 9ffd90efa..5750a7b58 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodResourceVoter.php
@@ -15,18 +15,12 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use UnexpectedValueException;
 
 class AccompanyingPeriodResourceVoter extends Voter
 {
-    public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_RESOURCE_EDIT';
+    final public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_RESOURCE_EDIT';
 
-    private AccessDecisionManagerInterface $accessDecisionManager;
-
-    public function __construct(AccessDecisionManagerInterface $accessDecisionManager)
-    {
-        $this->accessDecisionManager = $accessDecisionManager;
-    }
+    public function __construct(private readonly AccessDecisionManagerInterface $accessDecisionManager) {}
 
     protected function supports($attribute, $subject)
     {
@@ -35,17 +29,13 @@ class AccompanyingPeriodResourceVoter extends Voter
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod\Resource $subject */
-        switch ($attribute) {
-            case self::EDIT:
-                return $this->accessDecisionManager->decide(
-                    $token,
-                    [AccompanyingPeriodVoter::EDIT],
-                    $subject->getAccompanyingPeriod()
-                );
-
-            default:
-                throw new UnexpectedValueException("attribute not supported: {$attribute}");
-        }
+        return match ($attribute) {
+            self::EDIT => $this->accessDecisionManager->decide(
+                $token,
+                [AccompanyingPeriodVoter::EDIT],
+                $subject->getAccompanyingPeriod()
+            ),
+            default => throw new \UnexpectedValueException("attribute not supported: {$attribute}"),
+        };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index ea32326a4..9aadd3d95 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -18,18 +18,17 @@ 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\Household\Household;
 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
 {
     /**
      * all the roles that are linked to an accompanying period.
      */
-    public const ALL = [
+    final public const ALL = [
         self::SEE,
         self::SEE_DETAILS,
         self::CREATE,
@@ -41,31 +40,26 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
         self::RE_OPEN_COURSE,
     ];
 
-    /**
-     * Give the ability to see all confidential courses.
-     */
-    public const CONFIDENTIAL_CRUD = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CRUD_CONFIDENTIAL';
-
-    public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE';
+    final public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE';
 
     /**
      * role to DELETE the course.
      *
      * Will be true only for the creator, and if the course is still at DRAFT step.
      */
-    public const DELETE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE';
+    final public const DELETE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE';
 
     /**
      * role to EDIT the course.
      *
      * If the course is closed, it will be always false.
      */
-    public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE';
+    final public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE';
 
     /**
      * Give all the right above.
      */
-    public const FULL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_FULL';
+    final public const FULL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_FULL';
 
     /**
      * Reopen a closed course.
@@ -73,52 +67,55 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
      * This forward to the EDIT role, without taking into account that the course
      * is closed
      */
-    public const RE_OPEN_COURSE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_REOPEN';
+    final public const RE_OPEN_COURSE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_REOPEN';
 
     /**
      * Allow user to bulk reassign the courses.
      */
-    public const REASSIGN_BULK = 'CHILL_PERSON_ACCOMPANYING_COURSE_REASSIGN_BULK';
+    final public const REASSIGN_BULK = 'CHILL_PERSON_ACCOMPANYING_COURSE_REASSIGN_BULK';
 
-    public const SEE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE';
+    final public const SEE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE';
 
     /**
      * details are for seeing:.
      *
      * * SocialIssues
      */
-    public const SEE_DETAILS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS';
+    final public const SEE_DETAILS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS';
 
     /**
      * Give the ability to see statistics.
      */
-    public const STATS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_STATS';
+    final public const STATS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_STATS';
 
     /**
      * Right to toggle confidentiality.
      */
-    public const TOGGLE_CONFIDENTIAL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL';
+    final public const TOGGLE_CONFIDENTIAL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL';
 
-    public const TOGGLE_CONFIDENTIAL_ALL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL_ALL';
+    final public const TOGGLE_CONFIDENTIAL_ALL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL_ALL';
 
     /**
      * Right to toggle urgency of parcours.
      */
-    public const TOGGLE_INTENSITY = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_INTENSITY';
+    final public const TOGGLE_INTENSITY = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_INTENSITY';
 
-    private Security $security;
+    /**
+     * Right to see confidential period even if not referrer.
+     */
+    final public const SEE_CONFIDENTIAL_ALL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_CONFIDENTIAL';
 
-    private VoterHelperInterface $voterHelper;
+    private readonly VoterHelperInterface $voterHelper;
 
     public function __construct(
-        Security $security,
+        private readonly Security $security,
         VoterHelperFactoryInterface $voterHelperFactory
     ) {
-        $this->security = $security;
         $this->voterHelper = $voterHelperFactory
             ->generate(self::class)
             ->addCheckFor(null, [self::CREATE, self::REASSIGN_BULK])
             ->addCheckFor(AccompanyingPeriod::class, [self::TOGGLE_CONFIDENTIAL, ...self::ALL])
+            ->addCheckFor(Household::class, [self::SEE])
             ->addCheckFor(Person::class, [self::SEE, self::CREATE])
             ->addCheckFor(Center::class, [self::STATS])
             ->build();
@@ -129,7 +126,6 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
         return [
             self::SEE,
             self::SEE_DETAILS,
-            self::CONFIDENTIAL_CRUD,
             self::CREATE,
             self::EDIT,
             self::DELETE,
@@ -137,6 +133,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
             self::TOGGLE_CONFIDENTIAL_ALL,
             self::REASSIGN_BULK,
             self::STATS,
+            self::SEE_CONFIDENTIAL_ALL,
         ];
     }
 
@@ -147,7 +144,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
 
     public function getRolesWithoutScope(): array
     {
-        return [self::REASSIGN_BULK];
+        return [];
     }
 
     protected function supports($attribute, $subject)
@@ -163,7 +160,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
 
         if ($subject instanceof AccompanyingPeriod) {
             if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
-                if (in_array($attribute, [self::EDIT, self::DELETE], true)) {
+                if (\in_array($attribute, [self::EDIT, self::DELETE], true)) {
                     return false;
                 }
 
@@ -184,7 +181,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
                 return false;
             }
 
-            if (in_array($attribute, [
+            if (\in_array($attribute, [
                 self::SEE, self::SEE_DETAILS, self::EDIT,
             ], true)) {
                 if ($subject->getUser() === $token->getUser()) {
@@ -214,7 +211,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
 
             // if confidential, only the referent can see it
             if ($subject->isConfidential()) {
-                if ($this->voterHelper->voteOnAttribute(self::CONFIDENTIAL_CRUD, $subject, $token)) {
+                if ($this->voterHelper->voteOnAttribute(self::SEE_CONFIDENTIAL_ALL, $subject, $token)) {
                     return true;
                 }
 
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
index 98de820da..77c131cd9 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
@@ -15,7 +15,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluatio
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use UnexpectedValueException;
 
 /**
  * Voter for AccompanyingPeriodWorkEvaluationDocument.
@@ -24,14 +23,9 @@ use UnexpectedValueException;
  */
 class AccompanyingPeriodWorkEvaluationDocumentVoter extends Voter
 {
-    public const SEE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_DOCUMENT_SHOW';
+    final public const SEE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_DOCUMENT_SHOW';
 
-    private AccessDecisionManagerInterface $accessDecisionManager;
-
-    public function __construct(AccessDecisionManagerInterface $accessDecisionManager)
-    {
-        $this->accessDecisionManager = $accessDecisionManager;
-    }
+    public function __construct(private readonly AccessDecisionManagerInterface $accessDecisionManager) {}
 
     protected function supports($attribute, $subject)
     {
@@ -40,23 +34,20 @@ class AccompanyingPeriodWorkEvaluationDocumentVoter extends Voter
     }
 
     /**
-     * @param string $attribute
+     * @param string                                   $attribute
      * @param AccompanyingPeriodWorkEvaluationDocument $subject
      *
      * @return bool|void
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
-        switch ($attribute) {
-            case self::SEE:
-                return $this->accessDecisionManager->decide(
-                    $token,
-                    [AccompanyingPeriodWorkEvaluationVoter::SEE],
-                    $subject->getAccompanyingPeriodWorkEvaluation()
-                );
-
-            default:
-                throw new UnexpectedValueException("The attribute {$attribute} is not supported");
-        }
+        return match ($attribute) {
+            self::SEE => $this->accessDecisionManager->decide(
+                $token,
+                [AccompanyingPeriodWorkEvaluationVoter::SEE],
+                $subject->getAccompanyingPeriodWorkEvaluation()
+            ),
+            default => throw new \UnexpectedValueException("The attribute {$attribute} is not supported"),
+        };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
index cfa867266..ce5faca8d 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
@@ -16,48 +16,36 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluatio
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function in_array;
 
 class AccompanyingPeriodWorkEvaluationVoter extends Voter implements ChillVoterInterface
 {
-    public const ALL = [
+    final public const ALL = [
         self::SEE,
         self::STATS,
     ];
 
-    public const SEE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_SHOW';
+    final public const SEE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_SHOW';
 
-    public const STATS = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_STATS';
+    final public const STATS = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_STATS';
 
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private readonly Security $security) {}
 
     protected function supports($attribute, $subject)
     {
         return $subject instanceof AccompanyingPeriodWorkEvaluation
-            && in_array($attribute, self::ALL, true);
+            && \in_array($attribute, self::ALL, true);
     }
 
     /**
-     * @param string $attribute
+     * @param string                           $attribute
      * @param AccompanyingPeriodWorkEvaluation $subject
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
-        switch ($attribute) {
-            case self::STATS:
-                return $this->security->isGranted(AccompanyingPeriodVoter::STATS, $subject);
-
-            case self::SEE:
-                return $this->security->isGranted(AccompanyingPeriodWorkVoter::SEE, $subject->getAccompanyingPeriodWork());
-
-            default:
-                throw new UnexpectedValueException("attribute {$attribute} is not supported");
-        }
+        return match ($attribute) {
+            self::STATS => $this->security->isGranted(AccompanyingPeriodVoter::STATS, $subject),
+            self::SEE => $this->security->isGranted(AccompanyingPeriodWorkVoter::SEE, $subject->getAccompanyingPeriodWork()),
+            default => throw new \UnexpectedValueException("attribute {$attribute} is not supported"),
+        };
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
index 84f31c202..64b25498c 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
@@ -21,36 +21,30 @@ use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function get_class;
-use function in_array;
 
 class AccompanyingPeriodWorkVoter extends Voter implements ProvideRoleHierarchyInterface, ChillVoterInterface
 {
-    public const ALL = [
+    final public const ALL = [
         self::SEE,
         self::CREATE,
         self::UPDATE,
         self::DELETE,
     ];
 
-    public const CREATE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE';
+    final public const CREATE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE';
 
-    public const DELETE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE';
+    final public const DELETE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE';
 
-    public const SEE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE';
+    final public const SEE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE';
 
-    public const UPDATE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE';
+    final public const UPDATE = 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE';
 
-    private Security $security;
-
-    private VoterHelperInterface $voterHelper;
+    private readonly VoterHelperInterface $voterHelper;
 
     public function __construct(
-        Security $security,
+        private readonly Security $security,
         VoterHelperFactoryInterface $voterHelperFactory
     ) {
-        $this->security = $security;
         $this->voterHelper = $voterHelperFactory
             ->generate(self::class)
             ->addCheckFor(null, [self::CREATE])
@@ -84,48 +78,33 @@ class AccompanyingPeriodWorkVoter extends Voter implements ProvideRoleHierarchyI
         return
             (
                 $subject instanceof AccompanyingPeriodWork
-                && in_array($attribute, $this->getRoles(), true)
+                && \in_array($attribute, $this->getRoles(), true)
             ) || (
                 $subject instanceof AccompanyingPeriod
-                && in_array($attribute, [self::SEE, self::CREATE], true)
+                && \in_array($attribute, [self::SEE, self::CREATE], true)
             );
     }
 
     /**
-     * @param string $attribute
+     * @param string                 $attribute
      * @param AccompanyingPeriodWork $subject
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
         if ($subject instanceof AccompanyingPeriodWork) {
-            switch ($attribute) {
-                case self::SEE:
-                    return $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject->getAccompanyingPeriod());
-
-                case self::CREATE:
-                case self::UPDATE:
-                case self::DELETE:
-                    return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod());
-
-                default:
-                    throw new UnexpectedValueException("attribute {$attribute} is not supported");
-            }
+            return match ($attribute) {
+                self::SEE => $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject->getAccompanyingPeriod()),
+                self::CREATE, self::UPDATE, self::DELETE => $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod()),
+                default => throw new \UnexpectedValueException("attribute {$attribute} is not supported"),
+            };
         } elseif ($subject instanceof AccompanyingPeriod) {
-            switch ($attribute) {
-                case self::SEE:
-                    return $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject);
-
-                case self::CREATE:
-                    return $this->security->isGranted(AccompanyingPeriodVoter::CREATE, $subject);
-
-                default:
-                    throw new UnexpectedValueException(sprintf(
-                        "attribute {$attribute} is not supported on instance %s",
-                        AccompanyingPeriod::class
-                    ));
-            }
+            return match ($attribute) {
+                self::SEE => $this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $subject),
+                self::CREATE => $this->security->isGranted(AccompanyingPeriodVoter::CREATE, $subject),
+                default => throw new \UnexpectedValueException(sprintf("attribute {$attribute} is not supported on instance %s", AccompanyingPeriod::class)),
+            };
         }
 
-        throw new UnexpectedValueException(sprintf("attribute {$attribute} on instance %s is not supported", get_class($subject)));
+        throw new \UnexpectedValueException(sprintf("attribute {$attribute} on instance %s is not supported", $subject::class));
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
index 47a15db54..798ed853a 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
@@ -21,21 +21,19 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Security;
-use UnexpectedValueException;
-use function in_array;
 
 class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface, ChillVoterInterface
 {
-    public const EDIT = 'CHILL_PERSON_HOUSEHOLD_EDIT';
+    final public const EDIT = 'CHILL_PERSON_HOUSEHOLD_EDIT';
 
-    public const SEE = 'CHILL_PERSON_HOUSEHOLD_SEE';
+    final public const SEE = 'CHILL_PERSON_HOUSEHOLD_SEE';
 
     /**
      * @deprecated use @see{self::SEE} instead
      */
-    public const SHOW = self::SEE;
+    final public const SHOW = self::SEE;
 
-    public const STATS = 'CHILL_PERSON_HOUSEHOLD_STATS';
+    final public const STATS = 'CHILL_PERSON_HOUSEHOLD_STATS';
 
     private const ALL = [
         self::SEE,
@@ -43,13 +41,10 @@ class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface, Chi
         self::STATS,
     ];
 
-    private VoterHelperInterface $helper;
+    private readonly VoterHelperInterface $helper;
 
-    private Security $security;
-
-    public function __construct(Security $security, VoterHelperFactoryInterface $voterHelperFactory)
+    public function __construct(private readonly Security $security, VoterHelperFactoryInterface $voterHelperFactory)
     {
-        $this->security = $security;
         $this->helper = $voterHelperFactory
             ->generate(self::class)
             ->addCheckFor(Center::class, [self::STATS])
@@ -74,32 +69,23 @@ class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface, Chi
     protected function supports($attribute, $subject)
     {
         return ($subject instanceof Household
-            && in_array($attribute, self::ALL, true))
+            && \in_array($attribute, self::ALL, true))
             || $this->helper->supports($attribute, $subject);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
-        switch ($attribute) {
-            case self::SEE:
-                return $this->checkAssociatedMembersRole($subject, PersonVoter::SEE);
-
-            case self::EDIT:
-                return $this->checkAssociatedMembersRole($subject, PersonVoter::UPDATE);
-
-            case self::STATS:
-                return $this->voteOnAttribute($attribute, $subject, $token);
-
-            default:
-                throw new UnexpectedValueException('attribute not supported');
-        }
+        return match ($attribute) {
+            self::SEE => $this->checkAssociatedMembersRole($subject, PersonVoter::SEE),
+            self::EDIT => $this->checkAssociatedMembersRole($subject, PersonVoter::UPDATE),
+            self::STATS => $this->voteOnAttribute($attribute, $subject, $token),
+            default => throw new \UnexpectedValueException('attribute not supported'),
+        };
     }
 
     private function checkAssociatedMembersRole(Household $household, string $attribute): bool
     {
-        foreach ($household->getCurrentMembers()->map(static function (HouseholdMember $member) {
-            return $member->getPerson();
-        }) as $person) {
+        foreach ($household->getCurrentMembers()->map(static fn (HouseholdMember $member) => $member->getPerson()) as $person) {
             if ($this->security->isGranted($attribute, $person)) {
                 return true;
             }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
index 95f10458b..2de8a1554 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
@@ -21,17 +21,17 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const CREATE = 'CHILL_PERSON_CREATE';
+    final public const CREATE = 'CHILL_PERSON_CREATE';
 
-    public const DUPLICATE = 'CHILL_PERSON_DUPLICATE';
+    final public const DUPLICATE = 'CHILL_PERSON_DUPLICATE';
 
-    public const LISTS = 'CHILL_PERSON_LISTS';
+    final public const LISTS = 'CHILL_PERSON_LISTS';
 
-    public const SEE = 'CHILL_PERSON_SEE';
+    final public const SEE = 'CHILL_PERSON_SEE';
 
-    public const STATS = 'CHILL_PERSON_STATS';
+    final public const STATS = 'CHILL_PERSON_STATS';
 
-    public const UPDATE = 'CHILL_PERSON_UPDATE';
+    final public const UPDATE = 'CHILL_PERSON_UPDATE';
 
     protected VoterHelperInterface $voter;
 
diff --git a/src/Bundle/ChillPersonBundle/Security/AuthorizedCenterOnPersonCreation.php b/src/Bundle/ChillPersonBundle/Security/AuthorizedCenterOnPersonCreation.php
index 1244f921f..ae5f5281b 100644
--- a/src/Bundle/ChillPersonBundle/Security/AuthorizedCenterOnPersonCreation.php
+++ b/src/Bundle/ChillPersonBundle/Security/AuthorizedCenterOnPersonCreation.php
@@ -17,13 +17,10 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 class AuthorizedCenterOnPersonCreation implements AuthorizedCenterOnPersonCreationInterface
 {
-    private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser;
+    private readonly bool $showCenters;
 
-    private bool $showCenters;
-
-    public function __construct(AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser, ParameterBagInterface $parameterBag)
+    public function __construct(private readonly AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser, ParameterBagInterface $parameterBag)
     {
-        $this->authorizationHelperForCurrentUser = $authorizationHelperForCurrentUser;
         $this->showCenters = $parameterBag->get('chill_main')['acl']['form_show_centers'];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
index 0e1c81592..e266fe0ae 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
@@ -25,7 +25,6 @@ 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;
@@ -33,8 +32,6 @@ 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;
@@ -43,15 +40,15 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
 
     private const PERIOD_NULL = [
         'id',
-        'closingDate' => DateTime::class,
+        'closingDate' => \DateTime::class,
         'closingMotive' => AccompanyingPeriod\ClosingMotive::class,
         'confidential',
         'confidentialText',
-        'createdAt' => DateTime::class,
+        'createdAt' => \DateTime::class,
         'createdBy' => User::class,
         'emergency',
         'emergencyText',
-        'openingDate' => DateTime::class,
+        'openingDate' => \DateTime::class,
         'origin' => AccompanyingPeriod\Origin::class,
         'originText',
         'requestorAnonymous',
@@ -74,45 +71,23 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
         'pinnedComment' => AccompanyingPeriod\Comment::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;
-    }
+    public function __construct(private readonly TranslatorInterface $translator, private readonly TranslatableStringHelper $translatableStringHelper, private readonly SocialIssueRender $socialIssueRender, private readonly ClosingMotiveRender $closingMotiveRender, private readonly ScopeResolverDispatcher $scopeResolverDispatcher) {}
 
     /**
      * @param AccompanyingPeriod|null $period
-     * @param string|null $format
+     * @param string|null             $format
      */
     public function normalize($period, $format = null, array $context = [])
     {
         if ($period instanceof AccompanyingPeriod) {
             $scopes = $this->scopeResolverDispatcher->isConcerned($period) ? $this->scopeResolverDispatcher->resolveScope($period) : [];
 
-            if (!is_array($scopes)) {
+            if (!\is_array($scopes)) {
                 $scopes = [$scopes];
             }
 
             $addressContext = array_merge($context, ['docgen:expects' => Address::class, 'groups' => 'docgen:read']);
-            $dateContext = array_merge($context, ['docgen:expects' => DateTime::class, 'groups' => 'docgen:read']);
+            $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']);
             $administrativeLocationContext = array_merge($context, ['docgen:expects' => Location::class, 'groups' => 'docgen:read']);
@@ -134,33 +109,29 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                 '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,
+                'hasRequestorPerson' => null !== $period->getRequestorPerson(),
                 'requestorThirdParty' => $this->normalizer->normalize($period->getRequestorThirdParty(), $format, array_merge($context, ['docgen:expects' => ThirdParty::class])),
-                'hasRequestorThirdParty' => $period->getRequestorThirdParty() !== null,
+                'hasRequestorThirdParty' => null !== $period->getRequestorThirdParty(),
                 '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()),
+                '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,
+                'isClosed' => null !== $period->getClosingDate(),
                 '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,
+                'hasRef' => null !== $period->getUser(),
+                'socialIssuesText' => implode(', ', array_map(fn (SocialIssue $s) => $this->socialIssueRender->renderString($s, []), $period->getSocialIssues()->toArray())),
+                'scopesText' => implode(', ', array_map(fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()), $scopes)),
+                'hasRequestor' => null !== $period->getRequestor(),
                 'requestorKind' => $period->getRequestorKind(),
-                'hasLocation' => $period->getLocation() !== null,
-                'hasLocationPerson' => $period->getPersonLocation() !== null,
-                'hasAdministrativeLocation' => $period->getAdministrativeLocation() !== null,
+                'hasLocation' => null !== $period->getLocation(),
+                'hasLocationPerson' => null !== $period->getPersonLocation(),
+                'hasAdministrativeLocation' => null !== $period->getAdministrativeLocation(),
                 'locationPerson' => $this->normalizer->normalize($period->getPersonLocation(), $format, array_merge($context, ['docgen:expects' => Person::class])),
                 'location' => $this->normalizer->normalize($period->getLocation(), $format, $addressContext),
                 'administrativeLocation' => $this->normalizer->normalize($period->getAdministrativeLocation(), $format, $administrativeLocationContext),
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
index f4b97c47d..2b1b767c0 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
@@ -20,7 +20,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 final class AccompanyingPeriodOriginNormalizer implements NormalizerInterface
 {
     /**
-     * @param Origin $origin
+     * @param Origin      $origin
      * @param string|null $format
      */
     public function normalize($origin, $format = null, array $context = [])
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
index 2ddeb466d..ce0a4707d 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
@@ -21,7 +21,7 @@ class AccompanyingPeriodParticipationNormalizer implements NormalizerAwareInterf
 
     /**
      * @param AccompanyingPeriodParticipation $participation
-     * @param string|null $format
+     * @param string|null                     $format
      */
     public function normalize($participation, $format = null, array $context = [])
     {
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
index 665671145..2e26e96c4 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
@@ -22,22 +22,13 @@ 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 count;
-
 class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface, DenormalizerInterface
 {
     use DenormalizerAwareTrait;
 
     use ObjectToPopulateTrait;
 
-    private ResourceRepository $repository;
-
-    public function __construct(ResourceRepository $repository)
-    {
-        $this->repository = $repository;
-    }
+    public function __construct(private readonly ResourceRepository $repository) {}
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
@@ -47,16 +38,15 @@ class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface
             throw new Exception\InvalidArgumentException("the key type must be present in data and set to 'accompanying_period_resource'");
         }
 
-        if (null === $resource && 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']));
+                throw new Exception\UnexpectedValueException(sprintf('the resource withid %d is not found', $data['id']));
             }
 
             // if resource found, available only for read-only
-            if (count($data) > 2) {
+            if (\count($data) > 2) {
                 unset($data['id'], $data['type']);
 
                 throw new Exception\ExtraAttributesException($data);
@@ -67,12 +57,12 @@ class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface
             $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 => [
@@ -85,7 +75,7 @@ class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface
             $resource->setResource($res);
         }
 
-        if (array_key_exists('comment', $data)) {
+        if (\array_key_exists('comment', $data)) {
             $resource->setComment($data['comment']);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
index 4d9cfceca..e5cd50f09 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
@@ -21,11 +21,6 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 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.
@@ -36,30 +31,20 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
 
     use ObjectToPopulateTrait;
 
-    public const GROUP_CREATE = 'accompanying_period_work:create';
+    final public const GROUP_CREATE = 'accompanying_period_work:create';
 
-    public const GROUP_EDIT = 'accompanying_period_work:edit';
+    final public const GROUP_EDIT = 'accompanying_period_work:edit';
 
-    private EntityManagerInterface $em;
-
-    private AccompanyingPeriodWorkRepository $workRepository;
-
-    public function __construct(
-        AccompanyingPeriodWorkRepository $workRepository,
-        EntityManagerInterface $em
-    ) {
-        $this->workRepository = $workRepository;
-        $this->em = $em;
-    }
+    public function __construct(private readonly AccompanyingPeriodWorkRepository $workRepository, private readonly EntityManagerInterface $em) {}
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
-        $work = $this->denormalizer->denormalize($data, $type, $format, array_merge(
+        $work = $this->denormalizer->denormalize($data, $type, $format, \array_merge(
             $context,
             ['skip' => self::class]
         ));
 
-        if (in_array('accompanying_period_work:edit', $context['groups'] ?? [], true)) {
+        if (\in_array('accompanying_period_work:edit', $context['groups'] ?? [], true)) {
             $this->handleEvaluationCollection($data, $work, $format, $context);
         }
 
@@ -70,8 +55,8 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
     {
         return AccompanyingPeriodWork::class === $type
             && self::class !== ($context['skip'] ?? null)
-            && is_array($data)
-            && array_key_exists('type', $data)
+            && \is_array($data)
+            && \array_key_exists('type', $data)
             && 'accompanying_period_work' === $data['type'];
     }
 
@@ -81,7 +66,7 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
         $dataWithoutId = [];
 
         foreach ($data['accompanyingPeriodWorkEvaluations'] as $e) {
-            if (array_key_exists('id', $e)) {
+            if (\array_key_exists('id', $e)) {
                 $dataById[$e['id']] = $e;
             } else {
                 $dataWithoutId[] = $e;
@@ -91,7 +76,7 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
         // partition the separate kept evaluations and removed one
         [$kept, $removed] = $work->getAccompanyingPeriodWorkEvaluations()
             ->partition(
-                static 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
@@ -104,7 +89,7 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
                 $dataById[$k->getId()],
                 AccompanyingPeriodWorkEvaluation::class,
                 $format,
-                array_merge(
+                \array_merge(
                     $context,
                     [
                         'groups' => ['write'],
@@ -119,7 +104,7 @@ class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInte
                 $newData,
                 AccompanyingPeriodWorkEvaluation::class,
                 $format,
-                array_merge(
+                \array_merge(
                     $context,
                     ['groups' => ['accompanying_period_work_evaluation:create']]
                 )
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
index 8e890445e..a5dcfb840 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
@@ -19,10 +19,6 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
 
-use function array_key_exists;
-use function array_merge;
-use function is_array;
-
 /**
  * This denormalizer rely on AbstractNormalizer for most of the job, and
  * add some logic for synchronizing collection.
@@ -35,7 +31,7 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
-        $evaluation = $this->denormalizer->denormalize($data, $type, $format, array_merge(
+        $evaluation = $this->denormalizer->denormalize($data, $type, $format, \array_merge(
             $context,
             ['skip' => self::class]
         ));
@@ -49,8 +45,8 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
     {
         return AccompanyingPeriodWorkEvaluation::class === $type
             && self::class !== ($context['skip'] ?? null)
-            && is_array($data)
-            && array_key_exists('type', $data)
+            && \is_array($data)
+            && \array_key_exists('type', $data)
             && 'accompanying_period_work_evaluation' === $data['type'];
     }
 
@@ -60,17 +56,17 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
         $dataWithoutId = [];
 
         foreach ($data['documents'] as $e) {
-            if (array_key_exists('id', $e)) {
+            if (\array_key_exists('id', $e)) {
                 $dataById[$e['id']] = $e;
             } else {
                 $dataWithoutId[] = $e;
             }
         }
 
-        //partition the separate kept documents and removed one
+        // partition the separate kept documents and removed one
         [$kept, $removed] = $evaluation->getDocuments()
             ->partition(
-                static fn (int $key, AccompanyingPeriodWorkEvaluationDocument $a) => array_key_exists($a->getId(), $dataById)
+                static fn (int $key, AccompanyingPeriodWorkEvaluationDocument $a) => \array_key_exists($a->getId(), $dataById)
             );
 
         // remove the document from evaluation
@@ -84,7 +80,7 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
                 $dataById[$k->getId()],
                 AccompanyingPeriodWorkEvaluationDocument::class,
                 $format,
-                array_merge(
+                \array_merge(
                     $context,
                     [
                         'groups' => ['write'],
@@ -99,7 +95,7 @@ class AccompanyingPeriodWorkEvaluationDenormalizer implements ContextAwareDenorm
                 $newData,
                 AccompanyingPeriodWorkEvaluationDocument::class,
                 $format,
-                array_merge(
+                \array_merge(
                     $context,
                     ['groups' => ['accompanying_period_work_evaluation:create']]
                 )
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
index fb87df96c..720bb9c03 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
@@ -18,7 +18,6 @@ use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Workflow\Registry;
-use function array_key_exists;
 
 class AccompanyingPeriodWorkEvaluationDocumentNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
@@ -26,20 +25,9 @@ class AccompanyingPeriodWorkEvaluationDocumentNormalizer implements ContextAware
 
     private const SKIP = 'accompanying_period_work_evaluation_document_skip';
 
-    private EntityWorkflowRepository $entityWorkflowRepository;
+    public function __construct(private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly MetadataExtractor $metadataExtractor, private readonly Registry $registry) {}
 
-    private MetadataExtractor $metadataExtractor;
-
-    private Registry $registry;
-
-    public function __construct(EntityWorkflowRepository $entityWorkflowRepository, MetadataExtractor $metadataExtractor, Registry $registry)
-    {
-        $this->entityWorkflowRepository = $entityWorkflowRepository;
-        $this->metadataExtractor = $metadataExtractor;
-        $this->registry = $registry;
-    }
-
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
         $initial = $this->normalizer->normalize($object, $format, array_merge($context, [
             self::SKIP => spl_object_hash($object),
@@ -59,12 +47,12 @@ class AccompanyingPeriodWorkEvaluationDocumentNormalizer implements ContextAware
         return $initial;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = [])
+    public function supportsNormalization($data, string $format = null, array $context = [])
     {
         return $data instanceof AccompanyingPeriodWorkEvaluationDocument
             && 'json' === $format
             && (
-                !array_key_exists(self::SKIP, $context)
+                !\array_key_exists(self::SKIP, $context)
                 || spl_object_hash($data) !== $context[self::SKIP]
             );
     }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
index 8cd917961..67c9209e5 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
@@ -19,7 +19,6 @@ use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Workflow\Registry;
-use function array_key_exists;
 
 class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
@@ -27,30 +26,17 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
 
     private const IGNORE_EVALUATION = 'evaluation:ignore';
 
-    private EntityWorkflowRepository $entityWorkflowRepository;
-
-    private MetadataExtractor $metadataExtractor;
-
-    private Registry $registry;
-
-    public function __construct(Registry $registry, EntityWorkflowRepository $entityWorkflowRepository, MetadataExtractor $metadataExtractor)
-    {
-        $this->registry = $registry;
-        $this->entityWorkflowRepository = $entityWorkflowRepository;
-        $this->metadataExtractor = $metadataExtractor;
-    }
+    public function __construct(private readonly Registry $registry, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly MetadataExtractor $metadataExtractor) {}
 
     /**
      * @param AccompanyingPeriodWorkEvaluation $object
      */
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
         $initial = $this->normalizer->normalize($object, $format, array_merge(
             $context,
             [self::IGNORE_EVALUATION => spl_object_hash($object)],
-            [AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => static function ($object, $format, $context) {
-                return $object->getId();
-            }]
+            [AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => static fn ($object, $format, $context) => $object->getId()]
         ));
 
         // due to bug: https://api-platform.com/docs/core/serialization/#collection-relation
@@ -78,10 +64,10 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements ContextAwareNormaliz
         return $initial;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         return 'json' === $format
             && $data instanceof AccompanyingPeriodWorkEvaluation
-            && !array_key_exists(self::IGNORE_EVALUATION, $context);
+            && !\array_key_exists(self::IGNORE_EVALUATION, $context);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
index 18c716fd7..3f0cd738e 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
-use ArrayObject;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -22,7 +21,6 @@ use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Workflow\Registry;
-use function array_key_exists;
 
 class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
@@ -30,27 +28,14 @@ class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterfac
 
     private const IGNORE_WORK = 'ignore:work';
 
-    private EntityWorkflowRepository $entityWorkflowRepository;
-
-    private MetadataExtractor $metadataExtractor;
-
-    private Registry $registry;
-
-    public function __construct(Registry $registry, EntityWorkflowRepository $entityWorkflowRepository, MetadataExtractor $metadataExtractor)
-    {
-        $this->registry = $registry;
-        $this->entityWorkflowRepository = $entityWorkflowRepository;
-        $this->metadataExtractor = $metadataExtractor;
-    }
+    public function __construct(private readonly Registry $registry, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly MetadataExtractor $metadataExtractor) {}
 
     /**
      * @param AccompanyingPeriodWork $object
      *
      * @throws ExceptionInterface
-     *
-     * @return array|ArrayObject|bool|float|int|string|null
      */
-    public function normalize($object, ?string $format = null, array $context = [])
+    public function normalize($object, string $format = null, array $context = []): null|array|\ArrayObject|bool|float|int|string
     {
         $initial = $this->normalizer->normalize($object, $format, array_merge(
             $context,
@@ -91,10 +76,10 @@ class AccompanyingPeriodWorkNormalizer implements ContextAwareNormalizerInterfac
         return $initial;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         return 'json' === $format
             && $data instanceof AccompanyingPeriodWork
-            && !array_key_exists(self::IGNORE_WORK, $context);
+            && !\array_key_exists(self::IGNORE_WORK, $context);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
index 740ea808c..0e358483e 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
@@ -18,25 +18,16 @@ 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 UnexpectedValueException;
-use function array_key_exists;
-
 class MembersEditorNormalizer implements DenormalizerAwareInterface, DenormalizerInterface
 {
     use DenormalizerAwareTrait;
 
-    private MembersEditorFactory $factory;
-
-    public function __construct(MembersEditorFactory $factory)
-    {
-        $this->factory = $factory;
-    }
+    public function __construct(private readonly MembersEditorFactory $factory) {}
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
@@ -71,7 +62,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
             );
             $startDate = $this->denormalizer->denormalize(
                 $concerned['start_date'] ?? null,
-                DateTimeImmutable::class,
+                \DateTimeImmutable::class,
                 $format,
                 $context
             );
@@ -80,9 +71,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 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);
@@ -117,7 +106,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 $context
             );
 
-            if (array_key_exists('position', $concerned)) {
+            if (\array_key_exists('position', $concerned)) {
                 $position = $this->denormalizer->denormalize(
                     $concerned['position'] ?? null,
                     Position::class,
@@ -130,7 +119,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
 
             $startDate = $this->denormalizer->denormalize(
                 $concerned['start_date'] ?? null,
-                DateTimeImmutable::class,
+                \DateTimeImmutable::class,
                 $format,
                 $context
             );
@@ -143,9 +132,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 && 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(
@@ -160,10 +147,10 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
         if (null !== $data['composition']) {
             $compositionType = $this->denormalizer->denormalize($data['composition']['household_composition_type'], HouseholdCompositionType::class, $format, $context);
             $numberOfChildren = $data['composition']['number_of_children'];
-            $startDate = $this->denormalizer->denormalize($data['composition']['start_date'], DateTimeImmutable::class, $format, $context);
+            $startDate = $this->denormalizer->denormalize($data['composition']['start_date'], \DateTimeImmutable::class, $format, $context);
 
             if (null === $compositionType) {
-                throw new UnexpectedValueException('composition type cannot be null');
+                throw new \UnexpectedValueException('composition type cannot be null');
             }
 
             $householdComposition = (new HouseholdComposition())
@@ -186,7 +173,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
             throw new Exception\UnexpectedValueException("The schema does not have any key 'concerned'");
         }
 
-        if (false === array_key_exists('destination', $data)) {
+        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
index 74ca55398..c8f9cf455 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -22,7 +22,6 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
 use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\DataFixtures\Exception\CircularReferenceException;
 use libphonenumber\PhoneNumber;
@@ -33,12 +32,6 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-use function array_map;
-use function implode;
-use function in_array;
-use function is_string;
-
 class PersonDocGenNormalizer implements
     ContextAwareNormalizerInterface,
     NormalizerAwareInterface
@@ -47,35 +40,13 @@ class PersonDocGenNormalizer implements
 
     private const CIRCULAR_KEY = 'person:circular';
 
-    private PersonRenderInterface $personRender;
-
-    private RelationshipRepository $relationshipRepository;
-
-    private SummaryBudgetInterface $summaryBudget;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        PersonRenderInterface $personRender,
-        RelationshipRepository $relationshipRepository,
-        TranslatorInterface $translator,
-        TranslatableStringHelper $translatableStringHelper,
-        SummaryBudgetInterface $summaryBudget
-    ) {
-        $this->personRender = $personRender;
-        $this->relationshipRepository = $relationshipRepository;
-        $this->translator = $translator;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->summaryBudget = $summaryBudget;
-    }
+    public function __construct(private readonly PersonRenderInterface $personRender, private readonly RelationshipRepository $relationshipRepository, private readonly TranslatorInterface $translator, private readonly TranslatableStringHelper $translatableStringHelper, private readonly SummaryBudgetInterface $summaryBudget) {}
 
     public function normalize($person, $format = null, array $context = [])
     {
         try {
             $context = $this->addCircularToContext($person, $context);
-        } catch (CircularReferenceException $circularReferenceException) {
+        } catch (CircularReferenceException) {
             return [
                 'isNull' => true,
                 'isCircular' => true,
@@ -85,7 +56,7 @@ class PersonDocGenNormalizer implements
 
         /** @var Person $person */
         $dateContext = $context;
-        $dateContext['docgen:expects'] = DateTimeInterface::class;
+        $dateContext['docgen:expects'] = \DateTimeInterface::class;
         $addressContext = array_merge($context, ['docgen:expects' => Address::class]);
         $phonenumberContext = array_merge($context, ['docgen:expects' => PhoneNumber::class]);
         $centerContext = array_merge($context, ['docgen:expects' => Center::class]);
@@ -94,9 +65,7 @@ class PersonDocGenNormalizer implements
             // we simplify the list of attributes for the embedded persons
             AbstractNormalizer::GROUPS => ['docgen:read'],
             // when a person reference the same person... take care of circular references
-            AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => function ($object, $format, $context) {
-                return $this->normalizer->normalize(null, $format, $context);
-            },
+            AbstractNormalizer::CIRCULAR_REFERENCE_HANDLER => fn ($object, $format, $context) => $this->normalizer->normalize(null, $format, $context),
         ]);
 
         if (null === $person) {
@@ -114,12 +83,10 @@ class PersonDocGenNormalizer implements
             'civility' => $this->normalizer->normalize($person->getCivility(), $format, array_merge($context, ['docgen:expects' => Civility::class])),
             'firstName' => $person->getFirstName(),
             'lastName' => $person->getLastName(),
-            'altNames' => implode(
+            'altNames' => \implode(
                 ', ',
-                array_map(
-                    static function (PersonAltName $altName) {
-                        return $altName->getLabel();
-                    },
+                \array_map(
+                    static fn (PersonAltName $altName) => $altName->getLabel(),
                     $person->getAltNames()->toArray()
                 )
             ),
@@ -203,7 +170,7 @@ class PersonDocGenNormalizer implements
             $key = spl_object_hash($person);
         }
 
-        if (!array_key_exists(self::CIRCULAR_KEY, $context)) {
+        if (!\array_key_exists(self::CIRCULAR_KEY, $context)) {
             $context[self::CIRCULAR_KEY] = [$key];
 
             return $context;
@@ -230,11 +197,11 @@ class PersonDocGenNormalizer implements
     {
         $groups = $context[AbstractNormalizer::GROUPS] ?? [];
 
-        if (is_string($groups)) {
+        if (\is_string($groups)) {
             $groups = [$groups];
         }
 
-        return in_array($group, $groups, true);
+        return \in_array($group, $groups, true);
     }
 
     private function normalizeNullValue(string $format, array $context)
@@ -245,10 +212,10 @@ class PersonDocGenNormalizer implements
             'id', 'firstName', 'lastName', 'age', 'altNames', 'text',
             'center' => Center::class,
             'civility' => Civility::class,
-            'birthdate' => DateTimeInterface::class,
-            'deathdate' => DateTimeInterface::class,
+            'birthdate' => \DateTimeInterface::class,
+            'deathdate' => \DateTimeInterface::class,
             'gender', 'maritalStatus',
-            'maritalStatusDate' => DateTimeInterface::class,
+            'maritalStatusDate' => \DateTimeInterface::class,
             'maritalStatusComment',
             'email', 'firstPhoneNumber', 'fixPhoneNumber', 'mobilePhoneNumber', 'nationality',
             'placeOfBirth', 'memo', 'numberOfChildren',
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index a94ae3af9..eae33f399 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -20,8 +20,6 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
-use DateTime;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\Collection;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
@@ -31,10 +29,6 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function is_string;
 
 /**
  * Serialize a Person entity.
@@ -47,41 +41,26 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
     use ObjectToPopulateTrait;
 
-    private CenterResolverManagerInterface $centerResolverManager;
-
-    private PhoneNumberHelperInterface $phoneNumberHelper;
-
-    private ChillEntityRenderExtension $render;
-
-    private PersonRepository $repository;
-
-    private ResidentialAddressRepository $residentialAddressRepository;
-
     public function __construct(
-        ChillEntityRenderExtension $render, /* TODO: replace by PersonRenderInterface, as sthis is the only one required */
-        PersonRepository $repository,
-        CenterResolverManagerInterface $centerResolverManager,
-        ResidentialAddressRepository $residentialAddressRepository,
-        PhoneNumberHelperInterface $phoneNumberHelper /* TODO maybe not necessayr any more */
-    ) {
-        $this->render = $render;
-        $this->repository = $repository;
-        $this->centerResolverManager = $centerResolverManager;
-        $this->residentialAddressRepository = $residentialAddressRepository;
-        $this->phoneNumberHelper = $phoneNumberHelper;
-    }
+        private readonly ChillEntityRenderExtension $render,
+        /* TODO: replace by PersonRenderInterface, as sthis is the only one required */
+        private readonly PersonRepository $repository,
+        private readonly CenterResolverManagerInterface $centerResolverManager,
+        private readonly ResidentialAddressRepository $residentialAddressRepository,
+        private readonly PhoneNumberHelperInterface $phoneNumberHelper
+    ) {}
 
     public function denormalize($data, $type, $format = null, array $context = [])
     {
         $person = $this->extractObjectToPopulate($type, $context);
 
-        if (array_key_exists('id', $data) && null === $person) {
+        if (\array_key_exists('id', $data) && null === $person) {
             $person = $this->repository->find($data['id']);
 
             if (null === $person) {
-                throw new UnexpectedValueException("The person with id \"{$data['id']}\" does " .
-                    'not exists');
+                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;
@@ -107,7 +86,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
         $fields = array_filter(
             $fields,
-            static fn (string $field): bool => array_key_exists($field, $data)
+            static fn (string $field): bool => \array_key_exists($field, $data)
         );
 
         foreach ($fields as $item) {
@@ -138,14 +117,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
                     break;
 
                 case 'birthdate':
-                    $object = $this->denormalizer->denormalize($data[$item], DateTime::class, $format, $context);
+                    $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);
+                    $object = $this->denormalizer->denormalize($data[$item], \DateTimeImmutable::class, $format, $context);
 
                     $person->setDeathdate($object);
 
@@ -193,14 +172,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
     }
 
     /**
-     * @param Person $person
+     * @param Person      $person
      * @param string|null $format
      */
     public function normalize($person, $format = null, array $context = [])
     {
         $groups = $context[AbstractNormalizer::GROUPS] ?? [];
 
-        if (is_string($groups)) {
+        if (\is_string($groups)) {
             $groups = [$groups];
         }
         $household = $person->getCurrentHousehold();
@@ -224,18 +203,13 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'civility' => $this->normalizer->normalize($person->getCivility(), $format, $context),
         ];
 
-        if (in_array('minimal', $groups, true) && 1 === count($groups)) {
+        if (\in_array('minimal', $groups, true) && 1 === \count($groups)) {
             return $data;
         }
 
-        return array_merge($data, [
-            'centers' => $this->normalizer->normalize($this->centerResolverManager->resolveCenters($person), $format, $context),
-            'altNames' => $this->normalizeAltNames($person->getAltNames()),
-            'current_household_id' => $household ? $this->normalizer->normalize($household->getId(), $format, $context) : null,
-            'current_residential_addresses' => $currentResidentialAddresses ?
-                $this->normalizer->normalize($currentResidentialAddresses, $format, $context) :
-                null,
-        ]);
+        return [...$data, 'centers' => $this->normalizer->normalize($this->centerResolverManager->resolveCenters($person), $format, $context), 'altNames' => $this->normalizeAltNames($person->getAltNames()), 'current_household_id' => $household ? $this->normalizer->normalize($household->getId(), $format, $context) : null, 'current_residential_addresses' => $currentResidentialAddresses ?
+            $this->normalizer->normalize($currentResidentialAddresses, $format, $context) :
+            null];
     }
 
     public function supportsDenormalization($data, $type, $format = null)
@@ -257,12 +231,10 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
     {
         return $altNames
             ->map(
-                static function (PersonAltName $personAltName): array {
-                    return [
-                        'key' => $personAltName->getKey(),
-                        'label' => $personAltName->getLabel(),
-                    ];
-                }
+                static fn (PersonAltName $personAltName): array => [
+                    'key' => $personAltName->getKey(),
+                    'label' => $personAltName->getLabel(),
+                ]
             )
             ->toArray();
     }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizerInterface.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizerInterface.php
index 96f9ea934..36ec86966 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizerInterface.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizerInterface.php
@@ -19,6 +19,4 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  */
 interface PersonJsonNormalizerInterface extends
     DenormalizerInterface,
-    NormalizerInterface
-{
-}
+    NormalizerInterface {}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
index 0e4633580..402f5ff03 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
@@ -22,16 +22,11 @@ class RelationshipDocGenNormalizer implements ContextAwareNormalizerInterface, N
 {
     use NormalizerAwareTrait;
 
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     /**
      * @param Relationship $relation
-     * @param string|null $format
+     * @param string|null  $format
      */
     public function normalize($relation, $format = null, array $context = [])
     {
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
index c7d214b04..78a91bd9c 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
@@ -21,12 +21,7 @@ class SocialActionNormalizer implements NormalizerAwareInterface, NormalizerInte
 {
     use NormalizerAwareTrait;
 
-    private SocialActionRender $render;
-
-    public function __construct(SocialActionRender $render)
-    {
-        $this->render = $render;
-    }
+    public function __construct(private readonly SocialActionRender $render) {}
 
     public function normalize($socialAction, $format = null, array $context = [])
     {
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
index 3f2e46b3f..a2f69624d 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
@@ -21,25 +21,18 @@ class SocialIssueNormalizer implements ContextAwareNormalizerInterface, Normaliz
 {
     use NormalizerAwareTrait;
 
-    private SocialIssueRender $render;
-
-    public function __construct(SocialIssueRender $render)
-    {
-        $this->render = $render;
-    }
+    public function __construct(private readonly SocialIssueRender $render) {}
 
     public function normalize($socialIssue, $format = null, array $context = [])
     {
-        /** @var SocialIssue $socialIssue */
+        /* @var SocialIssue $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();
-                    }),
+                    'children_ids' => $socialIssue->getChildren()->map(static fn (SocialIssue $si) => $si->getId()),
                     'title' => $socialIssue->getTitle(),
                     'text' => $this->render->renderString($socialIssue, []),
                 ];
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
index 14b50403a..41666e576 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
-use ArrayObject;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
@@ -19,7 +18,6 @@ use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Workflow\Registry;
-use function array_key_exists;
 
 class WorkflowNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
@@ -27,24 +25,16 @@ class WorkflowNormalizer implements ContextAwareNormalizerInterface, NormalizerA
 
     private const IGNORE_ENTITY_WORKFLOW = 'ignore:entity_workflow';
 
-    private MetadataExtractor $metadataExtractor;
-
-    private Registry $registry;
-
-    public function __construct(Registry $registry, MetadataExtractor $metadataExtractor)
-    {
-        $this->registry = $registry;
-        $this->metadataExtractor = $metadataExtractor;
-    }
+    public function __construct(private readonly Registry $registry, private readonly MetadataExtractor $metadataExtractor) {}
 
     /**
      * @param EntityWorkflow $object
      *
-     * @throws ExceptionInterface
+     * @return array|\ArrayObject|bool|float|int|string|void|null
      *
-     * @return array|ArrayObject|bool|float|int|string|void|null
+     * @throws ExceptionInterface
      */
-    public function normalize($object, ?string $format = null, array $context = []): array
+    public function normalize($object, string $format = null, array $context = []): array
     {
         $data = $this->normalizer->normalize($object, $format, array_merge(
             $context,
@@ -61,10 +51,10 @@ class WorkflowNormalizer implements ContextAwareNormalizerInterface, NormalizerA
         return $data;
     }
 
-    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
         return 'json' === $format
             && $data instanceof EntityWorkflow
-            && !array_key_exists(self::IGNORE_ENTITY_WORKFLOW, $context);
+            && !\array_key_exists(self::IGNORE_ENTITY_WORKFLOW, $context);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php
index 2a608e4c1..44d2e38d5 100644
--- a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php
+++ b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php
@@ -14,72 +14,62 @@ namespace Chill\PersonBundle\Service\AccompanyingPeriod;
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use DateInterval;
-use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 
 class OldDraftAccompanyingPeriodRemover implements OldDraftAccompanyingPeriodRemoverInterface
 {
-    private EntityManagerInterface $em;
+    public function __construct(private readonly EntityManagerInterface $em, private readonly LoggerInterface $logger) {}
 
-    private LoggerInterface $logger;
-
-    public function __construct(EntityManagerInterface $em, LoggerInterface $logger)
+    public function remove(\DateInterval $interval): void
     {
-        $this->em = $em;
-        $this->logger = $logger;
-    }
-
-    public function remove(DateInterval $interval): void
-    {
-        $this->logger->debug('[' . __CLASS__ . '] start to remove old periods', [
+        $this->logger->debug('['.self::class.'] start to remove old periods', [
             'interval' => $interval->format('%d days'),
         ]);
 
-        $beforeDate = (new DateTimeImmutable('now'))->sub($interval);
+        $beforeDate = (new \DateTimeImmutable('now'))->sub($interval);
 
         $results = $this->em->wrapInTransaction(static function (EntityManagerInterface $em) use ($beforeDate) {
-            $subDQL = 'SELECT p FROM ' . AccompanyingPeriod::class . ' p WHERE p.createdAt < :beforeDate AND p.step = :draft';
+            $subDQL = 'SELECT p FROM '.AccompanyingPeriod::class.' p WHERE p.createdAt < :beforeDate AND p.step = :draft';
             $parameters = [
                 'beforeDate' => $beforeDate,
                 'draft' => AccompanyingPeriod::STEP_DRAFT,
             ];
 
             $resources = $em->createQuery(
-                'DELETE ' . AccompanyingPeriod\Resource::class . " r  WHERE r.accompanyingPeriod IN ({$subDQL})"
+                'DELETE '.AccompanyingPeriod\Resource::class." r  WHERE r.accompanyingPeriod IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $participations = $em->createQuery(
-                'DELETE ' . AccompanyingPeriodParticipation::class . " part WHERE part.accompanyingPeriod IN ({$subDQL})"
+                'DELETE '.AccompanyingPeriodParticipation::class." part WHERE part.accompanyingPeriod IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $userHistory = $em->createQuery(
-                'DELETE ' . AccompanyingPeriod\UserHistory::class . " h WHERE h.accompanyingPeriod IN ({$subDQL})"
+                'DELETE '.AccompanyingPeriod\UserHistory::class." h WHERE h.accompanyingPeriod IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $comments = $em->createQuery(
-                'DELETE ' . AccompanyingPeriod\Comment::class . " c WHERE c.accompanyingPeriod IN ({$subDQL})"
+                'DELETE '.AccompanyingPeriod\Comment::class." c WHERE c.accompanyingPeriod IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $documents = $em->createQuery(
-                'DELETE ' . AccompanyingCourseDocument::class . " d WHERE d.course IN ({$subDQL})"
+                'DELETE '.AccompanyingCourseDocument::class." d WHERE d.course IN ({$subDQL})"
             )
                 ->setParameters($parameters)
                 ->getSingleScalarResult();
 
             $periods = $em
                 ->createQuery(
-                    'DELETE ' . AccompanyingPeriod::class . ' p WHERE p.createdAt < :beforeDate
+                    'DELETE '.AccompanyingPeriod::class.' p WHERE p.createdAt < :beforeDate
                     AND p.step = :draft'
                 )
                 ->setParameter(':beforeDate', $beforeDate, Types::DATETIME_IMMUTABLE)
@@ -96,7 +86,7 @@ class OldDraftAccompanyingPeriodRemover implements OldDraftAccompanyingPeriodRem
             ];
         });
 
-        $this->logger->info('[' . __CLASS__ . '] periods removed', array_merge($results, [
+        $this->logger->info('['.self::class.'] periods removed', array_merge($results, [
             'interval' => $interval->format('%d days'),
         ]));
     }
diff --git a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php
index 550128703..ef9833b3a 100644
--- a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php
@@ -11,9 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\AccompanyingPeriod;
 
-use DateInterval;
-
 interface OldDraftAccompanyingPeriodRemoverInterface
 {
-    public function remove(DateInterval $interval): void;
+    public function remove(\DateInterval $interval): void;
 }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index 4a08eff08..b01e7c5f3 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -22,11 +22,14 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use DateTime;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
@@ -37,54 +40,31 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-
 /**
+ * @see AccompanyingPeriodContextTest
+ *
  * @template-implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriod>
  */
 class AccompanyingPeriodContext implements
     DocGeneratorContextWithAdminFormInterface,
     DocGeneratorContextWithPublicFormInterface
 {
-    private BaseContextData $baseContextData;
-
-    private DocumentCategoryRepository $documentCategoryRepository;
-
-    private EntityManagerInterface $em;
-
-    private NormalizerInterface $normalizer;
-
-    private PersonRenderInterface $personRender;
-
-    private PersonRepository $personRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
     public function __construct(
-        DocumentCategoryRepository $documentCategoryRepository,
-        NormalizerInterface $normalizer,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        EntityManagerInterface $em,
-        PersonRenderInterface $personRender,
-        PersonRepository $personRepository,
-        TranslatorInterface $translator,
-        BaseContextData $baseContextData
-    ) {
-        $this->documentCategoryRepository = $documentCategoryRepository;
-        $this->normalizer = $normalizer;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->em = $em;
-        $this->personRender = $personRender;
-        $this->personRepository = $personRepository;
-        $this->translator = $translator;
-        $this->baseContextData = $baseContextData;
-    }
+        private readonly DocumentCategoryRepository $documentCategoryRepository,
+        private readonly NormalizerInterface $normalizer,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly EntityManagerInterface $em,
+        private readonly PersonRenderInterface $personRender,
+        private readonly PersonRepository $personRepository,
+        private readonly TranslatorInterface $translator,
+        private readonly BaseContextData $baseContextData,
+        private readonly ThirdPartyRender $thirdPartyRender,
+        private readonly ThirdPartyRepository $thirdPartyRepository
+    ) {}
 
     public function adminFormReverseTransform(array $data): array
     {
-        if (array_key_exists('category', $data)) {
+        if (\array_key_exists('category', $data)) {
             $data['category'] = [
                 'idInsideBundle' => $data['category']->getIdInsideBundle(),
                 'bundleId' => $data['category']->getBundleId(),
@@ -103,11 +83,12 @@ class AccompanyingPeriodContext implements
             'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
             'person2' => $data['person2'] ?? false,
             'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
+            'thirdParty' => $data['thirdParty'] ?? false,
+            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('Third party'),
         ];
 
-        if (array_key_exists('category', $data)) {
-            $r['category'] = array_key_exists('category', $data) ?
-                $this->documentCategoryRepository->find($data['category']) : null;
+        if (\array_key_exists('category', $data)) {
+            $r['category'] = $this->documentCategoryRepository->find($data['category']);
         }
 
         return $r;
@@ -140,17 +121,21 @@ class AccompanyingPeriodContext implements
                 'label' => 'person 2 label',
                 'required' => true,
             ])
+            ->add('thirdParty', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for thirdParty',
+            ])
+            ->add('thirdPartyLabel', TextType::class, [
+                'label' => 'docgen.thirdParty label',
+                'required' => true,
+            ])
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
-                '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()) : '';
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('c')
+                    ->where('c.documentClass = :docClass')
+                    ->setParameter('docClass', AccompanyingCourseDocument::class),
+                'choice_label' => fn ($entity = null) => $entity ? $this->translatableStringHelper->localize($entity->getName()) : '',
             ]);
     }
 
@@ -160,9 +145,7 @@ class AccompanyingPeriodContext implements
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, mixed $entity): void
     {
         $options = $template->getOptions();
-        $persons = new ArrayCollection($entity->getCurrentParticipations()->map(static function (AccompanyingPeriodParticipation $p) {
-            return $p->getPerson();
-        })->toArray());
+        $persons = new ArrayCollection($entity->getCurrentParticipations()->map(static fn (AccompanyingPeriodParticipation $p) => $p->getPerson())->toArray());
 
         foreach ($entity->getCurrentParticipations() as $p) {
             foreach ($p->getPerson()->getResources() as $r) {
@@ -187,17 +170,37 @@ class AccompanyingPeriodContext implements
                 $builder->add($key, EntityType::class, [
                     'class' => Person::class,
                     'choices' => $persons,
-                    'choice_label' => function (Person $p) {
-                        return $this->personRender->renderString($p, ['addAge' => true]);
-                    },
+                    'choice_label' => fn (Person $p) => $this->personRender->renderString($p, ['addAge' => true]),
                     'multiple' => false,
                     'expanded' => true,
                     'required' => false,
-                    'label' => $options[$key . 'Label'],
+                    'label' => $options[$key.'Label'],
                     'placeholder' => $this->translator->trans('Any person selected'),
                 ]);
             }
         }
+
+        $thirdParties = [...array_values(array_filter([$entity->getRequestorThirdParty()])), ...array_values(array_filter(
+            array_map(
+                fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                $entity->getResources()->filter(
+                    static fn (Resource $r): bool => null !== $r->getThirdParty()
+                )->toArray()
+            )
+        ))];
+
+        if ($options['thirdParty'] ?? false) {
+            $builder->add('thirdParty', EntityType::class, [
+                'class' => ThirdParty::class,
+                'choices' => $thirdParties,
+                'choice_label' => fn (ThirdParty $p) => $this->thirdPartyRender->renderString($p, []),
+                'multiple' => false,
+                'required' => false,
+                'expanded' => true,
+                'label' => $options['thirdPartyLabel'],
+                'placeholder' => $this->translator->trans('Any third party selected'),
+            ]);
+        }
     }
 
     public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
@@ -223,6 +226,13 @@ class AccompanyingPeriodContext implements
             }
         }
 
+        if ($options['thirdParty']) {
+            $data['thirdParty'] = $this->normalizer->normalize($contextGenerationData['thirdParty'], 'docgen', [
+                'docgen:expects' => ThirdParty::class,
+                'groups' => 'docgen:read',
+            ]);
+        }
+
         return $data;
     }
 
@@ -262,7 +272,7 @@ class AccompanyingPeriodContext implements
     {
         $options = $template->getOptions();
 
-        return $options['mainPerson'] || $options['person1'] || $options['person2'];
+        return $options['mainPerson'] || $options['person1'] || $options['person2'] || $options['thirdParty'];
     }
 
     public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
@@ -272,6 +282,8 @@ class AccompanyingPeriodContext implements
             $normalized[$k] = null !== ($data[$k] ?? null) ? $data[$k]->getId() : null;
         }
 
+        $normalized['thirdParty'] = ($data['thirdParty'] ?? null)?->getId();
+
         return $normalized;
     }
 
@@ -287,6 +299,12 @@ class AccompanyingPeriodContext implements
             }
         }
 
+        if (null !== ($id = ($data['thirdParty'] ?? null))) {
+            $denormalized['thirdParty'] = $this->thirdPartyRepository->find($id);
+        } else {
+            $denormalized['thirdParty'] = null;
+        }
+
         return $denormalized;
     }
 
@@ -295,12 +313,12 @@ class AccompanyingPeriodContext implements
         $doc = new AccompanyingCourseDocument();
         $doc->setTemplate($template)
             ->setTitle($this->translatableStringHelper->localize($template->getName()))
-            ->setDate(new DateTime())
+            ->setDate(new \DateTime())
             ->setDescription($this->translatableStringHelper->localize($template->getName()))
             ->setCourse($entity)
             ->setObject($storedObject);
 
-        if (array_key_exists('category', $template->getOptions())) {
+        if (\array_key_exists('category', $template->getOptions())) {
             $doc
                 ->setCategory(
                     $this->documentCategoryRepository->find(
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
index ad1952596..4c1be8159 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
@@ -20,26 +20,16 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
- * Generate a context for an @link{AccompanyingPeriodWork}.
+ * Generate a context for an @see{AccompanyingPeriodWork}.
  *
  * Although there isn't any document associated to AccompanyingPeriodWork, this context
- * is use by @link{AccompanyingPeriodWorkEvaluationContext}.
+ * is use by @see{AccompanyingPeriodWorkEvaluationContext}.
  *
  * @implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriodWork>
  */
 class AccompanyingPeriodWorkContext implements DocGeneratorContextWithPublicFormInterface
 {
-    private NormalizerInterface $normalizer;
-
-    private AccompanyingPeriodContext $periodContext;
-
-    public function __construct(
-        AccompanyingPeriodContext $periodContext,
-        NormalizerInterface $normalizer
-    ) {
-        $this->periodContext = $periodContext;
-        $this->normalizer = $normalizer;
-    }
+    public function __construct(private readonly AccompanyingPeriodContext $periodContext, private readonly NormalizerInterface $normalizer) {}
 
     public function adminFormReverseTransform(array $data): array
     {
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index 4718b7b00..6ecaa99b4 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -18,13 +18,17 @@ 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\AccompanyingPeriod\Resource;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 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;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriodWorkEvaluation>
@@ -33,29 +37,7 @@ 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 __construct(private readonly AccompanyingPeriodWorkContext $accompanyingPeriodWorkContext, private readonly EntityManagerInterface $em, private readonly EvaluationRepository $evaluationRepository, private readonly NormalizerInterface $normalizer, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly ThirdPartyRender $thirdPartyRender, private readonly TranslatorInterface $translator) {}
 
     public function adminFormReverseTransform(array $data): array
     {
@@ -63,9 +45,7 @@ class AccompanyingPeriodWorkEvaluationContext implements
             $this->accompanyingPeriodWorkContext->adminFormReverseTransform($data),
             [
                 'evaluations' => array_map(
-                    static function (Evaluation $e) {
-                        return $e->getId();
-                    },
+                    static fn (Evaluation $e) => $e->getId(),
                     $data['evaluations']
                 ),
             ]
@@ -78,9 +58,7 @@ class AccompanyingPeriodWorkEvaluationContext implements
             $this->accompanyingPeriodWorkContext->adminFormTransform($data),
             [
                 'evaluations' => array_map(
-                    function ($id) {
-                        return $this->evaluationRepository->find($id);
-                    },
+                    fn ($id) => $this->evaluationRepository->find($id),
                     $data['evaluations'] ?? []
                 ),
             ]
@@ -97,9 +75,7 @@ class AccompanyingPeriodWorkEvaluationContext implements
             'class' => Evaluation::class,
             'label' => 'Linked evaluations',
             'choices' => $this->evaluationRepository->findAll(),
-            'choice_label' => function (Evaluation $e) {
-                return $this->translatableStringHelper->localize($e->getTitle());
-            },
+            'choice_label' => fn (Evaluation $e) => $this->translatableStringHelper->localize($e->getTitle()),
             'multiple' => true,
             'attr' => ['class' => 'select2'],
         ]);
@@ -108,6 +84,31 @@ class AccompanyingPeriodWorkEvaluationContext implements
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
     {
         $this->accompanyingPeriodWorkContext->buildPublicForm($builder, $template, $entity->getAccompanyingPeriodWork());
+
+        $thirdParties = [...array_values(array_filter($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray())), ...array_values(array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()])), ...array_values(
+            array_filter(
+                array_map(
+                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                    $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
+                        static fn (Resource $r): bool => null !== $r->getThirdParty()
+                    )->toArray()
+                )
+            )
+        )];
+
+        $options = $template->getOptions();
+        if ($options['thirdParty'] ?? false) {
+            $builder->add('thirdParty', EntityType::class, [
+                'class' => ThirdParty::class,
+                'choices' => $thirdParties,
+                'choice_label' => fn (ThirdParty $p) => $this->thirdPartyRender->renderString($p, []),
+                'multiple' => false,
+                'required' => false,
+                'expanded' => true,
+                'label' => $options['thirdPartyLabel'],
+                'placeholder' => $this->translator->trans('Any third party selected'),
+            ]);
+        }
     }
 
     public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index c7c7d2352..bf4b7da0d 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\DocGenerator;
 
-use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\DocStoreBundle\Entity\DocumentCategory;
@@ -26,76 +25,54 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Repository\PersonRepository;
-use DateTime;
+use Chill\PersonBundle\Entity\Person\ResidentialAddress;
+use Chill\PersonBundle\Repository\ResidentialAddressRepository;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use LogicException;
+use Service\DocGenerator\PersonContextTest;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_key_exists;
-use function count;
 
+/**
+ * @see PersonContextTest
+ */
 final class PersonContext implements PersonContextInterface
 {
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    private BaseContextData $baseContextData;
-
-    private CenterResolverManagerInterface $centerResolverManager;
-
-    private DocumentCategoryRepository $documentCategoryRepository;
-
-    private EntityManagerInterface $em;
-
-    private NormalizerInterface $normalizer;
-
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private Security $security;
-
-    private bool $showScopes;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
+    private readonly bool $showScopes;
 
     public function __construct(
-        AuthorizationHelperInterface $authorizationHelper,
-        BaseContextData $baseContextData,
-        CenterResolverManagerInterface $centerResolverManager,
-        DocumentCategoryRepository $documentCategoryRepository,
-        EntityManagerInterface $em,
-        NormalizerInterface $normalizer,
+        private readonly AuthorizationHelperInterface $authorizationHelper,
+        private readonly BaseContextData $baseContextData,
+        private readonly CenterResolverManagerInterface $centerResolverManager,
+        private readonly DocumentCategoryRepository $documentCategoryRepository,
+        private readonly EntityManagerInterface $em,
+        private readonly NormalizerInterface $normalizer,
         ParameterBagInterface $parameterBag,
-        ScopeRepositoryInterface $scopeRepository,
-        Security $security,
-        TranslatorInterface $translator,
-        TranslatableStringHelperInterface $translatableStringHelper
+        private readonly ScopeRepositoryInterface $scopeRepository,
+        private readonly Security $security,
+        private readonly TranslatorInterface $translator,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly ThirdPartyRender $thirdPartyRender,
+        private readonly ThirdPartyRepository $thirdPartyRepository,
+        private readonly ResidentialAddressRepository $residentialAddressRepository
     ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->centerResolverManager = $centerResolverManager;
-        $this->baseContextData = $baseContextData;
-        $this->documentCategoryRepository = $documentCategoryRepository;
-        $this->em = $em;
-        $this->normalizer = $normalizer;
-        $this->scopeRepository = $scopeRepository;
-        $this->security = $security;
         $this->showScopes = $parameterBag->get('chill_main')['acl']['form_show_scopes'];
-        $this->translator = $translator;
-        $this->translatableStringHelper = $translatableStringHelper;
     }
 
     public function adminFormReverseTransform(array $data): array
     {
-        if (array_key_exists('category', $data)) {
+        if (\array_key_exists('category', $data)) {
             $data['category'] = [
                 'idInsideBundle' => $data['category']->getIdInsideBundle(),
                 'bundleId' => $data['category']->getBundleId(),
@@ -110,11 +87,12 @@ final class PersonContext implements PersonContextInterface
         $r = [
             'mainPerson' => $data['mainPerson'] ?? false,
             'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
+            'thirdParty' => $data['thirdParty'] ?? false,
+            'thirdPartyLabel' => $data['thirdPartyLabel'] ?? $this->translator->trans('Third party'),
         ];
 
-        if (array_key_exists('category', $data)) {
-            $r['category'] = array_key_exists('category', $data) ?
-                $this->documentCategoryRepository->find($data['category']) : null;
+        if (\array_key_exists('category', $data)) {
+            $r['category'] = $this->documentCategoryRepository->find($data['category']);
         }
 
         return $r;
@@ -126,14 +104,18 @@ final class PersonContext implements PersonContextInterface
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => DocumentCategory::class,
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.documentClass = :docClass')
-                        ->setParameter('docClass', PersonDocument::class);
-                },
-                'choice_label' => function ($entity = null) {
-                    return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
-                },
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('c')
+                    ->where('c.documentClass = :docClass')
+                    ->setParameter('docClass', PersonDocument::class),
+                'choice_label' => fn ($entity = null) => $entity ? $this->translatableStringHelper->localize($entity->getName()) : '',
+                'required' => true,
+            ])
+            ->add('thirdParty', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for thirdParty',
+            ])
+            ->add('thirdPartyLabel', TextType::class, [
+                'label' => 'docgen.thirdParty label',
                 'required' => true,
             ]);
     }
@@ -143,12 +125,47 @@ final class PersonContext implements PersonContextInterface
      */
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
     {
+        $options = $template->getOptions();
+
         $builder->add('title', TextType::class, [
             'required' => true,
             'label' => 'docgen.Document title',
             'data' => $this->translatableStringHelper->localize($template->getName()),
         ]);
 
+        $thirdParties = [...array_values(
+            array_filter(
+                array_map(
+                    fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
+                    $this
+                        ->residentialAddressRepository
+                        ->findCurrentResidentialAddressByPerson($entity)
+                )
+            )
+        ), ...array_values(
+            array_filter(
+                array_map(
+                    fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
+                    $entity->getResources()->filter(
+                        static fn (PersonResource $r): bool => null !== $r->getThirdParty()
+                    )->toArray()
+                )
+            )
+        )];
+
+        if ($options['thirdParty'] ?? false) {
+            $builder->add('thirdParty', EntityType::class, [
+                'class' => ThirdParty::class,
+                'choices' => $thirdParties,
+                'choice_label' => fn (ThirdParty $p) => $this->thirdPartyRender->renderString($p, []),
+                'multiple' => false,
+                'required' => false,
+                'expanded' => true,
+                'label' => $options['thirdPartyLabel'],
+                'placeholder' => $this->translator->trans('Any third party selected'),
+            ]);
+        }
+
         if ($this->isScopeNecessary($entity)) {
             $builder->add('scope', ScopePickerType::class, [
                 'center' => $this->centerResolverManager->resolveCenters($entity),
@@ -160,10 +177,6 @@ final class PersonContext implements PersonContextInterface
 
     public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
     {
-        if (!$entity instanceof Person) {
-            throw new UnexpectedTypeException($entity, Person::class);
-        }
-
         $data = [];
         $data = array_merge($data, $this->baseContextData->getData($contextGenerationData['creator'] ?? null));
         $data['person'] = $this->normalizer->normalize($entity, 'docgen', [
@@ -174,6 +187,13 @@ final class PersonContext implements PersonContextInterface
             'docgen:person:with-budget' => true,
         ]);
 
+        if ($template->getOptions()['thirdParty']) {
+            $data['thirdParty'] = $this->normalizer->normalize($contextGenerationData['thirdParty'], 'docgen', [
+                'docgen:expects' => ThirdParty::class,
+                'groups' => 'docgen:read',
+            ]);
+        }
+
         return $data;
     }
 
@@ -227,6 +247,7 @@ final class PersonContext implements PersonContextInterface
         return [
             'title' => $data['title'] ?? '',
             'scope_id' => $scope instanceof Scope ? $scope->getId() : null,
+            'thirdParty' => ($data['thirdParty'] ?? null)?->getId(),
         ];
     }
 
@@ -246,6 +267,7 @@ final class PersonContext implements PersonContextInterface
         return [
             'title' => $data['title'] ?? '',
             'scope' => $scope,
+            'thirdParty' => null !== ($id = ($data['thirdParty'] ?? null)) ? $this->thirdPartyRepository->find($id) : null,
         ];
     }
 
@@ -256,12 +278,12 @@ final class PersonContext implements PersonContextInterface
             ->setTitle(
                 $contextGenerationData['title'] ?? $this->translatableStringHelper->localize($template->getName())
             )
-            ->setDate(new DateTime())
+            ->setDate(new \DateTime())
             ->setDescription($this->translatableStringHelper->localize($template->getName()))
             ->setPerson($entity)
             ->setObject($storedObject);
 
-        if (array_key_exists('category', $template->getOptions())) {
+        if (\array_key_exists('category', $template->getOptions())) {
             $doc
                 ->setCategory(
                     $this->documentCategoryRepository->find(
@@ -280,8 +302,8 @@ final class PersonContext implements PersonContextInterface
                 $this->centerResolverManager->resolveCenters($entity)
             );
 
-            if (1 !== count($scopes)) {
-                throw new LogicException('at this step, it should have only one scope');
+            if (1 !== \count($scopes)) {
+                throw new \LogicException('at this step, it should have only one scope');
             }
 
             $doc->setScope($scopes[0]);
@@ -292,10 +314,12 @@ final class PersonContext implements PersonContextInterface
 
     private function isScopeNecessary(Person $person): bool
     {
-        if ($this->showScopes && 1 < $this->authorizationHelper->getReachableScopes(
-            $this->security->getUser(),
-            PersonDocumentVoter::CREATE,
-            $this->centerResolverManager->resolveCenters($person)
+        if ($this->showScopes && 1 < \count(
+            $this->authorizationHelper->getReachableScopes(
+                $this->security->getUser(),
+                PersonDocumentVoter::CREATE,
+                $this->centerResolverManager->resolveCenters($person)
+            )
         )) {
             return true;
         }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
index 6de8c1c50..53e241292 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
@@ -19,7 +19,8 @@ use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * @template-extends  DocGeneratorContextWithPublicFormInterface<Person>
+ * @template-extends DocGeneratorContextWithPublicFormInterface<Person>
+ * @template-extends DocGeneratorContextWithAdminFormInterface<Person>
  */
 interface PersonContextInterface extends DocGeneratorContextWithAdminFormInterface, DocGeneratorContextWithPublicFormInterface
 {
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
index 53f8064a3..7f142fdbf 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextWithThirdParty.php
@@ -27,21 +27,11 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  */
 class PersonContextWithThirdParty implements DocGeneratorContextWithAdminFormInterface, DocGeneratorContextWithPublicFormInterface
 {
-    private NormalizerInterface $normalizer;
-
-    private PersonContextInterface $personContext;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
     public function __construct(
-        PersonContextInterface $personContext,
-        NormalizerInterface $normalizer,
-        ThirdPartyRepository $thirdPartyRepository
-    ) {
-        $this->personContext = $personContext;
-        $this->normalizer = $normalizer;
-        $this->thirdPartyRepository = $thirdPartyRepository;
-    }
+        private readonly PersonContextInterface $personContext,
+        private readonly NormalizerInterface $normalizer,
+        private readonly ThirdPartyRepository $thirdPartyRepository
+    ) {}
 
     public function adminFormReverseTransform(array $data): array
     {
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryBuilder.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryBuilder.php
new file mode 100644
index 000000000..7945f13d6
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryBuilder.php
@@ -0,0 +1,49 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo;
+
+/**
+ * Build a list of different Query parts into a single query.
+ */
+class AccompanyingPeriodInfoQueryBuilder
+{
+    private const BASE_QUERY = <<<'SQL'
+            SELECT
+                {period_id_column} AS accompanyingperiod_id,
+                '{related_entity_column_id}' AS relatedentity,
+                {related_entity_id_column_id} AS relatedentityid,
+                {user_id} AS user_id,
+                {datetime} AS infodate,
+                '{discriminator}' AS discriminator,
+                {metadata} AS metadata
+            FROM {from_statement}
+            {where_statement}
+            SQL;
+
+    public function buildQuery(AccompanyingPeriodInfoUnionQueryPartInterface $query): string
+    {
+        return strtr(
+            self::BASE_QUERY,
+            [
+                '{period_id_column}' => $query->getAccompanyingPeriodIdColumn(),
+                '{related_entity_column_id}' => $query->getRelatedEntityColumn(),
+                '{related_entity_id_column_id}' => $query->getRelatedEntityIdColumn(),
+                '{user_id}' => $query->getUserIdColumn(),
+                '{datetime}' => $query->getDateTimeColumn(),
+                '{discriminator}' => $query->getDiscriminator(),
+                '{metadata}' => $query->getMetadataColumn(),
+                '{from_statement}' => $query->getFromStatement(),
+                '{where_statement}' => '' === $query->getWhereClause() ? '' : 'WHERE '.$query->getWhereClause(),
+            ]
+        );
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodStartQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodStartQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..19272900a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodStartQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,63 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodStartQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'a.id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriod::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'a.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'NULL';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'a.openingDate';
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_start';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return '\'{}\'::jsonb';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period a';
+    }
+
+    public function getWhereClause(): string
+    {
+        return '';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..f0b38b635
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,64 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'w.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriodWork::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'w.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'cpapwr.user_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'w.endDate';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return "'{}'::jsonb";
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_work_end';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period_work w
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON w.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> w.endDate';
+    }
+
+    public function getWhereClause(): string
+    {
+        return 'w.endDate IS NOT NULL';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..a0215957c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,65 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'cpapw.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriodWorkEvaluation::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'e.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'e.createdBy_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'e.createdAt';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return "'{}'::jsonb";
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_work_evaluation_creation';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> e.startDate';
+    }
+
+    public function getWhereClause(): string
+    {
+        return 'e.createdAt IS NOT NULL';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationDocumentUpdateQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationDocumentUpdateQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..cae8c96de
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationDocumentUpdateQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,64 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodWorkEvaluationDocumentUpdateQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'cpapw.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriodWorkEvaluation::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'e.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'e.updatedby_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'e.updatedAt';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return "'{}'::jsonb";
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_work_evaluation_updated_at';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id';
+    }
+
+    public function getWhereClause(): string
+    {
+        return 'e.updatedAt IS NOT NULL';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..ce8dd22f8
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,65 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'cpapw.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriodWorkEvaluation::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'e.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'cpapwr.user_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'e.maxDate';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return "'{}'::jsonb";
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_work_evaluation_start';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> e.maxDate';
+    }
+
+    public function getWhereClause(): string
+    {
+        return 'e.maxDate IS NOT NULL';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..ecf366483
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,65 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'cpapw.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriodWorkEvaluation::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'e.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'cpapwr.user_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'e.startDate';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return "'{}'::jsonb";
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_work_evaluation_start';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> e.startDate';
+    }
+
+    public function getWhereClause(): string
+    {
+        return 'e.startDate IS NOT NULL';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationUpdateQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationUpdateQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..ff29c558d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationUpdateQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,65 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodWorkEvaluationUpdateQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'cpapw.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriodWorkEvaluationDocument::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'doc.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'doc.updatedby_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'doc.updatedAt';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return "'{}'::jsonb";
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_work_evaluation_document_updated_at';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period_work_evaluation_document doc
+            JOIN chill_person_accompanying_period_work_evaluation e ON doc.accompanyingperiodworkevaluation_id = e.id
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id';
+    }
+
+    public function getWhereClause(): string
+    {
+        return 'doc.updatedAt IS NOT NULL';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkNewReferrerQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkNewReferrerQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..2208c2975
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkNewReferrerQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,64 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodWorkNewReferrerQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'w.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriodWork::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'w.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'cpapwr.user_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'cpapwr.startDate';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return "'{}'::jsonb";
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_work_referrer_new';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period_work w
+            JOIN chill_person_accompanying_period_work_referrer cpapwr on w.id = cpapwr.accompanyingperiodwork_id';
+    }
+
+    public function getWhereClause(): string
+    {
+        return '';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkStartQueryPartForAccompanyingPeriodInfo.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkStartQueryPartForAccompanyingPeriodInfo.php
new file mode 100644
index 000000000..c4e6710dc
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkStartQueryPartForAccompanyingPeriodInfo.php
@@ -0,0 +1,64 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodWorkStartQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'w.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriodWork::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'w.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'cpapwr.user_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'w.startDate';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return "'{}'::jsonb";
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_work_start';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period_work w
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr on w.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> w.startDate';
+    }
+
+    public function getWhereClause(): string
+    {
+        return '';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoUnionQueryPartInterface.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoUnionQueryPartInterface.php
new file mode 100644
index 000000000..78cc61edf
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoUnionQueryPartInterface.php
@@ -0,0 +1,36 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo;
+
+interface AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string;
+
+    /**
+     * @return class-string
+     */
+    public function getRelatedEntityColumn(): string;
+
+    public function getRelatedEntityIdColumn(): string;
+
+    public function getUserIdColumn(): string;
+
+    public function getDateTimeColumn(): string;
+
+    public function getDiscriminator(): string;
+
+    public function getMetadataColumn(): string;
+
+    public function getFromStatement(): string;
+
+    public function getWhereClause(): string;
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodViewEntityInfoProvider.php b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodViewEntityInfoProvider.php
new file mode 100644
index 000000000..19059ef47
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodViewEntityInfoProvider.php
@@ -0,0 +1,41 @@
+<?php
+
+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 Chill\PersonBundle\Service\EntityInfo;
+
+use Chill\MainBundle\Service\EntityInfo\ViewEntityInfoProviderInterface;
+
+class AccompanyingPeriodViewEntityInfoProvider implements ViewEntityInfoProviderInterface
+{
+    public function __construct(
+        /**
+         * @var AccompanyingPeriodInfoUnionQueryPartInterface[]
+         */
+        private readonly iterable $unions,
+        private readonly AccompanyingPeriodInfoQueryBuilder $builder,
+    ) {}
+
+    public function getViewQuery(): string
+    {
+        return implode(
+            ' UNION ',
+            array_map(
+                fn (AccompanyingPeriodInfoUnionQueryPartInterface $part) => $this->builder->buildQuery($part),
+                iterator_to_array($this->unions)
+            )
+        );
+    }
+
+    public function getViewName(): string
+    {
+        return 'view_chill_person_accompanying_period_info';
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProvider.php b/src/Bundle/ChillPersonBundle/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProvider.php
new file mode 100644
index 000000000..40e85b368
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProvider.php
@@ -0,0 +1,163 @@
+<?php
+
+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 Chill\PersonBundle\Service\GenericDoc\Providers;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\GenericDoc\FetchQuery;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInterface;
+use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class AccompanyingPeriodWorkEvaluationGenericDocProvider implements GenericDocForAccompanyingPeriodProviderInterface, GenericDocForPersonProviderInterface
+{
+    public const KEY = 'accompanying_period_work_evaluation_document';
+
+    public function __construct(
+        private Security $security,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $accompanyingPeriodWorkMetadata = $this->entityManager->getClassMetadata(AccompanyingPeriod\AccompanyingPeriodWork::class);
+        $query = $this->buildBaseQuery();
+
+        $query->addWhereClause(
+            sprintf('action.%s = ?', $accompanyingPeriodWorkMetadata->getAssociationMapping('accompanyingPeriod')['joinColumns'][0]['name']),
+            [$accompanyingPeriod->getId()],
+            [Types::INTEGER]
+        );
+
+        return $this->addWhereClausesToQuery($query, $startDate, $endDate, $content);
+    }
+
+    public function isAllowedForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool
+    {
+        return $this->security->isGranted(AccompanyingPeriodWorkVoter::SEE, $accompanyingPeriod);
+    }
+
+    private function addWhereClausesToQuery(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    {
+        $classMetadata = $this->entityManager->getClassMetadata(AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument::class);
+        $storedObjectMetadata = $this->entityManager->getClassMetadata(StoredObject::class);
+
+        if (null !== $startDate) {
+            $query->addWhereClause(
+                sprintf('doc_store.%s >= ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$startDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $endDate) {
+            $query->addWhereClause(
+                sprintf('doc_store.%s < ?', $storedObjectMetadata->getColumnName('createdAt')),
+                [$endDate],
+                [Types::DATE_IMMUTABLE]
+            );
+        }
+
+        if (null !== $content) {
+            $query->addWhereClause(
+                sprintf('apwed.%s ilike ?', $classMetadata->getColumnName('title')),
+                ['%'.$content.'%'],
+                [Types::STRING]
+            );
+        }
+
+        return $query;
+    }
+
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    {
+        $storedObjectMetadata = $this->entityManager->getClassMetadata(StoredObject::class);
+        $accompanyingPeriodWorkMetadata = $this->entityManager->getClassMetadata(AccompanyingPeriod\AccompanyingPeriodWork::class);
+        $query = $this->buildBaseQuery();
+
+        // we loop over each accompanying period participation, to check of the user is allowed to see them
+        $or = [];
+        $orParams = [];
+        $orTypes = [];
+        foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
+            if (!$this->security->isGranted(AccompanyingPeriodWorkVoter::SEE, $participation->getAccompanyingPeriod())) {
+                continue;
+            }
+
+            $or[] = sprintf(
+                '(action.%s = ? AND apwed.%s BETWEEN ?::date AND COALESCE(?::date, \'infinity\'::date))',
+                $accompanyingPeriodWorkMetadata->getSingleAssociationJoinColumnName('accompanyingPeriod'),
+                $storedObjectMetadata->getColumnName('createdAt')
+            );
+            $orParams = [...$orParams, $participation->getAccompanyingPeriod()->getId(),
+                \DateTimeImmutable::createFromInterface($participation->getStartDate()),
+                null === $participation->getEndDate() ? null : \DateTimeImmutable::createFromInterface($participation->getEndDate())];
+            $orTypes = [...$orTypes, Types::INTEGER, Types::DATE_IMMUTABLE, Types::DATE_IMMUTABLE];
+        }
+
+        if ([] === $or) {
+            $query->addWhereClause('TRUE = FALSE');
+
+            return $query;
+        }
+
+        $query->addWhereClause(sprintf('(%s)', implode(' OR ', $or)), $orParams, $orTypes);
+
+        return $this->addWhereClausesToQuery($query, $startDate, $endDate, $content);
+    }
+
+    public function isAllowedForPerson(Person $person): bool
+    {
+        // this will be filtered during query
+        return true;
+    }
+
+    private function buildBaseQuery(): FetchQuery
+    {
+        $classMetadata = $this->entityManager->getClassMetadata(AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument::class);
+        $storedObjectMetadata = $this->entityManager->getClassMetadata(StoredObject::class);
+        $evaluationMetadata = $this->entityManager->getClassMetadata(AccompanyingPeriod\AccompanyingPeriodWorkEvaluation::class);
+        $accompanyingPeriodWorkMetadata = $this->entityManager->getClassMetadata(AccompanyingPeriod\AccompanyingPeriodWork::class);
+
+        $query = new FetchQuery(
+            self::KEY,
+            sprintf("jsonb_build_object('id', apwed.%s)", $classMetadata->getColumnName('id')),
+            sprintf('apwed.'.$storedObjectMetadata->getColumnName('createdAt')),
+            $classMetadata->getTableName().' AS apwed'
+        );
+        $query->addJoinClause(sprintf(
+            'JOIN %s doc_store ON doc_store.%s = apwed.%s',
+            $storedObjectMetadata->getSchemaName().'.'.$storedObjectMetadata->getTableName(),
+            $storedObjectMetadata->getColumnName('id'),
+            $classMetadata->getSingleAssociationJoinColumnName('storedObject')
+        ));
+        $query->addJoinClause(sprintf(
+            'JOIN %s evaluation ON apwed.%s = evaluation.%s',
+            $evaluationMetadata->getTableName(),
+            $classMetadata->getAssociationMapping('accompanyingPeriodWorkEvaluation')['joinColumns'][0]['name'],
+            $evaluationMetadata->getColumnName('id')
+        ));
+        $query->addJoinClause(sprintf(
+            'JOIN %s action ON evaluation.%s = action.%s',
+            $accompanyingPeriodWorkMetadata->getTableName(),
+            $evaluationMetadata->getAssociationMapping('accompanyingPeriodWork')['joinColumns'][0]['name'],
+            $accompanyingPeriodWorkMetadata->getColumnName('id')
+        ));
+
+        return $query;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/GenericDoc/Renderer/AccompanyingPeriodWorkEvaluationGenericDocRenderer.php b/src/Bundle/ChillPersonBundle/Service/GenericDoc/Renderer/AccompanyingPeriodWorkEvaluationGenericDocRenderer.php
new file mode 100644
index 000000000..7c6f2264f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/GenericDoc/Renderer/AccompanyingPeriodWorkEvaluationGenericDocRenderer.php
@@ -0,0 +1,42 @@
+<?php
+
+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 Chill\PersonBundle\Service\GenericDoc\Renderer;
+
+use Chill\DocStoreBundle\GenericDoc\GenericDocDTO;
+use Chill\DocStoreBundle\GenericDoc\Twig\GenericDocRendererInterface;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocumentRepository;
+use Chill\PersonBundle\Service\GenericDoc\Providers\AccompanyingPeriodWorkEvaluationGenericDocProvider;
+
+final readonly class AccompanyingPeriodWorkEvaluationGenericDocRenderer implements GenericDocRendererInterface
+{
+    public function __construct(
+        private AccompanyingPeriodWorkEvaluationDocumentRepository $accompanyingPeriodWorkEvaluationDocumentRepository,
+    ) {}
+
+    public function supports(GenericDocDTO $genericDocDTO, $options = []): bool
+    {
+        return AccompanyingPeriodWorkEvaluationGenericDocProvider::KEY === $genericDocDTO->key;
+    }
+
+    public function getTemplate(GenericDocDTO $genericDocDTO, $options = []): string
+    {
+        return '@ChillPerson/GenericDoc/evaluation_document.html.twig';
+    }
+
+    public function getTemplateData(GenericDocDTO $genericDocDTO, $options = []): array
+    {
+        return [
+            'document' => $this->accompanyingPeriodWorkEvaluationDocumentRepository->find($genericDocDTO->identifiers['id']),
+            'context' => $genericDocDTO->getContext(),
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
index 3d7b60254..21406072d 100644
--- a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
@@ -24,42 +24,13 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr\Comparison;
 use Doctrine\Persistence\ObjectRepository;
-use Exception;
 
-use function count;
-
-final class SocialWorkMetadata implements SocialWorkMetadataInterface
+final readonly class SocialWorkMetadata implements SocialWorkMetadataInterface
 {
-    private EntityManagerInterface $entityManager;
-
-    private EvaluationRepository $evaluationRepository;
-
-    private GoalRepository $goalRepository;
-
-    private ResultRepository $resultRepository;
-
-    private SocialActionRepository $socialActionRepository;
-
-    private SocialIssueRepository $socialIssueRepository;
-
-    public function __construct(
-        SocialIssueRepository $socialIssueRepository,
-        SocialActionRepository $socialActionRepository,
-        GoalRepository $goalRepository,
-        ResultRepository $resultRepository,
-        EvaluationRepository $evaluationRepository,
-        EntityManagerInterface $entityManager
-    ) {
-        $this->socialIssueRepository = $socialIssueRepository;
-        $this->socialActionRepository = $socialActionRepository;
-        $this->goalRepository = $goalRepository;
-        $this->resultRepository = $resultRepository;
-        $this->evaluationRepository = $evaluationRepository;
-        $this->entityManager = $entityManager;
-    }
+    public function __construct(private SocialIssueRepository $socialIssueRepository, private SocialActionRepository $socialActionRepository, private GoalRepository $goalRepository, private ResultRepository $resultRepository, private EvaluationRepository $evaluationRepository, private EntityManagerInterface $entityManager) {}
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function import(iterable $dataset): bool
     {
@@ -156,9 +127,9 @@ final class SocialWorkMetadata implements SocialWorkMetadataInterface
     }
 
     /**
-     * @throws Exception
-     *
      * @return object
+     *
+     * @throws \Exception
      */
     private function getOrCreateEntity(ObjectRepository $repository, string $field, array $jsonCriterias = [])
     {
@@ -175,13 +146,11 @@ final class SocialWorkMetadata implements SocialWorkMetadataInterface
             return new $entity();
         }
 
-        if (count($results) === 1) {
+        if (1 === \count($results)) {
             return reset($results);
         }
 
-        throw new Exception(
-            'Unable to create entity.'
-        );
+        throw new \Exception('Unable to create entity.');
     }
 
     private function handleEvaluation(?string $evaluationTitle, SocialAction $socialAction): ?Evaluation
@@ -246,9 +215,9 @@ final class SocialWorkMetadata implements SocialWorkMetadataInterface
     }
 
     /**
-     * @throws Exception
-     *
      * @return array<string, SocialAction|null>
+     *
+     * @throws \Exception
      */
     private function handleSocialAction(
         ?string $socialActionTitle,
@@ -296,9 +265,9 @@ final class SocialWorkMetadata implements SocialWorkMetadataInterface
     }
 
     /**
-     * @throws Exception
-     *
      * @return array<string, SocialIssue|null>
+     *
+     * @throws \Exception
      */
     private function handleSocialIssue(
         ?string $socialIssueTitle,
@@ -352,12 +321,12 @@ final class SocialWorkMetadata implements SocialWorkMetadataInterface
      * Index 5: Result
      * Index 6: Evaluation
      *
-     * @param array<int, ?string> $row
-     * @param array<string, array<string, <|array|null>|SocialIssue|string, SocialAction|null>|Evaluation|Goal|Result> $previousRow
+     * @param array<int, ?string>                                                                                                                      $row
+     * @param array{socialIssues: array<SocialIssue>, socialActions: array<SocialAction>, goal: Goal|null, result: Result|null, eval: Evaluation|null} $previousRow
      *
-     * @throws Exception
+     * @return array{socialIssues: array<SocialIssue>, socialActions: array<SocialAction>, goal: Goal|null, result: Result|null, eval: Evaluation|null}
      *
-     * @return array<string, array<string, <|array|null>|SocialIssue|string, SocialAction|null>|Evaluation|Goal|Result>
+     * @throws \Exception
      */
     private function import1(int $key, array $row, array $previousRow): array
     {
@@ -376,7 +345,7 @@ final class SocialWorkMetadata implements SocialWorkMetadataInterface
         $socialIssue = $socialIssues['socialIssueChild'] ?? $socialIssues['socialIssue'];
 
         if (null === $socialIssue) {
-            throw new Exception(sprintf("no social issue on row {$key}, values: %s", implode(', ', $row)));
+            throw new \Exception(sprintf("no social issue on row {$key}, values: %s", implode(', ', $row)));
         }
 
         $socialActions = $this
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
index f61d22252..f31612606 100644
--- a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
@@ -11,6 +11,4 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\Import;
 
-interface SocialWorkMetadataInterface extends ChillImporter
-{
-}
+interface SocialWorkMetadataInterface extends ChillImporter {}
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
index 0064a53d5..29ed4226a 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
@@ -11,37 +11,32 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Templating\Entity;
 
-use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\MainBundle\Templating\Entity\BoxUtilsChillEntityRenderTrait;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Render closing motive.
  *
  * @implements ChillEntityRenderInterface<ClosingMotive>
  */
-class ClosingMotiveRender implements ChillEntityRenderInterface
+final readonly class ClosingMotiveRender implements ChillEntityRenderInterface
 {
     use BoxUtilsChillEntityRenderTrait;
     private const SEPARATOR = ' > ';
 
-    /**
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private TranslatorInterface $translator
+    ) {}
 
     public function renderBox($entity, array $options): string
     {
         return
-            $this->getDefaultOpeningBox('closing-motive') .
-            $this->renderString($entity, $options) .
+            $this->getDefaultOpeningBox('closing-motive').
+            $this->renderString($entity, $options).
             $this->getDefaultClosingBox();
     }
 
@@ -49,7 +44,7 @@ class ClosingMotiveRender implements ChillEntityRenderInterface
     {
         return $this->renderStringRecursive(
             $entity,
-            '', //$this->translatableStringHelper->localize($entity->getName()),
+            '',
             $options
         );
     }
@@ -59,26 +54,30 @@ class ClosingMotiveRender implements ChillEntityRenderInterface
         return $entity instanceof ClosingMotive;
     }
 
-    private function renderStringRecursive(ClosingMotive $motive, string $existing, array $options)
+    private function renderStringRecursive(ClosingMotive $motive, string $existing, array $options): string
     {
-        $newExisting = $this->translatableStringHelper->localize($motive->getName());
+        $str = $this->translatableStringHelper->localize($motive->getName());
 
         if ($motive->hasParent()) {
             if ('' !== $existing) {
-                $newExisting = $newExisting . self::SEPARATOR . $existing;
+                $str = $str.self::SEPARATOR.$existing;
             }
 
-            return $this->renderStringRecursive(
+            $str = $this->renderStringRecursive(
                 $motive->getParent(),
-                $newExisting,
+                $str,
                 $options
             );
         }
 
         if ('' !== $existing) {
-            return $newExisting . self::SEPARATOR . $existing;
+            $str = $str.self::SEPARATOR.$existing;
         }
 
-        return $newExisting;
+        if ($motive->isLeaf() && $motive->isCanceledAccompanyingPeriod()) {
+            $str = $str.' '.$this->translator->trans('( Canceled period )');
+        }
+
+        return $str;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
index 05d9b3009..a09ad11f5 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
@@ -11,37 +11,19 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Templating\Entity;
 
-use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\MainBundle\Templating\Entity\BoxUtilsChillEntityRenderTrait;
-use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-
 /**
  * Render a Person.
  */
 class PersonRender implements PersonRenderInterface
 {
     use BoxUtilsChillEntityRenderTrait;
-    private ConfigPersonAltNamesHelper $configAltNamesHelper;
 
-    private EngineInterface $engine;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        ConfigPersonAltNamesHelper $configAltNamesHelper,
-        EngineInterface $engine,
-        TranslatorInterface $translator
-    ) {
-        $this->configAltNamesHelper = $configAltNamesHelper;
-        $this->engine = $engine;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly ConfigPersonAltNamesHelper $configAltNamesHelper, private readonly \Twig\Environment $engine, private readonly TranslatorInterface $translator) {}
 
     public function renderBox($person, array $options): string
     {
@@ -63,12 +45,12 @@ class PersonRender implements PersonRenderInterface
         ];
 
         return
-            $this->getDefaultOpeningBox('person') .
+            $this->getDefaultOpeningBox('person').
             $this->engine->render('@ChillPerson/Entity/person.html.twig', [
                 'person' => $person,
                 'render' => $options['render'] ?? 'raw',
                 'options' => $params,
-            ]) .
+            ]).
             $this->getDefaultClosingBox();
     }
 
@@ -76,19 +58,19 @@ class PersonRender implements PersonRenderInterface
     {
         $options = array_merge(['addAge' => true], $options);
 
-        if (null !== $person->getAge() && $person->getDeathDate() === null && $options['addAge']) {
-            return $person->getFirstName() . ' ' . $person->getLastName()
-            . $this->addAltNames($person, false) . ' (' . $this->translator->trans('years_old', ['age' => $person->getAge()]) . ')';
+        if (null !== $person->getAge() && null === $person->getDeathDate() && $options['addAge']) {
+            return $person->getFirstName().' '.$person->getLastName()
+            .$this->addAltNames($person, false).' ('.$this->translator->trans('years_old', ['age' => $person->getAge()]).')';
         }
 
         if (null !== $person->getDeathDate() && $options['addAge']) {
-            return $person->getFirstName() . ' ' . $person->getLastName()
-            . ' (‡)'
-            . $this->addAltNames($person, false);
+            return $person->getFirstName().' '.$person->getLastName()
+            .' (‡)'
+            .$this->addAltNames($person, false);
         }
 
-        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
@@ -106,7 +88,7 @@ class PersonRender implements PersonRenderInterface
 
             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 .= ' (';
                         $isFirst = false;
@@ -115,7 +97,7 @@ class PersonRender implements PersonRenderInterface
                     }
 
                     if ($addSpan) {
-                        $str .= '<span class="altname altname-' . $altName->getKey() . '">';
+                        $str .= '<span class="altname altname-'.$altName->getKey().'">';
                     }
                     $str .= $altName->getLabel();
 
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRenderInterface.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRenderInterface.php
index 2f69d31a9..203281b67 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRenderInterface.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRenderInterface.php
@@ -19,6 +19,4 @@ use Chill\PersonBundle\Entity\Person;
  *
  * @extends ChillEntityRenderInterface<Person>
  */
-interface PersonRenderInterface extends ChillEntityRenderInterface
-{
-}
+interface PersonRenderInterface extends ChillEntityRenderInterface {}
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
index 61c674b76..b9cf28fb7 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
@@ -18,22 +18,17 @@ use Chill\PersonBundle\Entity\Person\PersonResourceKind;
 /**
  * @implements ChillEntityRenderInterface<PersonResourceKind>
  */
-final class ResourceKindRender implements ChillEntityRenderInterface
+final readonly class ResourceKindRender implements ChillEntityRenderInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private TranslatableStringHelper $translatableStringHelper) {}
 
     public function renderBox($entity, array $options): string
     {
         return
-            '<span class="resource">' .
+            '<span class="resource">'.
             $this->translatableStringHelper->localize(
                 $entity->getTitle()
-            ) .
+            ).
             '</span>';
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
index dd8083878..657ed0f53 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
@@ -14,20 +14,16 @@ namespace Chill\PersonBundle\Templating\Entity;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_merge;
-use function array_reverse;
-use function implode;
 
 /**
  * @implements ChillEntityRenderInterface<SocialAction>
  */
 class SocialActionRender implements ChillEntityRenderInterface
 {
-    public const AND_CHILDREN_MENTION = 'show_and_children_mention';
+    final public const AND_CHILDREN_MENTION = 'show_and_children_mention';
 
-    public const DEFAULT_ARGS = [
+    final public const DEFAULT_ARGS = [
         self::SEPARATOR_KEY => ' > ',
         self::NO_BADGE => false,
         self::SHOW_AND_CHILDREN => false,
@@ -37,35 +33,21 @@ class SocialActionRender implements ChillEntityRenderInterface
     /**
      * if true, the action will not be encapsulated into a "badge".
      */
-    public const NO_BADGE = 'no-badge';
+    final public const NO_BADGE = 'no-badge';
 
-    public const SEPARATOR_KEY = 'default.separator';
+    final public const SEPARATOR_KEY = 'default.separator';
 
     /**
      * Show a mention "and children" on each SocialAction, if the social action
      * has at least one child.
      */
-    public const SHOW_AND_CHILDREN = 'show_and_children';
+    final public const SHOW_AND_CHILDREN = 'show_and_children';
 
-    private EngineInterface $engine;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        EngineInterface $engine,
-        TranslatorInterface $translator
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->engine = $engine;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly \Twig\Environment $engine, private readonly TranslatorInterface $translator) {}
 
     public function renderBox($socialAction, array $options): string
     {
-        $options = array_merge(self::DEFAULT_ARGS, $options);
+        $options = \array_merge(self::DEFAULT_ARGS, $options);
         // give some help to twig: an array of parents
         $parents = $this->buildParents($socialAction);
 
@@ -79,7 +61,7 @@ class SocialActionRender implements ChillEntityRenderInterface
     public function renderString($socialAction, array $options): string
     {
         /** @var SocialAction $socialAction */
-        $options = array_merge(self::DEFAULT_ARGS, $options);
+        $options = \array_merge(self::DEFAULT_ARGS, $options);
         $titles = [$this->translatableStringHelper->localize($socialAction->getTitle())];
 
         while ($socialAction->hasParent()) {
@@ -89,12 +71,12 @@ class SocialActionRender implements ChillEntityRenderInterface
             );
         }
 
-        $titles = array_reverse($titles);
+        $titles = \array_reverse($titles);
 
-        $title = implode($options[self::SEPARATOR_KEY], $titles);
+        $title = \implode($options[self::SEPARATOR_KEY], $titles);
 
         if ($options[self::SHOW_AND_CHILDREN] && $socialAction->hasChildren()) {
-            $title .= ' (' . $this->translator->trans($options[self::AND_CHILDREN_MENTION]) . ')';
+            $title .= ' ('.$this->translator->trans($options[self::AND_CHILDREN_MENTION]).')';
         }
 
         return $title;
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
index f3962535b..af8622f67 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
@@ -14,15 +14,12 @@ namespace Chill\PersonBundle\Templating\Entity;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_reverse;
-use function implode;
 
 /**
  * @implements ChillEntityRenderInterface<SocialIssue>
  */
-final class SocialIssueRender implements ChillEntityRenderInterface
+final readonly class SocialIssueRender implements ChillEntityRenderInterface
 {
     public const AND_CHILDREN_MENTION = 'show_and_children_mention';
 
@@ -40,21 +37,7 @@ final class SocialIssueRender implements ChillEntityRenderInterface
      */
     public const SHOW_AND_CHILDREN = 'show_and_children';
 
-    private EngineInterface $engine;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        EngineInterface $engine,
-        TranslatorInterface $translator
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->engine = $engine;
-        $this->translator = $translator;
-    }
+    public function __construct(private TranslatableStringHelper $translatableStringHelper, private \Twig\Environment $engine, private TranslatorInterface $translator) {}
 
     public function renderBox($socialIssue, array $options): string
     {
@@ -89,12 +72,12 @@ final class SocialIssueRender implements ChillEntityRenderInterface
             );
         }
 
-        $titles = array_reverse($titles);
+        $titles = \array_reverse($titles);
 
-        $title = implode($options[self::SEPARATOR_KEY], $titles);
+        $title = \implode($options[self::SEPARATOR_KEY], $titles);
 
         if ($options[self::SHOW_AND_CHILDREN] && $socialIssue->hasChildren()) {
-            $title .= ' (' . $this->translator->trans($options[self::AND_CHILDREN_MENTION]) . ')';
+            $title .= ' ('.$this->translator->trans($options[self::AND_CHILDREN_MENTION]).')';
         }
 
         return $title;
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
index 1d1711ce4..74cf7c83e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
@@ -12,36 +12,42 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\AccompanyingPeriod;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodConfidentialTest extends WebTestCase
 {
-    /**
-     * Setup before the first test of this class (see phpunit doc).
-     */
-    public static function setUpBeforeClass(): void
-    {
-        self::bootKernel();
-    }
+    use PrepareClientTrait;
+
+    private KernelBrowser $client;
 
     /**
      * Setup before each test method (see phpunit doc).
      */
     protected function setUp(): void
     {
-        $this->client = self::createClient([], [
-            'PHP_AUTH_USER' => 'fred',
-            'PHP_AUTH_PW' => 'password',
-        ]);
+        $this->client = $this->getClientAuthenticated();
     }
 
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testConfidentialInvalid()
     {
+        $this->markTestSkipped('test not written fully');
+
         // Disabling this dataprovider to avoid having errors while running the test.
         return yield from [];
         $maxGenerated = 3;
@@ -86,7 +92,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
         }
     }
 
-    public function testConfidentialValid()
+    public function testConfidentialValid(): never
     {
         $this->markTestIncomplete(
             'Marked as incomplete because of a problem in the dataprovider, at line 81.'
@@ -110,7 +116,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'accompanying_period', 'user' => $user])
+            json_encode(['type' => 'accompanying_period', 'user' => $user], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php
index e35766a75..021cab706 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Events/PersonMoveEventSubscriberTest.php
@@ -22,18 +22,15 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
-use DateTime;
-use DateTimeImmutable;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use ReflectionClass;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonMoveEventSubscriberTest extends KernelTestCase
@@ -51,23 +48,23 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $this->forceIdToPeriod($period);
 
         $previousHousehold = (new Household())->addAddress(
-            (new Address())->setValidFrom(new DateTime('1 year ago'))
+            (new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $nextHousehold = (new Household())->addAddress(
-            (new Address())->setValidFrom(new DateTime('tomorrow'))
+            (new Address())->setValidFrom(new \DateTime('tomorrow'))
         );
         $nextMembership = new HouseholdMember();
         $nextMembership
             ->setPerson($person)
             ->setHousehold($nextHousehold)
-            ->setStartDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -93,23 +90,23 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $this->forceIdToPeriod($period);
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $nextHousehold = (new Household())->addAddress(
-            (new Address())->setValidFrom(new DateTime('tomorrow'))
+            (new Address())->setValidFrom(new \DateTime('tomorrow'))
         );
         $nextMembership = new HouseholdMember();
         $nextMembership
             ->setPerson($person)
             ->setHousehold($nextHousehold)
-            ->setStartDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -138,23 +135,23 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $this->forceIdToPeriod($period);
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $nextHousehold = (new Household())->addAddress(
-            (new Address())->setValidFrom(new DateTime('1 month ago'))
+            (new Address())->setValidFrom(new \DateTime('1 month ago'))
         );
         $nextMembership = new HouseholdMember();
         $nextMembership
             ->setPerson($person)
             ->setHousehold($nextHousehold)
-            ->setStartDate(new DateTimeImmutable('1 month ago'));
+            ->setStartDate(new \DateTimeImmutable('1 month ago'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -162,7 +159,7 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
             ->setNextMembership($nextMembership);
 
         $notificationPersister = $this->prophesize(NotificationPersisterInterface::class);
-        $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalled(1);
+        $notificationPersister->persist(Argument::type(Notification::class))->shouldBeCalled();
         $eventSubscriber = $this->buildSubscriber(null, $notificationPersister->reveal(), null, null);
 
         $eventSubscriber->resetPeriodLocation($event);
@@ -183,14 +180,14 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $this->forceIdToPeriod($period);
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -221,14 +218,14 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         $membership
             ->setPerson($person)
             ->setHousehold($household = new Household())
-            ->setStartDate(new DateTimeImmutable('1 year ago'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'));
 
         $previousAddress = new Address();
-        $previousAddress->setValidFrom(new DateTime('6 months ago'));
+        $previousAddress->setValidFrom(new \DateTime('6 months ago'));
         $household->addAddress($previousAddress);
 
         $newAddress = new Address();
-        $newAddress->setValidFrom(new DateTime('tomorrow'));
+        $newAddress->setValidFrom(new \DateTime('tomorrow'));
         $household->addAddress($newAddress);
 
         $event = new PersonAddressMoveEvent($person);
@@ -247,10 +244,10 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
     }
 
     private function buildSubscriber(
-        ?EngineInterface $engine = null,
-        ?NotificationPersisterInterface $notificationPersister = null,
-        ?Security $security = null,
-        ?TranslatorInterface $translator = null
+        \Twig\Environment $engine = null,
+        NotificationPersisterInterface $notificationPersister = null,
+        Security $security = null,
+        TranslatorInterface $translator = null
     ): PersonAddressMoveEventSubscriber {
         if (null === $translator) {
             $double = $this->prophesize(TranslatorInterface::class);
@@ -264,7 +261,8 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
         }
 
         if (null === $engine) {
-            $double = $this->prophesize(EngineInterface::class);
+            $double = $this->prophesize(\Twig\Environment::class);
+            $double->render(Argument::type('string'), Argument::type('array'))->willReturn('dummy string');
             $engine = $double->reveal();
         }
 
@@ -282,7 +280,7 @@ final class PersonMoveEventSubscriberTest extends KernelTestCase
 
     private function forceIdToPeriod(AccompanyingPeriod $period): void
     {
-        $reflectionClass = new ReflectionClass($period);
+        $reflectionClass = new \ReflectionClass($period);
         $property = $reflectionClass->getProperty('id');
         $property->setAccessible(true);
         $property->setValue($period, 0);
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php
new file mode 100644
index 000000000..bdfca0d58
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Lifecycle/AccompanyingPeriodStepChangeCronjobTest.php
@@ -0,0 +1,55 @@
+<?php
+
+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 AccompanyingPeriod\Lifecycle;
+
+use Chill\MainBundle\Entity\CronJobExecution;
+use Chill\PersonBundle\AccompanyingPeriod\Lifecycle\AccompanyingPeriodStepChangeCronjob;
+use Chill\PersonBundle\AccompanyingPeriod\Lifecycle\AccompanyingPeriodStepChangeRequestor;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AccompanyingPeriodStepChangeCronjobTest extends TestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @dataProvider provideRunTimes
+     */
+    public function testCanRun(string $datetime, \DateTimeImmutable $lastExecutionStart, bool $canRun): void
+    {
+        $requestor = $this->prophesize(AccompanyingPeriodStepChangeRequestor::class);
+        $clock = new MockClock($datetime);
+
+        $cronJob = new AccompanyingPeriodStepChangeCronjob($clock, $requestor->reveal());
+        $cronJobExecution = (new CronJobExecution($cronJob->getKey()))->setLastStart($lastExecutionStart);
+
+        $this->assertEquals($canRun, $cronJob->canRun($cronJobExecution));
+    }
+
+    public function provideRunTimes(): iterable
+    {
+        // can run, during the night
+        yield ['2023-01-15T01:00:00+02:00', new \DateTimeImmutable('2023-01-14T00:00:00+02:00'), true];
+
+        // can not run, not during the night
+        yield ['2023-01-15T10:00:00+02:00', new \DateTimeImmutable('2023-01-14T00:00:00+02:00'), false];
+
+        // can not run: not enough elapsed time
+        yield ['2023-01-15T01:00:00+02:00', new \DateTimeImmutable('2023-01-15T00:30:00+02:00'), false];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
index 8ac092647..75e3877bc 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
@@ -17,15 +17,21 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Event\PrePersistEventArgs;
+use Doctrine\ORM\Event\PreUpdateEventArgs;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     public function testPrePersist()
     {
         $socialIssues = new ArrayCollection([
@@ -38,7 +44,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
         $entity = $this->generateClass($period, $socialIssues);
         $consistency = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
 
-        $consistency->prePersist($entity, $this->generateLifecycleArgs());
+        $consistency->prePersist($entity, $this->generateLifecycleArgs($period, Step::PrePersist));
 
         $this->assertCount(2, $period->getSocialIssues());
         $this->assertContains($grandGrandChild, $period->getSocialIssues());
@@ -63,7 +69,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
             $period->addSocialIssue($issue);
         }
 
-        $consistency->prePersistAccompanyingPeriod($period, $this->generateLifecycleArgs());
+        $consistency->prePersistAccompanyingPeriod($period, $this->generateLifecycleArgs($period, Step::PrePersist));
 
         $this->assertCount(1, $period->getSocialIssues());
         $this->assertSame($grandGrandChild, $period->getSocialIssues()->first());
@@ -81,7 +87,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
         $entity = $this->generateClass($period, $socialIssues);
         $consistency = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
 
-        $consistency->preUpdate($entity, $this->generateLifecycleArgs());
+        $consistency->preUpdate($entity, $this->generateLifecycleArgs($period, Step::PreUpdate));
 
         $this->assertCount(2, $period->getSocialIssues());
         $this->assertContains($grandGrandChild, $period->getSocialIssues());
@@ -106,7 +112,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
             $period->addSocialIssue($issue);
         }
 
-        $consistency->prePersistAccompanyingPeriod($period, $this->generateLifecycleArgs());
+        $consistency->prePersistAccompanyingPeriod($period, $this->generateLifecycleArgs($period, Step::PrePersist));
 
         $this->assertCount(1, $period->getSocialIssues());
         $this->assertSame($grandGrandChild, $period->getSocialIssues()->first());
@@ -115,15 +121,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
     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 __construct(public $period, public $socialIssues) {}
 
             public function getAccompanyingPeriod(): AccompanyingPeriod
             {
@@ -144,8 +142,21 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
         };
     }
 
-    protected function generateLifecycleArgs(): LifecycleEventArgs
+    protected function generateLifecycleArgs(AccompanyingPeriod $period, Step $step): PrePersistEventArgs|PreUpdateEventArgs
     {
-        return $this->createMock(LifecycleEventArgs::class);
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+
+        $dummyChanges = [];
+
+        return match ($step) {
+            Step::PrePersist => new PrePersistEventArgs($period, $entityManager->reveal()),
+            Step::PreUpdate => new PreUpdateEventArgs($period, $entityManager->reveal(), $dummyChanges),
+        };
     }
 }
+
+enum Step
+{
+    case PrePersist;
+    case PreUpdate;
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php
index 7dccb81e3..e69de29bb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php
@@ -1,22 +0,0 @@
-<?php
-
-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 AccompanyingPeriod\Workflow;
-
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- * @coversNothing
- */
-final class WorkflowEventSubscriberTest extends KernelTestCase
-{
-}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php b/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php
new file mode 100644
index 000000000..a7acdcc82
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Action/Remove/PersonMoveTest.php
@@ -0,0 +1,282 @@
+<?php
+
+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 Action\Remove;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\PersonBundle\Actions\Remove\PersonMove;
+use Chill\PersonBundle\Actions\Remove\PersonMoveManager;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relation;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
+use Chill\PersonBundle\Repository\Person\PersonCenterHistoryInterface;
+use Doctrine\DBAL\Connection;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonMoveTest extends KernelTestCase
+{
+    private EntityManagerInterface $em;
+
+    private PersonMoveManager $personMoveManager;
+
+    private EventDispatcherInterface $eventDispatcher;
+
+    private CenterRepositoryInterface $centerRepository;
+
+    private PersonCenterHistoryInterface $personCenterHistory;
+
+    /**
+     * @var list<array{0: class-string, 1: int}>
+     */
+    private static array $entitiesToDelete = [];
+
+    public function setUp(): void
+    {
+        self::bootKernel();
+        $this->em = self::$container->get(EntityManagerInterface::class);
+        $this->personMoveManager = self::$container->get(PersonMoveManager::class);
+        $this->eventDispatcher = self::$container->get(EventDispatcherInterface::class);
+        $this->centerRepository = self::$container->get(CenterRepositoryInterface::class);
+        $this->personCenterHistory = self::$container->get(PersonCenterHistoryInterface::class);
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        foreach (self::$entitiesToDelete as [$class, $id]) {
+            $entity = $em->find($class, $id);
+
+            if (null !== $entity) {
+                $em->remove($entity);
+            }
+        }
+
+        $em->flush();
+    }
+
+    /**
+     * @dataProvider dataProviderMovePerson
+     */
+    public function testMovePersonSimple(Person $personA, Person $personB, string $message): void
+    {
+        $move = new PersonMove($this->em, $this->personMoveManager, $this->eventDispatcher);
+        $sqls = $move->getSQL($personA, $personB);
+        $this->em->getConnection()->transactional(function (Connection $conn) use ($sqls) {
+            foreach ($sqls as $sql) {
+                $conn->executeStatement($sql);
+            }
+        });
+
+        $personsByIdOfA = $this->em->createQuery('SELECT p FROM '.Person::class.' p WHERE p.id = :id')
+            ->setParameter('id', $personA->getId())
+            ->getResult();
+        $personB = $this->em->find(Person::class, $personB->getId());
+
+        self::assertCount(0, $personsByIdOfA);
+        self::assertNotNull($personB?->getId(), $message);
+    }
+
+    public function testMovePersonCenterHistory(): void
+    {
+        $personA = new Person();
+        $personB = new Person();
+        [$centerA, $centerB] = $this->centerRepository->findAll();
+
+        $this->em->persist($personA);
+        $this->em->persist($personB);
+
+        $personCenterHistoryAFirst = (new Person\PersonCenterHistory())->setCenter($centerA)
+            ->setStartDate(new \DateTimeImmutable('2023-01-01'))
+            ->setEndDate(new \DateTimeImmutable('2023-06-30'));
+        $personCenterHistoryASecond = (new Person\PersonCenterHistory())->setCenter($centerB)
+            ->setStartDate(new \DateTimeImmutable('2023-06-30'))
+            ->setEndDate(new \DateTimeImmutable('2023-09-30'));
+        $personCenterHistoryBFirst = (new Person\PersonCenterHistory())->setCenter($centerA)
+            ->setStartDate(new \DateTimeImmutable('2023-03-01'))
+            ->setEndDate(new \DateTimeImmutable('2023-07-15'));
+        $personCenterHistoryBSecond = (new Person\PersonCenterHistory())->setCenter($centerB)
+            ->setStartDate(new \DateTimeImmutable('2023-07-15'))
+            ->setEndDate(new \DateTimeImmutable('2023-09-30'));
+
+        $this->em->persist($personCenterHistoryAFirst);
+        $this->em->persist($personCenterHistoryASecond);
+        $this->em->persist($personCenterHistoryBFirst);
+        $this->em->persist($personCenterHistoryBSecond);
+
+        $personA->addCenterHistory($personCenterHistoryAFirst);
+        $personA->addCenterHistory($personCenterHistoryASecond);
+        $personB->addCenterHistory($personCenterHistoryBFirst);
+        $personB->addCenterHistory($personCenterHistoryBSecond);
+
+        $this->em->flush();
+        $this->em->clear();
+
+        $move = new PersonMove($this->em, $this->personMoveManager, $this->eventDispatcher);
+        $sqls = $move->getSQL($personA, $personB);
+        $this->em->getConnection()->transactional(function (Connection $conn) use ($sqls) {
+            foreach ($sqls as $sql) {
+                $conn->executeStatement($sql);
+            }
+        });
+
+        $personsByIdOfA = $this->em->createQuery('SELECT p FROM '.Person::class.' p WHERE p.id = :id')
+            ->setParameter('id', $personA->getId())
+            ->getResult();
+        /** @var Person $personB */
+        $personB = $this->em->find(Person::class, $personB->getId());
+        $message = 'Move persons with overlapping center histories';
+
+        self::assertCount(0, $personsByIdOfA);
+        self::assertNotNull($personB?->getId(), $message);
+
+        $centersHistories = $this->personCenterHistory->findBy(['person' => $personB]);
+
+        // compute the oldest center history
+        $oldestCenterHistory = null;
+        foreach ($centersHistories as $centerHistory) {
+            $this->em->refresh($centerHistory);
+            if (null === $oldestCenterHistory || ($oldestCenterHistory instanceof Person\PersonCenterHistory && $oldestCenterHistory->getStartDate() >= $centerHistory->getStartDate())) {
+                $oldestCenterHistory = $centerHistory;
+            }
+        }
+
+        self::assertCount(2, $centersHistories);
+        self::assertEquals('2023-01-01', $oldestCenterHistory?->getStartDate()->format('Y-m-d'));
+
+        self::$entitiesToDelete[] = [Person::class, $personA];
+        self::$entitiesToDelete[] = [Person::class, $personB];
+        self::$entitiesToDelete[] = [Person\PersonCenterHistory::class, $personCenterHistoryAFirst];
+        self::$entitiesToDelete[] = [Person\PersonCenterHistory::class, $personCenterHistoryASecond];
+        self::$entitiesToDelete[] = [Person\PersonCenterHistory::class, $personCenterHistoryBFirst];
+        self::$entitiesToDelete[] = [Person\PersonCenterHistory::class, $personCenterHistoryBSecond];
+    }
+
+    public function dataProviderMovePerson(): iterable
+    {
+        $this->setUp();
+
+        $personA = new Person();
+        $personB = new Person();
+
+        $this->em->persist($personA);
+        $this->em->persist($personB);
+
+        self::$entitiesToDelete[] = [Person::class, $personA];
+        self::$entitiesToDelete[] = [Person::class, $personB];
+
+        yield [$personA, $personB, 'move 2 people without any associated data'];
+
+        $personA = new Person();
+        $personB = new Person();
+
+        $activity = new Activity();
+        $activity->setDate(new \DateTime('today'));
+        $activity->addPerson($personA);
+        $activity->addPerson($personB);
+
+        $this->em->persist($personA);
+        $this->em->persist($personB);
+        $this->em->persist($activity);
+
+        self::$entitiesToDelete[] = [Person::class, $personA];
+        self::$entitiesToDelete[] = [Person::class, $personB];
+        self::$entitiesToDelete[] = [Activity::class, $activity];
+
+        yield [$personA, $personB, 'move 2 people having an activity'];
+
+        $personA = new Person();
+        $personB = new Person();
+        $household = new Household();
+        $household->addMember(
+            $memberA = (new HouseholdMember())->setPerson($personA)->setShareHousehold(true)
+                ->setStartDate(new \DateTimeImmutable('2023-01-01'))
+        );
+        $household->addMember(
+            $memberB = (new HouseholdMember())->setPerson($personB)->setShareHousehold(true)
+                ->setStartDate(new \DateTimeImmutable('2023-01-01'))
+        );
+
+        $this->em->persist($personA);
+        $this->em->persist($personB);
+        $this->em->persist($household);
+        $this->em->persist($memberA);
+        $this->em->persist($memberB);
+
+        self::$entitiesToDelete[] = [HouseholdMember::class, $memberA];
+        self::$entitiesToDelete[] = [HouseholdMember::class, $memberB];
+        self::$entitiesToDelete[] = [Household::class, $household];
+        self::$entitiesToDelete[] = [Person::class, $personA];
+        self::$entitiesToDelete[] = [Person::class, $personB];
+
+        yield [$personA, $personB, 'move 2 people having the same household at the same time'];
+
+        $personA = new Person();
+        $personB = new Person();
+        $parcours = new AccompanyingPeriod();
+
+        $parcours->addPerson($personA);
+        $parcours->addPerson($personB);
+
+        $this->em->persist($personA);
+        $this->em->persist($personB);
+        $this->em->persist($parcours);
+
+        self::$entitiesToDelete[] = [Person::class, $personA];
+        self::$entitiesToDelete[] = [Person::class, $personB];
+        self::$entitiesToDelete[] = [AccompanyingPeriod::class, $parcours];
+
+        yield [$personA, $personB, 'move 2 people participating to the same parcours'];
+
+        $personA = new Person();
+        $personB = new Person();
+        $relationship = new Relationship();
+        $relation = new Relation();
+        $user = (new User())->setUsername(uniqid())->setEmail(uniqid().'@foo.com');
+
+        $relationship->setRelation($relation);
+        $relationship->setToPerson($personA);
+        $relationship->setFromPerson($personB);
+        $relationship->setReverse(false);
+        $relationship->setCreatedBy($user);
+
+        $this->em->persist($personA);
+        $this->em->persist($personB);
+        $this->em->persist($relation);
+        $this->em->persist($user);
+        $this->em->persist($relationship);
+
+        self::$entitiesToDelete[] = [Person::class, $personA];
+        self::$entitiesToDelete[] = [Person::class, $personB];
+        self::$entitiesToDelete[] = [Relation::class, $relation];
+        self::$entitiesToDelete[] = [User::class, $user];
+        self::$entitiesToDelete[] = [Relationship::class, $relationship];
+
+        yield [$personA, $personB, 'move 2 people with a relationship'];
+
+        $this->em->flush();
+        $this->em->clear();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
index 154dbd884..a23f4ae6e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
@@ -13,58 +13,39 @@ namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 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 DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-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.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingCourseApiControllerTest extends WebTestCase
 {
-    protected static EntityManagerInterface $em;
+    use PrepareClientTrait;
 
-    protected ?AccompanyingPeriod $period = null;
+    private static EntityManagerInterface $em;
 
-    protected ?int $periodId = null;
+    private ?AccompanyingPeriod $period = null;
 
-    protected ?int $personId = null;
+    private ?int $periodId = null;
 
-    /**
-     * Setup before the first test of this class (see phpunit doc).
-     */
-    public static function setUpBeforeClass(): void
+    private ?int $personId = null;
+
+    protected function tearDown(): void
     {
-        self::bootKernel();
-    }
-
-    /**
-     * Setup before each test method (see phpunit doc).
-     */
-    protected function setUp(): void
-    {
-        $this->client = self::createClient([], [
-            'PHP_AUTH_USER' => 'center a_social',
-            'PHP_AUTH_PW' => 'password',
-        ]);
+        self::ensureKernelShutdown();
     }
 
     public function dataGenerateNewAccompanyingCourse()
@@ -72,18 +53,18 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $period = new AccompanyingPeriod(new DateTime('1 week ago'));
+        $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'));
+        // $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')
+        $personIds = $em->createQuery('SELECT p.id FROM '.
+            Person::class.' p JOIN p.centerCurrent cc'.
+            ' WHERE cc.center = :center')
             ->setParameter('center', $center)
             ->setMaxResults(100)
             ->getScalarResult();
@@ -92,7 +73,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         shuffle($personIds);
 
         for ($i = 0; 2 > $i; ++$i) {
-            $person = $em->getRepository(Person::class)->find(array_pop($personIds));
+            $person = $em->getRepository(Person::class)->find(\array_pop($personIds));
             $period->addPerson($person);
         }
 
@@ -100,6 +81,8 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         $em->flush();
 
         yield [$period];
+
+        self::ensureKernelShutdown();
     }
 
     public function dataGenerateRandomAccompanyingCourse()
@@ -127,9 +110,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             ->from(Person::class, 'p')
             ->join('p.accompanyingPeriodParticipations', 'participation')
             ->join('participation.accompanyingPeriod', 'ap')
+            ->join('p.centerCurrent', 'cc')
             ->where(
                 $qb->expr()->eq(
-                    'p.center',
+                    'cc.center',
                     ':center'
                 )
             )
@@ -154,16 +138,18 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         $nbGenerated = 0;
 
         while ($nbGenerated < $maxGenerated) {
-            $id = array_pop($personIds)['id'];
+            $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()];
+            yield [\array_pop($personIds)['id'], $periods[\array_rand($periods)]->getId()];
 
             ++$nbGenerated;
         }
+
+        self::ensureKernelShutdown();
     }
 
     public function dataGenerateRandomAccompanyingCourseWithSocialIssue()
@@ -191,9 +177,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             ->from(Person::class, 'p')
             ->join('p.accompanyingPeriodParticipations', 'participation')
             ->join('participation.accompanyingPeriod', 'ap')
+            ->join('p.centerCurrent', 'cc')
             ->where(
                 $qb->expr()->eq(
-                    'p.center',
+                    'cc.center',
                     ':center'
                 )
             )
@@ -215,27 +202,29 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         // create a random order
         shuffle($personIds);
 
-        $socialIssues = $em->createQuery('SELECT s FROM ' .
-            SocialIssue::class . ' s ')
+        $socialIssues = $em->createQuery('SELECT s FROM '.
+            SocialIssue::class.' s ')
             ->setMaxResults(10)
             ->getResult();
 
         $nbGenerated = 0;
 
         while ($nbGenerated < $maxGenerated) {
-            $id = array_pop($personIds)['id'];
+            $id = \array_pop($personIds)['id'];
 
             $person = $em->getRepository(Person::class)
                 ->find($id);
             $periods = $person->getAccompanyingPeriods();
 
-            yield [$periods[array_rand($periods)], $socialIssues[array_rand($socialIssues)]];
+            yield [$periods[\array_rand($periods)], $socialIssues[\array_rand($socialIssues)]];
 
             ++$nbGenerated;
         }
+
+        self::ensureKernelShutdown();
     }
 
-    public function dataGenerateRandomRequestorValidData(): Iterator
+    public function dataGenerateRandomRequestorValidData(): \Iterator
     {
         $dataLength = 2;
         $maxResults = 100;
@@ -252,9 +241,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             ->from(Person::class, 'p')
             ->join('p.accompanyingPeriodParticipations', 'participation')
             ->join('participation.accompanyingPeriod', 'ap')
+            ->join('p.centerCurrent', 'cc')
             ->where(
                 $qb->expr()->eq(
-                    'p.center',
+                    'cc.center',
                     ':center'
                 )
             )
@@ -276,8 +266,8 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         // create a random order
         shuffle($personIds);
 
-        $thirdPartyIds = $em->createQuery('SELECT t.id FROM ' .
-            ThirdParty::class . ' t ')
+        $thirdPartyIds = $em->createQuery('SELECT t.id FROM '.
+            ThirdParty::class.' t ')
             ->setMaxResults($maxResults)
             ->getScalarResult();
 
@@ -288,17 +278,19 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
 
         while ($i <= $dataLength) {
             $person = $em->getRepository(Person::class)
-                ->find(array_pop($personIds)['id']);
+                ->find(\array_pop($personIds)['id']);
 
-            if (count($person->getAccompanyingPeriods()) === 0) {
+            if (0 === \count($person->getAccompanyingPeriods())) {
                 continue;
             }
 
             $period = $person->getAccompanyingPeriods()[0];
 
-            yield [$period, array_pop($personIds)['id'], array_pop($thirdPartyIds)['id']];
+            yield [$period, \array_pop($personIds)['id'], \array_pop($thirdPartyIds)['id']];
             ++$i;
         }
+
+        self::ensureKernelShutdown();
     }
 
     /**
@@ -313,14 +305,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'person', 'id' => $personId])
+            \json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode($response->getContent(), true);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -331,20 +323,18 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
         // 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));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
         $response = $this->client->getResponse();
-        $data = json_decode($response->getContent());
+        $data = \json_decode((string) $response->getContent(), null, 512, JSON_THROW_ON_ERROR);
 
         // check that the person id is contained
-        $participationsPersonsIds = array_map(
-            static function ($participation) {
-                return $participation->person->id;
-            },
+        $participationsPersonsIds = \array_map(
+            static fn ($participation) => $participation->person->id,
             $data->participations
         );
 
@@ -357,14 +347,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'person', 'id' => $personId])
+            \json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode($response->getContent(), true);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -387,16 +377,16 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [],
             [],
             [],
-            json_encode(['type' => 'social_issue', 'id' => $si->getId()])
+            \json_encode(['type' => 'social_issue', 'id' => $si->getId()], JSON_THROW_ON_ERROR)
         );
 
-        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
 
-        if ($this->client->getResponse()->getStatusCode() === 422) {
+        if (422 === $this->client->getResponse()->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
-        $data = json_decode($this->client->getResponse()->getContent(), true);
+        $data = \json_decode((string) $this->client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
         $this->assertArrayHasKey('id', $data);
         $this->assertArrayHasKey('type', $data);
         $this->assertEquals('social_issue', $data['type']);
@@ -407,10 +397,10 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [],
             [],
             [],
-            json_encode(['type' => 'social_issue', 'id' => $si->getId()])
+            \json_encode(['type' => 'social_issue', 'id' => $si->getId()], JSON_THROW_ON_ERROR)
         );
 
-        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
     }
 
     /**
@@ -418,16 +408,17 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
      */
     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();
+        $client = $this->getClientAuthenticated();
+        $client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
+        $response = $client->getResponse();
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
-        $data = json_decode($response->getContent());
+        $data = \json_decode((string) $response->getContent(), null, 512, JSON_THROW_ON_ERROR);
         $this->assertEquals(
             $data->id,
             $periodId,
@@ -453,13 +444,13 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'accompanying_period', 'emergency' => !$initialValueEmergency])
+            \json_encode(['type' => 'accompanying_period', 'emergency' => !$initialValueEmergency], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -474,11 +465,8 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
 
     /**
      * @dataProvider dataGenerateRandomRequestorValidData
-     *
-     * @param mixed $personId
-     * @param mixed $thirdPartyId
      */
-    public function testCommentWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
+    public function testCommentWithValidData(AccompanyingPeriod $period, mixed $personId, mixed $thirdPartyId)
     {
         $this->markTestIncomplete('fix test with validation');
         $em = self::$container->get(EntityManagerInterface::class);
@@ -489,14 +477,14 @@ final 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((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -508,12 +496,12 @@ final 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']], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode($response->getContent(), true);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
     }
 
     /**
@@ -527,9 +515,9 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             sprintf('/api/1.0/person/accompanying-course/%d/confirm.json', $period->getId())
         );
 
-        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
 
-        if ($this->client->getResponse()->getStatusCode() === 422) {
+        if (422 === $this->client->getResponse()->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -542,21 +530,19 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
      */
     public function testReferralAvailable(int $personId, int $periodId)
     {
-        $this->client->request(
+        $client = $this->getClientAuthenticated();
+        $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));
+        $this->assertTrue(\in_array($client->getResponse()->getStatusCode(), [200, 422], true));
     }
 
     /**
      * @dataProvider dataGenerateRandomRequestorValidData
-     *
-     * @param mixed $personId
-     * @param mixed $thirdPartyId
      */
-    public function testRequestorWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
+    public function testRequestorWithValidData(AccompanyingPeriod $period, mixed $personId, mixed $thirdPartyId)
     {
         $this->markTestIncomplete('fix test with validation');
         $em = self::$container->get(EntityManagerInterface::class);
@@ -568,14 +554,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'person', 'id' => $personId])
+            \json_encode(['type' => 'person', 'id' => $personId], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode($response->getContent(), true);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -595,14 +581,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            json_encode(['type' => 'thirdparty', 'id' => $thirdPartyId])
+            \json_encode(['type' => 'thirdparty', 'id' => $thirdPartyId], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $data = json_decode($response->getContent(), true);
+        $data = \json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -621,9 +607,9 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             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));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -636,11 +622,8 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
 
     /**
      * @dataProvider dataGenerateRandomRequestorValidData
-     *
-     * @param mixed $personId
-     * @param mixed $thirdPartyId
      */
-    public function testResourceWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
+    public function testResourceWithValidData(AccompanyingPeriod $period, mixed $personId, mixed $thirdPartyId)
     {
         $this->markTestIncomplete('fix test with validation');
         $em = self::$container->get(EntityManagerInterface::class);
@@ -652,14 +635,14 @@ final 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((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -679,13 +662,13 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
             [],
             [],
-            [], //server
-            json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()])
+            [], // server
+            \json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -696,14 +679,14 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // 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((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
 
-        if ($response->getStatusCode() === 422) {
+        if (422 === $response->getStatusCode()) {
             $this->markTestSkipped('the next tests should appears only on valid accompanying period');
         }
 
@@ -723,17 +706,18 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
             sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
             [],
             [],
-            [], //server
-            json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()])
+            [], // server
+            \json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()], JSON_THROW_ON_ERROR)
         );
         $response = $this->client->getResponse();
-        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+        $this->assertTrue(\in_array($response->getStatusCode(), [200, 422], true));
     }
 
     public function testShow404()
     {
-        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', 99999));
-        $response = $this->client->getResponse();
+        $client = $this->getClientAuthenticated();
+        $client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', 99999));
+        $response = $client->getResponse();
 
         $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 b475cca4c..7b6bdd43b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
@@ -16,51 +16,55 @@ 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\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function array_pop;
-use function count;
-use function preg_match;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingCourseControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
+    private KernelBrowser $client;
+
     protected function setUp(): void
     {
-        parent::setUp();
-        self::bootKernel();
         $this->client = $this->getClientAuthenticated();
     }
 
-    public function dataGenerateRandomUsers(): Iterator
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
+    public function dataGenerateRandomUsers(): \Iterator
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $period = new AccompanyingPeriod(new DateTime('1 week ago'));
+        $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'));
+        // $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')
+        $personIds = $em->createQuery('SELECT p.id FROM '.
+            Person::class.' p JOIN p.centerCurrent cc '.
+            ' WHERE cc.center = :center')
             ->setParameter('center', $center)
             ->setMaxResults(100)
             ->getScalarResult();
 
-        yield [array_pop($personIds), array_pop($personIds)];
+        yield [\array_pop($personIds), \array_pop($personIds)];
+
+        self::ensureKernelShutdown();
     }
 
     public function testNewWithoutUsers()
@@ -70,16 +74,13 @@ final class AccompanyingCourseControllerTest extends WebTestCase
         $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$|', (string) $location));
     }
 
     /**
      * @dataProvider dataGenerateRandomUsers
-     *
-     * @param mixed $personId0
-     * @param mixed $personId1
      */
-    public function testWithNewUsers($personId0, $personId1)
+    public function testWithNewUsers(mixed $personId0, mixed $personId1)
     {
         $this->client->request('GET', '/fr/person/parcours/new', [
             'person_id' => [
@@ -92,7 +93,7 @@ final class AccompanyingCourseControllerTest extends WebTestCase
         $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$|', (string) $location, $matches));
         $id = $matches[1];
 
         $period = self::$container->get(EntityManagerInterface::class)
@@ -101,6 +102,6 @@ final class AccompanyingCourseControllerTest extends WebTestCase
 
         $this->assertNotNull($period);
 
-        $this->assertEquals(2, count($period->getParticipations()));
+        $this->assertEquals(2, \count($period->getParticipations()));
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
index 0fbdad9d8..9d8fa2321 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
@@ -13,11 +13,8 @@ namespace Chill\PersonBundle\Tests\Controller;
 
 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.
@@ -26,6 +23,7 @@ use function array_key_exists;
  * closed) starting the 2015-01-05.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodControllerTest extends WebTestCase
@@ -37,7 +35,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     public const OPENING_INPUT = 'chill_personbundle_accompanyingperiod[openingDate]';
 
     /**
-     * @var \Symfony\Component\BrowserKit\Client
+     * @var \Symfony\Component\BrowserKit\AbstractBrowser
      */
     protected $client;
 
@@ -74,7 +72,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         $center = self::$em->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findOneBy(['name' => 'Center A']);
 
-        $this->person = (new Person(new DateTime('2015-01-05')))
+        $this->person = (new Person(new \DateTime('2015-01-05')))
             ->setFirstName('Roland')
             ->setLastName('Gallorime')
             ->setCenter($center)
@@ -108,7 +106,7 @@ final 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)
@@ -122,7 +120,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
 
         $this->assertTrue(
             $this->client->getResponse()->isRedirect(
-                '/fr/person/' . $this->person->getId() . '/accompanying-period'
+                '/fr/person/'.$this->person->getId().'/accompanying-period'
             ),
             'the server redirects to /accompanying-period page'
         );
@@ -149,20 +147,20 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     public function testClosingCurrentPeriod()
     {
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/close');
+              .$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'));
+            ->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'
+                '/fr/person/'.$this->person->getId().'/accompanying-period'
             ),
             'the server redirects to /accompanying-period page'
         );
@@ -189,14 +187,14 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     public function testClosingCurrentPeriodWithDateClosingBeforeOpeningFails()
     {
         $crawler = $this->client->request('GET', '/fr/person/'
-              . $this->person->getId() . '/accompanying-period/close');
+              .$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'));
+            ->setValue((new \DateTime('2014-01-01'))->format('d-m-Y'));
 
         $crawlerResponse = $this->client->submit($form);
 
@@ -236,7 +234,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         ]);
 
         $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)
@@ -270,13 +268,13 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
      * Then the response should not redirect to any page
      * and an error element is shown
      */
-    public function testCreatePeriodWithClosingAfterCurrentFails()
+    public function testCreatePeriodWithClosingAfterCurrentFails(): never
     {
-        $this->markTestSkipped('Multiple period may now cover. This test is kept ' .
+        $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)
@@ -312,7 +310,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     public function testCreatePeriodWithClosingBeforeOpeningFails()
     {
         $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)
@@ -358,7 +356,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         ]);
 
         $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)
@@ -404,7 +402,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         ]);
 
         $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)
@@ -438,13 +436,13 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
      * Then the response should not redirect to any page
      * and an error element is shown
      */
-    public function testCreatePeriodWithOpeningAndClosingAfterCurrentFails()
+    public function testCreatePeriodWithOpeningAndClosingAfterCurrentFails(): never
     {
-        $this->markTestSkipped('Multiple period may now cover. This test is kept ' .
+        $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)
@@ -470,7 +468,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     /**
      * @group reopening
      */
-    public function testReOpeningPeriod()
+    public function testReOpeningPeriod(): never
     {
         // test that re-opening a period which is opened does not work
         $this->client->request(
@@ -489,7 +487,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
 
         // 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([
@@ -503,7 +501,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
         $periods = $this->person->getAccompanyingPeriodsOrdered();
         /** @var Criteria $criteria */
         $criteria = Criteria::create();
-        //$criteria->where(Criteria::expr()->eq('openingDate', \DateTime::createFromFormat()))
+        // $criteria->where(Criteria::expr()->eq('openingDate', \DateTime::createFromFormat()))
         $firstPeriod = reset($periods);
         $lastPeriod = end($periods);
 
@@ -546,15 +544,14 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
     protected function generatePeriods(array $periods)
     {
         foreach ($periods as $periodDef) {
-            $period = new AccompanyingPeriod(new DateTime($periodDef['openingDate']));
+            $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');
+            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']))
+                $period->setClosingDate(new \DateTime($periodDef['closingDate']))
                     ->setClosingMotive($periodDef['closingMotive']);
             }
 
@@ -571,7 +568,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase
      * @var \Symfony\Component\DomCrawler\Form The form
      *
      * @return Chill\PersonBundle\Entity\AccompanyingPeriod The last value of closing
-     * motive
+     *                                                      motive
      */
     protected function getLastValueOnClosingMotive(\Symfony\Component\DomCrawler\Form $form)
     {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php
index 80f755d9c..be056598d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodRegulationListControllerTest.php
@@ -16,18 +16,13 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodRegulationListControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-        self::bootKernel();
-    }
-
     public function testRegulationList(): void
     {
         $client = $this->getClientAuthenticated();
@@ -35,5 +30,7 @@ final class AccompanyingPeriodRegulationListControllerTest extends WebTestCase
         $client->request('GET', '/fr/person/periods/undispatched');
 
         $this->assertResponseIsSuccessful();
+
+        self::ensureKernelShutdown();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
index 8686172ee..b5e468032 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
@@ -15,22 +15,16 @@ use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Entity\Center;
 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 DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use RuntimeException;
 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;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdApiControllerTest extends WebTestCase
@@ -42,6 +36,7 @@ final class HouseholdApiControllerTest extends WebTestCase
     protected function tearDown(): void
     {
         self::bootKernel();
+
         $em = self::$container->get(EntityManagerInterface::class);
 
         foreach ($this->toDelete as [$class, $id]) {
@@ -50,6 +45,8 @@ final class HouseholdApiControllerTest extends WebTestCase
         }
 
         $em->flush();
+
+        self::ensureKernelShutdown();
     }
 
     public function generateHouseholdAssociatedWithAddressReference()
@@ -61,11 +58,11 @@ final class HouseholdApiControllerTest extends WebTestCase
             ->getQuery()->getSingleScalarResult();
 
         if (0 === $nbReference) {
-            throw new RuntimeException('any reference found. Add a reference in database to perform this test');
+            throw new \RuntimeException('any reference found. Add a reference in database to perform this test');
         }
 
         $reference = $em->createQueryBuilder()->select('ar')->from(AddressReference::class, 'ar')
-            ->setFirstResult(random_int(0, $nbReference - 1))
+            ->setFirstResult(\random_int(0, $nbReference - 1))
             ->setMaxResults(1)
             ->getQuery()->getSingleResult();
 
@@ -76,13 +73,14 @@ final class HouseholdApiControllerTest extends WebTestCase
         $em->persist($p);
         $h = new Household();
         $h->addMember($m = (new HouseholdMember())->setPerson($p));
-        $h->addAddress(Address::createFromAddressReference($reference)->setValidFrom(new DateTime('today')));
+        $h->addAddress($a = Address::createFromAddressReference($reference)->setValidFrom(new \DateTime('today')));
+        $em->persist($a);
         $em->persist($m);
         $em->persist($h);
 
         $em->flush();
 
-        $this->toDelete = $this->toDelete + [
+        $this->toDelete += [
             [HouseholdMember::class, $m->getId()],
             [User::class, $p->getId()],
             [Household::class, $h->getId()],
@@ -90,6 +88,8 @@ final class HouseholdApiControllerTest extends WebTestCase
         ];
 
         yield [$reference->getId(), $h->getId()];
+
+        self::ensureKernelShutdown();
     }
 
     public function generateHouseholdId()
@@ -104,7 +104,8 @@ final class HouseholdApiControllerTest extends WebTestCase
             ->from(Household::class, 'household')
             ->join('household.members', 'members')
             ->join('members.person', 'person')
-            ->join('person.center', 'center')
+            ->join('person.centerCurrent', 'cc')
+            ->join('cc.center', 'center')
             ->where($qb->expr()->eq('center.name', ':center_name'))
             ->andWhere($qb->expr()->gt('SIZE(person.accompanyingPeriodParticipations)', 0))
             ->setParameter('center_name', 'Center A')
@@ -112,13 +113,15 @@ final class HouseholdApiControllerTest extends WebTestCase
             ->getQuery()
             ->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']];
+
+        self::ensureKernelShutdown();
     }
 
     public function generatePersonId()
@@ -128,20 +131,19 @@ final class HouseholdApiControllerTest extends WebTestCase
         $qb = self::$container->get(EntityManagerInterface::class)
             ->createQueryBuilder();
 
-        $period = $qb
-            ->select('ap')
-            ->from(AccompanyingPeriod::class, 'ap')
+        $personIds = $qb
+            ->select('p.id AS pid')
+            ->from(Person::class, 'p')
             ->where(
-                $qb->expr()->gte('SIZE(ap.participations)', 2)
+                $qb->expr()->gte('SIZE(p.accompanyingPeriodParticipations)', 2)
             )
             ->getQuery()
             ->setMaxResults(1)
             ->getSingleResult();
 
-        $person = $period->getParticipations()
-            ->first()->getPerson();
+        yield [$personIds['pid']];
 
-        yield [$person->getId()];
+        self::ensureKernelShutdown();
     }
 
     /**
@@ -157,13 +159,11 @@ final class HouseholdApiControllerTest extends WebTestCase
         );
 
         $this->assertResponseIsSuccessful();
-        $data = json_decode($client->getResponse()->getContent(), true);
+        $data = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
         $this->assertArrayHasKey('count', $data);
         $this->assertArrayHasKey('results', $data);
 
-        $householdIds = array_map(static function ($r) {
-            return $r['id'];
-        }, $data['results']);
+        $householdIds = \array_map(static fn ($r) => $r['id'], $data['results']);
 
         $this->assertContains($expectedHouseholdId, $householdIds);
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
index 772fee3b1..d11f50ac4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
@@ -13,17 +13,14 @@ namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
 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;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdControllerTest extends WebTestCase
@@ -37,37 +34,42 @@ final class HouseholdControllerTest extends WebTestCase
         $this->client = $this->getClientAuthenticated();
     }
 
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
     public function generateValidHouseholdIds()
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $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'
+            sprintf('SELECT DISTINCT h.id FROM %s h JOIN h.members m JOIN m.person p JOIN p.centerHistory ch JOIN ch.center c WHERE c.name = :center AND ch.endDate IS NULL', Household::class)
         )
             ->setParameter('center', 'Center A')
             ->setMaxResults(100)
             ->getScalarResult();
 
-        shuffle($ids);
+        if ([] === $ids) {
+            throw new \RuntimeException('no household ids with center "Center A"');
+        }
 
-        yield [array_pop($ids)['id']];
+        \shuffle($ids);
 
-        yield [array_pop($ids)['id']];
+        yield [\array_pop($ids)['id']];
 
-        yield [array_pop($ids)['id']];
+        yield [\array_pop($ids)['id']];
+
+        yield [\array_pop($ids)['id']];
+
+        self::ensureKernelShutdown();
     }
 
     /**
      * @dataProvider generateValidHouseholdIds
-     *
-     * @param mixed $householdId
      */
-    public function testAddresses($householdId)
+    public function testAddresses(mixed $householdId)
     {
         $this->client->request(
             Request::METHOD_GET,
@@ -79,10 +81,8 @@ final class HouseholdControllerTest extends WebTestCase
 
     /**
      * @dataProvider generateValidHouseholdIds
-     *
-     * @param mixed $householdId
      */
-    public function testAddressMove($householdId)
+    public function testAddressMove(mixed $householdId)
     {
         $this->client->request(
             Request::METHOD_GET,
@@ -96,10 +96,8 @@ final class HouseholdControllerTest extends WebTestCase
 
     /**
      * @dataProvider generateValidHouseholdIds
-     *
-     * @param mixed $householdId
      */
-    public function testEditMetadata($householdId)
+    public function testEditMetadata(mixed $householdId)
     {
         $crawler = $this->client->request(
             Request::METHOD_GET,
@@ -116,8 +114,8 @@ final class HouseholdControllerTest extends WebTestCase
 
         $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');
+        $form['household[waitingForBirthDate]'] = (new \DateTime('today'))
+            ->add(new \DateInterval('P1M'))->format('Y-m-d');
 
         $this->client->submit($form);
 
@@ -126,10 +124,8 @@ final class HouseholdControllerTest extends WebTestCase
 
     /**
      * @dataProvider generateValidHouseholdIds
-     *
-     * @param mixed $householdId
      */
-    public function testSummary($householdId)
+    public function testSummary(mixed $householdId)
     {
         $this->client->request(
             Request::METHOD_GET,
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
index 34c7e3113..aaaeefd81 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
@@ -16,75 +16,69 @@ 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;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdMemberControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    public function provideValidDataEditMember(): Iterator
+    public function provideValidDataEditMember(): \Iterator
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $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')
+        $membershipIds = $em->createQuery(sprintf('SELECT m.id FROM %s m JOIN m.person p JOIN p.centerHistory ch JOIN ch.center c WHERE c.name = :center AND m.endDate IS NULL AND ch.endDate IS NULL', HouseholdMember::class))
             ->setParameter('center', 'Center A')
             ->getScalarResult();
 
-        shuffle($membershipIds);
+        if ([] === $membershipIds) {
+            throw new \RuntimeException("no memberships for person associated to 'Center A'");
+        }
 
-        yield [array_pop($membershipIds)['id']];
+        \shuffle($membershipIds);
+
+        yield [\array_pop($membershipIds)['id']];
     }
 
-    public function provideValidDataMove(): Iterator
+    public function provideValidDataMove(): \Iterator
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
-        $yesterday = new DateTimeImmutable('yesterday');
+        $yesterday = new \DateTimeImmutable('yesterday');
 
         $personIds = $em->createQuery(
-            'SELECT p.id FROM ' . Person::class . ' p ' .
-            'JOIN p.center c ' .
-            'WHERE ' .
-            'c.name = :center '
+            sprintf('SELECT p.id FROM %s p JOIN p.centerHistory ch JOIN ch.center c WHERE c.name = :center AND ch.endDate IS NULL', Person::class)
         )
             ->setParameter('center', 'Center A')
             ->setMaxResults(100)
             ->getScalarResult();
 
-        shuffle($personIds);
+        if ([] === $personIds) {
+            throw new \RuntimeException('no person associated with "Center A"');
+        }
+
+        \shuffle($personIds);
 
         $household = new Household();
         $em->persist($household);
         $em->flush();
 
-        $positions = $em->createQuery('SELECT pos.id FROM ' . Position::class . ' pos ' .
+        $positions = $em->createQuery('SELECT pos.id FROM '.Position::class.' pos '.
             'WHERE pos.shareHouseHold = TRUE')
             ->getResult();
 
         $i = 0;
 
         do {
-            $id = array_pop($personIds)['id'];
+            $id = \array_pop($personIds)['id'];
             $person = self::$container->get(EntityManagerInterface::class)
                 ->getRepository(Person::class)
                 ->find($id);
@@ -101,8 +95,8 @@ final class HouseholdMemberControllerTest extends WebTestCase
                 yield [
                     $id,
                     $household->getId(),
-                    $positions[random_int(0, count($positions) - 1)]['id'],
-                    new DateTimeImmutable('tomorrow'),
+                    $positions[\random_int(0, \count($positions) - 1)]['id'],
+                    new \DateTimeImmutable('tomorrow'),
                 ];
             }
         } while (1 >= $i);
@@ -110,10 +104,8 @@ final class HouseholdMemberControllerTest extends WebTestCase
 
     /**
      * @dataProvider provideValidDataEditMember
-     *
-     * @param mixed $memberId
      */
-    public function testEditMember($memberId)
+    public function testEditMember(int $memberId)
     {
         $client = $this->getClientAuthenticated();
 
@@ -134,12 +126,8 @@ final class HouseholdMemberControllerTest extends WebTestCase
 
     /**
      * @dataProvider provideValidDataMove
-     *
-     * @param mixed $personId
-     * @param mixed $householdId
-     * @param mixed $positionId
      */
-    public function testLeaveWithoutHousehold($personId, $householdId, $positionId, DateTimeInterface $date)
+    public function testLeaveWithoutHousehold(mixed $personId, mixed $householdId, mixed $positionId, \DateTimeInterface $date)
     {
         $client = $this->getClientAuthenticated();
 
@@ -149,7 +137,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server
-            json_encode(
+            \json_encode(
                 [
                     'concerned' => [
                         [
@@ -158,7 +146,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
                                 'id' => $personId,
                             ],
                             'start_date' => [
-                                'datetime' => $date->format(DateTimeInterface::RFC3339),
+                                'datetime' => $date->format(\DateTimeInterface::RFC3339),
                             ],
                             'position' => [
                                 'type' => 'household_position',
@@ -179,19 +167,15 @@ final class HouseholdMemberControllerTest extends WebTestCase
             $client->getResponse()->getStatusCode()
         );
 
-        $data = json_decode($client->getResponse()->getContent(), true);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertEquals(null, $data);
     }
 
     /**
      * @dataProvider provideValidDataMove
-     *
-     * @param mixed $personId
-     * @param mixed $householdId
-     * @param mixed $positionId
      */
-    public function testMoveMember($personId, $householdId, $positionId, DateTimeInterface $date)
+    public function testMoveMember(mixed $personId, mixed $householdId, mixed $positionId, \DateTimeInterface $date)
     {
         $client = $this->getClientAuthenticated();
 
@@ -201,7 +185,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server
-            json_encode(
+            \json_encode(
                 [
                     'concerned' => [
                         [
@@ -210,7 +194,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
                                 'id' => $personId,
                             ],
                             'start_date' => [
-                                'datetime' => $date->format(DateTimeInterface::RFC3339),
+                                'datetime' => $date->format(\DateTimeInterface::RFC3339),
                             ],
                             'position' => [
                                 'type' => 'household_position',
@@ -237,12 +221,8 @@ final class HouseholdMemberControllerTest extends WebTestCase
 
     /**
      * @dataProvider provideValidDataMove
-     *
-     * @param mixed $personId
-     * @param mixed $householdId
-     * @param mixed $positionId
      */
-    public function testMoveMemberToNewHousehold($personId, $householdId, $positionId, DateTimeInterface $date)
+    public function testMoveMemberToNewHousehold(mixed $personId, mixed $householdId, mixed $positionId, \DateTimeInterface $date)
     {
         $client = $this->getClientAuthenticated();
 
@@ -252,7 +232,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server
-            json_encode(
+            \json_encode(
                 [
                     'concerned' => [
                         [
@@ -261,7 +241,7 @@ final class HouseholdMemberControllerTest extends WebTestCase
                                 'id' => $personId,
                             ],
                             'start_date' => [
-                                'datetime' => $date->format(DateTimeInterface::RFC3339),
+                                'datetime' => $date->format(\DateTimeInterface::RFC3339),
                             ],
                             'position' => [
                                 'type' => 'household_position',
@@ -284,14 +264,14 @@ final class HouseholdMemberControllerTest extends WebTestCase
             $client->getResponse()->getStatusCode()
         );
 
-        $data = json_decode($client->getResponse()->getContent(), true);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertIsArray($data);
         $this->assertArrayHasKey('members', $data);
         $this->assertIsArray($data['members']);
         $this->assertEquals(
             1,
-            count($data['members']),
+            \count($data['members']),
             'assert new household count one member'
         );
         $this->assertArrayHasKey('person', $data['members'][0]);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
index f950e8b62..14c6e30fa 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
@@ -16,12 +16,13 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonAddressControllerTest extends WebTestCase
 {
     /**
-     * @var \Symfony\Component\BrowserKit\Client
+     * @var \Symfony\Component\BrowserKit\AbstractBrowser
      */
     protected $client;
 
@@ -91,8 +92,8 @@ final class PersonAddressControllerTest extends WebTestCase
      */
     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());
 
@@ -134,8 +135,8 @@ final class PersonAddressControllerTest extends WebTestCase
 
     public function testEmptyList()
     {
-        $crawler = $this->client->request('GET', '/fr/person/' .
-                self::$person->getId() . '/address/list');
+        $crawler = $this->client->request('GET', '/fr/person/'.
+                self::$person->getId().'/address/list');
 
         $this->assertTrue($this->client->getResponse()->isSuccessful());
 
@@ -155,8 +156,8 @@ final 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());
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
index f5a886fa6..9171277f7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
@@ -14,67 +14,63 @@ namespace Chill\PersonBundle\Tests\Controller;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
-use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_pop;
-use function json_decode;
-use function shuffle;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonApiControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    public function dataGetPersonFromCenterA(): Iterator
+    public function dataGetPersonFromCenterA(): \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')
+        $personIds = $em->createQuery(sprintf(
+            'SELECT p.id FROM %s p JOIN p.centerCurrent pc JOIN pc.center c WHERE c.name = :center',
+            Person::class
+        ))
             ->setParameter('center', 'Center A')
             ->setMaxResults(100)
             ->getScalarResult();
 
-        shuffle($personIds);
+        \shuffle($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
     }
 
-    public function dataGetPersonFromCenterB(): Iterator
+    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')
+        $personIds = $em->createQuery(
+            sprintf('SELECT p.id FROM %s p JOIN p.centerCurrent pc JOIN pc.center c WHERE c.name = :center', Person::class)
+        )
             ->setParameter('center', 'Center B')
             ->setMaxResults(100)
             ->getScalarResult();
 
-        shuffle($personIds);
+        \shuffle($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
 
-        yield array_pop($personIds);
+        yield \array_pop($personIds);
     }
 
     /**
      * @dataProvider dataGetPersonFromCenterA
-     *
-     * @param mixed $personId
      */
-    public function testPersonAddressSuggestion($personId): void
+    public function testPersonAddressSuggestion(int $personId): void
     {
         $client = $this->getClientAuthenticated();
 
@@ -85,10 +81,8 @@ final class PersonApiControllerTest extends WebTestCase
 
     /**
      * @dataProvider dataGetPersonFromCenterB
-     *
-     * @param mixed $personId
      */
-    public function testPersonAddressSuggestionUnauthorized($personId): void
+    public function testPersonAddressSuggestionUnauthorized(mixed $personId): void
     {
         $client = $this->getClientAuthenticated();
 
@@ -100,10 +94,8 @@ final class PersonApiControllerTest extends WebTestCase
 
     /**
      * @dataProvider dataGetPersonFromCenterA
-     *
-     * @param mixed $personId
      */
-    public function testPersonGet($personId): void
+    public function testPersonGet(int $personId): void
     {
         $client = $this->getClientAuthenticated();
 
@@ -112,7 +104,7 @@ final class PersonApiControllerTest extends WebTestCase
 
         $this->assertResponseIsSuccessful();
 
-        $data = json_decode($client->getResponse()->getContent(), true);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertArrayHasKey('type', $data);
         $this->assertArrayHasKey('id', $data);
@@ -122,10 +114,8 @@ final class PersonApiControllerTest extends WebTestCase
 
     /**
      * @dataProvider dataGetPersonFromCenterB
-     *
-     * @param mixed $personId
      */
-    public function testPersonGetUnauthorized($personId): void
+    public function testPersonGetUnauthorized(mixed $personId): void
     {
         $client = $this->getClientAuthenticated();
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
index fbba0bbc3..572374bc1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
@@ -12,17 +12,16 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
-use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\DomCrawler\Form;
-use function count;
-use function in_array;
 
 /**
  * Test creation and deletion for persons.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerCreateTest extends WebTestCase
@@ -43,14 +42,14 @@ final class PersonControllerCreateTest extends WebTestCase
 
     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;
+    private readonly KernelBrowser $client;
 
     public static function tearDownAfterClass(): void
     {
         self::bootKernel();
-        $em = self::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+        $em = self::$container->get(EntityManagerInterface::class);
 
-        //remove two people created during test
+        // remove two people created during test
         $jesus = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)
             ->findOneBy(['firstName' => 'God']);
 
@@ -65,11 +64,12 @@ final class PersonControllerCreateTest extends WebTestCase
             $em->remove($jesus2);
         }
         $em->flush();
+        self::ensureKernelShutdown();
     }
 
-    protected function setUp(): void
+    protected function tearDown(): void
     {
-        $this->client = $this->getClientAuthenticated();
+        self::ensureKernelShutdown();
     }
 
     /**
@@ -79,19 +79,19 @@ final class PersonControllerCreateTest extends WebTestCase
      */
     public function testAddAPersonPage()
     {
-        $client = $this->client;
+        $client = $this->getClientAuthenticated();
         $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();
+        $form = $crawler->selectButton("Créer l'usager")->form();
 
         $this->assertInstanceOf(
-            'Symfony\Component\DomCrawler\Form',
+            \Symfony\Component\DomCrawler\Form::class,
             $form,
-            'The page contains a butto '
+            'The page contains a button'
         );
         $this->assertTrue(
             $form->has(self::FIRSTNAME_INPUT),
@@ -118,15 +118,15 @@ final class PersonControllerCreateTest extends WebTestCase
         );
         $this->assertEquals(
             3,
-            count($genderType->availableOptionValues()),
+            \count($genderType->availableOptionValues()),
             'The gender input has three options: man, women and undefined'
         );
         $this->assertTrue(
-            in_array('man', $genderType->availableOptionValues(), true),
+            \in_array('man', $genderType->availableOptionValues(), true),
             'gender has "homme" option'
         );
         $this->assertTrue(
-            in_array('woman', $genderType->availableOptionValues(), true),
+            \in_array('woman', $genderType->availableOptionValues(), true),
             'gender has "femme" option'
         );
         $this->assertFalse($genderType->hasValue(), 'The gender input is not checked');
@@ -134,51 +134,33 @@ final class PersonControllerCreateTest extends WebTestCase
         return $form;
     }
 
-    /**
-     * Test if, for a given person if its person view page (at the url
-     * fr/person/$personID/general) is accessible.
-     *
-     * @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'
-        );
-    }
-
     public function testReviewExistingDetectionInversedLastNameWithFirstName()
     {
-        $client = $this->client;
+        $this->markTestSkipped();
+        $client = $this->getClientAuthenticated();
 
         $crawler = $client->request('GET', '/fr/person/new');
 
-        //test the page is loaded before continuing
+        // test the page is loaded before continuing
         $this->assertTrue($client->getResponse()->isSuccessful());
 
-        $form = $crawler->selectButton('Ajouter la personne')->form();
-        $form = $this->fillAValidCreationForm($form, 'Charline', 'dd');
+        $form = $crawler->selectButton("Créer l'usager")->form();
+        $form = $this->fillAValidCreationForm($form, 'Charline', 'dd', new \DateTime('1970-10-15'));
         $client->submit($form);
 
         $this->assertStringContainsString(
-            'DEPARDIEU',
+            'usager a un nom similaire',
             $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();
+        // inversion
+        $form = $crawler->selectButton("Créer l'usager")->form();
         $form = $this->fillAValidCreationForm($form, 'dd', 'Charline');
         $client->submit($form);
 
         $this->assertStringContainsString(
-            'DEPARDIEU',
+            'usager a un nom similaire',
             $client->getCrawler()->text(),
             'check that the page has detected the lastname of a person existing in database'
         );
@@ -191,35 +173,14 @@ final class PersonControllerCreateTest extends WebTestCase
      */
     public function testValidForm()
     {
-        $client = $this->client;
+        $client = $this->getClientAuthenticated();
         $crawler = $client->request('GET', '/fr/person/new');
 
-        $form = $crawler->selectButton('Ajouter la personne')->form();
-        $this->fillAValidCreationForm($form);
-        $client = $this->client;
+        $form = $crawler->selectButton("Créer l'usager")->form();
+        $this->fillAValidCreationForm($form, uniqid(), uniqid());
         $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->assertMatchesRegularExpression(
-            '|/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];
+        self::assertResponseRedirects();
     }
 
     /**
@@ -236,10 +197,10 @@ final class PersonControllerCreateTest extends WebTestCase
             $client->getResponse()->isSuccessful(),
             'The page is accessible at the URL /{_locale}/person/new'
         );
-        $form = $crawler->selectButton('Ajouter la personne')->form();
+        $form = $crawler->selectButton("Créer l'usager")->form();
 
         // create a very long name to avoid collision
-        $this->fillAValidCreationForm($form, 'Carmela Girdana Assuntamente Castalle', 'rabbit');
+        $this->fillAValidCreationForm($form, uniqid(), uniqid());
 
         $this->assertTrue(
             $form->has(self::CENTER_INPUT),
@@ -254,27 +215,19 @@ final class PersonControllerCreateTest extends WebTestCase
 
         $client->submit($form);
 
-        $this->assertTrue(
-            $client->getResponse()->isRedirect(),
-            'a valid form redirect to url /{_locale}/person/{personId}/general/edit'
-        );
-        $client->followRedirect();
-        $this->assertMatchesRegularExpression(
-            '|/fr/person/[1-9][0-9]*/general/edit$|',
-            $client->getHistory()->current()->getUri(),
-            'a valid form redirect to url /{_locale}/person/{personId}/general/edit'
-        );
+        self::assertResponseRedirects();
     }
 
     private function fillAValidCreationForm(
         Form &$creationForm,
         string $firstname = 'God',
-        string $lastname = 'Jesus'
+        string $lastname = 'Jesus',
+        \DateTime $birthdate = null
     ) {
-        $creationForm->get(self::FIRSTNAME_INPUT)->setValue($firstname . '_' . uniqid());
-        $creationForm->get(self::LASTNAME_INPUT)->setValue($lastname . '_' . uniqid());
+        $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');
+        $date = $birthdate ?? 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 bb70866e2..d1ef1f1c9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
@@ -12,10 +12,12 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Person;
-use Closure;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
@@ -24,335 +26,172 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * As I am logged in as "center a_social"
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerUpdateTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    /**
-     * @var string The url using for editing the person's information
-     */
-    private $editUrl;
+    private readonly KernelBrowser $client;
 
     /**
-     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
+     * @var list<array<class-string, int>>
      */
-    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;
+    private static array $toDelete = [];
 
     /**
      * Prepare client and create a random person.
      */
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->em = self::$container
-            ->get(EntityManagerInterface::class);
-
-        $center = $this->em->getRepository(Center::class)
-            ->findOneBy(['name' => 'Center A']);
-
-        $this->person = (new Person())
-            ->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->client = $this->getClientAuthenticated();
-    }
+    protected function setUp(): void {}
 
     protected function tearDown(): void
     {
-        $this->refreshPerson();
-        $this->em->remove($this->person);
-        $this->em->flush();
+        self::ensureKernelShutdown();
     }
 
-    public function providesInvalidFieldsValues()
+    public static function tearDownAfterClass(): void
     {
-        return [
-            ['firstName', $this->getVeryLongText()],
-            ['lastName', $this->getVeryLongText()],
-            ['firstName', ''],
-            ['lastName', ''],
-            ['birthdate', 'false date'],
-        ];
-    }
+        self::bootKernel();
 
-    public function testEditLanguages()
-    {
-        $crawler = $this->client->request('GET', $this->editUrl);
-        $selectedLanguages = ['en', 'an', 'bbj'];
+        $em = self::$container->get(EntityManagerInterface::class);
 
-        $form = $crawler->selectButton('Enregistrer')
-            ->form();
-        $form->get('chill_personbundle_person[spokenLanguages]')
-            ->setValue($selectedLanguages);
+        foreach (self::$toDelete as [$class, $id]) {
+            $entity = $em->find($class, $id);
 
-        $this->client->submit($form);
-        $this->refreshPerson();
+            if (null === $entity) {
+                throw new \RuntimeException(sprintf('entity not found: %s, %d', $class, $id));
+            }
 
-        $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();
+            $em->remove($entity);
         }
-        $this->assertEquals(
-            asort($selectedLanguages),
-            asort($languagesCodesPresents),
-            'the person speaks the expected languages'
-        );
+
+        $em->flush();
+        self::ensureKernelShutdown();
     }
 
     /**
      * Test the edit page of a given person are not accessible for an
      * administrative user.
+     *
+     * @dataProvider providePerson
      */
-    public function testEditPageDeniedForUnauthorizedInsideCenter()
+    public function testEditPageDeniedForUnauthorizedInsideCenter(int $personId)
     {
         $client = self::createClient([], [
             'PHP_AUTH_USER' => 'center a_administrative',
             'PHP_AUTH_PW' => 'password',
         ]);
 
-        $client->request('GET', $this->editUrl);
-        $this->assertEquals(403, $client->getResponse()->getStatusCode());
+        $client->request('GET', $this->makeEditPath($personId));
+
+        self::assertResponseStatusCodeSame(403);
     }
 
     /**
      * Test if the edit page of a given person is not accessible for a user
      * of another center of the person.
+     *
+     * @dataProvider providePerson
      */
-    public function testEditPageDeniedForUnauthorizedOutsideCenter()
+    public function testEditPageDeniedForUnauthorizedOutsideCenter(int $personId)
     {
         $client = self::createClient([], [
             'PHP_AUTH_USER' => 'center b_social',
             'PHP_AUTH_PW' => 'password',
         ]);
 
-        $client->request('GET', $this->editUrl);
-        $this->assertEquals(
+        $client->request('GET', $this->makeEditPath($personId));
+
+        self::assertResponseStatusCodeSame(
             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.
+     *
+     * @dataProvider providePerson     *
      */
-    public function testEditPageIsSuccessful()
+    public function testEditPageIsSuccessful(int $personId)
     {
-        $this->client->request('GET', $this->editUrl);
-        $this->assertTrue(
-            $this->client->getResponse()->isSuccessful(),
-            'The person edit form is accessible'
-        );
+        $client = $this->getClientAuthenticated();
+
+        $crawler = $client->request('GET', $this->makeEditPath($personId));
+
+        self::assertResponseIsSuccessful('The person edit form is accessible');
+
+        $form = $crawler->selectButton('Enregistrer')->form();
+
+        $form['chill_personbundle_person[firstName]'] = 'tagada';
+
+        $client->submit($form);
+
+        self::assertResponseRedirects($this->makeViewPath($personId));
+
+        $person = self::$container->get(PersonRepository::class)->find($personId);
+
+        self::assertEquals('tagada', $person->getFirstName());
     }
 
     /**
-     * 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
+     * @dataProvider providePerson
      */
-    public function testEditTextField($field, $value, Closure $callback)
+    public function testEditPageWithErrorIsNotProcessable(int $personId)
     {
-        $crawler = $this->client->request('GET', $this->editUrl);
+        $client = $this->getClientAuthenticated();
 
-        $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(\Chill\MainBundle\Entity\Country::class)
-                        ->findOneByCountryCode($value);
-                    $transformedValue = $country->getId();
-                } else {
-                    $transformedValue = '';
-                }
+        $crawler = $client->request('GET', $this->makeEditPath($personId));
 
-                break;
+        self::assertResponseIsSuccessful('The person edit form is accessible');
 
-            default:
-                $transformedValue = $value;
-        }
+        $form = $crawler->selectButton('Enregistrer')->form();
 
-        $form->get('chill_personbundle_person[' . $field . ']')
-            ->setValue($transformedValue);
+        $form['chill_personbundle_person[firstName]'] = '';
 
-        $this->client->submit($form);
-        $this->refreshPerson();
+        $crawler = $client->submit($form);
 
-        $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'
-        );
+        self::assertResponseIsSuccessful('the page is successful but not redirected');
 
-        $crawler = $this->client->followRedirect();
-        $this->assertGreaterThan(
-            0,
-            $crawler->filter('.alert-success')->count(),
-            'a element .success is shown'
-        );
+        $alerts = $crawler->filter('.alert-danger');
 
-        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());
-        }
+        self::assertEquals(1, $alerts->count(), 'there is an alert message displayed on the page');
     }
 
-    /**
-     * Test the configurable fields are present.
-     *
-     * @group configurable_fields
-     */
-    public function testHiddenFielsArePresent()
+    public static function providePerson(): iterable
     {
-        $crawler = $this->client->request('GET', $this->editUrl);
-        $configurables = ['placeOfBirth', 'phonenumber', 'email',
-            'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus', ];
-        $form = $crawler->selectButton('Enregistrer')->form(); //;
+        self::bootKernel();
+        $centerRepository = self::$container->get(CenterRepositoryInterface::class);
+        $em = self::$container->get(EntityManagerInterface::class);
+        $center = $centerRepository->findOneBy(['name' => 'Center A']);
 
-        foreach ($configurables as $key) {
-            $this->assertTrue($form->has('chill_personbundle_person[' . $key . ']'));
-        }
+        $person = new Person();
+        $person
+            ->setFirstName('Foo')
+            ->setLastName('Bar')
+            ->setBirthdate(new \DateTime('2017-09-30'))
+            ->setGender(Person::MALE_GENDER)
+            ->setCenter($center);
+
+        $em->persist($person);
+
+        self::$toDelete[] = [Person::class, $person->getId()];
+
+        $em->flush();
+
+        yield [$person->getId()];
+
+        self::ensureKernelShutdown();
     }
 
-    /**
-     * Test tbe detection of invalid data during the update procedure.
-     *
-     * @dataProvider providesInvalidFieldsValues
-     *
-     * @param string $field
-     * @param string $value
-     */
-    public function testInvalidFields($field, $value)
+    private function makeEditPath(int $personId): string
     {
-        $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'
-        );
+        return "/fr/person/{$personId}/general/edit";
     }
 
-    /**
-     * provide valid values to test, with field name and
-     * a function to find the value back from person entity.
-     *
-     * @return mixed[]
-     */
-    public function validTextFieldsProvider()
+    private function makeViewPath(int $personId): string
     {
-        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');
-            }],
-            // TODO test on phonenumber update
-            // ['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(\Chill\PersonBundle\Entity\Person::class)
-            ->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 "/fr/person/{$personId}/general";
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
index 403f89dd4..d23fbcb7a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
@@ -11,10 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Controller;
 
-//ini_set('memory_limit', '-1');
+// ini_set('memory_limit', '-1');
 
 use Chill\PersonBundle\Entity\Person;
-use Closure;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
@@ -23,6 +22,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
  * As I am logged in as "center a_social"
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
@@ -30,22 +30,16 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
     /**
      * @var string The url using for editing the person's information
      */
-    private $editUrl;
+    private string $editUrl;
 
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
-     */
-    private $em;
+    private ?object $em = null;
 
-    /**
-     * @var Person The person on which the test is executed
-     */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
      * @var string The url using for seeing the person's information
      */
-    private $viewUrl;
+    private string $viewUrl;
 
     /**
      * Prepare client and create a random person.
@@ -69,8 +63,8 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
         $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->editUrl = '/en/person/'.$this->person->getId().'/general/edit';
+        $this->viewUrl = '/en/person/'.$this->person->getId().'/general';
 
         $this->client = self::createClient(
             [
@@ -115,13 +109,13 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
      * @param string $field
      * @param string $value
      */
-    public function testEditTextField($field, $value, 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
+        // transform countries into value if needed
         switch ($field) {
             case 'nationality':
             case 'countryOfBirth':
@@ -139,7 +133,7 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
                 $transformedValue = $value;
         }
 
-        $form->get('chill_personbundle_person[' . $field . ']')
+        $form->get('chill_personbundle_person['.$field.']')
             ->setValue($transformedValue);
 
         $this->client->submit($form);
@@ -152,7 +146,7 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
         $this->assertEquals(
             $value,
             $callback($this->person),
-            'the value ' . $field . ' is updated in db'
+            'the value '.$field.' is updated in db'
         );
 
         $crawler = $this->client->followRedirect();
@@ -166,7 +160,7 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
                 || 'gender' === $field) {
             // we do not perform test on the web page contents.
         } else {
-            $this->assertGreaterThan(0, $crawler->filter('html:contains("' . $value . '")')->count());
+            $this->assertGreaterThan(0, $crawler->filter('html:contains("'.$value.'")')->count());
         }
     }
 
@@ -181,10 +175,10 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
 
         $configurables = ['placeOfBirth', 'phonenumber', 'email',
             'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus', ];
-        $form = $crawler->selectButton('Submit')->form(); //;
+        $form = $crawler->selectButton('Submit')->form(); // ;
 
         foreach ($configurables as $key) {
-            $this->assertFalse($form->has('chill_personbundle_person[' . $key . ']'));
+            $this->assertFalse($form->has('chill_personbundle_person['.$key.']'));
         }
     }
 
@@ -197,24 +191,12 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
     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();
-            }],
+            ['firstName', 'random Value', static fn (Person $person) => $person->getFirstName()],
+            ['lastName', 'random Value', static fn (Person $person) => $person->getLastName()],
+            ['birthdate', '15-12-1980', static fn (Person $person) => $person->getBirthdate()->format('d-m-Y')],
+            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static fn (Person $person) => $person->getMemo()],
+            ['birthdate', '', static fn (Person $person) => $person->getBirthdate()],
+            ['gender', Person::FEMALE_GENDER, static fn (Person $person) => $person->getGender()],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
index 789b520a5..8c1a397aa 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
@@ -11,109 +11,115 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Controller;
 
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerViewTest extends WebTestCase
 {
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
-     */
-    private $em;
+    use PrepareClientTrait;
 
     /**
-     * @var Person A person used on which to run the test
+     * @var list<array<class-string, int>>
      */
-    private $person;
-
-    /**
-     * @var string The url to view the person details
-     */
-    private $viewUrl;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->em = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
-
-        $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class)
-            ->findOneBy(['name' => 'Center A']);
-
-        $this->person = (new Person())
-            ->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';
-    }
+    private static array $toDelete = [];
 
     protected function tearDown(): void
     {
-        $this->refreshPerson();
-        $this->em->remove($this->person);
-        $this->em->flush();
+        self::ensureKernelShutdown();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::bootKernel();
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        foreach (self::$toDelete as [$class, $id]) {
+            $entity = $em->find($class, $id);
+
+            if (null === $entity) {
+                throw new \RuntimeException(sprintf('entity not found: %s, %d', $class, $id));
+            }
+
+            $em->remove($entity);
+        }
+
+        $em->flush();
     }
 
     /**
      * Test if the  view page is accessible.
      *
      * @group configurable_fields
+     *
+     * @dataProvider providePerson
      */
-    public function testViewPerson()
+    public function testViewPerson(int $personId): void
     {
-        $client = self::createClient([], [
-            'PHP_AUTH_USER' => 'center a_social',
-            'PHP_AUTH_PW' => 'password',
-        ]);
+        $client = $this->getClientAuthenticated();
 
-        $crawler = $client->request('GET', $this->viewUrl);
-        $response = $client->getResponse();
+        $crawler = $client->request('GET', $this->makeViewPath($personId));
 
-        $this->assertTrue($response->isSuccessful());
+        self::assertResponseIsSuccessful();
 
-        $this->assertGreaterThan(0, $crawler->filter('html:contains("TESTED PERSON")')->count());
-        $this->assertGreaterThan(0, $crawler->filter('html:contains("Réginald")')->count());
-        $this->assertStringContainsString('Email addresses', $crawler->text());
-        $this->assertStringContainsString('Phonenumber', $crawler->text());
-        $this->assertStringContainsString('Langues parlées', $crawler->text());
-        $this->assertStringContainsString(/* Etat */ 'civil', $crawler->text());
+        $this->assertGreaterThan(0, $crawler->filter('html:contains("Foo")')->count());
+        $this->assertGreaterThan(0, $crawler->filter('html:contains("BAR")')->count());
     }
 
     /**
      * Test if the view page of a given person is not accessible for a user
      * of another center of the person.
+     *
+     * @dataProvider providePerson
      */
-    public function testViewPersonAccessDeniedForUnauthorized()
+    public function testViewPersonAccessDeniedForUnauthorized(int $personId): void
     {
-        $client = self::createClient([], [
-            'PHP_AUTH_USER' => 'center b_social',
-            'PHP_AUTH_PW' => 'password',
-        ]);
+        $client = $this->getClientAuthenticated('center b_social');
 
-        $client->request('GET', $this->viewUrl);
-        $this->assertEquals(
+        $client->request('GET', $this->makeViewPath($personId));
+
+        self::assertResponseStatusCodeSame(
             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.
-     */
-    protected function refreshPerson()
+    public static function providePerson(): iterable
     {
-        $this->person = $this->em->getRepository(\Chill\PersonBundle\Entity\Person::class)
-            ->find($this->person->getId());
+        self::bootKernel();
+        $centerRepository = self::$container->get(CenterRepositoryInterface::class);
+        $em = self::$container->get(EntityManagerInterface::class);
+        $center = $centerRepository->findOneBy(['name' => 'Center A']);
+
+        $person = new Person();
+        $person
+            ->setFirstName('Foo')
+            ->setLastName('Bar')
+            ->setBirthdate(new \DateTime('2017-09-30'))
+            ->setGender(Person::MALE_GENDER)
+            ->setCenter($center);
+
+        $em->persist($person);
+
+        self::$toDelete[] = [Person::class, $person->getId()];
+
+        $em->flush();
+
+        yield [$person->getId()];
+
+        self::ensureKernelShutdown();
+    }
+
+    private function makeViewPath(int $personId): string
+    {
+        return "/fr/person/{$personId}/general";
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
index f4722d685..e0d56204f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
@@ -16,52 +16,51 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonControllerViewWithHiddenFieldsTest extends WebTestCase
 {
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
-     */
-    private $em;
+    private ?object $em = null;
 
-    /**
-     * @var Person A person used on which to run the test
-     */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
      * @var string The url to view the person details
      */
-    private $viewUrl;
+    private readonly string $viewUrl;
 
     protected function setUp(): void
     {
-        self::bootKernel(['environment' => 'test_with_hidden_fields']);
-
-        $this->em = self::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager');
-
-        $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class)
-            ->findOneBy(['name' => 'Center A']);
-
-        $this->person = (new Person())
-            ->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';
+        /*
+         * self::bootKernel(['environment' => 'test_with_hidden_fields']);
+         *
+         * $this->em = self::$kernel->getContainer()
+         * ->get('doctrine.orm.entity_manager');
+         *
+         * $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class)
+         * ->findOneBy(['name' => 'Center A']);
+         *
+         * $this->person = (new Person())
+         * ->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';
+         */
     }
 
     protected function tearDown(): void
     {
+        /*
         $this->refreshPerson();
         $this->em->remove($this->person);
         $this->em->flush();
+        */
     }
 
     /**
@@ -69,7 +68,7 @@ final class PersonControllerViewWithHiddenFieldsTest extends WebTestCase
      *
      * @group configurable_fields
      */
-    public function testViewPerson()
+    public function testViewPerson(): never
     {
         $this->markTestSkipped('This configuration does not allow multiple environnements');
         $client = self::createClient(
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
index d6f4ca7cf..38e482fe9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
@@ -11,50 +11,67 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Controller;
 
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonDuplicateControllerViewTest extends WebTestCase
 {
-    protected function setUp(): void
+    public function providePersonData(): iterable
     {
         self::bootKernel();
 
-        $this->em = self::$container
-            ->get('doctrine.orm.entity_manager');
+        /** @var EntityManagerInterface $em */
+        $em = self::$container->get(EntityManagerInterface::class);
+        /** @var CenterRepositoryInterface $centerRepository */
+        $centerRepository = self::$container->get(CenterRepositoryInterface::class);
 
-        $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class)
-            ->findOneBy(['name' => 'Center A']);
-
-        $this->person = (new Person())
+        $center = $centerRepository->findOneBy(['name' => 'Center A']);
+        $person = (new Person())
             ->setLastName('Tested Persan')
             ->setFirstName('Réginal')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
-        $this->em->persist($this->person);
+        $em->persist($person);
 
-        $this->person2 = (new Person())
+        foreach ($person->getCenterHistory() as $centerHistory) {
+            $em->persist($centerHistory);
+        }
+
+        $person2 = (new Person())
             ->setLastName('Tested Person')
             ->setFirstName('Réginald')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
-        $this->em->persist($this->person2);
+        $em->persist($person2);
 
-        $this->em->flush();
+        foreach ($person2->getCenterHistory() as $centerHistory) {
+            $em->persist($centerHistory);
+        }
+
+        $em->flush();
+        $em->clear();
+
+        yield [$person->getId(), $person2->getId()];
     }
 
-    public function testViewDuplicatePerson()
+    /**
+     * @dataProvider providePersonData
+     */
+    public function testViewDuplicatePerson(int $personId, int $person2Id): void
     {
         $client = self::createClient([], [
             'PHP_AUTH_USER' => 'center a_social',
             'PHP_AUTH_PW' => 'password',
         ]);
 
-        $crawler = $client->request('GET', '/en/person/' . $this->person->getId() . '/duplicate/view');
+        $crawler = $client->request('GET', '/en/person/'.$personId.'/duplicate/view');
         $response = $client->getResponse();
         $this->assertTrue($response->isSuccessful());
 
@@ -62,14 +79,14 @@ final 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/'.$personId.'/duplicate/'.$person2Id.'/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', [
+        $crawler = $client->request('POST', '/en/person/'.$personId.'/duplicate/'.$person2Id.'/confirm', [
             'chill_personbundle_person_confirm_duplicate[confirm]' => 1,
         ]);
         $response = $client->getResponse();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
index 67b45acd5..7e191b91e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
@@ -15,23 +15,18 @@ 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.
      *
@@ -39,10 +34,9 @@ final class RelationshipApiControllerTest extends WebTestCase
      */
     private ?array $relations = null;
 
-    protected function setUp(): void
+    protected function tearDown(): void
     {
-        self::bootKernel();
-        $this->client = $this->getClientAuthenticated();
+        self::ensureKernelShutdown();
     }
 
     public function personProvider(): array
@@ -52,7 +46,8 @@ final class RelationshipApiControllerTest extends WebTestCase
         $countPersons = $em->createQueryBuilder()
             ->select('count(p)')
             ->from(Person::class, 'p')
-            ->join('p.center', 'c')
+            ->join('p.centerCurrent', 'center_current')
+            ->join('center_current.center', 'c')
             ->where('c.name LIKE :name')
             ->setParameter('name', 'Center A')
             ->getQuery()
@@ -60,14 +55,17 @@ final class RelationshipApiControllerTest extends WebTestCase
         $person = $em->createQueryBuilder()
             ->select('p')
             ->from(Person::class, 'p')
-            ->join('p.center', 'c')
+            ->join('p.centerCurrent', 'center_current')
+            ->join('center_current.center', 'c')
             ->where('c.name LIKE :name')
             ->setParameter('name', 'Center A')
             ->getQuery()
             ->setMaxResults(1)
-            ->setFirstResult(random_int(0, $countPersons - 1))
+            ->setFirstResult(\random_int(0, $countPersons - 1))
             ->getSingleResult();
 
+        self::ensureKernelShutdown();
+
         return [
             [$person->getId()],
         ];
@@ -78,24 +76,29 @@ final class RelationshipApiControllerTest extends WebTestCase
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
         $countPersons = $em->createQueryBuilder()
-            ->select('count(p)')
+            ->select('count(DISTINCT p)')
             ->from(Person::class, 'p')
-            ->join('p.center', 'c')
+            ->join('p.centerCurrent', 'center_current')
+            ->join('center_current.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')
+            ->join('p.centerCurrent', 'center_current')
+            ->join('center_current.center', 'c')
             ->where('c.name LIKE :name')
             ->setParameter('name', 'Center A')
             ->getQuery()
             ->setMaxResults(2)
-            ->setFirstResult(random_int(0, $countPersons - 1))
+            ->setFirstResult(\random_int(0, $countPersons - 1))
             ->getResult();
 
+        self::ensureKernelShutdown();
+
         return [
             [$persons[0]->getId(), $persons[1]->getId(), $this->getRandomRelation($em)->getId(), true],
         ];
@@ -103,43 +106,40 @@ final class RelationshipApiControllerTest extends WebTestCase
 
     /**
      * @dataProvider personProvider
-     *
-     * @param mixed $personId
      */
-    public function testGetRelationshipByPerson($personId)
+    public function testGetRelationshipByPerson(mixed $personId)
     {
-        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/relations/relationship/by-person/%d.json', $personId));
+        self::ensureKernelShutdown();
+        $client = $this->getClientAuthenticated();
+        $client->request(Request::METHOD_GET, sprintf('/api/1.0/relations/relationship/by-person/%d.json', $personId));
 
-        $response = $this->client->getResponse();
+        $response = $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
+    public function testPostRelationship(mixed $fromPersonId, mixed $toPersonId, mixed $relationId, mixed $isReverse): void
     {
-        $this->client->request(
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
             Request::METHOD_POST,
             '/api/1.0/relations/relationship.json',
             [],
             [],
             [],
-            json_encode([
+            \json_encode([
                 'type' => 'relationship',
                 'fromPerson' => ['id' => $fromPersonId, 'type' => 'person'],
                 'toPerson' => ['id' => $toPersonId, 'type' => 'person'],
                 'relation' => ['id' => $relationId, 'type' => 'relation'],
                 'reverse' => $isReverse,
-            ])
+            ], JSON_THROW_ON_ERROR)
         );
 
-        $response = $this->client->getResponse();
+        $response = $client->getResponse();
         $this->assertEquals(200, $response->getStatusCode());
     }
 
@@ -150,6 +150,6 @@ final class RelationshipApiControllerTest extends WebTestCase
                 ->findAll();
         }
 
-        return $this->relations[array_rand($this->relations)];
+        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 a0dcae59a..c7ca4c4bb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
@@ -14,23 +14,19 @@ namespace Chill\PersonBundle\Tests\Controller;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use function array_pop;
-use function count;
-use function json_decode;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueApiControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    protected function setUp(): void
+    protected function tearDown(): void
     {
-        parent::setUp();
-
-        self::bootKernel();
+        self::ensureKernelShutdown();
     }
 
     /**
@@ -40,14 +36,14 @@ final 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, 512, JSON_THROW_ON_ERROR);
 
         $this->assertArrayHasKey('id', $data);
         $this->assertArrayHasKey('type', $data);
@@ -60,10 +56,10 @@ final class SocialIssueApiControllerTest extends WebTestCase
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
-        $data = json_decode($client->getResponse()->getContent(), true);
+        $data = \json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $this->assertGreaterThan(0, $data['count']);
-        $this->assertGreaterThan(0, count($data['results']));
+        $this->assertGreaterThan(0, \count($data['results']));
 
         return $data;
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialWorkEvaluationApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialWorkEvaluationApiControllerTest.php
index aa98fdcd3..f4609ddc1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialWorkEvaluationApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialWorkEvaluationApiControllerTest.php
@@ -19,6 +19,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialWorkEvaluationApiControllerTest extends WebTestCase
@@ -52,7 +53,7 @@ final class SocialWorkEvaluationApiControllerTest extends WebTestCase
 
         /** @var SocialAction $socialAction */
         $socialAction = $this->em->createQuery(
-            'SELECT s FROM ' . SocialAction::class . ' s WHERE SIZE(s.evaluations) >= 2'
+            'SELECT s FROM '.SocialAction::class.' s WHERE SIZE(s.evaluations) >= 2'
         )
             ->setMaxResults(1)
             ->getSingleResult();
@@ -77,7 +78,7 @@ final class SocialWorkEvaluationApiControllerTest extends WebTestCase
 
         $this->assertResponseIsSuccessful();
 
-        $content = json_decode($client->getResponse()->getContent(), true);
+        $content = json_decode($client->getResponse()->getContent(), true, 512, JSON_THROW_ON_ERROR);
 
         $ids = array_map(static fn (array $item) => $item['id'], $content['results']);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php
new file mode 100644
index 000000000..45c2ed680
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/AccompanyingPeriodWorkTest.php
@@ -0,0 +1,96 @@
+<?php
+
+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 Chill\PersonBundle\Tests\Entity\AccompanyingPeriod;
+
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkReferrerHistory;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AccompanyingPeriodWorkTest extends TestCase
+{
+    public function testReferrerHistory(): void
+    {
+        $work = new AccompanyingPeriodWork();
+        $userA = new User();
+        $userB = new User();
+        $userC = new User();
+
+        self::assertCount(0, $work->getReferrers());
+
+        $work->addReferrer($userA);
+
+        self::assertCount(1, $work->getReferrers());
+        self::assertContains($userA, $work->getReferrers());
+
+        $work->addReferrer($userB);
+
+        self::assertCount(2, $work->getReferrers());
+        self::assertContains($userA, $work->getReferrers());
+        self::assertContains($userB, $work->getReferrers());
+
+        $work->addReferrer($userC);
+        $work->removeReferrer($userB);
+
+        self::assertCount(2, $work->getReferrers());
+        self::assertContains($userA, $work->getReferrers());
+        self::assertNotContains($userB, $work->getReferrers());
+        self::assertContains($userC, $work->getReferrers());
+
+        $work->removeReferrer($userA);
+        self::assertNotContains($userA, $work->getReferrers());
+        self::assertNotContains($userB, $work->getReferrers());
+        self::assertContains($userC, $work->getReferrers());
+    }
+
+    public function testReferrerHistoryOnDifferentDays(): void
+    {
+        $work = new AccompanyingPeriodWork();
+        $userA = new User();
+        $userB = new User();
+        $userC = new User();
+
+        $work->addReferrer($userA);
+
+        $historyA = $work->getReferrersHistory()->first();
+        $reflection = new \ReflectionClass($historyA);
+        $startDateReflection = $reflection->getProperty('startDate');
+        $startDateReflection->setAccessible(true);
+        $startDateReflection->setValue($historyA, new \DateTimeImmutable('1 year ago'));
+
+        $work->addReferrer($userB);
+        $work->addReferrer($userC);
+
+        $work->removeReferrer($userB);
+        $work->removeReferrer($userA);
+
+        self::assertCount(1, $work->getReferrers());
+        self::assertNotContains($userA, $work->getReferrers());
+        self::assertNotContains($userB, $work->getReferrers());
+        self::assertContains($userC, $work->getReferrers());
+
+        self::assertCount(2, $work->getReferrersHistory());
+
+        $historyA = $work->getReferrersHistory()
+            ->filter(fn (AccompanyingPeriodWorkReferrerHistory $h) => $userA === $h->getUser())
+            ->first();
+
+        self::assertNotFalse($historyA);
+        self::assertSame($userA, $historyA->getUser());
+        self::assertEquals((new \DateTimeImmutable())->format('Y-m-d'), $historyA->getEndDate()->format('Y-m-d'));
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
index 98b0f8019..336b81511 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
@@ -18,6 +18,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResourceTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
index 2f38da244..5fdb51c15 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Entity;
 
-use ArrayIterator;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -19,12 +18,10 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTime;
-use DateTimeInterface;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
@@ -44,12 +41,12 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertCount(1, $period->getStepHistories());
         $this->assertEquals(AccompanyingPeriod::STEP_CONFIRMED, $period->getStepHistories()->first()->getStep());
 
-        $period->setOpeningDate($aMonthAgo = new DateTime('1 month ago'));
+        $period->setOpeningDate($aMonthAgo = new \DateTime('1 month ago'));
 
         $this->assertCount(1, $period->getStepHistories());
         $this->assertEquals($aMonthAgo, $period->getStepHistories()->first()->getStartDate(), 'when changing the opening date, the start date of the first history should change');
 
-        $period->setOpeningDate($tenDaysAgo = new DateTime('10 days ago'));
+        $period->setOpeningDate($tenDaysAgo = new \DateTime('10 days ago'));
 
         $this->assertCount(1, $period->getStepHistories());
         $this->assertEquals($tenDaysAgo, $period->getStepHistories()->first()->getStartDate(), 'when changing the opening date, the start date of the first history should change');
@@ -57,13 +54,13 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $period->setStep(AccompanyingPeriod::STEP_CLOSED);
         $this->assertCount(2, $period->getStepHistories());
 
-        $period->setOpeningDate($tomorrow = new DateTime('tomorrow'));
+        $period->setOpeningDate($tomorrow = new \DateTime('tomorrow'));
         $this->assertEquals($tenDaysAgo, $period->getStepHistories()->first()->getStartDate(), 'when changing the opening date to a later one and no history after, start date should change');
     }
 
     public function testClosingEqualOpening()
     {
-        $datetime = new DateTime('now');
+        $datetime = new \DateTime('now');
 
         $period = new AccompanyingPeriod($datetime);
         $period->setClosingDate($datetime);
@@ -73,8 +70,8 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
     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);
@@ -86,8 +83,8 @@ final 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);
@@ -138,12 +135,14 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertCount(1, $period->getLocationHistories());
 
         $this->assertSame($address, $period->getLocationHistories()->first()->getAddressLocation());
+        $this->assertNull($period->getLocationHistories()->first()->getPersonLocation());
 
         $period->setPersonLocation($person);
         $period->setAddressLocation(null);
 
         $this->assertCount(2, $period->getLocationHistories());
         $this->assertSame($person, $period->getLocationHistories()->last()->getPersonLocation());
+        $this->assertNull($period->getLocationHistories()->last()->getAddressLocation());
 
         $period->setAddressLocation($address);
         $period->setPersonLocation(null);
@@ -152,11 +151,9 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
         $locations = $period->getLocationHistories()->toArray();
 
-        usort($locations, static function (AccompanyingPeriod\AccompanyingPeriodLocationHistory $a, AccompanyingPeriod\AccompanyingPeriodLocationHistory $b) {
-            return $a->getStartDate() <=> $b->getStartDate();
-        });
+        usort($locations, static fn (AccompanyingPeriod\AccompanyingPeriodLocationHistory $a, AccompanyingPeriod\AccompanyingPeriodLocationHistory $b) => $a->getStartDate() <=> $b->getStartDate());
 
-        $iterator = new ArrayIterator($locations);
+        $iterator = new \ArrayIterator($locations);
         $iterator->rewind();
 
         do {
@@ -174,17 +171,37 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         } while ($iterator->valid());
     }
 
+    public function testHistoryLocationNotHavingBothAtStart()
+    {
+        $period = new AccompanyingPeriod();
+        $person = new Person();
+        $address = new Address();
+
+        $period->setAddressLocation($address);
+        $period->setPersonLocation($person);
+
+        $period->setStep(AccompanyingPeriod::STEP_CONFIRMED);
+
+        $this->assertCount(1, $period->getLocationHistories());
+
+        self::assertNull($period->getAddressLocation());
+        self::assertNull($period->getLocationHistories()->first()->getAddressLocation());
+        self::assertSame($person, $period->getLocationHistories()->first()->getPersonLocation());
+        self::assertSame($person, $period->getPersonLocation());
+        self::assertEquals('person', $period->getLocationStatus());
+    }
+
     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());
+        $period = new AccompanyingPeriod(new \DateTime());
 
         $this->assertTrue($period->isOpen());
     }
@@ -194,7 +211,7 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $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);
@@ -217,7 +234,7 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
         if ($participationL instanceof AccompanyingPeriodParticipation) {
             $this->assertSame($participationL, $participation);
-            $this->assertTrue($participationL->getEndDate() instanceof DateTimeInterface);
+            $this->assertTrue($participationL->getEndDate() instanceof \DateTimeInterface);
         }
 
         $participation = $period->getOpenParticipationContainsPerson($person);
@@ -239,7 +256,7 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
     public function testPinnedComment()
     {
-        $period = new AccompanyingPeriod(new DateTime());
+        $period = new AccompanyingPeriod(new \DateTime());
         $comment = new Comment();
         $replacingComment = new Comment();
 
@@ -250,14 +267,14 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
         $this->assertSame($period->getPinnedComment(), $comment);
         $this->assertNull($comment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()));
+        $this->assertEquals(0, \count($period->getComments()));
 
         $period->setPinnedComment($replacingComment);
 
         $this->assertSame($period->getPinnedComment(), $replacingComment);
         $this->assertNull($replacingComment->getAccompanyingPeriod());
         $this->assertSame($period, $comment->getAccompanyingPeriod());
-        $this->assertEquals(1, count($period->getComments()));
+        $this->assertEquals(1, \count($period->getComments()));
         $this->assertContains($comment, $period->getComments());
 
         $period->setPinnedComment(null);
@@ -265,14 +282,14 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertNull($period->getPinnedComment());
         $this->assertSame($period, $comment->getAccompanyingPeriod());
         $this->assertSame($period, $replacingComment->getAccompanyingPeriod());
-        $this->assertEquals(2, count($period->getComments()));
+        $this->assertEquals(2, \count($period->getComments()));
         $this->assertContains($comment, $period->getComments());
         $this->assertContains($replacingComment, $period->getComments());
     }
 
     public function testRequestor()
     {
-        $period = new AccompanyingPeriod(new DateTime());
+        $period = new AccompanyingPeriod(new \DateTime());
         $person = new Person();
         $thirdParty = new ThirdParty();
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
index c728104ae..c5c6a38d1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
@@ -17,6 +17,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdMemberTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
index 7cbb4f95b..beb5ac073 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
@@ -16,12 +16,11 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdComposition;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdTest extends TestCase
@@ -31,38 +30,38 @@ final class HouseholdTest extends TestCase
         $household = new Household();
 
         $household->addMember($householdMemberA = (new HouseholdMember())
-            ->setStartDate(new DateTimeImmutable('2020-01-01'))
-            ->setEndDate(new DateTimeImmutable('2020-12-31'))
+            ->setStartDate(new \DateTimeImmutable('2020-01-01'))
+            ->setEndDate(new \DateTimeImmutable('2020-12-31'))
             ->setPerson(new Person()));
         $household->addMember($householdMemberB = (new HouseholdMember())
-            ->setStartDate(new DateTimeImmutable('2020-06-01'))
-            ->setEndDate(new DateTimeImmutable('2021-06-31'))
+            ->setStartDate(new \DateTimeImmutable('2020-06-01'))
+            ->setEndDate(new \DateTimeImmutable('2021-06-31'))
             ->setPerson(new Person()));
         $household->addMember($householdMemberC = (new HouseholdMember())
-            ->setStartDate(new DateTimeImmutable('2021-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2021-01-01'))
             ->setEndDate(null)
             ->setPerson(new Person()));
 
-        $members = $household->getMembersOnRange(new DateTimeImmutable('2019-01-01'), null);
+        $members = $household->getMembersOnRange(new \DateTimeImmutable('2019-01-01'), null);
 
         $this->assertCount(3, $members);
         $this->assertContains($householdMemberA, $members);
         $this->assertContains($householdMemberB, $members);
         $this->assertContains($householdMemberC, $members);
 
-        $members = $household->getMembersOnRange(new DateTimeImmutable('2020-01-01'), new DateTimeImmutable('2020-07-01'));
+        $members = $household->getMembersOnRange(new \DateTimeImmutable('2020-01-01'), new \DateTimeImmutable('2020-07-01'));
         $this->assertCount(2, $members);
         $this->assertContains($householdMemberA, $members);
         $this->assertContains($householdMemberB, $members);
         $this->assertNotContains($householdMemberC, $members);
 
-        $members = $household->getMembersOnRange(new DateTimeImmutable('2020-01-01'), new DateTimeImmutable('2022-12-31'));
+        $members = $household->getMembersOnRange(new \DateTimeImmutable('2020-01-01'), new \DateTimeImmutable('2022-12-31'));
         $this->assertCount(3, $members);
         $this->assertContains($householdMemberA, $members);
         $this->assertContains($householdMemberB, $members);
         $this->assertContains($householdMemberC, $members);
 
-        $members = $household->getMembersOnRange(new DateTimeImmutable('2021-01-01'), new DateTimeImmutable('2022-12-31'));
+        $members = $household->getMembersOnRange(new \DateTimeImmutable('2021-01-01'), new \DateTimeImmutable('2022-12-31'));
         $this->assertCount(2, $members);
         $this->assertNotContains($householdMemberA, $members);
         $this->assertContains($householdMemberB, $members);
@@ -74,16 +73,16 @@ final class HouseholdTest extends TestCase
         $household = new Household();
 
         $lastAddress = new Address();
-        $lastAddress->setValidFrom($yesterday = new DateTime('yesterday'));
-        $lastAddress->setValidTo(new DateTime('tomorrow'));
+        $lastAddress->setValidFrom($yesterday = new \DateTime('yesterday'));
+        $lastAddress->setValidTo(new \DateTime('tomorrow'));
         $household->addAddress($lastAddress);
 
         $this->assertNull($lastAddress->getValidTo());
         $this->assertEquals($yesterday, $lastAddress->getValidFrom());
 
         $previousAddress = new Address();
-        $previousAddress->setValidFrom($oneMonthAgo = new DateTime('1 month ago'));
-        $previousAddress->setValidTo(new DateTime('now'));
+        $previousAddress->setValidFrom($oneMonthAgo = new \DateTime('1 month ago'));
+        $previousAddress->setValidTo(new \DateTime('now'));
         $household->addAddress($previousAddress);
 
         $addresses = $household->getAddressesOrdered();
@@ -96,8 +95,8 @@ final class HouseholdTest extends TestCase
         $this->assertNull($lastAddress->getValidTo());
 
         $futureAddress = new Address();
-        $futureAddress->setValidFrom($tomorrow = new DateTime('tomorrow'));
-        $futureAddress->setValidTo(new DateTime('2150-01-01'));
+        $futureAddress->setValidFrom($tomorrow = new \DateTime('tomorrow'));
+        $futureAddress->setValidTo(new \DateTime('2150-01-01'));
         $household->addAddress($futureAddress);
 
         $addresses = $household->getAddressesOrdered();
@@ -118,22 +117,22 @@ final class HouseholdTest extends TestCase
         $household = new Household();
 
         $household->addComposition(($first = new HouseholdComposition())
-            ->setStartDate(new DateTimeImmutable('2021-12-01')));
+            ->setStartDate(new \DateTimeImmutable('2021-12-01')));
 
         $this->assertNull($first->getEndDate());
 
         $household->addComposition(($second = new HouseholdComposition())
-            ->setStartDate(new DateTimeImmutable('2021-12-31')));
+            ->setStartDate(new \DateTimeImmutable('2021-12-31')));
 
-        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $first->getEndDate());
-        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $second->getStartDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-31'), $first->getEndDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-31'), $second->getStartDate());
 
         $household->addComposition(($inside = new HouseholdComposition())
-            ->setStartDate(new DateTimeImmutable('2021-12-15')));
+            ->setStartDate(new \DateTimeImmutable('2021-12-15')));
 
-        $this->assertEquals(new DateTimeImmutable('2021-12-15'), $first->getEndDate());
-        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $second->getStartDate());
-        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $inside->getEndDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-15'), $first->getEndDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-31'), $second->getStartDate());
+        $this->assertEquals(new \DateTimeImmutable('2021-12-31'), $inside->getEndDate());
     }
 
     public function testHouseholdGetPersonsDuringMembership()
@@ -145,29 +144,29 @@ final class HouseholdTest extends TestCase
 
         $household->addMember(
             $member1 = (new HouseholdMember())
-                ->setStartDate(new DateTimeImmutable('2021-01-01'))
-                ->setEndDate(new DateTimeImmutable('2021-12-01'))
+                ->setStartDate(new \DateTimeImmutable('2021-01-01'))
+                ->setEndDate(new \DateTimeImmutable('2021-12-01'))
                 ->setPerson($person1)
         );
 
         $household->addMember(
             $member2a = (new HouseholdMember())
-                ->setStartDate(new DateTimeImmutable('2021-01-01'))
-                ->setEndDate(new DateTimeImmutable('2021-05-01'))
+                ->setStartDate(new \DateTimeImmutable('2021-01-01'))
+                ->setEndDate(new \DateTimeImmutable('2021-05-01'))
                 ->setPerson($person2)
         );
 
         $household->addMember(
             $member2b = (new HouseholdMember())
-                ->setStartDate(new DateTimeImmutable('2021-11-01'))
-                ->setEndDate(new DateTimeImmutable('2022-06-01'))
+                ->setStartDate(new \DateTimeImmutable('2021-11-01'))
+                ->setEndDate(new \DateTimeImmutable('2022-06-01'))
                 ->setPerson($person2)
         );
 
         $household->addMember(
             $memberOut = (new HouseholdMember())
-                ->setStartDate(new DateTimeImmutable('2019-01-01'))
-                ->setEndDate(new DateTimeImmutable('2019-12-01'))
+                ->setStartDate(new \DateTimeImmutable('2019-01-01'))
+                ->setEndDate(new \DateTimeImmutable('2019-12-01'))
                 ->setPerson($personOut)
         );
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
index 3e1c03a6a..e30f2658c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
@@ -17,13 +17,12 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
-use DateTime;
-use DateTimeImmutable;
 
 /**
  * Unit tests for the person Entity.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonTest extends \PHPUnit\Framework\TestCase
@@ -34,18 +33,18 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testAccompanyingPeriodOrderSameDateOpening()
     {
-        $d = new DateTime('2013/2/1');
+        $d = new \DateTime('2013/2/1');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
 
-        $g = new DateTime('2013/4/1');
+        $g = new \DateTime('2013/4/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
         $p->close($period);
 
-        $f = new DateTime('2013/2/1');
+        $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);
 
@@ -62,18 +61,18 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     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');
+        $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);
 
@@ -91,18 +90,18 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testDateCoveringWithCoveringAccompanyingPeriod()
     {
-        $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');
+        $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);
 
@@ -118,7 +117,7 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetCurrentAccompanyingPeriod()
     {
-        $d = new DateTime('yesterday');
+        $d = new \DateTime('yesterday');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
 
@@ -128,8 +127,8 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($period->isOpen());
         $this->assertEquals($d, $period->getOpeningDate());
 
-        //close and test
-        $period->setClosingDate(new DateTime('tomorrow'));
+        // close and test
+        $period->setClosingDate(new \DateTime('tomorrow'));
 
         $shouldBeNull = $p->getCurrentAccompanyingPeriod();
         $this->assertNull($shouldBeNull);
@@ -145,15 +144,15 @@ final 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);
         $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);
         $household->addMember($membership2);
@@ -163,10 +162,10 @@ final 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')
         ));
     }
 
@@ -177,15 +176,15 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
      */
     public function testNotOpenAFileReOpenedLater()
     {
-        $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');
+        $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));
 
         $r = $p->checkAccompanyingPeriodsAreNotCollapsing();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialActionTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialActionTest.php
index 2dcfa6b11..3684e6d68 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialActionTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialActionTest.php
@@ -16,6 +16,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialActionTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
index b846ae5f4..6660bd9c1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
@@ -17,6 +17,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueTest extends TestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php b/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php
index 36defe46e..0a64099b6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Event/Person/PersonAddressMoveEventTest.php
@@ -16,12 +16,11 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
-use DateTime;
-use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonAddressMoveEventTest extends TestCase
@@ -31,17 +30,17 @@ final class PersonAddressMoveEventTest extends TestCase
         $person = new Person();
 
         $household = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $household->addAddress(
-            ($nextAddress = new Address())->setValidFrom(new DateTime('1 month ago'))
+            ($nextAddress = new Address())->setValidFrom(new \DateTime('1 month ago'))
         );
         $member = new HouseholdMember();
         $member
             ->setPerson($person)
             ->setHousehold($household)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -50,8 +49,8 @@ final class PersonAddressMoveEventTest extends TestCase
 
         $this->assertSame($previousAddress, $event->getPreviousAddress());
         $this->assertSame($nextAddress, $event->getNextAddress());
-        $this->assertEquals((new DateTime('1 month ago'))->format('Y-m-d'), $nextAddress->getValidFrom()->format('Y-m-d'));
-        $this->assertEquals((new DateTime('1 month ago'))->format('Y-m-d'), $event->getMoveDate()->format('Y-m-d'));
+        $this->assertEquals((new \DateTime('1 month ago'))->format('Y-m-d'), $nextAddress->getValidFrom()->format('Y-m-d'));
+        $this->assertEquals((new \DateTime('1 month ago'))->format('Y-m-d'), $event->getMoveDate()->format('Y-m-d'));
     }
 
     public function testPersonChangeHousehold()
@@ -59,23 +58,23 @@ final class PersonAddressMoveEventTest extends TestCase
         $person = new Person();
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $nextHousehold = (new Household())->addAddress(
-            ($nextAddress = new Address())->setValidFrom(new DateTime('tomorrow'))
+            ($nextAddress = new Address())->setValidFrom(new \DateTime('tomorrow'))
         );
         $nextMembership = new HouseholdMember();
         $nextMembership
             ->setPerson($person)
             ->setHousehold($nextHousehold)
-            ->setStartDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -87,7 +86,7 @@ final class PersonAddressMoveEventTest extends TestCase
         $this->assertSame($nextAddress, $event->getNextAddress());
         $this->assertTrue($event->personChangeAddress());
         $this->assertFalse($event->personLeaveWithoutHousehold());
-        $this->assertEquals(new DateTimeImmutable('tomorrow'), $event->getMoveDate());
+        $this->assertEquals(new \DateTimeImmutable('tomorrow'), $event->getMoveDate());
     }
 
     public function testPersonLeaveHousehold()
@@ -95,14 +94,14 @@ final class PersonAddressMoveEventTest extends TestCase
         $person = new Person();
 
         $previousHousehold = (new Household())->addAddress(
-            ($previousAddress = new Address())->setValidFrom(new DateTime('1 year ago'))
+            ($previousAddress = new Address())->setValidFrom(new \DateTime('1 year ago'))
         );
         $previousMembership = new HouseholdMember();
         $previousMembership
             ->setPerson($person)
             ->setHousehold($previousHousehold)
-            ->setStartDate(new DateTimeImmutable('1 year ago'))
-            ->setEndDate(new DateTimeImmutable('tomorrow'));
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('tomorrow'));
 
         $event = new PersonAddressMoveEvent($person);
         $event
@@ -113,6 +112,6 @@ final class PersonAddressMoveEventTest extends TestCase
         $this->assertNull($event->getNextAddress());
         $this->assertTrue($event->personChangeAddress());
         $this->assertTrue($event->personLeaveWithoutHousehold());
-        $this->assertEquals(new DateTimeImmutable('tomorrow'), $event->getMoveDate());
+        $this->assertEquals(new \DateTimeImmutable('tomorrow'), $event->getMoveDate());
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
index 724777c83..c05e5dd5d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
@@ -16,6 +16,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonCreateEventTest extends TestCase
@@ -46,11 +47,8 @@ final class PersonCreateEventTest extends TestCase
 
     /**
      * @dataProvider generateAltNames
-     *
-     * @param mixed $altname
-     * @param mixed $altnameExpected
      */
-    public function testAltNamesOnPrePersist($altname, $altnameExpected)
+    public function testAltNamesOnPrePersist(mixed $altname, mixed $altnameExpected)
     {
         $listener = new PersonEventListener();
 
@@ -65,13 +63,8 @@ final class PersonCreateEventTest extends TestCase
 
     /**
      * @dataProvider generateNames
-     *
-     * @param mixed $firstname
-     * @param mixed $firstnameExpected
-     * @param mixed $lastname
-     * @param mixed $lastnameExpected
      */
-    public function testOnPrePersist($firstname, $firstnameExpected, $lastname, $lastnameExpected)
+    public function testOnPrePersist(mixed $firstname, mixed $firstnameExpected, mixed $lastname, mixed $lastnameExpected)
     {
         $listener = new PersonEventListener();
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
index 3528c2e8d..0d2684046 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
@@ -45,17 +46,14 @@ final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.administrativeLocation', 'acploc'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
index f807a7dc5..124b5c03a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
@@ -45,17 +46,14 @@ final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.closingMotive', 'acpmotive'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
index 479a6b331..796e3cfd1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ConfidentialAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class ConfidentialAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
index 15f4796d2..a13af0293 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DurationAggregatorTest extends AbstractAggregatorTest
@@ -47,9 +48,7 @@ final class DurationAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
index 1814ddc76..9e4a14862 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EmergencyAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class EmergencyAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
index e9f129a92..70a76b2fb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EvaluationAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class EvaluationAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php
index dc7ccaad7..bd5dc5e87 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php
@@ -11,14 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
+use Chill\MainBundle\Repository\GeographicalUnitLayerLayerRepository;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\GeographicalUnitStatAggregator;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GeographicalUnitStatAggregatorTest extends AbstractAggregatorTest
@@ -39,9 +41,12 @@ final class GeographicalUnitStatAggregatorTest extends AbstractAggregatorTest
 
     public function getFormData(): array
     {
-        // TODO: add geographical unit stat into fixtures and provide a level
+        self::bootKernel();
+        $repository = self::$container->get(GeographicalUnitLayerLayerRepository::class);
+        $levels = $repository->findAll();
+
         return [
-            ['date_calc' => new DateTimeImmutable('today'), 'level' => null],
+            ['date_calc' => new RollingDate(RollingDate::T_TODAY), 'level' => $levels],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
index 5fb341807..769c6fa8a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class IntensityAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class IntensityAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
index a8615c1d9..1f3149c65 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class OriginAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class OriginAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
index e60130a6f..8951b61eb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php
@@ -11,14 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerAggregator;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerAggregatorTest extends AbstractAggregatorTest
@@ -40,15 +41,13 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
     public function getFormData(): array
     {
         return [
-            ['date_calc' => new DateTimeImmutable('now')],
+            ['date_calc' => new RollingDate(RollingDate::T_TODAY)],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php
index 09d5f99df..539b856ec 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php
@@ -19,13 +19,13 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerScopeAggregator;
-use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
@@ -43,7 +43,7 @@ final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
         );
 
         $dateConverter = $this->prophesize(RollingDateConverterInterface::class);
-        $dateConverter->convert(Argument::type(RollingDate::class))->willReturn(new DateTimeImmutable());
+        $dateConverter->convert(Argument::type(RollingDate::class))->willReturn(new \DateTimeImmutable());
 
         return new ReferrerScopeAggregator(
             $scopeRepository->reveal(),
@@ -56,24 +56,21 @@ final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'date_calc' => new DateTimeImmutable('now'),
+                'date_calc' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.scopes', 'acpscope'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
index c1cc710f3..298c3b020 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RequestorAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class RequestorAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
index 648577aa9..833cca235 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -56,6 +55,9 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
                 ->join('acp.scopes', 'acpscope'),
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
index c0a6fdd79..b4ea4ec02 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialActionAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class SocialActionAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
index 3d37aefde..9135b7d9c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class SocialIssueAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
index 2a51c7fa0..dee46e80a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php
@@ -11,14 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\StepAggregator;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class StepAggregatorTest extends AbstractAggregatorTest
@@ -41,16 +42,14 @@ final class StepAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-01-01'),
+                'on_date' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php
index 1ed748e32..a62886152 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregatorTest.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\UserJobAggregator;
@@ -18,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class UserJobAggregatorTest extends AbstractAggregatorTest
@@ -39,15 +41,15 @@ final class UserJobAggregatorTest extends AbstractAggregatorTest
     public function getFormData(): array
     {
         return [
-            [],
+            [
+                'job_at' => new RollingDate(RollingDate::T_FIXED_DATE, \DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01')),
+            ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -56,6 +58,9 @@ final class UserJobAggregatorTest extends AbstractAggregatorTest
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
                 ->join('acp.job', 'acpjob'),
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
index b6dc51d2a..98d7bf581 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
index edba49f90..6e77e0ee9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php
@@ -11,14 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\ChildrenNumberAggregator;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
@@ -41,16 +42,14 @@ final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+                'on_date' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
index 48ff92784..312ad86dc 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php
@@ -11,14 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\CompositionAggregator;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CompositionAggregatorTest extends AbstractAggregatorTest
@@ -41,16 +42,14 @@ final class CompositionAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+                'on_date' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
index 42d03e54c..ce687655f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
@@ -11,12 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Aggregator\PersonAggregators\AgeAggregator;
-use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgeAggregatorTest extends AbstractAggregatorTest
@@ -39,24 +42,22 @@ final class AgeAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'date_age_calculation' => DateTime::createFromFormat('Y-m-d', '2016-06-16'),
+                'date_age_calculation' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container
-            ->get('doctrine.orm.entity_manager');
+            ->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(person.id)')
-                ->from('ChillPersonBundle:Person', 'person'),
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
index eb8980372..e7ed46563 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
@@ -46,9 +47,7 @@ final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
index 83b051bee..eaafa5ee2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
@@ -12,10 +12,13 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Aggregator\PersonAggregators\GenderAggregator;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GenderAggregatorTest extends AbstractAggregatorTest
@@ -43,17 +46,15 @@ final class GenderAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container
-            ->get('doctrine.orm.entity_manager');
+            ->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(person.id)')
-                ->from('ChillPersonBundle:Person', 'person'),
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
index 393a00bfe..157d3ad08 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php
@@ -11,16 +11,17 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Aggregator\PersonAggregators\HouseholdPositionAggregator;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
@@ -43,16 +44,14 @@ final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
     {
         return [
             [
-                'date_position' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+                'date_position' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -60,8 +59,10 @@ final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(person.id)')
                 ->from(Person::class, 'person')
-                ->join(HouseholdMember::class, 'householdmember', Expr\Join::WITH, 'householdmember.person = person')
-                ->join('person.center', 'center'),
+                ->join(HouseholdMember::class, 'householdmember', Expr\Join::WITH, 'householdmember.person = person'),
+            $em->createQueryBuilder()
+                ->select('count(person.id)')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
index e379fd09a..00726199c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MaritalStatusAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class MaritalStatusAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -56,6 +55,9 @@ final class MaritalStatusAggregatorTest extends AbstractAggregatorTest
                 ->select('count(person.id)')
                 ->from(Person::class, 'person')
                 ->join('person.maritalStatus', 'personmarital'),
+            $em->createQueryBuilder()
+                ->select('count(person.id)')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
index 0c93be59c..3179b12e7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
@@ -12,10 +12,13 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Aggregator\PersonAggregators\NationalityAggregator;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NationalityAggregatorTest extends AbstractAggregatorTest
@@ -44,17 +47,15 @@ final class NationalityAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container
-            ->get('doctrine.orm.entity_manager');
+            ->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(person.id)')
-                ->from('ChillPersonBundle:Person', 'person'),
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
index 79eda3f4c..84be8b8b3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
@@ -14,9 +14,11 @@ namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ActionTypeAggregator;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActionTypeAggregatorTest extends AbstractAggregatorTest
@@ -44,12 +46,10 @@ final class ActionTypeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container
-            ->get('doctrine.orm.entity_manager');
+            ->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
index 356e9b0e0..0c439d534 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
@@ -14,9 +14,11 @@ namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalAggregator;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GoalAggregatorTest extends AbstractAggregatorTest
@@ -44,12 +46,10 @@ final class GoalAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container
-            ->get('doctrine.orm.entity_manager');
+            ->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
index a32a7f396..e34f665e9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GoalResultAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class GoalResultAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -58,6 +57,11 @@ final class GoalResultAggregatorTest extends AbstractAggregatorTest
                 ->join('acp.works', 'acpw')
                 ->join('acpw.goals', 'goal')
                 ->join('goal.results', 'goalresult'),
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.goals', 'goal'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
index 0b5b4af60..1cdc27daf 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JobAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -55,8 +54,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.works', 'acpw')
-                ->join('acpw.referrers', 'acpwuser'),
+                ->join('acp.works', 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
index 24b01de26..928ce33fc 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
@@ -11,12 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerAggregatorTest extends AbstractAggregatorTest
@@ -27,7 +30,7 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer');
+        $this->aggregator = self::$container->get(ReferrerAggregator::class);
     }
 
     public function getAggregator()
@@ -38,18 +41,19 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest
     public function getFormData(): array
     {
         return [
-            [],
+            [], // there are previous saved export which does not contains any data
+            [
+                'referrer_at' => new RollingDate(RollingDate::T_TODAY),
+            ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container
-            ->get('doctrine.orm.entity_manager');
+            ->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
index 9df19d7d2..effbd4f18 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
@@ -14,9 +14,11 @@ namespace Chill\PersonBundle\Tests\Export\Aggregator\SocialWorkAggregators;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ResultAggregator;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResultAggregatorTest extends AbstractAggregatorTest
@@ -44,12 +46,10 @@ final class ResultAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container
-            ->get('doctrine.orm.entity_manager');
+            ->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
index 875b40e3f..1c5b462cd 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeAggregatorTest extends AbstractAggregatorTest
@@ -45,9 +46,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
@@ -55,8 +54,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest
             $em->createQueryBuilder()
                 ->select('count(acp.id)')
                 ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.works', 'acpw')
-                ->join('acpw.referrers', 'acpwuser'),
+                ->join('acp.works', 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
index 3aa9651b8..2b7f8468c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Export\CountAccompanyingCourse;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountAccompanyingCourseTest extends AbstractExportTest
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingPeriodWorkTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingPeriodWorkTest.php
index a16e04359..1ec36a0ab 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingPeriodWorkTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingPeriodWorkTest.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Export\CountAccompanyingPeriodWork;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CountAccompanyingPeriodWorkTest extends AbstractExportTest
@@ -27,7 +28,7 @@ final class CountAccompanyingPeriodWorkTest extends AbstractExportTest
     {
         self::bootKernel();
 
-        $this->export = self::$container->get('chill.person.export.count_social_work_actions');
+        $this->export = self::$container->get(CountAccompanyingPeriodWork::class);
     }
 
     public function getExport()
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
index 980e093ad..91640e9a4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
@@ -12,25 +12,24 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
+use Chill\PersonBundle\Export\Export\CountPerson;
 
 /**
  * Test CountPerson export.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class CountPersonTest extends AbstractExportTest
 {
-    /**
-     * @var
-     */
-    private $export;
+    private ?object $export = null;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        $this->export = self::$container->get('chill.person.export.count_person');
+        $this->export = self::$container->get(CountPerson::class);
     }
 
     public function getExport()
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php
new file mode 100644
index 000000000..0a864050f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php
@@ -0,0 +1,53 @@
+<?php
+
+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 Chill\PersonBundle\Tests\Export\Export;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\PersonBundle\Export\Export\ListAccompanyingPeriod;
+use Doctrine\ORM\AbstractQuery;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ListAccompanyingPeriodTest extends KernelTestCase
+{
+    private ListAccompanyingPeriod $listAccompanyingPeriod;
+
+    private CenterRepositoryInterface $centerRepository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::bootKernel();
+
+        $this->listAccompanyingPeriod = self::$container->get(ListAccompanyingPeriod::class);
+        $this->centerRepository = self::$container->get(CenterRepositoryInterface::class);
+    }
+
+    public function testQuery(): void
+    {
+        $centers = $this->centerRepository->findAll();
+
+        $query = $this->listAccompanyingPeriod->initiateQuery([], array_map(fn (Center $c) => ['center' => $c], $centers), $exportOpts = ['calc_date' => new RollingDate(RollingDate::T_TODAY)]);
+
+        $query->setMaxResults(1);
+
+        $actual = $query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
+
+        self::assertIsArray($actual);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php
new file mode 100644
index 000000000..08fa5141e
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkTest.php
@@ -0,0 +1,50 @@
+<?php
+
+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 Chill\PersonBundle\Tests\Export\Export;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\PersonBundle\Export\Export\ListAccompanyingPeriodWork;
+use Doctrine\ORM\AbstractQuery;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ListAccompanyingPeriodWorkTest extends KernelTestCase
+{
+    private ListAccompanyingPeriodWork $listAccompanyingPeriodWork;
+
+    private CenterRepositoryInterface $centerRepository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::bootKernel();
+
+        $this->listAccompanyingPeriodWork = self::$container->get(ListAccompanyingPeriodWork::class);
+        $this->centerRepository = self::$container->get(CenterRepositoryInterface::class);
+    }
+
+    public function testQuery(): void
+    {
+        $centers = $this->centerRepository->findAll();
+
+        $query = $this->listAccompanyingPeriodWork->initiateQuery([], array_map(fn (Center $c) => ['center' => $c], $centers), ['calc_date' => new RollingDate(RollingDate::T_TODAY)]);
+        $query->setMaxResults(1);
+
+        self::assertIsArray($query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY));
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php
new file mode 100644
index 000000000..7015fae11
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php
@@ -0,0 +1,50 @@
+<?php
+
+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 Chill\PersonBundle\Tests\Export\Export;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\PersonBundle\Export\Export\ListEvaluation;
+use Doctrine\ORM\AbstractQuery;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ListEvaluationTest extends KernelTestCase
+{
+    private ListEvaluation $listEvaluation;
+
+    private CenterRepositoryInterface $centerRepository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::bootKernel();
+
+        $this->listEvaluation = self::$container->get(ListEvaluation::class);
+        $this->centerRepository = self::$container->get(CenterRepositoryInterface::class);
+    }
+
+    public function testQuery(): void
+    {
+        $centers = $this->centerRepository->findAll();
+
+        $query = $this->listEvaluation->initiateQuery([], array_map(fn (Center $c) => ['center' => $c], $centers), ['calc_date' => new RollingDate(RollingDate::T_TODAY)]);
+        $query->setMaxResults(1);
+
+        self::assertIsArray($query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY));
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
index 44381cc7d..11937c216 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
@@ -13,13 +13,13 @@ namespace Chill\PersonBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Export\ListPerson;
-use DateTime;
 use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Test the export "ListPerson".
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ListPersonTest extends AbstractExportTest
@@ -32,7 +32,7 @@ final class ListPersonTest extends AbstractExportTest
     {
         self::bootKernel();
 
-        $this->export = self::$container->get('chill.person.export.list_person');
+        $this->export = self::$container->get(ListPerson::class);
 
         $request = $this->prophesize()
             ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
@@ -48,20 +48,17 @@ final class ListPersonTest extends AbstractExportTest
         return $this->export;
     }
 
-    public function getFormData(): array
+    public function getFormData(): iterable
     {
-        return [
+        foreach ([
             ['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'), ],
-        ];
+        ] as $base) {
+            yield [...$base, 'address_date' => new \DateTimeImmutable('today')];
+        }
     }
 
     public function getModifiersCombination(): array
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
index 8e13f91b7..a5ce35a7a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
@@ -14,10 +14,10 @@ namespace Export\Export;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Export\Export\StatAccompanyingCourseDuration;
-use DateTime;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class StatAccompanyingCourseDurationTest extends AbstractExportTest
@@ -39,7 +39,7 @@ final class StatAccompanyingCourseDurationTest extends AbstractExportTest
     public function getFormData(): array
     {
         return [
-            ['closingdate' => DateTime::createFromFormat('Y-m-d', '2022-06-30')],
+            ['closingdate' => \DateTime::createFromFormat('Y-m-d', '2022-06-30')],
         ];
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
index 7416e03a6..e88c22d7a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
@@ -11,13 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOnDateFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActiveOnDateFilterTest extends AbstractFilterTest
@@ -26,7 +28,6 @@ final class ActiveOnDateFilterTest extends AbstractFilterTest
 
     protected function setUp(): void
     {
-        //parent::setUp();
         self::bootKernel();
 
         $this->filter = self::$container->get('chill.person.export.filter_activeondate');
@@ -41,22 +42,20 @@ final class ActiveOnDateFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'on_date' => new RollingDate(RollingDate::T_FIXED_DATE, \DateTimeImmutable::createFromFormat('Y-m-d', '2022-05-01')),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->from(AccompanyingPeriod::class, 'acp')
                 ->select('acp.id'),
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
index 53b1b54ff..459ccb775 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
@@ -11,13 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOneDayBetweenDatesFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ActiveOneDayBetweenDatesFilterTest extends AbstractFilterTest
@@ -26,7 +28,6 @@ final class ActiveOneDayBetweenDatesFilterTest extends AbstractFilterTest
 
     protected function setUp(): void
     {
-        //parent::setUp();
         self::bootKernel();
 
         $this->filter = self::$container->get('chill.person.export.filter_activeonedaybetweendates');
@@ -41,24 +42,22 @@ final class ActiveOneDayBetweenDatesFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
-                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-06-01'),
+                'date_from' => new RollingDate(RollingDate::T_FIXED_DATE, \DateTimeImmutable::createFromFormat('Y-m-d', '2022-05-01')),
+                'date_to' => new RollingDate(RollingDate::T_FIXED_DATE, \DateTimeImmutable::createFromFormat('Y-m-d', '2022-06-01')),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
-                ->select('acp.id'),
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->select('count(distinct acp)'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
index 9d7837128..22981759c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AdministrativeLocationFilterTest extends AbstractFilterTest
@@ -26,7 +27,6 @@ final class AdministrativeLocationFilterTest extends AbstractFilterTest
 
     protected function setUp(): void
     {
-        //parent::setUp();
         self::bootKernel();
 
         $this->filter = self::$container->get('chill.person.export.filter_administrative_location');
@@ -39,12 +39,14 @@ final class AdministrativeLocationFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(Location::class, 'l')
             ->select('l')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
@@ -58,9 +60,7 @@ final class AdministrativeLocationFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
index 26c686c0d..9e4d98f17 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
@@ -12,12 +12,14 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ClosingMotiveFilter;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ClosingMotiveFilterTest extends AbstractFilterTest
@@ -38,6 +40,7 @@ final class ClosingMotiveFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
@@ -57,16 +60,14 @@ final class ClosingMotiveFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('acp.id')
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
index 73c8f1370..a0f1ec6a9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
@@ -17,6 +17,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ConfidentialFilterTest extends AbstractFilterTest
@@ -45,9 +46,7 @@ final class ConfidentialFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
index 18b85915a..ddf88bf8c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
@@ -17,6 +17,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EmergencyFilterTest extends AbstractFilterTest
@@ -38,16 +39,14 @@ final class EmergencyFilterTest extends AbstractFilterTest
     public function getFormData(): array
     {
         return [
-            ['accepted_emergencies' => true],
-            ['accepted_emergencies' => false],
+            ['accepted_emergency' => true],
+            ['accepted_emergency' => false],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
index 953db7091..f300ad7b4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EvaluationFilterTest extends AbstractFilterTest
@@ -26,7 +27,6 @@ final class EvaluationFilterTest extends AbstractFilterTest
 
     protected function setUp(): void
     {
-        //parent::setUp();
         self::bootKernel();
 
         $this->filter = self::$container->get('chill.person.export.filter_evaluation');
@@ -39,12 +39,14 @@ final class EvaluationFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(Evaluation::class, 'ev')
             ->select('ev')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
@@ -58,9 +60,7 @@ final class EvaluationFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
index 8f0f2dcda..540cb6c7a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
@@ -11,13 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Repository\GeographicalUnitRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\GeographicalUnitStatFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GeographicalUnitStatFilterTest extends AbstractFilterTest
@@ -26,7 +29,6 @@ final class GeographicalUnitStatFilterTest extends AbstractFilterTest
 
     protected function setUp(): void
     {
-        //parent::setUp();
         self::bootKernel();
 
         $this->filter = self::$container->get('chill.person.export.filter_geographicalunitstat');
@@ -39,25 +41,28 @@ final class GeographicalUnitStatFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
+        $repo = self::$container->get(GeographicalUnitRepositoryInterface::class);
+
+        $units = $repo->findAll();
+
         return [
             [
-                'date' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
-                'accepted_loctype' => 'center',
+                'date_calc' => new RollingDate(RollingDate::T_TODAY),
+                'units' => $units,
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->from(AccompanyingPeriod::class, 'acp')
                 ->select('acp.id'),
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
index ade9efd50..149e94e57 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
@@ -12,11 +12,13 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\IntensityFilter;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class IntensityFilterTest extends AbstractFilterTest
@@ -45,16 +47,14 @@ final class IntensityFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('acp.id')
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
index 6cfd905b3..0ebded633 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
@@ -11,13 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class OpenBetweenDatesFilterTest extends AbstractFilterTest
@@ -26,7 +28,6 @@ final class OpenBetweenDatesFilterTest extends AbstractFilterTest
 
     protected function setUp(): void
     {
-        //parent::setUp();
         self::bootKernel();
 
         $this->filter = self::$container->get('chill.person.export.filter_openbetweendates');
@@ -41,23 +42,21 @@ final class OpenBetweenDatesFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
-                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-06-01'),
+                'date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
+                'date_to' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->from(AccompanyingPeriod::class, 'acp')
                 ->select('acp.id'),
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
index 01962bd51..5a5689f3f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
@@ -12,12 +12,14 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OriginFilter;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class OriginFilterTest extends AbstractFilterTest
@@ -38,12 +40,14 @@ final class OriginFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(Origin::class, 'o')
             ->select('o')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
@@ -57,16 +61,14 @@ final class OriginFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('acp.id')
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
index 3ab1f94ec..a56741bd3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
@@ -12,12 +12,15 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilter;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerFilterTest extends AbstractFilterTest
@@ -38,42 +41,45 @@ final class ReferrerFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self:self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(User::class, 'u')
             ->select('u')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
 
         foreach ($array as $u) {
-            $data[] = ['accepted_referrers' => $u];
+            $data[] = ['accepted_referrers' => $u, 'date_calc' => new RollingDate(RollingDate::T_TODAY)];
         }
 
         return $data;
     }
 
-    public function getQueryBuilders(): array
+    public function getQueryBuilders(): iterable
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
-        return [
-            $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
-                ->select('acp.id'),
-            $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod\AccompanyingPeriodWork', 'acpw')
-                ->select('acpw.id'),
-            $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod\AccompanyingPeriodWork', 'acpw')
-                ->join('acpw.referrers', 'acpwuser')
-                ->select('acpwuser.id'),
-        ];
+        yield $em->createQueryBuilder()
+            ->from(AccompanyingPeriod::class, 'acp')
+            ->select('acp.id');
+
+        $qb = $em->createQueryBuilder();
+        $qb
+            ->from(AccompanyingPeriod\AccompanyingPeriodWork::class, 'acpw')
+            ->join('acpw.accompanyingPeriod', 'acp')
+            ->join('acp.participations', 'acppart')
+            ->join('acppart.person', 'person')
+        ;
+
+        $qb->select('COUNT(DISTINCT acpw.id) as export_result');
+
+        yield $qb;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
index 25cc86c57..1fe454c47 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
@@ -12,11 +12,13 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\RequestorFilter;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RequestorFilterTest extends AbstractFilterTest
@@ -47,15 +49,13 @@ final class RequestorFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->from(AccompanyingPeriod::class, 'acp')
                 ->select('acp.id'),
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
index e7da8d287..66768d966 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
@@ -12,12 +12,14 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialActionFilter;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialActionFilterTest extends AbstractFilterTest
@@ -26,7 +28,6 @@ final class SocialActionFilterTest extends AbstractFilterTest
 
     protected function setUp(): void
     {
-        //parent::setUp();
         self::bootKernel();
 
         $this->filter = self::$container->get('chill.person.export.filter_socialaction');
@@ -37,36 +38,30 @@ final class SocialActionFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public function getFormData(): iterable
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(SocialAction::class, 'sa')
             ->select('sa')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = ['accepted_socialactions' => $a];
-        }
-
-        return $data;
+        yield ['accepted_socialactions' => $array];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->from(AccompanyingPeriod::class, 'acp')
                 ->select('acp.id'),
         ];
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
index 2776ab8dd..4f72d1ece 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
@@ -12,12 +12,15 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialIssueFilter;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueFilterTest extends AbstractFilterTest
@@ -36,37 +39,31 @@ final class SocialIssueFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public function getFormData(): iterable
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(SocialIssue::class, 'si')
             ->select('si')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
-        $data = [];
-
-        foreach ($array as $i) {
-            $data[] = ['accepted_socialissues' => $i];
-        }
-
-        return $data;
+        yield ['accepted_socialissues' => new ArrayCollection($array)];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('acp.id')
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
index 9388aa8ae..6410c4094 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
@@ -11,23 +11,26 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilter;
+use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilterOnDate;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class StepFilterTest extends AbstractFilterTest
 {
-    private StepFilter $filter;
+    private StepFilterOnDate $filter;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.person.export.filter_step');
+        $this->filter = self::$container->get(StepFilterOnDate::class);
     }
 
     public function getFilter()
@@ -35,27 +38,29 @@ final class StepFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public function getFormData(): iterable
     {
-        return [
-            ['accepted_steps' => AccompanyingPeriod::STEP_DRAFT],
-            ['accepted_steps' => AccompanyingPeriod::STEP_CONFIRMED],
-            ['accepted_steps' => AccompanyingPeriod::STEP_CLOSED],
-        ];
+        foreach ([
+            ['accepted_steps_multi' => [AccompanyingPeriod::STEP_DRAFT]],
+            ['accepted_steps_multi' => [AccompanyingPeriod::STEP_CONFIRMED]],
+            ['accepted_steps_multi' => [AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG]],
+            ['accepted_steps_multi' => [AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT]],
+            ['accepted_steps_multi' => [AccompanyingPeriod::STEP_CLOSED]],
+        ] as $d) {
+            yield ['calc_date' => new RollingDate(RollingDate::T_TODAY), ...$d];
+        }
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
-        $em = self::$container->get('doctrine.orm.entity_manager');
+        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('acp.id')
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php
similarity index 53%
rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php
rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php
index dbf7a8fe3..115510ff5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php
@@ -11,15 +11,20 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\UserJobFilter;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
-final class CurrentUserJobFilterTest extends AbstractFilterTest
+final class UserJobFilterTest extends AbstractFilterTest
 {
     private UserJobFilter $filter;
 
@@ -27,7 +32,7 @@ final class CurrentUserJobFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.person.export.filter_userjob');
+        $this->filter = self::$container->get(UserJobFilter::class);
     }
 
     public function getFilter()
@@ -35,23 +40,30 @@ final class CurrentUserJobFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public function getFormData(): iterable
     {
-        return [];
+        self::bootKernel();
+        $jobs = self::$container->get(EntityManagerInterface::class)
+            ->createQuery('SELECT j FROM '.UserJob::class.' j')
+            ->setMaxResults(1)
+            ->getResult();
+
+        yield [
+            'jobs' => new ArrayCollection($jobs),
+            'date_calc' => new RollingDate(RollingDate::T_TODAY),
+        ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('acp.id')
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php
similarity index 54%
rename from src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php
rename to src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php
index 9140d5c41..c6828b721 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php
@@ -11,15 +11,20 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\UserScopeFilter;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
-final class CurrentUserScopeFilterTest extends AbstractFilterTest
+final class UserScopeFilterTest extends AbstractFilterTest
 {
     private UserScopeFilter $filter;
 
@@ -27,7 +32,7 @@ final class CurrentUserScopeFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.person.export.filter_userscope');
+        $this->filter = self::$container->get(UserScopeFilter::class);
     }
 
     public function getFilter()
@@ -37,21 +42,30 @@ final class CurrentUserScopeFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
-        return [];
+        self::bootKernel();
+        $scopes = self::$container->get(EntityManagerInterface::class)
+            ->createQuery('SELECT s FROM '.Scope::class.' s')
+            ->setMaxResults(1)
+            ->getResult();
+
+        return [
+            [
+                'date_calc' => new RollingDate(RollingDate::T_TODAY),
+                'scopes' => new ArrayCollection($scopes),
+            ],
+        ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('acp.id')
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp'),
+                ->from(AccompanyingPeriod::class, 'acp'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
index 320a98249..46c7ca853 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class EvaluationTypeFilterTest extends AbstractFilterTest
@@ -39,12 +40,14 @@ final class EvaluationTypeFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(Evaluation::class, 'e')
             ->select('e')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
@@ -60,18 +63,16 @@ final class EvaluationTypeFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('workeval.id')
+                ->select('eval.id')
                 ->from(AccompanyingPeriod::class, 'acp')
                 ->join('acp.works', 'acpw')
-                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval'),
+                ->join('acpw.accompanyingPeriodWorkEvaluations', 'eval'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
index 2b3870b82..db1c29ab6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php
@@ -18,6 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MaxDateFilterTest extends AbstractFilterTest
@@ -46,9 +47,7 @@ final class MaxDateFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
index aa8ec6c2c..471dde032 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
@@ -11,15 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\HouseholdFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Chill\PersonBundle\Export\Filter\HouseholdFilters\CompositionFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class CompositionFilterTest extends AbstractFilterTest
@@ -33,19 +34,21 @@ final class CompositionFilterTest extends AbstractFilterTest
         $this->filter = self::$container->get('chill.person.export.filter_household_composition');
     }
 
-    public function getFilter()
+    public function getFilter(): CompositionFilter
     {
         return $this->filter;
     }
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(HouseholdCompositionType::class, 'r')
             ->select('r')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
@@ -53,25 +56,33 @@ final class CompositionFilterTest extends AbstractFilterTest
         foreach ($array as $r) {
             $data[] = [
                 'accepted_composition' => $r,
-                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'on_date' => new RollingDate(RollingDate::T_TODAY),
             ];
         }
 
         return $data;
     }
 
-    public function getQueryBuilders(): array
+    public function getQueryBuilders(): iterable
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
+        $qb = $em->createQueryBuilder();
+        $qb
+            ->from(Household::class, 'household')
+            ->join('household.members', 'hmember')
+            ->join('hmember.person', 'person')
+            ->join('person.accompanyingPeriodParticipations', 'acppart')
+            ->join('acppart.accompanyingPeriod', 'acp')
+            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
+            ->andWhere('hmember.startDate <= :count_household_at_date AND (hmember.endDate IS NULL OR hmember.endDate > :count_household_at_date)')
+            ->setParameter('count_household_at_date', new \DateTimeImmutable('today'));
 
-        return [
-            $em->createQueryBuilder()
-                ->select('h.id')
-                ->from(Household::class, 'h'),
-        ];
+        $qb
+            ->select('COUNT(DISTINCT household.id) AS household_export_result')
+            ->addSelect('COUNT(DISTINCT acp.id) AS acp_export_result');
+
+        yield $qb;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
index 789a72956..ca04a40a4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php
@@ -11,14 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\AgeFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AgeFilterTest extends AbstractFilterTest
@@ -43,28 +44,21 @@ final class AgeFilterTest extends AbstractFilterTest
             [
                 'min_age' => '18',
                 'max_age' => '60',
-                'date_calc' => DateTime::createFromFormat('Y-m-d', '2020-05-01'),
-            ],
-            [   // ça devrait faire boum !
-                'min_age' => '35',
-                'max_age' => '30',
-                'date_calc' => DateTime::createFromFormat('Y-m-d', '2020-05-01'),
+                'date_calc' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('p.id')
-                ->from(Person::class, 'p'),
+                ->select('person.id')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
index 6c0c44774..ee5e167be 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
@@ -11,12 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\BirthdateFilter;
-use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class BirthdateFilterTest extends AbstractFilterTest
@@ -39,35 +42,28 @@ final class BirthdateFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => DateTime::createFromFormat('Y-m-d', '2000-01-01'),
-                'date_to' => DateTime::createFromFormat('Y-m-d', '2010-01-01'),
+                'date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
+                'date_to' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container
-            ->get('doctrine.orm.entity_manager');
+            ->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('p.firstName')
-                ->from('ChillPersonBundle:Person', 'p'),
+                ->select('person.firstName')
+                ->from(Person::class, 'person'),
             $em->createQueryBuilder()
-                ->select('p.firstName')
-                ->from('ChillPersonBundle:Person', 'p')
+                ->select('count(DISTINCT person)')
+                ->from(Person::class, 'person')
                 // add a dummy where clause
-                ->where('p.firstname IS NOT NULL'),
-            $em->createQueryBuilder()
-                ->select('count(IDENTITY(p))')
-                ->from('ChillPersonBundle:Person', 'p')
-                // add a dummy where clause
-                ->where('p.firstname IS NOT NULL'),
+                ->where('person.firstName IS NOT NULL'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
index 4134662ff..7c67cd6d2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php
@@ -11,14 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\DeadOrAliveFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DeadOrAliveFilterTest extends AbstractFilterTest
@@ -42,27 +43,25 @@ final class DeadOrAliveFilterTest extends AbstractFilterTest
         return [
             [
                 'person_state' => 'alive',
-                'date_calc' => DateTime::createFromFormat('Y-m-d', '2021-05-01'),
+                'date_calc' => new RollingDate(RollingDate::T_TODAY),
             ],
             [
                 'person_state' => 'deceased',
-                'date_calc' => DateTime::createFromFormat('Y-m-d', '2021-05-01'),
+                'date_calc' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('p.id')
-                ->from(Person::class, 'p'),
+                ->select('person.id')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
index 804639608..9062bfc2a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php
@@ -11,14 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\DeathdateFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class DeathdateFilterTest extends AbstractFilterTest
@@ -41,24 +42,22 @@ final class DeathdateFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => DateTime::createFromFormat('Y-m-d', '2020-05-01'),
-                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
+                'date_to' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('p.id')
-                ->from(Person::class, 'p'),
+                ->select('person.id')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
index 15da064b8..2aac73fe6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
@@ -14,9 +14,11 @@ namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\GenderFilter;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class GenderFilterTest extends AbstractFilterTest
@@ -52,17 +54,15 @@ final class GenderFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders()
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container
-            ->get('doctrine.orm.entity_manager');
+            ->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('p.firstName')
-                ->from('ChillPersonBundle:Person', 'p'),
+                ->select('person.firstName')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
index f8f530fe9..c52bb98cd 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php
@@ -15,11 +15,11 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\MaritalStatusFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MaritalStatusFilterTest extends AbstractFilterTest
@@ -40,12 +40,14 @@ final class MaritalStatusFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(MaritalStatus::class, 'm')
             ->select('m')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
@@ -53,7 +55,6 @@ final class MaritalStatusFilterTest extends AbstractFilterTest
         foreach ($array as $m) {
             $data[] = [
                 'maritalStatus' => $m,
-                'calc_date' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
             ];
         }
 
@@ -62,16 +63,14 @@ final class MaritalStatusFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('p.id')
-                ->from(Person::class, 'p'),
+                ->select('count(person)')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
index 2fcf22887..973b8c6eb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php
@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class NationalityFilterTest extends AbstractFilterTest
@@ -39,9 +40,10 @@ final class NationalityFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $countries = $em->getRepository(Country::class)->findAll();
+        $countries = array_slice($em->getRepository(Country::class)->findAll(), 0, 1);
 
         $data = [];
 
@@ -56,16 +58,14 @@ final class NationalityFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('p.id')
-                ->from(Person::class, 'p'),
+                ->select('count(person)')
+                ->from(Person::class, 'person'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
index 52c08c63c..c5f387463 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php
@@ -11,17 +11,18 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
 use Chill\PersonBundle\Export\Filter\PersonFilters\ResidentialAddressAtThirdpartyFilter;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResidentialAddressAtThirdpartyFilterTest extends AbstractFilterTest
@@ -42,20 +43,22 @@ final class ResidentialAddressAtThirdpartyFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
             ->from(ThirdPartyCategory::class, 'tpc')
             ->select('tpc')
             ->getQuery()
+            ->setMaxResults(1)
             ->getResult();
 
         $data = [];
 
         foreach ($array as $r) {
             $data[] = [
-                'thirdparty_cat' => $r,
-                'date_calc' => DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'thirdparty_cat' => [$r],
+                'date_calc' => new RollingDate(RollingDate::T_TODAY),
             ];
         }
 
@@ -64,18 +67,15 @@ final class ResidentialAddressAtThirdpartyFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
-                ->select('p.id')
-                ->from(Person::class, 'p')
-                ->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = p')
-                ->join('p.center', 'center')
+                ->select('person.id')
+                ->from(Person::class, 'person')
+                ->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = person')
                 ->join('resaddr.hostThirdParty', 'tparty')
                 ->join('tparty.categories', 'tpartycat'),
         ];
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
index 77b46a7e1..d0e42b9c3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\PersonFilters;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Filter\PersonFilters\ResidentialAddressAtUserFilter;
@@ -19,6 +20,7 @@ use Doctrine\ORM\Query\Expr;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResidentialAddressAtUserFilterTest extends AbstractFilterTest
@@ -39,14 +41,14 @@ final class ResidentialAddressAtUserFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
-        return [];
+        return [
+            ['date_calc' => new RollingDate(RollingDate::T_TODAY)],
+        ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
index 481032d0b..392ec656b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
@@ -11,12 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
+use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Filter\SocialWorkFilters\JobFilter;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class JobFilterTest extends AbstractFilterTest
@@ -37,21 +41,30 @@ final class JobFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
-        return [];
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $jobs = $em->createQuery('SELECT j FROM '.UserJob::class.' j')
+            ->setMaxResults(1)
+            ->getResult();
+
+        return [
+            [
+                'job' => new ArrayCollection($jobs),
+            ],
+        ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('acpw.id')
-                ->from('ChillPersonBundle:AccompanyingPeriodWork', 'acpw'),
+                ->from(AccompanyingPeriodWork::class, 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
index b7b07c9e1..5459fdd18 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Export\Filter\SocialWorkFilters\ReferrerFilter;
@@ -19,6 +20,7 @@ use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReferrerFilterTest extends AbstractFilterTest
@@ -39,15 +41,21 @@ final class ReferrerFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        $users = $em->getRepository(User::class)->findAll();
+        $users = array_slice($em->getRepository(User::class)->findAll(), 0, 1);
 
         $data = [];
 
         foreach ($users as $u) {
+            $data[] = [
+                'accepted_agents' => $u, // some saved export does not have the parameter "agent_at"
+            ];
+
             $data[] = [
                 'accepted_agents' => $u,
+                'agent_at' => new RollingDate(RollingDate::T_TODAY),
             ];
         }
 
@@ -56,9 +64,7 @@ final class ReferrerFilterTest extends AbstractFilterTest
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
index 47af12d34..78051e0da 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
@@ -11,12 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
 
+use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Filter\SocialWorkFilters\ScopeFilter;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ScopeFilterTest extends AbstractFilterTest
@@ -37,21 +40,30 @@ final class ScopeFilterTest extends AbstractFilterTest
 
     public function getFormData(): array
     {
-        return [];
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $scopes = $em->createQuery('SELECT s FROM '.Scope::class.' s')
+            ->setMaxResults(1)
+            ->getResult();
+
+        return [
+            [
+                'scope' => $scopes,
+            ],
+        ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('acpw.id')
-                ->from('ChillPersonBundle:AccompanyingPeriodWork', 'acpw'),
+                ->from(AccompanyingPeriodWork::class, 'acpw'),
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
deleted file mode 100644
index f462bc47e..000000000
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/SocialWorkTypeFilterTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-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 Chill\PersonBundle\Tests\Export\Filter\SocialWorkFilters;
-
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Export\Filter\SocialWorkFilters\SocialWorkTypeFilter;
-use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
-use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
-use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class SocialWorkTypeFilterTest extends AbstractFilterTest
-{
-    private SocialWorkTypeFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->filter = self::$container->get('chill.person.export.filter_social_work_type');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $action_repository = self::$container->get(SocialActionRepository::class);
-        $goal_repository = self::$container->get(GoalRepository::class);
-        $result_repository = self::$container->get(ResultRepository::class);
-
-        $actions = [];
-        $goals = [];
-        $results = [];
-
-        $social_actions = $action_repository->findAll();
-
-        foreach ($social_actions as $action) {
-            $actions[] = $action->getId();
-            $goals_by_action = $goal_repository->findBySocialActionWithDescendants($action);
-
-            foreach ($goals_by_action as $goal) {
-                $goals[] = $goal->getId();
-                $results_by_goal = $result_repository->findByGoal($goal);
-
-                foreach ($results_by_goal as $result) {
-                    $results[] = $result->getId();
-                }
-            }
-            $results_by_action = $result_repository->findBySocialActionWithDescendants($action);
-
-            foreach ($results_by_action as $result) {
-                $results[] = $result->getId();
-            }
-        }
-
-        sort($actions);
-        sort($goals);
-        sort($results);
-
-        $actions = array_unique($actions);
-        $goals = array_unique($goals);
-        $results = array_unique($results);
-
-        $data = [
-            [
-                'actionType' => implode(',', $actions),
-                'goal' => implode(',', $goals),
-                'result' => implode(',', $results),
-            ],
-        ];
-        /// TODO ne fonctionne pas
-        var_dump($data);
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('acpw.id')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ->join('acp.works', 'acpw'),
-        ];
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
index 83071bcbd..88ee709f2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
@@ -12,13 +12,12 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Form\Type;
 
 use Chill\PersonBundle\Form\Type\PickPersonType;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PickPersonTypeTest extends KernelTestCase
@@ -51,9 +50,9 @@ final class PickPersonTypeTest extends KernelTestCase
     /**
      * test with an invalid center type in the option 'centers' (in an array).
      */
-    public function testWithInvalidOptionCenters()
+    public function testWithInvalidOptionCenters(): never
     {
-        $this->expectException(RuntimeException::class);
+        $this->expectException(\RuntimeException::class);
 
         $this->markTestSkipped('need to inject locale into url generator without request');
         $this->formFactory
@@ -90,7 +89,7 @@ final class PickPersonTypeTest extends KernelTestCase
 
         $this->assertEquals(
             1,
-            count(array_unique($centerIds)),
+            \count(array_unique($centerIds)),
             'test that the form contains people from only one centers'
         );
 
@@ -123,24 +122,24 @@ final class PickPersonTypeTest extends KernelTestCase
 
         $this->assertEquals(
             2,
-            count(array_unique($centerIds)),
+            \count(array_unique($centerIds)),
             'test that the form contains people from only one centers'
         );
     }
 
-    public function testWithOptionRoleInvalid()
+    public function testWithOptionRoleInvalid(): never
     {
         $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'),
+                'role' => 'INVALID',
             ])
             ->getForm();
 
         // transform into a view to have data-center attr
         $view = $form->createView();
 
-        $this->assertEquals(0, count($view->vars['choices']));
+        $this->assertEquals(0, \count($view->vars['choices']));
     }
 
     public function testWithoutOption()
@@ -168,7 +167,7 @@ final class PickPersonTypeTest extends KernelTestCase
 
         $this->assertEquals(
             2,
-            count(array_unique($centerIds)),
+            \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 a58560bdd..827b2a2e2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
@@ -17,16 +17,15 @@ use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
 use Chill\PersonBundle\Household\MembersEditorFactory;
-use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MembersEditorTest extends TestCase
@@ -50,13 +49,13 @@ final class MembersEditorTest extends TestCase
         $factory = $this->buildMembersEditorFactory();
         $editor = $factory->createEditor($household);
 
-        $editor->addMovement($aMonthAgo = new DateTimeImmutable('1 month ago'), $person, $position);
+        $editor->addMovement($aMonthAgo = new \DateTimeImmutable('1 month ago'), $person, $position);
 
         // set a second time the person in position
         $factory = $this->buildMembersEditorFactory();
         $editor = $factory->createEditor($household);
 
-        $editor->addMovement($yesterday = new DateTimeImmutable('yesterday'), $person, $position);
+        $editor->addMovement($yesterday = new \DateTimeImmutable('yesterday'), $person, $position);
 
         $this->assertCount(2, $person->getHouseholdParticipationsNotShareHousehold());
 
@@ -74,6 +73,54 @@ final class MembersEditorTest extends TestCase
         $this->assertContains(null, $endDates);
     }
 
+    /**
+     * We test that a leave move is possible when member startdate is same as current date.
+     */
+    public function testLeaveMovementInSameHouseholdFromShareHouseholdToNotShareHouseholdOnSameDate()
+    {
+        $person = new Person();
+        $household = new Household();
+
+        $factory = $this->buildMembersEditorFactory();
+
+        $positionSharing = (new Position())->setShareHousehold(true);
+        $positionNotSharing = (new Position())->setShareHousehold(false);
+
+        // create add move
+        $editor = $factory->createEditor($household);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionSharing);
+        $editor->postMove();
+
+        self::assertContains($person, $household->getCurrentPersons());
+        self::assertSame($household, $person->getCurrentHousehold());
+        self::assertCount(1, $household->getMembers());
+
+        // create leave move
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher
+            ->dispatch(Argument::type(PersonAddressMoveEvent::class))
+            ->shouldBeCalled();
+        $factory = $this->buildMembersEditorFactory(
+            $eventDispatcher->reveal(),
+            null
+        );
+        $editor = $factory->createEditor($household);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionNotSharing);
+        $editor->postMove();
+
+        $participations = $household->getMembers();
+        self::assertCount(2, $participations);
+
+        $sharing = $participations->filter(fn (HouseholdMember $hm) => $hm->getShareHousehold());
+        self::assertCount(1, $sharing);
+
+        $notSharing = $participations->filter(fn (HouseholdMember $hm) => !$hm->getShareHousehold());
+        self::assertCount(1, $notSharing);
+
+        self::assertNotNull($sharing[0]->getEndDate());
+        self::assertEquals(new \DateTimeImmutable('today'), $sharing[0]->getEndDate());
+    }
+
     /**
      * We test here a move for a person:.
      *
@@ -92,28 +139,31 @@ final class MembersEditorTest extends TestCase
         $editor = $factory->createEditor($household);
 
         // we add the member to the household
-        $editor->addMovement(new DateTimeImmutable('1 month ago'), $person, $positionSharing);
+        $editor->addMovement(new \DateTimeImmutable('1 month ago'), $person, $positionSharing);
 
         // double check that the person is in the household
         $this->assertContains($person, $household->getCurrentPersons());
 
         // we do the move to the position not sharing household
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher
+            ->dispatch(Argument::type(PersonAddressMoveEvent::class))
+            ->shouldNotBeCalled();
+        $factory = $this->buildMembersEditorFactory(
+            $eventDispatcher->reveal(),
+            null
+        );
         $editor = $factory->createEditor($household2 = new Household());
-        $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+        $editor->addMovement(new \DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+        $editor->postMove();
 
-        $sharings = $household->getCurrentMembers()->filter(static function (HouseholdMember $m) {
-            return $m->getShareHousehold();
-        });
-        $notSharing = $household2->getCurrentMembers()->filter(static function (HouseholdMember $m) {
-            return !$m->getShareHousehold();
-        });
+        $sharings = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => $m->getShareHousehold());
+        $notSharing = $household2->getCurrentMembers()->filter(static fn (HouseholdMember $m) => !$m->getShareHousehold());
 
         $this->assertCount(1, $notSharing);
         $this->assertCount(1, $sharings);
 
-        $getPerson = static function (HouseholdMember $m) {
-            return $m->getPerson();
-        };
+        $getPerson = static fn (HouseholdMember $m) => $m->getPerson();
 
         $this->assertContains($person, $notSharing->map($getPerson));
     }
@@ -124,7 +174,7 @@ final class MembersEditorTest extends TestCase
      * * which was in a position "sharing household"
      * * which move to the same household, in a position "not sharing household"
      */
-    public function testMoveFromSharingHouseholdToNotSharingHousehouldInSamehousehold()
+    public function testMoveFromSharingHouseholdToNotSharingHousehouldInSamehouseholdOnDifferentDate()
     {
         $person = new Person();
         $household = new Household();
@@ -134,32 +184,113 @@ final class MembersEditorTest extends TestCase
         $editor = $factory->createEditor($household);
 
         // we add the member to the household
-        $editor->addMovement(new DateTimeImmutable('1 month ago'), $person, $positionSharing);
+        $editor->addMovement(new \DateTimeImmutable('1 month ago'), $person, $positionSharing);
 
         // double check that the person is in the household
         $this->assertContains($person, $household->getCurrentPersons());
 
         // we do the move to the position not sharing household
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher
+            ->dispatch(Argument::type(PersonAddressMoveEvent::class))
+            ->shouldBeCalled();
+        $factory = $this->buildMembersEditorFactory(
+            $eventDispatcher->reveal(),
+            null
+        );
         $editor = $factory->createEditor($household);
-        $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+        $editor->addMovement(new \DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+        $editor->postMove();
 
-        $sharings = $household->getCurrentMembers()->filter(static function (HouseholdMember $m) {
-            return $m->getShareHousehold();
-        });
-        $notSharing = $household->getCurrentMembers()->filter(static function (HouseholdMember $m) {
-            return !$m->getShareHousehold();
-        });
+        $sharings = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => $m->getShareHousehold());
+        $notSharing = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => !$m->getShareHousehold());
 
         $this->assertCount(1, $notSharing);
         $this->assertCount(0, $sharings);
 
-        $getPerson = static function (HouseholdMember $m) {
-            return $m->getPerson();
-        };
+        $getPerson = static fn (HouseholdMember $m) => $m->getPerson();
 
         $this->assertContains($person, $notSharing->map($getPerson));
     }
 
+    /**
+     * We test here a move for a person:.
+     *
+     * * which was in a position "not sharing household"
+     * * which move to the same household, in a position "sharing household"
+     */
+    public function testMoveFromNotSharingHouseholdToSharingHousehouldInSamehousehold()
+    {
+        $person = new Person();
+        $household = new Household();
+        $positionSharing = (new Position())->setShareHousehold(true);
+        $positionNotSharing = (new Position())->setShareHousehold(false);
+        $factory = $this->buildMembersEditorFactory();
+        $editor = $factory->createEditor($household);
+
+        // we add the member to the household, at the position "not sharing"
+        $editor->addMovement(new \DateTimeImmutable('1 month ago'), $person, $positionNotSharing);
+
+        // double check that the person is in the household
+        $this->assertContains($person, $household->getCurrentPersons());
+
+        // we do the move to the position sharing household
+        $editor = $factory->createEditor($household);
+        $editor->addMovement(new \DateTimeImmutable('yesterday'), $person, $positionSharing);
+
+        self::assertCount(2, $household->getMembers());
+
+        $sharings = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => $m->getShareHousehold());
+        $notSharing = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => !$m->getShareHousehold());
+
+        $this->assertCount(0, $notSharing);
+        $this->assertCount(1, $sharings);
+
+        $getPerson = static fn (HouseholdMember $m) => $m->getPerson();
+
+        $this->assertContains($person, $sharings->map($getPerson));
+        $this->assertNotContains($person, $notSharing->map($getPerson));
+    }
+
+    /**
+     * We test here a move for a person:.
+     *
+     * * which was in a position "not sharing household"
+     * * which move to the same household, in a position "sharing household"
+     */
+    public function testMoveFromNotSharingHouseholdToSharingHousehouldInSamehouseholdOnSameDate()
+    {
+        $person = new Person();
+        $household = new Household();
+        $positionSharing = (new Position())->setShareHousehold(true);
+        $positionNotSharing = (new Position())->setShareHousehold(false);
+        $factory = $this->buildMembersEditorFactory();
+        $editor = $factory->createEditor($household);
+
+        // we add the member to the household, at the position "not sharing"
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionNotSharing);
+
+        // double check that the person is in the household
+        $this->assertContains($person, $household->getCurrentPersons());
+
+        // we do the move to the position sharing household
+        $editor = $factory->createEditor($household);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionSharing);
+
+        self::assertCount(2, $household->getMembers());
+
+        $sharings = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => $m->getShareHousehold());
+        $notSharing = $household->getCurrentMembers()->filter(static fn (HouseholdMember $m) => !$m->getShareHousehold());
+
+        $this->assertCount(0, $notSharing);
+        $this->assertCount(1, $sharings);
+
+        $getPerson = static fn (HouseholdMember $m) => $m->getPerson();
+
+        $this->assertContains($person, $sharings->map($getPerson));
+        $this->assertNotContains($person, $notSharing->map($getPerson));
+    }
+
     public function testMovePersonWithoutSharedHousehold()
     {
         $person = new Person();
@@ -170,20 +301,20 @@ final class MembersEditorTest extends TestCase
         $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
         );
 
         $persistables = $editor->getPersistable();
-        $this->assertEquals(1, count($persistables));
+        $this->assertEquals(1, \count($persistables));
 
         $membership1 = $person->getHouseholdParticipations()->first();
         $this->assertSame($household1, $membership1->getHousehold());
         $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,
@@ -192,7 +323,7 @@ final class MembersEditorTest extends TestCase
         );
 
         $persistables = $editor->getPersistable();
-        $this->assertEquals(1, count($persistables));
+        $this->assertEquals(1, \count($persistables));
 
         $membership2 = $person->getHouseholdParticipations()->last();
         $this->assertNull($membership2->getEndDate());
@@ -213,20 +344,20 @@ final class MembersEditorTest extends TestCase
         $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
         );
 
         $persistables = $editor->getPersistable();
-        $this->assertEquals(count($persistables), 1);
+        $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');
+        $date = \DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01');
         $editor = $this->factory->createEditor($household2);
         $editor->addMovement(
             $date,
@@ -235,7 +366,7 @@ final class MembersEditorTest extends TestCase
         );
 
         $persistables = $editor->getPersistable();
-        $this->assertEquals(1, count($persistables));
+        $this->assertEquals(1, \count($persistables));
 
         $membership2 = $persistables[0];
         $this->assertSame($household2, $membership2->getHousehold());
@@ -247,13 +378,26 @@ final class MembersEditorTest extends TestCase
         $this->assertEquals($date, $membership1->getEndDate());
     }
 
-    public function testPostMoveToAPositionNotSharingHousehold()
+    public function testPostMoveToAPositionNotSharingHouseholdOnSameDay()
     {
         $person = new Person();
-        $position = (new Position())
+        $positionNotSharing = (new Position())
             ->setShareHousehold(false);
+        $positionSharing = (new Position())->setShareHousehold(true);
         $household1 = new Household();
         $household2 = new Household();
+
+        $factory = $this->buildMembersEditorFactory();
+        $editor = $factory->createEditor($household1);
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionSharing);
+        $editor->postMove();
+
+        self::assertContains($person, $household1->getCurrentPersons());
+        self::assertContains($person, $household1->getCurrentMembers()
+            ->filter(fn (HouseholdMember $m) => $m->getShareHousehold())
+            ->map(fn (HouseholdMember $m) => $m->getPerson()));
+        self::assertSame($household1, $person->getCurrentHousehold());
+
         $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
         $eventDispatcher
             ->dispatch(Argument::type(PersonAddressMoveEvent::class))
@@ -262,11 +406,78 @@ final class MembersEditorTest extends TestCase
             $eventDispatcher->reveal(),
             null
         );
-        $editor = $factory->createEditor($household1);
-
-        $editor->addMovement(new DateTimeImmutable('now'), $person, $position);
+        $editor = $factory->createEditor($household2);
 
+        $editor->addMovement(new \DateTimeImmutable('today'), $person, $positionNotSharing);
         $editor->postMove();
+
+        // $household1 still contains $person
+        self::assertContains($person, $household1->getCurrentPersons());
+        self::assertContains($person, $household1->getCurrentMembers()
+            ->filter(fn (HouseholdMember $m) => $m->getShareHousehold())
+            ->map(fn (HouseholdMember $m) => $m->getPerson()));
+        self::assertSame($household1, $person->getCurrentHousehold());
+
+        // $household2 contains $person at non-sharing position
+        self::assertContains($person, $household2->getCurrentMembers()
+            ->filter(fn (HouseholdMember $m) => !$m->getShareHousehold())
+            ->map(fn (HouseholdMember $m) => $m->getPerson()));
+        self::assertContains(
+            $household2,
+            $person->getHouseholdParticipationsNotShareHousehold()
+                ->map(fn (HouseholdMember $hm) => $hm->getHousehold())
+        );
+    }
+
+    public function testPostMoveToAPositionNotSharingHouseholdOnDifferentDays()
+    {
+        $person = new Person();
+        $positionNotSharing = (new Position())
+            ->setShareHousehold(false);
+        $positionSharing = (new Position())->setShareHousehold(true);
+        $household1 = new Household();
+        $household2 = new Household();
+
+        $factory = $this->buildMembersEditorFactory();
+        $editor = $factory->createEditor($household1);
+        $editor->addMovement(new \DateTimeImmutable('1 year ago'), $person, $positionSharing);
+        $editor->postMove();
+
+        self::assertContains($person, $household1->getCurrentPersons());
+        self::assertContains($person, $household1->getCurrentMembers()
+            ->filter(fn (HouseholdMember $m) => $m->getShareHousehold())
+            ->map(fn (HouseholdMember $m) => $m->getPerson()));
+        self::assertSame($household1, $person->getCurrentHousehold());
+
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher
+            ->dispatch(Argument::type(PersonAddressMoveEvent::class))
+            ->shouldNotBeCalled();
+        $factory = $this->buildMembersEditorFactory(
+            $eventDispatcher->reveal(),
+            null
+        );
+        $editor = $factory->createEditor($household2);
+
+        $editor->addMovement(new \DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+        $editor->postMove();
+
+        // $household1 still contains $person
+        self::assertContains($person, $household1->getCurrentPersons());
+        self::assertContains($person, $household1->getCurrentMembers()
+            ->filter(fn (HouseholdMember $m) => $m->getShareHousehold())
+            ->map(fn (HouseholdMember $m) => $m->getPerson()));
+        self::assertSame($household1, $person->getCurrentHousehold());
+
+        // $household2 contains $person at non-sharing position
+        self::assertContains($person, $household2->getCurrentMembers()
+            ->filter(fn (HouseholdMember $m) => !$m->getShareHousehold())
+            ->map(fn (HouseholdMember $m) => $m->getPerson()));
+        self::assertContains(
+            $household2,
+            $person->getHouseholdParticipationsNotShareHousehold()
+                ->map(fn (HouseholdMember $hm) => $hm->getHousehold())
+        );
     }
 
     public function testPostMoveToAPositionSharingHouseholdAndSameHousehold()
@@ -281,7 +492,7 @@ final class MembersEditorTest extends TestCase
         // set into the first household
         $editor = $this->buildMembersEditorFactory()
             ->createEditor($household1);
-        $editor->addMovement(new DateTimeImmutable('1 year ago'), $person, $position);
+        $editor->addMovement(new \DateTimeImmutable('1 year ago'), $person, $position);
 
         // prepare for next move
         $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
@@ -294,7 +505,7 @@ final class MembersEditorTest extends TestCase
         );
         $editor = $factory->createEditor($household1);
 
-        $editor->addMovement(new DateTimeImmutable('now'), $person, $position2);
+        $editor->addMovement(new \DateTimeImmutable('now'), $person, $position2);
 
         $editor->postMove();
     }
@@ -310,7 +521,7 @@ final class MembersEditorTest extends TestCase
         // set into the first household
         $editor = $this->buildMembersEditorFactory()
             ->createEditor($household1);
-        $editor->addMovement(new DateTimeImmutable('1 year ago'), $person, $position);
+        $editor->addMovement(new \DateTimeImmutable('1 year ago'), $person, $position);
 
         // perform now the movement
         $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
@@ -323,7 +534,7 @@ final class MembersEditorTest extends TestCase
         );
         $editor = $factory->createEditor($household2);
 
-        $editor->addMovement(new DateTimeImmutable('now'), $person, $position);
+        $editor->addMovement(new \DateTimeImmutable('now'), $person, $position);
 
         $editor->postMove();
     }
@@ -344,14 +555,14 @@ final class MembersEditorTest extends TestCase
         );
         $editor = $factory->createEditor($household1);
 
-        $editor->addMovement(new DateTimeImmutable('now'), $person, $position);
+        $editor->addMovement(new \DateTimeImmutable('now'), $person, $position);
 
         $editor->postMove();
     }
 
     private function buildMembersEditorFactory(
-        ?EventDispatcherInterface $eventDispatcher = null,
-        ?ValidatorInterface $validator = null
+        EventDispatcherInterface $eventDispatcher = null,
+        ValidatorInterface $validator = null
     ) {
         if (null === $eventDispatcher) {
             $double = $this->getProphet()->prophesize();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php
new file mode 100644
index 000000000..87c57be86
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/AccompanyingPeriodACLAwareRepositoryTest.php
@@ -0,0 +1,546 @@
+<?php
+
+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 Repository;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Workflow\Registry;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AccompanyingPeriodACLAwareRepositoryTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
+
+    private CenterResolverManagerInterface $centerResolverManager;
+
+    private CenterRepositoryInterface $centerRepository;
+
+    private EntityManagerInterface $entityManager;
+
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private Registry $registry;
+
+    private static array $periodsIdsToDelete = [];
+
+    /**
+     * @var list<array<class-string, int>>
+     */
+    private static array $entitiesToDelete = [];
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->accompanyingPeriodRepository = self::$container->get(AccompanyingPeriodRepository::class);
+        $this->centerRepository = self::$container->get(CenterRepositoryInterface::class);
+        $this->centerResolverManager = self::$container->get(CenterResolverManagerInterface::class);
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+        $this->scopeRepository = self::$container->get(ScopeRepositoryInterface::class);
+        $this->registry = self::$container->get(Registry::class);
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $repository = self::$container->get(AccompanyingPeriodRepository::class);
+
+        foreach (self::$periodsIdsToDelete as $id) {
+            if (null === $period = $repository->find($id)) {
+                throw new \RuntimeException('period not found while trying to delete it');
+            }
+
+            foreach ($period->getParticipations() as $participation) {
+                $em->remove($participation);
+            }
+            $em->remove($period);
+        }
+
+        foreach (self::$entitiesToDelete as [$class, $id]) {
+            if (null === $entity = $em->find($class, $id)) {
+                throw new \RuntimeException(sprintf('entity %s with id %d not found', $class, $id));
+            }
+            $em->remove($entity);
+        }
+
+        $em->flush();
+    }
+
+    /**
+     * @dataProvider provideDataFindByUserAndPostalCodesOpenedAccompanyingPeriod
+     *
+     * @param list<array{center: Center, scopeOnRole: list<Scope>, scopeCanSeeConfidential: list<Scope>}> $centerScopes
+     * @param list<AccompanyingPeriod>                                                                    $expectedContains
+     * @param list<AccompanyingPeriod>                                                                    $expectedNotContains
+     */
+    public function testFindByUserAndPostalCodesOpenedAccompanyingPeriod(User $user, User $searched, array $centerScopes, array $expectedContains, array $expectedNotContains, string $message): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn($user);
+
+        $authorizationHelper = $this->prophesize(AuthorizationHelperForCurrentUserInterface::class);
+        $centers = [];
+
+        foreach ($centerScopes as ['center' => $center, 'scopeOnRole' => $scopes, 'scopeCanSeeConfidential' => $scopesCanSeeConfidential]) {
+            $centers[spl_object_hash($center)] = $center;
+            $authorizationHelper->getReachableScopes(AccompanyingPeriodVoter::SEE, $center)
+                ->willReturn($scopes);
+            $authorizationHelper->getReachableScopes(AccompanyingPeriodVoter::SEE_CONFIDENTIAL_ALL, $center)
+                ->willReturn($scopesCanSeeConfidential);
+        }
+        $authorizationHelper->getReachableCenters(AccompanyingPeriodVoter::SEE)->willReturn(array_values($centers));
+
+        $repository = new AccompanyingPeriodACLAwareRepository(
+            $this->accompanyingPeriodRepository,
+            $security->reveal(),
+            $authorizationHelper->reveal(),
+            $this->centerResolverManager
+        );
+
+        $actual = array_map(
+            fn (AccompanyingPeriod $period) => $period->getId(),
+            $repository->findByUserAndPostalCodesOpenedAccompanyingPeriod($searched, [], ['id' => 'DESC'], 20, 0)
+        );
+
+        foreach ($expectedContains as $expected) {
+            self::assertContains($expected->getId(), $actual, $message);
+        }
+        foreach ($expectedNotContains as $expected) {
+            self::assertNotContains($expected->getId(), $actual, $message);
+        }
+    }
+
+    public function provideDataFindByUserAndPostalCodesOpenedAccompanyingPeriod(): iterable
+    {
+        $this->setUp();
+
+        if (null === $user = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u')->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no user found');
+        }
+
+        if (null === $anotherUser = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u WHERE u.id != :uid')->setParameter('uid', $user->getId())
+            ->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no user found');
+        }
+
+        $persons = $this->entityManager
+            ->createQuery('SELECT p FROM '.Person::class.' p JOIN p.centerCurrent current_center')
+            ->setMaxResults(4)
+            ->getResult();
+
+        if (4 > count($persons)) {
+            throw new \RuntimeException('no person found');
+        }
+
+        /** @var Person $person */
+        [$person, $anotherPerson, $person2, $person3] = $persons;
+
+        $scopes = $this->scopeRepository->findAll();
+
+        if (3 > count($scopes)) {
+            throw new \RuntimeException('not enough scopes for this test');
+        }
+        $scopesCanSee = [$scopes[0]];
+        $scopesGroup2 = [$scopes[1]];
+
+        $centers = $this->centerRepository->findActive();
+        $aCenterNotAssociatedToPerson = array_values(array_filter($centers, fn (Center $c) => $c !== $person->getCenter()))[0];
+
+        if (2 > count($centers)) {
+            throw new \RuntimeException('not enough centers for this test');
+        }
+
+        $period = $this->buildPeriod($person, $scopesCanSee, $user, true);
+        $period->setUser($user);
+
+        yield [
+            $anotherUser,
+            $user,
+            [
+                [
+                    'center' => $person->getCenter(),
+                    'scopeOnRole' => $scopesCanSee,
+                    'scopeCanSeeConfidential' => [],
+                ],
+            ],
+            [$period],
+            [],
+            'period should be visible with expected scopes',
+        ];
+
+        yield [
+            $anotherUser,
+            $user,
+            [
+                [
+                    'center' => $person->getCenter(),
+                    'scopeOnRole' => $scopesGroup2,
+                    'scopeCanSeeConfidential' => [],
+                ],
+            ],
+            [],
+            [$period],
+            'period should not be visible without expected scopes',
+        ];
+
+        yield [
+            $anotherUser,
+            $user,
+            [
+                [
+                    'center' => $person->getCenter(),
+                    'scopeOnRole' => $scopesGroup2,
+                    'scopeCanSeeConfidential' => [],
+                ],
+                [
+                    'center' => $aCenterNotAssociatedToPerson,
+                    'scopeOnRole' => $scopesCanSee,
+                    'scopeCanSeeConfidential' => [],
+                ],
+            ],
+            [],
+            [$period],
+            'period should not be visible for user having right in another scope (with multiple centers)',
+        ];
+
+        $period = $this->buildPeriod($person, $scopesCanSee, $user, true);
+        $period->setUser($user);
+        $period->setConfidential(true);
+
+        yield [
+            $anotherUser,
+            $user,
+            [
+                [
+                    'center' => $person->getCenter(),
+                    'scopeOnRole' => $scopesCanSee,
+                    'scopeCanSeeConfidential' => [],
+                ],
+            ],
+            [],
+            [$period],
+            'period confidential should not be visible',
+        ];
+
+        yield [
+            $anotherUser,
+            $user,
+            [
+                [
+                    'center' => $person->getCenter(),
+                    'scopeOnRole' => $scopesCanSee,
+                    'scopeCanSeeConfidential' => $scopesCanSee,
+                ],
+            ],
+            [$period],
+            [],
+            'period confidential be visible if user has required scopes',
+        ];
+
+        $this->entityManager->flush();
+    }
+
+    /**
+     * @dataProvider provideDataFindByUndispatched
+     *
+     * @param list<array{center: Center, scopeOnRole: list<Scope>, scopeCanSeeConfidential: list<Scope>}> $centerScopes
+     * @param list<AccompanyingPeriod>                                                                    $expectedContains
+     * @param list<AccompanyingPeriod>                                                                    $expectedNotContains
+     */
+    public function testFindByUndispatched(User $user, array $centerScopes, array $expectedContains, array $expectedNotContains, string $message): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn($user);
+
+        $authorizationHelper = $this->prophesize(AuthorizationHelperForCurrentUserInterface::class);
+        $centers = [];
+
+        foreach ($centerScopes as ['center' => $center, 'scopeOnRole' => $scopes, 'scopeCanSeeConfidential' => $scopesCanSeeConfidential]) {
+            $centers[spl_object_hash($center)] = $center;
+            $authorizationHelper->getReachableScopes(AccompanyingPeriodVoter::SEE, $center)
+                ->willReturn($scopes);
+            $authorizationHelper->getReachableScopes(AccompanyingPeriodVoter::SEE_CONFIDENTIAL_ALL, $center)
+                ->willReturn($scopesCanSeeConfidential);
+        }
+        $authorizationHelper->getReachableCenters(AccompanyingPeriodVoter::SEE)->willReturn(array_values($centers));
+
+        $repository = new AccompanyingPeriodACLAwareRepository(
+            $this->accompanyingPeriodRepository,
+            $security->reveal(),
+            $authorizationHelper->reveal(),
+            $this->centerResolverManager
+        );
+
+        $actual = array_map(
+            fn (AccompanyingPeriod $period) => $period->getId(),
+            $repository->findByUnDispatched([], [], [], ['id' => 'DESC'], 20, 0)
+        );
+
+        foreach ($expectedContains as $expected) {
+            self::assertContains($expected->getId(), $actual, $message);
+        }
+        foreach ($expectedNotContains as $expected) {
+            self::assertNotContains($expected->getId(), $actual, $message);
+        }
+    }
+
+    public function provideDataFindByUndispatched(): iterable
+    {
+        $this->setUp();
+
+        if (null === $user = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u')->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no user found');
+        }
+
+        if (null === $anotherUser = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u WHERE u.id != :uid')->setParameter('uid', $user->getId())
+            ->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no user found');
+        }
+
+        /** @var Person $person */
+        $persons = $this->entityManager
+            ->createQuery('SELECT p FROM '.Person::class.' p ')
+            ->setMaxResults(4)
+            ->getResult();
+
+        if (4 > count($persons)) {
+            throw new \RuntimeException('no person found');
+        }
+
+        [$person, $anotherPerson, $person2, $person3] = $persons;
+
+        $scopes = $this->scopeRepository->findAll();
+
+        if (3 > count($scopes)) {
+            throw new \RuntimeException('not enough scopes for this test');
+        }
+        $scopesCanSee = [$scopes[0]];
+        $scopesGroup2 = [$scopes[1]];
+
+        $centers = $this->centerRepository->findActive();
+
+        if (2 > count($centers)) {
+            throw new \RuntimeException('not enough centers for this test');
+        }
+
+        $period = $this->buildPeriod($person, $scopesCanSee, $user, true);
+
+        // expected scope: can see the period
+        yield [
+            $anotherUser,
+            [
+                [
+                    'center' => $person->getCenter(),
+                    'scopeOnRole' => $scopesCanSee,
+                    'scopeCanSeeConfidential' => [],
+                ],
+            ],
+            [$period],
+            [],
+            'period should be visible with expected scopes',
+        ];
+
+        // no scope visible
+        yield [
+            $anotherUser,
+            [
+                [
+                    'center' => $person->getCenter(),
+                    'scopeOnRole' => $scopesGroup2,
+                    'scopeCanSeeConfidential' => [],
+                ],
+            ],
+            [],
+            [$period],
+            'period should not be visible without expected scopes',
+        ];
+
+        // another center
+        yield [
+            $anotherUser,
+            [
+                [
+                    'center' => $person->getCenter(),
+                    'scopeOnRole' => $scopesGroup2,
+                    'scopeCanSeeConfidential' => [],
+                ],
+                [
+                    'center' => array_values(array_filter($centers, fn (Center $c) => $c !== $person->getCenter()))[0],
+                    'scopeOnRole' => $scopesCanSee,
+                    'scopeCanSeeConfidential' => [],
+                ],
+            ],
+            [],
+            [$period],
+            'period should not be visible for user having right in another scope (with multiple centers)',
+        ];
+
+        $this->entityManager->flush();
+    }
+
+    /**
+     * For testing this method, we mock the authorization helper to return different Scope that a user
+     * can see, or that a user can see confidential periods.
+     *
+     * @param array<Scope>              $scopeUserCanSee
+     * @param array<Scope>              $scopeUserCanSeeConfidential
+     * @param array<AccompanyingPeriod> $expectedPeriod
+     *
+     * @dataProvider provideDataForFindByPerson
+     */
+    public function testFindByPersonTestUser(User $user, Person $person, array $scopeUserCanSee, array $scopeUserCanSeeConfidential, array $expectedPeriod, string $message): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn($user);
+
+        $authorizationHelper = $this->prophesize(AuthorizationHelperForCurrentUserInterface::class);
+        $authorizationHelper->getReachableScopes(AccompanyingPeriodVoter::SEE, Argument::any())
+            ->willReturn($scopeUserCanSee);
+        $authorizationHelper->getReachableScopes(AccompanyingPeriodVoter::SEE_CONFIDENTIAL_ALL, Argument::any())
+            ->willReturn($scopeUserCanSeeConfidential);
+
+        $repository = new AccompanyingPeriodACLAwareRepository(
+            $this->accompanyingPeriodRepository,
+            $security->reveal(),
+            $authorizationHelper->reveal(),
+            $this->centerResolverManager
+        );
+
+        $actuals = $repository->findByPerson($person, AccompanyingPeriodVoter::SEE);
+        $expectedIds = array_map(fn (AccompanyingPeriod $period) => $period->getId(), $expectedPeriod);
+
+        self::assertCount(count($expectedPeriod), $actuals, $message);
+        foreach ($actuals as $actual) {
+            self::assertContains($actual->getId(), $expectedIds);
+        }
+    }
+
+    public function provideDataForFindByPerson(): iterable
+    {
+        $this->setUp();
+
+        if (null === $user = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u')->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no user found');
+        }
+
+        if (null === $anotherUser = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u WHERE u.id != :uid')->setParameter('uid', $user->getId())
+            ->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('no user found');
+        }
+
+        if (null === $centerA = $this->entityManager->createQuery('SELECT c FROM '.Center::class.' c WHERE c.name LIKE :cn')->setParameter('cn', 'Center A')
+            ->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('Center A not found');
+        }
+        $persons = [new Person(), new Person(), new Person(), new Person()];
+        $firstnames = ['alpha', 'beta', 'gamma', 'delta'];
+        $lastnames = ['primo', 'secundo', 'tertio', 'quartro'];
+
+        foreach ($persons as $k => $p) {
+            $p
+                ->setFirstName($firstnames[$k])
+                ->setLastName($lastnames[$k])
+                ->setBirthdate((new \DateTime('today'))->sub(new \DateInterval('P'.random_int(18, 100).'Y')))
+                ->setCenter($centerA)
+            ;
+            $this->entityManager->persist($p);
+            self::$entitiesToDelete[] = [Person::class, $p->getId()];
+        }
+
+        [$person, $anotherPerson, $person2, $person3] = $persons;
+
+        $scopes = $this->scopeRepository->findAll();
+
+        if (3 > count($scopes)) {
+            throw new \RuntimeException('not enough scopes for this test');
+        }
+        $scopesCanSee = [$scopes[0]];
+        $scopesGroup2 = [$scopes[1]];
+
+        // case: a period is in draft state
+        $period = $this->buildPeriod($person, $scopesCanSee, $user, false);
+
+        yield [$user, $person, $scopesCanSee, [], [$period], 'a user can see his period during draft state'];
+
+        // another user is not allowed to see this period, because it is in DRAFT state
+        yield [$anotherUser, $person, $scopesCanSee, [], [], 'another user is not allowed to see the period of someone else in draft state'];
+
+        // the period is confirmed
+        $period = $this->buildPeriod($anotherPerson, $scopesCanSee, $user, true);
+
+        // the other user can now see it
+        yield [$user, $anotherPerson, $scopesCanSee, [], [$period], 'a user see his period when confirmed'];
+        yield [$anotherUser, $anotherPerson, $scopesCanSee, [], [$period], 'another user with required scopes is allowed to see the period when not draft'];
+        yield [$anotherUser, $anotherPerson, $scopesGroup2, [], [], 'another user without the required scopes is not allowed to see the period when not draft'];
+
+        // this period will be confidential
+        $period = $this->buildPeriod($person2, $scopesCanSee, $user, true);
+        $period->setConfidential(true)->setUser($user, true);
+
+        yield [$user, $person2, $scopesCanSee, [], [$period], 'a user see his period when confirmed and confidential with required scopes'];
+        yield [$user, $person2, $scopesGroup2, [], [$period], 'a user see his period when confirmed and confidential without required scopes'];
+        yield [$anotherUser, $person2, $scopesCanSee, [], [], "a user don't see a confidential period, even if he has required scopes"];
+        yield [$anotherUser, $person2, $scopesCanSee, $scopesCanSee, [$period], 'a user see the period when confirmed and confidential if he has required scope to see the period'];
+
+        // period draft with creator = null
+        $period = $this->buildPeriod($person3, $scopesCanSee, null, false);
+        yield [$user, $person3, $scopesCanSee, [], [$period], 'a user see a period when draft if no creator on the period'];
+        $this->entityManager->flush();
+    }
+
+    /**
+     * @param array<Scope> $scopes
+     */
+    private function buildPeriod(Person $person, array $scopes, null|User $creator, bool $confirm): AccompanyingPeriod
+    {
+        $period = new AccompanyingPeriod();
+        $period->addPerson($person);
+        if (null !== $creator) {
+            $period->setCreatedBy($creator);
+        }
+
+        foreach ($scopes as $scope) {
+            $period->addScope($scope);
+        }
+
+        $this->entityManager->persist($period);
+        self::$periodsIdsToDelete[] = $period->getId();
+
+        if ($confirm) {
+            $workflow = $this->registry->get($period, 'accompanying_period_lifecycle');
+            $workflow->apply($period, 'confirm');
+        }
+
+        return $period;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
index 72059847a..493e71e3a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
@@ -23,10 +23,10 @@ use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Security;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonACLAwareRepositoryTest extends KernelTestCase
@@ -91,11 +91,11 @@ final class PersonACLAwareRepositoryTest extends KernelTestCase
 
         $results = $repository->findBySearchCriteria(0, 5, false, 'diallo');
 
-        $this->assertGreaterThan(0, count($results));
+        $this->assertGreaterThan(0, \count($results));
         $this->assertContainsOnlyInstancesOf(Person::class, $results);
 
         foreach ($results as $person) {
-            $this->assertStringContainsString('diallo', strtolower($person->getFirstName() . ' ' . $person->getLastName()));
+            $this->assertStringContainsString('diallo', strtolower($person->getFirstName().' '.$person->getLastName()));
         }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php
new file mode 100644
index 000000000..3f81f1ebe
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php
@@ -0,0 +1,45 @@
+<?php
+
+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 Chill\PersonBundle\Tests\Repository;
+
+use Chill\MainBundle\Repository\UserRepository;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class UserRepositoryTest extends KernelTestCase
+{
+    private UserRepository $userRepository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::bootKernel();
+        $this->userRepository = self::$container->get(UserRepository::class);
+    }
+
+    public function testFindAllAsArray(): void
+    {
+        $userIterator = $this->userRepository->findAllAsArray('fr');
+
+        self::assertIsIterable($userIterator);
+        $i = 0;
+        foreach ($userIterator as $u) {
+            self::assertIsArray($u);
+            ++$i;
+        }
+        self::assertGreaterThan(0, $i);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
index 9d200beee..1577ef2fe 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
@@ -11,17 +11,26 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Search;
 
+use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * Test Person search.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonSearchTest extends WebTestCase
 {
-    public function testDefaultAccented()
+    use PrepareClientTrait;
+
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
+    public function testDefaultAccented(): never
     {
         $this->markTestSkipped('skipped until adapted to new fixtures');
         $crawlerSpecial = $this->generateCrawlerForSearch('@person manço');
@@ -69,6 +78,8 @@ final class PersonSearchTest extends WebTestCase
 
         $this->assertMatchesRegularExpression('/MANÇO/', $crawlerSpecial->filter('.list-with-period')->text());
 
+        self::ensureKernelShutdown();
+
         $crawlerNoSpecial = $this->generateCrawlerForSearch('@person lastname:manco');
 
         $this->assertMatchesRegularExpression('/MANÇO/', $crawlerNoSpecial->filter('.list-with-period')->text());
@@ -95,6 +106,8 @@ final class PersonSearchTest extends WebTestCase
 
         $this->assertMatchesRegularExpression('/Gérard/', $crawlerSpecial->filter('.list-with-period')->text());
 
+        self::ensureKernelShutdown();
+
         $crawlerNoSpecial = $this->generateCrawlerForSearch('@person firstname:Gerard');
 
         $this->assertMatchesRegularExpression('/Gérard/', $crawlerNoSpecial->filter('.list-with-period')->text());
@@ -135,7 +148,7 @@ final class PersonSearchTest extends WebTestCase
         $this->assertMatchesRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
     }
 
-    public function testSearchCombineBirthdateAndLastName()
+    public function testSearchCombineBirthdateAndLastName(): never
     {
         $this->markTestSkipped('skipped until adapted to new fixtures');
         $crawler = $this->generateCrawlerForSearch('@person birthdate:1948-12-27 lastname:(Van Snick)');
@@ -144,7 +157,7 @@ final class PersonSearchTest extends WebTestCase
         $this->assertDoesNotMatchRegularExpression('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
     }
 
-    public function testSearchCombineGenderAndLastName()
+    public function testSearchCombineGenderAndLastName(): never
     {
         $this->markTestSkipped('skipped until adapted to new fixtures');
         $crawler = $this->generateCrawlerForSearch('@person gender:woman lastname:(Depardieu)');
@@ -153,13 +166,13 @@ final class PersonSearchTest extends WebTestCase
         $this->assertDoesNotMatchRegularExpression('/Gérard/', $crawler->filter('.list-with-period')->text());
     }
 
-    public function testSearchCombineLastnameAndFirstName()
+    public function testSearchCombineLastnameAndFirstName(): never
     {
         $this->markTestSkipped('skipped until adapted to new fixtures');
         $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu firstname:Jean');
 
         $this->assertMatchesRegularExpression('/Depardieu/', $crawler->filter('.list-with-period')->text());
-        //if this is a AND clause, Jean Depardieu should not appears
+        // if this is a AND clause, Jean Depardieu should not appears
         $this->assertDoesNotMatchRegularExpression(
             '/Gérard/',
             $crawler->filter('.list-with-period')->text(),
@@ -167,13 +180,13 @@ final class PersonSearchTest extends WebTestCase
         );
     }
 
-    public function testSearchCombineLastnameAndNationality()
+    public function testSearchCombineLastnameAndNationality(): never
     {
         $this->markTestSkipped('skipped until adapted to new fixtures');
         $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu nationality:RU');
 
         $this->assertMatchesRegularExpression('/Gérard/', $crawler->filter('.list-with-period')->text());
-        //if this is a AND clause, Jean Depardieu should not appears
+        // if this is a AND clause, Jean Depardieu should not appears
         $this->assertDoesNotMatchRegularExpression(
             '/Jean/',
             $crawler->filter('.list-with-period')->text(),
@@ -181,7 +194,7 @@ final class PersonSearchTest extends WebTestCase
         );
     }
 
-    public function testSearchMultipleTrigramUseAndClauseInDefault()
+    public function testSearchMultipleTrigramUseAndClauseInDefault(): never
     {
         $this->markTestSkipped('skipped until adapted to new fixtures');
         $crawler = $this->generateCrawlerForSearch('@person cha dep');
@@ -197,13 +210,15 @@ final class PersonSearchTest extends WebTestCase
     public function testSearchWithAuthorization()
     {
         $crawlerCanSee = $this->generateCrawlerForSearch('Gérard', 'center a_social');
-        $crawlerCannotSee = $this->generateCrawlerForSearch('Gérard', 'center b_social');
 
         $this->assertMatchesRegularExpression(
             '/DEPARDIEU/',
             $crawlerCanSee->text(),
             'center a_social may see "Depardieu" in center a'
         );
+        self::ensureKernelShutdown();
+
+        $crawlerCannotSee = $this->generateCrawlerForSearch('Gérard', 'center b_social');
         $this->assertDoesNotMatchRegularExpression(
             '/DEPARDIEU/',
             $crawlerCannotSee->text(),
@@ -225,15 +240,10 @@ final class PersonSearchTest extends WebTestCase
     }
 
     /**
-     * @param mixed $username
-     *
-     * @return \Symfony\Component\BrowserKit\Client
+     * @return \Symfony\Component\BrowserKit\AbstractBrowser
      */
-    private function getAuthenticatedClient($username = 'center a_social')
+    private function getAuthenticatedClient(mixed $username = 'center a_social')
     {
-        return self::createClient([], [
-            'PHP_AUTH_USER' => $username,
-            'PHP_AUTH_PW' => 'password',
-        ]);
+        return $this->getClientAuthenticated($username);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
index d7f08a3a4..1dbbceb3e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
  * Test PersonVoter.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class PersonVoterTest extends KernelTestCase
@@ -154,11 +155,11 @@ final class PersonVoterTest extends KernelTestCase
      *
      * @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');
+            ->willImplement('\\'.\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
 
         if (null === $permissions) {
             $token->getUser()->willReturn(null);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
index 9e5a8090e..3825f1404 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodOriginNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodOriginNormalizerTest.php
index cba5ed875..f69496b4d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodOriginNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodOriginNormalizerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodOriginNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodResourceNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodResourceNormalizerTest.php
index 0c4188826..8c76d6d86 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodResourceNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodResourceNormalizerTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodResourceNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
index e71e0bf51..c438be5f0 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
@@ -17,13 +17,13 @@ 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
@@ -67,8 +67,8 @@ final class AccompanyingPeriodWorkDocGenNormalizerTest extends KernelTestCase
             ->addPerson((new Person())->setFirstName('hello')->setLastName('name'))
             ->addGoal($g = new AccompanyingPeriodWorkGoal())
             ->addResult($r = new Result())
-            ->setCreatedAt(new DateTimeImmutable())
-            ->setUpdatedAt(new DateTimeImmutable())
+            ->setCreatedAt(new \DateTimeImmutable())
+            ->setUpdatedAt(new \DateTimeImmutable())
             ->setCreatedBy($user = new User())
             ->setUpdatedBy($user);
         $g->addResult($r)->setGoal($goal = new Goal());
@@ -88,7 +88,7 @@ final class AccompanyingPeriodWorkDocGenNormalizerTest extends KernelTestCase
         $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($actual));
 
         foreach ($expected as $key => $item) {
-            if ('@ignored' === $item) {
+            if (0 === $item) {
                 continue;
             }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php
index 8b2cf2ffb..4ab4b667e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizerTest.php
@@ -16,11 +16,11 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluatio
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
 use Chill\PersonBundle\Serializer\Normalizer\AccompanyingPeriodWorkEvaluationDenormalizer;
 use PHPUnit\Framework\TestCase;
-use ReflectionProperty;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodWorkEvaluationDenormalizerTest extends TestCase
@@ -96,13 +96,13 @@ final class AccompanyingPeriodWorkEvaluationDenormalizerTest extends TestCase
             "id": 382
         }';
 
-    public function testAssociatedDocumentIsTheSame()
+    public function testAssociatedDocumentIsTheSame(): never
     {
         $this->markTestIncomplete('not yet finished');
         $evaluation = new AccompanyingPeriodWorkEvaluation();
         $doc = new AccompanyingPeriodWorkEvaluationDocument();
         $doc->setStoredObject($storedObject = new StoredObject());
-        $reflectionProperty = new ReflectionProperty(AccompanyingPeriodWorkEvaluationDocument::class, 'id');
+        $reflectionProperty = new \ReflectionProperty(AccompanyingPeriodWorkEvaluationDocument::class, 'id');
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($doc, 1);
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
index acd4119a1..9cbeabea0 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
@@ -15,13 +15,14 @@ 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 Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdNormalizerTest extends KernelTestCase
@@ -30,7 +31,7 @@ final class HouseholdNormalizerTest extends KernelTestCase
 
     private ?NormalizerInterface $normalizer;
 
-    private array $toDelete;
+    private readonly array $toDelete;
 
     protected function setUp(): void
     {
@@ -39,7 +40,7 @@ final class HouseholdNormalizerTest extends KernelTestCase
         $this->entityManager = self::$container->get(EntityManagerInterface::class);
     }
 
-    public function testNormalizationRecursive()
+    public function testNormalizationRecursive(): void
     {
         $person = new Person();
         $person->setFirstName('ok')->setLastName('ok');
@@ -51,8 +52,8 @@ final class HouseholdNormalizerTest extends KernelTestCase
             ->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'))
             ->setPosition($position);
 
         $household->addMember($member);
@@ -67,4 +68,53 @@ final class HouseholdNormalizerTest extends KernelTestCase
         $this->assertArrayHasKey('type', $normalized);
         $this->assertEquals('household', $normalized['type']);
     }
+
+    /**
+     * When a household have old members (members which are not "current"),
+     * the indexes of the household must be reset to numerical and contiguous
+     * indexes. This ensure that it will be mapped as a list, not as an associative
+     * array.
+     */
+    public function testHouseholdDocGenNormalizationWithOldMembers(): void
+    {
+        $previousPerson = new Person();
+        $previousPerson->setFirstName('ok')->setLastName('ok');
+        $this->entityManager->persist($previousPerson);
+        $member = new HouseholdMember();
+        $household = new Household();
+        $position = (new Position())
+            ->setShareHousehold(true)
+            ->setAllowHolder(true);
+
+        $member->setPerson($previousPerson)
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setEndDate(new \DateTimeImmutable('1 month ago'))
+            ->setPosition($position);
+
+        $household->addMember($member);
+
+        $currentPerson1 = new Person();
+        $currentPerson1->setFirstName('p1')->setLastName('p1');
+        $this->entityManager->persist($currentPerson1);
+        $member = new HouseholdMember();
+        $member->setPerson($currentPerson1)
+            ->setStartDate(new \DateTimeImmutable('1 year ago'))
+            ->setPosition($position);
+        $household->addMember($member);
+
+        $normalized = $this->normalizer->normalize(
+            $household,
+            'docgen',
+            [
+                AbstractNormalizer::GROUPS => ['docgen:read'],
+                'docgen:expects' => Household::class,
+                'docgen:person:with-household' => false,
+                'docgen:person:with-relations' => false,
+                'docgen:person:with-budget' => false,
+            ]
+        );
+
+        self::assertIsArray($normalized);
+        self::assertArrayHasKey(0, $normalized['currentMembers']);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
index e85813d62..59bb0a731 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
@@ -28,10 +28,10 @@ use Prophecy\PhpUnit\ProphecyTrait;
 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
@@ -95,11 +95,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
             ->setFirstName('Renaud')
             ->setLastName('Mégane');
 
-        $expected = array_merge(
-            self::BLANK,
-            ['firstName' => 'Renaud', 'lastName' => 'Mégane',
-                'text' => 'Renaud Mégane', ]
-        );
+        $expected = [...self::BLANK, 'firstName' => 'Renaud', 'lastName' => 'Mégane', 'text' => 'Renaud Mégane'];
 
         yield [$person, $expected, 'partial normalization for a person'];
 
@@ -108,10 +104,8 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
 
     /**
      * @dataProvider dataGeneratorNormalizationNullOrNotNullHaveSameKeys
-     *
-     * @param mixed $context
      */
-    public function testNormalizationNullOrNotNullHaveSameKeys($context)
+    public function testNormalizationNullOrNotNullHaveSameKeys(mixed $context)
     {
         $period = new Person();
         $notNullData = $this->buildPersonNormalizer()->normalize($period, 'docgen', $context);
@@ -126,11 +120,8 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
 
     /**
      * @dataProvider generateData
-     *
-     * @param mixed $expected
-     * @param mixed $msg
      */
-    public function testNormalize(?Person $person, $expected, $msg)
+    public function testNormalize(?Person $person, mixed $expected, mixed $msg)
     {
         $normalized = $this->normalizer->normalize($person, 'docgen', [
             'docgen:expects' => Person::class,
@@ -229,11 +220,8 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
      * serializers.
      *
      * @dataProvider generateData
-     *
-     * @param mixed $expected
-     * @param mixed $msg
      */
-    public function testNormalizeUsingNormalizer(?Person $person, $expected, $msg)
+    public function testNormalizeUsingNormalizer(?Person $person, mixed $expected, mixed $msg)
     {
         $normalizer = $this->buildNormalizer();
 
@@ -249,12 +237,12 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
     }
 
     private function buildNormalizer(
-        ?PersonRender $personRender = null,
-        ?RelationshipRepository $relationshipRepository = null,
-        ?TranslatorInterface $translator = null,
-        ?TranslatableStringHelper $translatableStringHelper = null,
-        ?NormalizerInterface $normalizer = null,
-        ?SummaryBudgetInterface $summaryBudget = null
+        PersonRender $personRender = null,
+        RelationshipRepository $relationshipRepository = null,
+        TranslatorInterface $translator = null,
+        TranslatableStringHelper $translatableStringHelper = null,
+        NormalizerInterface $normalizer = null,
+        SummaryBudgetInterface $summaryBudget = null
     ): PersonDocGenNormalizer {
         if (null === $summaryBudget) {
             $summaryBudget = $this->prophesize(SummaryBudgetInterface::class);
@@ -286,11 +274,11 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
     }
 
     private function buildPersonNormalizer(
-        ?PersonRender $personRender = null,
-        ?RelationshipRepository $relationshipRepository = null,
-        ?TranslatorInterface $translator = null,
-        ?TranslatableStringHelper $translatableStringHelper = null,
-        ?SummaryBudgetInterface $summaryBudget = null
+        PersonRender $personRender = null,
+        RelationshipRepository $relationshipRepository = null,
+        TranslatorInterface $translator = null,
+        TranslatableStringHelper $translatableStringHelper = null,
+        SummaryBudgetInterface $summaryBudget = null
     ): PersonDocGenNormalizer {
         if (null === $relationshipRepository) {
             $relationshipRepository = $this->prophesize(RelationshipRepository::class);
@@ -318,9 +306,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
         $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]);
-            });
+            ->will(static fn ($args) => $normalizer->normalize($args[0], $args[1], $args[2]));
         $normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will(
             static function ($args) {
                 if (is_iterable($args[0])) {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
index 6e602436a..4c2c3b038 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
@@ -26,6 +26,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonJsonNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
index 05d2eace1..ead8b7284 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
@@ -20,10 +20,10 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use function is_object;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class RelationshipDocGenNormalizerTest extends TestCase
@@ -118,9 +118,7 @@ final class RelationshipDocGenNormalizerTest extends TestCase
     {
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
         $translatableStringHelper->localize(Argument::type('array'))->will(
-            static function ($args) {
-                return $args[0][array_keys($args[0])[0]];
-            }
+            static fn ($args) => $args[0][array_keys($args[0])[0]]
         );
 
         $normalizer = new RelationshipDocGenNormalizer(
@@ -130,9 +128,7 @@ final class RelationshipDocGenNormalizerTest extends TestCase
         $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]);
-            });
+            ->will(static fn ($args) => $normalizer->normalize($args[0], $args[1], $args[2]));
         $normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will(
             static function ($args) {
                 if (null === $args[0]) {
@@ -149,7 +145,7 @@ final class RelationshipDocGenNormalizerTest extends TestCase
                     return $r;
                 }
 
-                if (is_object($args[0])) {
+                if (\is_object($args[0])) {
                     return ['fake' => true, 'hash' => null !== $args[0] ? spl_object_hash($args[0]) : null];
                 }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php
index 19c8b9156..c55dc3f90 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/ResourceJsonNormalizerTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ResourceJsonNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialActionNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialActionNormalizerTest.php
index d3b9b2967..a0aa62013 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialActionNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialActionNormalizerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialActionNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialIssueNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialIssueNormalizerTest.php
index 98a459cc7..ccafddfe3 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialIssueNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/SocialIssueNormalizerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SocialIssueNormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php
new file mode 100644
index 000000000..fe8fac217
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/AccompanyingPeriodContextTest.php
@@ -0,0 +1,292 @@
+<?php
+
+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 Service\DocGenerator;
+
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
+use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AccompanyingPeriodContextTest extends KernelTestCase
+{
+    private BaseContextData $baseContextData;
+
+    private DocumentCategoryRepository $documentCategoryRepository;
+
+    private EntityManagerInterface $em;
+
+    private NormalizerInterface $normalizer;
+
+    private PersonRenderInterface $personRender;
+
+    private PersonRepository $personRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private TranslatorInterface $translator;
+
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->baseContextData = self::$container->get(BaseContextData::class);
+        $this->documentCategoryRepository = self::$container->get(DocumentCategoryRepository::class);
+        $this->em = self::$container->get(EntityManagerInterface::class);
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+        $this->personRender = self::$container->get(PersonRenderInterface::class);
+        $this->personRepository = self::$container->get(PersonRepository::class);
+        $this->translatableStringHelper = self::$container->get(TranslatableStringHelperInterface::class);
+        $this->translator = self::$container->get(TranslatorInterface::class);
+        $this->thirdPartyRender = self::$container->get(ThirdPartyRender::class);
+        $this->thirdPartyRepository = self::$container->get(ThirdPartyRepository::class);
+    }
+
+    private function buildContext(): AccompanyingPeriodContext
+    {
+        return new AccompanyingPeriodContext(
+            $this->documentCategoryRepository,
+            $this->normalizer,
+            $this->translatableStringHelper,
+            $this->em,
+            $this->personRender,
+            $this->personRepository,
+            $this->translator,
+            $this->baseContextData,
+            $this->thirdPartyRender,
+            $this->thirdPartyRepository,
+        );
+    }
+
+    /**
+     * This test run the methods executed when a document is generated:.
+     *
+     * - normalized data from the form in a way that they are stored in message queue;
+     * - denormalize the data from the message queue,
+     * - and get the data, as they will be transmitted to the GeneratorDriver
+     *
+     * @param array              $options          the options, as they are stored in the DocGeneratorTemplate (the admin form data)
+     * @param AccompanyingPeriod $entity           The entity from which the data will be extracted
+     * @param array              $data             The data, from the public form
+     * @param callable           $assertionsOnData some test that will be executed on the normalized data
+     *
+     * @dataProvider provideNormalizedData
+     */
+    public function testContextGenerationDataNormalizeDenormalizeGetData(
+        array $options,
+        AccompanyingPeriod $entity,
+        array $data,
+        array $expectedNormalized,
+        callable $assertionsOnData
+    ): void {
+        $context = $this->buildContext();
+        $template = new DocGeneratorTemplate();
+        $template->setName(['fr' => 'test'])->setContext(AccompanyingPeriodContext::class)
+            ->setDescription('description')->setActive(true)
+            ->setOptions($options);
+
+        $normalized = $context->contextGenerationDataNormalize($template, $entity, $data);
+
+        self::assertEquals($expectedNormalized, $normalized);
+
+        $denormalized = $context->contextGenerationDataDenormalize($template, $entity, $normalized);
+
+        $data = $context->getData($template, $entity, $denormalized);
+
+        call_user_func($assertionsOnData, $data);
+    }
+
+    public function provideNormalizedData(): iterable
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $thirdParty = $em->createQuery('SELECT t FROM '.ThirdParty::class.' t')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $thirdParty) {
+            throw new \RuntimeException('No thirdparty in database');
+        }
+
+        $period = $em->createQuery('SELECT a FROM '.AccompanyingPeriod::class." a WHERE a.step = 'CONFIRMED'")
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $period) {
+            throw new \RuntimeException('No confirmed period in database');
+        }
+
+        $person = $em->createQuery('SELECT p FROM '.Person::class.' p')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $person) {
+            throw new \RuntimeException('No confirmed period in database');
+        }
+
+        yield [
+            // test with only thirdParty
+            [
+                'mainPerson' => false,
+                'mainPersonLabel' => 'person',
+                'person1' => false,
+                'person1Label' => 'person2',
+                'person2' => false,
+                'person2Label' => 'person2',
+                'thirdParty' => true,
+                'thirdPartyLabel' => '3party',
+            ],
+            $period,
+            [
+                'thirdParty' => $thirdParty,
+            ],
+            [
+                'thirdParty' => $thirdParty->getId(),
+                'mainPerson' => null,
+                'person1' => null,
+                'person2' => null,
+            ],
+            function (array $data) use ($thirdParty, $period) {
+                self::assertArrayHasKey('thirdParty', $data);
+                self::assertEquals($thirdParty->getId(), $data['thirdParty']['id']);
+
+                self::assertArrayHasKey('course', $data);
+                self::assertEquals($period->getId(), $data['course']['id']);
+            },
+        ];
+
+        yield [
+            // test with only mainPerson
+            [
+                'mainPerson' => true,
+                'mainPersonLabel' => 'person',
+                'person1' => false,
+                'person1Label' => 'person2',
+                'person2' => false,
+                'person2Label' => 'person2',
+                'thirdParty' => false,
+                'thirdPartyLabel' => '3party',
+            ],
+            $period,
+            [
+                'mainPerson' => $person,
+            ],
+            [
+                'thirdParty' => null,
+                'mainPerson' => $person->getId(),
+                'person1' => null,
+                'person2' => null,
+            ],
+            function (array $data) use ($person, $period) {
+                self::assertArrayHasKey('mainPerson', $data);
+                self::assertEquals($person->getId(), $data['mainPerson']['id']);
+
+                self::assertArrayHasKey('course', $data);
+                self::assertEquals($period->getId(), $data['course']['id']);
+            },
+        ];
+
+        yield [
+            // test with every options activated
+            [
+                'mainPerson' => true,
+                'mainPersonLabel' => 'person',
+                'person1' => true,
+                'person1Label' => 'person2',
+                'person2' => true,
+                'person2Label' => 'person2',
+                'thirdParty' => true,
+                'thirdPartyLabel' => '3party',
+            ],
+            $period,
+            [
+                'mainPerson' => $person,
+                'person1' => $person,
+                'person2' => $person,
+                'thirdParty' => $thirdParty,
+            ],
+            [
+                'thirdParty' => $thirdParty->getId(),
+                'mainPerson' => $person->getId(),
+                'person1' => $person->getId(),
+                'person2' => $person->getId(),
+            ],
+            function (array $data) use ($person, $thirdParty, $period) {
+                self::assertArrayHasKey('mainPerson', $data);
+                self::assertEquals($person->getId(), $data['mainPerson']['id']);
+
+                self::assertArrayHasKey('person1', $data);
+                self::assertEquals($person->getId(), $data['person1']['id']);
+
+                self::assertArrayHasKey('person2', $data);
+                self::assertEquals($person->getId(), $data['person2']['id']);
+
+                self::assertArrayHasKey('thirdParty', $data);
+                self::assertEquals($thirdParty->getId(), $data['thirdParty']['id']);
+
+                self::assertArrayHasKey('course', $data);
+                self::assertEquals($period->getId(), $data['course']['id']);
+            },
+        ];
+
+        yield [
+            // test with any option activated
+            [
+                'mainPerson' => false,
+                'mainPersonLabel' => 'person',
+                'person1' => false,
+                'person1Label' => 'person2',
+                'person2' => false,
+                'person2Label' => 'person2',
+                'thirdParty' => false,
+                'thirdPartyLabel' => '3party',
+            ],
+            $period,
+            [
+                'mainPerson' => null,
+                'person1' => null,
+                'person2' => null,
+                'thirdParty' => null,
+            ],
+            [
+                'thirdParty' => null,
+                'mainPerson' => null,
+                'person1' => null,
+                'person2' => null,
+            ],
+            function (array $data) use ($period) {
+                self::assertArrayHasKey('course', $data);
+                self::assertEquals($period->getId(), $data['course']['id']);
+            },
+        ];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
index 44414cdba..772e669bb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextTest.php
@@ -18,20 +18,28 @@ use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\ResidentialAddressRepository;
+use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
 use Chill\PersonBundle\Service\DocGenerator\PersonContext;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\EntityManagerInterface;
-use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Exception\Prediction\FailedPredictionException;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -40,16 +48,148 @@ use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
-final class PersonContextTest extends TestCase
+final class PersonContextTest extends KernelTestCase
 {
     use ProphecyTrait;
 
+    /**
+     * This test run the methods executed when a document is generated:.
+     *
+     * - normalized data from the form in a way that they are stored in message queue;
+     * - denormalize the data from the message queue,
+     * - and get the data, as they will be transmitted to the GeneratorDriver
+     *
+     * @param array    $options          the options, as they are stored in the DocGeneratorTemplate (the admin form data)
+     * @param Person   $entity           The entity from which the data will be extracted
+     * @param array    $data             The data, from the public form
+     * @param callable $assertionsOnData some test that will be executed on the normalized data
+     *
+     * @dataProvider provideNormalizedData
+     */
+    public function testContextGenerationDataNormalizeDenormalizeGetData(
+        array $options,
+        Person $entity,
+        array $data,
+        array $expectedNormalized,
+        callable $assertionsOnData
+    ): void {
+        // we boot kernel only for this test
+        self::bootKernel();
+
+        // we create a PersonContext with the minimal dependency injection needed (relying on
+        // prophecy for other dependencies)
+        $context = $this->buildPersonContext(
+            null,
+            self::$container->get(BaseContextData::class),
+            self::$container->get(CenterResolverManagerInterface::class),
+            self::$container->get(DocumentCategoryRepository::class),
+            self::$container->get(EntityManagerInterface::class),
+            self::$container->get(NormalizerInterface::class),
+            new ParameterBag(['chill_main' => ['acl' => ['form_show_scopes' => false]]]),
+            null,
+            self::$container->get(Security::class),
+            null,
+            null,
+            null,
+            self::$container->get(ThirdPartyRepository::class)
+        );
+        $template = new DocGeneratorTemplate();
+        $template->setName(['fr' => 'test'])->setContext(AccompanyingPeriodContext::class)
+            ->setDescription('description')->setActive(true)
+            ->setOptions($options);
+
+        $normalized = $context->contextGenerationDataNormalize($template, $entity, $data);
+
+        self::assertEquals($expectedNormalized, $normalized);
+
+        $denormalized = $context->contextGenerationDataDenormalize($template, $entity, $normalized);
+
+        $data = $context->getData($template, $entity, $denormalized);
+
+        call_user_func($assertionsOnData, $data);
+    }
+
+    public function provideNormalizedData(): iterable
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $thirdParty = $em->createQuery('SELECT t FROM '.ThirdParty::class.' t')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $thirdParty) {
+            throw new \RuntimeException('No thirdparty in database');
+        }
+
+        $person = $em->createQuery('SELECT p FROM '.Person::class.' p')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $person) {
+            throw new \RuntimeException('No confirmed period in database');
+        }
+
+        $category = self::$container->get(DocumentCategoryRepository::class)
+            ->findAll()[0];
+
+        if (null === $category) {
+            throw new \RuntimeException('no document category in database');
+        }
+
+        yield [
+            [
+                'thirdParty' => true,
+                'thirdPartyLabel' => '3party',
+                'category' => $category,
+            ],
+            $person,
+            [
+                'title' => 'test',
+                'thirdParty' => $thirdParty,
+            ],
+            [
+                'thirdParty' => $thirdParty->getId(),
+                'title' => 'test',
+                'scope_id' => null,
+            ],
+            function ($data) use ($person, $thirdParty) {
+                self::assertArrayHasKey('person', $data);
+                self::assertEquals($person->getId(), $data['person']['id']);
+
+                self::assertArrayHasKey('thirdParty', $data);
+                self::assertEquals($thirdParty->getId(), $data['thirdParty']['id']);
+            },
+        ];
+
+        yield [
+            [
+                'thirdParty' => false,
+                'thirdPartyLabel' => '3party',
+                'category' => $category,
+            ],
+            $person,
+            [
+                'title' => 'test',
+            ],
+            [
+                'title' => 'test',
+                'scope_id' => null,
+                'thirdParty' => null,
+            ],
+            function ($data) use ($person) {
+                self::assertArrayHasKey('person', $data);
+                self::assertEquals($person->getId(), $data['person']['id']);
+            },
+        ];
+    }
+
     /**
      * Test that the build person context works in the case when 'form_show_scope' is false.
      */
@@ -63,8 +203,8 @@ final class PersonContextTest extends TestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->persist(Argument::type(PersonDocument::class))
             ->should(static function ($calls, $object, $method) {
-                if (1 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d receivved', count($calls)));
+                if (1 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d receivved', \count($calls)));
                 }
 
                 /** @var PersonDocument $personDocument */
@@ -105,8 +245,8 @@ final class PersonContextTest extends TestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->persist(Argument::type(PersonDocument::class))
             ->should(static function ($calls, $object, $method) use ($scope) {
-                if (1 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d receivved', count($calls)));
+                if (1 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d receivved', \count($calls)));
                 }
 
                 /** @var PersonDocument $personDocument */
@@ -149,8 +289,8 @@ final class PersonContextTest extends TestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->persist(Argument::type(PersonDocument::class))
             ->should(static function ($calls, $object, $method) use ($scope) {
-                if (1 !== count($calls)) {
-                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d receivved', count($calls)));
+                if (1 !== \count($calls)) {
+                    throw new FailedPredictionException(sprintf('the persist should be called exactly once, %d received', \count($calls)));
                 }
 
                 /** @var PersonDocument $personDocument */
@@ -173,7 +313,7 @@ final class PersonContextTest extends TestCase
             $em->reveal(),
         );
 
-        $personContext->buildPublicForm($this->buildFormBuilder(true), $docGen, $person);
+        $personContext->buildPublicForm($this->buildFormBuilder(false), $docGen, $person);
 
         $personContext->storeGenerated(
             $docGen,
@@ -187,8 +327,7 @@ final class PersonContextTest extends TestCase
     {
         $builder = $this->prophesize(FormBuilderInterface::class);
 
-        $builder->add('title', TextType::class, Argument::type('array'))
-            ->shouldBeCalled(1);
+        $builder->add('title', TextType::class, Argument::type('array'))->shouldBeCalled();
 
         if ($withScope) {
             $builder->add('scope', ScopePickerType::class, Argument::type('array'))
@@ -202,16 +341,20 @@ final class PersonContextTest extends TestCase
     }
 
     private function buildPersonContext(
-        ?AuthorizationHelperInterface $authorizationHelper = null,
-        ?BaseContextData $baseContextData = null,
-        ?CenterResolverManagerInterface $centerResolverManager = null,
-        ?DocumentCategoryRepository $documentCategoryRepository = null,
-        ?EntityManagerInterface $em = null,
-        ?NormalizerInterface $normalizer = null,
-        ?ParameterBagInterface $parameterBag = null,
-        ?Security $security = null,
-        ?TranslatorInterface $translator = null,
-        ?TranslatableStringHelperInterface $translatableStringHelper = null
+        AuthorizationHelperInterface $authorizationHelper = null,
+        BaseContextData $baseContextData = null,
+        CenterResolverManagerInterface $centerResolverManager = null,
+        DocumentCategoryRepository $documentCategoryRepository = null,
+        EntityManagerInterface $em = null,
+        NormalizerInterface $normalizer = null,
+        ParameterBagInterface $parameterBag = null,
+        ScopeRepositoryInterface $scopeRepository = null,
+        Security $security = null,
+        TranslatorInterface $translator = null,
+        TranslatableStringHelperInterface $translatableStringHelper = null,
+        ThirdPartyRender $thirdPartyRender = null,
+        ThirdPartyRepository $thirdPartyRepository = null,
+        ResidentialAddressRepository $residentialAddressRepository = null
     ): PersonContext {
         if (null === $authorizationHelper) {
             $authorizationHelper = $this->prophesize(AuthorizationHelperInterface::class)->reveal();
@@ -251,6 +394,11 @@ final class PersonContextTest extends TestCase
             $parameterBag = new ParameterBag(['chill_main' => ['acl' => ['form_show_scopes' => true]]]);
         }
 
+        if (null === $scopeRepository) {
+            $scopeRepository = $this->prophesize(ScopeRepositoryInterface::class);
+            $scopeRepository = $scopeRepository->reveal();
+        }
+
         if (null === $security) {
             $security = $this->prophesize(Security::class);
             $security->getUser()->willReturn(new User());
@@ -264,12 +412,32 @@ final class PersonContextTest extends TestCase
         if (null === $translatableStringHelper) {
             $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
             // return only the 'fr' key
-            $translatableStringHelper->localize(Argument::type('array'))->will(static function ($args) {
-                return $args[0]['fr'];
-            });
+            $translatableStringHelper->localize(Argument::type('array'))->will(static fn ($args) => $args[0]['fr']);
             $translatableStringHelper = $translatableStringHelper->reveal();
         }
 
+        if (null === $thirdPartyRender) {
+            $thirdPartyRender = $this->prophesize(ThirdPartyRender::class);
+            $thirdPartyRender = $thirdPartyRender->reveal();
+        }
+
+        if (null === $thirdPartyRepository) {
+            $thirdPartyRepository = $this->prophesize(ThirdPartyRepository::class);
+            $thirdPartyRepository = $thirdPartyRepository->reveal();
+        }
+
+        if (null === $residentialAddressRepository) {
+            $residentialAddressRepository = $this->prophesize(ResidentialAddressRepository::class);
+            $residentialAddressRepository->findCurrentResidentialAddressByPerson(Argument::type(Person::class), Argument::any())
+                ->willReturn([
+                    (new Person\ResidentialAddress())
+                        ->setAddress((new Address())
+                            ->setStreet('test street')
+                            ->setPostcode(new PostalCode())),
+                ]);
+            $residentialAddressRepository = $residentialAddressRepository->reveal();
+        }
+
         return new PersonContext(
             $authorizationHelper,
             $baseContextData,
@@ -278,9 +446,13 @@ final class PersonContextTest extends TestCase
             $em,
             $normalizer,
             $parameterBag,
+            $scopeRepository,
             $security,
             $translator,
-            $translatableStringHelper
+            $translatableStringHelper,
+            $thirdPartyRender,
+            $thirdPartyRepository,
+            $residentialAddressRepository
         );
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php
index a4f08e7c1..60d958a88 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/DocGenerator/PersonContextWithThirdPartyTest.php
@@ -16,6 +16,7 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Service\DocGenerator\PersonContextInterface;
 use Chill\PersonBundle\Service\DocGenerator\PersonContextWithThirdParty;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -23,6 +24,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonContextWithThirdPartyTest extends KernelTestCase
@@ -70,9 +72,7 @@ final class PersonContextWithThirdPartyTest extends KernelTestCase
     {
         $normalizer = $this->prophesize(NormalizerInterface::class);
         $normalizer->normalize(Argument::type(ThirdParty::class), 'docgen', Argument::type('array'))
-            ->will(static function ($args): array {
-                return ['class' => '3party', 'hash' => spl_object_hash($args[0])];
-            });
+            ->will(static fn ($args): array => ['class' => '3party', 'hash' => spl_object_hash($args[0])]);
 
         $personContext = $this->prophesize(PersonContextInterface::class);
 
@@ -85,9 +85,18 @@ final class PersonContextWithThirdPartyTest extends KernelTestCase
         $personContext->getData(Argument::type(DocGeneratorTemplate::class), Argument::type(Person::class), Argument::type('array'))
             ->willReturn(['person' => 'data']);
 
+        $thirdPartyRepository = $this->prophesize(ThirdPartyRepository::class);
+        $thirdPartyRepository->find(Argument::type('int'))->willReturn(new class () extends ThirdParty {
+            public function getId(): ?int
+            {
+                return 1;
+            }
+        });
+
         return new PersonContextWithThirdParty(
             $personContext->reveal(),
-            $normalizer->reveal()
+            $normalizer->reveal(),
+            $thirdPartyRepository->reveal(),
         );
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProviderTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProviderTest.php
new file mode 100644
index 000000000..6f378f02b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProviderTest.php
@@ -0,0 +1,135 @@
+<?php
+
+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 Service\GenericDoc\Providers;
+
+use Chill\CalendarBundle\Security\Voter\CalendarVoter;
+use Chill\CalendarBundle\Service\GenericDoc\Providers\AccompanyingPeriodCalendarGenericDocProvider;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AccompanyingPeriodCalendarGenericDocProviderTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private Security $security;
+
+    private EntityManagerInterface $entityManager;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->security = self::$container->get(Security::class);
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+    }
+
+    /**
+     * @dataProvider provideDataForAccompanyingPeriod
+     */
+    public function testBuildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): void
+    {
+        $provider = new AccompanyingPeriodCalendarGenericDocProvider($this->security, $this->entityManager);
+
+        $query = $provider->buildFetchQueryForAccompanyingPeriod($accompanyingPeriod, $startDate, $endDate, $content);
+
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()->fetchOne("SELECT COUNT(*) FROM ({$sql}) AS sq", $params, $types);
+
+        self::assertIsInt($nb);
+    }
+
+    /**
+     * @dataProvider provideDataForPerson
+     */
+    public function testBuildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted(CalendarVoter::SEE, Argument::any())->willReturn(true);
+
+        $provider = new AccompanyingPeriodCalendarGenericDocProvider($security->reveal(), $this->entityManager);
+
+        $query = $provider->buildFetchQueryForPerson($person, $startDate, $endDate, $content);
+
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()->fetchOne("SELECT COUNT(*) FROM ({$sql}) AS sq", $params, $types);
+
+        self::assertIsInt($nb);
+        self::assertStringNotContainsStringIgnoringCase('FALSE = TRUE', $sql);
+        self::assertStringNotContainsStringIgnoringCase('TRUE = FALSE', $sql);
+    }
+
+    /**
+     * @dataProvider provideDataForPerson
+     */
+    public function testBuildFetchQueryForPersonWithoutAnyRight(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted(CalendarVoter::SEE, Argument::any())->willReturn(false);
+
+        $provider = new AccompanyingPeriodCalendarGenericDocProvider($security->reveal(), $this->entityManager);
+
+        $query = $provider->buildFetchQueryForPerson($person, $startDate, $endDate, $content);
+
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()->fetchOne("SELECT COUNT(*) FROM ({$sql}) AS sq", $params, $types);
+
+        self::assertIsInt($nb);
+        self::assertStringContainsStringIgnoringCase('TRUE = FALSE', $sql);
+    }
+
+    public function provideDataForPerson(): iterable
+    {
+        $this->setUp();
+
+        if (null === $person = $this->entityManager->createQuery('SELECT p FROM '.Person::class.' p WHERE SIZE(p.accompanyingPeriodParticipations) > 0')
+            ->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('There is no person');
+        }
+
+        yield [$person, null, null, null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), null, null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), 'text'];
+        yield [$person, null, null, 'text'];
+        yield [$person, null, new \DateTimeImmutable('6 month ago'), null];
+    }
+
+    public function provideDataForAccompanyingPeriod(): iterable
+    {
+        $this->setUp();
+
+        if (null === $period = $this->entityManager->createQuery('SELECT p FROM '.AccompanyingPeriod::class.' p ')
+            ->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('There is no accompanying period');
+        }
+
+        yield [$period, null, null, null];
+        yield [$period, new \DateTimeImmutable('1 year ago'), null, null];
+        yield [$period, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), null];
+        yield [$period, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), 'text'];
+        yield [$period, null, null, 'text'];
+        yield [$period, null, new \DateTimeImmutable('6 month ago'), null];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProviderTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProviderTest.php
new file mode 100644
index 000000000..afbc0b2ab
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/AccompanyingPeriodWorkEvaluationGenericDocProviderTest.php
@@ -0,0 +1,80 @@
+<?php
+
+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 Service\GenericDoc\Providers;
+
+use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Service\GenericDoc\Providers\AccompanyingPeriodWorkEvaluationGenericDocProvider;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AccompanyingPeriodWorkEvaluationGenericDocProviderTest extends KernelTestCase
+{
+    use ProphecyTrait;
+    private EntityManagerInterface $entityManager;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+    }
+
+    /**
+     * @dataProvider provideSearchArguments
+     */
+    public function testBuildFetchQueryForAccompanyingPeriod(
+        \DateTimeImmutable $startDate = null,
+        \DateTimeImmutable $endDate = null,
+        string $content = null
+    ): void {
+        $period = $this->entityManager->createQuery('SELECT a FROM '.AccompanyingPeriod::class.' a')
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $period) {
+            throw new \RuntimeException('no accompanying period in databasee');
+        }
+
+        $security = $this->prophesize(Security::class);
+
+        $provider = new AccompanyingPeriodWorkEvaluationGenericDocProvider(
+            $security->reveal(),
+            $this->entityManager
+        );
+
+        $query = $provider->buildFetchQueryForAccompanyingPeriod($period, $startDate, $endDate, $content);
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()->executeQuery(
+            'SELECT COUNT(*) FROM ('.$sql.') AS sq',
+            $params,
+            $types
+        )->fetchOne();
+
+        self::assertIsInt($nb, 'Test that there are no errors');
+    }
+
+    public function provideSearchArguments(): iterable
+    {
+        yield [null, null, null];
+        yield [new \DateTimeImmutable('1 month ago'), null, null];
+        yield [new \DateTimeImmutable('1 month ago'), new \DateTimeImmutable('now'), null];
+        yield [null, null, 'test'];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/PersonCalendarGenericDocProviderTest.php b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/PersonCalendarGenericDocProviderTest.php
new file mode 100644
index 000000000..97ed90503
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Service/GenericDoc/Providers/PersonCalendarGenericDocProviderTest.php
@@ -0,0 +1,71 @@
+<?php
+
+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 Service\GenericDoc\Providers;
+
+use Chill\CalendarBundle\Service\GenericDoc\Providers\PersonCalendarGenericDocProvider;
+use Chill\DocStoreBundle\GenericDoc\FetchQueryToSqlBuilder;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonCalendarGenericDocProviderTest extends KernelTestCase
+{
+    private Security $security;
+
+    private EntityManagerInterface $entityManager;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->security = self::$container->get(Security::class);
+        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+    }
+
+    /**
+     * @dataProvider provideDataForPerson
+     */
+    public function testBuildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate, ?\DateTimeImmutable $endDate, ?string $content): void
+    {
+        $provider = new PersonCalendarGenericDocProvider($this->security, $this->entityManager);
+
+        $query = $provider->buildFetchQueryForPerson($person, $startDate, $endDate, $content);
+
+        ['sql' => $sql, 'params' => $params, 'types' => $types] = (new FetchQueryToSqlBuilder())->toSql($query);
+
+        $nb = $this->entityManager->getConnection()->fetchOne("SELECT COUNT(*) FROM ({$sql}) AS sq", $params, $types);
+
+        self::assertIsInt($nb);
+    }
+
+    public function provideDataForPerson(): iterable
+    {
+        $this->setUp();
+
+        if (null === $person = $this->entityManager->createQuery('SELECT p FROM '.Person::class.' p ')
+            ->setMaxResults(1)->getSingleResult()) {
+            throw new \RuntimeException('There is no person');
+        }
+
+        yield [$person, null, null, null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), null, null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), null];
+        yield [$person, new \DateTimeImmutable('1 year ago'), new \DateTimeImmutable('6 month ago'), 'text'];
+        yield [$person, null, null, 'text'];
+        yield [$person, null, new \DateTimeImmutable('6 month ago'), null];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Templating/Entity/ClosingMotiveRenderTest.php b/src/Bundle/ChillPersonBundle/Tests/Templating/Entity/ClosingMotiveRenderTest.php
new file mode 100644
index 000000000..cb7eb423a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Templating/Entity/ClosingMotiveRenderTest.php
@@ -0,0 +1,75 @@
+<?php
+
+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 Chill\PersonBundle\Tests\Templating\Entity;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
+use Chill\PersonBundle\Templating\Entity\ClosingMotiveRender;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ClosingMotiveRenderTest extends KernelTestCase
+{
+    private static ClosingMotiveRender $closingMotiveRender;
+
+    public static function setUpBeforeClass(): void
+    {
+        self::bootKernel();
+        self::$closingMotiveRender = self::$container->get(ClosingMotiveRender::class);
+    }
+
+    /**
+     * @dataProvider provideClosingMotiveWithRenderString
+     */
+    public function testRenderString(ClosingMotive $closingMotive, string $expected): void
+    {
+        $actual = self::$closingMotiveRender->renderString($closingMotive, []);
+
+        self::assertEquals($expected, $actual);
+    }
+
+    /**
+     * @dataProvider provideClosingMotiveWithRenderString
+     */
+    public function testRenderBox(ClosingMotive $closingMotive, string $expectedContent): void
+    {
+        $actual = strip_tags(self::$closingMotiveRender->renderBox($closingMotive, []));
+
+        self::assertStringContainsString($expectedContent, $actual);
+    }
+
+    public function provideClosingMotiveWithRenderString(): iterable
+    {
+        $closingMotive = (new ClosingMotive())->setName(['fr' => 'Left']);
+
+        yield [$closingMotive, 'Left'];
+
+        $closingMotive = (new ClosingMotive())->setName(['fr' => 'Left'])->setIsCanceledAccompanyingPeriod(true);
+
+        yield [$closingMotive, 'Left (annulé)'];
+
+        $closingMotiveParent = (new ClosingMotive())->setName(['fr' => 'Parent']);
+        $closingMotive = (new ClosingMotive())->setName(['fr' => 'Children']);
+        $closingMotiveParent->addChildren($closingMotive);
+
+        yield [$closingMotive, 'Parent > Children'];
+
+        $closingMotiveParent = (new ClosingMotive())->setName(['fr' => 'Parent'])->setIsCanceledAccompanyingPeriod(true);
+        $closingMotive = (new ClosingMotive())->setName(['fr' => 'Children']);
+        $closingMotiveParent->addChildren($closingMotive);
+
+        yield [$closingMotive, 'Parent > Children (annulé)'];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
index ebc6d4b40..2670b2402 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
@@ -15,14 +15,13 @@ 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.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class TimelineAccompanyingPeriodTest extends WebTestCase
@@ -39,7 +38,8 @@ final class TimelineAccompanyingPeriodTest extends WebTestCase
             ->from(Person::class, 'p')
             ->join('p.accompanyingPeriodParticipations', 'part')
             ->join('part.accompanyingPeriod', 'period')
-            ->join('p.center', 'center')
+            ->join('p.centerCurrent', 'cc')
+            ->join('cc.center', 'center')
             ->select('p.id')
             ->where($qb->expr()->eq('center.name', ':center'))
             ->setParameter('center', 'Center A')
@@ -47,21 +47,19 @@ final class TimelineAccompanyingPeriodTest extends WebTestCase
             ->getQuery()
             ->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)
+    public function testEntriesAreShown(mixed $personId): never
     {
         $this->markTestSkipped('page does not work');
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validation/PersonValidationTest.php b/src/Bundle/ChillPersonBundle/Tests/Validation/PersonValidationTest.php
new file mode 100644
index 000000000..636a059c5
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Validation/PersonValidationTest.php
@@ -0,0 +1,84 @@
+<?php
+
+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 Chill\PersonBundle\Tests\Validation;
+
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Validator\ConstraintViolationInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonValidationTest extends KernelTestCase
+{
+    private static ValidatorInterface $validator;
+
+    public static function setUpBeforeClass(): void
+    {
+        self::bootKernel();
+
+        self::$validator = self::$container->get(ValidatorInterface::class);
+    }
+
+    /**
+     * @dataProvider provideDataValidation
+     */
+    public function testFirstName(Person $person, string $path, string $code, int $expectedCountErrors): void
+    {
+        $errors = self::$validator->validate($person);
+
+        $errorsFiltered = array_filter(iterator_to_array($errors), fn (ConstraintViolationInterface $e) => $path === $e->getPropertyPath() /* && $code === $e->getCode() */);
+
+        self::assertCount($expectedCountErrors, $errorsFiltered);
+    }
+
+    public static function provideDataValidation(): iterable
+    {
+        $person = new Person();
+
+        yield [$person, 'firstName', 'c1051bb4-d103-4f74-8988-acbcafc7fdc3', 1];
+        yield [$person, 'lastName', 'c1051bb4-d103-4f74-8988-acbcafc7fdc3', 1];
+
+        $person = (new Person())->setFirstName('')->setLastName('');
+
+        yield [$person, 'firstName', 'c1051bb4-d103-4f74-8988-acbcafc7fdc3', 1];
+        yield [$person, 'lastName', 'c1051bb4-d103-4f74-8988-acbcafc7fdc3', 1];
+
+        $person = (new Person())->setFirstName('Valid')->setLastName('valid');
+
+        yield [$person, 'firstName', 'c1051bb4-d103-4f74-8988-acbcafc7fdc3', 0];
+        yield [$person, 'lastName', 'c1051bb4-d103-4f74-8988-acbcafc7fdc3', 0];
+
+        $person = (new Person())->setBirthdate(new \DateTime('next year'));
+
+        yield [$person, 'birthdate', '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4', 1];
+
+        $person = (new Person())->setBirthdate(new \DateTime('1700-01-01T00:00:00'));
+
+        yield [$person, 'birthdate', '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4', 1];
+
+        $person = (new Person())->setBirthdate(new \DateTime('yesterday'));
+
+        yield [$person, 'birthdate', '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4', 0];
+
+        $person = (new Person())->setEmail('blabla');
+
+        yield [$person, 'email', 'bd79c0ab-ddba-46cc-a703-a7a4b08de310', 1];
+
+        $person = (new Person())->setEmail('chillfake@gmail.com');
+
+        yield [$person, 'email', 'bd79c0ab-ddba-46cc-a703-a7a4b08de310', 0];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
index ca77c9632..72747b478 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
@@ -20,6 +20,7 @@ use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class LocationValidityValidatorTest extends ConstraintValidatorTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php
index a4c67f565..8adfcf634 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/ParticipationOverlapValidatorTest.php
@@ -24,6 +24,7 @@ use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 class ParticipationOverlapValidatorTest extends ConstraintValidatorTestCase
@@ -69,7 +70,7 @@ class ParticipationOverlapValidatorTest extends ConstraintValidatorTestCase
                 '{{ start }}' => (new \DateTimeImmutable('today'))->format('d-m-Y'),
                 '{{ end }}' => null,
                 '{{ ids }}' => [null, null],
-                '{{ name }}' => 'person'
+                '{{ name }}' => 'person',
             ])
             ->assertRaised();
     }
@@ -95,6 +96,7 @@ class ParticipationOverlapValidatorTest extends ConstraintValidatorTestCase
 
         $this->assertNoViolation();
     }
+
     protected function createValidator(): ParticipationOverlapValidator
     {
         $personRender = $this->prophesize(PersonRenderInterface::class);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
index dee497ae4..da747a52c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
@@ -18,11 +18,11 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequentialValidator;
-use DateTimeImmutable;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class HouseholdMembershipSequentialValidatorTest extends ConstraintValidatorTestCase
@@ -48,11 +48,11 @@ final class HouseholdMembershipSequentialValidatorTest extends ConstraintValidat
             ->setShareHousehold(true);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new DateTimeImmutable('2010-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2010-01-01'))
             ->setPerson($person);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new DateTimeImmutable('2011-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2011-01-01'))
             ->setPerson($person);
 
         $this->validator->validate($person, $constraint);
@@ -76,11 +76,11 @@ final class HouseholdMembershipSequentialValidatorTest extends ConstraintValidat
             ->setShareHousehold(false);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new DateTimeImmutable('2010-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2010-01-01'))
             ->setPerson($person);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new DateTimeImmutable('2011-01-01'))
+            ->setStartDate(new \DateTimeImmutable('2011-01-01'))
             ->setPerson($person);
 
         $this->validator->validate($person, $constraint);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
index de9769175..c01682804 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
@@ -16,11 +16,11 @@ use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder;
 use Chill\PersonBundle\Validator\Constraints\Household\MaxHolderValidator;
-use DateTimeImmutable;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class MaxHolderValidatorTest extends ConstraintValidatorTestCase
@@ -34,20 +34,20 @@ final 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 [
@@ -61,10 +61,8 @@ final class MaxHolderValidatorTest extends ConstraintValidatorTestCase
 
     /**
      * @dataProvider provideInvalidHousehold
-     *
-     * @param mixed $parameters
      */
-    public function testHouseholdInvalid(Household $household, $parameters)
+    public function testHouseholdInvalid(Household $household, mixed $parameters)
     {
         $constraint = $this->getConstraint();
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
index 476f7045f..4be918d60 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
@@ -13,53 +13,70 @@ namespace Chill\PersonBundle\Tests\Validator\Person;
 
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
 use Chill\PersonBundle\Validator\Constraints\Person\BirthdateValidator;
-use DateTime;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * Test the behaviour of BirthdayValidator.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class BirthdateValidatorTest extends ConstraintValidatorTestCase
 {
     public function testTomorrowInvalid()
     {
-        $bornAfter = new DateTime('+2 days');
+        $bornAfter = new \DateTime('2023-08-31');
         $this->validator->validate($bornAfter, $this->createConstraint());
         $this->buildViolation('msg')
-            ->setParameter('%date%', (new DateTime('yesterday'))->format('d-m-Y'))
+            ->setParameter('%date%', (new \DateTime('2023-08-29'))->format('d-m-Y'))
             ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
             ->assertRaised();
     }
 
     public function testValidateTodayInvalid()
     {
-        $bornToday = new DateTime('now');
+        $bornToday = new \DateTime('2023-08-30');
         $this->validator->validate($bornToday, $this->createConstraint());
         $this->buildViolation('msg')
-            ->setParameter('%date%', (new DateTime('yesterday'))->format('d-m-Y'))
+            ->setParameter('%date%', (new \DateTime('2023-08-29'))->format('d-m-Y'))
+            ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
+            ->assertRaised();
+    }
+
+    public function testValidateTooEarlyDate(): void
+    {
+        $bornLongTimeAgo = new \DateTime('1871-03-18');
+        $this->validator->validate($bornLongTimeAgo, $this->createConstraint());
+
+        $this->buildViolation('below')
+            ->setParameter('%date%', (new \DateTime('1873-08-30'))->format('d-m-Y'))
             ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
             ->assertRaised();
     }
 
     public function testValidateYesterdayValid()
     {
-        $bornYesterday = new DateTime('yesterday');
+        $bornYesterday = new \DateTime('2023-08-29');
         $this->validator->validate($bornYesterday, $this->createConstraint());
         $this->assertNoViolation();
     }
 
     protected function createValidator()
     {
-        return new BirthdateValidator('P1D');
+        return new BirthdateValidator(
+            new ParameterBag(['chill_person' => ['validation' => ['birthdate_not_after' => 'P1D']]]),
+            new MockClock(new \DateTimeImmutable('2023-08-30T14:12:00'))
+        );
     }
 
     private function createConstraint()
     {
         return new Birthdate([
             'message' => 'msg',
+            'belowMessage' => 'below',
         ]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
index 930df8c60..a14f77bda 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
@@ -23,6 +23,7 @@ use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonHasCenterValidatorTest extends ConstraintValidatorTestCase
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
index 1d73e1a59..efa273d22 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
@@ -13,14 +13,13 @@ 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 function str_repeat;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class PersonValidationTest extends KernelTestCase
@@ -36,7 +35,7 @@ final class PersonValidationTest extends KernelTestCase
     public function testBirthdateInFuture()
     {
         $person = (new Person())
-            ->setBirthdate(new Datetime('+2 months'));
+            ->setBirthdate(new \DateTime('+2 months'));
         $errors = $this->validator->validate($person, null);
 
         foreach ($errors->getIterator() as $error) {
@@ -58,7 +57,7 @@ final class PersonValidationTest extends KernelTestCase
     public function testFirstnameValidation()
     {
         $person = (new Person())
-            ->setFirstname(str_repeat('a', 500));
+            ->setFirstname(\str_repeat('a', 500));
         $errors = $this->validator->validate($person, null);
 
         foreach ($errors->getIterator() as $error) {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php b/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
index 231fabccb..c64696b0e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
@@ -12,12 +12,12 @@ 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;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class AccompanyingPeriodLifecycle extends KernelTestCase
@@ -30,7 +30,7 @@ final 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());
diff --git a/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
index fe2947f60..6973eba1d 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
@@ -19,12 +19,8 @@ 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.
  *
@@ -35,18 +31,7 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
 {
     private const SUPPORTED_CONTEXTS = ['person', 'center'];
 
-    protected EntityManager $em;
-
-    private AuthorizationHelper $authorizationHelper;
-
-    private Security $security;
-
-    public function __construct(EntityManager $em, Security $security, AuthorizationHelper $authorizationHelper)
-    {
-        $this->em = $em;
-        $this->security = $security;
-        $this->authorizationHelper = $authorizationHelper;
-    }
+    public function __construct(protected EntityManager $em, private readonly Security $security, private readonly AuthorizationHelper $authorizationHelper) {}
 
     public function getEntities(array $ids)
     {
@@ -54,7 +39,7 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
             ->getRepository('ChillPersonBundle:AccompanyingPeriod')
             ->findBy(['id' => $ids]);
 
-        //set results in an associative array with id as indexes
+        // set results in an associative array with id as indexes
         $results = [];
 
         foreach ($periods as $period) {
@@ -69,15 +54,14 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
      *
      * @param string $context
      *
-     * @throws LogicException
-     *
      * @return array
+     *
+     * @throws \LogicException
      */
     protected function basicFetchQuery($context, array $args)
     {
-        if (false === in_array($context, self::SUPPORTED_CONTEXTS, true)) {
-            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
@@ -109,7 +93,7 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
                 $questionMarks[] = '?';
                 $params[] = $c->getId();
             }
-            $query .= implode(', ', $questionMarks) . ')';
+            $query .= \implode(', ', $questionMarks).')';
 
             return [$query, $params];
         }
@@ -118,19 +102,18 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
             return ["{$participation->getTableName()}.{$join['name']} = ?", [$args['person']->getId()]];
         }
 
-        throw new LogicException("this context is not supported: {$context}");
+        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)
+    protected function getBasicEntityTemplate($template, mixed $entity, $context, array $args)
     {
         return [
             'template' => $template,
@@ -147,18 +130,18 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
         $joinPerson = $participation->getAssociationMapping('person')['joinColumns'][0];
 
         if ('person' === $context) {
-            return "{$period->getTableName()} " .
-                "JOIN {$participation->getTableName()} " .
-                "ON {$participation->getTableName()}.{$join['name']} = " .
+            return "{$period->getTableName()} ".
+                "JOIN {$participation->getTableName()} ".
+                "ON {$participation->getTableName()}.{$join['name']} = ".
                 "{$period->getTableName()}.{$join['referencedColumnName']}";
         }
 
-        return "{$period->getTableName()} " .
-                "JOIN {$participation->getTableName()} " .
-                "ON {$participation->getTableName()}.{$join['name']} = " .
-                "{$period->getTableName()}.{$join['referencedColumnName']} " .
-                "JOIN {$person->getTableName()} " .
-                "ON {$participation->getTableName()}.{$joinPerson['name']} = " .
+        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 21cb0438c..70afcd1c2 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
@@ -36,7 +36,7 @@ class TimelineAccompanyingPeriodClosing extends AbstractTimelineAccompanyingPeri
     public function getEntityTemplate($entity, $context, array $args)
     {
         return $this->getBasicEntityTemplate(
-            'ChillPersonBundle:Timeline:closing_period.html.twig',
+            '@ChillPerson/Timeline/closing_period.html.twig',
             $entity,
             $context,
             $args
diff --git a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
index 9cd8df75f..74162ddb0 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
@@ -34,7 +34,7 @@ class TimelineAccompanyingPeriodOpening extends AbstractTimelineAccompanyingPeri
     public function getEntityTemplate($entity, $context, array $args)
     {
         return $this->getBasicEntityTemplate(
-            'ChillPersonBundle:Timeline:opening_period.html.twig',
+            '@ChillPerson/Timeline/opening_period.html.twig',
             $entity,
             $context,
             $args
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
index 9454d31d0..6198e4e47 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
@@ -21,22 +21,9 @@ 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;
-
-    private TokenStorageInterface $token;
-
-    public function __construct(ActivityRepository $activityRepository, SocialIssueRender $socialIssueRender, TokenStorageInterface $token)
-    {
-        $this->activityRepository = $activityRepository;
-        $this->socialIssueRender = $socialIssueRender;
-        $this->token = $token;
-    }
+    public function __construct(private readonly ActivityRepository $activityRepository, private readonly SocialIssueRender $socialIssueRender, private readonly TokenStorageInterface $token) {}
 
     public function validate($period, Constraint $constraint)
     {
@@ -74,16 +61,14 @@ class AccompanyingPeriodValidityValidator extends ConstraintValidator
             $periodIssuesWithAncestors = array_merge(
                 $periodIssuesWithAncestors,
                 array_map(
-                    static function (SocialIssue $si) {
-                        return spl_object_hash($si);
-                    },
+                    static fn (SocialIssue $si) => spl_object_hash($si),
                     $si->getAncestors(true)
                 )
             );
         }
 
         foreach ($socialIssuesByKey as $key => $si) {
-            if (!in_array($key, $periodIssuesWithAncestors, true)) {
+            if (!\in_array($key, $periodIssuesWithAncestors, true)) {
                 $this->context
                     ->buildViolation(
                         $constraint->messageSocialIssueCannotBeDeleted
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
index df5b88fc6..4b4a13c18 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
@@ -20,12 +20,7 @@ use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
 class LocationValidityValidator extends ConstraintValidator
 {
-    private PersonRenderInterface $render;
-
-    public function __construct(PersonRenderInterface $render)
-    {
-        $this->render = $render;
-    }
+    public function __construct(private readonly PersonRenderInterface $render) {}
 
     public function validate($period, Constraint $constraint)
     {
@@ -37,7 +32,7 @@ class LocationValidityValidator extends ConstraintValidator
             throw new UnexpectedValueException($period, AccompanyingPeriod::class);
         }
 
-        if ($period->getLocationStatus() === 'person') {
+        if ('person' === $period->getLocationStatus()) {
             if (
                 null === $period->getOpenParticipationContainsPerson(
                     $period->getPersonLocation()
@@ -53,8 +48,8 @@ class LocationValidityValidator extends ConstraintValidator
         }
 
         if (
-            $period->getStep() !== AccompanyingPeriod::STEP_DRAFT
-            && $period->getLocationStatus() === 'none'
+            AccompanyingPeriod::STEP_DRAFT !== $period->getStep()
+            && 'none' === $period->getLocationStatus()
         ) {
             $this->context
                 ->buildViolation(
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
index 67ee00756..d3c25199b 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
@@ -20,21 +20,11 @@ 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 PersonRenderInterface $personRender;
-
-    private ThirdPartyRender $thirdpartyRender;
-
-    public function __construct(PersonRenderInterface $personRender, ThirdPartyRender $thirdPartyRender)
-    {
-        $this->personRender = $personRender;
-        $this->thirdpartyRender = $thirdPartyRender;
-    }
+    public function __construct(private readonly PersonRenderInterface $personRender, private readonly ThirdPartyRender $thirdpartyRender) {}
 
     public function validate($participations, Constraint $constraint)
     {
@@ -46,11 +36,11 @@ class ParticipationOverlapValidator extends ConstraintValidator
             throw new UnexpectedTypeException($participations, 'This should be a collection');
         }
 
-        if (count($participations) <= self::MAX_PARTICIPATION) {
+        if (\count($participations) <= self::MAX_PARTICIPATION) {
             return;
         }
 
-        if (0 === count($participations)) {
+        if (0 === \count($participations)) {
             return;
         }
 
@@ -67,7 +57,7 @@ class ParticipationOverlapValidator extends ConstraintValidator
         }
 
         foreach ($participationList as $group) {
-            if (count($group) > 1) {
+            if (\count($group) > 1) {
                 $overlaps = new DateRangeCovering(self::MAX_PARTICIPATION, $participations[0]->getStartDate()->getTimezone());
 
                 foreach ($group as $p) {
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
index 5813945ab..d7573c400 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
@@ -19,20 +19,9 @@ 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 PersonRenderInterface $personRender;
-
-    private ThirdPartyRender $thirdpartyRender;
-
-    public function __construct(PersonRenderInterface $personRender, ThirdPartyRender $thirdPartyRender)
-    {
-        $this->personRender = $personRender;
-        $this->thirdpartyRender = $thirdPartyRender;
-    }
+    public function __construct(private readonly PersonRenderInterface $personRender, private readonly ThirdPartyRender $thirdpartyRender) {}
 
     public function validate($resources, Constraint $constraint)
     {
@@ -44,7 +33,7 @@ class ResourceDuplicateCheckValidator extends ConstraintValidator
             throw new UnexpectedTypeException($resources, Collection::class);
         }
 
-        if (0 === count($resources)) {
+        if (0 === \count($resources)) {
             return;
         }
 
@@ -52,9 +41,9 @@ class ResourceDuplicateCheckValidator extends ConstraintValidator
 
         foreach ($resources as $resource) {
             $id = ($resource->getResource() instanceof Person ? 'p' :
-                't') . $resource->getResource()->getId();
+                't').$resource->getResource()->getId();
 
-            if (in_array($id, $resourceList, true)) {
+            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(), []))
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
index a57b47325..2ca0af42c 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
@@ -18,20 +18,13 @@ use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
-use function count;
-
 /**
  * Validate that a person does not belong to two household at
  * the same time.
  */
 class HouseholdMembershipSequentialValidator extends ConstraintValidator
 {
-    private PersonRenderInterface $render;
-
-    public function __construct(PersonRenderInterface $render)
-    {
-        $this->render = $render;
-    }
+    public function __construct(private readonly PersonRenderInterface $render) {}
 
     public function validate($person, Constraint $constraint)
     {
@@ -41,7 +34,7 @@ class HouseholdMembershipSequentialValidator extends ConstraintValidator
 
         $participations = $person->getHouseholdParticipationsShareHousehold();
 
-        if ($participations->count() === 0) {
+        if (0 === $participations->count()) {
             return;
         }
 
@@ -57,7 +50,7 @@ class HouseholdMembershipSequentialValidator extends ConstraintValidator
         if ($covers->hasIntersections()) {
             foreach ($covers->getIntersections() as [$start, $end, $metadata]) {
                 $participation = $participations[$metadata[0]];
-                $nbHousehold = count($metadata);
+                $nbHousehold = \count($metadata);
 
                 $this->context
                     ->buildViolation($constraint->message)
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
index 15fb22728..30060445f 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
@@ -25,7 +25,9 @@ use Symfony\Component\Validator\Constraint;
  */
 class Birthdate extends Constraint
 {
-    public const BIRTHDATE_INVALID_CODE = '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4';
+    final public const BIRTHDATE_INVALID_CODE = '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4';
 
     public $message = 'The birthdate must be before %date%';
+
+    public $belowMessage = 'The birthdate must be after %date%';
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
index 7845e33e6..1a7634136 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
@@ -11,23 +11,23 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Validator\Constraints\Person;
 
-use DateInterval;
-use DateTime;
-use LogicException;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-
-use function get_class;
-use function gettype;
-use function is_object;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 class BirthdateValidator extends ConstraintValidator
 {
-    private $interval_spec;
+    private readonly string $interval_spec;
 
-    public function __construct($interval_spec = null)
-    {
-        $this->interval_spec = $interval_spec;
+    private string $below_interval = 'P150Y';
+
+    public function __construct(
+        private readonly ParameterBagInterface $parameterBag,
+        private readonly ClockInterface $clock
+    ) {
+        $this->interval_spec = $this->parameterBag->get('chill_person')['validation']['birthdate_not_after'];
     }
 
     public function validate($value, Constraint $constraint)
@@ -36,32 +36,40 @@ class BirthdateValidator extends ConstraintValidator
             return;
         }
 
-        if (!$value instanceof DateTime) {
-            throw new LogicException('The input should a be a \DateTime interface,'
-                    . (is_object($value) ? get_class($value) : gettype($value)));
+        if (!$value instanceof \DateTime) {
+            throw new \LogicException('The input should a be a \DateTime interface,'.get_debug_type($value));
+        }
+
+        if (!$constraint instanceof Birthdate) {
+            throw new UnexpectedTypeException($constraint, Birthdate::class);
         }
 
         $limitDate = $this->getLimitDate();
 
-        if ($limitDate < $value) {
+        if ($value > $limitDate) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('%date%', $limitDate->format('d-m-Y'))
                 ->setCode(Birthdate::BIRTHDATE_INVALID_CODE)
                 ->addViolation();
         }
+
+        if ($value < $this->getBelowLimitDate()) {
+            $this->context->buildViolation($constraint->belowMessage)
+                ->setParameter('%date%', $this->getBelowLimitDate()->format('d-m-Y'))
+                ->setCode(Birthdate::BIRTHDATE_INVALID_CODE)
+                ->addViolation();
+        }
     }
 
-    /**
-     * @return DateTime
-     */
-    private function getLimitDate()
+    private function getLimitDate(): \DateTime
     {
-        if (null !== $this->interval_spec) {
-            $interval = new DateInterval($this->interval_spec);
+        $interval = new \DateInterval($this->interval_spec);
 
-            return (new DateTime('now'))->sub($interval);
-        }
+        return \DateTime::createFromImmutable($this->clock->now()->sub($interval));
+    }
 
-        return new DateTime('now');
+    private function getBelowLimitDate(): \DateTime
+    {
+        return \DateTime::createFromImmutable($this->clock->now()->sub(new \DateInterval($this->below_interval)));
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
index 278f80962..0d7ba3b17 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
@@ -20,14 +20,11 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 class PersonHasCenterValidator extends ConstraintValidator
 {
-    private bool $centerRequired;
+    private readonly bool $centerRequired;
 
-    private CenterResolverManagerInterface $centerResolverManager;
-
-    public function __construct(ParameterBagInterface $parameterBag, CenterResolverManagerInterface $centerResolverManager)
+    public function __construct(ParameterBagInterface $parameterBag, private readonly CenterResolverManagerInterface $centerResolverManager)
     {
         $this->centerRequired = $parameterBag->get('chill_person')['validation']['center_required'];
-        $this->centerResolverManager = $centerResolverManager;
     }
 
     public function validate($person, Constraint $constraint)
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php
index 10e651b56..8a54de53e 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php
@@ -20,12 +20,7 @@ use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
 class RelationshipNoDuplicateValidator extends ConstraintValidator
 {
-    private RelationshipRepository $relationshipRepository;
-
-    public function __construct(RelationshipRepository $relationshipRepository)
-    {
-        $this->relationshipRepository = $relationshipRepository;
-    }
+    public function __construct(private readonly RelationshipRepository $relationshipRepository) {}
 
     public function validate($value, Constraint $constraint)
     {
@@ -46,11 +41,11 @@ class RelationshipNoDuplicateValidator extends ConstraintValidator
         ]);
 
         foreach ($relationships as $r) {
-            if (
-                $r->getFromPerson() === $fromPerson
-                || $r->getFromPerson() === $toPerson
-                || $r->getToPerson() === $fromPerson
-                || $r->getToPerson() === $toPerson
+            if (spl_object_hash($r) !== spl_object_hash($value)
+                and (
+                    ($r->getFromPerson() === $fromPerson and $r->getToPerson() === $toPerson)
+                    || ($r->getFromPerson() === $toPerson and $r->getToPerson() === $fromPerson)
+                )
             ) {
                 $this->context->buildViolation($constraint->message)
                     ->addViolation();
diff --git a/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php b/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
index 8047d3b44..ef150f91d 100644
--- a/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
@@ -25,6 +25,6 @@ class AddAPersonWidget implements WidgetInterface
         array $context,
         array $config
     ) {
-        return $env->render('ChillPersonBundle:Widget:homepage_add_a_person.html.twig');
+        return $env->render('@ChillPerson/Widget/homepage_add_a_person.html.twig');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
index f2ea66653..aab72f148 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
@@ -15,19 +15,12 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
 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 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.
@@ -39,31 +32,10 @@ use function count;
  */
 class PersonListWidget implements WidgetInterface
 {
-    protected AuthorizationHelperInterface $authorizationHelper;
-
-    protected EntityManagerInterface $entityManager;
-
-    protected PersonRepository $personRepository;
-
-    protected TokenStorageInterface $tokenStorage;
-
     protected UserInterface $user;
 
-    public function __construct(
-        PersonRepository $personRepostory,
-        EntityManagerInterface $em,
-        AuthorizationHelperInterface $authorizationHelper,
-        TokenStorageInterface $tokenStorage
-    ) {
-        $this->personRepository = $personRepostory;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->tokenStorage = $tokenStorage;
-        $this->entityManager = $em;
-    }
+    public function __construct(protected PersonRepository $personRepository, protected EntityManagerInterface $entityManager, protected AuthorizationHelperInterface $authorizationHelper, protected TokenStorageInterface $tokenStorage) {}
 
-    /**
-     * @param mixed $place
-     */
     public function render(Environment $env, $place, array $context, array $config)
     {
         $numberOfItems = $config['number_of_items'] ?? 20;
@@ -74,12 +46,12 @@ class PersonListWidget implements WidgetInterface
         // 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(), 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) && true === $config['only_active']) {
+        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
@@ -92,19 +64,14 @@ class PersonListWidget implements WidgetInterface
                 (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
             );
             $and->add($or);
-            $qb->setParameter('now', new DateTime(), Types::DATE_MUTABLE);
+            $qb->setParameter('now', new \DateTime(), Types::DATE_MUTABLE);
         }
 
-        if (array_key_exists('filtering_class', $config) && null !== $config['filtering_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
-                ));
+                throw new \UnexpectedValueException(sprintf('the class %s does not implements %s', $config['filtering_class'], PersonListWidget\PersonFilteringInterface::class));
             }
             $ids = $filteringClass->getPersonIds(
                 $this->entityManager,
@@ -131,7 +98,7 @@ class PersonListWidget implements WidgetInterface
         $cfields = [];
 
         if (isset($config['custom_fields'])) {
-            if (count($config['custom_fields']) > 0) {
+            if (\count($config['custom_fields']) > 0) {
                 $cfs = $this->entityManager
                     ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomField::class)
                     ->findBy(['slug' => $config['custom_fields']]);
@@ -143,7 +110,7 @@ class PersonListWidget implements WidgetInterface
         }
 
         return $env->render(
-            'ChillPersonBundle:Widget:homepage_person_list.html.twig',
+            '@ChillPerson/Widget/homepage_person_list.html.twig',
             [
                 'persons' => $persons,
                 'customFields' => $cfields,
@@ -156,15 +123,13 @@ class PersonListWidget implements WidgetInterface
         $token = $this->tokenStorage->getToken();
 
         if (null === $token) {
-            throw new RuntimeException('the token should not be null');
+            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 ?'
-            );
+            throw new \RuntimeException('The user should implement UserInterface. Are you logged in ?');
         }
 
         return $user;
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
index fc6104810..204b6c7c7 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
@@ -34,7 +34,7 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
         $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')
+                        .' 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();
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
index 500daab6f..0fc13224e 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
@@ -21,21 +21,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityWorkflowHandlerInterface
 {
-    private AccompanyingPeriodWorkEvaluationDocumentRepository $repository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        AccompanyingPeriodWorkEvaluationDocumentRepository $repository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        TranslatorInterface $translator
-    ) {
-        $this->repository = $repository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly AccompanyingPeriodWorkEvaluationDocumentRepository $repository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
 
     public function getDeletionRoles(): array
     {
@@ -71,8 +57,8 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         return $this->translator->trans(
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
-        ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle()) . ') ' . $doc->getTitle();
+        ).' ('.$this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
+            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument
@@ -135,7 +121,7 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
-        return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluationDocument::class;
+        return AccompanyingPeriodWorkEvaluationDocument::class === $entityWorkflow->getRelatedEntityClass();
     }
 
     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
index db67ef045..63b34d1dc 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@@ -22,21 +22,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowHandlerInterface
 {
-    private AccompanyingPeriodWorkEvaluationRepository $repository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        AccompanyingPeriodWorkEvaluationRepository $repository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        TranslatorInterface $translator
-    ) {
-        $this->repository = $repository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly AccompanyingPeriodWorkEvaluationRepository $repository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
 
     public function getDeletionRoles(): array
     {
@@ -59,7 +45,7 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
         return $this->translator->trans(
             'workflow.Evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
-        ) . ' - ' . $this->translatableStringHelper->localize($evaluation->getEvaluation()->getTitle());
+        ).' - '.$this->translatableStringHelper->localize($evaluation->getEvaluation()->getTitle());
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluation
@@ -121,7 +107,7 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
-        return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWorkEvaluation::class;
+        return AccompanyingPeriodWorkEvaluation::class === $entityWorkflow->getRelatedEntityClass();
     }
 
     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
diff --git a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
index 3cdf23f88..5c74e5b17 100644
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@@ -23,21 +23,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInterface
 {
-    private AccompanyingPeriodWorkRepository $repository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        AccompanyingPeriodWorkRepository $repository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        TranslatorInterface $translator
-    ) {
-        $this->repository = $repository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly AccompanyingPeriodWorkRepository $repository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
 
     public function getDeletionRoles(): array
     {
@@ -47,8 +33,7 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
     public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
     {
         return [
-            'persons' => $this->getRelatedEntity($entityWorkflow)
-                ->getPersons(),
+            'persons' => $this->getRelatedEntity($entityWorkflow)?->getPersons() ?? [],
         ];
     }
 
@@ -62,7 +47,7 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
 
         return
             $this->translator->trans('workflow.Work (n°%w%)', ['%w%' => $entityWorkflow->getRelatedEntityId()])
-            . ' - ' . $this->translatableStringHelper->localize($work->getSocialAction()->getTitle());
+            .' - '.$this->translatableStringHelper->localize($work->getSocialAction()->getTitle());
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWork
@@ -129,7 +114,7 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
     {
-        return $entityWorkflow->getRelatedEntityClass() === AccompanyingPeriodWork::class;
+        return AccompanyingPeriodWork::class === $entityWorkflow->getRelatedEntityClass();
     }
 
     public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index d437a34d6..731318c6c 100644
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -1,130 +1,3 @@
-chill_person_view:
-    path: /{_locale}/person/{person_id}/general
-    controller: Chill\PersonBundle\Controller\PersonController::viewAction
-
-chill_person_general_edit:
-    path: /{_locale}/person/{person_id}/general/edit
-    controller: Chill\PersonBundle\Controller\PersonController::editAction
-
-chill_person_general_update:
-    path: /{_locale}/person/{person_id}/general/update
-    controller: Chill\PersonBundle\Controller\PersonController::updateAction
-
-chill_person_new:
-    path: /{_locale}/person/new
-    controller: Chill\PersonBundle\Controller\PersonController::newAction
-
-chill_person_review:
-    path: /{_locale}/person/review
-    controller: Chill\PersonBundle\Controller\PersonController::reviewAction
-
-chill_person_create:
-    path: /{_locale}/person/create
-    controller: Chill\PersonBundle\Controller\PersonController::createAction
-
-chill_person_search:
-    path: /{_locale}/person/search
-    controller: Chill\PersonBundle\Controller\PersonController::searchAction
-    options:
-        menus:
-            main:
-                order: 30
-                label: Search within persons
-
-chill_person_accompanying_period_list:
-    path: /{_locale}/person/{person_id}/accompanying-period
-    controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::listAction
-
-chill_person_accompanying_period_create:
-    path: /{_locale}/person/{person_id}/accompanying-period/create
-    controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::createAction
-
-chill_person_accompanying_period_update:
-    path: /{_locale}/person/{person_id}/accompanying-period/{period_id}/update
-    controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::updateAction
-
-chill_person_accompanying_period_close:
-    path: /{_locale}/person/{person_id}/accompanying-period/close
-    controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::closeAction
-
-chill_person_accompanying_period_open:
-    path: /{_locale}/person/{person_id}/accompanying-period/open
-    controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::openAction
-
-chill_person_accompanying_period_re_open:
-    path: /{_locale}/person/{person_id}/accompanying-period/{period_id}/re-open
-    controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::reOpenAction
-
-chill_person_resource_list:
-    path: /{_locale}/person/{person_id}/resources/list
-    controller: Chill\PersonBundle\Controller\PersonResourceController::listAction
-
-chill_person_resource_new:
-    path: /{_locale}/person/{person_id}/resources/new
-    controller: Chill\PersonBundle\Controller\PersonResourceController::newAction
-
-chill_person_resource_edit:
-    path: /{_locale}/person/{person_id}/resources/{resource_id}/edit
-    controller: Chill\PersonBundle\Controller\PersonResourceController::editAction
-
-chill_person_resource_delete:
-    path: /{_locale}/person/{person_id}/resources/{resource_id}/delete
-    controller: Chill\PersonBundle\Controller\PersonResourceController::deleteAction
-
-chill_person_address_list:
-    path: /{_locale}/person/{person_id}/address/list
-    controller: Chill\PersonBundle\Controller\PersonAddressController::listAction
-
-chill_person_address_create:
-    path: /{_locale}/person/{person_id}/address/create
-    controller: Chill\PersonBundle\Controller\PersonAddressController::createAction
-    methods: [POST]
-
-chill_person_address_new:
-    path: /{_locale}/person/{person_id}/address/new
-    controller: Chill\PersonBundle\Controller\PersonAddressController::newAction
-
-chill_person_address_edit:
-    path: /{_locale}/person/{person_id}/address/{address_id}/edit
-    controller: Chill\PersonBundle\Controller\PersonAddressController::editAction
-
-chill_person_address_update:
-    path: /{_locale}/person/{person_id}/address/{address_id}/update
-    controller: Chill\PersonBundle\Controller\PersonAddressController::updateAction
-
-chill_person_timeline:
-    path: /{_locale}/person/{person_id}/timeline
-    controller: Chill\PersonBundle\Controller\TimelinePersonController::personAction
-
-chill_person_duplicate_view:
-    path: /{_locale}/person/{person_id}/duplicate/view
-    controller: Chill\PersonBundle\Controller\PersonDuplicateController::viewAction
-
-chill_person_duplicate_confirm:
-    path: /{_locale}/person/{person1_id}/duplicate/{person2_id}/confirm
-    controller: Chill\PersonBundle\Controller\PersonDuplicateController::confirmAction
-
-chill_person_duplicate_not_duplicate:
-    path: /{_locale}/person/{person1_id}/duplicate/{person2_id}/not-duplicate
-    controller: Chill\PersonBundle\Controller\PersonDuplicateController::notDuplicateAction
-
-chill_person_remove_duplicate_not_duplicate:
-    path: /{_locale}/person/{person1_id}/duplicate/{person2_id}/remove-not-duplicate
-    controller: Chill\PersonBundle\Controller\PersonDuplicateController::removeNotDuplicateAction
-
-chill_person_find_manually_duplicate:
-    path: /{_locale}/person/{person_id}/find-manually
-    controller: Chill\PersonBundle\Controller\PersonDuplicateController::findManuallyDuplicateAction
-
-chill_person_admin_redirect_to_admin_index:
-    path:     /{_locale}/admin/person_redirect_to_main
-    controller: Chill\PersonBundle\Controller\AdminController::redirectToAdminIndexAction
-    options:
-        menus:
-            admin_person:
-                order: 0
-                label: Main admin menu
-
 chill_person_controllers:
     resource: "@ChillPersonBundle/Controller"
     type: annotation
diff --git a/src/Bundle/ChillPersonBundle/config/services.yaml b/src/Bundle/ChillPersonBundle/config/services.yaml
index f989b5dda..526f5cbbd 100644
--- a/src/Bundle/ChillPersonBundle/config/services.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services.yaml
@@ -59,13 +59,6 @@ services:
         autoconfigure: true
         resource: '../Validator/Constraints/'
 
-    # override default config, must be loaded after resource
-    Chill\PersonBundle\Validator\Constraints\BirthdateValidator:
-        arguments:
-            - "%chill_person.validation.birtdate_not_before%"
-        tags:
-            - { name: validator.constraint_validator, alias: birthdate_not_before }
-
     Chill\PersonBundle\Repository\:
         autowire: true
         autoconfigure: true
@@ -98,3 +91,7 @@ services:
         autowire: true
         autoconfigure: true
         resource: '../Workflow/'
+
+    Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodViewEntityInfoProvider:
+        arguments:
+            $unions: !tagged_iterator chill_person.accompanying_period_info_part
diff --git a/src/Bundle/ChillPersonBundle/config/services/accompanyingPeriod.yaml b/src/Bundle/ChillPersonBundle/config/services/accompanyingPeriod.yaml
index 7d7f9072d..e6b35de77 100644
--- a/src/Bundle/ChillPersonBundle/config/services/accompanyingPeriod.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/accompanyingPeriod.yaml
@@ -25,6 +25,11 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\PersonBundle\AccompanyingPeriod\Lifecycle\:
+        resource: './../../AccompanyingPeriod/Lifecycle'
+        autowire: true
+        autoconfigure: true
+
     Chill\PersonBundle\AccompanyingPeriod\Events\UserRefEventSubscriber:
         autowire: true
         autoconfigure: true
diff --git a/src/Bundle/ChillPersonBundle/config/services/actions.yaml b/src/Bundle/ChillPersonBundle/config/services/actions.yaml
index e4c6c6621..d6e2c80a5 100644
--- a/src/Bundle/ChillPersonBundle/config/services/actions.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/actions.yaml
@@ -1,5 +1,13 @@
 services:
-    Chill\PersonBundle\Actions\Remove\PersonMove:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Chill\PersonBundle\Actions\Remove\PersonMove: ~
+
+    Chill\PersonBundle\Actions\Remove\PersonMoveManager:
         arguments:
-            $em: '@Doctrine\ORM\EntityManagerInterface'
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
\ No newline at end of file
+            $handlers: !tagged_iterator chill_person.person_move_handler
+
+    Chill\PersonBundle\Actions\Remove\Handler\:
+        resource: '../../Actions/Remove/Handler'
diff --git a/src/Bundle/ChillPersonBundle/config/services/controller.yaml b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
index 4ef0cb15f..434d1ea08 100644
--- a/src/Bundle/ChillPersonBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
@@ -1,11 +1,14 @@
 services:
-    Chill\PersonBundle\Controller\PersonController:
+    _defaults:
         autowire: true
+        autoconfigure: true
+
+    Chill\PersonBundle\Controller\PersonController:
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\TimelinePersonController:
         arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $eventDispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
             $timelineBuilder: '@chill_main.timeline_builder'
             $paginatorFactory: '@chill_main.paginator_factory'
         tags: ['controller.service_arguments']
@@ -28,7 +31,7 @@ services:
             $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
             $personRepository: '@Chill\PersonBundle\Repository\PersonRepository'
             $personMove: '@Chill\PersonBundle\Actions\Remove\PersonMove'
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $eventDispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\AccompanyingCourseController:
diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml
index bb2cfa556..c5a2dba68 100644
--- a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml
@@ -28,11 +28,14 @@ services:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_socialissue_filter }
 
-    chill.person.export.filter_step:
-        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilter
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilterOnDate:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_step_filter }
 
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilterBetweenDates:
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_step_filter_between_dates }
+
     chill.person.export.filter_geographicalunitstat:
         class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\GeographicalUnitStatFilter
         tags:
@@ -128,6 +131,21 @@ services:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_creator_job_filter }
 
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\UserWorkingOnCourseFilter:
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_user_working_on_filter }
+
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\JobWorkingOnCourseFilter:
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_job_working_on_filter }
+
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ScopeWorkingOnCourseFilter:
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_scope_working_on_filter }
+
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\HavingAnAccompanyingPeriodInfoWithinDatesFilter:
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_info_within_filter }
 
     ## Aggregators
     chill.person.export.aggregator_referrer_scope:
@@ -221,3 +239,15 @@ services:
     Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\CreatorJobAggregator:
         tags:
             - { name: chill.export_aggregator, alias: accompanyingcourse_creator_job_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\UserWorkingOnCourseAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: accompanyingcourse_user_working_on_course_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\JobWorkingOnCourseAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: accompanyingcourse_job_working_on_course_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeWorkingOnCourseAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: accompanyingcourse_scope_working_on_course_aggregator }
diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml
index bf372ea06..43f5556cf 100644
--- a/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml
@@ -4,35 +4,27 @@ services:
         autowire: true
 
     ## Indicators
-    chill.person.export.count_person:
-        class: Chill\PersonBundle\Export\Export\CountPerson
-        autowire: true
-        autoconfigure: true
+    Chill\PersonBundle\Export\Export\CountPerson:
         tags:
             - { name: chill.export, alias: count_person }
 
-    chill.person.export.count_person_with_accompanying_course:
-        class: Chill\PersonBundle\Export\Export\CountPersonWithAccompanyingCourse
-        autowire: true
-        autoconfigure: true
+    Chill\PersonBundle\Export\Export\CountPersonWithAccompanyingCourse:
         tags:
             - { name: chill.export, alias: count_person_with_accompanying_course }
 
     Chill\PersonBundle\Export\Export\ListPerson:
-        autowire: true
-        autoconfigure: true
         tags:
             - { name: chill.export, alias: list_person }
 
-    Chill\PersonBundle\Export\Export\ListPersonWithAccompanyingPeriod:
-        autowire: true
-        autoconfigure: true
+    Chill\PersonBundle\Export\Export\ListPersonHavingAccompanyingPeriod:
         tags:
             - { name: chill.export, alias: list_person_with_acp }
 
+    Chill\PersonBundle\Export\Export\ListPersonWithAccompanyingPeriodDetails:
+        tags:
+            - { name: chill.export, alias: list_person_with_acp_details }
+
     Chill\PersonBundle\Export\Export\ListAccompanyingPeriod:
-        autowire: true
-        autoconfigure: true
         tags:
             - { name: chill.export, alias: list_acp }
 
@@ -177,3 +169,8 @@ services:
         tags:
             - { name: chill.export_aggregator, alias: person_household_compo_aggregator }
 
+    Chill\PersonBundle\Export\Aggregator\PersonAggregators\CenterAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: person_center_aggregator }
+
+
diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml
index ecf0ec399..c0e6abc4b 100644
--- a/src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml
@@ -48,7 +48,19 @@ services:
       tags:
           - { name: chill.export_filter, alias: social_work_actions_current_filter }
 
-  ## AGGREGATORS
+  Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkStartDateBetweenDateFilter:
+      autowire: true
+      autoconfigure: true
+      tags:
+          - { name: chill.export_filter, alias: social_work_actions_start_btw_dates_filter }
+
+  Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkEndDateBetweenDateFilter:
+      autowire: true
+      autoconfigure: true
+      tags:
+          - { name: chill.export_filter, alias: social_work_actions_end_btw_dates_filter }
+
+      ## AGGREGATORS
   chill.person.export.aggregator_action_type:
     class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ActionTypeAggregator
     autowire: true
@@ -70,8 +82,7 @@ services:
       tags:
           - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_job_aggregator }
 
-  chill.person.export.aggregator_treatingagent:
-    class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator
+  Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator:
     autowire: true
     autoconfigure: true
     tags:
diff --git a/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml b/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml
index d4cdcd957..8047e7eeb 100644
--- a/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml
@@ -6,7 +6,6 @@ services:
         tags: [ 'doctrine.fixture.orm' ]
 
     Chill\PersonBundle\DataFixtures\ORM\LoadCustomFields:
-        arguments:
-            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+        autowire: true
+        autoconfigure: true
         tags: [ 'doctrine.fixture.orm' ]
diff --git a/src/Bundle/ChillPersonBundle/config/services/menu.yaml b/src/Bundle/ChillPersonBundle/config/services/menu.yaml
index 198f5fe99..8b198b4f0 100644
--- a/src/Bundle/ChillPersonBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/menu.yaml
@@ -8,7 +8,7 @@ services:
               #    Chill\PersonBundle\Menu\SectionMenuBuilder:
               #        arguments:
               #            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-              #            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+              #            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
               #        tags:
               #            - { name: 'chill.menu_builder' }
               #
diff --git a/src/Bundle/ChillPersonBundle/config/services/notification.yaml b/src/Bundle/ChillPersonBundle/config/services/notification.yaml
index a7c9f4142..f5d227429 100644
--- a/src/Bundle/ChillPersonBundle/config/services/notification.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/notification.yaml
@@ -2,3 +2,9 @@ services:
     Chill\PersonBundle\Notification\AccompanyingPeriodNotificationHandler:
         autowire: true
         autoconfigure: true
+    Chill\PersonBundle\Notification\AccompanyingPeriodWorkNotificationHandler:
+        autowire: true
+        autoconfigure: true
+    Chill\PersonBundle\Notification\AccompanyingPeriodWorkEvaluationDocumentNotificationHandler:
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php b/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
index 06922359e..96028c079 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
@@ -23,7 +23,7 @@ class Version20150607231010 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -35,13 +35,13 @@ class Version20150607231010 extends AbstractMigration
     public function getDescription(): string
     {
         return 'Add a center on the person entity. The default center is the first '
-        . 'recorded.';
+        .'recorded.';
     }
 
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -63,8 +63,8 @@ class Version20150607231010 extends AbstractMigration
         // 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');
+                .'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 7b218dbf9..a2432a498 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
@@ -25,7 +25,7 @@ class Version20150811152608 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -36,7 +36,7 @@ class Version20150811152608 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php b/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
index 82c94efe4..80144eb54 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
@@ -22,7 +22,7 @@ class Version20150812110708 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -34,7 +34,7 @@ class Version20150812110708 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php b/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
index 9df778a08..ec45ab12a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
@@ -23,7 +23,7 @@ class Version20150820113409 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -35,7 +35,7 @@ class Version20150820113409 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php b/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
index be8c91af6..4e6935bca 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
@@ -21,7 +21,7 @@ class Version20160310161006 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP TABLE chill_person_persons_to_addresses');
     }
@@ -29,23 +29,23 @@ class Version20160310161006 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE TABLE chill_person_persons_to_addresses ('
-              . 'person_id INT NOT NULL, '
-              . 'address_id INT NOT NULL, '
-              . 'PRIMARY KEY(person_id, address_id))');
+              .'person_id INT NOT NULL, '
+              .'address_id INT NOT NULL, '
+              .'PRIMARY KEY(person_id, address_id))');
         $this->addSql('CREATE INDEX IDX_4655A196217BBB47 '
-              . 'ON chill_person_persons_to_addresses (person_id)');
+              .'ON chill_person_persons_to_addresses (person_id)');
         $this->addSql('CREATE INDEX IDX_4655A196F5B7AF75 '
-              . 'ON chill_person_persons_to_addresses (address_id)');
+              .'ON chill_person_persons_to_addresses (address_id)');
         $this->addSql('ALTER TABLE chill_person_persons_to_addresses '
-              . 'ADD CONSTRAINT FK_4655A196217BBB47 '
-              . 'FOREIGN KEY (person_id) '
-              . 'REFERENCES Person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_4655A196217BBB47 '
+              .'FOREIGN KEY (person_id) '
+              .'REFERENCES Person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_persons_to_addresses '
-              . 'ADD CONSTRAINT FK_4655A196F5B7AF75 '
-              . 'FOREIGN KEY (address_id) '
-              . 'REFERENCES chill_main_address (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+              .'ADD CONSTRAINT FK_4655A196F5B7AF75 '
+              .'FOREIGN KEY (address_id) '
+              .'REFERENCES chill_main_address (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php b/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
index 148ceee3a..159e969a3 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
@@ -14,16 +14,12 @@ namespace Chill\Migrations\Person;
 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.
  */
 class Version20160422000000 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-    }
+    public function down(Schema $schema): void {}
 
     public function up(Schema $schema): void
     {
@@ -36,11 +32,11 @@ class Version20160422000000 extends AbstractMigration
         $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(
-            count($personWithTwoAddressWithSameValidFrom) !== 0,
+            0 !== \count($personWithTwoAddressWithSameValidFrom),
             'There exists some person with multiple adress with the same validFrom'
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php b/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
index 0e06fccab..6b11a1d63 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
@@ -45,7 +45,7 @@ class Version20160818113633 extends AbstractMigration
         foreach ($personIdAndCFData as $person) {
             $personId = $person['id'];
             $cFDataArray = unserialize($person['cfdata']);
-            $cFDataJson = json_encode($cFDataArray);
+            $cFDataJson = json_encode($cFDataArray, JSON_THROW_ON_ERROR);
             $this->addSql(
                 'UPDATE person set cfdata = :cfdatajson WHERE id = :id',
                 ['cfdatajson' => $cFDataJson, 'id' => $personId]
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php b/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
index f1c0ddd92..d1d782b42 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
@@ -21,7 +21,7 @@ final class Version20180518144221 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_person DROP contactInfo');
         $this->addSql('ALTER TABLE chill_person_person DROP mobilenumber');
@@ -30,7 +30,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php b/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
index 23f6875cc..950754659 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
@@ -23,7 +23,7 @@ final class Version20180820120000 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('UPDATE chill_person_person SET email=contactInfo');
         $this->addSql('UPDATE chill_person_person SET contactInfo=\'\'');
@@ -31,7 +31,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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 05c467379..3222aaade 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
@@ -21,14 +21,14 @@ final class Version20181005140249 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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 4f7765000..b4bf23c7c 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
@@ -21,7 +21,7 @@ final class Version20181023101621 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX fullnameCanonical_trgm_idx');
         $this->addSql('ALTER TABLE chill_person_person DROP fullnameCanonical');
@@ -33,27 +33,27 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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
+            <<<'SQL_WRAP'
+            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_WRAP
         );
         $this->addSql(
             <<<'SQL'
@@ -67,17 +67,17 @@ final class Version20181023101621 extends AbstractMigration
         );
 
         $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
+            <<<'SQL_WRAP'
+            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_WRAP
         );
         $this->addSql(
             <<<'SQL'
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php b/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
index efc885b15..5f869d138 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
@@ -21,7 +21,7 @@ final class Version20200128084445 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX IDX_2628668E217BBB47');
         $this->addSql('DROP TABLE chill_person_alt_name');
@@ -30,7 +30,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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))');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php b/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
index 947d26357..7d48b5f53 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
@@ -130,20 +130,20 @@ final class Version20200130213446 extends AbstractMigration
         $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
+            <<<'SQL_WRAP'
+            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_WRAP
         );
     }
 
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php b/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
index ef6b0b59a..bb3aa9304 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
@@ -21,7 +21,7 @@ final class Version20200310090632 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_closingmotive DROP parent_id');
         $this->addSql('ALTER TABLE chill_person_closingmotive DROP ordering');
@@ -29,7 +29,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
index 5d10f36e0..4ff268051 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
@@ -20,7 +20,7 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210326113045 extends AbstractMigration
 {
-    private $datas = [];
+    private array $datas = [];
 
     /**
      *  The distinct clause makes that for each group of duplicates, it keeps only the first row in the returned result set.
@@ -35,12 +35,12 @@ final class Version20210326113045 extends AbstractMigration
 
         // insert datas in existing table
         $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 '
-            . ') AS jt '
-            . 'WHERE ap.id = jt.id');
+            .'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 '
+            .') AS jt '
+            .'WHERE ap.id = jt.id');
 
         // drop join table
         $this->addSql('DROP TABLE persons_accompanying_periods');
@@ -65,7 +65,7 @@ final class Version20210326113045 extends AbstractMigration
 
         // 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');
+            .'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');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
index 02ff252fa..7e8cd1b45 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
@@ -22,7 +22,7 @@ final class Version20210419105054 extends AbstractMigration
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive_id_seq '
-            . 'RENAME TO chill_person_closingmotive_id_seq');
+            .'RENAME TO chill_person_closingmotive_id_seq');
     }
 
     public function getDescription(): string
@@ -33,6 +33,6 @@ final class Version20210419105054 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_person_closingmotive_id_seq RENAME TO '
-            . 'chill_person_accompanying_period_closingmotive_id_seq');
+            .'chill_person_accompanying_period_closingmotive_id_seq');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
index 93e0cf8a2..175d9e4a3 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
@@ -23,9 +23,9 @@ final class Version20210419105940 extends AbstractMigration
     {
         // this will keep the '"' at first and last character, but is acceptable
         $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
-            . 'ALTER label TYPE VARCHAR(255) USING label->\'fr\'::text');
+            .'ALTER label TYPE VARCHAR(255) USING label->\'fr\'::text');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
-            . 'ALTER label DROP DEFAULT');
+            .'ALTER label DROP DEFAULT');
     }
 
     public function getDescription(): string
@@ -36,8 +36,8 @@ final class Version20210419105940 extends AbstractMigration
     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');
+            .'ALTER label TYPE JSON USING json_build_object(\'fr\', label)::jsonb');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
-            . 'ALTER label DROP DEFAULT');
+            .'ALTER label DROP DEFAULT');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php
index 8db3880ed..e713486d0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php
@@ -19,9 +19,7 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210419112619 extends AbstractMigration
 {
-    public function down(Schema $schema): void
-    {
-    }
+    public function down(Schema $schema): void {}
 
     public function getDescription(): string
     {
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
index 1b9b0a501..92bcc3aa8 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
@@ -49,7 +49,7 @@ 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 ' .
+        $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 =,
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php b/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
index f115f9313..268c3f391 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
@@ -32,18 +32,18 @@ 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) ' .
+            '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 '
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php b/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
index 40b12f331..bc067c44d 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
@@ -32,7 +32,7 @@ final class Version20211021125359 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // creates a constraint 'participations may not overlap'
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD CONSTRAINT ' .
+        $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 =,
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php b/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php
index d6e9d2b77..99c04364d 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211213203147.php
@@ -40,7 +40,7 @@ final class Version20211213203147 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation_action ADD CONSTRAINT FK_DF34CCFB456C5646 FOREIGN KEY (evaluation_id) REFERENCES chill_person_social_work_evaluation (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation_action ADD CONSTRAINT FK_DF34CCFB3DC32179 FOREIGN KEY (socialaction_id) REFERENCES chill_person_social_action (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
 
-        $this->addSql('INSERT INTO chill_person_social_work_evaluation_action (evaluation_id, socialaction_id) ' .
+        $this->addSql('INSERT INTO chill_person_social_work_evaluation_action (evaluation_id, socialaction_id) '.
             'SELECT id, socialaction_ID FROM chill_person_social_work_evaluation');
 
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation DROP CONSTRAINT fk_2e23f3febf32a3da');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php b/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
index 2260e73c5..e87bb6f0a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
@@ -38,7 +38,7 @@ final class Version20220128133039 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CONSTRAINT FK_6C258C49D7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CONSTRAINT FK_6C258C49A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CHECK (startdate <= enddate)');
-        $this->addSql('INSERT INTO chill_person_accompanying_period_user_history (id, user_id, accompanyingperiod_id, startDate, endDate) ' .
+        $this->addSql('INSERT INTO chill_person_accompanying_period_user_history (id, user_id, accompanyingperiod_id, startDate, endDate) '.
             'SELECT nextval(\'chill_person_accompanying_period_user_history_id_seq\'), user_id, id, openingDate, null FROM chill_person_accompanying_period WHERE user_id IS NOT NULL');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL;');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD createdBy_id INT DEFAULT NULL;');
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php b/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
index 4ea2a17a1..5c7106e77 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
@@ -13,9 +13,7 @@ namespace Chill\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
-use Exception;
 use libphonenumber\PhoneNumberUtil;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -25,7 +23,7 @@ final class Version20220215135509 extends AbstractMigration implements Container
 
     public function down(Schema $schema): void
     {
-        throw new Exception('You should not do that.');
+        throw new \Exception('You should not do that.');
     }
 
     public function getDescription(): string
@@ -39,7 +37,7 @@ final class Version20220215135509 extends AbstractMigration implements Container
             ->getParameter('chill_main')['phone_helper']['default_carrier_code'];
 
         if (null === $carrier_code) {
-            throw new RuntimeException('no carrier code');
+            throw new \RuntimeException('no carrier code');
         }
 
         $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber TYPE TEXT');
@@ -53,9 +51,9 @@ final class Version20220215135509 extends AbstractMigration implements Container
         $this->addSql('COMMENT ON COLUMN chill_person_person.mobilenumber IS NULL');
 
         $this->addSql(
-            'UPDATE chill_person_person SET ' .
-            $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber') .
-            ', ' .
+            'UPDATE chill_person_person SET '.
+            $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber').
+            ', '.
             $this->buildMigrationPhoneNumberClause($carrier_code, 'mobilenumber')
         );
 
@@ -65,7 +63,7 @@ final class Version20220215135509 extends AbstractMigration implements Container
         $this->addSql('COMMENT ON COLUMN chill_person_phone.phonenumber IS NULL');
 
         $this->addSql(
-            'UPDATE chill_person_phone SET ' .
+            'UPDATE chill_person_phone SET '.
             $this->buildMigrationPhoneNumberClause($carrier_code, 'phonenumber')
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php b/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php
index 9f42abdfe..a55d35fbe 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220926154347.php
@@ -51,7 +51,7 @@ final class Version20220926154347 extends AbstractMigration
 
         // check consistency of history on database side
         $this->addSql('ALTER TABLE chill_person_person_center_history ADD CHECK (startdate <= enddate)');
-        $this->addSql('ALTER TABLE chill_person_person_center_history ADD CONSTRAINT ' .
+        $this->addSql('ALTER TABLE chill_person_person_center_history ADD CONSTRAINT '.
             'chill_internal_person_person_center_history_not_overlaps EXCLUDE USING GIST(
               -- extension btree_gist required to include comparaison with integer
               person_id WITH =,
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20221014115500.php b/src/Bundle/ChillPersonBundle/migrations/Version20221014115500.php
index fe7b920d9..ec14dd8f0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20221014115500.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20221014115500.php
@@ -37,7 +37,7 @@ final class Version20221014115500 extends AbstractMigration
             ');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_step_history ADD CHECK (startDate <= endDate)');
 
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_step_history ADD CONSTRAINT ' .
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_step_history ADD CONSTRAINT '.
             'chill_internal_acp_steps_not_overlaps EXCLUDE USING GIST(
             -- extension btree_gist required to include comparaison with integer
               period_id WITH =,
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20230427102309.php b/src/Bundle/ChillPersonBundle/migrations/Version20230427102309.php
new file mode 100644
index 000000000..662c11d9a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20230427102309.php
@@ -0,0 +1,191 @@
+<?php
+
+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 Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230427102309 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Apply steps on confirmed and inactive accompanying periods';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // create a table to store "infos" temporarily (will be store in the view)
+        $this->addSql(<<<'SQL'
+        CREATE TEMPORARY TABLE acc_period_info AS
+            SELECT a.id                                                 AS accompanyingperiod_id,
+                   'Chill\PersonBundle\Entity\AccompanyingPeriod'::text AS relatedentity,
+                   a.id                                                 AS relatedentityid,
+                   NULL::integer                                        AS user_id,
+                   a.openingdate                                        AS infodate,
+                   'accompanying_period_start'::text                    AS discriminator,
+                   '{}'::jsonb                                          AS metadata
+            FROM chill_person_accompanying_period a
+            UNION
+            SELECT w.accompanyingperiod_id,
+                   'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'::text AS relatedentity,
+                   w.id                                                                        AS relatedentityid,
+                   cpapwr.user_id,
+                   w.enddate                                                                   AS infodate,
+                   'accompanying_period_work_end'::text                                        AS discriminator,
+                   '{}'::jsonb                                                                 AS metadata
+            FROM chill_person_accompanying_period_work w
+                     LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON w.id = cpapwr.accompanyingperiodwork_id
+            WHERE w.enddate IS NOT NULL
+            UNION
+            SELECT cpapw.accompanyingperiod_id,
+                   'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+                   e.id                                                                                  AS relatedentityid,
+                   e.updatedby_id                                                                        AS user_id,
+                   e.updatedat                                                                           AS infodate,
+                   'accompanying_period_work_evaluation_updated_at'::text                                AS discriminator,
+                   '{}'::jsonb                                                                           AS metadata
+            FROM chill_person_accompanying_period_work_evaluation e
+                     JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            WHERE e.updatedat IS NOT NULL
+            UNION
+            SELECT cpapw.accompanyingperiod_id,
+                   'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+                   e.id                                                                                  AS relatedentityid,
+                   cpapwr.user_id,
+                   e.maxdate                                                                             AS infodate,
+                   'accompanying_period_work_evaluation_start'::text                                     AS discriminator,
+                   '{}'::jsonb                                                                           AS metadata
+            FROM chill_person_accompanying_period_work_evaluation e
+                     JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+                     LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id
+            WHERE e.maxdate IS NOT NULL
+            UNION
+            SELECT cpapw.accompanyingperiod_id,
+                   'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+                   e.id                                                                                  AS relatedentityid,
+                   cpapwr.user_id,
+                   e.startdate                                                                           AS infodate,
+                   'accompanying_period_work_evaluation_start'::text                                     AS discriminator,
+                   '{}'::jsonb                                                                           AS metadata
+            FROM chill_person_accompanying_period_work_evaluation e
+                     JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+                     LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id
+            UNION
+            SELECT cpapw.accompanyingperiod_id,
+                   'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument'::text AS relatedentity,
+                   doc.id                                                                                        AS relatedentityid,
+                   doc.updatedby_id                                                                              AS user_id,
+                   doc.updatedat                                                                                 AS infodate,
+                   'accompanying_period_work_evaluation_document_updated_at'::text                               AS discriminator,
+                   '{}'::jsonb                                                                                   AS metadata
+            FROM chill_person_accompanying_period_work_evaluation_document doc
+                     JOIN chill_person_accompanying_period_work_evaluation e ON doc.accompanyingperiodworkevaluation_id = e.id
+                     JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            WHERE doc.updatedat IS NOT NULL
+            UNION
+            SELECT cpapw.accompanyingperiod_id,
+                   'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+                   e.id                                                                                  AS relatedentityid,
+                   cpapwr.user_id,
+                   e.maxdate                                                                             AS infodate,
+                   'accompanying_period_work_evaluation_max'::text                                       AS discriminator,
+                   '{}'::jsonb                                                                           AS metadata
+            FROM chill_person_accompanying_period_work_evaluation e
+                     JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+                     LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id
+            WHERE e.maxdate IS NOT NULL
+            UNION
+            SELECT w.accompanyingperiod_id,
+                   'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'::text AS relatedentity,
+                   w.id                                                                        AS relatedentityid,
+                   cpapwr.user_id,
+                   w.startdate                                                                 AS infodate,
+                   'accompanying_period_work_start'::text                                      AS discriminator,
+                   '{}'::jsonb                                                                 AS metadata
+            FROM chill_person_accompanying_period_work w
+                     LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON w.id = cpapwr.accompanyingperiodwork_id
+            UNION
+            SELECT activity.accompanyingperiod_id,
+                   'Chill\ActivityBundle\Entity\Activity'::text AS relatedentity,
+                   activity.id                                  AS relatedentityid,
+                   au.user_id,
+                   activity.date                                AS infodate,
+                   'activity_date'::text                        AS discriminator,
+                   '{}'::jsonb                                  AS metadata
+            FROM activity
+                     LEFT JOIN activity_user au ON activity.id = au.activity_id
+            WHERE activity.accompanyingperiod_id IS NOT NULL;
+        SQL);
+
+        // create a table to store oldest inactives
+        $this->addSql(<<<'SQL'
+            CREATE TEMPORARY TABLE inactive_long AS
+                SELECT a.accompanyingperiod_id, MAX(infodate) AS last_date
+                FROM acc_period_info a JOIN chill_person_accompanying_period acp ON acp.id = a.accompanyingperiod_id
+                WHERE
+                    NOT EXISTS (SELECT 1 FROM acc_period_info WHERE infodate > (NOW() - '2 years'::interval) AND acc_period_info.accompanyingperiod_id = a.accompanyingperiod_id)
+                    AND acp.step LIKE 'CONFIRMED'
+            GROUP BY accompanyingperiod_id;
+        SQL);
+
+        $this->addSql(<<<'SQL'
+            UPDATE chill_person_accompanying_period_step_history SET enddate = GREATEST(last_date + '2 years'::interval, startdate)
+                FROM inactive_long WHERE inactive_long.accompanyingperiod_id = period_id AND enddate IS NULL;
+        SQL);
+
+        $this->addSql(<<<'SQL'
+            INSERT INTO chill_person_accompanying_period_step_history (id, period_id, enddate, startdate, step, createdat, updatedat)
+                SELECT nextval('chill_person_accompanying_period_step_history_id_seq'), period_id, NULL, sq.g, 'CONFIRMED_INACTIVE_LONG', NOW(), NOW()
+                    FROM (SELECT GREATEST(MAX(startdate), MAX(enddate)) AS g, period_id FROM chill_person_accompanying_period_step_history GROUP BY period_id) AS sq
+                    JOIN inactive_long ON sq.period_id = inactive_long.accompanyingperiod_id
+        SQL);
+
+        $this->addSql(<<<'SQL'
+            UPDATE chill_person_accompanying_period a SET step = 'CONFIRMED_INACTIVE_LONG' FROM inactive_long inactive WHERE a.id = inactive.accompanyingperiod_id;
+        SQL);
+
+        $this->addSql(<<<'SQL'
+            DROP TABLE inactive_long
+        SQL);
+
+        $this->addSql(<<<'SQL'
+            CREATE TEMPORARY TABLE inactive_long AS
+                SELECT a.accompanyingperiod_id, MAX(infodate) AS last_date
+                FROM acc_period_info a JOIN chill_person_accompanying_period acp ON acp.id = a.accompanyingperiod_id
+                WHERE
+                    NOT EXISTS (SELECT 1 FROM acc_period_info WHERE infodate > (NOW() - '6 months'::interval) AND acc_period_info.accompanyingperiod_id = a.accompanyingperiod_id)
+                    AND acp.step LIKE 'CONFIRMED'
+            GROUP BY accompanyingperiod_id;
+        SQL);
+
+        $this->addSql(<<<'SQL'
+            UPDATE chill_person_accompanying_period_step_history SET enddate = GREATEST(last_date + '6 months'::interval, startdate)
+                FROM inactive_long WHERE inactive_long.accompanyingperiod_id = period_id AND enddate IS NULL;
+        SQL);
+
+        $this->addSql(<<<'SQL'
+            INSERT INTO chill_person_accompanying_period_step_history (id, period_id, enddate, startdate, step, createdat, updatedat)
+                SELECT nextval('chill_person_accompanying_period_step_history_id_seq'), period_id, NULL, sq.g, 'CONFIRMED_INACTIVE_SHORT', NOW(), NOW()
+                    FROM (SELECT GREATEST(MAX(startdate), MAX(enddate)) AS g, period_id FROM chill_person_accompanying_period_step_history GROUP BY period_id) AS sq
+                    JOIN inactive_long ON sq.period_id = inactive_long.accompanyingperiod_id
+        SQL);
+
+        $this->addSql(<<<'SQL'
+            UPDATE chill_person_accompanying_period a SET step = 'CONFIRMED_INACTIVE_SHORT' FROM inactive_long inactive WHERE a.id = inactive.accompanyingperiod_id;
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20230627130331.php b/src/Bundle/ChillPersonBundle/migrations/Version20230627130331.php
new file mode 100644
index 000000000..63f160997
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20230627130331.php
@@ -0,0 +1,36 @@
+<?php
+
+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 Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230627130331 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add constraint to force unicity on chill_person_accompanying_period_user_history';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history
+        ADD CONSTRAINT acc_period_user_history_not_overlaps
+        EXCLUDE USING GIST (accompanyingperiod_id with =, tsrange(startdate, enddate) with &&)
+        DEFERRABLE INITIALLY DEFERRED');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history DROP CONSTRAINT acc_period_user_history_not_overlaps');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20230628152138.php b/src/Bundle/ChillPersonBundle/migrations/Version20230628152138.php
new file mode 100644
index 000000000..240b99dbf
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20230628152138.php
@@ -0,0 +1,45 @@
+<?php
+
+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 Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230628152138 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'An accompanying period cannot have both a locaiton on a period and on an address';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('UPDATE chill_person_accompanying_period SET addresslocation_id = NULL
+                                        where personlocation_id IS NOT NULL AND addresslocation_id IS NOT NULL');
+        $this->addSql('INSERT INTO chill_person_accompanying_period_location_history
+            (id, period_id, startdate, enddate, createdat, personlocation_id, addresslocation_id, createdby_id)
+            SELECT nextval(\'chill_person_accompanying_period_location_history_id_seq\'), period_id, startdate, startdate, now(), null, addresslocation_id, null
+            FROM chill_person_accompanying_period_location_history
+            WHERE personlocation_id IS NOT NULL AND addresslocation_id IS NOT NULL
+            ');
+        $this->addSql('UPDATE chill_person_accompanying_period_location_history SET addresslocation_id = NULL WHERE addresslocation_id IS NOT NULL AND personlocation_id IS NOT NULL');
+
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT location_check CHECK (personlocation_id IS NULL OR addresslocation_id IS NULL)');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_location_history ADD CONSTRAINT location_check CHECK (personlocation_id IS NULL OR addresslocation_id IS NULL)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT location_check');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_location_history DROP CONSTRAINT location_check');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20230918115305.php b/src/Bundle/ChillPersonBundle/migrations/Version20230918115305.php
new file mode 100644
index 000000000..b127c146d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20230918115305.php
@@ -0,0 +1,36 @@
+<?php
+
+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 Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add isCanceledAccompanyingPeriod property to ClosingMotive.
+ */
+final class Version20230918115305 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add isCanceledAccompanyingPeriod property to ClosingMotive';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive ADD isCanceledAccompanyingPeriod BOOLEAN DEFAULT FALSE NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive DROP isCanceledAccompanyingPeriod');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20231002094521.php b/src/Bundle/ChillPersonBundle/migrations/Version20231002094521.php
new file mode 100644
index 000000000..c960ab8f8
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20231002094521.php
@@ -0,0 +1,60 @@
+<?php
+
+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 Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20231002094521 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Remove doublons in chill_person_accompanying_period_location_history and add a constraint on startdate / endDate by period';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(
+            <<<'SQL'
+            WITH doublons_ordered AS (
+                SELECT h2.id AS h2id, h2.createdAt AS h2createdAt, h2.startDate AS h2start, h2.endDate AS h2end, h1.*,
+                       rank() OVER (partition by h1.period_id ORDER BY h1.id, h2.id) AS ranking
+                FROM chill_person_accompanying_period_location_history h1
+                         JOIN chill_person_accompanying_period_location_history h2 ON h1.period_id = h2.period_id  AND h1.id <> h2.id
+                WHERE daterange(h1.startdate, h1.enddate) && daterange(h2.startdate, h2.enddate) ORDER BY h1.period_id, h1.id
+            ),
+            keep_only_first AS (
+                SELECT id FROM doublons_ordered WHERE ranking > 1
+            )
+            DELETE FROM chill_person_accompanying_period_location_history WHERE id IN (SELECT id FROM doublons_ordered);
+            SQL
+        );
+
+        $this->addSql(
+            <<<'SQL'
+                    ALTER TABLE chill_person_accompanying_period_location_history
+                    ADD CONSTRAINT acc_period_location_history_not_overlaps
+                    EXCLUDE USING GIST (period_id with =, tsrange(startdate, enddate) with &&)
+                    DEFERRABLE INITIALLY DEFERRED
+            SQL
+        );
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(
+            <<<'SQL'
+            ALTER TABLE chill_person_accompanying_period_location_history DROP CONSTRAINT acc_period_location_history_not_overlaps
+            SQL
+        );
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20231004142738.php b/src/Bundle/ChillPersonBundle/migrations/Version20231004142738.php
new file mode 100644
index 000000000..0c9840fff
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20231004142738.php
@@ -0,0 +1,85 @@
+<?php
+
+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 Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20231004142738 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'keep an history of accompanying period work referrer';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_work_referrer_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT fk_3619f5ebb99f6060');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT FK_3619F5EBA76ED395');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT chill_person_accompanying_period_work_referrer_pkey');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD id INT NOT NULL DEFAULT nextval(\'chill_person_accompanying_period_work_referrer_id_seq\')');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD endDate DATE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD startDate DATE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER accompanyingperiodwork_id DROP NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER user_id DROP NOT NULL');
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.endDate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.startDate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBC55C1209 FOREIGN KEY (accompanyingPeriodWork_id) REFERENCES chill_person_accompanying_period_work (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EBA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD PRIMARY KEY (id)');
+        $this->addSql('ALTER INDEX idx_3619f5ebb99f6060 RENAME TO IDX_3619F5EBC55C1209');
+
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL;');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL;');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD createdBy_id INT DEFAULT NULL;');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD updatedBy_id INT DEFAULT NULL;');
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.endDate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.startDate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_referrer.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EB3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT FK_3619F5EB65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('CREATE INDEX IDX_3619F5EB3174800F ON chill_person_accompanying_period_work_referrer (createdBy_id);');
+        $this->addSql('CREATE INDEX IDX_3619F5EB65FF1AEC ON chill_person_accompanying_period_work_referrer (updatedBy_id);');
+
+        // set a default date on startDate
+        $this->addSql('UPDATE chill_person_accompanying_period_work_referrer r SET startdate=w.startdate FROM chill_person_accompanying_period_work w WHERE w.id = r.accompanyingperiodwork_id');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER startDate SET NOT NULL');
+
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT cpapwr_start_date_before_end CHECK (startdate <= enddate OR enddate IS NULL)');
+
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer
+            ADD CONSTRAINT acc_period_work_ref_history_not_overlaps
+            EXCLUDE USING GIST (accompanyingperiodwork_id with =, user_id with =, tsrange(startdate, enddate) with &&)
+            DEFERRABLE INITIALLY DEFERRED');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_referrer_id_seq CASCADE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT FK_3619F5EBC55C1209');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT fk_3619f5eba76ed395');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT cpapwr_start_date_before_end');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT acc_period_work_ref_history_not_overlaps');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP CONSTRAINT chill_person_accompanying_period_work_referrer_pkey');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP id');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP endDate');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer DROP startDate');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER user_id SET NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ALTER accompanyingPeriodWork_id SET NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD CONSTRAINT fk_3619f5ebb99f6060 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_referrer ADD CONSTRAINT fk_3619f5eba76ed395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_referrer ADD PRIMARY KEY (accompanyingperiodwork_id, user_id)');
+        $this->addSql('ALTER INDEX idx_3619f5ebc55c1209 RENAME TO idx_3619f5ebb99f6060');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index 091b9232f..a8d2080fb 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -135,3 +135,22 @@ exports:
     by_person:
         Filtered by person\'s geographical unit (based on address) computed at date, only units:
             "Filtré par zone géographique sur base de l'adresse, calculé à {datecalc, date, short}, seulement les zones suivantes: {units}"
+    filter:
+        work:
+            by_treating_agent:
+                Filtered by treating agent at date: >-
+                    Les agents traitant au { agent_at, date, medium }, seulement {agents}
+'total persons matching the search pattern': >-
+    { total, plural,
+        =0 {Aucun usager ne correspond aux termes de recherche}
+        one {Un usager correspond aux termes de recherche}
+        many {# usagers correspondent aux terms de recherche}
+        other {# usagers correspondent aux terms de recherche}
+    }
+
+'nb person with similar name. Please verify that this is a new person': >-
+    { nb, plural,
+        =0 {Aucun usager n'a un nom similaire}
+        one {Un usager a un nom similaire. Vérifiez qu'il ne s'agit pas de lui.}
+        other {# usagers ont un nom similaire. Vérifiez qu'il ne s'agit pas de l'un d'eux}
+    }
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index d33957ea7..097b5e79f 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -57,7 +57,7 @@ Add new phone: Ajouter un numéro de téléphone
 Remove phone: Supprimer
 'Notes on contact information': 'Remarques sur les informations de contact'
 'Remarks': 'Remarques'
-'Spoken languages': 'Langues parlées'
+Spoken languages': 'Langues parlées'
 'Unknown spoken languages': 'Langues parlées inconnues'
 Male: Homme
 Female: Femme
@@ -151,14 +151,12 @@ Reset: 'Remise à zéro'
 'Add a person': 'Ajout d''un usager'
 'Person Menu': 'Menu usager'
 'The person data are not valid': 'Les données de votre formulaire sont invalides.'
-'%nb% person with similar name. Please verify that this is a new person': '{1} Une usager a un nom similaire. Vérifiez qu''il ne s''agit pas d''elle. | ]1, Inf] %nb% usagers ont un nom similaire. Vérifiez qu''il ne s''agit pas de l''une d''elles.'
 'The person has been created': 'Le dossier a été créé'
 'Person search results': 'Recherche de usagers'
 Person search results by phonenumber: Recherche d'usager par numéro de téléphone
 'Search within persons': 'Recherche parmi les usagers'
 Open person file: Ouvrir le dossier de l'usager
 and %number% other: '{0} et aucun autre| {1} et une autre |]1, Inf] et %number% autres'
-'%total% persons matching the search pattern:': '{0} Aucune usager ne correspond aux termes de recherche : | {1} Un usager a été trouvé par la recherche : | ]1,Inf] %total% usagers correspondent aux termes de recherche :'
 'Last opening since %last_opening%': 'Dernière ouverture le %last_opening%.'
 'Person accompanying period - %name%': 'Historique du dossier - %name%'
 'Opening date': 'Date d''ouverture'
@@ -237,8 +235,12 @@ No referrer: Pas d'agent traitant
 Some peoples does not belong to any household currently. Add them to an household soon: Certains usagers n'appartiennent à aucun ménage actuellement. Renseignez leur 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
-course.closed: Clôturé
+course:
+    draft: Brouillon
+    closed: Clôturé
+    inactive_short: Hors file active
+    inactive_long: Pré-archivé
+    confirmed: Confirmé
 Origin: Origine de la demande
 Delete accompanying period: Supprimer le parcours d'accompagnement
 Are you sure you want to remove the accompanying period "%id%" ?:  Êtes-vous sûr de vouloir supprimer le parcours d'accompagnement %id% ?
@@ -325,8 +327,9 @@ CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE: Créer un parcours d'accompagnement
 CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE: Modifier un parcours d'accompagnement
 CHILL_PERSON_ACCOMPANYING_PERIOD_FULL: Voir les détails, créer, supprimer et mettre à jour un parcours d'accompagnement
 CHILL_PERSON_ACCOMPANYING_COURSE_REASSIGN_BULK: Réassigner les parcours en lot
-CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS: Voir les détails  d'un parcours d'accompagnement
+CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS: Voir les détails d'un parcours d'accompagnement
 CHILL_PERSON_ACCOMPANYING_PERIOD_STATS: Statistiques sur les parcours d'accompagnement
+CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_CONFIDENTIAL: Voir les parcours confidentiels
 
 CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE: Créer une action d'accompagnement
 CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE: Supprimer une action d'accompagnement
@@ -344,6 +347,9 @@ CHILL_PERSON_HOUSEHOLD_STATS: Statistiques sur les ménages
 #period
 Period closed!: Parcours clôturé!
 Pediod closing form is not valide: Le formulaire de fermeture n'est pas valide
+Consider canceled: Permet de considérer les parcours comme annulés
+Canceled parcours help: Si coché, les parcours avec ce motif de cloture seront considérés comme annulés et ne seront pas pris en compte pour les statistiques. La modification se reflétera pour tous les motifs enfants
+( Canceled period ): (annulé)
 
 #widget
 
@@ -368,7 +374,7 @@ Count people participating in an accompanying course by various parameters.: Com
 Exports of accompanying courses: Exports des parcours d'accompagnement
 Count accompanying courses: Nombre de parcours
 Count accompanying courses by various parameters: Compte le nombre de parcours en fonction de différents filtres.
-Accompanying courses participation duration and number of participations: Durée moyenne et nombre des participation des usagers aux parcours
+Accompanying courses participation duration and number of participations: Durée moyenne et nombre des participations des usagers aux parcours
 Create an average of accompanying courses duration of each person participation to accompanying course, according to filters on persons, accompanying course: Crée un rapport qui comptabilise la moyenne de la durée de participation de chaque usager concerné aux parcours, avec différents filtres, notamment sur les usagers concernés.
 Closingdate to apply: Date de fin à prendre en compte lorsque le parcours n'est pas clotûré
 
@@ -455,21 +461,11 @@ Filtered by person having an activity between %date_from% and %date_to% with rea
 
 
 ## accompanying course filters/aggr
-Filter by user scope: Filtrer les parcours par service du référent
-"Filtered by user main scope: only %scope%": "Filtré par service du référent: uniquement %scope%"
-
-Group course by scope: Grouper les parcours par service
-
-Filter by user job: Filtrer les parcours par métier du référent
-"Filtered by user job: only %job%": "Filtré par métier du référent: uniquement %job%"
-Group by user job: Grouper les parcours par métier du référent
-
 Filter by social issue: Filtrer les parcours par problématiques sociales
 Accepted socialissues: Problématiques sociales
 "Filtered by socialissues: only %socialissues%": "Filtré par problématique sociale: uniquement %socialissues%"
 Group by social issue: Grouper les parcours par problématiques sociales
 
-Filter by step: Filtrer les parcours par statut du parcours
 Accepted steps: Statuts
 Step: Statut
 "Filtered by steps: only %step%": "Filtré par statut du parcours: uniquement %step%"
@@ -552,22 +548,22 @@ is regular: le parcours est régulier
 Intensity: Intensité
 Group by intensity: Grouper les parcours par intensité
 
-Filter by active on date: Filtrer les parcours actifs à une date
-On date: Actifs à cette date
-"Filtered by actives courses: active on %ondate%": "Filtrer les parcours actifs: actifs le %ondate%"
+Filter by active on date: Filtrer les parcours ouverts à une date
+On date: A l'état ouvert à cette date
+"Filtered by actives courses: active on %ondate%": "Filtrer les parcours ouverts: actifs le %ondate%"
 
-Filter by active at least one day between dates: Filtrer les parcours actifs au moins un jour dans la période
-"Filtered by actives courses: at least one day between %datefrom% and %dateto%": "Filtrer les parcours actifs: au moins un jour entre le %datefrom% et le %dateto%"
+Filter by active at least one day between dates: Filtrer les parcours ouverts au moins un jour dans la période
+"Filtered by actives courses: at least one day between %datefrom% and %dateto%": "Filtrer les parcours ouverts: au moins un jour entre le %datefrom% et le %dateto%"
 
 Filter by referrers: Filtrer les parcours par référent
 Accepted referrers: Référents
 "Filtered by referrer: only %referrers%": "Filtré par référent: uniquement %referrers%"
 Group by referrers: Grouper les parcours par référent
 
-Filter by opened between dates: Filtrer les parcours ouverts entre deux dates
+Filter by opened between dates: Filtrer les parcours dont la date d'ouverture est comprise entre deux dates
 Date from: Date de début
 Date to: Date de fin
-"Filtered by opening dates: between %datefrom% and %dateto%": "Filtrer les parcours ouverts entre deux dates: entre le %datefrom% et le %dateto%"
+"Filtered by opening dates: between %datefrom% and %dateto%": "Filtrer les parcours dont la date d'ouverture est comprise entre le %datefrom% et le %dateto%"
 
 Filter by temporary location: Filtrer les parcours avec une localisation temporaire
 Filter by which has no referrer: Filtrer les parcours sans référent
@@ -578,12 +574,9 @@ Filtered acp which has no actions: 'Filtré: uniquement les parcours qui n''ont
 Group by number of actions: Grouper les parcours par nombre d’actions
 Filter by creator: Filtrer les parcours par créateur
 'Filtered by creator: only %creators%': 'Filtré par créateur: uniquement %creators%'
-Filter by creator job: Filtrer les parcours par métier du créateur
-'Filtered by creator job: only %jobs%': 'Filtré par métier du créateur: uniquement %jobs%'
-Group by creator job: Grouper les parcours par métier du créateur
 
-Filter by current actions: Filtrer les actions en cours
-Filtered by current action: 'Filtré: uniquement les actions en cours (sans date de fin)'
+Filter actions without end date: Filtre les actions sans date de fin (ouvertes)
+Filtered actions without end date: 'Filtré: uniquement les actions sans date de fin (ouvertes)'
 Filter by start date evaluations: Filtrer les évaluations par date de début
 Filter by end date evaluations: Filtrer les évaluations par date de fin
 start period date: Date de début de la période
@@ -596,20 +589,8 @@ Filter by current evaluations: Filtrer les évaluations en cours
 'Filtered by geographic unit: computed at %date%, only in %units%': 'Filtré par unité géographique: adresse le %date%, seulement les unités %units%'
 
 ## social actions filters/aggr
-Filter by treating agent scope: Filtrer les actions par service de l'agent traitant
-"Filtered by treating agent scope: only %scopes%": "Filtré par service de l'agent traitant: uniquement %scopes%"
-Group by treating agent scope: Grouper les actions par service de l'agent traitant
-
 Filter by scope: Filtrer par service
 
-Filter by treating agent job: Filtrer les actions par métier de l'agent traitant
-"Filtered by treating agent job: only %jobs%": "Filtré par métier de l'agent traitant: uniquement %jobs%"
-Group by treating agent job: Grouper les actions par métier de l'agent traitant
-
-Filter by treating agent: Filtrer les actions par agent traitant
-Accepted agents: Agent traitant
-"Filtered by treating agent: only %agents%": "Filtré par agent traitant: uniquement %agents%"
-Group by treating agent: Grouper les actions par agent traitant
 
 Group social work actions by action type: Grouper les actions par type
 Group social work actions by goal: Grouper les actions par objectif
@@ -909,6 +890,9 @@ accompanying_course_work:
     social_evaluation: Évaluation
     private_comment: Commentaire privé
     timeSpent: Temps de rédaction
+    date_filter: Filtrer par date
+    types_filter: Filtrer par type d'action
+    user_filter: Filtrer par intervenant
 
 
 #
@@ -923,10 +907,10 @@ docgen:
     Accompanying period work: "Action d'accompagnement"
     Accompanying period work context: "Evaluation des actions d'accompagnement"
     Main person: Usager principal
-    person 1: Premièr usager
+    person 1: Premier usager
     person 2: Second usager
     Ask for main person: Demander à l'utilisateur de préciser l'usager principal
-    Ask for person 1: Demander à l'utilisateur de préciser le premièr usager
+    Ask for person 1: Demander à l'utilisateur de préciser le premier usager
     Ask for person 2: Demander à l'utilisateur de préciser le second usager
     A basic context for accompanying period: Contexte pour les parcours
     A context for accompanying period work: Contexte pour les actions d'accompagnement
@@ -994,6 +978,8 @@ notification:
     Notify referrer: Notifier le référent
     Notify any: Notifier d'autres utilisateurs
 
+personId: Identifiant de l'usager
+
 export:
     export:
         acp_stats:
@@ -1001,25 +987,33 @@ export:
             count_participations: Nombre de participations distinctes
             count_persons: Nombre d'usagers concernés distincts
             count_acps: Nombre de parcours distincts
+
         nb_household_with_course:
             Count households with accompanying course: Nombre de ménages impliqués dans un parcours
             Count households: Nombre de ménages
             Count accompanying periods: Nombre de parcours
             Count household with accompanying course by various parameters.: Compte le nombre de ménages impliqués dans un parcours selon différents filtres.
             Date of calculation of household members: Date à laquelle les membres du ménages sont comptabilisés
+
     aggregator:
         person:
             by_household_composition:
                 Household composition: Composition du ménage
                 Group course by household composition: Grouper les usagers par composition familiale
                 Calc date: Date de calcul de la composition du ménage
+            by_center:
+                title: Grouper les usagers par centre
+                at_date: Date de calcul du centre
+                center: Centre de l'usager
+
         course:
             by_referrer:
                 Computation date for referrer: Date à laquelle le référent était actif
             by_user_scope:
                 Group course by referrer's scope: Grouper les parcours par service du référent
-                Computation date for referrer: Date à laquelle le référent était actif
                 Referrer's scope: Service du référent de parcours
+            by_user_job:
+                Group by user job: Grouper les parcours par métier du référent
             duration:
                 day: Durée du parcours en jours
                 week: Durée du parcours en semaines
@@ -1029,12 +1023,37 @@ export:
                 Number of actions: Nombre d'actions
             by_creator_job:
                 Creator's job: Métier du créateur
+                Group by creator job: Grouper les parcours par métier du créateur
+            by_user_working:
+                title: Grouper les parcours par intervenant
+                user: Intervenant
+            by_job_working:
+                title: Grouper les parcours par métier de l'intervenant
+                job: Métier de l'intervenant
+                Calc date: Date de calcul du métier de l'intervenant
+            by_scope_working:
+                title: Grouper les parcours par service de l'intervenant
+                scope: Service de l'intervenant
+                Calc date: Date de calcul du service de l'intervenant
+            by_scope:
+                Group course by scope: Grouper les parcours par service
+
         course_work:
+            by_treating_agent:
+                Calc date: Référent à la date
+                Group by treating agent: Grouper les actions par agent traitant
             by_current_action:
                 Current action ?: Action en cours ?
                 Group by current actions: Grouper les actions en cours
                 Current action: Action en cours
                 Not current action: Action terminée
+            by_agent_scope:
+                Group by treating agent scope: Grouper les actions par service de l'agent traitant
+                Calc date: Date de calcul du service de l'agent traitant
+            by_agent_job:
+                Group by treating agent job: Grouper les actions par métier de l'agent traitant
+                Calc date: Date de calcul du métier de l'agent traitant
+
         eval:
             by_end_date:
                 Has end date ?: Évaluation en cours ?
@@ -1053,6 +1072,7 @@ export:
     filter:
         by_geog_unit:
             Filtered by person's geographical unit (based on address) computed at %datecalc%, only %units%: Filtré par unité géographique (sur base de l'adresse), calculé le %datecalc%, seulement %units%
+
         person:
             by_composition:
                 Filter by household composition: Filtrer les usagers par composition du ménage
@@ -1072,8 +1092,39 @@ export:
                 Status: Statut
 
         course:
+            having_info_within_interval:
+                title: Filter les parcours ayant reçu une intervention entre deux dates
+                start_date: Début de la période
+                end_date: Fin de la période
+                Only course with events between %startDate% and %endDate%: Seulement les parcours ayant reçu une intervention entre le %startDate% et le %endDate%
+            by_user_working:
+                title: Filter les parcours par intervenant, entre deux dates
+                'Filtered by user working on course: only %users%, between %start_date% and %end_date%': 'Filtré par intervenants sur le parcours: seulement %users%, entre le %start_date% et le %end_date%'
+                User working after: Intervention après le
+                User working before: Intervention avant le
+            by_job_working:
+                title: Filtrer les parcours par métier de l'intervenant, entre deux dates
+                'Filtered by job working on course: only %jobs%, between %start_date% and %end_date%': 'Filtré par métier des intervenants sur le parcours: seulement %jobs%, entre le %start_date% et le %end_date%'
+                Job working after: Intervention après le
+                Job working before: Intervention avant le
+                Calc date:
+            by_scope_working:
+                title: Filtrer les parcours par service de l'intervenant, entre deux dates
+                'Filtered by scope working on course: only %scopes%, between %start_date% and %end_date%': 'Filtré par service des intervenants sur le parcours: seulement %scopes%, entre le %start_date% et le %end_date%'
+                Scope working after: Intervention après le
+                Scope working before: Intervention avant le
+                Calc date:
+            by_step:
+                Filter by step: Filtrer les parcours par statut du parcours
+                Filter by step between dates: Filtrer les parcours par statut du parcours entre deux dates
+                steps: Statuts retenus
+                date_calc: Date de prise en compte du statut
+                date_from: Statuts acquis après cette date
+                date_to: Statuts acquis avant cette date
+                'Filtered by steps: only %step% and between %date_from% and %date_to%': 'Filtré par statut: seulement %step%, entre %date_from% et %date_to%'
             by_user_scope:
-                Computation date for referrer: Date à laquelle le référent était actif
+                Filter by user scope: Filtrer les parcours par service du référent
+                "Filtered by user main scope: only %scope%": "Filtré par service du référent: uniquement %scope%"
             by_referrer:
                 Computation date for referrer: Date à laquelle le référent était actif
             having_temporarily:
@@ -1082,29 +1133,72 @@ export:
                 Having a person's location: Ayant une localisation auprès d'un usager
                 Calculation date: Date de la localisation
             creator_job:
-                'Filtered by creator job: only %jobs%': 'Filtré par métier du créateur: seulement %jobs%'
+                Filter by creator job: Filtrer les parcours par métier du créateur
+                'Filtered by creator job: only %jobs%': "Filtré par métier du créateur: uniquement %jobs%"
+            by_user_job:
+                Filter by user job: Filtrer les parcours par métier du référent
+                "Filtered by user job: only %job%": "Filtré par métier du référent: uniquement %job%"
+
+        work:
+            start_between_dates:
+                title: Filtre les actions d'accompagnement dont la date d'ouverture est entre deux dates
+                start_date: Date de début
+                end_date: Date de fin
+                keep_null: Conserver les actions dont la date de début n'est pas indiquée
+                keep_null_help: Si coché, les actions dont la date de début est vide seront prises en compte. Si non coché, elles ne seront pas comptabilisée.
+                Only where start date is between %startDate% and %endDate%: Seulement les actions dont la date de début est entre le %startDate% et le %endDate%
+            end_between_dates:
+                title: Filtre les actions d'accompagnement dont la date de clotûre est entre deux dates (ou l'action est toujours ouverte)
+                start_date: Date de début
+                end_date: Date de fin
+                keep_null: Conserver les actions dont la date de fin n'est pas indiquée (actions en cours)
+                keep_null_help: Si coché, les actions dont la date de fin est vide seront prises en compte. Si non coché, elles ne seront pas comptabilisée.
+                Only where start date is between %startDate% and %endDate%: Seulement les actions dont la date de fin est entre le %startDate% et le %endDate%
+            by_user_job:
+                Filter by treating agent job: Filtrer les actions par métier de l'agent traitant
+                "Filtered by treating agent job: only %jobs%": "Filtré par métier de l'agent traitant: uniquement %jobs%"
+                Calc date: Date de calcul du métier de l'agent traitant
+            by_user_scope:
+                Filter by treating agent scope: Filtrer les actions par service de l'agent traitant
+                "Filtered by treating agent scope: only %scopes%": "Filtré par service de l'agent traitant: uniquement %scopes%"
+                Calc date: Date de calcul du service de l'agent traitant
+            by_treating_agent:
+                Filter by treating agent: Filtrer les actions par agent traitant
+                Accepted agents: Agent traitant
+                Calc date: Date à laquelle l'agent est en situation de désignation sur l'action
+                calc_date_help: Il s'agit de la date à laquelle l'agent est actif comme agent traitant de l'action, et non la date à la quelle l'agent est désigné comme agent traitant.
+                "Filtered by treating agent: only %agents%": "Filtré par agent traitant: uniquement %agents%"
+
     list:
         person_with_acp:
             List peoples having an accompanying period: Liste des usagers ayant un parcours d'accompagnement
+            List peoples having an accompanying period with period details: Liste des usagers concernés avec détail de chaque parcours
             Create a list of people having an accompaying periods, according to various filters.: Génère une liste des usagers ayant un parcours d'accompagnement, selon différents critères liés au parcours ou à l'usager
+            Create a list of people having an accompaying periods with details of period, according to various filters.: Génère une liste des usagers ayant un parcours d'accompagnement, selon différents critères liés au parcours ou à l'usager. Ajoute les détails du parcours à la liste.
+
         acp:
             List of accompanying periods: Liste des parcours d'accompagnements
             Generate a list of accompanying periods, filtered on different parameters.: Génère une liste des parcours d'accompagnement, filtrée sur différents paramètres.
             Date of calculation for associated elements: Date de calcul des éléments associés
             The associated referree, localisation, and other elements will be valid at this date: Les éléments associés, comme la localisation, le référent et d'autres éléments seront valides à cette date
-            id: Identifiant du parcours
+            acpId: Identifiant du parcours
             openingDate: Date d'ouverture du parcours
             closingDate: Date de fermeture du parcours
+            closingMotive: Motif de cloture
+            job: Métier
             confidential: Confidentiel
             emergency: Urgent
             intensity: Intensité
-            createdAt: Créé le
-            updatedAt: Dernière mise à jour le
+            acpCreatedAt: Créé le
+            acpUpdatedAt: Dernière mise à jour le
             acpOrigin: Origine du parcours
+            origin: Origine du parcours
             acpClosingMotive: Motif de fermeture
             acpJob: Métier du parcours
-            createdBy: Créé par
-            updatedBy: Dernière modification par
+            acpCreatedBy_id: Créé par (identifiant)
+            acpCreatedBy: Créé par
+            acpUpdatedBy_id: Dernière modificaton par (identifiant)
+            acpUpdatedBy: Dernière modification par
             administrativeLocation: Location administrative
             step: Etape
             stepSince: Dernière modification de l'étape
@@ -1112,7 +1206,7 @@ export:
             referrerSince: Référent depuis le
             locationIsPerson: Parcours localisé auprès d'un usager concerné
             locationIsTemp: Parcours avec une localisation temporaire
-            acpLocationPersonName: Usager auprès duquel le parcours est localisé
+            locationPersonName: Usager auprès duquel le parcours est localisé
             locationPersonId: Identifiant de l'usager auprès duquel le parcours est localisé
             acpaddress_fieldscountry: Pays de l'adresse
             isRequestorPerson: Le demandeur est-il un usager ?
@@ -1120,6 +1214,9 @@ export:
             acprequestorPerson: Nom du demandeur usager
             scopes: Services
             socialIssues: Problématiques sociales
+            requestorPerson: Demandeur (personne)
+            requestorThirdParty: Demandeur (tiers)
+
         eval:
             List of evaluations: Liste des évaluations
             Generate a list of evaluations, filtered on different parameters: Génère une liste des évaluations, filtrée sur différents paramètres.
@@ -1149,9 +1246,11 @@ export:
             createdBy: Créé par
             updatedBy: Modifié par
             timeSpent: Temps de rédaction (minutes)
+
         acpw:
             List of accompanying period works: Liste des actions
             List description: Génère une liste des actions d'accompagnement, filtrée sur différents paramètres.
+            Date of calculation for associated elements: Date de calcul des éléments associés
             help_description: L'agent traitant de l'action sera valide à cette date
             id: Identifiant de l'action
             startDate: Date de début
@@ -1177,6 +1276,7 @@ export:
             resultsTitle: Résultats
             evaluationsId: Identifiants des évaluations
             evaluationsTitle: Évaluations
+
         household:
             List household associated with accompanying period title: Liste des ménages impliqués dans un parcours
             List description: Génère la liste des ménages, filtrée selon divers paramètres.
@@ -1190,6 +1290,7 @@ export:
             compositionNumberOfChildren: Nombre d'enfants dans la composition
             compositionComment: Commentaire sur la composition
             compositionType: Type de composition
+
         acpaddress_fieldscountry: Pays  # addressHelper effect
 
 social_action:
@@ -1197,3 +1298,8 @@ social_action:
 
 social_issue:
     and children: et dérivés
+
+generic_doc:
+    filter:
+        keys:
+            accompanying_period_work_evaluation_document: Document des actions d'accompagnement
diff --git a/src/Bundle/ChillReportBundle/ChillReportBundle.php b/src/Bundle/ChillReportBundle/ChillReportBundle.php
index ef92fa192..76bc4c9b2 100644
--- a/src/Bundle/ChillReportBundle/ChillReportBundle.php
+++ b/src/Bundle/ChillReportBundle/ChillReportBundle.php
@@ -13,6 +13,4 @@ namespace Chill\ReportBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class ChillReportBundle extends Bundle
-{
-}
+class ChillReportBundle extends Bundle {}
diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php
index 0a62a4b33..a44b49c48 100644
--- a/src/Bundle/ChillReportBundle/Controller/ReportController.php
+++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php
@@ -17,16 +17,11 @@ 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.
@@ -64,11 +59,11 @@ class ReportController extends AbstractController
     /**
      * Create 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 containing the form data (from the newAction)
+     * @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.
+     * @return Response the web page
      */
     public function createAction($person_id, $cf_group_id, Request $request)
     {
@@ -90,7 +85,7 @@ class ReportController extends AbstractController
         $form = $this->createCreateForm($entity, $person, $cFGroup);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $entity->setCFGroup($cFGroup);
             $entity->setPerson($person);
 
@@ -107,10 +102,7 @@ class ReportController extends AbstractController
                         ->trans('Success : report created!')
                 );
 
-            return $this->redirect($this->generateUrl(
-                'report_view',
-                ['person_id' => $person_id, 'report_id' => $entity->getId()]
-            ));
+            return $this->redirectToRoute('report_view', ['person_id' => $person_id, 'report_id' => $entity->getId()]);
         }
 
         $this->get('session')
@@ -120,7 +112,7 @@ class ReportController extends AbstractController
                     ->trans('The form is not valid. The report has not been created !')
             );
 
-        return $this->render('ChillReportBundle:Report:new.html.twig', [
+        return $this->render('@ChillReport/Report/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
             'person' => $person,
@@ -130,12 +122,12 @@ class ReportController extends AbstractController
     /**
      * Display a form to edit an existing Report entity.
      *
-     * @param int|string $person_id The id of the person.
-     * @param int|string $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.
+     * @return Response the web page
      */
-    public function editAction($person_id, $report_id)
+    public function editAction(int|string $person_id, int|string $report_id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -143,16 +135,11 @@ class ReportController extends AbstractController
         $report = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$report) {
-            throw $this->createNotFoundException(
-                $this->get('translator')->trans('Unable to find this report.')
-            );
+            throw $this->createNotFoundException($this->get('translator')->trans('Unable to find this report.'));
         }
 
         if ((int) $person_id !== (int) $report->getPerson()->getId()) {
-            throw new RuntimeException(
-                $this->get('translator')->trans('This is not the report of the person.'),
-                1
-            );
+            throw new \RuntimeException($this->get('translator')->trans('This is not the report of the person.'), 1);
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_UPDATE', $report);
@@ -166,9 +153,9 @@ class ReportController extends AbstractController
             'element_id' => $report->getId(),
             'action' => 'edit',
         ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-        return $this->render('ChillReportBundle:Report:edit.html.twig', [
+        return $this->render('@ChillReport/Report/edit.html.twig', [
             'edit_form' => $editForm->createView(),
             'person' => $person,
         ]);
@@ -177,8 +164,8 @@ class ReportController extends AbstractController
     /**
      * Return a csv file with all the reports of a given type.
      *
-     * @param int $cf_group_id The id of the report type to export
-     * @param Request $request The request
+     * @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
      */
@@ -203,10 +190,10 @@ class ReportController extends AbstractController
     /**
      * List all the report entities for a given person.
      *
-     * @param int $person_id The id of the person.
-     * @param Request $request The request
+     * @param int     $person_id the id of the person
+     * @param Request $request   The request
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function listAction($person_id, Request $request)
     {
@@ -219,13 +206,13 @@ class ReportController extends AbstractController
         $reachableScopes = $this->authorizationHelper
             ->getReachableScopes(
                 $this->getUser(),
-                new Role('CHILL_REPORT_SEE'),
+                '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) ')
+                .'WHERE r.person = :person AND r.scope IN (:scopes) ')
             ->setParameter('person', $person)
             ->setParameter('scopes', $reachableScopes)
             ->getSingleScalarResult();
@@ -247,9 +234,9 @@ class ReportController extends AbstractController
             'element_class' => Report::class,
             'action' => 'list',
         ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-        return $this->render('ChillReportBundle:Report:list.html.twig', [
+        return $this->render('@ChillReport/Report/list.html.twig', [
             'reports' => $reports,
             'person' => $person,
             'paginator' => $paginator,
@@ -259,11 +246,11 @@ class ReportController extends AbstractController
     /**
      * 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
+     * @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.
+     * @return Response the web page
      */
     public function newAction($person_id, $cf_group_id, Request $request)
     {
@@ -292,13 +279,13 @@ class ReportController extends AbstractController
 
         $entity = new Report();
         $entity->setUser($this->get('security.token_storage')->getToken()->getUser());
-        $entity->setDate(new DateTime('now'));
+        $entity->setDate(new \DateTime('now'));
 
         $entity->setCFGroup($cFGroup);
 
         $form = $this->createCreateForm($entity, $person, $cFGroup);
 
-        return $this->render('ChillReportBundle:Report:new.html.twig', [
+        return $this->render('@ChillReport/Report/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
             'person' => $person,
@@ -308,10 +295,10 @@ class ReportController extends AbstractController
     /**
      * 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
+     * @param int     $person_id the id of the person
+     * @param Request $request   The request
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function selectReportTypeAction($person_id, Request $request)
     {
@@ -335,24 +322,14 @@ class ReportController extends AbstractController
         $cFGroupId = $request->query->get('cFGroup');
 
         if ($request->query->has('cFGroup')) {
-            return $this->redirect(
-                $this->generateUrl(
-                    'report_new',
-                    ['person_id' => $person_id, 'cf_group_id' => $cFGroupId]
-                )
-            );
+            return $this->redirectToRoute('report_new', ['person_id' => $person_id, 'cf_group_id' => $cFGroupId]);
         }
 
         $cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
-            ->findByEntity('Chill\ReportBundle\Entity\Report');
+            ->findByEntity(\Chill\ReportBundle\Entity\Report::class);
 
-        if (count($cFGroups) === 1) {
-            return $this->redirect(
-                $this->generateUrl(
-                    'report_new',
-                    ['person_id' => $person_id, 'cf_group_id' => $cFGroups[0]->getId()]
-                )
-            );
+        if (1 === \count($cFGroups)) {
+            return $this->redirectToRoute('report_new', ['person_id' => $person_id, 'cf_group_id' => $cFGroups[0]->getId()]);
         }
 
         $cFGroupsChoice = [];
@@ -373,7 +350,7 @@ class ReportController extends AbstractController
 
         $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($person_id);
 
-        return $this->render('ChillReportBundle:Report:select_report_type.html.twig', [
+        return $this->render('@ChillReport/Report/select_report_type.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
         ]);
@@ -385,33 +362,23 @@ class ReportController extends AbstractController
      *
      * @param Request $request The request
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function selectReportTypeForExportAction(Request $request)
     {
         $cFGroupId = $request->query->get('cFGroup');
 
         if ($request->query->has('cFGroup')) {
-            return $this->redirect(
-                $this->generateUrl(
-                    'report_export_list',
-                    ['cf_group_id' => $cFGroupId]
-                )
-            );
+            return $this->redirectToRoute('report_export_list', ['cf_group_id' => $cFGroupId]);
         }
 
         $em = $this->getDoctrine()->getManager();
 
         $cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
-            ->findByEntity('Chill\ReportBundle\Entity\Report');
+            ->findByEntity(\Chill\ReportBundle\Entity\Report::class);
 
-        if (count($cFGroups) === 1) {
-            return $this->redirect(
-                $this->generateUrl(
-                    'report_export_list',
-                    ['cf_group_id' => $cFGroups[0]->getId()]
-                )
-            );
+        if (1 === \count($cFGroups)) {
+            return $this->redirectToRoute('report_export_list', ['cf_group_id' => $cFGroups[0]->getId()]);
         }
 
         $cFGroupsChoice = [];
@@ -430,7 +397,7 @@ class ReportController extends AbstractController
             ])
             ->getForm();
 
-        return $this->render('ChillReportBundle:Report:select_report_type_for_export.html.twig', [
+        return $this->render('@ChillReport/Report/select_report_type_for_export.html.twig', [
             'form' => $form->createView(),
             'layout_name' => '@ChillMain/Export/layout.html.twig',
         ]);
@@ -439,10 +406,10 @@ class ReportController extends AbstractController
     /**
      * Web page for editing an existing report.
      *
-     * @param int $person_id The id of the person.
-     * @param int $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.
+     * @return Response the web page
      */
     public function updateAction($person_id, $report_id, Request $request)
     {
@@ -451,9 +418,7 @@ class ReportController extends AbstractController
         $report = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$report) {
-            throw $this->createNotFoundException(
-                $this->get('translator')->trans('Unable to find this report.')
-            );
+            throw $this->createNotFoundException($this->get('translator')->trans('Unable to find this report.'));
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_UPDATE', $report);
@@ -461,7 +426,7 @@ class ReportController extends AbstractController
         $editForm = $this->createEditForm($report);
         $editForm->handleRequest($request);
 
-        if ($editForm->isValid()) {
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
             $this->get('session')
@@ -479,12 +444,9 @@ class ReportController extends AbstractController
                 'element_id' => $report->getId(),
                 'action' => 'update',
             ]);
-            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+            $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-            return $this->redirect($this->generateUrl(
-                'report_view',
-                ['person_id' => $report->getPerson()->getId(), 'report_id' => $report_id]
-            ));
+            return $this->redirectToRoute('report_view', ['person_id' => $report->getPerson()->getId(), 'report_id' => $report_id]);
         }
 
         $this->get('session')
@@ -495,7 +457,7 @@ class ReportController extends AbstractController
                     ->trans('The form is not valid. The report has not been updated !')
             );
 
-        return $this->render('ChillReportBundle:Report:edit.html.twig', [
+        return $this->render('@ChillReport/Report/edit.html.twig', [
             'edit_form' => $editForm->createView(),
             'person' => $report->getPerson(),
         ]);
@@ -504,10 +466,10 @@ class ReportController extends AbstractController
     /**
      * Find and display a report.
      *
-     * @param int $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
+     * @param int $person_id the id of the person
      *
-     * @return Response The web page.
+     * @return Response the web page
      */
     public function viewAction($report_id, $person_id)
     {
@@ -518,9 +480,7 @@ class ReportController extends AbstractController
         $entity = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$entity || !$person) {
-            throw $this->createNotFoundException(
-                $this->get('translator')->trans('Unable to find this report.')
-            );
+            throw $this->createNotFoundException($this->get('translator')->trans('Unable to find this report.'));
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_SEE', $entity);
@@ -530,9 +490,9 @@ class ReportController extends AbstractController
             'element_id' => $entity->getId(),
             'action' => 'view',
         ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-        return $this->render('ChillReportBundle:Report:view.html.twig', [
+        return $this->render('@ChillReport/Report/view.html.twig', [
             'entity' => $entity,
             'person' => $person,
         ]);
@@ -542,11 +502,10 @@ class ReportController extends AbstractController
      * 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)
+    private function createCreateForm(Report $entity, Person $person, mixed $cFGroup)
     {
         return $this->createForm(ReportType::class, $entity, [
             'action' => $this->generateUrl(
@@ -556,7 +515,7 @@ class ReportController extends AbstractController
             ),
             'method' => 'POST',
             'cFGroup' => $cFGroup,
-            'role' => new Role('CHILL_REPORT_CREATE'),
+            'role' => 'CHILL_REPORT_CREATE',
             'center' => $person->getCenter(),
         ]);
     }
@@ -564,7 +523,7 @@ class ReportController extends AbstractController
     /**
      * Creates a form to edit a Report entity.
      *
-     * @param Report $entity The report to edit.
+     * @param Report $entity the report to edit
      *
      * @return \Symfony\Component\Form\Form The form
      */
@@ -578,7 +537,7 @@ class ReportController extends AbstractController
             ),
             'method' => 'PUT',
             'cFGroup' => $entity->getCFGroup(),
-            'role' => new Role('CHILL_REPORT_UPDATE'),
+            '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 5eebbaad1..e32b73544 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
@@ -16,8 +16,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function count;
-
 /**
  * Load CustomField for Report into database.
  */
@@ -68,15 +66,15 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
         ];
 
         for ($i = 0; 25 >= $i; ++$i) {
-            $cFType = $cFTypes[mt_rand(0, count($cFTypes) - 1)];
+            $cFType = $cFTypes[random_int(0, \count($cFTypes) - 1)];
 
             $customField = (new CustomField())
                 ->setSlug("cf_report_{$i}")
                 ->setType($cFType['type'])
                 ->setOptions($cFType['options'])
                 ->setName(['fr' => "CustomField {$i}"])
-                ->setOrdering(mt_rand(0, 1000) / 1000)
-                ->setCustomFieldsGroup($this->getReference('cf_group_report_' . (mt_rand(0, 3))));
+                ->setOrdering(random_int(0, 1000) / 1000)
+                ->setCustomFieldsGroup($this->getReference('cf_group_report_'.random_int(0, 3)));
 
             $manager->persist($customField);
         }
@@ -88,7 +86,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
 
     private function createExpectedFields(ObjectManager $manager)
     {
-        //report logement
+        // report logement
         $reportLogement = $this->getReference('cf_group_report_logement');
 
         $houseTitle = (new CustomField())
@@ -144,7 +142,7 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
             ->setCustomFieldsGroup($reportLogement);
         $manager->persist($descriptionLogement);
 
-        //report problems
+        // report problems
         $reportEducation = $this->getReference('cf_group_report_education');
 
         $title = (new CustomField())
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
index 47cc2511d..af2f06e69 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
@@ -44,9 +44,9 @@ class LoadCustomFieldsGroup extends AbstractFixture implements OrderedFixtureInt
         $this->addReference('cf_group_report_education', $report);
 
         for ($i = 0; 3 >= $i; ++$i) {
-            $report = $this->createReport($manager, ['fr' => 'ZZ Rapport aléatoire ' . $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();
@@ -62,11 +62,11 @@ class LoadCustomFieldsGroup extends AbstractFixture implements OrderedFixtureInt
         array $name,
         array $options = []
     ) {
-        echo $name['fr'] . " \n";
+        echo $name['fr']." \n";
 
         $cFGroup = (new CustomFieldsGroup())
             ->setName($name)
-            ->setEntity('Chill\ReportBundle\Entity\Report')
+            ->setEntity(\Chill\ReportBundle\Entity\Report::class)
             ->setOptions($options);
 
         $manager->persist($cFGroup);
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
index 29dff7eae..2aa175b80 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
@@ -18,8 +18,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-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.
@@ -40,10 +38,10 @@ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 printf("processing scope %s \n", $scope->getName()['en']);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             printf("denying power on administrative \n");
 
                             break 2; // we do not want any power on administrative
@@ -53,7 +51,7 @@ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        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
@@ -64,7 +62,7 @@ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
 
                 printf(
                     'Adding CHILL_REPORT_UPDATE & CHILL_REPORT_CREATE to %s '
-                        . "permission group, scope '%s' \n",
+                        ."permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
index 2148a370a..6c61b1914 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
@@ -16,30 +16,22 @@ use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
 use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ReportBundle\Entity\Report;
-use DateTime;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 use Faker\Factory as FakerFactory;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-
-use function count;
-use function in_array;
 
 /**
  * Load reports into DB.
  */
-class LoadReports extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
+final class LoadReports extends AbstractFixture implements OrderedFixtureInterface
 {
-    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
+    private readonly \Faker\Generator $faker;
 
-    /**
-     * @var \Faker\Generator
-     */
-    private $faker;
-
-    public function __construct()
-    {
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager
+    ) {
         $this->faker = FakerFactory::create('fr_FR');
     }
 
@@ -52,7 +44,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
     {
         $this->createExpected($manager);
 
-        //create random 2 times, to allow multiple report on some people
+        // create random 2 times, to allow multiple report on some people
         $this->createRandom($manager, 90);
         $this->createRandom($manager, 30);
 
@@ -61,7 +53,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
 
     private function createExpected(ObjectManager $manager)
     {
-        $charline = $this->container->get('doctrine.orm.entity_manager')
+        $charline = $this->entityManager
             ->getRepository(Person::class)
             ->findOneBy(['firstName' => 'Charline', 'lastName' => 'DEPARDIEU']);
 
@@ -69,7 +61,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
             $report = (new Report())
                 ->setPerson($charline)
                 ->setCFGroup($this->getReference('cf_group_report_logement'))
-                ->setDate(new DateTime('2015-01-05'))
+                ->setDate(new \DateTime('2015-01-05'))
                 ->setScope($this->getReference('scope_social'));
             $this->fillReport($report);
 
@@ -84,11 +76,11 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
         $people = $this->getPeopleRandom($percentage);
 
         foreach ($people as $person) {
-            //create a report, set logement or education report
+            // create a report, set logement or education report
             $report = (new Report())
                 ->setPerson($person)
                 ->setCFGroup(
-                    mt_rand(0, 10) > 5 ?
+                    random_int(0, 10) > 5 ?
                             $this->getReference('cf_group_report_logement') :
                             $this->getReference('cf_group_report_education')
                 )
@@ -100,18 +92,18 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
 
     private function fillReport(Report $report)
     {
-        //setUser
+        // setUser
         $usernameRef = array_rand(LoadUsers::$refs);
         $report->setUser(
             $this->getReference($usernameRef)
         );
 
-        //set date if null
-        if ($report->getDate() === null) {
-            //set date. 30% of the dates are 2015-05-01
-            $expectedDate = new DateTime('2015-01-05');
+        // set date if null
+        if (null === $report->getDate()) {
+            // set date. 30% of the dates are 2015-05-01
+            $expectedDate = new \DateTime('2015-01-05');
 
-            if (mt_rand(0, 100) < 30) {
+            if (random_int(0, 100) < 30) {
                 $report->setDate($expectedDate);
             } else {
                 $report->setDate($this->faker->dateTimeBetween('-1 year', 'now')
@@ -119,7 +111,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
             }
         }
 
-        //fill data
+        // fill data
         $datas = [];
 
         foreach ($report->getCFGroup()->getCustomFields() as $field) {
@@ -147,15 +139,15 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
 
     private function getPeopleRandom($percentage)
     {
-        $people = $this->container->get('doctrine.orm.entity_manager')
+        $people = $this->entityManager
             ->getRepository(Person::class)
             ->findAll();
 
-        //keep only a part ($percentage) of the people
+        // keep only a part ($percentage) of the people
         $selectedPeople = [];
 
         foreach ($people as $person) {
-            if (mt_rand(0, 100) < $percentage) {
+            if (random_int(0, 100) < $percentage) {
                 $selectedPeople[] = $person;
             }
         }
@@ -166,24 +158,24 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
     /**
      * pick a random choice.
      *
-     * @return string|string[] the array of slug if multiple, a single slug otherwise
+     * @return string|string[]
      */
-    private function getRandomChoice(CustomField $field)
+    private function getRandomChoice(CustomField $field): array|string
     {
         $choices = $field->getOptions()['choices'];
         $multiple = $field->getOptions()['multiple'];
         $other = $field->getOptions()['other'];
 
-        //add other if allowed
+        // add other if allowed
         if ($other) {
             $choices[] = ['slug' => '_other'];
         }
 
-        //initialize results
+        // initialize results
         $picked = [];
 
         if ($multiple) {
-            $numberSelected = mt_rand(1, count($choices) - 1);
+            $numberSelected = random_int(1, \count($choices) - 1);
 
             for ($i = 0; $i < $numberSelected; ++$i) {
                 $picked[] = $this->pickChoice($choices);
@@ -192,7 +184,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
             if ($other) {
                 $result = ['_other' => null, '_choices' => $picked];
 
-                if (in_array('_other', $picked, true)) {
+                if (\in_array('_other', $picked, true)) {
                     $result['_other'] = $this->faker->realText(70);
                 }
 
@@ -211,6 +203,8 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
                 return $result;
             }
         }
+
+        return $picked;
     }
 
     /**
@@ -226,7 +220,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
     /**
      * pick a choice within a 'choices' options (for choice type).
      *
-     * @return the slug of the selected choice
+     * @return string the slug of the selected choice
      */
     private function pickChoice(array $choices)
     {
diff --git a/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php b/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
index 9d8bf8fbe..a4d2a58d5 100644
--- a/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
+++ b/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
@@ -41,7 +41,7 @@ class ChillReportExtension extends Extension implements PrependExtensionInterfac
             'chill_custom_fields',
             ['customizables_entities' => [
                 [
-                    'class' => 'Chill\ReportBundle\Entity\Report',
+                    'class' => \Chill\ReportBundle\Entity\Report::class,
                     'name' => 'ReportEntity',
                     'options' => [
                         'summary_fields' => [
@@ -62,7 +62,7 @@ class ChillReportExtension extends Extension implements PrependExtensionInterfac
         $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');
diff --git a/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
index 565ff08a7..70c9f532b 100644
--- a/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
@@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_report');
-        $rootNode = $treeBuilder->getRootNode('chill_report');
+        $rootNode = $treeBuilder->getRootNode();
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for
diff --git a/src/Bundle/ChillReportBundle/Entity/Report.php b/src/Bundle/ChillReportBundle/Entity/Report.php
index 4422fc9e6..1db2ed080 100644
--- a/src/Bundle/ChillReportBundle/Entity/Report.php
+++ b/src/Bundle/ChillReportBundle/Entity/Report.php
@@ -25,56 +25,52 @@ use Doctrine\ORM\Mapping as ORM;
  * Class Report.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="report")
+ *
  * @ORM\HasLifecycleCallbacks
  */
 class Report implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var array
      * @ORM\Column(type="json")
      */
-    private $cFData;
+    private ?array $cFData = null;
 
     /**
-     * @var CustomFieldsGroup
      * @ORM\ManyToOne(
      * targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup")
      */
-    private $cFGroup;
+    private ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $cFGroup = null;
 
     /**
-     * @var DateTime
      * @ORM\Column(type="datetime")
      */
-    private $date;
+    private ?\DateTime $date = null;
 
     /**
-     * @var int
-     *
      * @ORM\Id
+     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var Person
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
-     * @var Scope
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
-    private $scope;
+    private ?\Chill\MainBundle\Entity\Scope $scope = null;
 
     /**
-     * @var User
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private $user;
+    private ?\Chill\MainBundle\Entity\User $user = null;
 
     /**
      * @return Center
@@ -106,10 +102,8 @@ class Report implements HasCenterInterface, HasScopeInterface
 
     /**
      * Get date.
-     *
-     * @return DateTime
      */
-    public function getDate()
+    public function getDate(): ?\DateTime
     {
         return $this->date;
     }
@@ -181,7 +175,7 @@ class Report implements HasCenterInterface, HasScopeInterface
     /**
      * Set date.
      *
-     * @param DateTime $date
+     * @param \DateTime $date
      *
      * @return Report
      */
diff --git a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
index 21606d807..1761e3522 100644
--- a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+++ b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
@@ -25,36 +25,16 @@ 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\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-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
 {
-    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',
@@ -66,23 +46,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
     protected array $slugs = [];
 
-    protected TranslatableStringHelper $translatableStringHelper;
-
-    protected TranslatorInterface $translator;
-
-    public function __construct(
-        CustomFieldsGroup $customfieldsGroup,
-        TranslatableStringHelper $translatableStringHelper,
-        TranslatorInterface $translator,
-        CustomFieldProvider $customFieldProvider,
-        EntityManagerInterface $em
-    ) {
-        $this->customfieldsGroup = $customfieldsGroup;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-        $this->customFieldProvider = $customFieldProvider;
-        $this->em = $em;
-    }
+    public function __construct(protected CustomFieldsGroup $customfieldsGroup, protected TranslatableStringHelper $translatableStringHelper, protected TranslatorInterface $translator, protected CustomFieldProvider $customFieldProvider, protected EntityManagerInterface $em) {}
 
     public function buildForm(FormBuilderInterface $builder)
     {
@@ -94,7 +58,6 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
                 $cf->getSlug();
         }
 
-        // Add a checkbox to select fields
         $builder->add('fields', ChoiceType::class, [
             'multiple' => true,
             'expanded' => true,
@@ -102,30 +65,23 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
             '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_') {
+                if (str_starts_with((string) $val, 'address_')) {
                     return ['data-display-target' => 'address_date'];
                 }
 
                 return [];
             },
-            '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') . ')';
-
-                    case '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") . ')';
-                }
+            'choice_label' => fn (string $key, string $label): string => match (substr($key, 0, 7)) {
+                'person_' => $this->translator->trans(substr($key, 7, \strlen($key) - 7)).
+                    ' ('.$this->translator->trans('Person').')',
+                'report_' => $this->translator->trans(\ucfirst(substr($key, 7, \strlen($key) - 7))).
+                    ' ('.$this->translator->trans('Report').')',
+                default => $label.
+                    ' ('.$this->translator->trans("Report's question").')',
             },
             'constraints' => [new Callback([
                 'callback' => static function ($selected, ExecutionContextInterface $context) {
-                    if (count($selected) === 0) {
+                    if (0 === \count($selected)) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
@@ -134,15 +90,18 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
             ])],
         ]);
 
-        // add a date  field for addresses
         $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 getFormDefaultData(): array
+    {
+        return ['address_date' => new \DateTime()];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_LIST];
@@ -175,14 +134,13 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
                     }
 
                     if ('person_birthdate' === $key) {
-                        $date = DateTime::createFromFormat('Y-m-d', $value);
+                        $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 (false === $date) {
-                        throw new Exception(sprintf('The value %s could '
-                            . 'not be converted to %s', $value, DateTime::class));
+                        throw new \Exception(sprintf('The value %s could not be converted to %s', $value, \DateTime::class));
                     }
 
                     return $date->format('d-m-Y');
@@ -252,7 +210,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
                 return function ($value) use ($key, $countryRepository) {
                     if ('_header' === $value) {
-                        return strtolower($key);
+                        return \strtolower($key);
                     }
 
                     if (null === $value) {
@@ -269,22 +227,22 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
             case 'person_address_country_name':
                 return function ($value) use ($key) {
                     if ('_header' === $value) {
-                        return strtolower($key);
+                        return \strtolower($key);
                     }
 
                     if (null === $value) {
                         return '';
                     }
 
-                    return $this->translatableStringHelper->localize(json_decode($value, true));
+                    return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR));
                 };
 
             default:
                 // for fields which are associated with person
-                if (in_array($key, $this->fields, true)) {
+                if (\in_array($key, $this->fields, true)) {
                     return static function ($value) use ($key) {
                         if ('_header' === $value) {
-                            return strtolower($key);
+                            return \strtolower($key);
                         }
 
                         return $value;
@@ -300,13 +258,13 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
         $fields = [];
 
         foreach ($data['fields'] as $key) {
-            if (in_array($key, $this->fields, true)) {
+            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 [...$fields, ...\array_keys($this->slugs)];
     }
 
     public function getResult($query, $data)
@@ -331,14 +289,11 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $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();
@@ -346,7 +301,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
         // 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'], true)) {
+            if (!\in_array($f, $data['fields'], true)) {
                 continue;
             }
 
@@ -354,7 +309,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
             switch ($f) {
                 case 'person_countryOfBirth':
                 case 'person_nationality':
-                    $suffix = substr($f, 7);
+                    $suffix = substr((string) $f, 7);
                     $qb->addSelect(sprintf('IDENTITY(person.%s) as %s', $suffix, $f));
 
                     break;
@@ -367,7 +322,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
                 case 'person_address_country_name':
                 case 'person_address_country_code':
                     // remove 'person_'
-                    $suffix = substr($f, 7);
+                    $suffix = substr((string) $f, 7);
 
                     $qb->addSelect(sprintf(
                         'GET_PERSON_ADDRESS_%s(person.id, :address_date) AS %s',
@@ -390,31 +345,22 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
                     break;
 
                 default:
-                    $prefix = substr($f, 0, 7);
-                    $suffix = substr($f, 7);
+                    $prefix = substr((string) $f, 0, 7);
+                    $suffix = substr((string) $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}");
-                    }
+                    match ($prefix) {
+                        'person_' => $qb->addSelect(sprintf('person.%s as %s', $suffix, $f)),
+                        'report_' => $qb->addSelect(sprintf('report.%s as %s', $suffix, $f)),
+                        // no break
+                        default => 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'], true)) {
+            if (!\in_array($cf->getSlug(), $data['fields'], true)) {
                 continue;
             }
 
@@ -464,7 +410,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
     public function supportsModifiers()
     {
-        return [Declarations::PERSON_IMPLIED_IN, Declarations::PERSON_TYPE, 'report'];
+        return [Declarations::PERSON_TYPE, 'report'];
     }
 
     public function validateForm($data, ExecutionContextInterface $context)
@@ -472,11 +418,11 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
         // get the field starting with address_
         $addressFields = array_filter(
             $this->fields,
-            static fn (string $el): bool => substr($el, 0, 8) === 'address_'
+            static fn (string $el): bool => str_starts_with($el, 'address_')
         );
 
         // check if there is one field starting with address in data
-        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
+        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
@@ -505,9 +451,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
     private function getCustomFields()
     {
         return array_filter($this->customfieldsGroup
-            ->getCustomFields()->toArray(), static function (CustomField $cf) {
-                return $cf->getType() !== 'title';
-            });
+            ->getCustomFields()->toArray(), static fn (CustomField $cf) => 'title' !== $cf->getType());
     }
 
     private function getLabelForCustomField($key, array $values, $data)
@@ -526,19 +470,19 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
             return $this->customFieldProvider
                 ->getCustomFieldByType($cf->getType())
-                ->render(json_decode($value, true), $cf, 'csv');
+                ->render(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR), $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);
+                $decoded = json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR);
 
                 if ('_header' === $value) {
                     $label = $cfType->getChoices($cf)[$slugChoice];
 
                     return $this->translatableStringHelper->localize($cf->getName())
-                            . ' | ' . $label;
+                            .' | '.$label;
                 }
 
                 if ('_other' === $slugChoice && $cfType->isChecked($cf, $slugChoice, $decoded)) {
@@ -554,7 +498,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
 
     private function slugToDQL($slug, $type = 'default', array $additionalInfos = [])
     {
-        $uid = 'slug_' . uniqid('', true);
+        $uid = 'slug_'.\uniqid('', true);
 
         $this->slugs[$uid] = [
             'slug' => $slug,
diff --git a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
index 79bad4f52..0346f2ab3 100644
--- a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
+++ b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
@@ -19,13 +19,7 @@ use Doctrine\ORM\Query\Expr;
 
 class ReportDateFilter implements FilterInterface
 {
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    public function __construct(
-        RollingDateConverterInterface $rollingDateConverter
-    ) {
-        $this->rollingDateConverter = $rollingDateConverter;
-    }
+    public function __construct(private readonly RollingDateConverterInterface $rollingDateConverter) {}
 
     public function addRole(): ?string
     {
@@ -67,19 +61,22 @@ class ReportDateFilter implements FilterInterface
     {
         $builder->add('date_from', PickRollingDateType::class, [
             'label' => 'Report is after this date',
-            'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
         ]);
 
         $builder->add('date_to', PickRollingDateType::class, [
             'label' => 'Report is before this date',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by report\'s date: '
-            . 'between %date_from% and %date_to%', [
+            .'between %date_from% and %date_to%', [
                 '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
                 '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
             ], ];
diff --git a/src/Bundle/ChillReportBundle/Form/ReportType.php b/src/Bundle/ChillReportBundle/Form/ReportType.php
index 435d894d9..8d6551443 100644
--- a/src/Bundle/ChillReportBundle/Form/ReportType.php
+++ b/src/Bundle/ChillReportBundle/Form/ReportType.php
@@ -88,14 +88,14 @@ class ReportType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\ReportBundle\Entity\Report',
+            'data_class' => \Chill\ReportBundle\Entity\Report::class,
         ]);
 
         $resolver->setRequired([
             'cFGroup',
         ]);
 
-        $resolver->setAllowedTypes('cFGroup', 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup');
+        $resolver->setAllowedTypes('cFGroup', \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class);
 
         $this->appendScopeChoicesOptions($resolver);
     }
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Search/results.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Search/results.html.twig
index 68367bebd..7960f7164 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Search/results.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Search/results.html.twig
@@ -1,22 +1,11 @@
-{#
- * 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/>.
-#}
 <h2>{{ 'Reports search results'|trans }}</h2>
 
-<p>{{ '%total% reports matching the search "%pattern%"'|transchoice( total, {'%pattern%': pattern, '%total%' : total}) }}</p>
+<p>
+    {{ 'total reports matching the search'|trans({'total' : total}) }}&nbsp;:
+    <a href="{{ path('chill_main_advanced_search', { "name": search_name, "q": pattern } ) }}" class="btn btn-sm">
+        <i class="fa fa-search" aria-hidden="true"></i> {{ pattern }}
+    </a>
+</p>
 
 {% if reports|length > 0 %}
     <table class="striped rounded">
diff --git a/src/Bundle/ChillReportBundle/Search/ReportSearch.php b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
index 55bbe9f66..4737edd99 100644
--- a/src/Bundle/ChillReportBundle/Search/ReportSearch.php
+++ b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
@@ -17,12 +17,8 @@ use Chill\MainBundle\Search\ParsingException;
 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 function array_key_exists;
 
 /**
  * Search amongst reports.
@@ -31,31 +27,15 @@ 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;
+    private readonly \Chill\MainBundle\Entity\User $user;
 
     public function __construct(
-        EntityManagerInterface $em,
-        AuthorizationHelper $helper,
+        private readonly EntityManagerInterface $em,
+        private readonly 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');
+            throw new \RuntimeException('an user must be associated with token');
         }
         $this->user = $tokenStorage->getToken()->getUser();
     }
@@ -72,7 +52,7 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 
     public function renderResult(array $terms, $start = 0, $limit = 50, array $options = [], $format = 'html')
     {
-        return $this->container->get('templating')->render('ChillReportBundle:Search:results.html.twig', [
+        return $this->container->get('templating')->render('@ChillReport/Search/results.html.twig', [
             'reports' => $this->getReports($terms, $start, $limit),
             'total' => $this->count($terms),
             'pattern' => $this->recomposePattern($terms, ['date'], 'report'),
@@ -86,10 +66,10 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 
     private function addACL(QueryBuilder $qb)
     {
-        //adding join
+        // adding join
         $qb->join('r.person', 'p');
 
-        $role = new Role('CHILL_REPORT_SEE');
+        $role = 'CHILL_REPORT_SEE';
         $reachableCenters = $this->helper->getReachableCenters($this->user, $role);
 
         $whereElement = $qb->expr()->orX();
@@ -97,19 +77,17 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 
         foreach ($reachableCenters as $center) {
             $reachableScopesId = array_map(
-                static function (Scope $scope) {
-                    return $scope->getId();
-                },
+                static fn (Scope $scope) => $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->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);
+            $qb->setParameter('center_'.$i, $center);
+            $qb->setParameter('reachable_scopes_'.$i, $reachableScopesId);
         }
 
         return $whereElement;
@@ -126,19 +104,19 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 
         $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 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 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)) {
+        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)) {
+        } elseif (\array_key_exists('_default', $terms)) {
             $query->andWhere($query->expr()->eq('r.date', ':date'))
                 ->setParameter('date', $this->parseDate($terms['_default']));
         }
@@ -167,7 +145,7 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
             ->orderBy('r.date', 'desc');
 
         $reportQuery = $qb->getQuery();
-        $reportQuery->setFetchMode('Chill\\ReportBundle\\Entity\\Report', 'person', \Doctrine\ORM\Mapping\ClassMetadata::FETCH_EAGER);
+        $reportQuery->setFetchMode(\Chill\ReportBundle\Entity\Report::class, '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 ae4d1be55..f93d140ee 100644
--- a/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
+++ b/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
@@ -19,17 +19,15 @@ use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\ReportBundle\Entity\Report;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
-use function in_array;
-
 class ReportVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const CREATE = 'CHILL_REPORT_CREATE';
+    final public const CREATE = 'CHILL_REPORT_CREATE';
 
-    public const LISTS = 'CHILL_REPORT_LISTS';
+    final public const LISTS = 'CHILL_REPORT_LISTS';
 
-    public const SEE = 'CHILL_REPORT_SEE';
+    final public const SEE = 'CHILL_REPORT_SEE';
 
-    public const UPDATE = 'CHILL_REPORT_UPDATE';
+    final public const UPDATE = 'CHILL_REPORT_UPDATE';
 
     /**
      * @var AuthorizationHelper
@@ -59,7 +57,7 @@ class ReportVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
     protected function supports($attribute, $subject)
     {
         if ($subject instanceof Report) {
-            return in_array($attribute, [
+            return \in_array($attribute, [
                 self::CREATE, self::UPDATE, self::SEE,
             ], true);
         }
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
index ea30084ae..a16653601 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
@@ -13,17 +13,14 @@ namespace Chill\ReportBundle\Tests\Controller;
 
 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.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ReportControllerNextTest extends WebTestCase
@@ -55,22 +52,18 @@ final class ReportControllerNextTest extends WebTestCase
             );
 
         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'");
+            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 = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
-            ->findBy(['entity' => 'Chill\ReportBundle\Entity\Report']);
-        //filter customFieldsGroup to get only "situation de logement"
+            ->findBy(['entity' => \Chill\ReportBundle\Entity\Report::class]);
+        // filter customFieldsGroup to get only "situation de logement"
         $filteredCustomFieldsGroupHouse = array_filter(
             $customFieldsGroups,
-            static function (CustomFieldsGroup $group) {
-                return in_array('Situation de logement', $group->getName(), true);
-            }
+            static fn (CustomFieldsGroup $group) => \in_array('Situation de logement', $group->getName(), true)
         );
         $this->group = $filteredCustomFieldsGroupHouse[0];
     }
@@ -87,7 +80,7 @@ final class ReportControllerNextTest extends WebTestCase
             403,
             $client->getResponse()->getStatusCode(),
             'assert that user for center b has a 403 status code when listing'
-                . 'reports on person from center a'
+                .'reports on person from center a'
         );
     }
 
@@ -109,7 +102,7 @@ final class ReportControllerNextTest extends WebTestCase
             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'
+                .'trying to watch a report from person from center a'
         );
     }
 
@@ -126,7 +119,7 @@ final class ReportControllerNextTest extends WebTestCase
             403,
             $clientCenterB->getResponse()->getStatusCode(),
             'assert that user is denied on trying to show a form "new" for'
-                . ' a person on another center'
+                .' a person on another center'
         );
     }
 
@@ -144,7 +137,7 @@ final class ReportControllerNextTest extends WebTestCase
             403,
             $client->getResponse()->getStatusCode(),
             'assert that user is denied on trying to show a form "new" for'
-                . ' a person on another center'
+                .' a person on another center'
         );
     }
 
@@ -154,7 +147,7 @@ final class ReportControllerNextTest extends WebTestCase
         $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);
@@ -176,7 +169,7 @@ final class ReportControllerNextTest extends WebTestCase
     /**
      * @return \Symfony\Component\DomCrawler\Form
      */
-    protected function getReportForm(Person $person, CustomFieldsGroup $group, Client $client)
+    protected function getReportForm(Person $person, CustomFieldsGroup $group, \Symfony\Component\BrowserKit\AbstractBrowser $client)
     {
         $url = sprintf(
             'fr/person/%d/report/cfgroup/%d/new',
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
index 6a6ee99f1..1259e4b5f 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
@@ -13,20 +13,17 @@ namespace Chill\ReportBundle\Tests\Controller;
 
 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.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ReportControllerTest extends WebTestCase
@@ -38,10 +35,7 @@ final class ReportControllerTest extends WebTestCase
      */
     private static $client;
 
-    /**
-     * @var \Doctrine\ORM\EntityManagerInterface
-     */
-    private static $em;
+    private static ?object $em = null;
 
     /**
      * @var CustomFieldsGroup
@@ -62,7 +56,7 @@ final class ReportControllerTest extends WebTestCase
         self::$em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
-        //get a random person
+        // get a random person
         self::$person = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository(\Chill\PersonBundle\Entity\Person::class)
@@ -74,21 +68,17 @@ final class ReportControllerTest extends WebTestCase
             );
 
         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'");
+            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 = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
-            ->findBy(['entity' => 'Chill\ReportBundle\Entity\Report']);
-        //filter customFieldsGroup to get only "situation de logement"
+            ->findBy(['entity' => \Chill\ReportBundle\Entity\Report::class]);
+        // filter customFieldsGroup to get only "situation de logement"
         $filteredCustomFieldsGroupHouse = array_filter(
             $customFieldsGroups,
-            static function (CustomFieldsGroup $group) {
-                return in_array('Situation de logement', $group->getName(), true);
-            }
+            static fn (CustomFieldsGroup $group) => \in_array('Situation de logement', $group->getName(), true)
         );
         self::$group = $filteredCustomFieldsGroupHouse[0];
 
@@ -121,6 +111,7 @@ final class ReportControllerTest extends WebTestCase
 
     /**
      * @return type
+     *
      * @depends testMenu
      */
     public function testChooseReportModelPage(Link $link)
@@ -132,14 +123,14 @@ final class ReportControllerTest extends WebTestCase
         $form = $crawlerAddAReportPage->selectButton('Créer un nouveau rapport')->form();
 
         $this->assertInstanceOf(
-            'Symfony\Component\DomCrawler\Form',
+            \Symfony\Component\DomCrawler\Form::class,
             $form,
             'I can see a form with a button "add a new report" '
         );
 
         $this->assertGreaterThan(
             1,
-            count($form->get(self::REPORT_NAME_FIELD)
+            \count($form->get(self::REPORT_NAME_FIELD)
                 ->availableOptionValues()),
             'I can choose between report models'
         );
@@ -162,11 +153,11 @@ final class ReportControllerTest extends WebTestCase
      *
      * @depends testNewReportPage
      */
-    public function testInvalidDate(Form $form)
+    public function testInvalidDate(Form $form): never
     {
         $client = $this->getAuthenticatedClient();
         $this->markTestSkipped('This test raise an error since symfony 2.7. '
-                . 'The user is not correctly reloaded from database.');
+                .'The user is not correctly reloaded from database.');
         $filledForm = $this->fillCorrectForm($form);
         $filledForm->get('chill_reportbundle_report[date]')->setValue('invalid date value');
 
@@ -211,7 +202,7 @@ final class ReportControllerTest extends WebTestCase
         $this->assertTrue($client->getResponse()->isSuccessful());
 
         $linkSee = $crawler->filter('.bt-view')->links();
-        $this->assertGreaterThan(0, count($linkSee));
+        $this->assertGreaterThan(0, \count($linkSee));
         $this->assertMatchesRegularExpression(sprintf(
             '|/fr/person/%s/report/[0-9]*/view$|',
             self::$person->getId(),
@@ -219,7 +210,7 @@ final class ReportControllerTest extends WebTestCase
         ), $linkSee[0]->getUri());
 
         $linkUpdate = $crawler->filter('.bt-update')->links();
-        $this->assertGreaterThan(0, count($linkUpdate));
+        $this->assertGreaterThan(0, \count($linkUpdate));
         $this->assertMatchesRegularExpression(sprintf(
             '|/fr/person/%s/report/[0-9]*/edit$|',
             self::$person->getId(),
@@ -246,16 +237,16 @@ final class ReportControllerTest extends WebTestCase
         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',
+            \Symfony\Component\DomCrawler\Link::class,
             $link,
             'There is a "add a report" link in menu'
         );
-        $this->assertContains(
+        $this->assertStringContainsString(
             sprintf(
                 '/fr/person/%d/report/select/type/for/creation',
                 self::$person->getId()
@@ -269,6 +260,7 @@ final class ReportControllerTest extends WebTestCase
 
     /**
      * @return type
+     *
      * @depends testChooseReportModelPage
      */
     public function testNewReportPage(Crawler $crawlerNewReportPage)
@@ -278,7 +270,7 @@ final class ReportControllerTest extends WebTestCase
             ->form();
 
         $this->assertInstanceOf(
-            'Symfony\Component\DomCrawler\Form',
+            \Symfony\Component\DomCrawler\Form::class,
             $addForm,
             'I have a report form'
         );
@@ -299,10 +291,10 @@ final class ReportControllerTest extends WebTestCase
             self::$group,
             $client
         );
-        //var_dump($form);
+        // var_dump($form);
         $filledForm = $this->fillCorrectForm($form);
         $filledForm->get('chill_reportbundle_report[date]')->setValue('');
-        //$this->markTestSkipped();
+        // $this->markTestSkipped();
         $crawler = $this->getAuthenticatedClient('center a_administrative')->submit($filledForm);
 
         $this->assertFalse($client->getResponse()->isRedirect());
@@ -331,7 +323,7 @@ final class ReportControllerTest extends WebTestCase
             ->form();
 
         $form->get('chill_reportbundle_report[date]')->setValue(
-            (new DateTime('yesterday'))->format('d-m-Y')
+            (new \DateTime('yesterday'))->format('d-m-Y')
         );
 
         $client->submit($form);
@@ -344,7 +336,7 @@ final class ReportControllerTest extends WebTestCase
             )
         ));
 
-        $this->assertEquals(new DateTime('yesterday'), self::$kernel->getContainer()
+        $this->assertEquals(new \DateTime('yesterday'), self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository('ChillReportBundle:Report')
             ->find($reportId)
@@ -360,7 +352,7 @@ final class ReportControllerTest extends WebTestCase
     public function testValidCreate()
     {
         $client = $this->getAuthenticatedClient();
-        //$this->markTestSkipped("This test raise an error since symfony 2.7. "
+        // $this->markTestSkipped("This test raise an error since symfony 2.7. "
         //        . "The user is not correctly reloaded from database.");
         $addForm = $this->getReportForm(self::$person, self::$group, $client);
         $filledForm = $this->fillCorrectForm($addForm);
@@ -373,7 +365,7 @@ final class ReportControllerTest extends WebTestCase
         $client->followRedirect();
 
         $this->assertMatchesRegularExpression(
-            '|/fr/person/' . self::$person->getId() . '/report/[0-9]*/view$|',
+            '|/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"
         );
@@ -381,7 +373,7 @@ final class ReportControllerTest extends WebTestCase
         $matches = [];
         preg_match(
             '|/report/([0-9]*)/view$|',
-            $client->getHistory()->current()->getUri(),
+            (string) $client->getHistory()->current()->getUri(),
             $matches
         );
 
@@ -419,7 +411,7 @@ final class ReportControllerTest extends WebTestCase
     protected function getReportForm(
         Person $person,
         CustomFieldsGroup $group,
-        \Symfony\Component\BrowserKit\Client $client
+        \Symfony\Component\BrowserKit\AbstractBrowser $client
     ) {
         $url = sprintf(
             'fr/person/%d/report/cfgroup/%d/new',
@@ -438,7 +430,7 @@ final class ReportControllerTest extends WebTestCase
     private function fillCorrectForm(Form $form)
     {
         $form->get('chill_reportbundle_report[date]')->setValue(
-            (new DateTime())->format('d-m-Y')
+            (new \DateTime())->format('d-m-Y')
         );
 
         return $form;
@@ -464,14 +456,14 @@ final class ReportControllerTest extends WebTestCase
             ->getType(), 'the user field is a select input');
 
         if ($isDefault) {
-            $date = new DateTime('now');
+            $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
+            // resolve the user
             $userId = $form->get('chill_reportbundle_report[user]')->getValue();
 
             $this->assertEquals(
diff --git a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
index 2b02159ca..ae01d8d90 100644
--- a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
@@ -11,11 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\ReportBundle\Tests\DependencyInjection;
 
-use Exception;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ChillReportExtensionTest extends KernelTestCase
@@ -23,6 +23,9 @@ final class ChillReportExtensionTest extends KernelTestCase
     /*
      * Check if class Chill\ReportBundle\Entity\Report is in chill_custom_fields.customizables_entities
      */
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testDeclareReportAsCustomizable()
     {
         self::bootKernel(['environment' => 'test']);
@@ -32,13 +35,13 @@ final class ChillReportExtensionTest extends KernelTestCase
         $reportFounded = false;
 
         foreach ($customizablesEntities as $customizablesEntity) {
-            if ('Chill\ReportBundle\Entity\Report' === $customizablesEntity['class']) {
+            if (\Chill\ReportBundle\Entity\Report::class === $customizablesEntity['class']) {
                 $reportFounded = true;
             }
         }
 
         if (!$reportFounded) {
-            throw new Exception('Class Chill\\ReportBundle\\Entity\\Report not found in chill_custom_fields.customizables_entities', 1);
+            throw new \Exception('Class Chill\\ReportBundle\\Entity\\Report not found in chill_custom_fields.customizables_entities', 1);
         }
     }
 }
diff --git a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
index 5076c861c..8125d5413 100644
--- a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php
@@ -11,14 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\ReportBundle\Tests\Export\Filter;
 
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\ReportBundle\Entity\Report;
 use Chill\ReportBundle\Export\Filter\ReportDateFilter;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReportDateFilterTest extends AbstractFilterTest
@@ -29,7 +30,7 @@ final class ReportDateFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.report.export.filter_date');
+        $this->filter = self::$container->get(ReportDateFilter::class);
     }
 
     public function getFilter()
@@ -41,17 +42,15 @@ final class ReportDateFilterTest extends AbstractFilterTest
     {
         return [
             [
-                'date_from' => DateTime::createFromFormat('Y-m-d', '2021-07-01'),
-                'date_to' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+                'date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
+                'date_to' => new RollingDate(RollingDate::T_TODAY),
             ],
         ];
     }
 
     public function getQueryBuilders(): array
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
diff --git a/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php b/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
index 294eccd03..6d001c0df 100644
--- a/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
@@ -11,13 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\ReportBundle\Tests\Search;
 
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * Test for report search.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class ReportSearchTest extends WebTestCase
@@ -27,7 +27,7 @@ final class ReportSearchTest extends WebTestCase
         $client = $this->getAuthenticatedClient();
 
         $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
+            'q' => '@report '.(new \DateTime('tomorrow'))->format('Y-m-d'), // there should be any result for future. And future is tomorrow
             'name' => 'report',
         ]);
 
@@ -96,18 +96,16 @@ final class ReportSearchTest extends WebTestCase
         $crawlerSocial = $clientSocial->request('GET', '/fr/search', $params);
         $crawlerAdministrative = $clientAdministrative->request('GET', '/fr/search', $params);
 
-        $this->assertNotContains('social', $crawlerAdministrative->filter('.content')
+        $this->assertStringNotContainsString('social', $crawlerAdministrative->filter('.content')
             ->text());
-        $this->assertNotContains('administrative', $crawlerAdministrative->filter('.content')
+        $this->assertStringNotContainsString('administrative', $crawlerAdministrative->filter('.content')
             ->text());
     }
 
     /**
-     * @param mixed $username
-     *
-     * @return \Symfony\Component\BrowserKit\Client
+     * @return \Symfony\Component\BrowserKit\AbstractBrowser
      */
-    private function getAuthenticatedClient($username = 'center a_social')
+    private function getAuthenticatedClient(mixed $username = 'center a_social')
     {
         return self::createClient([], [
             'PHP_AUTH_USER' => $username,
diff --git a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
index be32edc8d..5d4261d8a 100644
--- a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
@@ -23,6 +23,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ReportVoterTest extends KernelTestCase
@@ -43,9 +44,7 @@ final class ReportVoterTest extends KernelTestCase
      */
     protected $voter;
 
-    public static function setUpBeforeClass(): void
-    {
-    }
+    public static function setUpBeforeClass(): void {}
 
     protected function setUp(): void
     {
@@ -125,7 +124,6 @@ final class ReportVoterTest extends KernelTestCase
      * @dataProvider dataProvider
      *
      * @param type $expectedResult
-     * @param User $user
      * @param type $action
      * @param type $message
      */
@@ -134,7 +132,7 @@ final class ReportVoterTest extends KernelTestCase
         Report $report,
         $action,
         $message,
-        ?User $user = null
+        User $user = null
     ) {
         $token = $this->prepareToken($user);
         $result = $this->voter->vote($token, $report, [$action]);
@@ -159,15 +157,13 @@ final class ReportVoterTest extends KernelTestCase
      *
      * 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)
+    protected function prepareToken(User $user = null)
     {
         $token = $this->prophet->prophesize();
         $token
-            ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+            ->willImplement('\\'.\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
 
         if (null === $user) {
             $token->getUser()->willReturn(null);
diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
index 9f39fb87e..6e7a6dad1 100644
--- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
@@ -15,27 +15,20 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Tests\TestHelper as MainTestHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ReportBundle\Entity\Report;
-use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function count;
 
 /**
  * Test a report is shown into timeline.
  *
  * @internal
+ *
  * @coversNothing
  */
 final class TimelineProviderTest extends WebTestCase
 {
-    /**
-     * @var \Doctrine\ORM\EntityManager
-     */
-    private static $em;
+    private static ?object $em = null;
 
-    /**
-     * @var Person
-     */
-    private $person;
+    private \Chill\PersonBundle\Entity\Person $person;
 
     /**
      * @var Report
@@ -55,7 +48,7 @@ final class TimelineProviderTest extends WebTestCase
         $center = self::$em->getRepository(\Chill\MainBundle\Entity\Center::class)
             ->findOneBy(['name' => 'Center A']);
 
-        $person = (new Person(new DateTime('2015-05-01')))
+        $person = (new Person(new \DateTime('2015-05-01')))
             ->setGender(Person::FEMALE_GENDER)
             ->setFirstName('Nelson')
             ->setLastName('Mandela')
@@ -67,15 +60,13 @@ final class TimelineProviderTest extends WebTestCase
             self::$em
                 ->getRepository(\Chill\MainBundle\Entity\Scope::class)
                 ->findAll(),
-            static function (Scope $scope) {
-                return $scope->getName()['en'] === 'social';
-            }
+            static fn (Scope $scope) => 'social' === $scope->getName()['en']
         );
 
         $report = (new Report())
             ->setUser(self::$em->getRepository(\Chill\MainBundle\Entity\User::class)
                 ->findOneByUsername('center a_social'))
-            ->setDate(new DateTime('2015-05-02'))
+            ->setDate(new \DateTime('2015-05-02'))
             ->setPerson($this->person)
             ->setCFGroup($this->getHousingCustomFieldsGroup())
             ->setCFData(['has_logement' => 'own_house',
@@ -90,10 +81,10 @@ final class TimelineProviderTest extends WebTestCase
 
     protected function tearDown(): void
     {
-        //static::$em->refresh($this->person);
-        //static::$em->refresh($this->report);
+        // static::$em->refresh($this->person);
+        // static::$em->refresh($this->report);
         // static::$em->remove($this->person);
-        //static::$em->remove($this->report);
+        // static::$em->remove($this->report);
     }
 
     public function testReportIsNotVisibleToUngrantedUsers()
@@ -103,8 +94,8 @@ final class TimelineProviderTest extends WebTestCase
             MainTestHelper::getAuthenticatedClientOptions('center a_administrative')
         );
 
-        $crawler = $client->request('GET', '/fr/person/' . $this->person->getId()
-              . '/timeline');
+        $crawler = $client->request('GET', '/fr/person/'.$this->person->getId()
+              .'/timeline');
 
         $this->assertEquals(
             0,
@@ -124,14 +115,14 @@ final class TimelineProviderTest extends WebTestCase
             MainTestHelper::getAuthenticatedClientOptions()
         );
 
-        $crawler = $client->request('GET', '/fr/person/' . $this->person->getId()
-              . '/timeline');
+        $crawler = $client->request('GET', '/fr/person/'.$this->person->getId()
+              .'/timeline');
 
         $this->assertTrue(
             $client->getResponse()->isSuccessful(),
             'The page timeline is loaded successfully'
         );
-        $this->assertContains(
+        $this->assertStringContainsString(
             'a ajouté un rapport',
             $crawler->text(),
             'the page contains the text "a publié un rapport"'
@@ -140,16 +131,16 @@ final class TimelineProviderTest extends WebTestCase
 
     public function testTimelineReportWithSummaryField()
     {
-        //load the page
+        // load the page
         $client = self::createClient(
             [],
             MainTestHelper::getAuthenticatedClientOptions()
         );
 
-        $crawler = $client->request('GET', '/fr/person/' . $this->person->getId()
-              . '/timeline');
+        $crawler = $client->request('GET', '/fr/person/'.$this->person->getId()
+              .'/timeline');
 
-        //performs tests
+        // performs tests
         $this->assertTrue(
             $client->getResponse()->isSuccessful(),
             'The page timeline is loaded successfully'
@@ -160,18 +151,8 @@ final class TimelineProviderTest extends WebTestCase
                 ->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"'
-        );
+        $this->assertSelectorTextContains('.report_entry .summary', 'blah blah', 'the page contains the text "blah blah"');
+        $this->assertSelectorTextContains('.report_entry .summary', 'Propriétaire', 'the page contains the mention "Propriétaire"');
     }
 
     /**
@@ -186,11 +167,11 @@ final class TimelineProviderTest extends WebTestCase
             ->findAll();
 
         foreach ($groups as $group) {
-            if ($group->getName()['fr'] === 'Situation de logement') {
+            if ('Situation de logement' === $group->getName()['fr']) {
                 return $group;
             }
         }
 
-        return $groups[mt_rand(0, count($groups) - 1)];
+        return $groups[random_int(0, \count($groups) - 1)];
     }
 }
diff --git a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
index 900920a7f..17b600149 100644
--- a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+++ b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
@@ -18,46 +18,14 @@ 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.
  */
 class TimelineReportProvider implements TimelineProviderInterface
 {
-    protected CustomFieldsHelper $customFieldsHelper;
-
-    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;
-    }
+    public function __construct(protected EntityManager $em, protected AuthorizationHelper $helper, private readonly Security $security, protected CustomFieldsHelper $customFieldsHelper, protected $showEmptyValues) {}
 
     public function fetchQuery($context, array $args)
     {
@@ -68,10 +36,10 @@ class TimelineReportProvider implements TimelineProviderInterface
 
         return TimelineSingleQuery::fromArray([
             'id' => $report->getTableName()
-                 . '.' . $report->getColumnName('id'),
+                 .'.'.$report->getColumnName('id'),
             'type' => 'report',
             'date' => $report->getTableName()
-                 . '.' . $report->getColumnName('date'),
+                 .'.'.$report->getColumnName('date'),
             'FROM' => $this->getFromClause($context),
             'WHERE' => $where,
             'parameters' => $parameters,
@@ -97,7 +65,7 @@ class TimelineReportProvider implements TimelineProviderInterface
         $this->checkContext($context);
 
         return [
-            'template' => 'ChillReportBundle:Timeline:report.html.twig',
+            'template' => '@ChillReport/Timeline/report.html.twig',
             'template_data' => [
                 'report' => $entity,
                 'context' => $context,
@@ -113,17 +81,17 @@ class TimelineReportProvider implements TimelineProviderInterface
 
     protected function getFieldsToRender(Report $entity, $context, array $args = [])
     {
-        //gather all custom fields which should appears in summary
+        // gather all custom fields which should appears in summary
         $gatheredFields = [];
 
-        if (array_key_exists('summary_fields', $entity->getCFGroup()->getOptions())) {
+        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(
+                    \in_array(
                         $customField->getSlug(),
                         $entity->getCFGroup()->getOptions()['summary_fields'],
                         true
@@ -131,7 +99,7 @@ class TimelineReportProvider implements TimelineProviderInterface
                 ) {
                     // if we do not want to show empty values
                     if (false === $this->showEmptyValues) {
-                        if ($customField->getType() === 'title') {
+                        if ('title' === $customField->getType()) {
                             $options = $customField->getOptions();
 
                             switch ($options['type']) {
@@ -147,8 +115,8 @@ class TimelineReportProvider implements TimelineProviderInterface
                             }
                         } else {
                             if (
-                                $this->customFieldsHelper->isEmptyValue($entity->getCFData(), $customField)
-                                === false
+                                false
+                                === $this->customFieldsHelper->isEmptyValue($entity->getCFData(), $customField)
                             ) {
                                 if (null !== $title) {
                                     $gatheredFields[] = $title;
@@ -177,13 +145,12 @@ class TimelineReportProvider implements TimelineProviderInterface
      *
      * @param string $context
      *
-     * @throws LogicException if the context is not supported
+     * @throws \LogicException if the context is not supported
      */
     private function checkContext($context)
     {
         if ('person' !== $context && 'center' !== $context) {
-            throw new LogicException("The context '{$context}' is not "
-                  . "supported. Currently only 'person' and 'center' is supported");
+            throw new \LogicException("The context '{$context}' is not supported. Currently only 'person' and 'center' is supported");
         }
     }
 
@@ -196,10 +163,10 @@ class TimelineReportProvider implements TimelineProviderInterface
         $personId = $report
             ->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName'];
 
-        $clause = '{report} ' .
+        $clause = '{report} '.
             'JOIN {person} ON {report}.{person_id} = {person}.{id_person} ';
 
-        return strtr(
+        return \strtr(
             $clause,
             [
                 '{report}' => $report->getTableName(),
@@ -212,16 +179,11 @@ class TimelineReportProvider implements TimelineProviderInterface
 
     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");
-        }
+        return match ($context) {
+            'person' => $this->getWhereClauseForPerson($context, $args),
+            'center' => $this->getWhereClauseForCenter($context, $args),
+            default => throw new \UnexpectedValueException("This context {$context} is not implemented"),
+        };
     }
 
     private function getWhereClauseForCenter(string $context, array $args): array
@@ -239,7 +201,7 @@ class TimelineReportProvider implements TimelineProviderInterface
         $parameters = [];
 
         // the clause, that will be joined with an "OR"
-        $centerScopesClause = '({person}.{center_id} = ? ' .
+        $centerScopesClause = '({person}.{center_id} = ? '.
             'AND {report}.{scopes_id} IN ({scopes_ids}))';
         // container for formatted clauses
         $formattedClauses = [];
@@ -247,7 +209,7 @@ class TimelineReportProvider implements TimelineProviderInterface
         $askedCenters = $args['centers'];
 
         foreach ($reachableCenters as $center) {
-            if (false === in_array($center, $askedCenters, true)) {
+            if (false === \in_array($center, $askedCenters, true)) {
                 continue;
             }
 
@@ -257,26 +219,26 @@ class TimelineReportProvider implements TimelineProviderInterface
             $scopeIds = [];
 
             foreach ($this->helper->getReachableScopes($this->security->getUser(), $role, $center) as $scope) {
-                if (in_array($scope->getId(), $scopeIds, true)) {
+                if (\in_array($scope->getId(), $scopeIds, true)) {
                     continue;
                 }
                 $scopeIds[] = $scope->getId();
             }
 
-            $formattedClauses[] = strtr($centerScopesClause, [
-                '{scopes_ids}' => implode(', ', array_fill(0, count($scopeIds), '?')),
+            $formattedClauses[] = \strtr($centerScopesClause, [
+                '{scopes_ids}' => \implode(', ', \array_fill(0, \count($scopeIds), '?')),
             ]);
             // append $scopeIds to parameters
-            $parameters = array_merge($parameters, $scopeIds);
+            $parameters = [...$parameters, ...$scopeIds];
         }
 
-        if (0 === count($formattedClauses)) {
+        if (0 === \count($formattedClauses)) {
             return ['FALSE = TRUE', []];
         }
 
         return [
-            strtr(
-                implode(' OR ', $formattedClauses),
+            \strtr(
+                \implode(' OR ', $formattedClauses),
                 [
                     '{person}' => $person->getTableName(),
                     '{center_id}' => $personCenterId,
@@ -305,28 +267,28 @@ class TimelineReportProvider implements TimelineProviderInterface
         $scopes = $this->helper->getReachableScopes($this->security->getUser(), $role, $args['person']->getCenter());
 
         foreach ($scopes as $scope) {
-            if (in_array($scope->getId(), $parameters, true)) {
+            if (\in_array($scope->getId(), $parameters, true)) {
                 continue;
             }
 
             $parameters[] = $scope->getId();
         }
 
-        if (1 === count($parameters)) {
+        if (1 === \count($parameters)) {
             // nothing change, we simplify the clause
             $clause = '{report}.{person_id} = ? AND FALSE = TRUE';
         }
 
         return [
-            strtr(
+            \strtr(
                 $clause,
                 [
                     '{report}' => $report->getTableName(),
                     '{person_id}' => $reportPersonId,
                     '{scopes_id}' => $reportScopeId,
-                    '{scopes_ids}' => implode(
+                    '{scopes_ids}' => \implode(
                         ', ',
-                        array_fill(0, count($parameters) - 1, '?')
+                        \array_fill(0, \count($parameters) - 1, '?')
                     ),
                 ]
             ),
diff --git a/src/Bundle/ChillReportBundle/config/services/controller.yaml b/src/Bundle/ChillReportBundle/config/services/controller.yaml
index 0eb58e45a..eb11b0426 100644
--- a/src/Bundle/ChillReportBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillReportBundle/config/services/controller.yaml
@@ -1,7 +1,7 @@
 services:
     Chill\ReportBundle\Controller\ReportController:
         arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $eventDispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
             $paginator: '@Chill\MainBundle\Pagination\PaginatorFactory'
         tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillReportBundle/config/services/export.yaml b/src/Bundle/ChillReportBundle/config/services/export.yaml
index 9650b9e33..5f93cb820 100644
--- a/src/Bundle/ChillReportBundle/config/services/export.yaml
+++ b/src/Bundle/ChillReportBundle/config/services/export.yaml
@@ -7,8 +7,9 @@ services:
             $customFieldProvider: '@Chill\CustomFieldsBundle\Service\CustomFieldProvider'
         tags:
             - { name: chill.export_elements_provider, prefix: 'report' }
-            
-    chill.report.export.filter_date:
-        class: Chill\ReportBundle\Export\Filter\ReportDateFilter
+
+    Chill\ReportBundle\Export\Filter\ReportDateFilter:
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: 'report_date_filter' }
diff --git a/src/Bundle/ChillReportBundle/config/services/fixtures.yaml b/src/Bundle/ChillReportBundle/config/services/fixtures.yaml
index 6362bbfe7..668cf8941 100644
--- a/src/Bundle/ChillReportBundle/config/services/fixtures.yaml
+++ b/src/Bundle/ChillReportBundle/config/services/fixtures.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\ReportBundle\DataFixtures\ORM\:
         resource: ../../DataFixtures/ORM
-        tags: [ 'doctrine.fixture.orm' ]
\ No newline at end of file
+        tags: [ 'doctrine.fixture.orm' ]
diff --git a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
index 3aad75baf..15827738e 100644
--- a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
+++ b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
@@ -14,7 +14,6 @@ namespace Chill\Migrations\Report;
 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;
 
@@ -23,15 +22,12 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class Version20150622233319 extends AbstractMigration implements ContainerAwareInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private ?\Symfony\Component\DependencyInjection\ContainerInterface $container = null;
 
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -41,11 +37,10 @@ class Version20150622233319 extends AbstractMigration implements ContainerAwareI
         $this->addSql('ALTER TABLE Report DROP scope_id');
     }
 
-    public function setContainer(?ContainerInterface $container = null)
+    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');
+            throw new \RuntimeException('Container is not provided. This migration need container to set a default center');
         }
 
         $this->container = $container;
@@ -54,7 +49,7 @@ class Version20150622233319 extends AbstractMigration implements ContainerAwareI
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'postgresql' !== $this->connection->getDatabasePlatform()->getName(),
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -104,10 +99,10 @@ class Version20150622233319 extends AbstractMigration implements ContainerAwareI
             }
         }*/
 
-        $this->addSql('ALTER TABLE report DROP scope'); //before this migration, scope was never used
+        $this->addSql('ALTER TABLE report DROP scope'); // before this migration, scope was never used
         $this->addSql('ALTER TABLE report ADD CONSTRAINT FK_report_scope '
-                . 'FOREIGN KEY (scope_id) '
-                . 'REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+                .'FOREIGN KEY (scope_id) '
+                .'REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
 
         if (isset($defaultScopeId)) {
             $this->addSql('UPDATE report SET scope_id = :id', [
diff --git a/src/Bundle/ChillReportBundle/translations/messages.fr.yml b/src/Bundle/ChillReportBundle/translations/messages.fr.yml
index 69b0ea60e..c22ed17fb 100644
--- a/src/Bundle/ChillReportBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillReportBundle/translations/messages.fr.yml
@@ -34,7 +34,6 @@ No report registered for this person.: Aucun rapport pour cet usager.
 'You may not set a date argument and a date in default': Vous avez introduit deux dates, l'une avec l'argument date et l'autre en zone de recherche par défaut. Merci d'indiquer l'un ou l'autre
 'You must provide either a date:YYYY-mm-dd argument or a YYYY-mm-dd default search': Merci d'indiquer soit un argument date:YYYY-mm-dd, soit une date dans la recherche par défaut.
 'Reports search results': Recherche dans les rapports
-'%total% reports matching the search "%pattern%"': '{0} Aucun rapport ne correspond à la recherche "%pattern%" | {1} Un rapport correspond à la recherche "%pattern%" | ]1,Inf]%total% rapports correspondent à la recherche "%pattern%"'
 
 #timeline
 '%user% has filled a %report_label% report': "%user% a ajouté un rapport '%report_label%'"
@@ -53,3 +52,4 @@ CHILL_REPORT_LISTS: Liste des rapports
 Filter by report's date: Filtrer par date de rapport
 Report is after this date: Rapports après cette date
 Report is before this date: Rapports avant cette date
+"Filtered by report's date: between %date_from% and %date_to%": "Filtré par date du rapport: entre le %date_from% et le %date_to%"
diff --git a/src/Bundle/ChillReportBundle/translations/messages.intl-icu.fr.yaml b/src/Bundle/ChillReportBundle/translations/messages.intl-icu.fr.yaml
new file mode 100644
index 000000000..f38303d42
--- /dev/null
+++ b/src/Bundle/ChillReportBundle/translations/messages.intl-icu.fr.yaml
@@ -0,0 +1,7 @@
+total reports matching the search: >-
+    { total, plural,
+        =0 {Aucun rapport ne correspond à la recherche}
+        one {Un rapport correspond à la recherche}
+        many {# rapports correspondent à la recherche}
+        other {# rapports correspondent à la recherche}
+    }
diff --git a/src/Bundle/ChillTaskBundle/ChillTaskBundle.php b/src/Bundle/ChillTaskBundle/ChillTaskBundle.php
index 5479c54b4..05f92ea93 100644
--- a/src/Bundle/ChillTaskBundle/ChillTaskBundle.php
+++ b/src/Bundle/ChillTaskBundle/ChillTaskBundle.php
@@ -21,6 +21,6 @@ class ChillTaskBundle extends Bundle
     {
         parent::build($container);
 
-        $container->addCompilerPass(new TaskWorkflowDefinitionCompilerPass());
+        $container->addCompilerPass(new TaskWorkflowDefinitionCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
index 2ba9488b6..16c520c75 100644
--- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
@@ -26,8 +26,9 @@ use Chill\TaskBundle\Event\TaskEvent;
 use Chill\TaskBundle\Event\UI\UIEvent;
 use Chill\TaskBundle\Form\SingleTaskType;
 use Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface;
+use Chill\TaskBundle\Repository\SingleTaskRepository;
+use Chill\TaskBundle\Repository\SingleTaskStateRepository;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -39,59 +40,30 @@ 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 Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_map;
-use function array_merge;
-
 final class SingleTaskController extends AbstractController
 {
-    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,
-        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;
-    }
+        private readonly CenterResolverDispatcherInterface $centerResolverDispatcher,
+        private readonly PaginatorFactory $paginatorFactory,
+        private readonly SingleTaskAclAwareRepositoryInterface $singleTaskAclAwareRepository,
+        private readonly TranslatorInterface $translator,
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly TimelineBuilder $timelineBuilder,
+        private readonly LoggerInterface $logger,
+        private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
+        private readonly SingleTaskStateRepository $singleTaskStateRepository,
+        private readonly SingleTaskRepository $singleTaskRepository,
+    ) {}
 
     /**
      * @Route(
      *     "/{_locale}/task/single-task/{id}/delete",
      *     name="chill_task_single_task_delete"
      * )
-     *
-     * @param mixed $id
      */
-    public function deleteAction(Request $request, $id)
+    public function deleteAction(Request $request, mixed $id)
     {
         $course = null;
         $em = $this->getDoctrine()->getManager();
@@ -101,7 +73,7 @@ final class SingleTaskController extends AbstractController
             throw $this->createNotFoundException('Unable to find Task entity.');
         }
 
-        if ($task->getPerson() !== null) {
+        if (null !== $task->getPerson()) {
             $personId = $task->getPerson()->getId();
 
             if (null === $personId) {
@@ -138,7 +110,7 @@ final class SingleTaskController extends AbstractController
 
         $form = $this->createDeleteForm($id);
 
-        if ($request->getMethod() === Request::METHOD_DELETE) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -159,16 +131,10 @@ final class SingleTaskController extends AbstractController
                     ->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->redirectToRoute('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()]
-                ));
+                return $this->redirectToRoute('chill_task_singletask_by-course_list', ['id' => $task->getCourse()->getId()]);
             }
         }
 
@@ -203,11 +169,11 @@ final class SingleTaskController extends AbstractController
         Request $request
     ) {
         $this->denyAccessUnlessGranted(TaskVoter::UPDATE, $task, 'You are not '
-            . 'allowed to edit this task');
+            .'allowed to edit this task');
 
         $event = (new UIEvent('single-task', $task))
             ->setForm($this->setCreateForm($task, TaskVoter::UPDATE));
-        $this->eventDispatcher->dispatch(UIEvent::EDIT_FORM, $event);
+        $this->eventDispatcher->dispatch($event, UIEvent::EDIT_FORM);
 
         $form = $event->getForm();
 
@@ -229,7 +195,7 @@ final class SingleTaskController extends AbstractController
                         'element_id' => $task->getId(),
                         'action' => 'update',
                     ]);
-                    $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+                    $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
                     if ($request->query->has('returnPath')) {
                         return $this->redirect($request->query->get('returnPath'));
@@ -252,7 +218,7 @@ final class SingleTaskController extends AbstractController
             $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
-        $this->eventDispatcher->dispatch(UIEvent::EDIT_PAGE, $event);
+        $this->eventDispatcher->dispatch($event, UIEvent::EDIT_PAGE);
 
         if ($event->hasResponse()) {
             return $event->getResponse();
@@ -264,7 +230,7 @@ final class SingleTaskController extends AbstractController
                 'element_id' => $task->getId(),
                 'action' => 'edit',
             ]);
-            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+            $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
             return $this->render('@ChillTask/SingleTask/Person/edit.html.twig', [
                 'task' => $task,
@@ -298,14 +264,26 @@ final class SingleTaskController extends AbstractController
     ) {
         $this->denyAccessUnlessGranted(TaskVoter::SHOW, null);
 
-        $filterOrder = $this->buildFilterOrder();
-        $flags = array_merge(
+        $showMissionTypeFilter = $this->singleTaskRepository->countByDistinctTypes() > 1;
+
+        $filterOrder = $this->buildFilterOrder(true, $showMissionTypeFilter);
+
+        $filteredUsers = $filterOrder->getUserPickerData('userPicker');
+
+        $flags = \array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
+            \array_map(static fn ($i) => 'state_'.$i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
         );
+
+        if ($showMissionTypeFilter) {
+            $types = $filterOrder->getCheckboxData('missionTypePicker');
+        }
+
         $nb = $this->singleTaskAclAwareRepository->countByAllViewable(
             $filterOrder->getQueryString(),
-            $flags
+            $flags,
+            $types ?? [],
+            $filteredUsers
         );
         $paginator = $this->paginatorFactory->create($nb);
 
@@ -313,6 +291,8 @@ final class SingleTaskController extends AbstractController
             $tasks = $this->singleTaskAclAwareRepository->findByAllViewable(
                 $filterOrder->getQueryString(),
                 $flags,
+                $types ?? [],
+                $filteredUsers,
                 $paginator->getCurrentPageFirstItemNumber(),
                 $paginator->getItemsPerPage(),
                 [
@@ -344,9 +324,9 @@ final class SingleTaskController extends AbstractController
         $this->denyAccessUnlessGranted(TaskVoter::SHOW, $course);
 
         $filterOrder = $this->buildFilterOrder();
-        $flags = array_merge(
+        $flags = \array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
+            \array_map(static fn ($i) => 'state_'.$i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
         );
         $nb = $this->singleTaskAclAwareRepository->countByCourse(
             $course,
@@ -393,9 +373,9 @@ final class SingleTaskController extends AbstractController
         $this->denyAccessUnlessGranted(TaskVoter::SHOW, $person);
 
         $filterOrder = $this->buildFilterOrder();
-        $flags = array_merge(
+        $flags = \array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
+            \array_map(static fn ($i) => 'state_'.$i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
         );
         $nb = $this->singleTaskAclAwareRepository->countByPerson(
             $person,
@@ -433,6 +413,7 @@ final class SingleTaskController extends AbstractController
 
     /**
      * @return Response
+     *
      * @Route(
      *     "/{_locale}/task/single-task/list/my",
      *     name="chill_task_singletask_my_tasks",
@@ -447,10 +428,10 @@ final class SingleTaskController extends AbstractController
     {
         $this->denyAccessUnlessGranted('ROLE_USER');
 
-        $filterOrder = $this->buildFilterOrder();
-        $flags = array_merge(
+        $filterOrder = $this->buildFilterOrder(false);
+        $flags = \array_merge(
             $filterOrder->getCheckboxData('status'),
-            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
+            \array_map(static fn ($i) => 'state_'.$i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
         );
         $nb = $this->singleTaskAclAwareRepository->countByCurrentUsersTasks(
             $filterOrder->getQueryString(),
@@ -556,7 +537,7 @@ final class SingleTaskController extends AbstractController
         }
 
         $this->denyAccessUnlessGranted($role, $task, 'You are not '
-             . 'allowed to create this task');
+             .'allowed to create this task');
 
         $form = $this->setCreateForm($task, $role);
 
@@ -567,7 +548,7 @@ final class SingleTaskController extends AbstractController
                 $em = $this->getDoctrine()->getManager();
                 $em->persist($task);
 
-                $this->eventDispatcher->dispatch(TaskEvent::PERSIST, new TaskEvent($task));
+                $this->eventDispatcher->dispatch(new TaskEvent($task), TaskEvent::PERSIST);
 
                 $em->flush();
 
@@ -593,24 +574,19 @@ final class SingleTaskController extends AbstractController
             }
         }
 
-        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');
-        }
+        return match ($entityType) {
+            'person' => $this->render('@ChillTask/SingleTask/Person/new.html.twig', [
+                'form' => $form->createView(),
+                'task' => $task,
+                'person' => $task->getPerson(),
+            ]),
+            'course' => $this->render('@ChillTask/SingleTask/AccompanyingCourse/new.html.twig', [
+                'form' => $form->createView(),
+                'task' => $task,
+                'accompanyingCourse' => $task->getCourse(),
+            ]),
+            default => throw new \LogicException('entity context not supported'),
+        };
     }
 
     /**
@@ -629,7 +605,7 @@ final class SingleTaskController extends AbstractController
                 'element_id' => $task->getId(),
                 'action' => 'show',
             ]);
-            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+            $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
         }
 
         $timeline = $this->timelineBuilder
@@ -662,7 +638,7 @@ final class SingleTaskController extends AbstractController
         return $form;
     }
 
-    private function buildFilterOrder(): FilterOrderHelper
+    private function buildFilterOrder($includeFilterByUser = true, $includeMissionType = false): FilterOrderHelper
     {
         $statuses = ['no-alert', 'warning', 'alert'];
         $statusTrans = [
@@ -670,24 +646,43 @@ final class SingleTaskController extends AbstractController
             'Tasks near deadline',
             'Tasks over deadline',
         ];
-        $states = [
-            // todo: get a list of possible states dynamically
-            'new', 'in_progress', 'closed', 'canceled',
-        ];
+        $arrayOfTypes = [];
 
-        return $this->filterOrderHelperFactory
+        $filterBuilder = $this->filterOrderHelperFactory
             ->create(self::class)
             ->addSearchBox()
-            ->addCheckbox('status', $statuses, $statuses, $statusTrans)
-            ->addCheckbox('states', $states, ['new', 'in_progress'])
-            ->build();
+            ->addCheckbox('status', $statuses, $statuses, $statusTrans);
+
+        $states = $this->singleTaskStateRepository->findAllExistingStates();
+        $checked = array_values(array_filter($states, fn (string $state) => !in_array($state, ['closed', 'canceled', 'validated'], true)));
+
+        if ([] !== $states) {
+            $filterBuilder
+                ->addCheckbox('states', $states, $checked);
+        }
+
+        if ($includeFilterByUser) {
+            $filterBuilder
+                ->addUserPicker('userPicker', 'Filter by user', ['multiple' => true, 'required' => false]);
+        }
+
+        if ($includeMissionType) {
+            $filterBuilder->addCheckbox(
+                'missionTypePicker',
+                \array_map(
+                    fn ($row) => $row['type'],
+                    $this->singleTaskRepository->findAllTaskDistinctTypes()
+                )
+            );
+        }
+
+        return $filterBuilder->build();
     }
 
     /**
      * Creates a form to delete a Task entity by id.
-     * @param mixed $id
      */
-    private function createDeleteForm($id): FormInterface
+    private function createDeleteForm(mixed $id): FormInterface
     {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl(
diff --git a/src/Bundle/ChillTaskBundle/Controller/TaskController.php b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
index 6525d5572..e5d060de7 100644
--- a/src/Bundle/ChillTaskBundle/Controller/TaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
@@ -25,7 +25,6 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
 use Symfony\Contracts\Translation\TranslatorInterface;
-
 use function array_filter;
 use function array_values;
 
@@ -43,7 +42,7 @@ class TaskController extends AbstractController
      * )
      *
      * @param string $kind
-     * @param int $taskId
+     * @param int    $taskId
      * @param string $transition
      *
      * @return Response
@@ -70,7 +69,7 @@ class TaskController extends AbstractController
                         'list_params' => $request->query->get('list_params', []),
                     ]
                 );
-                $task->getCourse() === null ? $defaultTemplate = '@ChillTask/SingleTask/Person/transition.html.twig' : $defaultTemplate = '@ChillTask/SingleTask/AccompanyingCourse/transition.html.twig';
+                null === $task->getCourse() ? $defaultTemplate = '@ChillTask/SingleTask/Person/transition.html.twig' : $defaultTemplate = '@ChillTask/SingleTask/AccompanyingCourse/transition.html.twig';
 
                 break;
 
@@ -82,8 +81,7 @@ class TaskController extends AbstractController
         }
 
         if (null === $task) {
-            throw $this->createNotFoundException("task with id '{$taskId}' and type "
-                . "'{$kind}' does not exists");
+            throw $this->createNotFoundException("task with id '{$taskId}' and type '{$kind}' does not exists");
         }
 
         $workflow = $registry->get($task);
@@ -91,12 +89,10 @@ class TaskController extends AbstractController
         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(
+        $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;
-                }
+                static fn (Transition $t) => $t->getName() === $transition
             )
         )[0];
 
@@ -121,7 +117,7 @@ class TaskController extends AbstractController
             ->setForm($form)
             ->setTransition($transitionInstance);
 
-        $eventDispatcher->dispatch(UIEvent::SHOW_TRANSITION_PAGE, $event);
+        $eventDispatcher->dispatch($event, UIEvent::SHOW_TRANSITION_PAGE);
 
         if ($event->hasResponse()) {
             return $event->getResponse();
diff --git a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
index bd6bc92ff..cb38df91c 100644
--- a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
+++ b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
@@ -19,8 +19,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
-use function in_array;
-
 /**
  * Add a role UPDATE & CREATE for all groups except administrative,
  * and a role SEE for administrative.
@@ -39,10 +37,10 @@ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
 
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
-                //create permission group
+                // create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ($scope->getName()['en'] === 'administrative') {
+                        if ('administrative' === $scope->getName()['en']) {
                             break 2; // we do not want any power on administrative
                         }
 
@@ -50,7 +48,7 @@ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
 
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
                         }
 
@@ -59,7 +57,7 @@ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
 
                 printf(
                     'Adding CHILL_TASK_TASK_UPDATE & CHILL_TASK_TASK_CREATE & Chill_TASK_TASK_DELETE permissions to %s '
-                        . "permission group, scope '%s' \n",
+                        ."permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php b/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
index 580de1cec..0122861d6 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
@@ -31,7 +31,7 @@ class ChillTaskExtension extends Extension implements PrependExtensionInterface
         $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');
@@ -64,7 +64,7 @@ class ChillTaskExtension extends Extension implements PrependExtensionInterface
 
     protected function prependRoute(ContainerBuilder $container)
     {
-        //declare routes for task bundle
+        // declare routes for task bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
@@ -80,15 +80,13 @@ class ChillTaskExtension extends Extension implements PrependExtensionInterface
             'workflows' => [
                 'task_default' => [
                     'marking_store' => [
-                        'type' => 'multiple_state',
-                        'arguments' => [
-                            'currentStates',
-                        ],
+                        'type' => 'method',
+                        'property' => 'currentStates',
                     ],
-                    'type' => 'state_machine',
+                    'type' =>  'workflow',
                     'support_strategy' => TaskWorkflowManager::class,
                     'places' => ['new', 'in_progress', 'closed', 'canceled'],
-                    'initial_place' => 'new',
+                    'initial_marking' => ['new'],
                     'transitions' => [
                         'start' => [
                             'from' => 'new',
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php b/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
index 3455737e0..4447778ec 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
@@ -14,7 +14,6 @@ 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;
@@ -24,8 +23,7 @@ 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);
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
index 8c57ef0f6..f01050684 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
@@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_task');
-        $rootNode = $treeBuilder->getRootNode('chill_task');
+        $rootNode = $treeBuilder->getRootNode();
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for
diff --git a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
index d49e5e385..51ab8166d 100644
--- a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
@@ -21,13 +21,11 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
-use function array_fill_keys;
-use function array_keys;
-
 /**
  * AbstractTask.
  *
  * @ORM\MappedSuperclass
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *     "single_task": SingleTask::class
  * })
@@ -35,77 +33,73 @@ use function array_keys;
 abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var User
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\MainBundle\Entity\User"
      * )
+     *
      * @Serializer\Groups({"read"})
      */
-    private $assignee;
+    private ?\Chill\MainBundle\Entity\User $assignee = null;
 
     /**
-     * @var Scope
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\MainBundle\Entity\Scope"
      * )
      */
-    private $circle;
+    private ?\Chill\MainBundle\Entity\Scope $circle = null;
 
     /**
-     * @var bool
      * @ORM\Column(name="closed", type="boolean", options={ "default": false })
+     *
      * @Serializer\Groups({"read"})
      */
-    private $closed = false;
+    private bool $closed = false;
 
     /**
-     * @var AccompanyingPeriod
      * @ORM\ManyToOne(targetEntity="\Chill\PersonBundle\Entity\AccompanyingPeriod")
+     *
      * @Serializer\Groups({"read"})
      */
-    private $course;
+    private ?\Chill\PersonBundle\Entity\AccompanyingPeriod $course = null;
 
     /**
-     * @var json
+     * @ORM\Column(name="current_states", type="json", options={"jsonb"=true, "default"="[]"})
      *
-     * @ORM\Column(name="current_states", type="json")
      * @Serializer\Groups({"read"})
      */
-    private $currentStates = [];
+    private array $currentStates = [];
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="description", type="text")
+     *
      * @Serializer\Groups({"read"})
      */
-    private $description = '';
+    private string $description = '';
 
     /**
-     * @var Person
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\PersonBundle\Entity\Person"
      * )
+     *
      * @Serializer\Groups({"read"})
      */
-    private $person;
+    private ?\Chill\PersonBundle\Entity\Person $person = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="title", type="text")
+     *
      * @Assert\NotBlank
+     *
      * @Serializer\Groups({"read"})
      */
-    private $title = '';
+    private string $title = '';
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="type", type="string", length=255)
+     *
      * @Serializer\Groups({"read"})
      */
-    private $type;
+    private ?string $type = null;
 
     public function getAssignee(): ?User
     {
@@ -147,7 +141,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
      */
     public function getCurrentStates()
     {
-        return array_fill_keys($this->currentStates, 1);
+        return \array_fill_keys($this->currentStates, 1);
     }
 
     /**
@@ -195,7 +189,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
         return $this->closed;
     }
 
-    public function setAssignee(?User $assignee = null)
+    public function setAssignee(User $assignee = null)
     {
         $this->assignee = $assignee;
 
@@ -226,13 +220,11 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
      *
      * The current states are sorted in a single array, non associative.
      *
-     * @param $currentStates
-     *
      * @return AbstractTask
      */
     public function setCurrentStates($currentStates)
     {
-        $this->currentStates = array_keys($currentStates);
+        $this->currentStates = \array_keys($currentStates);
 
         return $this;
     }
diff --git a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
index 676e22a99..d8182cd23 100644
--- a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\TaskBundle\Entity;
 
-use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -20,63 +19,54 @@ use Doctrine\ORM\Mapping as ORM;
  * 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;
+    private ?\DateTime $firstOccurenceEndDate = null;
 
     /**
-     * @var int
-     *
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var DateTime
-     *
      * @ORM\Column(name="last_occurence_end_date", type="date")
      */
-    private $lastOccurenceEndDate;
+    private ?\DateTime $lastOccurenceEndDate = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="occurence_frequency", type="string", length=255)
      */
-    private $occurenceFrequency;
+    private ?string $occurenceFrequency = null;
 
     /**
-     * @var dateinterval
-     *
      * @ORM\Column(name="occurence_start_date", type="dateinterval")
      */
     private $occurenceStartDate;
 
     /**
-     * @var dateinterval
-     *
      * @ORM\Column(name="occurence_warning_interval", type="dateinterval", nullable=true)
      */
     private $occurenceWarningInterval;
 
     /**
-     * @var Collection
+     * @var Collection<SingleTask>
      *
      * @ORM\OneToMany(
      *     targetEntity="SingleTask",
      *     mappedBy="recurringTask"
      * )
      */
-    private $singleTasks;
+    private Collection $singleTasks;
 
     public function __construct()
     {
@@ -86,7 +76,7 @@ class RecurringTask extends AbstractTask
     /**
      * Get firstOccurenceEndDate.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getFirstOccurenceEndDate()
     {
@@ -106,7 +96,7 @@ class RecurringTask extends AbstractTask
     /**
      * Get lastOccurenceEndDate.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getLastOccurenceEndDate()
     {
@@ -125,8 +115,6 @@ class RecurringTask extends AbstractTask
 
     /**
      * Get occurenceStartDate.
-     *
-     * @return dateinterval
      */
     public function getOccurenceStartDate()
     {
@@ -135,8 +123,6 @@ class RecurringTask extends AbstractTask
 
     /**
      * Get occurenceWarningInterval.
-     *
-     * @return dateinterval
      */
     public function getOccurenceWarningInterval()
     {
@@ -146,7 +132,7 @@ class RecurringTask extends AbstractTask
     /**
      * Set firstOccurenceEndDate.
      *
-     * @param DateTime $firstOccurenceEndDate
+     * @param \DateTime $firstOccurenceEndDate
      *
      * @return RecurringTask
      */
@@ -160,7 +146,7 @@ class RecurringTask extends AbstractTask
     /**
      * Set lastOccurenceEndDate.
      *
-     * @param DateTime $lastOccurenceEndDate
+     * @param \DateTime $lastOccurenceEndDate
      *
      * @return RecurringTask
      */
@@ -188,11 +174,9 @@ class RecurringTask extends AbstractTask
     /**
      * Set occurenceStartDate.
      *
-     * @param dateinterval $occurenceStartDate
-     *
      * @return RecurringTask
      */
-    public function setOccurenceStartDate($occurenceStartDate)
+    public function setOccurenceStartDate(mixed $occurenceStartDate)
     {
         $this->occurenceStartDate = $occurenceStartDate;
 
@@ -202,11 +186,9 @@ class RecurringTask extends AbstractTask
     /**
      * Set occurenceWarningInterval.
      *
-     * @param dateinterval $occurenceWarningInterval
-     *
      * @return RecurringTask
      */
-    public function setOccurenceWarningInterval($occurenceWarningInterval)
+    public function setOccurenceWarningInterval(mixed $occurenceWarningInterval)
     {
         $this->occurenceWarningInterval = $occurenceWarningInterval;
 
diff --git a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
index cd63f9db5..eca0c17cc 100644
--- a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
@@ -11,9 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\TaskBundle\Entity;
 
+use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
 use DateInterval;
-use DateTime;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -26,6 +25,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table(
  *     name="chill_task.single_task",
  *     indexes={
+ *
  *         @ORM\Index(
  *             name="by_type",
  *             columns={ "type" }
@@ -40,72 +40,74 @@ use Symfony\Component\Validator\Constraints as Assert;
  *         )
  *     }
  * )
+ *
  * @ORM\Entity(repositoryClass="Chill\TaskBundle\Repository\SingleTaskRepository")
  */
 class SingleTask extends AbstractTask
 {
     /**
-     * @var DateTime
-     *
      * @ORM\Column(name="end_date", type="date", nullable=true)
-     * @Assert\Date
-     * @Serializer\Groups({"read"})
-     */
-    private $endDate;
-
-    /**
-     * @var int
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
+     * @Assert\Date
+     *
      * @Serializer\Groups({"read"})
      */
-    private $id;
+    private ?\DateTime $endDate = null;
+
+    /**
+     * @ORM\Column(name="id", type="integer")
+     *
+     * @ORM\Id
+     *
+     * @ORM\GeneratedValue(strategy="AUTO")
+     *
+     * @Serializer\Groups({"read"})
+     */
+    private ?int $id = null;
 
     /**
-     * @var RecurringTask
      * @ORM\ManyToOne(
      *     targetEntity="RecurringTask",
      *     inversedBy="singleTasks"
      * )
      */
-    private $recurringTask;
+    private ?\Chill\TaskBundle\Entity\RecurringTask $recurringTask = null;
 
     /**
-     * @var DateTime
-     *
      * @ORM\Column(name="start_date", type="date", nullable=true)
+     *
      * @Serializer\Groups({"read"})
+     *
      * @Assert\Date
      *
      * @Assert\Expression(
      *     "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"
      * )
      */
-    private $startDate;
+    private ?\DateTime $startDate = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection
+     * @var Collection<SingleTaskPlaceEvent>
+     *
      * @ORM\OneToMany(
      *     targetEntity="\Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent",
      *     mappedBy="task",
      *     cascade={ "remove" }
      * )
      */
-    private $taskPlaceEvents;
+    private Collection $taskPlaceEvents;
 
     /**
-     * @var DateInterval
-     *  and this.getEndDate() === null
+     * @var \DateInterval
+     *                    and this.getEndDate() === null
      *
      * @ORM\Column(name="warning_interval", type="dateinterval", nullable=true)
+     *
      * @Serializer\Groups({"read"})
      *
      * @Assert\Expression(
@@ -113,7 +115,7 @@ class SingleTask extends AbstractTask
      *     message="An end date is required if a warning interval is set"
      * )
      */
-    private $warningInterval;
+    private null|\DateInterval $warningInterval = null;
 
     public function __construct()
     {
@@ -122,10 +124,8 @@ class SingleTask extends AbstractTask
 
     /**
      * Get endDate.
-     *
-     * @return DateTime
      */
-    public function getEndDate()
+    public function getEndDate(): null|\DateTime
     {
         return $this->endDate;
     }
@@ -148,7 +148,7 @@ class SingleTask extends AbstractTask
     /**
      * Get startDate.
      *
-     * @return DateTime
+     * @return \DateTime
      */
     public function getStartDate()
     {
@@ -166,29 +166,28 @@ class SingleTask extends AbstractTask
      *
      * Return null if warningDate or endDate is null
      *
-     * @return DateTimeImmutable
+     * @return \DateTimeImmutable
+     *
      * @Serializer\Groups({"read"})
      */
     public function getWarningDate()
     {
-        if ($this->getWarningInterval() === null) {
+        if (null === $this->getWarningInterval()) {
             return null;
         }
 
-        if ($this->getEndDate() === null) {
+        if (null === $this->getEndDate()) {
             return null;
         }
 
-        return DateTimeImmutable::createFromMutable($this->getEndDate())
+        return \DateTimeImmutable::createFromMutable($this->getEndDate())
             ->sub($this->getWarningInterval());
     }
 
     /**
      * Get warningInterval.
-     *
-     * @return DateInterval
      */
-    public function getWarningInterval()
+    public function getWarningInterval(): null|\DateInterval
     {
         return $this->warningInterval;
     }
@@ -196,7 +195,7 @@ class SingleTask extends AbstractTask
     /**
      * Set endDate.
      *
-     * @param DateTime $endDate
+     * @param \DateTime $endDate
      *
      * @return SingleTask
      */
@@ -215,7 +214,7 @@ class SingleTask extends AbstractTask
     /**
      * Set startDate.
      *
-     * @param DateTime $startDate
+     * @param \DateTime $startDate
      *
      * @return SingleTask
      */
@@ -236,11 +235,9 @@ class SingleTask extends AbstractTask
     /**
      * Set warningInterval.
      *
-     * @param string $warningInterval
-     *
      * @return SingleTask
      */
-    public function setWarningInterval($warningInterval)
+    public function setWarningInterval(null|\DateInterval $warningInterval)
     {
         $this->warningInterval = $warningInterval;
 
diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
index e30161db2..8a47eda19 100644
--- a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
+++ b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\TaskBundle\Entity\Task;
 
 use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -23,19 +22,16 @@ use Doctrine\ORM\Mapping as ORM;
 class AbstractTaskPlaceEvent
 {
     /**
-     * @var User
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\MainBundle\Entity\User"
      * )
      */
-    private $author;
+    private ?\Chill\MainBundle\Entity\User $author = null;
 
     /**
-     * @var string
-     *
      * @ORM\Column(name="data", type="json")
      */
-    private $data = [];
+    private array $data = [];
 
     /**
      * @var datetime_immutable
@@ -45,24 +41,13 @@ class AbstractTaskPlaceEvent
     private $datetime;
 
     /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @var string
-     *
      * @ORM\Column(name="transition", type="string", length=255)
      */
-    private $transition = '';
+    private string $transition = '';
 
     public function __construct()
     {
-        $this->datetime = new DateTimeImmutable('now');
+        $this->datetime = new \DateTimeImmutable('now');
     }
 
     public function getAuthor(): User
@@ -72,10 +57,8 @@ class AbstractTaskPlaceEvent
 
     /**
      * Get data.
-     *
-     * @return string
      */
-    public function getData()
+    public function getData(): array
     {
         return $this->data;
     }
@@ -90,16 +73,6 @@ class AbstractTaskPlaceEvent
         return $this->datetime;
     }
 
-    /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
     /**
      * Get transition.
      *
@@ -120,11 +93,9 @@ class AbstractTaskPlaceEvent
     /**
      * Set data.
      *
-     * @param string $data
-     *
      * @return AbstractTaskPlaceEvent
      */
-    public function setData($data)
+    public function setData(array $data)
     {
         $this->data = $data;
 
diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
index 366403520..47e3eabfb 100644
--- a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
+++ b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
@@ -18,6 +18,7 @@ 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"}
@@ -27,18 +28,27 @@ use Doctrine\ORM\Mapping as ORM;
  *             columns={"task_id", "transition"}
  *         )
  *     })
+ *
  *     @ORM\Entity
  */
 class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
 {
     /**
-     * @var SingleTask
+     * @ORM\Column(name="id", type="integer")
+     *
+     * @ORM\Id
+     *
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private ?int $id = null;
+
+    /**
      * @ORM\ManyToOne(
      *     targetEntity="\Chill\TaskBundle\Entity\SingleTask",
      *     inversedBy="taskPlaceEvents"
      * )
      */
-    protected $task;
+    protected ?\Chill\TaskBundle\Entity\SingleTask $task = null;
 
     public function getTask(): SingleTask
     {
@@ -51,4 +61,14 @@ class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
 
         return $this;
     }
+
+    /**
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Event/TaskEvent.php b/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
index 57e8329c9..4e38f96ca 100644
--- a/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
@@ -12,11 +12,10 @@ declare(strict_types=1);
 namespace Chill\TaskBundle\Event;
 
 use Chill\TaskBundle\Entity\AbstractTask;
-use Symfony\Component\EventDispatcher\Event;
 
-class TaskEvent extends Event
+class TaskEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
-    public const PERSIST = 'chill_task.task_persist';
+    final public const PERSIST = 'chill_task.task_persist';
 
     /**
      * @var AbstractTask
diff --git a/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php b/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
index 1acfe0562..ba7d85eb0 100644
--- a/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
@@ -12,29 +12,23 @@ 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
+class UIEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
-    public const EDIT_FORM = 'chill_task.edit_form';
+    final public const EDIT_FORM = 'chill_task.edit_form';
 
-    public const EDIT_PAGE = 'chill_task.edit_page';
+    final public const EDIT_PAGE = 'chill_task.edit_page';
 
-    public const SHOW_TRANSITION_PAGE = 'chill_task.show_transition_page';
+    final public const SHOW_TRANSITION_PAGE = 'chill_task.show_transition_page';
 
     /**
      * @var FormInterface|null
      */
     protected $form;
 
-    /**
-     * @var string
-     */
-    protected $kind;
-
     /**
      * @var Response|null
      */
@@ -50,16 +44,15 @@ class UIEvent extends Event
      */
     protected $transition;
 
-    public function __construct($kind, AbstractTask $task)
+    /**
+     * @param string $kind
+     */
+    public function __construct(protected $kind, AbstractTask $task)
     {
-        $this->kind = $kind;
         $this->task = $task;
     }
 
-    /**
-     * @return FormInterface|null
-     */
-    public function getForm()
+    public function getForm(): ?FormInterface
     {
         return $this->form;
     }
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
index 4020eeef3..e0221545b 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
@@ -28,11 +28,6 @@ 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
 {
@@ -99,7 +94,7 @@ class SingleTaskListType extends AbstractType
         if ($options['add_type']) {
             $types = $this->getTaskTypesChoices($options);
 
-            if (count($types) > 0) {
+            if (\count($types) > 0) {
                 $builder->add('types', ChoiceType::class, [
                     'choices' => $types,
                     'required' => false,
@@ -116,14 +111,14 @@ class SingleTaskListType extends AbstractType
                     'centers' => $this->authorizationHelper
                         ->getReachableCenters(
                             $this->tokenStorage->getToken()->getUser(),
-                            new Role(TaskVoter::SHOW)
+                            TaskVoter::SHOW
                         ),
                     'required' => false,
                     'label' => 'Associated person',
                 ]);
             $reachablesCenters = $this->getReachablesCenters();
 
-            if (count($reachablesCenters) > 1) {
+            if (\count($reachablesCenters) > 1) {
                 $builder
                     ->add('center_id', EntityType::class, [
                         'class' => \Chill\MainBundle\Entity\Center::class,
@@ -160,7 +155,7 @@ class SingleTaskListType extends AbstractType
     protected function getReachablesCenters()
     {
         $user = $this->tokenStorage->getToken()->getUser();
-        $role = new Role(TaskVoter::SHOW);
+        $role = TaskVoter::SHOW;
 
         return $this->authorizationHelper->getReachableCenters($user, $role);
     }
@@ -169,7 +164,7 @@ class SingleTaskListType extends AbstractType
     {
         $qb = $this->em->createQueryBuilder();
         $user = $this->tokenStorage->getToken()->getUser();
-        $role = new Role(TaskVoter::SHOW);
+        $role = TaskVoter::SHOW;
         $centers = $this->authorizationHelper->getReachableCenters($user, $role);
 
         $qb->select('DISTINCT task.type AS type')
@@ -182,16 +177,16 @@ class SingleTaskListType extends AbstractType
         foreach ($centers as $center) {
             $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
 
-            if (count($circles) > 0) {
+            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));
+                    ->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);
+                    ->setParameter('center_'.$i, $center)
+                    ->setParameter('circles_'.$i, $circles);
                 ++$i;
             }
         }
@@ -216,15 +211,11 @@ class SingleTaskListType extends AbstractType
     protected function getUserChoices($options)
     {
         $users = $this->getUsersAssigneedToTask($options);
-        $choices = array_combine(
+        $choices = \array_combine(
             // get usernames
-            array_map(static function (User $user) {
-                return $user->getUsername();
-            }, $users),
+            \array_map(static fn (User $user) => $user->getUsername(), $users),
             // get ids
-            array_map(static function (User $user) {
-                return $user->getId();
-            }, $users)
+            \array_map(static fn (User $user) => $user->getId(), $users)
         );
         $choices['Unassigned'] = '_unassigned';
 
@@ -234,15 +225,13 @@ class SingleTaskListType extends AbstractType
     /**
      * Return a list of user having a task assigned.
      *
-     * @param mixed $options
-     *
      * @return User[]
      */
-    protected function getUsersAssigneedToTask($options)
+    protected function getUsersAssigneedToTask(mixed $options)
     {
         $qb = $this->em->createQueryBuilder();
         $user = $this->tokenStorage->getToken()->getUser();
-        $role = new Role(TaskVoter::SHOW);
+        $role = TaskVoter::SHOW;
         $centers = $this->authorizationHelper->getReachableCenters($user, $role);
 
         $qb->select('DISTINCT user')
@@ -265,12 +254,12 @@ class SingleTaskListType extends AbstractType
             // 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))
+                    ->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);
+            $qb->setParameter('center_'.$i, $center)
+                ->setParameter('circles_'.$i, $circles);
             // increase counter
             ++$i;
         }
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
index d27a2aa06..7e572e078 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
@@ -24,25 +24,10 @@ 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 __construct(private readonly ParameterBagInterface $parameterBag, private readonly CenterResolverDispatcherInterface $centerResolverDispatcher, private readonly ScopeResolverDispatcher $scopeResolverDispatcher) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -90,6 +75,6 @@ class SingleTaskType extends AbstractType
     {
         $resolver
             ->setRequired('role')
-            ->setAllowedTypes('role', [Role::class, 'string']);
+            ->setAllowedTypes('role', ['string']);
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
index 4933b063c..6b710744d 100644
--- a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
@@ -15,7 +15,6 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Knp\Menu\MenuItem;
-use LogicException;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -59,30 +58,17 @@ class MenuBuilder implements LocalMenuBuilderInterface
 
     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");
-        }
+        match ($menuId) {
+            'person' => $this->buildPersonMenu($menu, $parameters),
+            'accompanyingCourse' => $this->buildAccompanyingCourseMenu($menu, $parameters),
+            'section' => $menu->setExtras('icons'),
+            default => throw new \LogicException("this menuid {$menuId} is not implemented"),
+        };
     }
 
     public function buildPersonMenu($menu, $parameters)
     {
-        //var $person \Chill\PersonBundle\Entity\Person */
+        // var $person \Chill\PersonBundle\Entity\Person */
         $person = $parameters['person'] ?? null;
 
         if ($this->authorizationChecker->isGranted(TaskVoter::SHOW, $person)) {
diff --git a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
index a590fe278..a8c299680 100644
--- a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
@@ -66,7 +66,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         if (0 < $ended) {
             $this->addItemInMenu(
                 $menu,
-                '%number% tasks over deadline',
+                'nb tasks over deadline',
                 $ended,
                 -15,
                 ['new', 'in_progress'],
@@ -77,7 +77,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         if (0 < $warning) {
             $this->addItemInMenu(
                 $menu,
-                '%number% tasks near deadline',
+                'nb tasks near deadline',
                 $warning,
                 -14,
                 ['new', 'in_progress'],
@@ -103,7 +103,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
     {
         if (0 < $number) {
             $menu->addChild(
-                $this->translator->transChoice($message, $number),
+                $this->translator->trans($message, ['nb' => $number]),
                 [
                     'route' => 'chill_task_singletask_my_tasks',
                     'routeParameters' => [
diff --git a/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php
index d19420580..6ac7f10ec 100644
--- a/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php
@@ -17,6 +17,4 @@ namespace Chill\TaskBundle\Repository;
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-abstract class AbstractTaskRepository extends \Doctrine\ORM\EntityRepository
-{
-}
+abstract class AbstractTaskRepository extends \Doctrine\ORM\EntityRepository {}
diff --git a/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php
index 4bbedd1bb..985aa9935 100644
--- a/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php
@@ -17,6 +17,4 @@ namespace Chill\TaskBundle\Repository;
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class RecurringTaskRepository extends \Doctrine\ORM\EntityRepository
-{
-}
+class RecurringTaskRepository extends \Doctrine\ORM\EntityRepository {}
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
index 0efc16085..605597fea 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
@@ -17,55 +17,55 @@ 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
+final readonly class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepositoryInterface
 {
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    private CenterResolverManagerInterface $centerResolverDispatcher;
-
-    private EntityManagerInterface $em;
-
-    private Security $security;
-
-    public function __construct(
-        CenterResolverManagerInterface $centerResolverDispatcher,
-        EntityManagerInterface $em,
-        Security $security,
-        AuthorizationHelperInterface $authorizationHelper
-    ) {
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-        $this->em = $em;
-        $this->security = $security;
-        $this->authorizationHelper = $authorizationHelper;
-    }
+    public function __construct(private CenterResolverManagerInterface $centerResolverDispatcher, private EntityManagerInterface $em, private Security $security, private AuthorizationHelperInterface $authorizationHelper) {}
 
     public function buildBaseQuery(
-        ?string $pattern = null,
-        ?array $flags = []
+        string $pattern = null,
+        ?array $flags = [],
+        ?array $types = [],
+        ?array $users = []
     ): QueryBuilder {
         $qb = $this->em->createQueryBuilder();
         $qb
             ->from(SingleTask::class, 't');
 
-        if (!empty($pattern)) {
+        if (null !== $pattern && '' !== $pattern) {
             $qb->andWhere($qb->expr()->like('LOWER(UNACCENT(t.title))', 'LOWER(UNACCENT(:pattern))'))
-                ->setParameter('pattern', '%' . $pattern . '%');
+                ->setParameter('pattern', '%'.$pattern.'%');
         }
 
-        if (count($flags) > 0) {
+        if (null !== $users && \count($users) > 0) {
+            $orXUser = $qb->expr()->orX();
+
+            foreach ($users as $key => $user) {
+                $orXUser->add(
+                    $qb->expr()->eq('t.assignee', ':user_'.$key)
+                );
+
+                $qb->setParameter('user_'.$key, $user);
+            }
+
+            if ($orXUser->count() > 0) {
+                $qb->andWhere($orXUser);
+            }
+        }
+
+        if (null !== $types && \count($types) > 0) {
+            $qb->andWhere($qb->expr()->in('t.type', ':types'));
+
+            $qb->setParameter('types', $types);
+        }
+
+        if (null !== $flags && \count($flags) > 0) {
             $orXDate = $qb->expr()->orX();
             $orXState = $qb->expr()->orX();
-            $now = new DateTime();
+            $now = new \DateTime();
 
             foreach ($flags as $key => $flag) {
                 switch ($flag) {
@@ -78,7 +78,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
                                 )
                             );
                         $qb
-                            ->setParameter('intervalBlank', new DateInterval('P0D'))
+                            ->setParameter('intervalBlank', new \DateInterval('P0D'))
                             ->setParameter('now', $now);
 
                         break;
@@ -119,8 +119,8 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
 
                         break;
 
-                    case substr($flag, 0, 6) === 'state_':
-                        $state = substr($flag, 6);
+                    case str_starts_with((string) $flag, 'state_'):
+                        $state = \substr((string) $flag, 6);
                         $orXState
                             ->add(
                                 "JSONB_EXISTS_IN_ARRAY(t.currentStates, :state_{$key}) = 'TRUE'"
@@ -130,7 +130,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
                         break;
 
                     default:
-                        throw new LogicException("this flag is not supported: {$flag}");
+                        throw new \LogicException("this flag is not supported: {$flag}");
                 }
             }
 
@@ -148,7 +148,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
 
     public function buildQueryByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): QueryBuilder {
         $qb = $this->buildBaseQuery($pattern, $flags);
@@ -160,7 +160,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
 
     public function buildQueryByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): QueryBuilder {
         $qb = $this->buildBaseQuery($pattern, $flags);
@@ -171,7 +171,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
     }
 
     public function buildQueryMyTasks(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): QueryBuilder {
         $qb = $this->buildBaseQuery($pattern, $flags);
@@ -182,10 +182,12 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
     }
 
     public function countByAllViewable(
-        ?string $pattern = null,
-        ?array $flags = []
+        string $pattern = null,
+        ?array $flags = [],
+        ?array $types = [],
+        ?array $users = []
     ): int {
-        $qb = $this->buildBaseQuery($pattern, $flags);
+        $qb = $this->buildBaseQuery($pattern, $flags, $types, $users);
 
         return $this
             ->addACLGlobal($qb)
@@ -195,7 +197,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
 
     public function countByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int {
         $qb = $this->buildQueryByCourse($course, $pattern, $flags);
@@ -207,7 +209,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
     }
 
     public function countByCurrentUsersTasks(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int {
         return $this->buildQueryMyTasks($pattern, $flags)
@@ -217,7 +219,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
 
     public function countByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int {
         $qb = $this->buildQueryByPerson($person, $pattern, $flags);
@@ -229,13 +231,15 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
     }
 
     public function findByAllViewable(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
+        ?array $types = [],
+        ?array $users = [],
         ?int $start = 0,
         ?int $limit = 50,
         ?array $orderBy = []
     ): array {
-        $qb = $this->buildBaseQuery($pattern, $flags);
+        $qb = $this->buildBaseQuery($pattern, $flags, $types, $users);
         $qb = $this->addACLGlobal($qb);
 
         return $this->getResult($qb, $start, $limit, $orderBy);
@@ -243,7 +247,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
 
     public function findByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?int $start = 0,
         ?int $limit = 50,
@@ -256,7 +260,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
     }
 
     public function findByCurrentUsersTasks(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?int $start = 0,
         ?int $limit = 50,
@@ -269,7 +273,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
 
     public function findByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?int $start = 0,
         ?int $limit = 50,
@@ -294,7 +298,7 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
             ->setMaxResults($limit);
 
         foreach ($orderBy as $field => $direction) {
-            $qb->addOrderBy('t.' . $field, $direction);
+            $qb->addOrderBy('t.'.$field, $direction);
         }
 
         return $qb->getQuery()->getResult();
@@ -350,14 +354,14 @@ final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepository
 
             $and = $qb->expr()->andX(
                 $qb->expr()->orX(
-                    $qb->expr()->eq('center_current_person.center', ':center_' . $k),
-                    $qb->expr()->eq('center_current_participation.center', ':center_' . $k)
+                    $qb->expr()->eq('center_current_person.center', ':center_'.$k),
+                    $qb->expr()->eq('center_current_participation.center', ':center_'.$k)
                 ),
-                $qb->expr()->in('t.circle', ':scopes_' . $k)
+                $qb->expr()->in('t.circle', ':scopes_'.$k)
             );
             $qb
-                ->setParameter('center_' . $k, $center)
-                ->setParameter('scopes_' . $k, $allowedScopes);
+                ->setParameter('center_'.$k, $center)
+                ->setParameter('scopes_'.$k, $allowedScopes);
             $orX->add($and);
 
             ++$k;
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
index 57c57e592..2f305ae3e 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
@@ -17,27 +17,31 @@ use Chill\PersonBundle\Entity\Person;
 interface SingleTaskAclAwareRepositoryInterface
 {
     public function countByAllViewable(
-        ?string $pattern = null,
-        ?array $flags = []
+        string $pattern = null,
+        ?array $flags = [],
+        ?array $types = [],
+        ?array $users = []
     ): int;
 
     public function countByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int;
 
-    public function countByCurrentUsersTasks(?string $pattern = null, ?array $flags = []): int;
+    public function countByCurrentUsersTasks(string $pattern = null, ?array $flags = []): int;
 
     public function countByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = []
     ): int;
 
     public function findByAllViewable(
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
+        ?array $types = [],
+        ?array $users = [],
         ?int $start = 0,
         ?int $limit = 50,
         ?array $orderBy = []
@@ -45,18 +49,18 @@ interface SingleTaskAclAwareRepositoryInterface
 
     public function findByCourse(
         AccompanyingPeriod $course,
-        ?string $pattern = null,
+        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 findByCurrentUsersTasks(string $pattern = null, ?array $flags = [], ?int $start = 0, ?int $limit = 50, ?array $orderBy = []): array;
 
     public function findByPerson(
         Person $person,
-        ?string $pattern = null,
+        string $pattern = null,
         ?array $flags = [],
         ?int $start = 0,
         ?int $limit = 50,
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
index e3eb634cd..6260b90c1 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
@@ -15,15 +15,9 @@ 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 LogicException;
-use Symfony\Component\Security\Core\Role\Role;
-use UnexpectedValueException;
-
-use function array_key_exists;
 use function count;
 
 /**
@@ -31,15 +25,15 @@ use function count;
  */
 class SingleTaskRepository extends EntityRepository
 {
-    public const DATE_STATUS_CURRENT = 'current';
+    final public const DATE_STATUS_CURRENT = 'current';
 
-    public const DATE_STATUS_ENDED = 'ended';
+    final public const DATE_STATUS_ENDED = 'ended';
 
-    public const DATE_STATUS_NOT_STARTED = 'not_started';
+    final public const DATE_STATUS_NOT_STARTED = 'not_started';
 
-    public const DATE_STATUS_WARNING = 'warning';
+    final public const DATE_STATUS_WARNING = 'warning';
 
-    public const DATE_STATUSES = [
+    final public const DATE_STATUSES = [
         self::DATE_STATUS_ENDED,
         self::DATE_STATUS_WARNING,
         self::DATE_STATUS_CURRENT,
@@ -59,11 +53,10 @@ class SingleTaskRepository extends EntityRepository
      * @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)');
@@ -146,20 +139,17 @@ class SingleTaskRepository extends EntityRepository
                     ->add($this->buildNowIsAfterWarningDate($qb, true))
                     ->add($this->buildNowIsAfterStartDate($qb, true));
         }
-        $qb->setParameter('now', new DateTime('today'), Types::DATE_MUTABLE);
+        $qb->setParameter('now', new \DateTime('today'), Types::DATE_MUTABLE);
         $qb->andWhere($andWhere);
     }
 
     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`');
+            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);
+        $role = TaskVoter::SHOW;
         $qb->join('st.person', 'p');
 
         $centers = $this->authorizationHelper
@@ -174,10 +164,10 @@ class SingleTaskRepository extends EntityRepository
 
             $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;
         }
@@ -185,56 +175,55 @@ class SingleTaskRepository extends EntityRepository
         $qb->where($where);
     }
 
-    protected function buildQuery(QueryBuilder $qb, $params, ?User $currentUser = null)
+    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'])) {
+        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)) {
+        } 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);
+                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.');
+        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'])) {
+        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'])) {
+        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) {
+        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'])) {
+        if (\array_key_exists('date_status', $params) && !empty($params['date_status'])) {
             $this->addTypeFilter($qb, $params);
         }
 
-        if (array_key_exists('is_closed', $params)) {
+        if (\array_key_exists('is_closed', $params)) {
             $qb->andWhere($this->buildIsClosed($qb, !$params['is_closed']));
         }
     }
@@ -306,4 +295,28 @@ class SingleTaskRepository extends EntityRepository
             ->add($qb->expr()->isNull('st.endDate'))
             ->add($qb->expr()->isNull('st.warningInterval'));
     }
+
+    public function countByDistinctTypes()
+    {
+        $qb = $this->createQueryBuilder('st')
+            ->select('COUNT(DISTINCT st.type)');
+
+        $this->buildQuery($qb, []);
+
+        return (int) $qb
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    public function findAllTaskDistinctTypes()
+    {
+        $qb = $this->createQueryBuilder('st')
+            ->select('DISTINCT st.type');
+
+        $this->buildQuery($qb, []);
+
+        return $qb
+            ->getQuery()
+            ->getResult();
+    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php
new file mode 100644
index 000000000..614870264
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskStateRepository.php
@@ -0,0 +1,46 @@
+<?php
+
+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 Chill\TaskBundle\Repository;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception;
+
+class SingleTaskStateRepository
+{
+    private const FIND_ALL_STATES = <<<'SQL'
+    SELECT DISTINCT jsonb_array_elements_text(current_states) FROM chill_task.single_task
+    SQL;
+
+    public function __construct(
+        private readonly Connection $connection
+    ) {}
+
+    /**
+     * Return a list of all states associated to at least one single task in the database.
+     *
+     * @return list<string>
+     *
+     * @throws Exception
+     */
+    public function findAllExistingStates(): array
+    {
+        $states = [];
+
+        foreach ($this->connection->fetchAllNumeric(self::FIND_ALL_STATES) as $row) {
+            if ('' !== $row[0] && null !== $row[0]) {
+                $states[] = $row[0];
+            }
+        }
+
+        return $states;
+    }
+}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig
index bc8a042d6..8c6ac735e 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig
@@ -14,7 +14,7 @@
         {% else %}
             <div class="flex-table chill-task-list">
                 {% for task in tasks %}
-                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : false } %}
+                    {% include '@ChillTask/SingleTask/List/index_item.html.twig' with { 'showContext' : false } %}
                 {% endfor %}
             </div>
         {% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig
index 8fe45959e..1cb2bc228 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title 'Tasks'|trans %}
 
@@ -14,7 +14,7 @@
         {% else %}
             <div class="flex-table chill-task-list">
                 {% for task in tasks %}
-                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : true} %}
+                    {% include '@ChillTask/SingleTask/List/index_item.html.twig' with { 'showContext' : true} %}
                 {% endfor %}
             </div>
         {% endif %}
@@ -27,8 +27,10 @@
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('page_task_list') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('page_task_list') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
 {% 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
index aea0269ea..87b9c4086 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig
@@ -3,7 +3,7 @@
         <div class="item-col">
             <div class="denomination h2">
                 {{ task.title }}
-                {% for place in workflow_marked_places(task) %}
+                {% for place in  workflow_marked_places(task) %}
                     <span class="task-status badge type-{{ task.type }} place-{{ place }}">
                         {{ place|trans }}
                     </span>
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
index 359d02ef0..64182fe3b 100644
--- 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
@@ -14,7 +14,7 @@
         {% else %}
             <div class="flex-table chill-task-list">
                 {% for task in tasks %}
-                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : true} %}
+                    {% include '@ChillTask/SingleTask/List/index_item.html.twig' with { 'showContext' : true} %}
                 {% endfor %}
             </div>
         {% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
index 0763dd8f3..f154205be 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
@@ -16,7 +16,7 @@
         {% else %}
             <div class="flex-table chill-task-list">
                 {% for task in tasks %}
-                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : false } %}
+                    {% include '@ChillTask/SingleTask/List/index_item.html.twig' with { 'showContext' : false } %}
                 {% endfor %}
             </div>
         {% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
index f6ae64592..3c1103ddf 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
@@ -11,27 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\TaskBundle\Security\Authorization;
 
-use Symfony\Component\EventDispatcher\Event;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\TaskBundle\Entity\AbstractTask;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
-class AuthorizationEvent extends Event
+class AuthorizationEvent extends \Symfony\Contracts\EventDispatcher\Event
 {
-    public const VOTE = 'chill_task.vote';
-
-    /**
-     * @var string
-     */
-    protected $attribute;
-
-    /**
-     * @var \Chill\PersonBundle\Entity\Person|Chill\TaskBundle\Entity\AbstractTask|null
-     */
-    protected $subject;
-
-    /**
-     * @var TokenInterface
-     */
-    protected $token;
+    final public const VOTE = 'chill_task.vote';
 
     /**
      * @var bool
@@ -39,14 +26,10 @@ class AuthorizationEvent extends Event
     protected $vote;
 
     public function __construct(
-        $subject,
-        $attribute,
-        TokenInterface $token
-    ) {
-        $this->subject = $subject;
-        $this->attribute = $attribute;
-        $this->token = $token;
-    }
+        private readonly null|AbstractTask|AccompanyingPeriod|Person $subject,
+        private readonly string $attribute,
+        private readonly TokenInterface $token
+    ) {}
 
     public function getAttribute()
     {
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
index f21249453..cc3992329 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
@@ -26,8 +26,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 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
 {
     public const CREATE_COURSE = 'CHILL_TASK_TASK_CREATE_FOR_COURSE';
@@ -48,24 +46,14 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
 
     public const UPDATE = 'CHILL_TASK_TASK_UPDATE';
 
-    private AccessDecisionManagerInterface $accessDecisionManager;
-
-    private EventDispatcherInterface $eventDispatcher;
-
-    private LoggerInterface $logger;
-
-    private VoterHelperInterface $voter;
+    private readonly VoterHelperInterface $voter;
 
     public function __construct(
-        AccessDecisionManagerInterface $accessDecisionManager,
-        EventDispatcherInterface $eventDispatcher,
-        LoggerInterface $logger,
+        private readonly AccessDecisionManagerInterface $accessDecisionManager,
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly LoggerInterface $logger,
         VoterHelperFactoryInterface $voterFactory
     ) {
-        $this->accessDecisionManager = $accessDecisionManager;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->logger = $logger;
-
         $this->voter = $voterFactory
             ->generate(AbstractTask::class)
             ->addCheckFor(AbstractTask::class, self::ROLES)
@@ -105,11 +93,11 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
 
         $event = new AuthorizationEvent($subject, $attribute, $token);
 
-        $this->eventDispatcher->dispatch(AuthorizationEvent::VOTE, $event);
+        $this->eventDispatcher->dispatch($event, AuthorizationEvent::VOTE);
 
         if ($event->hasVote()) {
             $this->logger->debug('The TaskVoter is overriding by '
-                . AuthorizationEvent::VOTE, [
+                .AuthorizationEvent::VOTE, [
                     'vote' => $event->getVote(),
                     'task_id' => $subject->getId(),
                 ]);
@@ -138,7 +126,7 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
 
         if ($subject instanceof AccompanyingPeriod) {
             if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
-                if (in_array($attribute, [self::UPDATE, self::CREATE_COURSE, self::DELETE], true)) {
+                if (\in_array($attribute, [self::UPDATE, self::CREATE_COURSE, self::DELETE], true)) {
                     return false;
                 }
             }
diff --git a/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php b/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
index 8b1646435..878ae43cd 100644
--- a/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
+++ b/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
@@ -31,7 +31,7 @@ class TaskTwigExtension extends AbstractExtension
     public function getFunctions()
     {
         return [
-            new TwigFunction('task_workflow_metadata', [$this, 'getWorkflowMetadata']),
+            new TwigFunction('task_workflow_metadata', $this->getWorkflowMetadata(...)),
         ];
     }
 
@@ -39,7 +39,7 @@ class TaskTwigExtension extends AbstractExtension
         AbstractTask $task,
         string $key,
         $metadataSubject = null,
-        ?string $name = 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 08a4177e1..c442dda8f 100644
--- a/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+++ b/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
@@ -18,11 +18,9 @@ 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';
+    final public const CACHE_KEY = 'chill_task.count_notifications.user.%d.%s';
 
     /**
      * @var CacheItempPoolInterface
@@ -104,7 +102,7 @@ class CountNotificationTask implements NotificationCounterInterface
         ];
 
         $sum = $this->singleTaskRepository->countByParameters(
-            array_merge($params, ['date_status' => $status])
+            [...$params, 'date_status' => $status]
         );
 
         $sumCache->set($sum);
diff --git a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
index c51eb9ed4..1453df4d0 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
@@ -15,11 +15,10 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Tests\TestHelper;
 use Faker;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use function array_filter;
-use function array_rand;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SingleTaskControllerTest extends WebTestCase
@@ -58,7 +57,7 @@ final class SingleTaskControllerTest extends WebTestCase
 
         $client->submit($form, [
             'title' => $title,
-            'circle' => $circles[array_rand($circles)],
+            'circle' => $circles[\array_rand($circles)],
         ]);
 
         $this->assertTrue($client->getResponse()->isRedirect(sprintf(
@@ -76,11 +75,9 @@ final class SingleTaskControllerTest extends WebTestCase
     }
 
     /**
-     * @param mixed $centerName
-     *
      * @return \Chill\PersonBundle\Entity\Person
      */
-    protected function getRandomPerson($centerName)
+    protected function getRandomPerson(mixed $centerName)
     {
         $em = self::$kernel
             ->getContainer()
@@ -90,22 +87,20 @@ final class SingleTaskControllerTest extends WebTestCase
             ->getRepository(Center::class)
             ->findAll();
 
-        $center = array_filter(
+        $center = \array_filter(
             $centers,
-            static function (Center $c) use ($centerName) {
-                return $c->getName() === $centerName;
-            }
+            static fn (Center $c) => $c->getName() === $centerName
         )[0];
 
         $ids = $em
             ->createQuery(
                 'SELECT p.id FROM ChillPersonBundle:Person p '
-                . 'WHERE p.center = :center'
+                .'WHERE p.center = :center'
             )
             ->setParameter('center', $center)
             ->getResult();
 
-        $id = $ids[array_rand($ids)];
+        $id = $ids[\array_rand($ids)];
 
         return self::$kernel
             ->getContainer()
diff --git a/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php b/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
index 41832a25c..e8758290a 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
@@ -15,8 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
-final class TaskControllerTest extends WebTestCase
-{
-}
+final class TaskControllerTest extends WebTestCase {}
diff --git a/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php b/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php
index 0bab53764..206b71a1b 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Repository/SingleTaskACLAwareRepositoryTest.php
@@ -28,10 +28,10 @@ use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Security;
-use function count;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
@@ -40,7 +40,7 @@ final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
 
     use ProphecyTrait;
 
-    private AuthorizationHelperInterface $authorizationHelper;
+    private readonly AuthorizationHelperInterface $authorizationHelper;
 
     private CenterRepositoryInterface $centerRepository;
 
@@ -152,7 +152,7 @@ final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
 
         $tasks = $repository->findByAllViewable(null, []);
 
-        $this->assertGreaterThanOrEqual(0, count($tasks));
+        $this->assertGreaterThanOrEqual(0, \count($tasks));
     }
 
     public function testFindByCourse(): void
@@ -162,7 +162,7 @@ final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
         $scopes = $this->scopeRepository->findAll();
         /** @var Person $person */
         $person = $this->em->createQuery(
-            'SELECT p FROM ' . Person::class . ' p JOIN p.centerCurrent cc
+            'SELECT p FROM '.Person::class.' p JOIN p.centerCurrent cc
             WHERE SIZE(p.accompanyingPeriodParticipations) > 0
             AND cc.center = :center'
         )
@@ -191,7 +191,7 @@ final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
 
         $tasks = $repository->findByCourse($period);
 
-        $this->assertGreaterThanOrEqual(0, count($tasks));
+        $this->assertGreaterThanOrEqual(0, \count($tasks));
     }
 
     public function testFindByPerson(): void
@@ -221,6 +221,6 @@ final class SingleTaskACLAwareRepositoryTest extends KernelTestCase
 
         $tasks = $repository->findByPerson($person, null, []);
 
-        $this->assertGreaterThanOrEqual(0, count($tasks));
+        $this->assertGreaterThanOrEqual(0, \count($tasks));
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
index b29c1818e..fbd02f289 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
@@ -16,19 +16,15 @@ use Chill\MainBundle\Timeline\TimelineSingleQuery;
 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.
  */
 class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
 {
-    public const TYPE = 'chill_task.transition';
+    final public const TYPE = 'chill_task.transition';
 
     /**
      * @var EntityManagerInterface
@@ -49,8 +45,7 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
     public function fetchQuery($context, $args)
     {
         if ('task' !== $context) {
-            throw new LogicException(sprintf('%s is not able '
-                    . 'to render context %s', self::class, $context));
+            throw new \LogicException(sprintf('%s is not able to render context %s', self::class, $context));
         }
 
         $metadata = $this->em
@@ -85,10 +80,8 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
             ->getRepository(SingleTaskPlaceEvent::class)
             ->findBy(['id' => $ids]);
 
-        return array_combine(
-            array_map(static function ($e) {
-                return $e->getId();
-            }, $events),
+        return \array_combine(
+            \array_map(static fn ($e) => $e->getId(), $events),
             $events
         );
     }
@@ -101,7 +94,7 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
         }
 
         return [
-            'template' => 'ChillTaskBundle:Timeline:single_task_transition_task_context.html.twig',
+            'template' => '@ChillTask/Timeline/single_task_transition_task_context.html.twig',
             'template_data' => [
                 'task' => $args['task'],
                 'event' => $entity,
diff --git a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
index e5414cac1..98b38a989 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
@@ -19,66 +19,29 @@ 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 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.
  */
 class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
 {
-    public const TYPE = 'chill_task.transition';
+    final public const TYPE = 'chill_task.transition';
 
-    protected AuthorizationHelper $authorizationHelper;
-
-    protected EntityManagerInterface $em;
-
-    protected Registry $registry;
-
-    protected Security $security;
-
-    public function __construct(
-        EntityManagerInterface $em,
-        Registry $registry,
-        AuthorizationHelper $authorizationHelper,
-        Security $security
-    ) {
-        $this->em = $em;
-        $this->registry = $registry;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->security = $security;
-    }
+    public function __construct(protected EntityManagerInterface $em, protected Registry $registry, protected AuthorizationHelper $authorizationHelper, protected Security $security) {}
 
     public function fetchQuery($context, $args)
     {
         $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");
-        }
+        [$where, $parameters] = match ($context) {
+            'person' => $this->getWhereClauseForPerson($args['person']),
+            'center' => $this->getWhereClauseForCenter($args['centers']),
+            default => throw new \UnexpectedValueException("context {$context} is not supported"),
+        };
 
         return TimelineSingleQuery::fromArray([
             'id' => sprintf('%s.%s.%s', $metadata->getSchemaName(), $metadata->getTableName(), $metadata->getColumnName('id')),
@@ -96,10 +59,8 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
             ->getRepository(SingleTaskPlaceEvent::class)
             ->findBy(['id' => $ids]);
 
-        return array_combine(
-            array_map(static function ($e) {
-                return $e->getId();
-            }, $events),
+        return \array_combine(
+            \array_map(static fn ($e) => $e->getId(), $events),
             $events
         );
     }
@@ -108,7 +69,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
     {
         $workflow = $this->registry->get(
             $entity->getTask(),
-            (isset($entity->getData()['workflow'])) ? $entity->getData()['workflow'] : null
+            $entity->getData()['workflow'] ?? null
         );
         // sf4 check: prevent error message:
         // `Notice: Undefined property: Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent::$getData`
@@ -118,7 +79,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         $transition = $this->getTransitionByName($entity->getTransition(), $workflow);
 
         return [
-            'template' => 'ChillTaskBundle:Timeline:single_task_transition.html.twig',
+            'template' => '@ChillTask/Timeline/single_task_transition.html.twig',
             'template_data' => [
                 'context' => $context,
                 'event' => $entity,
@@ -156,11 +117,11 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         $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} ' .
+        $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(
+        return \strtr(
             $from,
             [
                 '{single_task}' => sprintf('%s.%s', $singleTask->getSchemaName(), $singleTask->getTableName()),
@@ -195,10 +156,10 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         foreach (
             $this->authorizationHelper->getReachableCenters(
                 $this->security->getUser(),
-                new Role(ActivityVoter::SEE_DETAILS)
+                ActivityVoter::SEE_DETAILS
             ) as $center
         ) {
-            if (false === in_array($center, $centers, true)) {
+            if (false === \in_array($center, $centers, true)) {
                 continue;
             }
 
@@ -208,7 +169,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
             // we loop over circles
             $circles = $this->authorizationHelper->getReachableCircles(
                 $this->security->getUser(),
-                new Role(ActivityVoter::SEE_DETAILS),
+                ActivityVoter::SEE_DETAILS,
                 $center
             );
             $circleIds = [];
@@ -217,24 +178,24 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
                 $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)) {
+        if (0 === \count($clauses)) {
             return ['FALSE = TRUE', []];
         }
 
         return [
-            implode(' OR ', $clauses),
+            \implode(' OR ', $clauses),
             $parameters,
         ];
     }
@@ -261,11 +222,11 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         // we loop over circles
         $circles = $this->authorizationHelper->getReachableCircles(
             $this->security->getUser(),
-            new Role(ActivityVoter::SEE_DETAILS),
+            ActivityVoter::SEE_DETAILS,
             $personArg->getCenter()
         );
 
-        if (0 === count($circles)) {
+        if (0 === \count($circles)) {
             // go fast to block access to every tasks
             return ['FALSE = TRUE', []];
         }
@@ -275,14 +236,14 @@ 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,
diff --git a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
index a68e8c9b9..0f38252d8 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
@@ -13,21 +13,15 @@ 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;
-
 class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDefinition
 {
-    public const DEFINITION_METADATA = [
+    final public const DEFINITION_METADATA = [
         'name' => 'Default task',
     ];
 
-    public const TRANSITION_METADATA = [
+    final public const TRANSITION_METADATA = [
         'close' => [
             'verb' => 'close',
             'class' => 'btn btn-task-label btn-task-close',
@@ -61,15 +55,15 @@ class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDe
         string $key,
         $metadataSubject = null
     ) {
-        $keys = explode('.', $key);
+        $keys = \explode('.', $key);
 
         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;
@@ -81,23 +75,23 @@ class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDe
 
     public function isClosed(AbstractTask $task)
     {
-        return array_key_exists('closed', $task->getCurrentStates())
-            || array_key_exists('canceled', $task->getCurrentStates());
+        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';
+            && 'task_default' === $task->getType();
     }
 
     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;
         }
 
diff --git a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php
index 76a8da7c8..81fea25e6 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php
@@ -11,6 +11,4 @@ declare(strict_types=1);
 
 namespace Chill\TaskBundle\Workflow;
 
-interface TaskWorkflowDefinition
-{
-}
+interface TaskWorkflowDefinition {}
diff --git a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
index 404a19f2b..949786dd5 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
@@ -12,14 +12,10 @@ 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 function count;
-use function sprintf;
-
 class TaskWorkflowManager implements WorkflowSupportStrategyInterface
 {
     /**
@@ -33,9 +29,9 @@ class TaskWorkflowManager implements WorkflowSupportStrategyInterface
     }
 
     /**
-     * @throws LogicException
-     *
      * @return TaskWorkflowDefinition
+     *
+     * @throws \LogicException
      */
     public function getTaskWorkflowDefinition(AbstractTask $task)
     {
@@ -47,21 +43,20 @@ class TaskWorkflowManager implements WorkflowSupportStrategyInterface
             }
         }
 
-        $count = count($definitions);
+        $count = \count($definitions);
 
         if (1 < $count) {
-            throw new LogicException('More than one TaskWorkflowDefinition supports '
-                . 'this task. This should not happens.');
+            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()));
+            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)
+    public function getWorkflowMetadata(AbstractTask $task, string $key, $metadataSubject = null, string $name = null)
     {
         return $this->getTaskWorkflowDefinition($task)
             ->getWorkflowMetadata($task, $key, $metadataSubject);
diff --git a/src/Bundle/ChillTaskBundle/config/services/repositories.yaml b/src/Bundle/ChillTaskBundle/config/services/repositories.yaml
index 7bee5abd0..9681e5d5c 100644
--- a/src/Bundle/ChillTaskBundle/config/services/repositories.yaml
+++ b/src/Bundle/ChillTaskBundle/config/services/repositories.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_task.single_task_repository:
         class: Chill\TaskBundle\Repository\SingleTaskRepository
         factory: ['@doctrine.orm.entity_manager', getRepository]
@@ -10,8 +14,8 @@ services:
                   - "@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\SingleTaskAclAwareRepository: ~
 
     Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface: '@Chill\TaskBundle\Repository\SingleTaskAclAwareRepository'
+
+    Chill\TaskBundle\Repository\SingleTaskStateRepository: ~
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php b/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
index e3da643cc..1aea04a96 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
@@ -21,14 +21,14 @@ class Version20180413135614 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SCHEMA chill_task');
         $this->addSql('CREATE SEQUENCE chill_task.single_task_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php b/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
index c506290cf..80a17dc53 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
@@ -21,7 +21,7 @@ class Version20180413201023 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -32,7 +32,7 @@ class Version20180413201023 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_task.recurring_task_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_task.recurring_task (id INT NOT NULL, assignee_id INT DEFAULT NULL, person_id INT DEFAULT NULL, circle_id INT DEFAULT NULL, type VARCHAR(255) NOT NULL, current_states JSONB NOT NULL, title TEXT NOT NULL, description TEXT NOT NULL, first_occurence_end_date DATE NOT NULL, last_occurence_end_date DATE NOT NULL, occurence_frequency VARCHAR(255) NOT NULL, occurence_start_date INTERVAL NOT NULL, occurence_warning_interval INTERVAL DEFAULT NULL, PRIMARY KEY(id))');
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php b/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
index 3933c716b..82d494f01 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
@@ -21,7 +21,7 @@ class Version20180426093011 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_task.recurring_task DROP closed');
         $this->addSql('ALTER TABLE chill_task.single_task DROP closed');
@@ -29,7 +29,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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 77e1aebc8..17cc2f54d 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
@@ -21,7 +21,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -29,7 +29,7 @@ class Version20180502194119 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_task.single_task_place_event_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_task.single_task_place_event (id INT NOT NULL, author_id INT DEFAULT NULL, task_id INT DEFAULT NULL, datetime TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, transition VARCHAR(255) NOT NULL, data JSONB NOT NULL, PRIMARY KEY(id))');
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php b/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
index bd3157368..5bf8f6c51 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
@@ -21,7 +21,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX transition_task_date');
         $this->addSql('DROP INDEX transition_task');
@@ -29,7 +29,7 @@ final class Version20181113161925 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $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)');
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php b/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
index ba24d9f16..926b83778 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
@@ -21,7 +21,7 @@ final class Version20181113164108 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP INDEX by_type');
         $this->addSql('DROP INDEX by_current_state');
@@ -29,7 +29,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTaskBundle/translations/messages+intl-icu.fr.yml
new file mode 100644
index 000000000..dabbe6b35
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/translations/messages+intl-icu.fr.yml
@@ -0,0 +1,14 @@
+#widget
+nb tasks over deadline: >-
+    {nb, plural,
+        =0 {Aucune tâche dépassée}
+        one {Une tâche dépassée}
+        other {# tâches dépassées}
+    }
+
+nb tasks near deadline: >-
+    {nb, plural,
+        =0 {Aucune tâche en rappel}
+        one {Une tâche en rappel}
+        other {# tâches en rappel}
+    }
diff --git a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
index d437baac2..b0d155f59 100644
--- a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
@@ -65,6 +65,7 @@ Not assigned: Aucun utilisateur assigné
 For person: Pour
 By: Par
 Any tasks: Aucune tâche
+Filter by user: Filtrer par utilisateur(s)
 
 # transitions - default task definition
 "new": "nouvelle"
@@ -94,10 +95,6 @@ Are you sure you want to start this task ?: Êtes-vous sûrs de vouloir démarre
 "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"
-
 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
diff --git a/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php b/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php
index 4f280b4b9..f11473dd7 100644
--- a/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php
+++ b/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php
@@ -22,6 +22,6 @@ class ChillThirdPartyBundle extends Bundle
         parent::build($container);
         $container->registerForAutoconfiguration(ThirdPartyTypeProviderInterface::class)
             ->addTag('chill_3party.provider');
-        $container->addCompilerPass(new ThirdPartyTypeCompilerPass());
+        $container->addCompilerPass(new ThirdPartyTypeCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
index 4f430b91c..559310be6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
@@ -23,6 +23,6 @@ class AdminController extends AbstractController
      */
     public function indexAdminAction()
     {
-        return $this->render('ChillThirdPartyBundle:Admin:index.html.twig');
+        return $this->render('@ChillThirdParty/Admin/index.html.twig');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
index bc7a9effd..214d9ba36 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
@@ -19,7 +19,6 @@ use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyACLAwareRepositoryInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
-use LogicException;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -28,35 +27,18 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_merge;
-
 final class ThirdPartyController extends CRUDController
 {
-    protected AuthorizationHelper $authorizationHelper;
-
-    protected PaginatorFactory $paginatorFactory;
-
-    protected RequestStack $requestStack;
-
-    protected ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository;
-
-    protected TranslatorInterface $translator;
-
-    private bool $askCenter;
+    private readonly bool $askCenter;
 
     public function __construct(
-        AuthorizationHelper $authorizationHelper,
-        TranslatorInterface $translator,
-        PaginatorFactory $paginatorFactory,
-        RequestStack $requestStack,
-        ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository,
+        protected AuthorizationHelper $authorizationHelper,
+        protected TranslatorInterface $translator,
+        protected PaginatorFactory $paginatorFactory,
+        protected RequestStack $requestStack,
+        protected ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository,
         ParameterBagInterface $parameterBag
     ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->translator = $translator;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->requestStack = $requestStack;
-        $this->thirdPartyACLAwareRepository = $thirdPartyACLAwareRepository;
         $this->askCenter = $parameterBag->get('chill_main')['acl']['form_show_centers'];
     }
 
@@ -72,15 +54,15 @@ final class ThirdPartyController extends CRUDController
         return $this->getFilterOrderHelperFactory()
             ->create(self::class)
             ->addSearchBox(['name', 'company_name', 'acronym'])
-            //->addToggle('only-active', [])
+            // ->addToggle('only-active', [])
             //    ->addOrderBy()
             ->build();
     }
 
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    protected function countEntities(string $action, Request $request, FilterOrderHelper $filterOrder = null): int
     {
         if (null === $filterOrder) {
-            throw new LogicException('filterOrder should not be null');
+            throw new \LogicException('filterOrder should not be null');
         }
 
         return $this->thirdPartyACLAwareRepository->countThirdParties(
@@ -89,17 +71,17 @@ final class ThirdPartyController extends CRUDController
         );
     }
 
-    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    protected function createFormFor(string $action, $entity, string $formClass = null, array $formOptions = []): FormInterface
     {
         if ('new' === $action) {
-            return parent::createFormFor($action, $entity, $formClass, array_merge(
+            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(
+            return parent::createFormFor($action, $entity, $formClass, \array_merge(
                 $formOptions,
                 ['kind' => $entity->getKind()]
             ));
@@ -108,7 +90,7 @@ final class ThirdPartyController extends CRUDController
         return parent::createFormFor($action, $entity, $formClass, $formOptions);
     }
 
-    protected function getQueryResult(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, ?FilterOrderHelper $filterOrder = null)
+    protected function getQueryResult(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, FilterOrderHelper $filterOrder = null)
     {
         return $this->thirdPartyACLAwareRepository
             ->listThirdParties(
@@ -135,7 +117,7 @@ final class ThirdPartyController extends CRUDController
             $kind = $request->query->getAlpha('kind', '');
 
             if (!(ThirdParty::KIND_COMPANY === $kind || ThirdParty::KIND_CONTACT === $kind)) {
-                throw new BadRequestHttpException('This kind is not supported: ' . $kind);
+                throw new BadRequestHttpException('This kind is not supported: '.$kind);
             }
 
             $entity->setKind($kind);
@@ -145,7 +127,6 @@ final class ThirdPartyController extends CRUDController
     }
 
     /**
-     * @param $action
      * @param ThirdParty $entity
      */
     protected function onPostFetchEntity($action, Request $request, $entity): ?Response
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
index 6b40f01b9..7261deba4 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
@@ -16,21 +16,16 @@ 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\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Iterator;
 use libphonenumber\PhoneNumberUtil;
 use Nelmio\Alice\Loader\NativeLoader;
 use Nelmio\Alice\ObjectSet;
 
-use function array_map;
-use function count;
-
 class LoadThirdParty extends Fixture implements DependentFixtureInterface
 {
-    private PhoneNumberUtil $phoneNumberUtil;
+    private readonly PhoneNumberUtil $phoneNumberUtil;
 
     public function __construct()
     {
@@ -54,7 +49,7 @@ 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);
@@ -66,15 +61,13 @@ class LoadThirdParty extends Fixture implements DependentFixtureInterface
         $manager->flush();
     }
 
-    private function getCenters(): Iterator
+    private function getCenters(): \Iterator
     {
-        $references = array_map(
-            static function ($a) {
-                return $a['ref'];
-            },
+        $references = \array_map(
+            static fn ($a) => $a['ref'],
             LoadCenters::$centers
         );
-        $number = random_int(1, count($references));
+        $number = random_int(1, \count($references));
 
         if (1 === $number) {
             yield $this->getReference($references[array_rand($references)]);
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
index 22b1ee58d..061c85a4a 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
@@ -41,7 +41,7 @@ class LoadThirdPartyCategory extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($categories as $val) {
-            echo 'Creating thirdparty category : ' . $val['name']['fr'] . "\n";
+            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 e29f17c51..265a773cb 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
@@ -39,7 +39,7 @@ class LoadThirdPartyProfession extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($professions as $val) {
-            echo 'Creating thirdparty professions : ' . $val['name']['fr'] . "\n";
+            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 3c870449c..91625c827 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -37,7 +37,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
         $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');
@@ -70,7 +70,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
 
     protected function preprendRoutes(ContainerBuilder $container)
     {
-        //declare routes for 3party bundle
+        // declare routes for 3party bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [
@@ -130,8 +130,8 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                     'class' => \Chill\ThirdPartyBundle\Entity\ThirdParty::class,
                     'name' => 'thirdparty',
                     'base_path' => '/api/1.0/thirdparty/thirdparty',
-                    //'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::SHOW,
-                    //'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
+                    // 'base_role' => \Chill\ThirdPartyBundle\Security\Authorization\ThirdPartyVoter::SHOW,
+                    // 'controller' => \Chill\ThirdPartyBundle\Controller\ThirdPartyApiController::class,
                     'actions' => [
                         '_entity' => [
                             'methods' => [
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
index f5fa9d05a..8586451b2 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
@@ -12,20 +12,17 @@ declare(strict_types=1);
 namespace Chill\ThirdPartyBundle\DependencyInjection\CompilerPass;
 
 use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
-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.
  */
 class ThirdPartyTypeCompilerPass implements CompilerPassInterface
 {
-    public const TAG = 'chill_3party.provider';
+    final public const TAG = 'chill_3party.provider';
 
     public function process(ContainerBuilder $container)
     {
@@ -37,11 +34,8 @@ class ThirdPartyTypeCompilerPass implements CompilerPassInterface
             // check forr keys already in use :
             $key = $taggedService->getClass()::getKey();
 
-            if (in_array($key, $usedKeys, true)) {
-                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
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
index 3248f58d7..d4c2cd598 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
@@ -24,7 +24,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_third_party');
-        $rootNode = $treeBuilder->getRootNode('chill_third_party');
+        $rootNode = $treeBuilder->getRootNode();
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index ca24d2442..f4ad5293c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -19,8 +19,6 @@ use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ReadableCollection;
@@ -30,15 +28,6 @@ use Symfony\Component\Serializer\Annotation\Context;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
 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.
@@ -76,6 +65,7 @@ use function spl_object_hash;
  * database by a Php array, mapped by a jsonb into the database. This has one advantage: it is easily searchable.
  *
  * As the list of type is hardcoded into database, it is more easily searchable. (for chill 2.0, the
+ *
  * @see{Chill\ThirdPartyBundle\Form\Type\PickThirdPartyDynamicType} does not support it yet, but
  * the legacy @see{Chill\ThirdPartyBundle\Form\Type\PickThirdPartyType} does.
  *
@@ -83,25 +73,28 @@ use function spl_object_hash;
  * noticing a difference.
  *
  * @ORM\Entity
+ *
  * @ORM\Table(name="chill_3party.third_party")
+ *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "thirdparty": ThirdParty::class
  * })
  */
-class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
+class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Stringable
 {
-    public const KIND_CHILD = 'child';
+    final public const KIND_CHILD = 'child';
 
-    public const KIND_COMPANY = 'company';
+    final public const KIND_COMPANY = 'company';
 
-    public const KIND_CONTACT = 'contact';
+    final public const KIND_CONTACT = 'contact';
 
     /**
      * [fr] Sigle.
      *
-     * @var string
      * @ORM\Column(name="acronym", type="string", length=64, nullable=true)
+     *
      * @Assert\Length(min="2")
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?string $acronym = '';
@@ -116,8 +109,11 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
      * cascade={"persist", "remove"})
+     *
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
     private ?Address $address = null;
@@ -132,18 +128,25 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     private ?string $canonicalized = '';
 
     /**
-     * @var ThirdPartyCategory
+     * @var Collection<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")})
+     *
      * @Groups({"docgen:read", "docgen:read:3party:parent"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
     private Collection $categories;
 
     /**
+     * @var Collection<Center>
+     *
      * @ORM\ManyToMany(targetEntity="\Chill\MainBundle\Entity\Center")
+     *
      * @ORM\JoinTable(name="chill_3party.party_center")
      */
     private Collection $centers;
@@ -154,28 +157,32 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\OneToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty", mappedBy="parent",
      * cascade={"persist"}, orphanRemoval=true)
      *
-     * @var Collection<(int|string), ThirdParty>
+     * @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({"read", "write", "docgen:read", "docgen:read:3party:parent"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
     private ?Civility $civility = null;
 
     /**
      * @ORM\Column(name="comment", type="text", nullable=true)
+     *
      * @Groups({"read", "write"})
      */
     private ?string $comment = null;
 
     /**
      * @ORM\Column(name="contact_data_anonymous", type="boolean", options={"default": false})
+     *
      * @Groups({"read", "docgen:read", "docgen:read:3party:parent"})
      */
     private bool $contactDataAnonymous = false;
@@ -183,58 +190,69 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(name="created_at", type="datetime_immutable", nullable=false)
      */
-    private DateTimeImmutable $createdAt;
+    private \DateTimeImmutable $createdAt;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @ORM\JoinColumn(name="created_by", referencedColumnName="id")
      */
-    private ?User $createdBy;
+    private ?User $createdBy = null;
 
     /**
      * @ORM\Column(name="email", type="string", length=255, nullable=true)
-     * @Assert\Email(checkMX=false)
+     *
+     * @Assert\Email()
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?string $email = null;
 
     /**
      * @ORM\Column(name="firstname", type="text", options={"default": ""})
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
-    private string $firstname = '';
+    private ?string $firstname = '';
 
     /**
-     * @var int
      * @ORM\Column(name="id", type="integer")
+     *
      * @ORM\Id
+     *
      * @ORM\GeneratedValue(strategy="AUTO")
+     *
      * @Groups({"read", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(name="kind", type="string", length="20", options={"default": ""})
+     *
      * @Groups({"write", "docgen:read", "docgen:read:3party:parent"})
      */
-    private ?string $kind = '';
+    private string $kind = '';
 
     /**
-     * @var string
      * @ORM\Column(name="name", type="string", length=255)
+     *
      * @Assert\Length(min="2")
+     *
      * @Assert\NotNull
+     *
      * @Assert\NotBlank
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
-    private ?string $name = '';
+    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", "docgen:read:3party:parent"})
      */
     private ?string $nameCompany = '';
@@ -243,23 +261,31 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      * 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", "write", "docgen:read"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read:3party:parent"}, groups={"docgen:read"})
      */
     private ?ThirdParty $parent = null;
 
     /**
      * [fr] Qualité.
+     *
      * @ORM\Column(name="profession", type="text", nullable=false)
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
+     *
      * @Context(normalizationContext={"groups": "docgen:read"}, groups={"docgen:read:3party:parent"})
      */
     private string $profession = '';
 
     /**
      * @ORM\Column(name="telephone", type="phone_number", nullable=true)
+     *
      * @PhonenumberConstraint(type="any")
+     *
      * @Groups({"read", "write", "docgen:read", "docgen:read:3party:parent"})
      */
     private ?PhoneNumber $telephone = null;
@@ -272,13 +298,14 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\Column(name="updated_at", type="datetime_immutable", nullable=true)
      */
-    private ?DateTimeImmutable $updatedAt;
+    private ?\DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @ORM\JoinColumn(name="updated_by", referencedColumnName="id")
      */
-    private ?User $updatedBy;
+    private ?User $updatedBy = null;
 
     /**
      * ThirdParty constructor.
@@ -290,10 +317,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         $this->children = new ArrayCollection();
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->getName();
     }
@@ -354,7 +378,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
             return $this;
         }
 
-        if (!in_array($type, $this->thirdPartyTypes ?? [], true)) {
+        if (!\in_array($type, $this->thirdPartyTypes ?? [], true)) {
             $this->thirdPartyTypes[] = $type;
         }
 
@@ -373,21 +397,15 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
             return $this;
         }
 
-        if (is_string($typeAndCategory)) {
+        if (\is_string($typeAndCategory)) {
             $this->addThirdPartyTypes($typeAndCategory);
 
             return $this;
         }
 
-        throw new UnexpectedValueException(sprintf(
-            'typeAndCategory should be a string or a %s',
-            ThirdPartyCategory::class
-        ));
+        throw new \UnexpectedValueException(sprintf('typeAndCategory should be a string or a %s', ThirdPartyCategory::class));
     }
 
-    /**
-     * @return string
-     */
     public function getAcronym(): ?string
     {
         return $this->acronym;
@@ -437,15 +455,13 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * Get comment.
-     *
-     * @return string|null
      */
-    public function getComment()
+    public function getComment(): ?string
     {
         return $this->comment;
     }
 
-    public function getCreatedAt(): DateTimeImmutable
+    public function getCreatedAt(): \DateTimeImmutable
     {
         return $this->createdAt;
     }
@@ -488,9 +504,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this->parent;
     }
 
-    /**
-     * @return string
-     */
     public function getProfession(): string
     {
         return $this->profession;
@@ -506,26 +519,24 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * Get type.
-     *
-     * @return array|null
      */
-    public function getThirdPartyTypes()
+    public function getThirdPartyTypes(): ?array
     {
         return $this->thirdPartyTypes ?? [];
     }
 
     public function getTypesAndCategories(): array
     {
-        return array_merge(
+        return \array_merge(
             $this->getCategories()->toArray(),
             $this->getThirdPartyTypes() ?? []
         );
     }
 
     /**
-     * @return DateTime|null
+     * @return \DateTime|null
      */
-    public function getUpdatedAt(): ?DateTimeImmutable
+    public function getUpdatedAt(): ?\DateTimeImmutable
     {
         return $this->updatedAt;
     }
@@ -553,7 +564,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      */
     public function isLeaf(): bool
     {
-        return $this->children->count() !== 0;
+        return 0 !== $this->children->count();
     }
 
     public function isParent(): bool
@@ -616,8 +627,8 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
             return $this;
         }
 
-        if (in_array($type, $this->thirdPartyTypes ?? [], true)) {
-            $this->thirdPartyTypes = array_filter($this->thirdPartyTypes, fn ($e) => !in_array($e, $this->thirdPartyTypes, true));
+        if (\in_array($type, $this->thirdPartyTypes ?? [], true)) {
+            $this->thirdPartyTypes = \array_filter($this->thirdPartyTypes, fn ($e) => !\in_array($e, $this->thirdPartyTypes, true));
         }
 
         foreach ($this->children as $child) {
@@ -635,24 +646,16 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
             return $this;
         }
 
-        if (is_string($typeAndCategory)) {
+        if (\is_string($typeAndCategory)) {
             $this->removeThirdPartyTypes($typeAndCategory);
 
             return $this;
         }
 
-        throw new UnexpectedValueException(sprintf(
-            'typeAndCategory should be a string or a %s',
-            ThirdPartyCategory::class
-        ));
+        throw new \UnexpectedValueException(sprintf('typeAndCategory should be a string or a %s', ThirdPartyCategory::class));
     }
 
-    /**
-     * @param string $acronym
-     *
-     * @return $this
-     */
-    public function setAcronym(?string $acronym = null): ThirdParty
+    public function setAcronym(string $acronym = null): ThirdParty
     {
         $this->acronym = (string) $acronym;
 
@@ -676,7 +679,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @return $this
      */
-    public function setAddress(?Address $address = null)
+    public function setAddress(Address $address = null)
     {
         $this->address = $address;
 
@@ -701,9 +704,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    /**
-     * @return $this
-     */
     public function setCivility(?Civility $civility): ThirdParty
     {
         $this->civility = $civility;
@@ -714,11 +714,9 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Set comment.
      *
-     * @param string|null $comment
-     *
      * @return ThirdParty
      */
-    public function setComment($comment = null)
+    public function setComment(string $comment = null)
     {
         $this->comment = $comment;
 
@@ -733,11 +731,11 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     }
 
     /**
-     * @param DateTimeImmutable $createdAt
+     * @param \DateTimeImmutable $createdAt
      *
      * @return $this
      */
-    public function setCreatedAt(DateTimeInterface $createdAt): ThirdParty
+    public function setCreatedAt(\DateTimeInterface $createdAt): ThirdParty
     {
         $this->createdAt = $createdAt;
 
@@ -754,11 +752,9 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Set email.
      *
-     * @param string|null $email
-     *
      * @return ThirdParty
      */
-    public function setEmail($email = null)
+    public function setEmail(string $email = null)
     {
         $this->email = trim((string) $email);
 
@@ -774,7 +770,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 
     public function setKind(?string $kind): ThirdParty
     {
-        $this->kind = $kind;
+        $this->kind = (string) $kind;
 
         return $this;
     }
@@ -786,9 +782,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    /**
-     * @param string $nameCompany
-     */
     public function setNameCompany(?string $nameCompany): ThirdParty
     {
         $this->nameCompany = (string) $nameCompany;
@@ -796,9 +789,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    /**
-     * @return $this
-     */
     public function setParent(?ThirdParty $parent): ThirdParty
     {
         $this->parent = $parent;
@@ -816,7 +806,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     /**
      * Set telephone.
      */
-    public function setTelephone(?PhoneNumber $telephone = null): self
+    public function setTelephone(PhoneNumber $telephone = null): self
     {
         $this->telephone = $telephone;
 
@@ -831,7 +821,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     public function setThirdPartyTypes(?array $type = [])
     {
         // remove all keys from the input data
-        $this->thirdPartyTypes = array_values($type);
+        $this->thirdPartyTypes = \array_values($type);
 
         foreach ($this->children as $child) {
             $child->setThirdPartyTypes($type);
@@ -842,7 +832,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 
     public function setTypesAndCategories(array $typesAndCategories): self
     {
-        $types = array_filter($typesAndCategories, static fn ($item) => !$item instanceof ThirdPartyCategory);
+        $types = \array_filter($typesAndCategories, static fn ($item) => !$item instanceof ThirdPartyCategory);
         $this->setThirdPartyTypes($types);
 
         // handle categories
@@ -850,15 +840,15 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
             $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);
+        $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)) {
+            if (!\in_array(\spl_object_hash($t), $categoriesHashes, true)) {
                 $this->removeCategory($t);
             }
         }
@@ -867,11 +857,11 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
     }
 
     /**
-     * @param DateTimeImmutable $updatedAt
+     * @param \DateTimeImmutable $updatedAt
      *
      * @return $this
      */
-    public function setUpdatedAt(DateTimeInterface $updatedAt): ThirdParty
+    public function setUpdatedAt(\DateTimeInterface $updatedAt): ThirdParty
     {
         $this->updatedAt = $updatedAt;
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
index d9c23611e..7bd8f9f7b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_3party.party_category")
+ *
  * @ORM\Entity(repositoryClass=ThirdPartyCategoryRepository::class)
  */
 class ThirdPartyCategory
@@ -28,14 +29,18 @@ class ThirdPartyCategory
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"docgen:read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
index 19fefd765..8994543c2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
@@ -17,7 +17,9 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_3party.party_profession")
+ *
  * @ORM\Entity(repositoryClass=ThirdPartyProfessionRepository::class)
+ *
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  * "third_party_profession": ThirdPartyProfession::class})
  */
@@ -25,20 +27,25 @@ class ThirdPartyProfession
 {
     /**
      * @ORM\Column(type="boolean")
+     *
      * @Serializer\Groups({"read"})
      */
     private bool $active = true;
 
     /**
      * @ORM\Id
+     *
      * @ORM\GeneratedValue
+     *
      * @ORM\Column(type="integer")
+     *
      * @Serializer\Groups({"docgen:read", "read", "write"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     *
      * @Serializer\Groups({"docgen:read", "read"})
      */
     private array $name = [];
diff --git a/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php b/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
index 7c620f786..d49c343a8 100644
--- a/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
+++ b/src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
@@ -13,14 +13,12 @@ namespace Chill\ThirdPartyBundle\EventListener;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 
-use const MB_CASE_TITLE;
-
 class ThirdPartyEventListener
 {
     public function prePersistThirdParty(ThirdParty $thirdparty): void
     {
-        if ($thirdparty->getKind() !== 'company') {
-            $firstnameCaps = mb_convert_case(mb_strtolower($thirdparty->getFirstname()), MB_CASE_TITLE, 'UTF-8');
+        if ('company' !== $thirdparty->getKind()) {
+            $firstnameCaps = mb_convert_case(mb_strtolower($thirdparty->getFirstname()), \MB_CASE_TITLE, 'UTF-8');
             $firstnameCaps = ucwords(strtolower($firstnameCaps), " \t\r\n\f\v'-");
             $thirdparty->setFirstName($firstnameCaps);
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Export/Helper/LabelThirdPartyHelper.php b/src/Bundle/ChillThirdPartyBundle/Export/Helper/LabelThirdPartyHelper.php
index f87fe41b4..9b4cbfa75 100644
--- a/src/Bundle/ChillThirdPartyBundle/Export/Helper/LabelThirdPartyHelper.php
+++ b/src/Bundle/ChillThirdPartyBundle/Export/Helper/LabelThirdPartyHelper.php
@@ -13,20 +13,10 @@ namespace Chill\ThirdPartyBundle\Export\Helper;
 
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use function count;
-use const SORT_NUMERIC;
 
 class LabelThirdPartyHelper
 {
-    private ThirdPartyRender $thirdPartyRender;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    public function __construct(ThirdPartyRender $thirdPartyRender, ThirdPartyRepository $thirdPartyRepository)
-    {
-        $this->thirdPartyRender = $thirdPartyRender;
-        $this->thirdPartyRepository = $thirdPartyRepository;
-    }
+    public function __construct(private readonly ThirdPartyRender $thirdPartyRender, private readonly ThirdPartyRepository $thirdPartyRepository) {}
 
     public function getLabel(string $key, array $values, string $header): callable
     {
@@ -54,9 +44,9 @@ class LabelThirdPartyHelper
                 return '';
             }
 
-            $decoded = json_decode($value);
+            $decoded = json_decode((string) $value, null, 512, JSON_THROW_ON_ERROR);
 
-            if (0 === count($decoded)) {
+            if (0 === \count($decoded)) {
                 return '';
             }
 
@@ -75,7 +65,7 @@ class LabelThirdPartyHelper
                         },
                         array_unique(
                             array_filter($decoded, static fn (?int $id) => null !== $id),
-                            SORT_NUMERIC
+                            \SORT_NUMERIC
                         )
                     )
                 );
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php b/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
index 7d5bded0f..1beb72a1d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
@@ -13,14 +13,10 @@ namespace Chill\ThirdPartyBundle\Form\ChoiceLoader;
 
 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.
  *
@@ -61,8 +57,8 @@ class ThirdPartyChoiceLoader implements ChoiceLoaderInterface
         foreach ($values as $value) {
             $party = $this->partyRepository->find($value);
 
-            if (false === in_array($this->center, $party->getCenters()->toArray(), true)) {
-                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;
@@ -82,7 +78,7 @@ class ThirdPartyChoiceLoader implements ChoiceLoaderInterface
                 continue;
             }
 
-            $id = call_user_func($value, $choice);
+            $id = \call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedParties[$id] = $choice;
         }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index b1446a543..046d553e9 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -34,35 +34,18 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
-use function array_key_exists;
-
 class ThirdPartyType extends AbstractType
 {
-    protected AuthorizationHelper $authorizationHelper;
-
-    protected EntityManagerInterface $om;
-
-    protected TokenStorageInterface $tokenStorage;
-
-    protected TranslatableStringHelper $translatableStringHelper;
-
-    protected ThirdPartyTypeManager $typesManager;
-
-    private bool $askCenter;
+    private readonly bool $askCenter;
 
     public function __construct(
-        AuthorizationHelper $authorizationHelper,
-        TokenStorageInterface $tokenStorage,
-        ThirdPartyTypeManager $typesManager,
-        TranslatableStringHelper $translatableStringHelper,
-        EntityManagerInterface $om,
+        protected AuthorizationHelper $authorizationHelper,
+        protected TokenStorageInterface $tokenStorage,
+        protected ThirdPartyTypeManager $typesManager,
+        protected TranslatableStringHelper $translatableStringHelper,
+        protected 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'];
     }
 
@@ -86,7 +69,7 @@ class ThirdPartyType extends AbstractType
         if ($this->askCenter) {
             $builder
                 ->add('centers', PickCenterType::class, [
-                    'role' => (array_key_exists('data', $options) && $this->om->contains($options['data'])) ?
+                    'role' => (\array_key_exists('data', $options) && $this->om->contains($options['data'])) ?
                         ThirdPartyVoter::UPDATE : ThirdPartyVoter::CREATE,
                     'choice_options' => [
                         'multiple' => true,
@@ -117,7 +100,7 @@ class ThirdPartyType extends AbstractType
                     'label' => 'thirdparty.Contact data are confidential',
                 ]);
 
-        // Institutional ThirdParty (parent)
+            // Institutional ThirdParty (parent)
         } else {
             $builder
                 ->add('nameCompany', TextType::class, [
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
index ed4b3c1e7..85fe9fe7a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
@@ -24,13 +24,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_diff;
-use function array_merge;
-use function count;
-use function is_array;
-
 /**
- * @deprecated use the @link{PickThirdPartyDynamicType::class}
+ * @deprecated use the @see{PickThirdPartyDynamicType::class}
+ *
  * @note do remove ThirdPartyChoiceLoader if this class is removed
  */
 class PickThirdPartyType extends AbstractType
@@ -69,7 +65,7 @@ class PickThirdPartyType extends AbstractType
 
     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
@@ -94,24 +90,21 @@ class PickThirdPartyType extends AbstractType
             ->setDefined('types')
             ->setRequired('types')
             ->setAllowedValues('types', function ($types) {
-                if (false === is_array($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;
+                return 0 === \count(\array_diff($types, $this->typesManager->getTypes()));
             });
 
         $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)
-                );
-            });
+            ->setDefault('choice_label', static fn (ThirdParty $tp) => $tp->getName())
+            ->setDefault('choice_loader', fn (Options $options) => new ThirdPartyChoiceLoader(
+                $options['center'],
+                $this->em->getRepository(ThirdParty::class)
+            ));
     }
 
     public function getParent(): string
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
index eb7966084..77720331d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
@@ -20,48 +20,24 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 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 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,
-        TranslatableStringHelper $translatableStringHelper,
-        TranslatorInterface $translator
-    ) {
-        $this->thirdPartyCategoryRepository = $thirdPartyCategoryRepository;
-        $this->thirdPartyTypeManager = $thirdPartyTypeManager;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->translator = $translator;
-    }
+    public function __construct(private readonly ThirdPartyCategoryRepository $thirdPartyCategoryRepository, private readonly ThirdPartyTypeManager $thirdPartyTypeManager, private readonly TranslatableStringHelper $translatableStringHelper, private readonly TranslatorInterface $translator) {}
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $choices = array_merge(
+        $choices = \array_merge(
             $this->thirdPartyCategoryRepository->findBy(['active' => true]),
             $this->thirdPartyTypeManager->getTypes()
         );
 
-        uasort($choices, function ($itemA, $itemB) {
+        \uasort($choices, function ($itemA, $itemB) {
             $strA = $itemA instanceof ThirdPartyCategory ? $this->translatableStringHelper
-                ->localize($itemA->getName()) : $this->translator->trans(self::PREFIX_TYPE . $itemA);
+                ->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);
+                ->localize($itemB->getName()) : $this->translator->trans(self::PREFIX_TYPE.$itemB);
 
             return $strA <=> $strB;
         });
@@ -75,11 +51,9 @@ class PickThirdPartyTypeCategoryType extends \Symfony\Component\Form\AbstractTyp
                     return $this->translatableStringHelper->localize($item->getName());
                 }
 
-                return self::PREFIX_TYPE . $item;
-            },
-            'choice_value' => function ($item) {
-                return $this->reverseTransform($item);
+                return self::PREFIX_TYPE.$item;
             },
+            'choice_value' => fn ($item) => $this->reverseTransform($item),
         ]);
     }
 
@@ -95,13 +69,13 @@ class PickThirdPartyTypeCategoryType extends \Symfony\Component\Form\AbstractTyp
         }
 
         if ($value instanceof ThirdPartyCategory) {
-            return 'category:' . $value->getId();
+            return 'category:'.$value->getId();
         }
 
-        if (is_string($value)) {
-            return 'type:' . $value;
+        if (\is_string($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/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
index eb9e7e5ea..0fd640f9b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -26,18 +26,7 @@ use Symfony\Component\Serializer\SerializerInterface;
  */
 class PickThirdpartyDynamicType extends AbstractType
 {
-    private DenormalizerInterface $denormalizer;
-
-    private NormalizerInterface $normalizer;
-
-    private SerializerInterface $serializer;
-
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, NormalizerInterface $normalizer)
-    {
-        $this->denormalizer = $denormalizer;
-        $this->serializer = $serializer;
-        $this->normalizer = $normalizer;
-    }
+    public function __construct(private readonly DenormalizerInterface $denormalizer, private readonly SerializerInterface $serializer, private readonly NormalizerInterface $normalizer) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
index 9200bc6ed..f05ad0296 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
@@ -15,22 +15,11 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Security\Core\Security;
 
-final class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareRepositoryInterface
+final readonly class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareRepositoryInterface
 {
-    private AuthorizationHelper $authorizationHelper;
+    public function __construct(private Security $security, private AuthorizationHelper $authorizationHelper, private ThirdPartyRepository $thirdPartyRepository) {}
 
-    private Security $security;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    public function __construct(Security $security, AuthorizationHelper $authorizationHelper, ThirdPartyRepository $thirdPartyRepository)
-    {
-        $this->security = $security;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->thirdPartyRepository = $thirdPartyRepository;
-    }
-
-    public function buildQuery(?string $filterString = null): QueryBuilder
+    public function buildQuery(string $filterString = null): QueryBuilder
     {
         $qb = $this->thirdPartyRepository->createQueryBuilder('tp');
 
@@ -42,7 +31,7 @@ final class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareRepository
 
         if (null !== $filterString) {
             $qb->andWhere($qb->expr()->like('tp.canonicalized', 'LOWER(UNACCENT(:filterString))'))
-                ->setParameter('filterString', '%' . $filterString . '%');
+                ->setParameter('filterString', '%'.$filterString.'%');
         }
 
         return $qb;
@@ -62,13 +51,13 @@ final class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareRepository
         string $role,
         ?string $filterString,
         ?array $orderBy = [],
-        ?int $limit = null,
-        ?int $offset = null
+        int $limit = null,
+        int $offset = null
     ): array {
         $qb = $this->buildQuery($filterString);
 
         foreach ($orderBy as $sort => $direction) {
-            $qb->addOrderBy('tp.' . $sort, $direction);
+            $qb->addOrderBy('tp.'.$sort, $direction);
         }
 
         $qb->setFirstResult($offset)
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
index 76e15ef17..c2e6c74c1 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
@@ -17,13 +17,10 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use DomainException;
 
-use function array_key_exists;
-
-final class ThirdPartyRepository implements ObjectRepository
+class ThirdPartyRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -32,7 +29,6 @@ final class ThirdPartyRepository implements ObjectRepository
 
     /**
      * count amongst parties associated to $centers, with $terms parameters.
-     *
      */
     public function countByMemberOfCenters(array $centers, array $terms = []): int
     {
@@ -42,7 +38,7 @@ final class ThirdPartyRepository implements ObjectRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function createQueryBuilder(string $alias, string $indexBy = null): QueryBuilder
     {
         return $this->repository->createQueryBuilder($alias, $indexBy);
     }
@@ -66,7 +62,7 @@ final class ThirdPartyRepository implements ObjectRepository
      *
      * @return array|ThirdParty[]
      */
-    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);
     }
@@ -85,9 +81,9 @@ final class ThirdPartyRepository implements ObjectRepository
      * - is_active: is active = true / false
      * - types: an array of types
      *
-     * @param int $firstResult
-     * @param int $maxResults
-     * @param array $terms
+     * @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
@@ -117,7 +113,7 @@ final class ThirdPartyRepository implements ObjectRepository
                 break;
 
             default:
-                throw new DomainException('This return format is invalid');
+                throw new \DomainException('This return format is invalid');
         }
         $qb->setFirstResult($firstResult)
             ->setMaxResults($maxResults);
@@ -152,8 +148,8 @@ final class ThirdPartyRepository implements ObjectRepository
         $or = $qb->expr()->orX();
 
         foreach ($centers as $center) {
-            $or->add($qb->expr()->isMemberOf(':center_' . $center->getId(), 'tp.centers'));
-            $qb->setParameter('center_' . $center->getId(), $center);
+            $or->add($qb->expr()->isMemberOf(':center_'.$center->getId(), 'tp.centers'));
+            $qb->setParameter('center_'.$center->getId(), $center);
         }
 
         $qb->where($or);
@@ -163,7 +159,7 @@ final class ThirdPartyRepository implements ObjectRepository
 
     private function setIsActiveCondition(QueryBuilder $qb, array $terms)
     {
-        if (array_key_exists('is_active', $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'")
@@ -177,25 +173,25 @@ final class ThirdPartyRepository implements ObjectRepository
      */
     private function setNameCondition(QueryBuilder $qb, array $terms)
     {
-        if (array_key_exists('name', $terms) || array_key_exists('_default', $terms)) {
+        if (\array_key_exists('name', $terms) || \array_key_exists('_default', $terms)) {
             $term = $terms['name'] ?? $terms['_default'];
 
             if (null === $term || '' === $term) {
                 return;
             }
             $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(tp.name))', 'UNACCENT(LOWER(:name))'));
-            $qb->setParameter('name', '%' . $term . '%');
+            $qb->setParameter('name', '%'.$term.'%');
         }
     }
 
     private function setTypesCondition(QueryBuilder $qb, array $terms)
     {
-        if (array_key_exists('types', $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);
+                $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/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index f330246fc..4e7fd159d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -25,7 +25,7 @@
 
                     <dt>{{ 'Name'|trans }}</dt>
                     <dd>
-                        {% if thirdParty.isLeaf == true %}{{ thirdParty.civility }}{% endif %}
+                        {% if thirdParty.isLeaf == true and thirdParty.civility is not same as null %}{{ thirdParty.civility.name|localize_translatable_string }}{% endif %}
                         {{ thirdParty.firstname ~ ' ' ~ thirdParty.name }}
                     </dd>
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
index 86c0fa9db..8970fec1c 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
@@ -15,11 +15,6 @@ 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:
  *
@@ -49,21 +44,14 @@ FROM rows, searches
  */
 class ThirdPartyApiSearch implements SearchApiInterface
 {
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    public function __construct(ThirdPartyRepository $thirdPartyRepository)
-    {
-        $this->thirdPartyRepository = $thirdPartyRepository;
-    }
+    public function __construct(private readonly 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 prepare(array $metadatas): void {}
 
     public function provideQuery(string $pattern, array $parameters): SearchApiQuery
     {
@@ -71,14 +59,11 @@ class ThirdPartyApiSearch implements SearchApiInterface
             ->setSelectKey('tparty')
             ->setSelectJsonbMetadata("jsonb_build_object('id', tparty.id)")
             ->setFromClause('chill_3party.third_party AS tparty
-                LEFT JOIN chill_main_address cma ON cma.id = tparty.address_id
-                LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id
                 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');
+                LEFT JOIN chill_main_address cma ON cma.id = COALESCE(parent.address_id, tparty.address_id)
+                LEFT JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id');
 
-        $strs = explode(' ', $pattern);
+        $strs = \explode(' ', $pattern);
         $wheres = [];
         $whereArgs = [];
         $pertinence = [];
@@ -96,25 +81,24 @@ class ThirdPartyApiSearch implements SearchApiInterface
                 $pertinence[] = 'GREATEST(
                         STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), tparty.canonicalized),
                         STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), parent.canonicalized)
-                    ) + ' .
+                    ) + '.
                     "GREATEST(
                         (tparty.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int,
                         (parent.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_p.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0)";
-                $pertinenceArgs[] = [$str, $str, $str, $str, $str, $str];
+                   "COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0)";
+                $pertinenceArgs[] = [$str, $str, $str, $str, $str];
             }
         }
 
         $query
-            ->setSelectPertinence(implode(' + ', $pertinence) . ' + 1', array_merge(
+            ->setSelectPertinence(\implode(' + ', $pertinence).' + 1', \array_merge(
                 [],
                 ...$pertinenceArgs
             ))
-            ->andWhereClause(implode(' AND ', $wheres)
-                . ' AND tparty.active IS TRUE and (parent.active IS TRUE OR parent IS NULL)', array_merge(
+            ->andWhereClause(\implode(' AND ', $wheres)
+                .' AND tparty.active IS TRUE and (parent.active IS TRUE OR parent IS NULL)', \array_merge(
                     [],
                     ...$whereArgs
                 ));
@@ -129,6 +113,6 @@ class ThirdPartyApiSearch implements SearchApiInterface
 
     public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return in_array('thirdparty', $types, true);
+        return \in_array('thirdparty', $types, true);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
index 2c7948a2d..8b8f724d0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
@@ -14,19 +14,17 @@ 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\Repository\ThirdPartyRepository;
 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';
+    final public const NAME = '3party';
 
     /**
      * @var AuthorizationHelper
@@ -48,20 +46,17 @@ class ThirdPartySearch implements SearchInterface
      */
     protected $tokenStorage;
 
-    private ThirdPartyRepository $thirdPartyRepository;
-
     public function __construct(
         EntityManagerInterface $em,
         TokenStorageInterface $tokenStorage,
         AuthorizationHelper $authorizationHelper,
         PaginatorFactory $paginatorFactory,
-        ThirdPartyRepository $thirdPartyRepository
+        private readonly ThirdPartyRepository $thirdPartyRepository
     ) {
         $this->em = $em;
         $this->tokenStorage = $tokenStorage;
         $this->authorizationHelper = $authorizationHelper;
         $this->paginatorFactory = $paginatorFactory;
-        $this->thirdPartyRepository = $thirdPartyRepository;
     }
 
     public function getOrder(): int
@@ -101,7 +96,7 @@ class ThirdPartySearch implements SearchInterface
             ];
         }
         // format "html"
-        throw new \UnexpectedValueException("format html not supported");
+        throw new \UnexpectedValueException('format html not supported');
     }
 
     public function supports($domain, $format): bool
diff --git a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
index e1dae28b9..09f7feb3b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+++ b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
@@ -17,22 +17,17 @@ 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';
+    final public const CREATE = 'CHILL_3PARTY_3PARTY_CREATE';
 
-    public const SHOW = 'CHILL_3PARTY_3PARTY_SHOW';
+    final public const SHOW = 'CHILL_3PARTY_3PARTY_SHOW';
 
-    public const UPDATE = 'CHILL_3PARTY_3PARTY_UPDATE';
+    final public const UPDATE = 'CHILL_3PARTY_3PARTY_UPDATE';
 
     /**
      * @var AuthorizationHelper
@@ -66,7 +61,7 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
     protected function supports($attribute, $subject)
     {
         if ($subject instanceof ThirdParty) {
-            return in_array($attribute, $this->getRoles(), true);
+            return \in_array($attribute, $this->getRoles(), true);
         }
 
         if (null === $subject) {
@@ -77,7 +72,7 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
     }
 
     /**
-     * @param string $attribute
+     * @param string          $attribute
      * @param ThirdParty|null $subject
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
@@ -91,14 +86,14 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
 
         return true;
         $centers = $this->authorizationHelper
-            ->getReachableCenters($user, new Role($attribute));
+            ->getReachableCenters($user, $attribute);
 
         if (null === $subject) {
-            return count($centers) > 0;
+            return \count($centers) > 0;
         }
 
         if ($subject instanceof ThirdParty) {
-            return count(array_intersect($centers, $subject->getCenters()->toArray())) > 0;
+            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 7b2721511..26f175705 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -24,17 +24,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
 {
     use NormalizerAwareTrait;
 
-    private ThirdPartyRender $thirdPartyRender;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        ThirdPartyRender $thirdPartyRender,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->thirdPartyRender = $thirdPartyRender;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(private readonly ThirdPartyRender $thirdPartyRender, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
 
     public function normalize($thirdParty, $format = null, array $context = [])
     {
diff --git a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
index ece12f5c9..a36ceda4e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+++ b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
@@ -11,12 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\ThirdPartyBundle\Templating\Entity;
 
-use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\MainBundle\Templating\Entity\BoxUtilsChillEntityRenderTrait;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Symfony\Component\Templating\EngineInterface;
 
 /**
  * @implements ChillEntityRenderInterface<ThirdParty>
@@ -24,17 +22,8 @@ use Symfony\Component\Templating\EngineInterface;
 class ThirdPartyRender implements ChillEntityRenderInterface
 {
     use BoxUtilsChillEntityRenderTrait;
-    protected EngineInterface $engine;
 
-    protected TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        EngineInterface $engine,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->engine = $engine;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
+    public function __construct(protected \Twig\Environment $engine, protected TranslatableStringHelper $translatableStringHelper) {}
 
     public function renderBox($entity, array $options): string
     {
@@ -53,33 +42,33 @@ class ThirdPartyRender implements ChillEntityRenderInterface
         ];
 
         return
-            $this->getDefaultOpeningBox('thirdparty') .
+            $this->getDefaultOpeningBox('thirdparty').
             $this->engine->render('@ChillThirdParty/Entity/thirdparty.html.twig', [
                 'thirdparty' => $entity,
                 'render' => $options['render'] ?? 'raw',
                 'options' => $params,
-            ]) .
+            ]).
             $this->getDefaultClosingBox();
     }
 
     public function renderString($entity, array $options): string
     {
-        if ($entity->getCivility() !== null) {
+        if (null !== $entity->getCivility()) {
             $civility = $this->translatableStringHelper
-                ->localize($entity->getCivility()->getAbbreviation()) . ' ';
+                ->localize($entity->getCivility()->getAbbreviation()).' ';
         } else {
             $civility = '';
         }
 
         if ('' !== (string) $entity->getAcronym()) {
-            $acronym = ' (' . $entity->getAcronym() . ')';
+            $acronym = ' ('.$entity->getAcronym().')';
         } else {
             $acronym = '';
         }
 
         $firstname = ('' === $entity->getFirstname()) ? '' : $entity->getFirstname();
 
-        return $civility . $firstname . ' ' . $entity->getName() . $acronym;
+        return $civility.$firstname.' '.$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 e62e0772e..6c70faf35 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
@@ -15,10 +15,14 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ThirdPartyControllerTest extends WebTestCase
 {
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testIndex()
     {
         $client = self::createClient();
@@ -26,6 +30,9 @@ final class ThirdPartyControllerTest extends WebTestCase
         $crawler = $client->request('GET', '/index');
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testNew()
     {
         $client = self::createClient();
@@ -33,6 +40,9 @@ final class ThirdPartyControllerTest extends WebTestCase
         $crawler = $client->request('GET', '/new');
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testUpdate()
     {
         $client = self::createClient();
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
index bfd976de8..1801c1986 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
@@ -17,6 +17,7 @@ use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ThirdPartyTest extends TestCase
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php
index 1de8cbc62..56d80e0dc 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php
@@ -14,21 +14,26 @@ namespace Chill\ThirdPartyBundle\Tests\Serializer\Normalizer;
 use Chill\MainBundle\Entity\Civility;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
+use libphonenumber\PhoneNumberUtil;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ThirdPartyDocGenNormalizerTest extends KernelTestCase
 {
     private NormalizerInterface $normalizer;
 
+    private PhoneNumberUtil $phoneNumberUtil;
+
     protected function setUp(): void
     {
         self::bootKernel();
         $this->normalizer = self::$container->get(NormalizerInterface::class);
+        $this->phoneNumberUtil = PhoneNumberUtil::getInstance();
     }
 
     public function testAvoidRecursionWithNullParent()
@@ -91,7 +96,7 @@ final class ThirdPartyDocGenNormalizerTest extends KernelTestCase
             ->setName('test')
             ->setCivility((new Civility())->setName(['fr' => 'Monsieur'])->setAbbreviation(['fr' => 'M.']))
             ->setEmail('info@cl.coop')
-            ->setTelephone('+32486123456')
+            ->setTelephone($this->phoneNumberUtil->parse('+32486123456', 'BE'))
             ->addTypesAndCategories('kind')
             ->addTypesAndCategories((new ThirdPartyCategory())->setName(['fr' => 'category']));
 
@@ -99,6 +104,6 @@ final class ThirdPartyDocGenNormalizerTest extends KernelTestCase
 
         $this->assertIsArray($actual);
         $this->assertArrayHasKey('telephone', $actual);
-        $this->assertEquals('+32486123456', $actual['telephone']);
+        $this->assertEquals('0486 12 34 56', $actual['telephone']);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php
index 01248e374..978c26636 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php
@@ -17,6 +17,7 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ThirdPartyJsonDenormalizerTest extends KernelTestCase
diff --git a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
index cc8081aaa..46367124b 100644
--- a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
+++ b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
@@ -11,8 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\ThirdPartyBundle\ThirdPartyType;
 
-use function array_keys;
-
 /**
  * Manages types of third parties.
  */
@@ -21,7 +19,7 @@ class ThirdPartyTypeManager
     /**
      * The prefix used to translate the key of provider.
      */
-    public const THIRD_PARTY_TRANSLATOR_KEY = 'chill_3party.key_label.';
+    final public const THIRD_PARTY_TRANSLATOR_KEY = 'chill_3party.key_label.';
 
     /**
      * @var ThirdPartyTypeProviderInterface[]
@@ -32,8 +30,6 @@ class ThirdPartyTypeManager
      * Add a provider to the manager.
      *
      * Method used during the load of the manager by Dependency Injection
-     *
-     * @param \Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeProviderInterface $provider
      */
     public function addProvider(ThirdPartyTypeProviderInterface $provider): self
     {
@@ -57,6 +53,6 @@ class ThirdPartyTypeManager
      */
     public function getTypes(): array
     {
-        return array_keys($this->providers);
+        return \array_keys($this->providers);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
index e187099e2..18b740285 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
@@ -24,7 +24,7 @@ final class Version20190307111314 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('DROP SEQUENCE chill_third_party_id_seq CASCADE');
         $this->addSql('DROP TABLE chill_third_party');
@@ -33,7 +33,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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 ddcdfc7ae..b81eadf12 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
@@ -23,7 +23,7 @@ final class Version20190307131650 extends AbstractMigration
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->throwIrreversibleMigrationException('The down version of this migration is '
-            . 'not written');
+            .'not written');
     }
 
     public function up(Schema $schema): void
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
index 331af6ccc..f34cbff81 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
@@ -21,7 +21,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -29,7 +29,7 @@ final class Version20190418090842 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE TABLE chill_3party.party_center (thirdparty_id INT NOT NULL, center_id INT NOT NULL, PRIMARY KEY(thirdparty_id, center_id))');
         $this->addSql('CREATE INDEX IDX_C65D4397C7D3A8E6 ON chill_3party.party_center (thirdparty_id)');
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
index 925900e36..9a942bed8 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
@@ -27,8 +27,8 @@ final class Version20190429171109 extends AbstractMigration
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_3party.third_party RENAME COLUMN type '
-            . 'TO types');
+            .'TO types');
         $this->addSql('ALTER TABLE chill_3party.third_party ALTER COLUMN types '
-            . 'SET DATA TYPE jsonb');
+            .'SET DATA TYPE jsonb');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
index 97210c9d1..7a12f6214 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
@@ -21,7 +21,7 @@ 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->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), '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');
@@ -29,7 +29,7 @@ final class Version20190502144206 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf('postgresql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_3party.third_party ADD address_id INT DEFAULT NULL');
         $this->addSql('COMMENT ON COLUMN chill_3party.third_party.types IS NULL');
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php
index d41af0c07..9c4267235 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php
@@ -14,7 +14,6 @@ namespace Chill\Migrations\ThirdParty;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 use libphonenumber\PhoneNumberUtil;
-use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -40,7 +39,7 @@ final class Version20220302143821 extends AbstractMigration implements Container
             ->getParameter('chill_main')['phone_helper']['default_carrier_code'];
 
         if (null === $carrier_code) {
-            throw new RuntimeException('no carrier code');
+            throw new \RuntimeException('no carrier code');
         }
 
         $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone TYPE VARCHAR(35)');
@@ -49,7 +48,7 @@ final class Version20220302143821 extends AbstractMigration implements Container
         $this->addSql('COMMENT ON COLUMN chill_3party.third_party.telephone IS \'(DC2Type:phone_number)\'');
 
         $this->addSql(
-            'UPDATE chill_3party.third_party SET ' .
+            'UPDATE chill_3party.third_party SET '.
             $this->buildMigrationPhonenumberClause($carrier_code, 'telephone')
         );
     }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
index fefe1c339..756ca41cd 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20230215175150.php
@@ -11,21 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
 
-use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
-final class Version20230215175150 extends AbstractMigration implements ContainerAwareInterface
+final class Version20230215175150 extends AbstractMigration
 {
-    public ContainerInterface $container;
-
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_3party.third_party DROP profession');
-        //        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession_id INT DEFAULT NULL');
     }
 
     public function getDescription(): string
@@ -33,31 +26,9 @@ final class Version20230215175150 extends AbstractMigration implements Container
         return 'Change profession to a string field and transfer values';
     }
 
-    /**
-     * @return mixed
-     */
-    public function setContainer(?ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_3party.third_party ADD profession TEXT DEFAULT \'\' NOT NULL');
-
-        $em = $this->container->get('doctrine.orm.entity_manager');
-        $professions = $em->getRepository(ThirdPartyProfession::class)->findAll();
-
-        foreach ($professions as $p) {
-            $id = $p->getId();
-            $name = $p->getName()['fr'];
-
-            $this->addSql(
-                'UPDATE chill_3party.third_party SET profession = :profession
-                          WHERE chill_3party.third_party.profession_id = :id;',
-                ['profession' => $name, 'id' => $id],
-                ['profession' => Types::STRING, 'id' => Types::INTEGER]
-            );
-        }
+        $this->addSql('UPDATE chill_3party.third_party SET profession = party_profession.name->>\'fr\' FROM chill_3party.party_profession WHERE party_profession.id = third_party.profession_id');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 94a10177b..f62a5beff 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -75,6 +75,7 @@ No email given:  Aucune adresse courriel renseignée
 The party is visible in those centers: Le tiers est visible dans ces centres
 The party is not visible in any center: Le tiers n'est associé à aucun centre
 No third parties: Aucun tiers
+Any third party selected: Aucun tiers sélectionné
 
 Thirdparty handling: Tiers traitant
 Thirdparty workers: Tiers intervenants
@@ -112,6 +113,8 @@ crud:
 docgen:
     A context for person with a third party (for sending mail): Un contexte d'une personne avec un tiers (pour envoyer un courrier à ce tiers, par exemple)
     Person with third party: Personne avec choix d'un tiers
+    Ask for thirdParty: Demander à l'utilisateur de préciser un tiers
+    thirdParty label: Libellé du tiers
 
 # exports
 export:
diff --git a/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php b/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php
index 5ca164db1..401eb9970 100644
--- a/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php
+++ b/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php
@@ -13,6 +13,4 @@ namespace Chill\WopiBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-final class ChillWopiBundle extends Bundle
-{
-}
+final class ChillWopiBundle extends Bundle {}
diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php
index b3697aafd..3b2744b28 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php
@@ -35,34 +35,19 @@ class Convert
 {
     private const LOG_PREFIX = '[convert] ';
 
-    private string $collaboraDomain;
-
-    private HttpClientInterface $httpClient;
-
-    private LoggerInterface $logger;
-
-    private RequestStack $requestStack;
-
-    private Security $security;
-
-    private StoredObjectManagerInterface $storedObjectManager;
+    private readonly string $collaboraDomain;
 
     /**
      * @param StoredObjectManager $storedObjectManager
      */
     public function __construct(
-        HttpClientInterface $httpClient,
-        RequestStack $requestStack,
-        Security $security,
-        StoredObjectManagerInterface $storedObjectManager,
-        LoggerInterface $logger,
+        private readonly HttpClientInterface $httpClient,
+        private readonly RequestStack $requestStack,
+        private readonly Security $security,
+        private readonly StoredObjectManagerInterface $storedObjectManager,
+        private readonly LoggerInterface $logger,
         ParameterBagInterface $parameters
     ) {
-        $this->httpClient = $httpClient;
-        $this->requestStack = $requestStack;
-        $this->security = $security;
-        $this->storedObjectManager = $storedObjectManager;
-        $this->logger = $logger;
         $this->collaboraDomain = $parameters->get('wopi')['server'];
     }
 
@@ -93,20 +78,20 @@ class Convert
             return new Response($response->getContent(), Response::HTTP_OK, [
                 'Content-Type' => 'application/pdf',
             ]);
-        } catch (ClientExceptionInterface|TransportExceptionInterface|RedirectionExceptionInterface|ServerExceptionInterface $exception) {
+        } catch (ClientExceptionInterface|RedirectionExceptionInterface|ServerExceptionInterface|TransportExceptionInterface $exception) {
             return $this->onConversionFailed($url, $exception->getResponse());
         }
     }
 
     private function onConversionFailed(string $url, ResponseInterface $response): JsonResponse
     {
-        $this->logger->error(self::LOG_PREFIX . ' could not convert document', [
+        $this->logger->error(self::LOG_PREFIX.' could not convert document', [
             'response_status' => $response->getStatusCode(),
             'message' => $response->getContent(false),
             'server' => $this->collaboraDomain,
             'url' => $url,
         ]);
 
-        return new JsonResponse(['message' => 'conversion failed : ' . $response->getContent(false)], Response::HTTP_SERVICE_UNAVAILABLE);
+        return new JsonResponse(['message' => 'conversion failed : '.$response->getContent(false)], Response::HTTP_SERVICE_UNAVAILABLE);
     }
 }
diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
index ab4276ec4..053b7abd0 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Editor.php
@@ -17,7 +17,6 @@ use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\User;
 use Chill\WopiBundle\Service\Controller\ResponderInterface;
-use Exception;
 use Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface;
 use loophp\psr17\Psr17Interface;
 use Symfony\Component\HttpFoundation\Request;
@@ -29,58 +28,16 @@ use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Templating\EngineInterface;
 use Twig\Environment;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
-final class Editor
+final readonly class Editor
 {
-    private DocumentManagerInterface $documentManager;
-
-    private EngineInterface $engine;
-
-    private JWTTokenManagerInterface $JWTTokenManager;
-
-    private Psr17Interface $psr17;
-
-    private ResponderInterface $responder;
-
-    private RouterInterface $router;
-
-    private Security $security;
-
-    private ConfigurationInterface $wopiConfiguration;
-
-    private DiscoveryInterface $wopiDiscovery;
-
-    private NormalizerInterface $normalizer;
-
-    public function __construct(
-        ConfigurationInterface $wopiConfiguration,
-        DiscoveryInterface $wopiDiscovery,
-        DocumentManagerInterface $documentManager,
-        EngineInterface $engine,
-        JWTTokenManagerInterface $JWTTokenManager,
-        NormalizerInterface $normalizer,
-        ResponderInterface $responder,
-        Security $security,
-        Psr17Interface $psr17,
-        RouterInterface $router
-    ) {
-        $this->documentManager = $documentManager;
-        $this->engine = $engine;
-        $this->JWTTokenManager = $JWTTokenManager;
-        $this->normalizer = $normalizer;
-        $this->wopiConfiguration = $wopiConfiguration;
-        $this->wopiDiscovery = $wopiDiscovery;
-        $this->responder = $responder;
-        $this->security = $security;
-        $this->psr17 = $psr17;
-        $this->router = $router;
-    }
+    public function __construct(private ConfigurationInterface $wopiConfiguration, private DiscoveryInterface $wopiDiscovery, private DocumentManagerInterface $documentManager, private Environment $engine, private JWTTokenManagerInterface $JWTTokenManager, private NormalizerInterface $normalizer, private ResponderInterface $responder, private Security $security, private Psr17Interface $psr17, private RouterInterface $router) {}
 
     public function __invoke(string $fileId, Request $request): Response
     {
@@ -111,14 +68,14 @@ final class Editor
                 $this->engine
                     ->render('@ChillWopi/Editor/stored_object_pending.html.twig', [
                         'storedObject' => $this->normalizer->normalize($storedObject, 'json', [
-                            AbstractNormalizer::GROUPS => ['read']
-                        ])
+                            AbstractNormalizer::GROUPS => ['read'],
+                        ]),
                     ])
             );
         }
 
         if ([] === $discoverExtension = $this->wopiDiscovery->discoverMimeType($storedObject->getType())) {
-            throw new Exception(sprintf('Unable to find mime type %s', $storedObject->getType()));
+            throw new \Exception(sprintf('Unable to find mime type %s', $storedObject->getType()));
         }
 
         $configuration['favIconUrl'] = '';
diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
index 1518458bd..1c0ef6490 100644
--- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
+++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
@@ -28,7 +28,7 @@ final class ChillWopiExtension extends Extension
                 $config
             );
 
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.php');
     }
 }
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
index fc19e9c0d..a962c9e67 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
+++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
@@ -33,10 +33,10 @@ return static function (ContainerConfigurator $container) {
         ->autoconfigure();
 
     $services
-        ->load('Chill\\WopiBundle\\Service\\', __DIR__ . '/../../Service');
+        ->load('Chill\\WopiBundle\\Service\\', __DIR__.'/../../Service');
 
     $services
-        ->load('Chill\\WopiBundle\\Controller\\', __DIR__ . '/../../Controller')
+        ->load('Chill\\WopiBundle\\Controller\\', __DIR__.'/../../Controller')
         ->tag('controller.service_arguments');
 
     $services
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
index 145b58b8b..cdc2dc347 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
+++ b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block content %}
     <div class="alert alert-danger">
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
index 78033e111..a57eab761 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
@@ -20,27 +20,13 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 use Twig\Environment;
 
-final class Responder implements ResponderInterface
+final readonly class Responder implements ResponderInterface
 {
-    private SerializerInterface $serializer;
-
-    private Environment $twig;
-
-    private UrlGeneratorInterface $urlGenerator;
-
-    public function __construct(
-        Environment $twig,
-        UrlGeneratorInterface $urlGenerator,
-        SerializerInterface $serializer
-    ) {
-        $this->twig = $twig;
-        $this->urlGenerator = $urlGenerator;
-        $this->serializer = $serializer;
-    }
+    public function __construct(private Environment $twig, private UrlGeneratorInterface $urlGenerator, private SerializerInterface $serializer) {}
 
     public function file(
         $file,
-        ?string $filename = null,
+        string $filename = null,
         string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT
     ): BinaryFileResponse {
         $response = new BinaryFileResponse($file);
@@ -63,12 +49,7 @@ final class Responder implements ResponderInterface
                 ->serialize(
                     $data,
                     'json',
-                    array_merge(
-                        [
-                            'json_encode_options' => JsonResponse::DEFAULT_ENCODING_OPTIONS,
-                        ],
-                        $context
-                    )
+                    ['json_encode_options' => JsonResponse::DEFAULT_ENCODING_OPTIONS, ...$context]
                 ),
             $status,
             $headers,
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
index f09b92909..734a5b5b3 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\WopiBundle\Service\Controller;
 
-use SplFileInfo;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -24,23 +23,22 @@ interface ResponderInterface
     /**
      * Returns a BinaryFileResponse object with original or customized file name and disposition header.
      *
-     * @param SplFileInfo|string $file
+     * @param \SplFileInfo|string $file
      */
     public function file(
         $file,
-        ?string $filename = null,
+        string $filename = null,
         string $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT
     ): BinaryFileResponse;
 
     /**
      * Returns a JsonResponse that uses the serializer component if enabled, or json_encode.
      *
-     * @param mixed $data
      * @param array<string, list<string>|string> $headers
-     * @param array<string, mixed> $context
+     * @param array<string, mixed>               $context
      */
     public function json(
-        $data,
+        mixed $data,
         int $status = 200,
         array $headers = [],
         array $context = []
@@ -56,7 +54,7 @@ interface ResponderInterface
     /**
      * Returns a RedirectResponse to the given route with the given parameters.
      *
-     * @param array<array-key, scalar> $parameters
+     * @param array<array-key, scalar>    $parameters
      * @param array<string, list<string>> $headers
      */
     public function redirectToRoute(
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/AuthorizationManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/AuthorizationManager.php
index 24ea00982..1496ba479 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/AuthorizationManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/AuthorizationManager.php
@@ -19,15 +19,7 @@ use Symfony\Component\Security\Core\Security;
 
 class AuthorizationManager implements \ChampsLibres\WopiBundle\Contracts\AuthorizationManagerInterface
 {
-    private Security $security;
-
-    private JWTTokenManagerInterface $tokenManager;
-
-    public function __construct(JWTTokenManagerInterface $tokenManager, Security $security)
-    {
-        $this->tokenManager = $tokenManager;
-        $this->security = $security;
-    }
+    public function __construct(private readonly JWTTokenManagerInterface $tokenManager, private readonly Security $security) {}
 
     public function isRestrictedWebViewOnly(string $accessToken, Document $document, RequestInterface $request): bool
     {
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
index fce25de58..d4338b208 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentLockManager.php
@@ -15,7 +15,6 @@ use ChampsLibres\WopiLib\Contract\Entity\Document;
 use ChampsLibres\WopiLib\Contract\Service\DocumentLockManagerInterface;
 use Chill\MainBundle\Redis\ChillRedis;
 use Psr\Http\Message\RequestInterface;
-use RuntimeException;
 
 class ChillDocumentLockManager implements DocumentLockManagerInterface
 {
@@ -26,12 +25,10 @@ class ChillDocumentLockManager implements DocumentLockManagerInterface
      */
     private const LOCK_GRACEFUL_DURATION_TIME = 3;
 
-    private ChillRedis $redis;
-
-    public function __construct(ChillRedis $redis)
-    {
-        $this->redis = $redis;
-    }
+    public function __construct(
+        private readonly ChillRedis $redis,
+        private readonly int $ttlAfterDeleteSeconds = self::LOCK_GRACEFUL_DURATION_TIME
+    ) {}
 
     public function deleteLock(Document $document, RequestInterface $request): bool
     {
@@ -41,7 +38,7 @@ class ChillDocumentLockManager implements DocumentLockManagerInterface
 
         // some queries (ex.: putFile) may be executed on the same time than the unlock, so
         // we add a delay before unlocking the file, instead of deleting it immediatly
-        return $this->redis->expire($this->getCacheId($document), self::LOCK_GRACEFUL_DURATION_TIME);
+        return $this->redis->expire($this->getCacheId($document), $this->ttlAfterDeleteSeconds);
     }
 
     public function getLock(Document $document, RequestInterface $request): string
@@ -50,7 +47,7 @@ class ChillDocumentLockManager implements DocumentLockManagerInterface
             return $value;
         }
 
-        throw new RuntimeException('wopi key does not exists');
+        throw new \RuntimeException('wopi key does not exists');
     }
 
     public function hasLock(Document $document, RequestInterface $request): bool
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
index ce75cafa8..f263afcc8 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -17,50 +17,30 @@ use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\StoredObjectRepository;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
-use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
-use Error;
 use loophp\psr17\Psr17Interface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Ramsey\Uuid\Uuid;
-use RuntimeException;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Mime\MimeTypes;
-
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
-use function strlen;
 
 final class ChillDocumentManager implements DocumentManagerInterface
 {
-    private DocumentLockManagerInterface $documentLockManager;
-
-    private EntityManagerInterface $entityManager;
-
-    private Psr17Interface $psr17;
-
-    private RequestInterface $request;
-
-    private StoredObjectManagerInterface $storedObjectManager;
-
-    private StoredObjectRepository $storedObjectRepository;
+    private readonly RequestInterface $request;
 
     public function __construct(
-        DocumentLockManagerInterface $documentLockManager,
-        EntityManagerInterface $entityManager,
+        private readonly DocumentLockManagerInterface $documentLockManager,
+        private readonly EntityManagerInterface $entityManager,
         HttpMessageFactoryInterface $httpMessageFactory,
-        Psr17Interface $psr17,
+        private readonly Psr17Interface $psr17,
         RequestStack $requestStack,
-        StoredObjectManagerInterface $storedObjectManager,
-        StoredObjectRepository $storedObjectRepository
+        private readonly StoredObjectManagerInterface $storedObjectManager,
+        private readonly StoredObjectRepository $storedObjectRepository
     ) {
-        $this->documentLockManager = $documentLockManager;
-        $this->entityManager = $entityManager;
-        $this->psr17 = $psr17;
         $this->request = $httpMessageFactory->createRequest($requestStack->getCurrentRequest());
-        $this->storedObjectManager = $storedObjectManager;
-        $this->storedObjectRepository = $storedObjectRepository;
     }
 
     public function create(array $data): Document
@@ -88,7 +68,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     public function deleteLock(Document $document): void
     {
         if (false === $this->documentLockManager->deleteLock($document, $this->request)) {
-            throw new RuntimeException('could not remove the lock');
+            throw new \RuntimeException('could not remove the lock');
         }
     }
 
@@ -116,14 +96,14 @@ final class ChillDocumentManager implements DocumentManagerInterface
     /**
      * @param StoredObject $document
      *
-     * @return string The document filename with its extension.
+     * @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.');
+            throw new \Error('Unknown mimetype for stored document.');
         }
 
         return sprintf('%s.%s', $document->getFilename(), reset($exts));
@@ -132,7 +112,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     /**
      * @param StoredObject $document
      */
-    public function getCreationDate(Document $document): DateTimeInterface
+    public function getCreationDate(Document $document): \DateTimeInterface
     {
         return $document->getCreatedAt() ?? new \DateTimeImmutable('now');
     }
@@ -148,7 +128,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
     /**
      * @param StoredObject $document
      */
-    public function getLastModifiedDate(Document $document): DateTimeInterface
+    public function getLastModifiedDate(Document $document): \DateTimeInterface
     {
         return $this->storedObjectManager->getLastModified($document);
     }
@@ -165,7 +145,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
 
     public function getSize(Document $document): int
     {
-        return strlen($this->getContent($document));
+        return \strlen($this->getContent($document));
     }
 
     public function getVersion(Document $document): string
@@ -193,12 +173,12 @@ final class ChillDocumentManager implements DocumentManagerInterface
 
     public function remove(Document $document): void
     {
-        throw new RuntimeException('this is not implemented and should not happens');
+        throw new \RuntimeException('this is not implemented and should not happens');
     }
 
     public function rename(Document $document, string $requestedName): void
     {
-        throw new RuntimeException('this is not implemented and should not happens');
+        throw new \RuntimeException('this is not implemented and should not happens');
     }
 
     public function write(Document $document, array $properties = []): void
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
index 82dbadf7b..9f2dac4f0 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
@@ -15,15 +15,9 @@ use ChampsLibres\WopiLib\Contract\Service\WopiInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-final class ChillWopi implements WopiInterface
+final readonly class ChillWopi implements WopiInterface
 {
-    private WopiInterface $wopi;
-
-    public function __construct(
-        WopiInterface $wopi
-    ) {
-        $this->wopi = $wopi;
-    }
+    public function __construct(private WopiInterface $wopi) {}
 
     public function checkFileInfo(
         string $fileId,
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/UserManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/UserManager.php
index 3fb3b544e..f72ae3cde 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/UserManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/UserManager.php
@@ -17,12 +17,7 @@ use Symfony\Component\Security\Core\Security;
 
 class UserManager implements \ChampsLibres\WopiBundle\Contracts\UserManagerInterface
 {
-    private Security $security;
-
-    public function __construct(Security $security)
-    {
-        $this->security = $security;
-    }
+    public function __construct(private readonly Security $security) {}
 
     public function getUserFriendlyName(string $accessToken, string $fileId, RequestInterface $request): ?string
     {
diff --git a/src/Bundle/ChillWopiBundle/tests/Controller/ConverTest.php b/src/Bundle/ChillWopiBundle/tests/Controller/ConvertTest.php
similarity index 87%
rename from src/Bundle/ChillWopiBundle/tests/Controller/ConverTest.php
rename to src/Bundle/ChillWopiBundle/tests/Controller/ConvertTest.php
index 27d162a34..2bc3f4769 100644
--- a/src/Bundle/ChillWopiBundle/tests/Controller/ConverTest.php
+++ b/src/Bundle/ChillWopiBundle/tests/Controller/ConvertTest.php
@@ -21,13 +21,16 @@ use Psr\Log\NullLogger;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
-final class ConverTest extends TestCase
+final class ConvertTest extends TestCase
 {
     use ProphecyTrait;
 
@@ -49,6 +52,7 @@ final class ConverTest extends TestCase
 
         $convert = new Convert(
             $httpClient,
+            $this->makeRequestStack(),
             $security->reveal(),
             $storeManager->reveal(),
             new NullLogger(),
@@ -78,6 +82,7 @@ final class ConverTest extends TestCase
 
         $convert = new Convert(
             $httpClient,
+            $this->makeRequestStack(),
             $security->reveal(),
             $storeManager->reveal(),
             new NullLogger(),
@@ -89,4 +94,12 @@ final class ConverTest extends TestCase
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEquals('1234', $response->getContent());
     }
+
+    private function makeRequestStack(): RequestStack
+    {
+        $requestStack = new RequestStack();
+        $requestStack->push(new Request());
+
+        return $requestStack;
+    }
 }
diff --git a/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php b/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
index a3edddea6..c5e687cac 100644
--- a/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
+++ b/src/Bundle/ChillWopiBundle/tests/Service/Wopi/ChillDocumentLockManagerTest.php
@@ -20,6 +20,7 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @internal
+ *
  * @coversNothing
  */
 final class ChillDocumentLockManagerTest extends KernelTestCase
@@ -31,27 +32,6 @@ final class ChillDocumentLockManagerTest extends KernelTestCase
         self::bootKernel();
     }
 
-    public function testMultipleLoops()
-    {
-        $manager = $this->makeManager(1);
-        $document = new StoredObject();
-        $request = $this->prophesize(RequestInterface::class);
-
-        $i = 0;
-
-        while (50 > ++$i) {
-            $this->assertFalse($manager->hasLock($document, $request->reveal()));
-
-            $this->assertTrue($manager->setLock($document, 'dummy', $request->reveal()));
-
-            $this->assertEquals('dummy', $manager->getLock($document, $request->reveal()));
-
-            $this->assertTrue($manager->deleteLock($document, $request->reveal()));
-
-            $this->assertFalse($manager->hasLock($document, $request->reveal()));
-        }
-    }
-
     public function testRelock()
     {
         $manager = $this->makeManager(1);
@@ -70,6 +50,8 @@ final class ChillDocumentLockManagerTest extends KernelTestCase
 
         $this->assertTrue($manager->deleteLock($document, $request->reveal()));
 
+        sleep(3); // wait for redis to remove the key
+
         $this->assertFalse($manager->hasLock($document, $request->reveal()));
     }
 
@@ -87,10 +69,12 @@ final class ChillDocumentLockManagerTest extends KernelTestCase
 
         $this->assertTrue($manager->deleteLock($document, $request->reveal()));
 
+        sleep(3); // wait for redis to remove the key
+
         $this->assertFalse($manager->hasLock($document, $request->reveal()));
     }
 
-    private function makeManager(int $ttlAfterDeleteSeconds): ChillDocumentLockManager
+    private function makeManager(int $ttlAfterDeleteSeconds = -1): ChillDocumentLockManager
     {
         $redis = self::$container->get(ChillRedis::class);
 
diff --git a/tests/Kernel.php b/tests/Kernel.php
new file mode 100644
index 000000000..a0ede51ac
--- /dev/null
+++ b/tests/Kernel.php
@@ -0,0 +1,64 @@
+<?php
+
+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 App;
+
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+use Symfony\Component\Routing\RouteCollectionBuilder;
+
+class Kernel extends BaseKernel
+{
+    use MicroKernelTrait;
+
+    private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
+
+    public function registerBundles(): iterable
+    {
+        $contents = require __DIR__ . '/app/config/bundles.php';
+
+        foreach ($contents as $class => $envs) {
+            if ($envs[$this->environment] ?? $envs['all'] ?? false) {
+                yield new $class();
+            }
+        }
+    }
+
+    public function getProjectDir()
+    {
+        return \dirname(__DIR__);
+    }
+
+    protected function configureRoutes(RouteCollectionBuilder $routes)
+    {
+        $confDir = $this->getProjectDir().'/tests/app/config';
+
+        $routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob');
+        $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');
+        $routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');
+    }
+
+    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
+    {
+        $container->addResource(new FileResource($this->getProjectDir().'/tests/app/config/bundles.php'));
+        $container->setParameter('container.dumper.inline_class_loader', \PHP_VERSION_ID < 70400 || $this->debug);
+        $container->setParameter('container.dumper.inline_factories', true);
+        $confDir = $this->getProjectDir().'/tests/app/config';
+
+        $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');
+        $loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob');
+        $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob');
+        $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
+    }
+}
diff --git a/tests/app b/tests/app
deleted file mode 160000
index 5e478fdfb..000000000
--- a/tests/app
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5e478fdfbf429baf3ce852ae69eb1f7101b1b416
diff --git a/tests/app/config/bootstrap.php b/tests/app/config/bootstrap.php
new file mode 100644
index 000000000..4a7385190
--- /dev/null
+++ b/tests/app/config/bootstrap.php
@@ -0,0 +1,32 @@
+<?php
+
+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.
+ */
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__).'/../../vendor/autoload.php';
+
+if (!class_exists(Dotenv::class)) {
+    throw new LogicException('Please run "composer require symfony/dotenv" to load the ".env" files configuring the application.');
+}
+
+// Load cached env vars if the .env.local.php file exists
+// Run "composer dump-env prod" to create it (requires symfony/flex >=1.2)
+if (is_array($env = @include dirname(__DIR__).'/.env.local.php') && (!isset($env['APP_ENV']) || ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? $env['APP_ENV']) === $env['APP_ENV'])) {
+    (new Dotenv(false))->populate($env);
+} else {
+    // load all the .env files
+    (new Dotenv(false))->loadEnv(dirname(__DIR__).'/../../.env.test');
+}
+
+$_SERVER += $_ENV;
+$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
+$_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
+$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';
diff --git a/tests/app/config/bundles.php b/tests/app/config/bundles.php
new file mode 100644
index 000000000..36e3bcf03
--- /dev/null
+++ b/tests/app/config/bundles.php
@@ -0,0 +1,48 @@
+<?php
+
+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.
+ */
+
+return [
+    ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true],
+    Chill\ActivityBundle\ChillActivityBundle::class => ['all' => true],
+    Chill\AsideActivityBundle\ChillAsideActivityBundle::class => ['all' => true],
+    Chill\CalendarBundle\ChillCalendarBundle::class => ['all' => true],
+    Chill\CustomFieldsBundle\ChillCustomFieldsBundle::class => ['all' => true],
+    Chill\DocGeneratorBundle\ChillDocGeneratorBundle::class => ['all' => true],
+    Chill\DocStoreBundle\ChillDocStoreBundle::class => ['all' => true],
+    Chill\EventBundle\ChillEventBundle::class => ['all' => true],
+    Chill\MainBundle\ChillMainBundle::class => ['all' => true],
+    Chill\PersonBundle\ChillPersonBundle::class => ['all' => true],
+    Chill\ReportBundle\ChillReportBundle::class => ['all' => true],
+    Chill\TaskBundle\ChillTaskBundle::class => ['all' => true],
+    Chill\ThirdPartyBundle\ChillThirdPartyBundle::class => ['all' => true],
+    Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
+    Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
+    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
+    Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
+    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
+    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
+    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
+    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
+    Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
+    Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
+    Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
+    //Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
+    Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
+    Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true],
+    Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true],
+    Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
+    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
+    \Misd\PhoneNumberBundle\MisdPhoneNumberBundle::class => ['all' => true],
+    ChampsLibres\WopiBundle\WopiBundle::class => ['all' => true],
+    Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
+    \Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
+
+];
diff --git a/tests/app/config/packages/assets.yaml b/tests/app/config/packages/assets.yaml
new file mode 100644
index 000000000..051d36dce
--- /dev/null
+++ b/tests/app/config/packages/assets.yaml
@@ -0,0 +1,3 @@
+framework:
+    assets:
+        json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
diff --git a/tests/app/config/packages/cache.yaml b/tests/app/config/packages/cache.yaml
new file mode 100644
index 000000000..c7a5f169d
--- /dev/null
+++ b/tests/app/config/packages/cache.yaml
@@ -0,0 +1,33 @@
+framework:
+    cache:
+        # Unique name of your app: used to compute stable namespaces for cache keys.
+        #prefix_seed: your_vendor_name/app_name
+
+        # The "app" cache stores to the filesystem by default.
+        # The data in this cache should persist between deploys.
+        # Other options include:
+
+        # Redis
+        #app: cache.adapter.redis
+        #default_redis_provider: redis://localhost
+
+        # APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
+        #app: cache.adapter.apcu
+
+        # Namespaced pools use the above "app" backend by default
+        #pools:
+            #my.dedicated.cache: null
+
+        default_redis_provider: '%env(resolve:REDIS_URL)%'
+
+        pools:
+            cache.user_data:
+                adapter: cache.adapter.redis
+                public: true
+                default_lifetime: 300  # 5 minutes
+
+            # will be used in chill_main.tag_aware_cache service
+            cache.tags:
+                adapter: cache.adapter.redis
+                public: false
+                default_lifetime: 300
diff --git a/tests/app/config/packages/champs-libres.yaml b/tests/app/config/packages/champs-libres.yaml
new file mode 100644
index 000000000..ebea3ef58
--- /dev/null
+++ b/tests/app/config/packages/champs-libres.yaml
@@ -0,0 +1,14 @@
+champs_libres_async_uploader:
+    openstack:
+        os_username:          '%env(resolve:OS_USERNAME)%'    # Required
+        os_password:          '%env(resolve:OS_PASSWORD)%'    # Required
+        os_tenant_id:         '%env(resolve:OS_TENANT_ID)%'   # Required
+        os_region_name:       '%env(resolve:OS_REGION_NAME)%' # Required
+        os_auth_url:          '%env(resolve:OS_AUTH_URL)%'    # Required
+    temp_url:
+        temp_url_key:         '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%'       # Required
+        container:            '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required
+        temp_url_base_path:   '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required. Do not forget a trailing slash
+        max_post_file_size:   15000000 # 15Mo (bytes)
+        max_expires_delay:    180
+        max_submit_delay:     3600
diff --git a/tests/app/config/packages/chill.yaml b/tests/app/config/packages/chill.yaml
new file mode 100644
index 000000000..92dbd0769
--- /dev/null
+++ b/tests/app/config/packages/chill.yaml
@@ -0,0 +1,23 @@
+chill_main:
+    available_languages: [ '%env(resolve:LOCALE)%' ]
+    notifications:
+        from_email: 'test@yopmail.com'
+        from_name: 'TEST CHILL'
+        host: 'localhost'
+    redis:
+        host: '%env(resolve:REDIS_HOST)%'
+        port: '%env(resolve:REDIS_PORT)%'
+    phone_helper:
+        twilio_sid: '%env(resolve:TWILIO_SID)%'
+        twilio_secret: '%env(resolve:TWILIO_SECRET)%'
+        default_carrier_code: '%env(resolve:DEFAULT_CARRIER_CODE)%'
+
+chill_custom_fields:
+    show_empty_values_in_views: false
+
+# Enable/disable specific libraries (css and js)
+twig:
+    globals:
+        active_bootstrap: false
+        active_forkawesome: true
+        active_ckeditor: false
diff --git a/tests/app/config/packages/chill_budget.yaml b/tests/app/config/packages/chill_budget.yaml
new file mode 100644
index 000000000..dfb50ac9f
--- /dev/null
+++ b/tests/app/config/packages/chill_budget.yaml
@@ -0,0 +1,14 @@
+#chill_amli_budget:
+#    resources:
+#        - { key: travail-temporaire, labels: [{ lang: fr, label: "Travail temporaire" }]}
+#        - { key: chomage, labels: [{ lang: fr, label: "Allocation de chômage"}]}
+#        - { key: cpas, labels: [{ lang: fr, label: "CPAS"}]}
+#        - { key: mutuelle, labels: [{ lang: fr, label: "Mutuelle"}]}
+#        - { key: pension-alimentaire, labels: [{ lang: fr, label: "Pension alimentaire"}]}
+#        - { key: allocation-fam, labels: [{ lang: fr, label: "Allocations familiales"}]}
+#    charges:
+#        - { key: charge-communes, labels: [{ lang: fr, label: "Charges communes" }]}
+#        - { key: electricity, labels: [{ lang: fr, label: "Électricité" }]}
+#        - { key: gaz, labels: [{ lang: fr, label: "Gaz" }]}
+#        - { key: water, labels: [{ lang: fr, label: "Eau" }]}
+#        - { key: autres, labels: [ { lang: fr, label: "Autres"}]}
diff --git a/tests/app/config/packages/dev/debug.yaml b/tests/app/config/packages/dev/debug.yaml
new file mode 100644
index 000000000..26d4e53d2
--- /dev/null
+++ b/tests/app/config/packages/dev/debug.yaml
@@ -0,0 +1,4 @@
+debug:
+    # Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser.
+    # See the "server:dump" command to start a new server.
+    dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%"
diff --git a/tests/app/config/packages/dev/messenger.yaml b/tests/app/config/packages/dev/messenger.yaml
new file mode 100644
index 000000000..2ea139315
--- /dev/null
+++ b/tests/app/config/packages/dev/messenger.yaml
@@ -0,0 +1,7 @@
+framework:
+    messenger:
+        transports:
+            async: 'in-memory://'
+            sync: 'in-memory://'
+            priority: 'in-memory://'
+            failed: 'in-memory://'
diff --git a/tests/app/config/packages/dev/monolog.yaml b/tests/app/config/packages/dev/monolog.yaml
new file mode 100644
index 000000000..423fc10df
--- /dev/null
+++ b/tests/app/config/packages/dev/monolog.yaml
@@ -0,0 +1,21 @@
+monolog:
+    handlers:
+        main:
+            type: stream
+            path: "%kernel.logs_dir%/%kernel.environment%.log"
+            level: debug
+            channels: ["!event"]
+        # uncomment to get logging in your browser
+        # you may have to allow bigger header sizes in your Web server configuration
+        #firephp:
+        #    type: firephp
+        #    level: info
+        #chromephp:
+        #    type: chromephp
+        #    level: info
+        console:
+            type: console
+            process_psr_3_messages: false
+            channels: ['!event', '!doctrine', '!console']
+            bubble: false
+
diff --git a/tests/app/config/packages/doctrine.yaml b/tests/app/config/packages/doctrine.yaml
new file mode 100644
index 000000000..9046f2e44
--- /dev/null
+++ b/tests/app/config/packages/doctrine.yaml
@@ -0,0 +1,18 @@
+doctrine:
+    dbal:
+        url: '%env(resolve:DATABASE_URL)%'
+
+        # IMPORTANT: You MUST configure your server version,
+        # either here or in the DATABASE_URL env var (see .env file)
+        #server_version: '5.7'
+    orm:
+        auto_generate_proxy_classes: true
+        naming_strategy: doctrine.orm.naming_strategy.default
+        auto_mapping: true
+        #mappings:
+        #    App:
+        #        is_bundle: false
+        #        type: annotation
+        #        dir: '%kernel.project_dir%/src/Entity'
+        #        prefix: 'App\Entity'
+        #        alias: App
diff --git a/tests/app/config/packages/doctrine_migrations.yaml b/tests/app/config/packages/doctrine_migrations.yaml
new file mode 100644
index 000000000..a559780d3
--- /dev/null
+++ b/tests/app/config/packages/doctrine_migrations.yaml
@@ -0,0 +1,30 @@
+doctrine_migrations:
+    migrations_paths:
+        # migrations for default chill modules
+        'Chill\Migrations\Main': '@ChillMainBundle/migrations'
+        'Chill\Migrations\Activity': '@ChillActivityBundle/migrations'
+        'Chill\Migrations\DocStore': '@ChillDocStoreBundle/migrations'
+        'Chill\Migrations\CustomFields': '@ChillCustomFieldsBundle/migrations'
+        'Chill\Migrations\Event': '@ChillEventBundle/migrations'
+        'Chill\Migrations\Person': '@ChillPersonBundle/migrations'
+        'Chill\Migrations\Report': '@ChillReportBundle/migrations'
+        'Chill\Migrations\Task': '@ChillTaskBundle/migrations'
+        'Chill\Migrations\ThirdParty': '@ChillThirdPartyBundle/migrations'
+        'Chill\Migrations\AsideActivity': '@ChillAsideActivityBundle/migrations'
+        'Chill\Migrations\DocGenerator': '@ChillDocGeneratorBundle/migrations'
+        'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
+        'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
+
+    all_or_nothing:
+        true
+
+    services:
+        'Doctrine\Migrations\Version\Comparator': 'Chill\MainBundle\Doctrine\Migrations\VersionComparator'
+
+    storage:
+        table_storage:
+            table_name: 'migration_versions'
+            version_column_name: 'version'
+            version_column_length: 1024
+            executed_at_column_name: 'executed_at'
+            execution_time_column_name: 'execution_time'
diff --git a/tests/app/config/packages/framework.yaml b/tests/app/config/packages/framework.yaml
new file mode 100644
index 000000000..01c554356
--- /dev/null
+++ b/tests/app/config/packages/framework.yaml
@@ -0,0 +1,27 @@
+# see https://symfony.com/doc/current/reference/configuration/framework.html
+framework:
+    secret: '%env(APP_SECRET)%'
+
+    # DIRTY FIX un bug dans symfony4 empêche de récupérer un tableau de variables depuis .env
+    # cfr. https://github.com/symfony/symfony/issues/28599
+    trusted_hosts:
+        - '^(localhost|127.0.0.1)$'
+
+    #csrf_protection: true
+    #http_method_override: true
+
+    # Enables session support. Note that the session will ONLY be started if you read or write from it.
+    # Remove or comment this section to explicitly disable session support.
+    session:
+        handler_id: null
+        cookie_secure: auto
+        cookie_samesite: lax
+
+    #esi: true
+    #fragments: true
+    php_errors:
+        log: true
+
+    ## sf4 check: ou à déplacer dans un chill.yaml
+    assets:
+        json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
diff --git a/tests/app/config/packages/lexik_jwt_authentication.yaml b/tests/app/config/packages/lexik_jwt_authentication.yaml
new file mode 100644
index 000000000..93041d0a2
--- /dev/null
+++ b/tests/app/config/packages/lexik_jwt_authentication.yaml
@@ -0,0 +1,12 @@
+lexik_jwt_authentication:
+    secret_key: '%env(resolve:JWT_SECRET_KEY)%'
+    public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
+    pass_phrase: '%env(JWT_PASSPHRASE)%'
+
+    # required for wopi - recommended duration
+    token_ttl: 36000
+
+    token_extractors:
+        query_parameter:
+            enabled: true
+            name: access_token
diff --git a/tests/app/config/packages/loophp_psr17.yaml b/tests/app/config/packages/loophp_psr17.yaml
new file mode 100644
index 000000000..b5481376d
--- /dev/null
+++ b/tests/app/config/packages/loophp_psr17.yaml
@@ -0,0 +1,8 @@
+services:
+    # Register loophp/psr17/Psr17 class and autowire/autoconfigure it.
+    loophp\psr17\Psr17:
+        autowire: true
+        autoconfigure: true
+
+    # Alias the service to the Psr17 interface.
+    loophp\psr17\Psr17Interface: '@loophp\psr17\Psr17'
diff --git a/tests/app/config/packages/messenger.yaml b/tests/app/config/packages/messenger.yaml
new file mode 100644
index 000000000..f2281f14c
--- /dev/null
+++ b/tests/app/config/packages/messenger.yaml
@@ -0,0 +1,22 @@
+framework:
+    messenger:
+        # Uncomment this (and the failed transport below) to send failed messages to this transport for later handling.
+        # failure_transport: failed
+
+        transports:
+        # https://symfony.com/doc/current/messenger.html#transport-configuration
+        # async: '%env(MESSENGER_TRANSPORT_DSN)%'
+        # failed: 'doctrine://default?queue_name=failed'
+        # sync: 'sync://'
+
+        routing:
+            # Route your messages to the transports
+            'Chill\CalendarBundle\Messenger\Message\CalendarRangeMessage': async
+            'Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage': async
+            'Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage': async
+            'Chill\CalendarBundle\Messenger\Message\CalendarMessage': async
+            'Chill\CalendarBundle\Messenger\Message\InviteUpdateMessage': async
+            'Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage': async
+            'Chill\MainBundle\Service\ShortMessage\ShortMessage': async
+            'Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage': priority
+            'Chill\PersonBundle\AccompanyingPeriod\Lifecycle\AccompanyingPeriodStepChangeRequestMessage': async
diff --git a/tests/app/config/packages/nyholm_psr7.yaml b/tests/app/config/packages/nyholm_psr7.yaml
new file mode 100644
index 000000000..f1357233b
--- /dev/null
+++ b/tests/app/config/packages/nyholm_psr7.yaml
@@ -0,0 +1,21 @@
+services:
+    # Register nyholm/psr7 services for autowiring with PSR-17 (HTTP factories)
+    Psr\Http\Message\RequestFactoryInterface: '@nyholm.psr7.psr17_factory'
+    Psr\Http\Message\ResponseFactoryInterface: '@nyholm.psr7.psr17_factory'
+    Psr\Http\Message\ServerRequestFactoryInterface: '@nyholm.psr7.psr17_factory'
+    Psr\Http\Message\StreamFactoryInterface: '@nyholm.psr7.psr17_factory'
+    Psr\Http\Message\UploadedFileFactoryInterface: '@nyholm.psr7.psr17_factory'
+    Psr\Http\Message\UriFactoryInterface: '@nyholm.psr7.psr17_factory'
+
+    # Register nyholm/psr7 services for autowiring with HTTPlug factories
+    Http\Message\MessageFactory: '@nyholm.psr7.httplug_factory'
+    Http\Message\RequestFactory: '@nyholm.psr7.httplug_factory'
+    Http\Message\ResponseFactory: '@nyholm.psr7.httplug_factory'
+    Http\Message\StreamFactory: '@nyholm.psr7.httplug_factory'
+    Http\Message\UriFactory: '@nyholm.psr7.httplug_factory'
+
+    nyholm.psr7.psr17_factory:
+        class: Nyholm\Psr7\Factory\Psr17Factory
+
+    nyholm.psr7.httplug_factory:
+        class: Nyholm\Psr7\Factory\HttplugFactory
diff --git a/tests/app/config/packages/prod/deprecations.yaml b/tests/app/config/packages/prod/deprecations.yaml
new file mode 100644
index 000000000..920a06197
--- /dev/null
+++ b/tests/app/config/packages/prod/deprecations.yaml
@@ -0,0 +1,8 @@
+# As of Symfony 5.1, deprecations are logged in the dedicated "deprecation" channel when it exists
+#monolog:
+#    channels: [deprecation]
+#    handlers:
+#        deprecation:
+#            type: stream
+#            channels: [deprecation]
+#            path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log"
diff --git a/tests/app/config/packages/prod/doctrine.yaml b/tests/app/config/packages/prod/doctrine.yaml
new file mode 100644
index 000000000..084f59a05
--- /dev/null
+++ b/tests/app/config/packages/prod/doctrine.yaml
@@ -0,0 +1,20 @@
+doctrine:
+    orm:
+        auto_generate_proxy_classes: false
+        metadata_cache_driver:
+            type: pool
+            pool: doctrine.system_cache_pool
+        query_cache_driver:
+            type: pool
+            pool: doctrine.system_cache_pool
+        result_cache_driver:
+            type: pool
+            pool: doctrine.result_cache_pool
+
+framework:
+    cache:
+        pools:
+            doctrine.result_cache_pool:
+                adapter: cache.app
+            doctrine.system_cache_pool:
+                adapter: cache.system
diff --git a/tests/app/config/packages/prod/monolog.yaml b/tests/app/config/packages/prod/monolog.yaml
new file mode 100644
index 000000000..8fb26a524
--- /dev/null
+++ b/tests/app/config/packages/prod/monolog.yaml
@@ -0,0 +1,14 @@
+monolog:
+    handlers:
+        graylog:
+            type: gelf
+            publisher:
+                hostname: "%env(resolve:GELF_HOST)%"
+                port:     "%env(resolve:GELF_PORT)%"
+            level: warning
+            channels: ['!event']
+        console:
+            type: console
+            process_psr_3_messages: false
+            channels: ['!event', '!doctrine', '!console']
+            bubble: false
diff --git a/tests/app/config/packages/prod/routing.yaml b/tests/app/config/packages/prod/routing.yaml
new file mode 100644
index 000000000..b3e6a0af2
--- /dev/null
+++ b/tests/app/config/packages/prod/routing.yaml
@@ -0,0 +1,3 @@
+framework:
+    router:
+        strict_requirements: null
diff --git a/tests/app/config/packages/prod/webpack_encore.yaml b/tests/app/config/packages/prod/webpack_encore.yaml
new file mode 100644
index 000000000..d0b3ba81e
--- /dev/null
+++ b/tests/app/config/packages/prod/webpack_encore.yaml
@@ -0,0 +1,4 @@
+#webpack_encore:
+    # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
+    # Available in version 1.2
+    #cache: true
diff --git a/tests/app/config/packages/ramsey_uuid_doctrine.yaml b/tests/app/config/packages/ramsey_uuid_doctrine.yaml
new file mode 100644
index 000000000..cfc3036f9
--- /dev/null
+++ b/tests/app/config/packages/ramsey_uuid_doctrine.yaml
@@ -0,0 +1,4 @@
+doctrine:
+    dbal:
+        types:
+            uuid: 'Ramsey\Uuid\Doctrine\UuidType'
diff --git a/tests/app/config/packages/routing.yaml b/tests/app/config/packages/routing.yaml
new file mode 100644
index 000000000..b45c1cec7
--- /dev/null
+++ b/tests/app/config/packages/routing.yaml
@@ -0,0 +1,7 @@
+framework:
+    router:
+        utf8: true
+
+        # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
+        # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
+        #default_uri: http://localhost
diff --git a/tests/app/config/packages/security.yaml b/tests/app/config/packages/security.yaml
new file mode 100644
index 000000000..f93eb04c3
--- /dev/null
+++ b/tests/app/config/packages/security.yaml
@@ -0,0 +1,58 @@
+security:
+
+    # https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers
+    providers:
+
+        chain_provider:
+            chain :
+                providers: [in_memory, users]
+        in_memory:
+            memory:
+                users:
+                    admin: { password: '%env(resolve:ADMIN_PASSWORD)%', roles: ['ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'] }
+        users:
+            id: chill.main.user_provider
+
+    encoders:
+
+        Chill\MainBundle\Entity\User:
+            algorithm: bcrypt
+        Symfony\Component\Security\Core\User\User: plaintext
+
+    firewalls:
+
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+
+        default:
+            anonymous: ~
+            provider: chain_provider
+            form_login:
+                csrf_parameter: _csrf_token
+                csrf_token_id: authenticate
+                #csrf_provider: security.csrf.token_manager
+            logout_on_user_change: true
+            logout: ~
+
+            # uncomment to enable impersonate mode in Chill
+            # https://symfony.com/doc/current/security/impersonating_user.html
+            # switch_user: true
+
+            # activate different ways to authenticate
+            # https://symfony.com/doc/current/security.html#firewalls-authentication
+
+    # Easy way to control access for large sections of your site
+    # Note: Only the *first* access control that matches will be used
+    access_control:
+        - { path: ^/(login|logout), roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/public, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        # access for homepage, the homepage redirect admin to admin section
+        - { path: ^/$, roles: [ IS_AUTHENTICATED_REMEMBERED ] }
+        - { path: ^/homepage$, roles: [ IS_AUTHENTICATED_REMEMBERED ] }
+        # idem
+        - { path: ^/([a-z]+/)?homepage, roles: [ IS_AUTHENTICATED_REMEMBERED ] }
+        # admin section, only for admin
+        - { path: ^/([a-z]+/)?admin, roles: ROLE_ADMIN }
+        # other pages, only for regular user (no admin)
+        - { path: ^/, roles: ROLE_USER }
diff --git a/tests/app/config/packages/sensio_framework_extra.yaml b/tests/app/config/packages/sensio_framework_extra.yaml
new file mode 100644
index 000000000..1821ccc07
--- /dev/null
+++ b/tests/app/config/packages/sensio_framework_extra.yaml
@@ -0,0 +1,3 @@
+sensio_framework_extra:
+    router:
+        annotations: false
diff --git a/tests/app/config/packages/test/chill.yaml b/tests/app/config/packages/test/chill.yaml
new file mode 100644
index 000000000..a6a68dee4
--- /dev/null
+++ b/tests/app/config/packages/test/chill.yaml
@@ -0,0 +1,5 @@
+---
+chill_main:
+    available_languages:
+        - 'fr'
+        - 'en'
diff --git a/tests/app/config/packages/test/framework.yaml b/tests/app/config/packages/test/framework.yaml
new file mode 100644
index 000000000..23906ec36
--- /dev/null
+++ b/tests/app/config/packages/test/framework.yaml
@@ -0,0 +1,6 @@
+framework:
+    test: true
+    session:
+        storage_id: session.storage.mock_file
+    assets:
+        json_manifest_path: NULL
diff --git a/tests/app/config/packages/test/mailer.yaml b/tests/app/config/packages/test/mailer.yaml
new file mode 100644
index 000000000..52b99299c
--- /dev/null
+++ b/tests/app/config/packages/test/mailer.yaml
@@ -0,0 +1,5 @@
+framework:
+    mailer:
+        dsn: 'null://null'
+        envelope:
+            sender: 'test@chill.social'
diff --git a/tests/app/config/packages/test/messenger.yaml b/tests/app/config/packages/test/messenger.yaml
new file mode 100644
index 000000000..fda6af2b8
--- /dev/null
+++ b/tests/app/config/packages/test/messenger.yaml
@@ -0,0 +1,7 @@
+framework:
+    messenger:
+        transports:
+            async: 'in-memory://'
+            failed: 'in-memory://'
+            sync: 'in-memory://'
+            priority: 'in-memory://'
diff --git a/tests/app/config/packages/test/monolog.yaml b/tests/app/config/packages/test/monolog.yaml
new file mode 100644
index 000000000..fc40641dc
--- /dev/null
+++ b/tests/app/config/packages/test/monolog.yaml
@@ -0,0 +1,12 @@
+monolog:
+    handlers:
+        main:
+            type: fingers_crossed
+            action_level: error
+            handler: nested
+            excluded_http_codes: [404, 405]
+            channels: ["!event"]
+        nested:
+            type: stream
+            path: "%kernel.logs_dir%/%kernel.environment%.log"
+            level: debug
diff --git a/tests/app/config/packages/test/security.yaml b/tests/app/config/packages/test/security.yaml
new file mode 100644
index 000000000..4ff914485
--- /dev/null
+++ b/tests/app/config/packages/test/security.yaml
@@ -0,0 +1,8 @@
+---
+# config/packages/test/security.yaml
+security:
+  firewalls:
+    default:
+      http_basic: ~
+  role_hierarchy:
+    CHILL_MASTER_ROLE: [CHILL_INHERITED_ROLE_1]
diff --git a/tests/app/config/packages/test/twig.yaml b/tests/app/config/packages/test/twig.yaml
new file mode 100644
index 000000000..8c6e0b401
--- /dev/null
+++ b/tests/app/config/packages/test/twig.yaml
@@ -0,0 +1,2 @@
+twig:
+    strict_variables: true
diff --git a/tests/app/config/packages/test/validator.yaml b/tests/app/config/packages/test/validator.yaml
new file mode 100644
index 000000000..1e5ab7880
--- /dev/null
+++ b/tests/app/config/packages/test/validator.yaml
@@ -0,0 +1,3 @@
+framework:
+    validation:
+        not_compromised_password: false
diff --git a/tests/app/config/packages/test/webpack_encore.yaml b/tests/app/config/packages/test/webpack_encore.yaml
new file mode 100644
index 000000000..9ad967357
--- /dev/null
+++ b/tests/app/config/packages/test/webpack_encore.yaml
@@ -0,0 +1,2 @@
+webpack_encore:
+    strict_mode: false
diff --git a/tests/app/config/packages/translation.yaml b/tests/app/config/packages/translation.yaml
new file mode 100644
index 000000000..58f048218
--- /dev/null
+++ b/tests/app/config/packages/translation.yaml
@@ -0,0 +1,7 @@
+framework:
+
+    default_locale:  '%env(resolve:LOCALE)%'
+
+    translator:
+        default_path: '%kernel.project_dir%/translations'
+        fallbacks: [ '%env(resolve:LOCALE)%' ]
diff --git a/tests/app/config/packages/twig.yaml b/tests/app/config/packages/twig.yaml
new file mode 100644
index 000000000..02d862922
--- /dev/null
+++ b/tests/app/config/packages/twig.yaml
@@ -0,0 +1,17 @@
+twig:
+    default_path: '%kernel.project_dir%/templates'
+    debug: '%kernel.debug%'
+    strict_variables: '%kernel.debug%'
+    exception_controller: null
+
+    ## In Symfony 5, bootstrap_5 theme is supported. But not yet in sf4 !!
+    # see sf5 https://symfony.com/doc/current/form/form_themes.html
+    # see sf4 https://symfony.com/doc/4.4/form/form_themes.html
+    #
+    # While waiting for the upgrade, we get the form theme file
+    # (https://github.com/symfony/symfony/tree/5.4/src/Symfony/Bridge/Twig/Resources/views/Form),
+    # put it in ChillMainBundle/Resources/views/Form/bootstrap5/
+    # and adapt it lightly.
+    #
+    form_themes: ['@ChillMain/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig']
+    #form_themes: ['bootstrap_5_horizontal_layout.html.twig']
diff --git a/tests/app/config/packages/validator.yaml b/tests/app/config/packages/validator.yaml
new file mode 100644
index 000000000..350786a13
--- /dev/null
+++ b/tests/app/config/packages/validator.yaml
@@ -0,0 +1,8 @@
+framework:
+    validation:
+        email_validation_mode: html5
+
+        # Enables validator auto-mapping support.
+        # For instance, basic validation constraints will be inferred from Doctrine's metadata.
+        #auto_mapping:
+        #    App\Entity\: []
diff --git a/tests/app/config/packages/webpack_encore.yaml b/tests/app/config/packages/webpack_encore.yaml
new file mode 100644
index 000000000..709531205
--- /dev/null
+++ b/tests/app/config/packages/webpack_encore.yaml
@@ -0,0 +1,33 @@
+---
+webpack_encore:
+    # The path where Encore is building the assets - i.e. Encore.setOutputPath()
+    output_path: '%kernel.project_dir%/public/build'
+
+    # If multiple builds are defined (as shown below), you can disable the default build:
+    # output_path: false
+
+    # Set attributes that will be rendered on all script and link tags
+    script_attributes:
+        defer: true
+    # link_attributes:
+    #
+
+    # If using Encore.enableIntegrityHashes() and need the crossorigin attribute (default: false, or use 'anonymous' or 'use-credentials')
+    # crossorigin: 'anonymous'
+
+    # Preload all rendered script and link tags automatically via the HTTP/2 Link header
+    # preload: true
+
+    # Throw an exception if the entrypoints.json file is missing or an entry is missing from the data
+    # strict_mode: false
+
+    # If you have multiple builds:
+    # builds:
+        # pass "frontend" as the 3rg arg to the Twig functions
+        # {{ encore_entry_script_tags('entry1', null, 'frontend') }}
+
+        # frontend: '%kernel.project_dir%/public/frontend/build'
+
+    # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
+    # Put in config/packages/prod/webpack_encore.yaml
+    # cache: true
diff --git a/tests/app/config/packages/workflow.yaml b/tests/app/config/packages/workflow.yaml
new file mode 100644
index 000000000..855df59cd
--- /dev/null
+++ b/tests/app/config/packages/workflow.yaml
@@ -0,0 +1,2 @@
+framework:
+    workflows: null
diff --git a/tests/app/config/preload.php b/tests/app/config/preload.php
new file mode 100644
index 000000000..d98989af6
--- /dev/null
+++ b/tests/app/config/preload.php
@@ -0,0 +1,18 @@
+<?php
+
+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.
+ */
+
+if (file_exists(dirname(__DIR__).'/var/cache/prod/srcApp_KernelProdContainer.preload.php')) {
+    require dirname(__DIR__).'/var/cache/prod/srcApp_KernelProdContainer.preload.php';
+}
+
+if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
+    require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
+}
diff --git a/tests/app/config/routes.yaml b/tests/app/config/routes.yaml
new file mode 100644
index 000000000..8ab27068a
--- /dev/null
+++ b/tests/app/config/routes.yaml
@@ -0,0 +1,8 @@
+#index:
+#    path: /
+#    controller: App\Controller\DefaultController::index
+
+#load routes for chill bundles
+chill_routes:
+   resource: .
+   type: chill_routes
\ No newline at end of file
diff --git a/tests/app/config/routes/annotations.yaml b/tests/app/config/routes/annotations.yaml
new file mode 100644
index 000000000..05223b2d8
--- /dev/null
+++ b/tests/app/config/routes/annotations.yaml
@@ -0,0 +1,3 @@
+kernel:
+    resource: ../../../Kernel.php
+    type: annotation
diff --git a/tests/app/config/routes/dev/framework.yaml b/tests/app/config/routes/dev/framework.yaml
new file mode 100644
index 000000000..bcbbf13d0
--- /dev/null
+++ b/tests/app/config/routes/dev/framework.yaml
@@ -0,0 +1,3 @@
+_errors:
+    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+    prefix: /_error
diff --git a/tests/app/config/services.yaml b/tests/app/config/services.yaml
new file mode 100644
index 000000000..71c5d507d
--- /dev/null
+++ b/tests/app/config/services.yaml
@@ -0,0 +1,15 @@
+# This file is the entry point to configure your own services.
+# Files in the packages/ subdirectory configure your dependencies.
+
+# Put parameters here that don't need to change on each machine where the app is deployed
+# https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
+parameters:
+
+services:
+    # default configuration for services in *this* file
+    _defaults:
+        autowire: true      # Automatically injects dependencies in your services.
+        autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
+
+    # add more service definitions when explicit configuration is needed
+    # please note that last definitions always *replace* previous ones
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 000000000..0527d656c
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,20 @@
+<?php
+
+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.
+ */
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (file_exists(dirname(__DIR__).'/tests/app/config/bootstrap.php')) {
+    require dirname(__DIR__).'/tests/app/config/bootstrap.php';
+} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+}
diff --git a/tests/console b/tests/console
new file mode 100755
index 000000000..264e064a1
--- /dev/null
+++ b/tests/console
@@ -0,0 +1,42 @@
+#!/usr/bin/env php
+<?php
+
+use App\Kernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\ErrorHandler\Debug;
+
+if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+    echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
+}
+
+set_time_limit(0);
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (!class_exists(Application::class)) {
+    throw new LogicException('You need to add "symfony/framework-bundle" as a Composer dependency.');
+}
+
+$input = new ArgvInput();
+if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
+    putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
+}
+
+if ($input->hasParameterOption('--no-debug', true)) {
+    putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
+}
+
+require dirname(__DIR__).'/tests/app/config/bootstrap.php';
+
+if ($_SERVER['APP_DEBUG']) {
+    umask(0000);
+
+    if (class_exists(Debug::class)) {
+        Debug::enable();
+    }
+}
+
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+$application = new Application($kernel);
+$application->run($input);
diff --git a/tests/symfony-container.php b/tests/symfony-container.php
new file mode 100644
index 000000000..fd093e94d
--- /dev/null
+++ b/tests/symfony-container.php
@@ -0,0 +1,19 @@
+<?php
+
+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.
+ */
+
+use App\Kernel;
+
+require __DIR__ . '/bootstrap.php';
+
+$appKernel = new Kernel('test', false);
+$appKernel->boot();
+
+return $appKernel->getContainer();
diff --git a/utils/rector/src/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector.php b/utils/rector/src/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector.php
new file mode 100644
index 000000000..b2efd260a
--- /dev/null
+++ b/utils/rector/src/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector.php
@@ -0,0 +1,271 @@
+<?php
+
+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 Chill\Utils\Rector\Rector;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Export\DirectExportInterface;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Export\ListInterface;
+use PhpParser\Node;
+use Rector\Core\Rector\AbstractRector;
+use Rector\Symfony\NodeAnalyzer\ClassAnalyzer;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+class ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector extends AbstractRector
+{
+    public function __construct(
+        private readonly ClassAnalyzer $classAnalyzer,
+    ) {}
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Add a getFormDefault data method on exports, filters and aggregators, filled with default data',
+            [/*
+                <<<PHP
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('foo', PickRollingDateType::class, [
+            'label' => 'Test thing',
+            'data' => new RollingDate(RollingDate::T_TODAY)
+        ]);
+
+        $builder->add('baz', TextType::class, [
+            'label' => 'OrNiCar',
+            'data' => 'Castor'
+        ]);
+    }
+}
+PHP,
+<<<PHP
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('foo', PickRollingDateType::class, [
+            'label' => 'Test thing',
+            'data' => new RollingDate(RollingDate::T_TODAY)
+        ]);
+
+        $builder->add('baz', TextType::class, [
+            'label' => 'OrNiCar',
+            'data' => 'Castor'
+        ]);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['foo' => new RollingDate(RollingDate::T_TODAY), 'baz' => 'Castor'];
+    }
+}
+PHP */
+            ]
+        );
+    }
+
+    public function getNodeTypes(): array
+    {
+        return [Node\Stmt\Class_::class];
+    }
+
+    public function refactor(Node $node): ?Node
+    {
+        if (!$node instanceof Node\Stmt\Class_) {
+            return null;
+        }
+
+        if (
+            !$this->classAnalyzer->hasImplements($node, FilterInterface::class)
+            && !$this->classAnalyzer->hasImplements($node, AggregatorInterface::class)
+            && !$this->classAnalyzer->hasImplements($node, ExportInterface::class)
+            && !$this->classAnalyzer->hasImplements($node, DirectExportInterface::class)
+            && !$this->classAnalyzer->hasImplements($node, ListInterface::class)
+        ) {
+            return null;
+        }
+
+        $buildFormStmtIndex = null;
+        $hasGetFormDefaultDataMethod = false;
+        foreach ($node->stmts as $k => $stmt) {
+            if (!$stmt instanceof Node\Stmt\ClassMethod) {
+                continue;
+            }
+
+            if ('buildForm' === $stmt->name->name) {
+                $buildFormStmtIndex = $k;
+            }
+
+            if ('getFormDefaultData' === $stmt->name->name) {
+                $hasGetFormDefaultDataMethod = true;
+            }
+        }
+
+        if ($hasGetFormDefaultDataMethod || null === $buildFormStmtIndex) {
+            return null;
+        }
+
+        $stmtBefore = array_slice($node->stmts, 0, $buildFormStmtIndex, false);
+        $stmtAfter = array_slice($node->stmts, $buildFormStmtIndex + 1);
+
+        // lines to satisfay phpstan parser
+        if (!$node->stmts[$buildFormStmtIndex] instanceof Node\Stmt\ClassMethod) {
+            throw new \LogicException();
+        }
+
+        ['build_form_method' => $buildFormMethod, 'empty_to_replace' => $emptyToReplace]
+            = $this->filterBuildFormMethod($node->stmts[$buildFormStmtIndex], $node);
+
+        $node->stmts = [
+            ...$stmtBefore,
+            $buildFormMethod,
+            $this->makeGetFormDefaultData($node->stmts[$buildFormStmtIndex], $emptyToReplace),
+            ...$stmtAfter,
+        ];
+
+        return $node;
+    }
+
+    private function makeGetFormDefaultData(Node\Stmt\ClassMethod $buildFormMethod, array $emptyToReplace): Node\Stmt\ClassMethod
+    {
+        $method = new Node\Stmt\ClassMethod('getFormDefaultData');
+        $method->flags = Node\Stmt\Class_::MODIFIER_PUBLIC;
+        $method->returnType = new Node\Identifier('array');
+
+        $data = new Node\Expr\Array_([]);
+
+        foreach ($emptyToReplace as $key => $value) {
+            $item = new Node\Expr\ArrayItem($value, new Node\Scalar\String_($key));
+            $data->items[] = $item;
+        }
+
+        $method->stmts[] = new Node\Stmt\Return_($data);
+
+        return $method;
+    }
+
+    /**
+     * @return array{"build_form_method": Node\Stmt\ClassMethod, "empty_to_replace": array<string, mixed>}
+     */
+    private function filterBuildFormMethod(Node\Stmt\ClassMethod $buildFormMethod, Node\Stmt\Class_ $node): array
+    {
+        $builderName = $buildFormMethod->params[0]->var->name;
+
+        $newStmts = [];
+        $emptyDataToReplace = [];
+
+        foreach ($buildFormMethod->stmts as $stmt) {
+            if ($stmt instanceof Node\Stmt\Expression
+                // it must be a method call
+                && $stmt->expr instanceof Node\Expr\MethodCall
+                && false !== ($results = $this->handleMethodCallBuilderAdd($stmt->expr, $builderName, $node))
+            ) {
+                ['stmt' => $newMethodCAll, 'emptyDataToReplace' => $newEmptyDataToReplace] = $results;
+                $newStmts[] = new Node\Stmt\Expression($newMethodCAll);
+                $emptyDataToReplace = [...$emptyDataToReplace, ...$newEmptyDataToReplace];
+            } else {
+                $newStmts[] = $stmt;
+            }
+        }
+
+        $buildFormMethod->stmts = $newStmts;
+
+        return ['build_form_method' => $buildFormMethod, 'empty_to_replace' => $emptyDataToReplace];
+    }
+
+    private function handleMethodCallBuilderAdd(Node\Expr\MethodCall $methodCall, string $builderName, Node\Stmt\Class_ $node): array|false
+    {
+        $emptyDataToReplace = [];
+        // check for chained method call
+        if (
+            // this means that the MethodCall apply on another method call: a chained
+            $methodCall->var instanceof Node\Expr\MethodCall
+        ) {
+            // as this is chained, we make a recursion on this method
+
+            $resultFormDeepMethodCall = $this->handleMethodCallBuilderAdd($methodCall->var, $builderName, $node);
+
+            if (false === $resultFormDeepMethodCall) {
+                return false;
+            }
+
+            ['stmt' => $chainedMethodCall, 'emptyDataToReplace' => $newEmptyDataToReplace] = $resultFormDeepMethodCall;
+            $emptyDataToReplace = $newEmptyDataToReplace;
+            $methodCall->var = $chainedMethodCall;
+        }
+
+        if (
+            $methodCall->var instanceof Node\Expr\Variable
+        ) {
+            if ($methodCall->var->name !== $builderName) {
+                // ho, this does not apply on a builder, so we cancel all the method calls
+                return false;
+            }
+        }
+
+        if ($methodCall->name instanceof Node\Identifier && 'add' !== $methodCall->name->name) {
+            return ['stmt' => $methodCall, 'emptyDataToReplace' => $emptyDataToReplace];
+        }
+
+        if (
+            // the method call must be "add"
+            $methodCall->name instanceof Node\Identifier
+            && 'add' === $methodCall->name->name
+            // it must have a first argument, a string
+            // TODO what happens if a value, or a const ?
+            && ($methodCall->args[0] ?? null) instanceof Node\Arg
+            && $methodCall->args[0]->value instanceof Node\Scalar\String_
+            // and a third argument, an array
+            && ($methodCall->args[2] ?? null) instanceof Node\Arg
+            && $methodCall->args[2]->value instanceof Node\Expr\Array_
+        ) {
+            // we parse on the 3rd argument, to find if there is an 'empty_data' key
+            $emptyDataIndex = null;
+            foreach ($methodCall->args[2]->value->items as $arrayItemIndex => $item) {
+                /* @phpstan-ignore-next-line */
+                if ('data' === $item->key->value or 'empty_data' === $item->key->value) {
+                    $k = $methodCall->args[0]->value->value;
+                    $emptyDataToReplace[$k] = $item->value;
+                    $emptyDataIndex = $arrayItemIndex;
+                }
+            }
+
+            if (null !== $emptyDataIndex) {
+                $methodCall->args[2]->value->items = array_values(
+                    array_filter(
+                        $methodCall->args[2]->value->items,
+                        /* @phpstan-ignore-next-line */
+                        fn (Node\Expr\ArrayItem $item) => 'data' !== $item->key->value
+                    )
+                );
+            }
+
+            return ['stmt' => $methodCall, 'emptyDataToReplace' => $emptyDataToReplace];
+        }
+
+        return ['stmt' => $methodCall, 'emptyDataToReplace' => $emptyDataToReplace];
+    }
+}
diff --git a/utils/rector/tests/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRectorTest.php b/utils/rector/tests/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRectorTest.php
new file mode 100644
index 000000000..8a33b326a
--- /dev/null
+++ b/utils/rector/tests/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRectorTest.php
@@ -0,0 +1,40 @@
+<?php
+
+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 Chill\Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector;
+
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ChillBundleAddFormDefaultDataOnExportFilterAggregatorRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData
+     */
+    public function test(string $file): void
+    {
+        $this->doTestFile($file);
+    }
+
+    public function provideData(): \Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__.'/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__.'/config/config.php';
+    }
+}
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/aggregator-with-no-method-get-form-default-data.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/aggregator-with-no-method-get-form-default-data.php.inc
new file mode 100644
index 000000000..aa373e629
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/aggregator-with-no-method-get-form-default-data.php.inc
@@ -0,0 +1,133 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\ExportInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements ExportInterface
+{
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        // TODO: Implement getAllowedFormattersTypes() method.
+    }
+
+    public function getDescription()
+    {
+        // TODO: Implement getDescription() method.
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        // TODO: Implement getLabels() method.
+    }
+
+    public function getQueryKeys($data)
+    {
+        // TODO: Implement getQueryKeys() method.
+    }
+
+    public function getResult($query, $data)
+    {
+        // TODO: Implement getResult() method.
+    }
+
+    public function getType()
+    {
+        // TODO: Implement getType() method.
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        // TODO: Implement initiateQuery() method.
+    }
+
+    public function requiredRole(): string
+    {
+        // TODO: Implement requiredRole() method.
+    }
+
+    public function supportsModifiers()
+    {
+        // TODO: Implement supportsModifiers() method.
+    }
+}
+?>
+-----
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\ExportInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements ExportInterface
+{
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        // TODO: Implement getAllowedFormattersTypes() method.
+    }
+
+    public function getDescription()
+    {
+        // TODO: Implement getDescription() method.
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        // TODO: Implement getLabels() method.
+    }
+
+    public function getQueryKeys($data)
+    {
+        // TODO: Implement getQueryKeys() method.
+    }
+
+    public function getResult($query, $data)
+    {
+        // TODO: Implement getResult() method.
+    }
+
+    public function getType()
+    {
+        // TODO: Implement getType() method.
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        // TODO: Implement initiateQuery() method.
+    }
+
+    public function requiredRole(): string
+    {
+        // TODO: Implement requiredRole() method.
+    }
+
+    public function supportsModifiers()
+    {
+        // TODO: Implement supportsModifiers() method.
+    }
+}
+?>
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/direct-export-with-no-method-get-form-default-data.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/direct-export-with-no-method-get-form-default-data.php.inc
new file mode 100644
index 000000000..d60f62dcb
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/direct-export-with-no-method-get-form-default-data.php.inc
@@ -0,0 +1,77 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\DirectExportInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+class MyClass implements DirectExportInterface
+{
+    public function generate(array $acl, array $data = []): Response
+    {
+        // TODO: Implement generate() method.
+    }
+
+    public function getDescription(): string
+    {
+        // TODO: Implement getDescription() method.
+    }
+
+    public function requiredRole(): string
+    {
+        // TODO: Implement requiredRole() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+}
+?>
+-----
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\DirectExportInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+class MyClass implements DirectExportInterface
+{
+    public function generate(array $acl, array $data = []): Response
+    {
+        // TODO: Implement generate() method.
+    }
+
+    public function getDescription(): string
+    {
+        // TODO: Implement getDescription() method.
+    }
+
+    public function requiredRole(): string
+    {
+        // TODO: Implement requiredRole() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+}
+?>
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/export-with-no-method-get-form-default-data.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/export-with-no-method-get-form-default-data.php.inc
new file mode 100644
index 000000000..ba5a6d4ec
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/export-with-no-method-get-form-default-data.php.inc
@@ -0,0 +1,95 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements AggregatorInterface
+{
+    public function getLabels($key, array $values, $data)
+    {
+        // TODO: Implement getLabels() method.
+    }
+
+    public function getQueryKeys($data)
+    {
+        // TODO: Implement getQueryKeys() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
+-----
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements AggregatorInterface
+{
+    public function getLabels($key, array $values, $data)
+    {
+        // TODO: Implement getLabels() method.
+    }
+
+    public function getQueryKeys($data)
+    {
+        // TODO: Implement getQueryKeys() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-multiple-reuse-data-on-form-default-data-with-chained-builder.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-multiple-reuse-data-on-form-default-data-with-chained-builder.php.inc
new file mode 100644
index 000000000..ed46f6381
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-multiple-reuse-data-on-form-default-data-with-chained-builder.php.inc
@@ -0,0 +1,111 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('foo', PickRollingDateType::class, [
+                'label' => 'Test thing',
+                'data' => new RollingDate(RollingDate::T_TODAY)
+            ])
+            ->anotherCall('test')
+            ->add('baz', TextType::class, [
+                'label' => 'OrNiCar',
+                'data' => 'Castor'
+            ])
+            ->baz('foo');
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
+-----
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('foo', PickRollingDateType::class, [
+                'label' => 'Test thing'
+            ])
+            ->anotherCall('test')
+            ->add('baz', TextType::class, [
+                'label' => 'OrNiCar'
+            ])
+            ->baz('foo');
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['foo' => new RollingDate(RollingDate::T_TODAY), 'baz' => 'Castor'];
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-multiple-reuse-data-on-form-default-data.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-multiple-reuse-data-on-form-default-data.php.inc
new file mode 100644
index 000000000..5429d3c82
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-multiple-reuse-data-on-form-default-data.php.inc
@@ -0,0 +1,107 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('foo', PickRollingDateType::class, [
+            'label' => 'Test thing',
+            'data' => new RollingDate(RollingDate::T_TODAY)
+        ]);
+
+        $builder->add('baz', TextType::class, [
+            'label' => 'OrNiCar',
+            'data' => 'Castor'
+        ]);
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
+-----
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('foo', PickRollingDateType::class, [
+            'label' => 'Test thing'
+        ]);
+
+        $builder->add('baz', TextType::class, [
+            'label' => 'OrNiCar'
+        ]);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['foo' => new RollingDate(RollingDate::T_TODAY), 'baz' => 'Castor'];
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-no-data-on-builder.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-no-data-on-builder.php.inc
new file mode 100644
index 000000000..285c16b50
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-no-data-on-builder.php.inc
@@ -0,0 +1,105 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('foo', PickRollingDateType::class, [
+            'label' => 'Test thing',
+        ]);
+
+        $builder->add('baz', TextType::class, [
+            'label' => 'OrNiCar',
+        ]);
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
+-----
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('foo', PickRollingDateType::class, [
+            'label' => 'Test thing',
+        ]);
+
+        $builder->add('baz', TextType::class, [
+            'label' => 'OrNiCar',
+        ]);
+    }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-reuse-data-on-form-default-data.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-reuse-data-on-form-default-data.php.inc
new file mode 100644
index 000000000..b2e78e49c
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-reuse-data-on-form-default-data.php.inc
@@ -0,0 +1,96 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('test', PickRollingDateType::class, [
+            'label' => 'Test thing',
+            'data' => new RollingDate(RollingDate::T_TODAY)
+        ]);
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
+-----
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('test', PickRollingDateType::class, [
+            'label' => 'Test thing'
+        ]);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['test' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-with-no-method-get-form-default-data.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-with-no-method-get-form-default-data.php.inc
new file mode 100644
index 000000000..687bd9d0c
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/filter-with-no-method-get-form-default-data.php.inc
@@ -0,0 +1,87 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
+-----
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+?>
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/list-with-no-method-get-form-default-data.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/list-with-no-method-get-form-default-data.php.inc
new file mode 100644
index 000000000..99cea7155
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/list-with-no-method-get-form-default-data.php.inc
@@ -0,0 +1,135 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\ListInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements ListInterface
+{
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        // TODO: Implement getAllowedFormattersTypes() method.
+    }
+
+    public function getDescription()
+    {
+        // TODO: Implement getDescription() method.
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        // TODO: Implement getLabels() method.
+    }
+
+    public function getQueryKeys($data)
+    {
+        // TODO: Implement getQueryKeys() method.
+    }
+
+    public function getResult($query, $data)
+    {
+        // TODO: Implement getResult() method.
+    }
+
+    public function getType()
+    {
+        // TODO: Implement getType() method.
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        // TODO: Implement initiateQuery() method.
+    }
+
+    public function requiredRole(): string
+    {
+        // TODO: Implement requiredRole() method.
+    }
+
+    public function supportsModifiers()
+    {
+        // TODO: Implement supportsModifiers() method.
+    }
+}
+?>
+-----
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\ListInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements ListInterface
+{
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        // TODO: Implement getAllowedFormattersTypes() method.
+    }
+
+    public function getDescription()
+    {
+        // TODO: Implement getDescription() method.
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        // TODO: Implement getLabels() method.
+    }
+
+    public function getQueryKeys($data)
+    {
+        // TODO: Implement getQueryKeys() method.
+    }
+
+    public function getResult($query, $data)
+    {
+        // TODO: Implement getResult() method.
+    }
+
+    public function getType()
+    {
+        // TODO: Implement getType() method.
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        // TODO: Implement initiateQuery() method.
+    }
+
+    public function requiredRole(): string
+    {
+        // TODO: Implement requiredRole() method.
+    }
+
+    public function supportsModifiers()
+    {
+        // TODO: Implement supportsModifiers() method.
+    }
+}
+?>
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/skip-filter-existing-get-form-default-data-method.php.inc b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/skip-filter-existing-get-form-default-data-method.php.inc
new file mode 100644
index 000000000..2fefc908d
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/Fixture/skip-filter-existing-get-form-default-data-method.php.inc
@@ -0,0 +1,46 @@
+<?php
+
+namespace Utils\Rector\Tests\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector\Fixture;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class MyClass implements FilterInterface
+{
+    public function describeAction($data, $format = 'string')
+    {
+        // TODO: Implement describeAction() method.
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getTitle()
+    {
+        // TODO: Implement getTitle() method.
+    }
+
+    public function addRole(): ?string
+    {
+        // TODO: Implement addRole() method.
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: Implement alterQuery() method.
+    }
+
+    public function applyOn()
+    {
+        // TODO: Implement applyOn() method.
+    }
+}
+
diff --git a/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/config/config.php b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/config/config.php
new file mode 100644
index 000000000..89ec65f14
--- /dev/null
+++ b/utils/rector/tests/Rector/ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector/config/config.php
@@ -0,0 +1,14 @@
+<?php
+
+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.
+ */
+
+return static function (Rector\Config\RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(\Chill\Utils\Rector\Rector\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector::class);
+};