Add workflow guard to block external send without public view

Introduce `EntityWorkflowGuardSendExternalIfNoPublicView` class to prevent workflows from transitioning to an external send state if the entity lacks a public view. Included unit tests to verify functionality for entities both with and without public views.
Merge branch 'signature-app/OP762-fix-create-workflow-action' into 'signature-app-master'
2025-09-12 17:55:00 +00:00 · 2024-10-23 15:26:25 +02:00 · 2024-10-23 11:51:05 +00:00 · 2024-10-23 13:44:31 +02:00 · 2024-10-23 09:47:43 +00:00 · 2024-10-23 11:41:20 +02:00
2265 changed files with 24169 additions and 10208 deletions
--- a/.changes/unreleased/Feature-20240614-153236.yaml
+++ b/.changes/unreleased/Feature-20240614-153236.yaml
@@ -0,0 +1,8 @@
+kind: Feature
+body: |-
+  Electronic signature
+
+  Implementation of the electronic signature for documents within chill.
+time: 2024-06-14T15:32:36.875891692+02:00
+custom:
+  Issue: ""
--- a/.changes/unreleased/Feature-20240614-153537.yaml
+++ b/.changes/unreleased/Feature-20240614-153537.yaml
@@ -0,0 +1,7 @@
+kind: Feature
+body: The behavoir of the voters for stored objects is adjusted so as to limit edit
+  and delete possibilities to users related to the activity, social action or workflow
+  entity.
+time: 2024-06-14T15:35:37.582159301+02:00
+custom:
+  Issue: "286"
--- a/.changes/unreleased/Feature-20240718-151233.yaml
+++ b/.changes/unreleased/Feature-20240718-151233.yaml
@@ -0,0 +1,5 @@
+kind: Feature
+body: Metadata form added for person signatures
+time: 2024-07-18T15:12:33.8134266+02:00
+custom:
+  Issue: "288"
--- a/.changes/unreleased/Fixed-20240916-151843.yaml
+++ b/.changes/unreleased/Fixed-20240916-151843.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Show only the current referrer in the page "show" for an accompanying period
+  workf
+time: 2024-09-16T15:18:43.017401122+02:00
+custom:
+  Issue: "308"
--- a/.changes/v2.23.0.md
+++ b/.changes/v2.23.0.md
@@ -1,11 +1,30 @@
-## v2.23.0 - 2024-07-23
+## v2.23.0 - 2024-07-23 & 2024-07-19
 ### Feature
-* ([#221](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/221)) [DX] move async-upload-bundle features into chill-bundles 
-* Add job bundle (module emploi) 
+* ([#221](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/221)) [DX] move async-upload-bundle features into chill-bundles
+* Add job bundle (module emploi)
 * Upgrade import of address list to the last version of compiled addresses of belgian-best-address
- 
+
 * Upgrade CKEditor and refactor configuration with use of typescript
- 
+
+* ([#123](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/123)) Add a button to duplicate calendar ranges from a week to another one
+* [admin] filter users by active / inactive in the admin user's list
+* ([#273](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/273)) Add the possibility to mark all notifications as read
+
+
+* Handle duplicate reference id in the import of reference addresses
+* Do not update the "createdAt" column when importing postal code which does not change
+* Display filename on file upload within the UI interface
 ### Fixed
-* Fix resolving of centers for an household, which will fix in turn the access control 
-* Resolved type hinting error in activity list export  
+* Fix resolving of centers for an household, which will fix in turn the access control
+* Resolved type hinting error in activity list export
+* ([#271](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/271)) Take into account the acp closing date in the acp works date filter
+
+### Traduction française des principaux changements
+- Ajout d'un bouton pour dupliquer les périodes de disponibilités d'une semaine à une autre;
+- dans l'interface d'administration, filtre sur les utilisateurs actifs. Par défaut, seul les utilisateurs
+  actifs sont affichés;
+- Nouveau bouton pour indiquer toutes les notifications comme lues;
+- Améliorations sur l'import des adresses et des codes postaux;
+- Affiche le nom du fichier déposé quand on téléverse un fichier depuis le poste de travail local;
+- Agrandit l'icône du type de fichier dans l'interface de dépôt de fichier;
+- correction: tient compte de la date de fermeture du parcours dans les filtres sur les actions d'accompagnement.
--- a/.changes/v2.24.0.md
+++ b/.changes/v2.24.0.md
@@ -0,0 +1,3 @@
+## v2.24.0 - 2024-09-11
+### Feature
+* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 
--- a/.changes/v3.0.0.md
+++ b/.changes/v3.0.0.md
@@ -0,0 +1,5 @@
+## v3.0.0 - 2024-08-26
+### Fixed
+* Fix delete action for accompanying periods in draft state 
+* Fix connection to azure when making an calendar event in chill 
+* CollectionType js fixes for remove button and adding multiple entries 
--- a/.changes/v3.1.0.md
+++ b/.changes/v3.1.0.md
@@ -0,0 +1,3 @@
+## v3.1.0 - 2024-08-30
+### Feature
+* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 
--- a/.env
+++ b/.env
@@ -23,7 +23,7 @@ TRUSTED_HOSTS='^(localhost|example\.com|nginx)$'
 ###< symfony/framework-bundle ###

 ## Wopi server for editing documents online
-WOPI_SERVER=http://collabora:9980
+EDITOR_SERVER=http://collabora:9980

 # must be manually set in .env.local
 # ADMIN_PASSWORD=
--- a/.env.test
+++ b/.env.test
@@ -41,3 +41,5 @@ DATABASE_URL="postgresql://postgres:postgres@db:5432/test?serverVersion=14&chars
 ASYNC_UPLOAD_TEMP_URL_KEY=
 ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
 ASYNC_UPLOAD_TEMP_URL_CONTAINER=
+
+EDITOR_SERVER=https://localhost:9980
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,7 +122,7 @@ unit_tests:
        - 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 --env=test
-        - php -d memory_limit=4G bin/phpunit --colors=never --exclude-group dbIntensive
+        - php -d memory_limit=4G bin/phpunit --colors=never --exclude-group dbIntensive,openstack-integration,collabora-integration
    artifacts:
        expire_in: 1 day
        paths:
@@ -138,4 +138,4 @@ release:
        - echo "running release_job"
    release:
        tag_name: '$CI_COMMIT_TAG'
-        description: "./.changes/v$CI_COMMIT_TAG.md"
+        description: "./.changes/$CI_COMMIT_TAG.md"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,27 +6,62 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


-## v2.23.0 - 2024-07-23
+## v3.1.0 - 2024-08-30
 ### Feature
-* ([#221](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/221)) [DX] move async-upload-bundle features into chill-bundles 
-* Add job bundle (module emploi) 
-* Upgrade import of address list to the last version of compiled addresses of belgian-best-address
- 
-* Upgrade CKEditor and refactor configuration with use of typescript
- 
+* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe.
+
+## v3.0.0 - 2024-08-26
 ### Fixed
-* Fix resolving of centers for an household, which will fix in turn the access control 
-* Resolved type hinting error in activity list export  
+* Fix delete action for accompanying periods in draft state
+* Fix connection to azure when making an calendar event in chill
+* CollectionType js fixes for remove button and adding multiple entries
+
+## v2.24.0 - 2024-09-11
+### Feature
+* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document.
+
+## v2.23.0 - 2024-07-19 & 2024-07-23
+### Feature
+* ([#123](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/123)) Add a button to duplicate calendar ranges from a week to another one
+* [admin] filter users by active / inactive in the admin user's list
+* ([#273](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/273)) Add the possibility to mark all notifications as read
+
+
+* Handle duplicate reference id in the import of reference addresses
+* Do not update the "createdAt" column when importing postal code which does not change
+* Display filename on file upload within the UI interface
+### Fixed
+* ([#271](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/271)) Take into account the acp closing date in the acp works date filter
+
+### Traduction française des principaux changements
+- Ajout d'un bouton pour dupliquer les périodes de disponibilités d'une semaine à une autre;
+- dans l'interface d'administration, filtre sur les utilisateurs actifs. Par défaut, seul les utilisateurs
+  actifs sont affichés;
+- Nouveau bouton pour indiquer toutes les notifications comme lues;
+- Améliorations sur l'import des adresses et des codes postaux;
+- Affiche le nom du fichier déposé quand on téléverse un fichier depuis le poste de travail local;
+- Agrandit l'icône du type de fichier dans l'interface de dépôt de fichier;
+- correction: tient compte de la date de fermeture du parcours dans les filtres sur les actions d'accompagnement.
+
+* ([#221](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/221)) [DX] move async-upload-bundle features into chill-bundles
+* Add job bundle (module emploi)
+* Upgrade import of address list to the last version of compiled addresses of belgian-best-address
+
+* Upgrade CKEditor and refactor configuration with use of typescript
+
+### Fixed
+* Fix resolving of centers for an household, which will fix in turn the access control
+* Resolved type hinting error in activity list export

 ## v2.22.2 - 2024-07-03
 ### Fixed
-* Remove scope required for event participation stats 
+* Remove scope required for event participation stats

 ## v2.22.1 - 2024-07-01
 ### Fixed
-* Remove debug word 
+* Remove debug word
 ### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 
+* Add a command for reading official address DB from Luxembourg and update chill addresses

 ## v2.22.0 - 2024-06-25
 ### Feature
@@ -69,7 +104,7 @@ and is generated by [Changie](https://github.com/miniscruff/changie).

 ## v2.20.1 - 2024-06-05
 ### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 
+* Do not allow StoredObjectCreated for edit and convert buttons

 ## v2.20.0 - 2024-06-05
 ### Fixed
@@ -116,96 +151,96 @@ and is generated by [Changie](https://github.com/miniscruff/changie).

 ## v2.18.2 - 2024-04-12
 ### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record

 ## v2.18.1 - 2024-03-26
 ### Fixed
-* Fix layout issue in document generation for admin (minor) 
+* Fix layout issue in document generation for admin (minor)

 ## v2.18.0 - 2024-03-26
 ### Feature
-* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation
 ### Fixed
-* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job

 ## v2.17.0 - 2024-03-19
 ### Feature
-* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
-* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
-* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
+* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates
+* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course
+* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields
 * ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
 ### Fixed
-* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
-* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
+* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill
+* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period

 ## v2.16.3 - 2024-02-26
 ### Fixed
-* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
+* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier'
 ### UX
-* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
+* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters

 ## v2.16.2 - 2024-02-21
 ### Fixed
-* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template

 ## v2.16.1 - 2024-02-09
 ### Fixed
-* Force bootstrap version to avoid error in builds with newer version 
+* Force bootstrap version to avoid error in builds with newer version

 ## v2.16.0 - 2024-02-08
 ### Feature
-* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
-* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
-* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
-* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
-* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
-* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
-* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
-* Modernize the event bundle, with some new fields and multiple improvements 
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work
+* Modernize the event bundle, with some new fields and multiple improvements
 ### Fixed
-* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
-* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form
 ### UX
-* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin.

 ## v2.15.2 - 2024-01-11
 ### Fixed
-* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files
 ### DX
-* Set placeholder to False for expanded EntityType form fields where required is set to False. 
+* Set placeholder to False for expanded EntityType form fields where required is set to False.

 ## v2.15.1 - 2023-12-20
 ### Fixed
-* Fix the household export query to exclude accompanying periods that are in draft state. 
+* Fix the household export query to exclude accompanying periods that are in draft state.
 ### DX
-* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx

 ## v2.15.0 - 2023-12-11
 ### Feature
-* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
-* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
+* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange"
+* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type"
 ### Fixed
-* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
-* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
+* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period.
+* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick)
 * ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
- 
-* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
-* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 
+
+* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1)
+* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them

 ## v2.14.1 - 2023-11-29
 ### Fixed
-* Export: fix list person with custom fields 
-* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
-* Fix error in ListEvaluation when "handling agents" are alone 
+* Export: fix list person with custom fields
+* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin
+* Fix error in ListEvaluation when "handling agents" are alone

 ## v2.14.0 - 2023-11-24
 ### Feature
-* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
+* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order
 ### Fixed
-* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
-* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
-* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
-* Fix various errors in custom fields administration 
+* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export
+* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null
+* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields
+* Fix various errors in custom fields administration

 ## v2.13.0 - 2023-11-21
 ### Feature
@@ -219,7 +254,7 @@ and is generated by [Changie](https://github.com/miniscruff/changie).

 ## v2.12.1 - 2023-11-16
 ### Fixed
-* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 
+* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result"

 ## v2.12.0 - 2023-11-15
 ### Feature
@@ -250,36 +285,36 @@ and is generated by [Changie](https://github.com/miniscruff/changie).

 ## v2.11.0 - 2023-11-07
 ### Feature
-* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
+* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job"
 ### Fixed
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
-* Fix "group activity by creator job" aggregator 
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit
+* Fix "group activity by creator job" aggregator

 ## v2.10.6 - 2023-11-07
 ### Fixed
-* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 
+* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies

 ## v2.10.5 - 2023-11-05
 ### Fixed
-* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
-* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 
+* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type
+* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date"

 ## v2.10.4 - 2023-10-26
 ### Fixed
-* Fix null value constraint errors when merging relationships in doubles 
+* Fix null value constraint errors when merging relationships in doubles

 ## v2.10.3 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface

 ## v2.10.2 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get().

 ## v2.10.1 - 2023-10-24
 ### Fixed
-* Fix export controller when generating an export without any data in session 
+* Fix export controller when generating an export without any data in session

 ## v2.10.0 - 2023-10-24
 ### Feature
@@ -304,11 +339,11 @@ and is generated by [Changie](https://github.com/miniscruff/changie).

 ## v2.9.2 - 2023-10-17
 ### Fixed
-* Fix possible null values in string's entities 
+* 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 
+* 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
@@ -356,57 +391,57 @@ But if you do not need this any more, you must ensure that the configuration key

 ## 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) 
+* ([#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" 
+* ([#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 
+* Remove id property from document
+mappedsuperclass

 ## v2.6.2 - 2023-09-18
 ### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
+* 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. 
+* 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. 
+* ([#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 
+* ([#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. 
+
+* ([#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 
+
+* 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. 
+* ([#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) 
+* [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 
+* [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
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
        "social worker"
    ],
    "require": {
-        "php": "^8.3",
+        "php": "^8.2",
        "ext-dom": "*",
        "ext-json": "*",
        "ext-openssl": "*",
@@ -30,48 +30,51 @@
        "ovh/ovh": "^3.0",
        "phpoffice/phpspreadsheet": "^1.16",
        "ramsey/uuid-doctrine": "^1.7",
-        "sensio/framework-extra-bundle": "^6.0",
+        "sensio/framework-extra-bundle": "^5.5",
+        "smalot/pdfparser": "^2.10",
        "spomky-labs/base64url": "^2.0",
-        "symfony/asset": "6.4.*",
-        "symfony/browser-kit": "6.4.*",
-        "symfony/cache": "6.4.*",
+        "symfony/asset": "^5.4",
+        "symfony/browser-kit": "^5.4",
+        "symfony/cache": "^5.4",
        "symfony/clock": "^6.2",
-        "symfony/config": "^6.4",
-        "symfony/console": "6.4.*",
-        "symfony/css-selector": "6.4.*",
-        "symfony/dom-crawler": "6.4.*",
-        "symfony/error-handler": "6.4.*",
-        "symfony/event-dispatcher": "6.4.*",
-        "symfony/expression-language": "6.4.*",
-        "symfony/filesystem": "6.4.*",
-        "symfony/finder": "6.4.*",
-        "symfony/form": "6.4.*",
-        "symfony/framework-bundle": "6.4.*",
-        "symfony/http-client": "6.4.*",
-        "symfony/http-foundation": "6.4.*",
-        "symfony/intl": "6.4.*",
-        "symfony/mailer": "6.4.*",
-        "symfony/messenger": "6.4.*",
-        "symfony/mime": "6.4.*",
+        "symfony/config": "^5.4",
+        "symfony/console": "^5.4",
+        "symfony/css-selector": "^5.4",
+        "symfony/dom-crawler": "^5.4",
+        "symfony/error-handler": "^5.4",
+        "symfony/event-dispatcher": "^5.4",
+        "symfony/event-dispatcher-contracts": "^2.4",
+        "symfony/expression-language": "^5.4",
+        "symfony/filesystem": "^5.4",
+        "symfony/finder": "^5.4",
+        "symfony/form": "^5.4",
+        "symfony/framework-bundle": "^5.4",
+        "symfony/http-client": "^5.4",
+        "symfony/http-foundation": "^5.4",
+        "symfony/intl": "^5.4",
+        "symfony/mailer": "^5.4",
+        "symfony/messenger": "^5.4",
+        "symfony/mime": "^5.4",
        "symfony/monolog-bundle": "^3.5",
-        "symfony/options-resolver": "6.4.*",
-        "symfony/process": "6.4.*",
-        "symfony/property-access": "6.4.*",
-        "symfony/property-info": "6.4.*",
-        "symfony/routing": "6.4.*",
-        "symfony/security-bundle": "^6.4",
-        "symfony/security-core": "6.4.*",
-        "symfony/security-csrf": "6.4.*",
-        "symfony/security-http": "6.4.*",
-        "symfony/serializer": "6.4.*",
-        "symfony/string": "6.4.*",
-        "symfony/templating": "6.4.*",
-        "symfony/translation": "6.4.*",
-        "symfony/twig-bundle": "6.4.*",
-        "symfony/validator": "6.4.*",
+        "symfony/options-resolver": "^5.4",
+        "symfony/process": "^5.4",
+        "symfony/property-access": "^5.4",
+        "symfony/property-info": "^5.4",
+        "symfony/routing": "^5.4",
+        "symfony/security-bundle": "^5.4",
+        "symfony/security-core": "^5.4",
+        "symfony/security-csrf": "^5.4",
+        "symfony/security-guard": "^5.4",
+        "symfony/security-http": "^5.4",
+        "symfony/serializer": "^5.4",
+        "symfony/string": "^5.4",
+        "symfony/templating": "^5.4",
+        "symfony/translation": "^5.4",
+        "symfony/twig-bundle": "^5.4",
+        "symfony/validator": "^5.4",
        "symfony/webpack-encore-bundle": "^1.11",
-        "symfony/workflow": "6.4.*",
-        "symfony/yaml": "6.4.*",
+        "symfony/workflow": "^5.4",
+        "symfony/yaml": "^5.4",
        "thenetworg/oauth2-azure": "^2.0",
        "twig/extra-bundle": "^3.0",
        "twig/intl-extra": "^3.0",
@@ -92,13 +95,13 @@
        "phpstan/phpstan-strict-rules": "^1.0",
        "phpunit/phpunit": "^10.5.24",
        "rector/rector": "^1.1.0",
-        "symfony/debug-bundle": "6.4.*",
-        "symfony/dotenv": "6.4.*",
+        "symfony/debug-bundle": "^5.4",
+        "symfony/dotenv": "^5.4",
        "symfony/maker-bundle": "^1.20",
        "symfony/phpunit-bridge": "^7.1",
-        "symfony/runtime": "6.4.*",
-        "symfony/stopwatch": "6.4.*",
-        "symfony/var-dumper": "6.4.*"
+        "symfony/runtime": "^5.4",
+        "symfony/stopwatch": "^5.4",
+        "symfony/var-dumper": "^5.4"
    },
    "conflict": {
        "symfony/symfony": "*"
@@ -151,11 +154,5 @@
            "cache:clear": "symfony-cmd"
        },
        "php-cs-fixer": "php-cs-fixer fix --config=./.php-cs-fixer.dist.php --show-progress=none"
-    },
-    "extra": {
-        "symfony": {
-            "allow-contrib": false,
-            "require": "6.4.*"
-        }
    }
 }
--- a/docs/source/_static/code/exports/BirthdateFilter.php
+++ b/docs/source/_static/code/exports/BirthdateFilter.php
@@ -21,7 +21,6 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
    // add specific role for this filter
-    #[\Override]
    public function addRole(): ?string
    {
        // we do not need any new role for this filter, so we return null
@@ -29,7 +28,6 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
    }

    // here, we alter the query created by Export
-    #[\Override]
    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
@@ -54,14 +52,12 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
    }

    // we give information on which type of export this filter applies
-    #[\Override]
    public function applyOn()
    {
        return 'person';
    }

    // we build a form to collect some parameters from the users
-    #[\Override]
    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
    {
        $builder->add('date_from', DateType::class, [
@@ -78,7 +74,6 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
            'format' => 'dd-MM-yyyy',
        ]);
    }
-    #[\Override]
    public function getFormDefaultData(): array
    {
        return ['date_from' => new DateTime(), 'date_to' => new DateTime()];
@@ -86,7 +81,6 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac

    // here, we create a simple string which will describe the action of
    // the filter in the Response
-    #[\Override]
    public function describeAction($data, $format = 'string')
    {
        return ['Filtered by person\'s birtdate: '
@@ -96,7 +90,6 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
            ], ];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'Filter by person\'s birthdate';
@@ -106,7 +99,6 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
    // is executed here. This function is added by the interface
    // `ExportElementValidatedInterface`, and can be ignore if there is
    // no need for a validation
-    #[\Override]
    public function validateForm($data, ExecutionContextInterface $context)
    {
        $date_from = $data['date_from'];
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -32,30 +32,25 @@ class CountPerson implements ExportInterface
        $this->entityManager = $em;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // this export does not add any form
    }
-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes()
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription()
    {
        return 'Count peoples by various parameters.';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        // the Closure which will be executed by the formatter.
@@ -65,7 +60,6 @@ class CountPerson implements ExportInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        // this array match the result keys in the query. We have only
@@ -73,25 +67,21 @@ class CountPerson implements ExportInterface
        return ['export_result'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle()
    {
        return 'Count peoples';
    }

-    #[\Override]
    public function getType()
    {
        return Declarations::PERSON_TYPE;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        // we gather all center the user choose.
@@ -108,13 +98,11 @@ class CountPerson implements ExportInterface
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return PersonVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers()
    {
        // explain the export manager which formatters and filters are allowed
--- a/docs/source/development/cronjob.rst
+++ b/docs/source/development/cronjob.rst
@@ -39,9 +39,12 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
    use Chill\MainBundle\Entity\CronJobExecution;
    use DateInterval;
    use DateTimeImmutable;
+    use Symfony\Component\Clock\ClockInterface;

    class MyCronJob implements CronJobInterface
    {
+        function __construct(private ClockInterface $clock) {}
+
        public function canRun(?CronJobExecution $cronJobExecution): bool
        {
            // the parameter $cronJobExecution contains data about the last execution of the cronjob
@@ -56,7 +59,7 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:

            // this cron job should be executed if the last execution is greater than one day, but only during the night

-            $now = new DateTimeImmutable('now');
+            $now = $clock->now();

            return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
                && in_array($now->format('H'), self::ACCEPTED_HOURS, true)
@@ -69,10 +72,15 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
            return 'arbitrary-and-unique-key';
        }

-        public function run(): void
+        public function run(array $lastExecutionData): void
        {
            // here, we execute the command
-        }
+
+            // we return execution data, which will be served for next execution
+            // this data should be easily serializable in a json column: it should contains
+            // only int, string, etc. Avoid storing object
+            return ['last-execution-id' => 0];
+       }
    }

 How are cron job scheduled ?
--- a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
+++ b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
@@ -31,7 +31,6 @@ class ChillMainConfiguration implements ConfigurationInterface
        $this->setWidgetFactories($widgetFactories);
    }

-    #[\Override]
    public function getConfigTreeBuilder()
    {
        $treeBuilder = new TreeBuilder('chill_main');
--- a/docs/source/development/user-interface/widgets/ChillMainExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillMainExtension.php
@@ -27,13 +27,11 @@ class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesE
     */
    protected $widgetFactories = [];

-    #[\Override]
    public function addWidgetFactory(WidgetFactoryInterface $factory)
    {
        $this->widgetFactories[] = $factory;
    }

-    #[\Override]
    public function getConfiguration(array $config, ContainerBuilder $container)
    {
        return new Configuration($this->widgetFactories, $container);
@@ -42,13 +40,11 @@ class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesE
    /**
     * @return WidgetFactoryInterface[]
     */
-    #[\Override]
    public function getWidgetFactories()
    {
        return $this->widgetFactories;
    }

-    #[\Override]
    public function load(array $configs, ContainerBuilder $container)
    {
        // configuration for main bundle
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
@@ -25,7 +25,6 @@ class ChillPersonAddAPersonListWidgetFactory extends AbstractWidgetFactory
     * see http://symfony.com/doc/current/components/config/definition.html
     *
     */
-    #[\Override]
    public function configureOptions($place, NodeBuilder $node)
    {
        $node->booleanNode('only_active')
@@ -57,7 +56,6 @@ class ChillPersonAddAPersonListWidgetFactory extends AbstractWidgetFactory
     * the service must exists in the container, and it is not required that the service
     * has the `chill_main` tag.
     */
-    #[\Override]
    public function getServiceId(ContainerBuilder $containerBuilder, $place, $order, array $config)
    {
        return 'chill_person.widget.person_list';
@@ -68,7 +66,6 @@ class ChillPersonAddAPersonListWidgetFactory extends AbstractWidgetFactory
     *
     * @return string
     */
-    #[\Override]
    public function getWidgetAlias()
    {
        return 'person_list';
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
@@ -79,7 +79,6 @@ class ChillPersonAddAPersonWidget implements WidgetInterface
     *
     * @return string
     */
-    #[\Override]
    public function render(Twig_Environment $env, $place, array $context, array $config)
    {
        $qb = $this->personRepository
--- a/docs/source/development/user-interface/widgets/ChillPersonExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonExtension.php
@@ -22,7 +22,6 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 */
 class ChillPersonExtension extends Extension implements PrependExtensionInterface
 {
-    #[\Override]
    public function load(array $configs, ContainerBuilder $container)
    {
        // ...
@@ -33,7 +32,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
     *
     * @param \Chill\PersonBundle\DependencyInjection\containerBuilder $container
     */
-    #[\Override]
    public function prepend(ContainerBuilder $container)
    {
        $container->prependExtensionConfig('chill_main', [
--- a/docs/source/installation/enable-collabora-for-dev.rst
+++ b/docs/source/installation/enable-collabora-for-dev.rst
@@ -0,0 +1,125 @@
+
+Enable CODE for development
+===========================
+
+For editing a document, there must be a way to communicate between the collabora server and the symfony server, in
+both direction. The domain name should also be the same for collabora server and for the browser which access to the
+online editor.
+
+Using ngrok (or other http tunnel)
+----------------------------------
+
+One can configure a tunnel server to expose your local install to the web, and access to your local server using the
+tunnel url.
+
+Start ngrok
+^^^^^^^^^^^
+
+This can be achieve using `ngrok <https://ngrok.com/>`_.
+
+.. note::
+
+   The configuration of ngrok is outside of the scope of this document. Refers to the ngrok's documentation.
+
+.. code-block:: bash
+
+   # ensuring that your server is running through http and port 8000
+   ngrok http 8000
+   # then open the link given by the ngrok utility and you should reach your app
+
+At this step, ensure that you can reach your local app using the ngrok url.
+
+Configure Collabora
+^^^^^^^^^^^^^^^^^^^
+
+The collabora server must be executed online and configure to access to your ngrok installation. Ensure that the aliasgroup
+exists for your ngrok application (`See the CODE documentation: <https://sdk.collaboraonline.com/docs/installation/Configuration.html#multihost-configuration>`_).
+
+Configure your app
+^^^^^^^^^^^^^^^^^^
+
+Set the :code:`EDITOR_SERVER` variable to point to your collabora server, this should be done in your :code:`.env.local` file.
+
+At this point, everything must be fine. In case of errors, watch the log from your collabora server, use the `profiler <https://symfony.com/doc/current/profiler.html>`_
+to debug the requests.
+
+.. note::
+
+   In case of error while validating proof (you'll see those message in the collabora's logs), you can temporarily disable
+   the proof validation adding this code snippet in `config/services.yaml`:
+
+   .. code-block:: yaml
+
+      when@dev:
+          # add only in dev environment, to avoid security problems
+          services:
+              ChampsLibres\WopiLib\Contract\Service\ProofValidatorInterface:
+                  # this class will always validate proof
+                  alias: Chill\WopiBundle\Service\Wopi\NullProofValidator
+
+With a local CODE image
+-----------------------
+
+.. warning::
+
+   This configuration is not sure, and must be refined. The documentation does not seems to be entirely valid.
+
+Use a local domain name and https for your app
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Use the proxy feature from embedded symfony server to run your app. `See the dedicated doc <https://symfony.com/doc/current/setup/symfony_server.html#local-domain-names>`
+
+Configure also the `https certificate <https://symfony.com/doc/current/setup/symfony_server.html#enabling-tls>`_
+
+In this example, your local domain name will be :code:`my-domain` and the url will be :code:`https://my-domain.wip`.
+
+Ensure that the proxy is running.
+
+Create a certificate database for collabora
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Collabora must validate your certificate generated by symfony console. For that, you need `to create a NSS database <https://sdk.collaboraonline.com/docs/installation/Configuration.html#validating-digital-signatures>`
+and configure collabora to use it.
+
+At first, export the certificate for symfony development. Use the graphical interface from your browser to get the
+certificate as a PEM file.
+
+.. code-block:: bash
+
+   # create your database in a custom directory
+   mkdir /path/to/your/directory
+   certutil -N -d /path/to/your/directory
+   cat /path/to/your/ca.crt | certutil -d . -A symfony -t -t C,P,C,u,w -a
+
+Launch CODE properly configured
+
+.. code-block:: yaml
+
+     collabora:
+         image: collabora/code:latest
+         environment:
+             - SLEEPFORDEBUGGER=0
+             - DONT_GEN_SSL_CERT="True"
+             # add path to the database
+             - extra_params=--o:ssl.enable=false --o:ssl.termination=false --o:logging.level=7 -o:certificates.database_path=/etc/custom-certificates/nss-database
+             - username=admin
+             - password=admin
+             - dictionaries=en_US
+             - aliasgroup1=https://my-domain.wip
+         ports:
+             - "127.0.0.1:9980:9980"
+         volumes:
+             - "/path/to/your/directory/nss-database:/etc/custom-certificates/nss-database"
+         extra_hosts:
+             - "my-domain.wip:host-gateway"
+
+Configure your app
+^^^^^^^^^^^^^^^^^^
+
+Into your :code:`.env.local` file:
+
+.. code-block:: env
+
+   EDITOR_SERVER=http://${COLLABORA_HOST}:${COLLABORA_PORT}
+
+At this step, you should be able to edit a document through collabora.
--- a/package.json
+++ b/package.json
@@ -53,9 +53,9 @@
    "marked": "^12.0.2",
    "masonry-layout": "^4.2.2",
    "mime": "^4.0.0",
-    "swagger-ui": "^4.15.5",
+    "pdfjs-dist": "^4.3.136",
    "vis-network": "^9.1.0",
-    "vue": "^3.2.37",
+    "vue": "^3.5.6",
    "vue-i18n": "^9.1.6",
    "vue-multiselect": "3.0.0-alpha.2",
    "vue-toast-notification": "^3.1.2",
--- a/rector.php
+++ b/rector.php
@@ -39,19 +39,14 @@ return static function (RectorConfig $rectorConfig): void {

    //define sets of rules
    $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_83,
-//        \Rector\Symfony\Set\SymfonySetList::SYMFONY_40,
-//        \Rector\Symfony\Set\SymfonySetList::SYMFONY_41,
-//        \Rector\Symfony\Set\SymfonySetList::SYMFONY_42,
-//        \Rector\Symfony\Set\SymfonySetList::SYMFONY_43,
-//        \Rector\Symfony\Set\SymfonySetList::SYMFONY_44,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_50,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_51,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_52,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_53,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_54,
-//        \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
-//        \Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_90,
+        LevelSetList::UP_TO_PHP_82,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_40,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_41,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_42,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_43,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_44,
+        \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
+        \Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_90,
    ]);

    $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class, [
@@ -74,9 +69,8 @@ return static function (RectorConfig $rectorConfig): void {

    // skip some path...
    $rectorConfig->skip([
-        // we must adapt service definition
-        \Rector\Symfony\Symfony28\Rector\MethodCall\GetToConstructorInjectionRector::class,
-        \Rector\Symfony\Symfony34\Rector\Closure\ContainerGetNameToTypeInTestsRector::class,
+        // waiting for fixing this bug: https://github.com/rectorphp/rector-doctrine/issues/342
+        \Rector\Doctrine\CodeQuality\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector::class,
    ]);

    $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -68,7 +68,7 @@ final class ActivityController extends AbstractController
        private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
        private readonly TranslatableStringHelperInterface $translatableStringHelper,
        private readonly PaginatorFactory $paginatorFactory,
-        private readonly ChillSecurity $security
+        private readonly ChillSecurity $security,
    ) {}

    /**
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
@@ -22,7 +22,6 @@ class AdminActivityPresenceController extends CRUDController
     *
     * @return \Doctrine\ORM\QueryBuilder|mixed
     */
-    #[\Override]
    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
    {
        /* @var \Doctrine\ORM\QueryBuilder $query */
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
@@ -22,7 +22,6 @@ class AdminActivityTypeCategoryController extends CRUDController
     *
     * @return \Doctrine\ORM\QueryBuilder|mixed
     */
-    #[\Override]
    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
    {
        /* @var \Doctrine\ORM\QueryBuilder $query */
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
@@ -22,7 +22,6 @@ class AdminActivityTypeController extends CRUDController
     *
     * @return \Doctrine\ORM\QueryBuilder|mixed
     */
-    #[\Override]
    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
    {
        /* @var \Doctrine\ORM\QueryBuilder $query */
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
@@ -32,13 +32,11 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
        $this->faker = FakerFactory::create('fr_FR');
    }

-    #[\Override]
    public function getOrder()
    {
        return 16400;
    }

-    #[\Override]
    public function load(ObjectManager $manager)
    {
        $persons = $this->em
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
@@ -38,7 +38,6 @@ class LoadActivityNotifications extends AbstractFixture implements DependentFixt
        ],
    ];

-    #[\Override]
    public function getDependencies()
    {
        return [
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
@@ -23,13 +23,11 @@ class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterf
 {
    public static $references = [];

-    #[\Override]
    public function getOrder()
    {
        return 16300;
    }

-    #[\Override]
    public function load(ObjectManager $manager)
    {
        $reasons = [
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
@@ -21,13 +21,11 @@ use Doctrine\Persistence\ObjectManager;
 */
 class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtureInterface
 {
-    #[\Override]
    public function getOrder()
    {
        return 16200;
    }

-    #[\Override]
    public function load(ObjectManager $manager)
    {
        $categs = [
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
@@ -23,13 +23,11 @@ class LoadActivityType extends Fixture implements OrderedFixtureInterface
 {
    public static $references = [];

-    #[\Override]
    public function getOrder()
    {
        return 16100;
    }

-    #[\Override]
    public function load(ObjectManager $manager)
    {
        $types = [
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
@@ -23,13 +23,11 @@ class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterfac
 {
    public static $references = [];

-    #[\Override]
    public function getOrder()
    {
        return 16050;
    }

-    #[\Override]
    public function load(ObjectManager $manager)
    {
        $categories = [
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -26,13 +26,11 @@ use Doctrine\Persistence\ObjectManager;
 */
 class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterface
 {
-    #[\Override]
    public function getOrder()
    {
        return 16000;
    }

-    #[\Override]
    public function load(ObjectManager $manager)
    {
        foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -25,7 +25,6 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 */
 class ChillActivityExtension extends Extension implements PrependExtensionInterface
 {
-    #[\Override]
    public function load(array $configs, ContainerBuilder $container)
    {
        $configuration = new Configuration();
@@ -45,7 +44,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
        $loader->load('services/doctrine.entitylistener.yaml');
    }

-    #[\Override]
    public function prepend(ContainerBuilder $container)
    {
        $this->prependRoutes($container);
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -22,7 +22,6 @@ use function is_int;
 */
 class Configuration implements ConfigurationInterface
 {
-    #[\Override]
    public function getConfigTreeBuilder()
    {
        $treeBuilder = new TreeBuilder('chill_activity');
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -53,9 +53,9 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

    use TrackUpdateTrait;

-    final public const string SENTRECEIVED_RECEIVED = 'received';
+    final public const SENTRECEIVED_RECEIVED = 'received';

-    final public const string SENTRECEIVED_SENT = 'sent';
+    final public const SENTRECEIVED_SENT = 'sent';

    #[Groups(['read'])]
    #[ORM\ManyToOne(targetEntity: AccompanyingPeriod::class)]
@@ -80,7 +80,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    private \DateTime $date;

    /**
-     * @var Collection<StoredObject>
+     * @var Collection<int, StoredObject>
     */
    #[Assert\Valid(traverse: true)]
    #[ORM\ManyToMany(targetEntity: StoredObject::class, cascade: ['persist'])]
@@ -107,7 +107,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    private ?Person $person = null;

    /**
-     * @var Collection<Person>
+     * @var Collection<int, \Chill\PersonBundle\Entity\Person>
     */
    #[Groups(['read', 'docgen:read'])]
    #[ORM\ManyToMany(targetEntity: Person::class)]
@@ -117,7 +117,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    private PrivateCommentEmbeddable $privateComment;

    /**
-     * @var Collection<ActivityReason>
+     * @var Collection<int, ActivityReason>
     */
    #[Groups(['docgen:read'])]
    #[ORM\ManyToMany(targetEntity: ActivityReason::class)]
@@ -132,7 +132,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    private string $sentReceived = '';

    /**
-     * @var Collection<SocialAction>
+     * @var Collection<int, \Chill\PersonBundle\Entity\SocialWork\SocialAction>
     */
    #[Groups(['read', 'docgen:read'])]
    #[ORM\ManyToMany(targetEntity: SocialAction::class)]
@@ -140,7 +140,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    private Collection $socialActions;

    /**
-     * @var Collection<SocialIssue>
+     * @var Collection<int, SocialIssue>
     */
    #[Groups(['read', 'docgen:read'])]
    #[ORM\ManyToMany(targetEntity: SocialIssue::class)]
@@ -148,7 +148,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    private Collection $socialIssues;

    /**
-     * @var Collection<ThirdParty>
+     * @var Collection<int, ThirdParty>
     */
    #[Groups(['read', 'docgen:read'])]
    #[ORM\ManyToMany(targetEntity: ThirdParty::class)]
@@ -162,7 +162,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    private ?User $user = null;

    /**
-     * @var Collection<User>
+     * @var Collection<int, User>
     */
    #[Groups(['read', 'docgen:read'])]
    #[ORM\ManyToMany(targetEntity: User::class)]
@@ -262,7 +262,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this;
    }

-    #[\Override]
    public function getAccompanyingPeriod(): ?AccompanyingPeriod
    {
        return $this->accompanyingPeriod;
@@ -282,7 +281,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     * get the center
     * center is extracted from person.
     */
-    #[\Override]
    public function getCenters(): iterable
    {
        if ($this->person instanceof Person) {
@@ -401,7 +399,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->scope;
    }

-    #[\Override]
    public function getScopes(): iterable
    {
        if (null !== $this->getAccompanyingPeriod()) {
@@ -425,7 +422,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->socialActions;
    }

-    #[\Override]
    public function getSocialIssues(): Collection
    {
        return $this->socialIssues;
@@ -496,7 +492,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this;
    }

-    #[\Override]
    public function removeSocialIssue(SocialIssue $socialIssue): self
    {
        $this->socialIssues->removeElement($socialIssue);
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
@@ -40,9 +40,9 @@ class ActivityReasonCategory implements \Stringable
    /**
     * Array of ActivityReason.
     *
-     * @var Collection<ActivityReason>
+     * @var Collection<int, ActivityReason>
     */
-    #[ORM\OneToMany(targetEntity: ActivityReason::class, mappedBy: 'category')]
+    #[ORM\OneToMany(mappedBy: 'category', targetEntity: ActivityReason::class)]
    private Collection $reasons;

    /**
@@ -53,7 +53,6 @@ class ActivityReasonCategory implements \Stringable
        $this->reasons = new ArrayCollection();
    }

-    #[\Override]
    public function __toString(): string
    {
        return 'ActivityReasonCategory('.$this->getName('x').')';
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -25,11 +25,11 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 #[ORM\Table(name: 'activitytype')]
 class ActivityType
 {
-    final public const int FIELD_INVISIBLE = 0;
+    final public const FIELD_INVISIBLE = 0;

-    final public const int FIELD_OPTIONAL = 1;
+    final public const FIELD_OPTIONAL = 1;

-    final public const int FIELD_REQUIRED = 2;
+    final public const FIELD_REQUIRED = 2;

    /**
     * @deprecated not in use
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
@@ -19,13 +19,11 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ByActivityNumberAggregator implements AggregatorInterface
 {
-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data): void
    {
        $qb
@@ -33,25 +31,21 @@ class ByActivityNumberAggregator implements AggregatorInterface
            ->addGroupBy('activity_by_number_aggregator');
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACP_TYPE;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder): void
    {
        // No form needed
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return static function ($value) {
@@ -67,13 +61,11 @@ class ByActivityNumberAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['activity_by_number_aggregator'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Group acp by activity number';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityTypeAggregator.php
@@ -25,7 +25,7 @@ use Symfony\Component\Form\FormBuilderInterface;

 final readonly class ByActivityTypeAggregator implements AggregatorInterface
 {
-    private const string PREFIX = 'acp_by_activity_type_agg';
+    private const PREFIX = 'acp_by_activity_type_agg';

    public function __construct(
        private RollingDateConverterInterface $rollingDateConverter,
@@ -33,7 +33,6 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
        private TranslatableStringHelperInterface $translatableStringHelper,
    ) {}

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder
@@ -47,7 +46,6 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
            ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -56,7 +54,6 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
        ];
    }

-    #[\Override]
    public function getLabels($key, array $values, mixed $data)
    {
        return function (int|string|null $value): string {
@@ -72,25 +69,21 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return [self::PREFIX.'_actype_id'];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'export.aggregator.acp.by_activity_type.title';
    }

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -122,7 +115,6 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
            ->addGroupBy("{$p}_actype_id");
    }

-    #[\Override]
    public function applyOn()
    {
        return Declarations::ACP_TYPE;
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
@@ -22,13 +22,11 @@ class BySocialActionAggregator implements AggregatorInterface
 {
    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $actionRepository) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
@@ -39,25 +37,21 @@ class BySocialActionAggregator implements AggregatorInterface
        $qb->addGroupBy('socialaction_aggregator');
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY_ACP;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // no form
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value) {
@@ -75,13 +69,11 @@ class BySocialActionAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['socialaction_aggregator'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Group activity by linked socialaction';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
@@ -22,13 +22,11 @@ class BySocialIssueAggregator implements AggregatorInterface
 {
    public function __construct(private readonly SocialIssueRepository $issueRepository, private readonly SocialIssueRender $issueRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
@@ -39,25 +37,21 @@ class BySocialIssueAggregator implements AggregatorInterface
        $qb->addGroupBy('socialissue_aggregator');
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY_ACP;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // no form
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
@@ -75,13 +69,11 @@ class BySocialIssueAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['socialissue_aggregator'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Group activity by linked socialissue';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php
@@ -18,15 +18,13 @@ use Symfony\Component\Form\FormBuilderInterface;

 final readonly class ActivityLocationAggregator implements AggregatorInterface
 {
-    public const string KEY = 'activity_location_aggregator';
+    public const KEY = 'activity_location_aggregator';

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
@@ -36,25 +34,21 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
        $qb->addGroupBy(self::KEY);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // no form required for this aggregator
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data): \Closure
    {
        return function ($value): string {
@@ -70,13 +64,11 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return [self::KEY];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'export.aggregator.activity.by_location.Title';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityPresenceAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityPresenceAggregator.php
@@ -22,16 +22,13 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
 {
    public function __construct(private ActivityPresenceRepositoryInterface $activityPresenceRepository, private TranslatableStringHelperInterface $translatableStringHelper) {}

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, mixed $data)
    {
        return function (int|string|null $value): string {
@@ -47,32 +44,27 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return ['activity_presence_aggregator_attendee'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.aggregator.activity.by_activity_presence.Group activity by presence';
    }

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data): void
    {
        $qb->addSelect('IDENTITY(activity.attendee) AS activity_presence_aggregator_attendee');
        $qb->addGroupBy('activity_presence_aggregator_attendee');
    }

-    #[\Override]
    public function applyOn()
    {
        return Declarations::ACTIVITY;
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
@@ -28,16 +28,14 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
    public function __construct(
        protected ActivityReasonCategoryRepository $activityReasonCategoryRepository,
        protected ActivityReasonRepository $activityReasonRepository,
-        protected TranslatableStringHelper $translatableStringHelper
+        protected TranslatableStringHelper $translatableStringHelper,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        // add select element
@@ -69,13 +67,11 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        $qb->addGroupBy($alias);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add(
@@ -93,7 +89,6 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        );
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -101,7 +96,6 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        ];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value) use ($data) {
@@ -131,7 +125,6 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        };
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        // add select element
@@ -146,13 +139,11 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        throw new \RuntimeException('The data provided are not recognised.');
    }

-    #[\Override]
    public function getTitle()
    {
        return 'Aggregate by activity reason';
    }

-    #[\Override]
    public function validateForm($data, ExecutionContextInterface $context)
    {
        if (null === $data['level']) {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -20,17 +20,15 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ActivityTypeAggregator implements AggregatorInterface
 {
-    final public const string KEY = 'activity_type_aggregator';
+    final public const KEY = 'activity_type_aggregator';

    public function __construct(protected ActivityTypeRepositoryInterface $activityTypeRepository, protected TranslatableStringHelperInterface $translatableStringHelper) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('acttype', $qb->getAllAliases(), true)) {
@@ -41,25 +39,21 @@ class ActivityTypeAggregator implements AggregatorInterface
        $qb->addGroupBy(self::KEY);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // no form required for this aggregator
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data): \Closure
    {
        return function (int|string|null $value): string {
@@ -75,13 +69,11 @@ class ActivityTypeAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return [self::KEY];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'Aggregate by activity type';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -20,17 +20,15 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ActivityUserAggregator implements AggregatorInterface
 {
-    final public const string KEY = 'activity_user_id';
+    final public const KEY = 'activity_user_id';

    public function __construct(private readonly UserRepository $userRepository, private readonly UserRender $userRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        // add select element
@@ -40,25 +38,21 @@ class ActivityUserAggregator implements AggregatorInterface
        $qb->addGroupBy(self::KEY);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // nothing to add
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, $values, $data): \Closure
    {
        return function ($value) {
@@ -76,13 +70,11 @@ class ActivityUserAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return [self::KEY];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Aggregate by activity user';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
@@ -22,13 +22,11 @@ class ActivityUsersAggregator implements AggregatorInterface
 {
    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('actusers', $qb->getAllAliases(), true)) {
@@ -40,25 +38,21 @@ class ActivityUsersAggregator implements AggregatorInterface
            ->addGroupBy('activity_users_aggregator');
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // nothing to add on the form
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value) {
@@ -76,13 +70,11 @@ class ActivityUsersAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return ['activity_users_aggregator'];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'Aggregate by activity users';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
@@ -22,20 +22,18 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ActivityUsersJobAggregator implements AggregatorInterface
 {
-    private const string PREFIX = 'act_agg_user_job';
+    private const PREFIX = 'act_agg_user_job';

    public function __construct(
        private readonly UserJobRepositoryInterface $userJobRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -62,22 +60,18 @@ class ActivityUsersJobAggregator implements AggregatorInterface
            ->addGroupBy("{$p}_select");
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
@@ -97,13 +91,11 @@ class ActivityUsersJobAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return [self::PREFIX.'_select'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.aggregator.activity.by_user_job.Aggregate by users job';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
@@ -22,20 +22,18 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ActivityUsersScopeAggregator implements AggregatorInterface
 {
-    private const string PREFIX = 'act_agg_user_scope';
+    private const PREFIX = 'act_agg_user_scope';

    public function __construct(
        private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -62,22 +60,18 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
            ->addGroupBy("{$p}_select");
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
@@ -97,13 +91,11 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return [self::PREFIX.'_select'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.aggregator.activity.by_user_scope.Aggregate by users scope';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
@@ -22,38 +22,32 @@ class ByCreatorAggregator implements AggregatorInterface
 {
    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $qb->addSelect('IDENTITY(activity.createdBy) AS creator_aggregator');
        $qb->addGroupBy('creator_aggregator');
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // no form
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
@@ -71,13 +65,11 @@ class ByCreatorAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['creator_aggregator'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Group activity by creator';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
@@ -22,13 +22,11 @@ class ByThirdpartyAggregator implements AggregatorInterface
 {
    public function __construct(private readonly ThirdPartyRepository $thirdPartyRepository, private readonly ThirdPartyRender $thirdPartyRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('acttparty', $qb->getAllAliases(), true)) {
@@ -39,25 +37,21 @@ class ByThirdpartyAggregator implements AggregatorInterface
        $qb->addGroupBy('thirdparty_aggregator');
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // no form
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
@@ -75,13 +69,11 @@ class ByThirdpartyAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['thirdparty_aggregator'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Group activity by linked thirdparties';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorJobAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorJobAggregator.php
@@ -22,20 +22,18 @@ use Symfony\Component\Form\FormBuilderInterface;

 class CreatorJobAggregator implements AggregatorInterface
 {
-    private const string PREFIX = 'acp_agg_creator_job';
+    private const PREFIX = 'acp_agg_creator_job';

    public function __construct(
        private readonly UserJobRepositoryInterface $userJobRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper
+        private readonly TranslatableStringHelper $translatableStringHelper,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -62,22 +60,18 @@ class CreatorJobAggregator implements AggregatorInterface
            ->addGroupBy("{$p}_select");
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
@@ -95,13 +89,11 @@ class CreatorJobAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return [self::PREFIX.'_select'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.aggregator.activity.by_creator_job.Group activity by creator job';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
@@ -22,20 +22,18 @@ use Symfony\Component\Form\FormBuilderInterface;

 class CreatorScopeAggregator implements AggregatorInterface
 {
-    private const string PREFIX = 'acp_agg_creator_scope';
+    private const PREFIX = 'acp_agg_creator_scope';

    public function __construct(
        private readonly ScopeRepository $scopeRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper
+        private readonly TranslatableStringHelper $translatableStringHelper,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -62,22 +60,18 @@ class CreatorScopeAggregator implements AggregatorInterface
            ->addGroupBy("{$p}_select");
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
@@ -97,13 +91,11 @@ class CreatorScopeAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return [self::PREFIX.'_select'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.aggregator.activity.by_creator_scope.Group activity by creator scope';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
@@ -19,21 +19,19 @@ use Symfony\Component\Form\FormBuilderInterface;

 class DateAggregator implements AggregatorInterface
 {
-    private const array CHOICES = [
+    private const CHOICES = [
        'by month' => 'month',
        'by week' => 'week',
        'by year' => 'year',
    ];

-    private const string DEFAULT_CHOICE = 'year';
+    private const DEFAULT_CHOICE = 'year';

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $order = null;
@@ -64,13 +62,11 @@ class DateAggregator implements AggregatorInterface
        $qb->addOrderBy('date_aggregator', $order);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('frequency', ChoiceType::class, [
@@ -80,13 +76,11 @@ class DateAggregator implements AggregatorInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return ['frequency' => self::DEFAULT_CHOICE];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return static function ($value) use ($data): string {
@@ -104,13 +98,11 @@ class DateAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['date_aggregator'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Group activity by date';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -22,13 +22,11 @@ class LocationTypeAggregator implements AggregatorInterface
 {
    public function __construct(private readonly LocationTypeRepository $locationTypeRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
@@ -39,25 +37,21 @@ class LocationTypeAggregator implements AggregatorInterface
        $qb->addGroupBy('locationtype_aggregator');
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // no form
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
@@ -79,13 +73,11 @@ class LocationTypeAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['locationtype_aggregator'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Group activity by locationtype';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/HouseholdAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/HouseholdAggregator.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\ActivityBundle\Export\Aggregator\PersonAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Repository\Household\HouseholdRepository;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class HouseholdAggregator implements AggregatorInterface
+{
+    public function __construct(private HouseholdRepository $householdRepository) {}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add here
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, mixed $data)
+    {
+        return function (int|string|null $value): string|int {
+            if ('_header' === $value) {
+                return 'export.aggregator.person.by_household.household';
+            }
+
+            if ('' === $value || null === $value || null === $household = $this->householdRepository->find($value)) {
+                return '';
+            }
+
+            return $household->getId();
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['activity_household_agg'];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.person.by_household.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join(
+            HouseholdMember::class,
+            'activity_household_agg_household_member',
+            Join::WITH,
+            $qb->expr()->andX(
+                $qb->expr()->eq('activity_household_agg_household_member.person', 'activity.person'),
+                $qb->expr()->lte('activity_household_agg_household_member.startDate', 'activity.date'),
+                $qb->expr()->orX(
+                    $qb->expr()->gte('activity_household_agg_household_member.endDate', 'activity.date'),
+                    $qb->expr()->isNull('activity_household_agg_household_member.endDate')
+                )
+            )
+        );
+
+        $qb->join(
+            Household::class,
+            'activity_household_agg_household',
+            Join::WITH,
+            $qb->expr()->eq('activity_household_agg_household_member.household', 'activity_household_agg_household')
+        );
+
+        $qb
+            ->addSelect('activity_household_agg_household.id AS activity_household_agg')
+            ->addGroupBy('activity_household_agg');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY_PERSON;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/PersonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/PersonAggregator.php
@@ -21,43 +21,36 @@ final readonly class PersonAggregator implements AggregatorInterface
 {
    public function __construct(private LabelPersonHelper $labelPersonHelper) {}

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // nothing to add here
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, mixed $data)
    {
        return $this->labelPersonHelper->getLabel($key, $values, 'export.aggregator.person.by_person.person');
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return ['activity_by_person_agg'];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'export.aggregator.person.by_person.title';
    }

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $qb
@@ -65,7 +58,6 @@ final readonly class PersonAggregator implements AggregatorInterface
            ->addGroupBy('activity_by_person_agg');
    }

-    #[\Override]
    public function applyOn()
    {
        return Declarations::ACTIVITY_PERSON;
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonsAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonsAggregator.php
@@ -23,23 +23,20 @@ use Symfony\Component\Form\FormBuilderInterface;
 */
 final readonly class PersonsAggregator implements AggregatorInterface
 {
-    private const string PREFIX = 'act_persons_agg';
+    private const PREFIX = 'act_persons_agg';

    public function __construct(private LabelPersonHelper $labelPersonHelper) {}

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // nothing to add here
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, mixed $data)
    {
        if ($key !== self::PREFIX.'_pid') {
@@ -49,25 +46,21 @@ final readonly class PersonsAggregator implements AggregatorInterface
        return $this->labelPersonHelper->getLabel($key, $values, 'export.aggregator.activity.by_persons.Persons');
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return [self::PREFIX.'_pid'];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'export.aggregator.activity.by_persons.Group activity by persons';
    }

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -78,7 +71,6 @@ final readonly class PersonsAggregator implements AggregatorInterface
            ->addGroupBy("{$p}_pid");
    }

-    #[\Override]
    public function applyOn()
    {
        return Declarations::ACTIVITY;
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
@@ -21,38 +21,32 @@ class SentReceivedAggregator implements AggregatorInterface
 {
    public function __construct(private readonly TranslatorInterface $translator) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data): void
    {
        $qb->addSelect('activity.sentReceived AS activity_sentreceived_aggregator')
            ->addGroupBy('activity_sentreceived_aggregator');
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder): void
    {
        // No form needed
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getLabels($key, array $values, $data): callable
    {
        return function (?string $value): string {
@@ -77,13 +71,11 @@ class SentReceivedAggregator implements AggregatorInterface
        };
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['activity_sentreceived_aggregator'];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.aggregator.activity.by_sent_received.Group activity by sentreceived';
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@@ -36,34 +36,28 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription(): string
    {
        return 'Average activities linked to an accompanying period duration by various parameters.';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to an accompanying period';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_avg_activity_duration' !== $key) {
@@ -73,31 +67,26 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['export_avg_activity_duration'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Average activity linked to an accompanying period duration';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -127,13 +116,11 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers(): array
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -41,37 +41,31 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // TODO: Implement buildForm() method.
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription(): string
    {
        return 'Average activities linked to an accompanying period visit duration by various parameters.';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to an accompanying period';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_avg_activity_visit_duration' !== $key) {
@@ -81,31 +75,26 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['export_avg_activity_visit_duration'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Average activity linked to an accompanying period visit duration';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -135,13 +124,11 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers(): array
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -41,34 +41,28 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription(): string
    {
        return 'Count activities linked to an accompanying period by various parameters.';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to an accompanying period';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_count_activity' !== $key) {
@@ -78,31 +72,26 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        return static fn ($value) => '_header' === $value ? 'Number of activities linked to an accompanying period' : $value;
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['export_count_activity'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Count activities linked to an accompanying period';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -131,13 +120,11 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers(): array
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountHouseholdOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountHouseholdOnActivity.php
@@ -42,34 +42,28 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription(): string
    {
        return 'export.export.count_household_on_activity.description';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to an accompanying period';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_count_activity' !== $key) {
@@ -79,31 +73,26 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
        return static fn ($value) => '_header' === $value ? 'export.export.count_household_on_activity.header' : $value;
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['export_count_activity'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.export.count_household_on_activity.title';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -140,13 +129,11 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers(): array
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountPersonsOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountPersonsOnActivity.php
@@ -41,34 +41,28 @@ class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription(): string
    {
        return 'export.export.count_person_on_activity.description';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to an accompanying period';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_count_activity' !== $key) {
@@ -78,31 +72,26 @@ class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
        return static fn ($value) => '_header' === $value ? 'export.export.count_person_on_activity.header' : $value;
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['export_count_activity'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.export.count_person_on_activity.title';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -132,13 +121,11 @@ class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers(): array
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
@@ -33,37 +33,31 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
        private FilterListAccompanyingPeriodHelperInterface $filterListAccompanyingPeriodHelper,
    ) {}

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $this->helper->buildForm($builder);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes()
    {
        return $this->helper->getAllowedFormattersTypes();
    }

-    #[\Override]
    public function getDescription()
    {
        return ListActivityHelper::MSG_KEY.'List activities linked to an accompanying course';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to an accompanying period';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        return match ($key) {
@@ -79,7 +73,6 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
        };
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return
@@ -92,25 +85,21 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
            );
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $this->helper->getResult($query, $data);
    }

-    #[\Override]
    public function getTitle()
    {
        return ListActivityHelper::MSG_KEY.'List activity linked to a course';
    }

-    #[\Override]
    public function getType()
    {
        return $this->helper->getType();
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -146,13 +135,11 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::LISTS;
    }

-    #[\Override]
    public function supportsModifiers()
    {
        return array_merge(
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@@ -40,37 +40,31 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // TODO: Implement buildForm() method.
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription(): string
    {
        return 'Sum activities linked to an accompanying period duration by various parameters.';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to an accompanying period';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_sum_activity_duration' !== $key) {
@@ -80,31 +74,26 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['export_sum_activity_duration'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Sum activity linked to an accompanying period duration';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -134,13 +123,11 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers(): array
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@@ -40,37 +40,31 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // TODO: Implement buildForm() method.
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription(): string
    {
        return 'Sum activities linked to an accompanying period visit duration by various parameters.';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to an accompanying period';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_sum_activity_visit_duration' !== $key) {
@@ -80,31 +74,26 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
    }

-    #[\Override]
    public function getQueryKeys($data): array
    {
        return ['export_sum_activity_visit_duration'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Sum activity linked to an accompanying period visit duration';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -134,13 +123,11 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers(): array
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -33,34 +33,28 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes()
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription()
    {
        return 'Count activities linked to a person by various parameters.';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to a person';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_count_activity' !== $key) {
@@ -70,31 +64,26 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return ['export_count_activity'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle()
    {
        return 'Count activities linked to a person';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -124,13 +113,11 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers()
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountHouseholdOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountHouseholdOnActivity.php
@@ -34,34 +34,28 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes()
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription()
    {
        return 'export.export.count_household_on_activity_person.description';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to a person';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_count_activity' !== $key) {
@@ -71,31 +65,26 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
        return static fn ($value) => '_header' === $value ? 'export.export.count_household_on_activity_person.header' : $value;
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return ['export_count_activity'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle()
    {
        return 'export.export.count_household_on_activity_person.title';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);
@@ -132,13 +121,11 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers()
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -19,6 +19,7 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
@@ -44,6 +45,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
        'person_firstname',
        'person_lastname',
        'person_id',
+        'household_id',
    ];
    private readonly bool $filterStatsByCenters;

@@ -57,7 +59,6 @@ class ListActivity implements ListInterface, GroupedExportInterface
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('fields', ChoiceType::class, [
@@ -77,31 +78,26 @@ class ListActivity implements ListInterface, GroupedExportInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes()
    {
        return [FormatterInterface::TYPE_LIST];
    }

-    #[\Override]
    public function getDescription()
    {
        return 'List activities linked to a person description';
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to a person';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        switch ($key) {
@@ -171,48 +167,50 @@ class ListActivity implements ListInterface, GroupedExportInterface
        }
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return $data['fields'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle()
    {
        return 'List activity linked to a person';
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);

-        // throw an error if any fields are present
+        // throw an error if no fields are present
        if (!\array_key_exists('fields', $data)) {
-            throw new InvalidArgumentException('Any fields have been checked.');
+            throw new InvalidArgumentException('No fields have been checked.');
        }

        $qb = $this->entityManager->createQueryBuilder();

        $qb
            ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'actperson');
+            ->join('activity.person', 'person')
+            ->join(
+                HouseholdMember::class,
+                'householdmember',
+                Query\Expr\Join::WITH,
+                'person = householdmember.person AND householdmember.startDate <= activity.date AND (householdmember.endDate IS NULL OR householdmember.endDate > activity.date)'
+            )
+            ->join('householdmember.household', 'household');

        if ($this->filterStatsByCenters) {
-            $qb->join('actperson.centerHistory', 'centerHistory');
+            $qb->join('person.centerHistory', 'centerHistory');
            $qb->where(
                $qb->expr()->andX(
                    $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
@@ -235,17 +233,22 @@ class ListActivity implements ListInterface, GroupedExportInterface
                        break;

                    case 'person_firstname':
-                        $qb->addSelect('actperson.firstName AS person_firstname');
+                        $qb->addSelect('person.firstName AS person_firstname');

                        break;

                    case 'person_lastname':
-                        $qb->addSelect('actperson.lastName AS person_lastname');
+                        $qb->addSelect('person.lastName AS person_lastname');

                        break;

                    case 'person_id':
-                        $qb->addSelect('actperson.id AS person_id');
+                        $qb->addSelect('person.id AS person_id');
+
+                        break;
+
+                    case 'household_id':
+                        $qb->addSelect('household.id AS household_id');

                        break;

@@ -290,14 +293,12 @@ class ListActivity implements ListInterface, GroupedExportInterface
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::LISTS;
    }

-    #[\Override]
-    public function supportsModifiers()
+    public function supportsModifiers(): array
    {
        return [
            Declarations::ACTIVITY,
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
@@ -30,7 +30,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 */
 class StatActivityDuration implements ExportInterface, GroupedExportInterface
 {
-    final public const string SUM = 'sum';
+    final public const SUM = 'sum';
    private readonly bool $filterStatsByCenters;

    /**
@@ -42,27 +42,23 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
        /**
         * The action for this report.
         */
-        protected string $action = 'sum'
+        protected string $action = 'sum',
    ) {
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder) {}

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function getAllowedFormattersTypes()
    {
        return [FormatterInterface::TYPE_TABULAR];
    }

-    #[\Override]
    public function getDescription()
    {
        if (self::SUM === $this->action) {
@@ -72,13 +68,11 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
        throw new \LogicException('this action is not supported: '.$this->action);
    }

-    #[\Override]
    public function getGroup(): string
    {
        return 'Exports of activities linked to a person';
    }

-    #[\Override]
    public function getLabels($key, array $values, $data)
    {
        if ('export_stat_activity' !== $key) {
@@ -90,19 +84,16 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
        return static fn (string $value) => '_header' === $value ? $header : $value;
    }

-    #[\Override]
    public function getQueryKeys($data)
    {
        return ['export_stat_activity'];
    }

-    #[\Override]
    public function getResult($query, $data)
    {
        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

-    #[\Override]
    public function getTitle()
    {
        if (self::SUM === $this->action) {
@@ -112,13 +103,11 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
        throw new \LogicException('This action is not supported: '.$this->action);
    }

-    #[\Override]
    public function getType(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        $centers = array_map(
@@ -156,13 +145,11 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
        return $qb;
    }

-    #[\Override]
    public function requiredRole(): string
    {
        return ActivityStatsVoter::STATS;
    }

-    #[\Override]
    public function supportsModifiers()
    {
        return [
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
@@ -28,7 +28,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;

 class ListActivityHelper
 {
-    final public const string MSG_KEY = 'export.list.activity.';
+    final public const MSG_KEY = 'export.list.activity.';

    public function __construct(
        private readonly ActivityPresenceRepositoryInterface $activityPresenceRepository,
@@ -39,7 +39,7 @@ class ListActivityHelper
        private readonly TranslatorInterface $translator,
        private readonly TranslatableStringHelperInterface $translatableStringHelper,
        private readonly TranslatableStringExportLabelHelper $translatableStringLabelHelper,
-        private readonly UserHelper $userHelper
+        private readonly UserHelper $userHelper,
    ) {}

    public function addSelect(QueryBuilder $qb): void
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
@@ -25,7 +25,7 @@ use Symfony\Component\Form\FormBuilderInterface;

 final readonly class ActivityTypeFilter implements FilterInterface
 {
-    private const string BASE_EXISTS = 'SELECT 1 FROM '.Activity::class.' act_type_filter_activity WHERE act_type_filter_activity.accompanyingPeriod = acp';
+    private const BASE_EXISTS = 'SELECT 1 FROM '.Activity::class.' act_type_filter_activity WHERE act_type_filter_activity.accompanyingPeriod = acp';

    public function __construct(
        private ActivityTypeRepositoryInterface $activityTypeRepository,
@@ -33,13 +33,11 @@ final readonly class ActivityTypeFilter implements FilterInterface
        private RollingDateConverterInterface $rollingDateConverter,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $exists = self::BASE_EXISTS;
@@ -64,13 +62,11 @@ final readonly class ActivityTypeFilter implements FilterInterface
        }
    }

-    #[\Override]
    public function applyOn()
    {
        return Declarations::ACP_TYPE;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_activitytypes', EntityType::class, [
@@ -96,7 +92,6 @@ final readonly class ActivityTypeFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -106,7 +101,6 @@ final readonly class ActivityTypeFilter implements FilterInterface
        ];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $types = [];
@@ -124,7 +118,6 @@ final readonly class ActivityTypeFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter accompanying course by activity type';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@@ -23,13 +23,11 @@ class BySocialActionFilter implements FilterInterface
 {
    public function __construct(private readonly SocialActionRender $actionRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
@@ -45,13 +43,11 @@ class BySocialActionFilter implements FilterInterface
            );
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY_ACP;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_socialactions', PickSocialActionType::class, [
@@ -59,13 +55,11 @@ class BySocialActionFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $actions = [];
@@ -81,7 +75,6 @@ class BySocialActionFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter activity by linked socialaction';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
@@ -23,13 +23,11 @@ class BySocialIssueFilter implements FilterInterface
 {
    public function __construct(private readonly SocialIssueRender $issueRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
@@ -45,13 +43,11 @@ class BySocialIssueFilter implements FilterInterface
            );
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY_ACP;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_socialissues', PickSocialIssueType::class, [
@@ -59,13 +55,11 @@ class BySocialIssueFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $issues = [];
@@ -81,7 +75,6 @@ class BySocialIssueFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter activity by linked socialissue';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
@@ -22,13 +22,11 @@ use Symfony\Component\Form\FormBuilderInterface;
 */
 class HasNoActivityFilter implements FilterInterface
 {
-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $qb
@@ -40,31 +38,26 @@ class HasNoActivityFilter implements FilterInterface
            ');
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACP_TYPE;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        // no form needed
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        return ['Filtered acp which has no activities', []];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter acp which has no activity';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
@@ -25,13 +25,11 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
        private RollingDateConverterInterface $rollingDateConverter,
    ) {}

-    #[\Override]
    public function getTitle()
    {
        return 'export.filter.activity.course_having_activity_between_date.Title';
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder
@@ -43,7 +41,6 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
            ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -52,7 +49,6 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
        ];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string')
    {
        return [
@@ -64,13 +60,11 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
        ];
    }

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $alias = 'act_period_having_act_betw_date_alias';
@@ -79,7 +73,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt

        $qb->andWhere(
            $qb->expr()->exists(
-                'SELECT 1 FROM '.Activity::class." {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = activity.accompanyingPeriod"
+                'SELECT 1 FROM '.Activity::class." {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = acp"
            )
        );

@@ -88,7 +82,6 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
            ->setParameter($to, $this->rollingDateConverter->convert($data['end_date']));
    }

-    #[\Override]
    public function applyOn()
    {
        return \Chill\PersonBundle\Export\Declarations::ACP_TYPE;
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -25,13 +25,11 @@ class ActivityDateFilter implements FilterInterface
 {
    public function __construct(protected TranslatorInterface $translator, private readonly RollingDateConverterInterface $rollingDateConverter) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
@@ -58,13 +56,11 @@ class ActivityDateFilter implements FilterInterface
        );
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder
@@ -76,13 +72,11 @@ class ActivityDateFilter implements FilterInterface
            ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string')
    {
        return [
@@ -94,7 +88,6 @@ class ActivityDateFilter implements FilterInterface
        ];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'Filtered by date activity';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php
@@ -25,16 +25,14 @@ final readonly class ActivityPresenceFilter implements FilterInterface
 {
    public function __construct(
        private TranslatableStringHelperInterface $translatableStringHelper,
-        private TranslatorInterface $translator
+        private TranslatorInterface $translator,
    ) {}

-    #[\Override]
    public function getTitle()
    {
        return 'export.filter.activity.by_presence.Filter activity by activity presence';
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('presences', EntityType::class, [
@@ -47,13 +45,11 @@ final readonly class ActivityPresenceFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string')
    {
        $presences = array_map(
@@ -67,13 +63,11 @@ final readonly class ActivityPresenceFilter implements FilterInterface
        ];
    }

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $qb
@@ -81,7 +75,6 @@ final readonly class ActivityPresenceFilter implements FilterInterface
            ->setParameter('activity_presence_filter_presences', $data['presences']);
    }

-    #[\Override]
    public function applyOn()
    {
        return Declarations::ACTIVITY;
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -26,16 +26,14 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
 {
    public function __construct(
        protected TranslatableStringHelperInterface $translatableStringHelper,
-        protected ActivityTypeRepositoryInterface $activityTypeRepository
+        protected ActivityTypeRepositoryInterface $activityTypeRepository,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
@@ -44,13 +42,11 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
        $qb->setParameter('selected_activity_types', $data['types']);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('types', EntityType::class, [
@@ -74,13 +70,11 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string')
    {
        // collect all the reasons'name used in this filter in one array
@@ -94,13 +88,11 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
        ]];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'Filter by activity type';
    }

-    #[\Override]
    public function validateForm($data, ExecutionContextInterface $context)
    {
        if (null === $data['types'] || 0 === \count($data['types'])) {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
@@ -22,13 +22,11 @@ class ActivityUsersFilter implements FilterInterface
 {
    public function __construct(private readonly UserRender $userRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $orX = $qb->expr()->orX();
@@ -41,13 +39,11 @@ class ActivityUsersFilter implements FilterInterface
        $qb->andWhere($orX);
    }

-    #[\Override]
    public function applyOn()
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_users', PickUserDynamicType::class, [
@@ -56,13 +52,11 @@ class ActivityUsersFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string')
    {
        $users = [];
@@ -76,7 +70,6 @@ class ActivityUsersFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter activity by users';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
@@ -22,13 +22,11 @@ class ByCreatorFilter implements FilterInterface
 {
    public function __construct(private readonly UserRender $userRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $qb
@@ -38,13 +36,11 @@ class ByCreatorFilter implements FilterInterface
            ->setParameter('users', $data['accepted_users']);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_users', PickUserDynamicType::class, [
@@ -52,13 +48,11 @@ class ByCreatorFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $users = [];
@@ -72,7 +66,6 @@ class ByCreatorFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter activity by creator';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/CreatorJobFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/CreatorJobFilter.php
@@ -26,7 +26,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;

 final readonly class CreatorJobFilter implements FilterInterface
 {
-    private const string PREFIX = 'acp_act_filter_creator_job';
+    private const PREFIX = 'acp_act_filter_creator_job';

    public function __construct(
        private TranslatableStringHelper $translatableStringHelper,
@@ -34,13 +34,11 @@ final readonly class CreatorJobFilter implements FilterInterface
        private UserJobRepositoryInterface $userJobRepository,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -72,13 +70,11 @@ final readonly class CreatorJobFilter implements FilterInterface
            );
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder
@@ -94,7 +90,6 @@ final readonly class CreatorJobFilter implements FilterInterface
            ]);
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $jobs = array_map(
@@ -107,7 +102,6 @@ final readonly class CreatorJobFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -115,7 +109,6 @@ final readonly class CreatorJobFilter implements FilterInterface
        ];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.filter.activity.by_creator_job.Filter activity by user job';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php
@@ -24,20 +24,18 @@ use Symfony\Component\Form\FormBuilderInterface;

 class CreatorScopeFilter implements FilterInterface
 {
-    private const string PREFIX = 'acp_act_filter_creator_scope';
+    private const PREFIX = 'acp_act_filter_creator_scope';

    public function __construct(
        private readonly TranslatableStringHelper $translatableStringHelper,
        private readonly ScopeRepositoryInterface $scopeRepository,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -69,13 +67,11 @@ class CreatorScopeFilter implements FilterInterface
            );
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder
@@ -90,7 +86,6 @@ class CreatorScopeFilter implements FilterInterface
            ]);
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $scopes = [];
@@ -106,7 +101,6 @@ class CreatorScopeFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -114,7 +108,6 @@ class CreatorScopeFilter implements FilterInterface
        ];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.filter.activity.by_creator_scope.Filter activity by user scope';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
@@ -21,22 +21,20 @@ use Symfony\Contracts\Translation\TranslatorInterface;

 class EmergencyFilter implements FilterInterface
 {
-    private const array CHOICES = [
+    private const CHOICES = [
        'activity is emergency' => 'true',
        'activity is not emergency' => 'false',
    ];

-    private const string DEFAULT_CHOICE = 'false';
+    private const DEFAULT_CHOICE = 'false';

    public function __construct(private readonly TranslatorInterface $translator) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
@@ -53,13 +51,11 @@ class EmergencyFilter implements FilterInterface
        $qb->setParameter('emergency', $data['accepted_emergency']);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_emergency', ChoiceType::class, [
@@ -70,13 +66,11 @@ class EmergencyFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return ['accepted_emergency' => self::DEFAULT_CHOICE];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        return [
@@ -88,7 +82,6 @@ class EmergencyFilter implements FilterInterface
        ];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter activity by emergency';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
@@ -19,13 +19,11 @@ use Symfony\Component\Form\FormBuilderInterface;

 class LocationFilter implements FilterInterface
 {
-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $qb->andWhere(
@@ -35,13 +33,11 @@ class LocationFilter implements FilterInterface
        $qb->setParameter('location', $data['accepted_location']);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_location', PickUserLocationType::class, [
@@ -50,13 +46,11 @@ class LocationFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $locations = [];
@@ -70,7 +64,6 @@ class LocationFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter activity by location';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
@@ -23,13 +23,11 @@ class LocationTypeFilter implements FilterInterface
 {
    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
@@ -49,13 +47,11 @@ class LocationTypeFilter implements FilterInterface
        $qb->setParameter('locationtype', $data['accepted_locationtype']);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_locationtype', PickLocationTypeType::class, [
@@ -64,13 +60,11 @@ class LocationTypeFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $types = [];
@@ -86,7 +80,6 @@ class LocationTypeFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter activity by locationtype';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -28,13 +28,11 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
 {
    public function __construct(protected TranslatableStringHelper $translatableStringHelper, protected ActivityReasonRepository $activityReasonRepository) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
@@ -55,13 +53,11 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
        $qb->setParameter('selected_activity_reasons', $data['reasons']);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY_PERSON;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('reasons', EntityType::class, [
@@ -74,13 +70,11 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string')
    {
        // collect all the reasons'name used in this filter in one array
@@ -97,13 +91,11 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
        ];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'Filter by reason';
    }

-    #[\Override]
    public function validateForm($data, ExecutionContextInterface $context)
    {
        if (null === $data['reasons'] || 0 === \count($data['reasons'])) {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -34,14 +34,12 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
        private RollingDateConverterInterface $rollingDateConverter,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
    {
        // create a subquery for activity
        $sqb = $qb->getEntityManager()->createQueryBuilder();
@@ -85,13 +83,11 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
        );
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::PERSON_TYPE;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('date_from_rolling', PickRollingDateType::class, [
@@ -116,7 +112,6 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
        }
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -126,8 +121,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
        ];
    }

-    #[\Override]
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, $format = 'string'): array
    {
        return [
            [] === $data['reasons'] ?
@@ -147,13 +141,11 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
        ];
    }

-    #[\Override]
-    public function getTitle()
+    public function getTitle(): string
    {
        return 'export.filter.activity.person_between_dates.title';
    }

-    #[\Override]
    public function validateForm($data, ExecutionContextInterface $context)
    {
        if ($this->rollingDateConverter->convert($data['date_from_rolling'])
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonsFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonsFilter.php
@@ -24,17 +24,15 @@ use Symfony\Component\Form\FormBuilderInterface;
 */
 final readonly class PersonsFilter implements FilterInterface
 {
-    private const string PREFIX = 'act_persons_filter';
+    private const PREFIX = 'act_persons_filter';

    public function __construct(private PersonRenderInterface $personRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -49,13 +47,11 @@ final readonly class PersonsFilter implements FilterInterface
        $qb->andWhere($orX);
    }

-    #[\Override]
    public function applyOn()
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_persons', PickPersonDynamicType::class, [
@@ -64,7 +60,6 @@ final readonly class PersonsFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -72,7 +67,6 @@ final readonly class PersonsFilter implements FilterInterface
        ];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string')
    {
        $users = [];
@@ -86,7 +80,6 @@ final readonly class PersonsFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.filter.activity.by_persons.Filter activity by persons';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
@@ -22,22 +22,20 @@ use Symfony\Contracts\Translation\TranslatorInterface;

 class SentReceivedFilter implements FilterInterface
 {
-    private const array CHOICES = [
+    private const CHOICES = [
        'export.filter.activity.by_sent_received.is sent' => Activity::SENTRECEIVED_SENT,
        'export.filter.activity.by_sent_received.is received' => Activity::SENTRECEIVED_RECEIVED,
    ];

-    private const string DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;
+    private const DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;

    public function __construct(private readonly TranslatorInterface $translator) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
@@ -54,13 +52,11 @@ class SentReceivedFilter implements FilterInterface
        $qb->setParameter('sentreceived', $data['accepted_sentreceived']);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_sentreceived', ChoiceType::class, [
@@ -72,13 +68,11 @@ class SentReceivedFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return ['accepted_sentreceived' => self::DEFAULT_CHOICE];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $sentreceived = array_flip(self::CHOICES)[$data['accepted_sentreceived']];
@@ -88,7 +82,6 @@ class SentReceivedFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter activity by sentreceived';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
@@ -23,13 +23,11 @@ class UserFilter implements FilterInterface
 {
    public function __construct(private readonly UserRender $userRender) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
@@ -46,13 +44,11 @@ class UserFilter implements FilterInterface
        $qb->setParameter('users', $data['accepted_users']);
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_users', PickUserDynamicType::class, [
@@ -61,13 +57,11 @@ class UserFilter implements FilterInterface
        ]);
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [];
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        $users = [];
@@ -81,7 +75,6 @@ class UserFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'Filter activity by user';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
@@ -25,20 +25,18 @@ use Symfony\Component\Form\FormBuilderInterface;

 class UsersJobFilter implements FilterInterface
 {
-    private const string PREFIX = 'act_filter_user_job';
+    private const PREFIX = 'act_filter_user_job';

    public function __construct(
        private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly UserJobRepositoryInterface $userJobRepository
+        private readonly UserJobRepositoryInterface $userJobRepository,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -62,13 +60,11 @@ class UsersJobFilter implements FilterInterface
            );
    }

-    #[\Override]
    public function applyOn()
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder
@@ -81,7 +77,6 @@ class UsersJobFilter implements FilterInterface
            ]);
    }

-    #[\Override]
    public function describeAction($data, $format = 'string')
    {
        return ['export.filter.activity.by_users_job.Filtered activity by users job: only %jobs%', [
@@ -95,7 +90,6 @@ class UsersJobFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -103,7 +97,6 @@ class UsersJobFilter implements FilterInterface
        ];
    }

-    #[\Override]
    public function getTitle()
    {
        return 'export.filter.activity.by_users_job.Filter by users job';
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
@@ -25,20 +25,18 @@ use Symfony\Component\Form\FormBuilderInterface;

 class UsersScopeFilter implements FilterInterface
 {
-    private const string PREFIX = 'act_filter_user_scope';
+    private const PREFIX = 'act_filter_user_scope';

    public function __construct(
        private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
    ) {}

-    #[\Override]
    public function addRole(): ?string
    {
        return null;
    }

-    #[\Override]
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $p = self::PREFIX;
@@ -62,13 +60,11 @@ class UsersScopeFilter implements FilterInterface
            );
    }

-    #[\Override]
    public function applyOn(): string
    {
        return Declarations::ACTIVITY;
    }

-    #[\Override]
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder
@@ -81,7 +77,6 @@ class UsersScopeFilter implements FilterInterface
            ]);
    }

-    #[\Override]
    public function describeAction($data, $format = 'string'): array
    {
        return ['export.filter.activity.by_users_scope.Filtered activity by users scope: only %scopes%', [
@@ -95,7 +90,6 @@ class UsersScopeFilter implements FilterInterface
        ]];
    }

-    #[\Override]
    public function getFormDefaultData(): array
    {
        return [
@@ -103,7 +97,6 @@ class UsersScopeFilter implements FilterInterface
        ];
    }

-    #[\Override]
    public function getTitle(): string
    {
        return 'export.filter.activity.by_users_scope.Filter by users scope';
--- a/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
@@ -20,7 +20,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class ActivityPresenceType extends AbstractType
 {
-    #[\Override]
    public function buildForm(FormBuilderInterface $builder, array $options): void
    {
        $builder
@@ -34,7 +33,6 @@ class ActivityPresenceType extends AbstractType
            ]);
    }

-    #[\Override]
    public function configureOptions(OptionsResolver $resolver): void
    {
        $resolver->setDefaults([
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
@@ -19,7 +19,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class ActivityReasonCategoryType extends AbstractType
 {
-    #[\Override]
    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $builder
@@ -30,7 +29,6 @@ class ActivityReasonCategoryType extends AbstractType
    /**
     * @param OptionsResolverInterface $resolver
     */
-    #[\Override]
    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults([
@@ -41,7 +39,6 @@ class ActivityReasonCategoryType extends AbstractType
    /**
     * @return string
     */
-    #[\Override]
    public function getBlockPrefix()
    {
        return 'chill_activitybundle_activityreasoncategory';
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
@@ -21,7 +21,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class ActivityReasonType extends AbstractType
 {
-    #[\Override]
    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $builder
@@ -30,7 +29,6 @@ class ActivityReasonType extends AbstractType
            ->add('category', TranslatableActivityReasonCategoryType::class);
    }

-    #[\Override]
    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults([
@@ -41,7 +39,6 @@ class ActivityReasonType extends AbstractType
    /**
     * @return string
     */
-    #[\Override]
    public function getBlockPrefix()
    {
        return 'chill_activitybundle_activityreason';
--- a/Show More
+++ b/Show More