WIP add devs files for working with caddy / mercure

Tickets: edit comments and mark them as deleted

See merge request Chill-Projet/chill-bundles!854

.changes/unreleased/DX-20250430-144550.yaml

@@ -1,6 +0,0 @@
-kind: DX
-body: Remove dead code for wopi-link module
-time: 2025-04-30T14:45:50.406111606+02:00
-custom:
-    Issue: "352"
-    SchemaChange: No schema change

.changes/unreleased/DX-20250528-165813.yaml

@@ -1,6 +0,0 @@
-kind: DX
-body: Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)
-time: 2025-05-28T16:58:13.226870341+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Feature-20240530-160003.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: |
+  Upgrade import of address list to the last version of compiled addresses of belgian-best-address
+time: 2024-05-30T16:00:03.440767606+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20240531-190242.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: |
+  Upgrade CKEditor and refactor configuration with use of typescript
+time: 2024-05-31T19:02:42.776662753+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20250424-142211.yaml

@@ -1,7 +0,0 @@
-kind: Feature
-body: Add the document file name to the document title when a user upload a document,
-  unless there is already a document title.
-time: 2025-04-24T14:22:11.800975422+02:00
-custom:
-  Issue: "377"
-  SchemaChange: No schema change

.changes/unreleased/Feature-20250520-095628.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Add desactivation date for social action and issue csv export
-time: 2025-05-20T09:56:28.108941934+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Feature-20250523-133341.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Add Emoji and Fullscreen feature to ckeditor configuration
-time: 2025-05-23T13:33:41.645095128+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Feature-20250523-133434.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Create editor which allow us to toggle between rich and simple text editor
-time: 2025-05-23T13:34:34.56795603+02:00
-custom:
-    Issue: "321"
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20250424-133943.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: trying to prevent bug of typeerror in doc-history + improved display of document
-  history
-time: 2025-04-24T13:39:43.878468232+02:00
-custom:
-  Issue: "376"
-  SchemaChange: No schema change

.changes/unreleased/Fixed-20250424-163746.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: Display previous participation in acc course work even if the person has left
-  the acc course
-time: 2025-04-24T16:37:46.970203594+02:00
-custom:
-  Issue: "381"
-  SchemaChange: No schema change

.changes/unreleased/Fixed-20250505-102715.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix display of text in calendar events
-time: 2025-05-05T10:27:15.461493066+02:00
-custom:
-    Issue: "372"
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20250514-145339.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Add missing translation for user_group.no_user_groups
-time: 2025-05-14T14:53:39.53927329+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/UX-20250423-172624.yaml

@@ -1,6 +0,0 @@
-kind: UX
-body: Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page
-time: 2025-04-23T17:26:24.45777387+02:00
-custom:
-    Issue: "374"
-    SchemaChange: No schema change

.changes/v3.12.0.md

@@ -0,0 +1,22 @@
+## v3.12.0 - 2025-06-30
+### Feature
+* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.   
+* Add desactivation date for social action and issue csv export   
+* Add Emoji and Fullscreen feature to ckeditor configuration   
+* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor   
+* Do not remove workflow which are automatically canceled after staling for more than 30 days   
+### Fixed
+* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history   
+* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course   
+* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events   
+* Add missing translation for user_group.no_user_groups   
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities   
+* ([#392](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/392)) Allow null and cast as string to setContent method for NewsItem
+   
+* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.   
+### DX
+* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module   
+* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)   
+### UX
+* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page   
+* Improve labeling of fields in person resource creation form   

.changes/v3.12.1.md

@@ -0,0 +1,3 @@
+## v3.12.1 - 2025-06-30
+### Fixed
+* Fix loading of the list of documents   

.changes/v4.0.0.md

@@ -0,0 +1,74 @@
+## v4.0.0 - 2025-07-08
+### Feature
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
+### Fixed
+* ([#390](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/390)) Display the list of participant in the results, even if there is only one participant and that the search result display the requestor
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities
+* Fix translations for social action fields in admin form: results, goals, evaluations
+### DX
+* Rewrite exports to run them asynchronously
+
+  **Schema Change**: Add columns or tables
+* Allow TranslatableMessage in flash messages
+### UX
+* Improve labeling of fields in person resource creation form
+
+
+**Release notes**
+
+- Add new methods to serialize data using the rector rule
+- Remove all references to the Request in filters, aggregators, filters. Actually, the most frequent occurence is `$security->getUser()`.
+- Refactor manually the initializeQuery method
+- Remove the injection of ExportManager into the constructor of each export element:
+
+  ```diff
+
+  - class MyFormatter implements FormatterInterface
+  + class MyFormatter implements FormatterInterface, \Chill\MainBundle\Export\ExportManagerAwareInterface
+  {
+  +    use \Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
+
+  -    public function __construct(private ExportManager $exportmanager) {}
+
+       public function MyMethod(): void
+       {
+  -          $this->exportManager->getFilter('alias');
+  +          $this->getExportManager()->getFilter('alias');
+       }
+  }
+  ```
+- configure messenger to handle export in a queue:
+
+```diff
+# config/packages/messenger.yaml
+framework:
+    messenger:
+        routing:
++            'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
+```
+
+- add missing methods to exports, aggregators, filters, formatter:
+
+  ```php
+  public function normalizeFormData(array $formData): array;
+
+  public function denormalizeFormData(array $formData, int $fromVersion): array;
+  ```
+
+  There are rector rules to generate those methods:
+
+  - `Chill\Utils\Rector\Rector\ChillBundleAddNormalizationMethodsOnExportRector`
+
+  See:
+
+  ```php
+  // upgrade chill exports
+  $rectorConfig->rules([\Chill\Utils\Rector\Rector\ChillBundleAddNormalizationMethodsOnExportRector::class]);
+  ```
+
+  This rule will create most of the work necessary, but some manuals changes are still necessary:
+
+  - we must set manually the correct repository for method `denormalizeDoctrineEntity`;
+  - when the form data contains some entities, and the form type is not one of EntityType::class, PickUserDynamicType::class, PickUserLocationType::class, PickThirdpartyDynamicType::class, Select2CountryType::class, then we must handle the normalization manually (using the `\Chill\MainBundle\Export\ExportDataNormalizerTrait`)
+
+

.changes/v4.0.1.md

@@ -0,0 +1,4 @@
+## v4.0.1 - 2025-07-08
+### Fixed
+* Fix package.json for compilation
+   

.editorconfig

@@ -19,11 +19,11 @@ max_line_length = 80
 [COMMIT_EDITMSG]
 max_line_length = 0
 
-[*.{js, vue, ts}]
+[*.{js,vue,ts}]
 indent_size = 2
 indent_style = space
 
-[.rst]
+[*.rst]
-ident_size = 3
+indent_size = 3
-ident_style = space
+indent_style = space
 

.env

@@ -16,9 +16,6 @@ APP_ENV=prod
 APP_SECRET=!ChangeMeInAppEnv!
 ###< symfony/framework-bundle ###
 
-## Wopi server for editing documents online
-EDITOR_SERVER=http://collabora:9980
-
 # must be manually set in .env.local
 # ADMIN_PASSWORD=
 
@@ -92,3 +89,13 @@ REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
 ###> symfony/ovh-cloud-notifier ###
 # OVHCLOUD_DSN=ovhcloud://APPLICATION_KEY:APPLICATION_SECRET@default?consumer_key=CONSUMER_KEY&service_name=SERVICE_NAME
 ###< symfony/ovh-cloud-notifier ###
+
+###> symfony/mercure-bundle ###
+# See https://symfony.com/doc/current/mercure.html#configuration
+# The URL of the Mercure hub, used by the app to publish updates (can be a local URL)
+MERCURE_URL=https://example.com/.well-known/mercure
+# The public URL of the Mercure hub, used by the browser to connect
+MERCURE_PUBLIC_URL=https://example.com/.well-known/mercure
+# The secret used to sign the JWTs
+MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
+###< symfony/mercure-bundle ###

.gitlab-ci.yml

@@ -46,7 +46,7 @@ stages:
 
 build:
     stage: Composer install
-    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    image: chill/base-image:8.3-edge
     before_script:
         - composer config -g cache-dir "$(pwd)/.cache"
     script:
@@ -61,7 +61,7 @@ build:
 
 code_style:
     stage: Tests
-    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    image: chill/base-image:8.3-edge
     script:
         - php-cs-fixer fix --dry-run -v --show-progress=none
     cache:
@@ -74,7 +74,7 @@ code_style:
 
 phpstan_tests:
     stage: Tests
-    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    image: chill/base-image:8.3-edge
     variables:
         COMPOSER_MEMORY_LIMIT: 3G
     before_script:
@@ -91,7 +91,7 @@ phpstan_tests:
 
 rector_tests:
     stage: Tests
-    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    image: chill/base-image:8.3-edge
     before_script:
         - bin/console cache:clear --env=dev
     script:
@@ -132,7 +132,7 @@ lint:
 
 unit_tests:
     stage: Tests
-    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    image: chill/base-image:8.3-edge
     variables:
         COMPOSER_MEMORY_LIMIT: 3G
     before_script:

.junie/guidelines.md

@@ -22,7 +22,7 @@ Chill is a comprehensive web application built as a set of Symfony bundles. It i
 - **Backend**: PHP 8.3+, Symfony 5.4
 - **Frontend**: JavaScript/TypeScript, Vue.js 3, Bootstrap 5
 - **Build Tools**: Webpack Encore, Yarn
-- **Database**: PostgreSQL with materialized views
+- **Database**: PostgreSQL with materialized views. We do not support other databases.
 - **Other Services**: Redis, AMQP (RabbitMQ), SMTP
 
 ## Project Structure
@@ -149,6 +149,42 @@ Key configuration files:
 - `package.json`: JavaScript dependencies and scripts
 - `.env`: Default environment variables. Must usually not be updated: use `.env.local` instead.
 
+### Database migrations
+
+Each time a doctrine entity is created, we generate migration to adapt the database.
+
+The migration are created using the command `symfony console doctrine:migrations:diff --no-interaction --namespace <namespace>`, where the namespace is the relevant namespace for migration. As this is a bash script, do not forget to quote the `\` (`\` must become `\\` in your command).
+
+Each bundle has his own namespace for migration (always ask me to confirm that command, with a list of updated / created entities so that I can confirm you that it is ok):
+
+- `Chill\Bundle\ActivityBundle` writes migrations to `Chill\Migrations\Activity`;
+- `Chill\Bundle\BudgetBundle` writes migrations to `Chill\Migrations\Budget`;
+- `Chill\Bundle\CustomFieldsBundle` writes migrations to `Chill\Migrations\CustomFields`;
+- `Chill\Bundle\DocGeneratorBundle` writes migrations to `Chill\Migrations\DocGenerator`;
+- `Chill\Bundle\DocStoreBundle` writes migrations to `Chill\Migrations\DocStore`;
+- `Chill\Bundle\EventBundle` writes migrations to `Chill\Migrations\Event`;
+- `Chill\Bundle\CalendarBundle` writes migrations to `Chill\Migrations\Calendar`;
+- `Chill\Bundle\FamilyMembersBundle` writes migrations to `Chill\Migrations\FamilyMembers`;
+- `Chill\Bundle\FranceTravailApiBundle` writes migrations to `Chill\Migrations\FranceTravailApi`;
+- `Chill\Bundle\JobBundle` writes migrations to `Chill\Migrations\Job`;
+- `Chill\Bundle\MainBundle` writes migrations to `Chill\Migrations\Main`;
+- `Chill\Bundle\PersonBundle` writes migrations to `Chill\Migrations\Person`;
+- `Chill\Bundle\ReportBundle` writes migrations to `Chill\Migrations\Report`;
+- `Chill\Bundle\TaskBundle` writes migrations to `Chill\Migrations\Task`;
+- `Chill\Bundle\ThirdPartyBundle` writes migrations to `Chill\Migrations\ThirdParty`;
+- `Chill\Bundle\TicketBundle` writes migrations to `Chill\Migrations\Ticket`;
+- `Chill\Bundle\WopiBundle` writes migrations to `Chill\Migrations\Wopi`;
+
+Once created the, comment's classes should be removed and a description of the changes made to the entities should be added to the migrations, using the `getDescription` method. The migration should not be cleaned by any artificial intelligence, as modifying this migration is error prone.
+
+### Guidelines related to code structure and requirements
+
+#### Usage of clock
+
+When we need to use a DateTime or DateTimeImmutable that need to express "now", we prefer the usage of
+`Symfony\Component\Clock\ClockInterface`, where possible. This is usually not possible in doctrine entities,
+where injection does not work when restoring an entity from database, but usually possible in services.
+
 ### Testing Information
 
 The project uses PHPUnit for testing. Each bundle has its own test suite, and there's also a global test suite at the root level.
@@ -218,7 +254,7 @@ class TicketTest extends TestCase
 
 #### Test Database
 
-For tests that require a database, the project uses an in-memory SQLite database by default. You can configure a different database for testing in the `.env.test` file.
+For tests that require a database, the project uses postgresql database filled by fixtures (usage of doctrine-fixtures). You can configure a different database for testing in the `.env.test` file.
 
 ### Code Quality Tools
 

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "tabWidth": 2,
+  "useTabs": false
+}

.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Chill Debug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000,
+            "pathMappings": {
+                "/var/www/html": "${workspaceFolder}"
+            },
+            "preLaunchTask": "symfony"
+        },
+        {
+            "name": "Yarn Encore Dev (Watch)",
+            "type": "node-terminal",
+            "request": "launch",
+            "command": "yarn encore dev --watch",
+            "cwd": "${workspaceFolder}"
+        }
+    ],
+    "compounds": [
+        {
+            "name": "Chill Debug + Yarn Encore Dev (Watch)",
+            "configurations": ["Chill Debug", "Yarn Encore Dev (Watch)"]
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,23 @@
+{
+    "tasks": [
+        {
+            "type": "shell",
+            "command": "symfony",
+            "args": [
+                "server:start",
+                "--allow-http",
+                "--no-tls",
+                "--port=8000",
+                "--allow-all-ip",
+                "-d"
+            ],
+            "label": "symfony"
+        },
+        {
+            "type": "shell",
+            "command": "yarn",
+            "args": ["encore", "dev", "--watch"],
+            "label": "webpack"
+        }
+    ]
+}

CHANGELOG.md

@@ -6,6 +6,133 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.0.1 - 2025-07-08
+### Fixed
+* Fix package.json for compilation
+   
+
+## v4.0.0 - 2025-07-08
+### Feature
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
+### Fixed
+* ([#390](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/390)) Display the list of participant in the results, even if there is only one participant and that the search result display the requestor
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities
+* Fix translations for social action fields in admin form: results, goals, evaluations
+### DX
+* Rewrite exports to run them asynchronously
+
+  **Schema Change**: Add columns or tables
+* Allow TranslatableMessage in flash messages
+### UX
+* Improve labeling of fields in person resource creation form
+
+
+**Release notes**
+
+- Add new methods to serialize data using the rector rule
+- Remove all references to the Request in filters, aggregators, filters. Actually, the most frequent occurence is `$security->getUser()`.
+- Refactor manually the initializeQuery method
+- Remove the injection of ExportManager into the constructor of each export element:
+
+  ```diff
+
+  - class MyFormatter implements FormatterInterface
+  + class MyFormatter implements FormatterInterface, \Chill\MainBundle\Export\ExportManagerAwareInterface
+  {
+  +    use \Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
+
+  -    public function __construct(private ExportManager $exportmanager) {}
+
+       public function MyMethod(): void
+       {
+  -          $this->exportManager->getFilter('alias');
+  +          $this->getExportManager()->getFilter('alias');
+       }
+  }
+  ```
+- configure messenger to handle export in a queue:
+
+```diff
+# config/packages/messenger.yaml
+framework:
+    messenger:
+        routing:
++            'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
+```
+
+- add missing methods to exports, aggregators, filters, formatter:
+
+  ```php
+  public function normalizeFormData(array $formData): array;
+
+  public function denormalizeFormData(array $formData, int $fromVersion): array;
+  ```
+
+  There are rector rules to generate those methods:
+
+  - `Chill\Utils\Rector\Rector\ChillBundleAddNormalizationMethodsOnExportRector`
+
+  See:
+
+  ```php
+  // upgrade chill exports
+  $rectorConfig->rules([\Chill\Utils\Rector\Rector\ChillBundleAddNormalizationMethodsOnExportRector::class]);
+  ```
+
+  This rule will create most of the work necessary, but some manuals changes are still necessary:
+
+  - we must set manually the correct repository for method `denormalizeDoctrineEntity`;
+  - when the form data contains some entities, and the form type is not one of EntityType::class, PickUserDynamicType::class, PickUserLocationType::class, PickThirdpartyDynamicType::class, Select2CountryType::class, then we must handle the normalization manually (using the `\Chill\MainBundle\Export\ExportDataNormalizerTrait`)
+
+
+
+## v3.12.1 - 2025-06-30
+### Fixed
+* Fix loading of the list of documents   
+
+## v3.12.0 - 2025-06-30
+### Feature
+* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.   
+* Add desactivation date for social action and issue csv export   
+* Add Emoji and Fullscreen feature to ckeditor configuration   
+* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor   
+* Do not remove workflow which are automatically canceled after staling for more than 30 days   
+### Fixed
+* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history   
+* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course   
+* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events   
+* Add missing translation for user_group.no_user_groups   
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities   
+* ([#392](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/392)) Allow null and cast as string to setContent method for NewsItem
+   
+* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.   
+### DX
+* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module   
+* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)   
+### UX
+* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page   
+* Improve labeling of fields in person resource creation form   
+
+## v3.11.0 - 2025-04-17
+### Feature
+* ([#365](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/365)) Add counters of actions and activities, with 2 boxes to (1) show the number of active actions on total actions and (2) show the number of activities in a accompanying period, and pills in menus for showing the number of active actions and the number of activities.
+* ([#364](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/364)) Added a second phone number "telephone2" to the thirdParty entity. Adapted twig templates and vuejs apps to handle this phone number
+
+  **Schema Change**: Add columns or tables
+* Signature: add a button to go directly to the signature zone, even if there is only one
+### Fixed
+* Fixed wrong translations in the on-the-fly for creation of thirdParty
+* Fixed update of phone number in on-the-fly edition of thirdParty
+* Fixed closing of modal when editing thirdParty in accompanying course works
+* Shorten the delay between two execution of AccompanyingPeriodStepChangeCronjob, to ensure at least one execution in a day
+* ([#102](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/102)) Fix display of title in document list
+* When cleaning the old stored object versions, do not throw an error if the stored object is not found on disk
+* Add consistent log prefix and key to logs when stale workflows are automatically canceled
+* ([#380](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/380)) Remove the "not null" validation constraint on recently added properties on HouseholdComposition
+
+### DX
+* Add new chill-col style for displaying title and aside in a flex table
+
 ## v3.10.3 - 2025-03-18
 ### DX
 * Eslint fixes   

CONVENTIONS-fr.md

@@ -54,7 +54,7 @@ Arborescence:
     - person
     - personvendee
     - household_edit_metadata
-        - index.js
+        - index.ts
 ```
 
 ## Organisation des feuilles de styles

compose.override.yaml

@@ -32,3 +32,9 @@ services:
         hostname: my-rabbit
         volumes:
             - ./docker/rabbitmq/data:/var/lib/rabbitmq
+
+    ###> symfony/mercure-bundle ###
+    mercure:
+        ports:
+            - "127.0.0.1:8043:443"
+###< symfony/mercure-bundle ###

compose.yaml

@@ -50,7 +50,36 @@ services:
             timeout: 30s
             retries: 3
 
+    ###> symfony/mercure-bundle ###
+    mercure:
+        image: dunglas/mercure
+        restart: unless-stopped
+        environment:
+            # Uncomment the following line to disable HTTPS,
+            #SERVER_NAME: ':80'
+            MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+            MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+            # Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive
+            MERCURE_EXTRA_DIRECTIVES: |
+                cors_origins http://chill-bundles.wip https://chill-bundles.wip
+        # Comment the following line to disable the development mode
+        command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
+        healthcheck:
+            test: [ "CMD", "curl", "-f", "https://localhost/healthz" ]
+            timeout: 5s
+            retries: 5
+            start_period: 60s
+        volumes:
+            - mercure_data:/data
+            - mercure_config:/config
+###< symfony/mercure-bundle ###
+
 volumes:
     ###> doctrine/doctrine-bundle ###
     database_data:
-###< doctrine/doctrine-bundle ###
+    ###< doctrine/doctrine-bundle ###
+
+    ###> symfony/mercure-bundle ###
+    mercure_data:
+    mercure_config:
+###< symfony/mercure-bundle ###

composer.json

@@ -55,6 +55,7 @@
         "symfony/http-foundation": "^5.4",
         "symfony/intl": "^5.4",
         "symfony/mailer": "^5.4",
+        "symfony/mercure-bundle": "^0.3.9",
         "symfony/messenger": "^5.4",
         "symfony/mime": "^5.4",
         "symfony/monolog-bundle": "^3.5",
@@ -133,6 +134,7 @@
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
             "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
+            "Chill\\TicketBundle\\": "src/Bundle/ChillTicketBundle/src",
             "Chill\\Utils\\Rector\\": "utils/rector/src"
         }
     },

config/bundles.php

@@ -35,6 +35,8 @@ return [
     Chill\ThirdPartyBundle\ChillThirdPartyBundle::class => ['all' => true],
     Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
     Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
+    Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
+    Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
 ];

config/packages/chill.yaml

@@ -17,6 +17,7 @@ chill_main:
     acl:
         form_show_scopes: true
         form_show_centers: true
+        filter_stats_by_center: true
     access_global_history: false
     access_user_change_password: true
     access_permissions_group_list: true

config/packages/chill_ticket.yaml

@@ -0,0 +1,4 @@
+chill_ticket:
+    ticket:
+        person_per_ticket:    one # One of "one"; "many"
+

config/packages/doctrine_migrations_chill.yaml

@@ -14,6 +14,7 @@ doctrine_migrations:
         'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
         'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
         'Chill\Migrations\Report': '@ChillReportBundle/migrations'
+        'Chill\Migrations\Ticket': '@ChillTicketBundle/migrations'
     all_or_nothing:
         true
 

config/packages/mercure.yaml

@@ -0,0 +1,8 @@
+mercure:
+    hubs:
+        default:
+            url: '%env(MERCURE_URL)%'
+            public_url: '%env(MERCURE_PUBLIC_URL)%'
+            jwt:
+                secret: '%env(MERCURE_JWT_SECRET)%'
+                publish: '*'

config/packages/messenger.yaml

@@ -5,7 +5,6 @@ framework:
 
         # Uncomment this (and the failed transport below) to send failed messages to this transport for later handling.
         failure_transport: failed
-
         transports:
             # those transports are added by chill-bundles recipes
             sync: sync://
@@ -19,7 +18,9 @@ framework:
                         async: ~
                     auto_setup: true
 
-            priority: '%env(MESSENGER_TRANSPORT_DSN)%/priority'
+            priority:
+                dsn: '%env(MESSENGER_TRANSPORT_DSN)%/priority'
+
             # end of transports added by chill-bundles recipes
             # https://symfony.com/doc/current/messenger.html#transport-configuration
             failed: 'doctrine://default?queue_name=failed'
@@ -61,6 +62,8 @@ framework:
             'Chill\MainBundle\Workflow\Messenger\PostSignatureStateChangeMessage': priority
             'Chill\MainBundle\Workflow\Messenger\PostPublicViewMessage': async
             'Chill\MainBundle\Service\Workflow\CancelStaleWorkflowMessage': async
+            'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
+            'Chill\MainBundle\Export\Messenger\RemoveExportGenerationMessage': async
             # end of routes added by chill-bundles recipes
             # Route your messages to the transports
             # 'App\Message\YourMessage': async

config/routes/chill_assets_dev.yaml

@@ -17,3 +17,8 @@ when@dev:
         defaults:
             template: '@ChillMain/Dev/dev.assets.test2.html.twig'
 
+    dev_mercure:
+        path: /_dev/mercure
+        controller: Symfony\Bundle\FrameworkBundle\Controller\TemplateController
+        defaults:
+            template: '@ChillMain/Dev/dev.mercure.html.twig'

config/routes/chill_ticket.yaml

@@ -0,0 +1,2 @@
+chill_ticket_bundle:
+    resource: '@ChillTicketBundle/config/routes.yaml'

docs/source/_static/code/exports/BirthdateFilter.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use DateTime;
 use Doctrine\ORM\Query\Expr;
@@ -20,6 +21,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     // add specific role for this filter
     public function addRole(): ?string
     {
@@ -28,7 +30,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
     }
 
     // here, we alter the query created by Export
-    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
+    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         // we create the clause here
@@ -52,13 +54,13 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
     }
 
     // we give information on which type of export this filter applies
-    public function applyOn()
+    public function applyOn(): string
     {
         return 'person';
     }
 
     // we build a form to collect some parameters from the users
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder): void
     {
         $builder->add('date_from', DateType::class, [
             'label' => 'Born after this date',
@@ -74,6 +76,18 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
             'format' => 'dd-MM-yyyy',
         ]);
     }
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+    public function normalizeFormData(array $formData): array
+    {
+        return ['date_from' => $this->normalizeDate($formData['date_from']), 'date_to' => $this->normalizeDate($formData['date_to'])];
+    }
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['date_from' => $this->denormalizeDate($formData['date_from']), 'date_to' => $this->denormalizeDate($formData['date_to'])];
+    }
     public function getFormDefaultData(): array
     {
         return ['date_from' => new DateTime(), 'date_to' => new DateTime()];
@@ -81,7 +95,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
 
     // here, we create a simple string which will describe the action of
     // the filter in the Response
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
     {
         return ['Filtered by person\'s birtdate: '
             . 'between %date_from% and %date_to%', [
@@ -90,7 +104,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
             ], ];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Filter by person\'s birthdate';
     }
@@ -99,7 +113,7 @@ 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
-    public function validateForm($data, ExecutionContextInterface $context)
+    public function validateForm($data, ExecutionContextInterface $context): void
     {
         $date_from = $data['date_from'];
         $date_to = $data['date_to'];

docs/source/_static/code/exports/CountPerson.php

@@ -36,6 +36,18 @@ class CountPerson implements ExportInterface
     {
         // this export does not add any form
     }
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
     public function getFormDefaultData(): array
     {
         return [];
@@ -60,29 +72,29 @@ class CountPerson implements ExportInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         // this array match the result keys in the query. We have only
         // one column.
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Count peoples';
     }
 
-    public function getType()
+    public function getType(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         // we gather all center the user choose.
         $centers = array_map(static fn ($el) => $el['center'], $acl);

docs/source/development/create-a-new-bundle.rst

@@ -11,24 +11,94 @@
 Create a new bundle
 *******************
 
-Create your own bundle is not a trivial task.
-
-The easiest way to achieve this is seems to be : 
-
-1. Prepare a fresh installation of the chill project, in a new directory
-2. Create a new bundle in this project, in the src directory
-3. Initialize a git repository **at the root bundle**, and create your initial commit.
-4. Register the bundle with composer/packagist. If you do not plan to distribute your bundle with packagist, you may use a custom repository for achieve this [#f1]_
-5. Move to a development installation, made as described in the :ref:`installation-for-development` section, and add your new repository to the composer.json file
-6. Work as :ref:`usual <editing-code-and-commiting>`
-
 .. warning::
 
     This part of the doc is not yet tested
 
-TODO
+Create a new directory with Bundle class
+----------------------------------------
+
+.. code-block:: bash
+
+   mkdir -p src/Bundle/ChillSomeBundle/src/config
+   mkdir -p src/Bundle/ChillSomeBundle/src/Controller
+
+Add a bundle file
+
+.. code-block:: php
+
+    <?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\SomeBundle;
+
+    use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+    class ChillSomeBundle extends Bundle {}
+
+And a route file:
+
+.. code-block:: yaml
+
+   chill_ticket_controller:
+       resource: '@ChillTicketBundle/Controller/'
+       type: annotation
+
+Register the new psr-4 namespace
+--------------------------------
+
+In composer.json, add the new psr4 namespace
+
+.. code-block:: diff
+
+    {
+    "autoload": {
+        "psr-4": {
+    +        "Chill\\SomeBundle\\": "src/Bundle/ChillSomeBundle/src",
+        }
+    }
+    }
 
 
-.. rubric:: Footnotes
+Register the bundle
+-------------------
+
+Register in the file :code:`config/bundles.php`:
+
+.. code-block:: php
+
+    Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
+
+And import routes in :code:`config/routes/chill_some_bundle.yaml`:
+
+.. code-block:: yaml
+
+   chill_ticket_bundle:
+       resource: '@ChillSomeBundle/config/routes.yaml'
+
+Add the doctrine_migration namespace
+------------------------------------
+
+Add the namespace to :code:`config/packages/doctrine_migrations_chill.yaml`
+
+.. code-block:: diff
+
+   doctrine_migrations:
+       migrations_paths:
+   +        'Chill\Some\Ticket': '@ChillSomeBundle/migrations'
+
+Dump autoloading
+----------------
+
+.. code-block:: bash
+
+   symfony composer dump-autoload
 
-.. [#f1] Be aware that we use the Affero GPL Licence, which ensure that all users must have access to derivative works done with this software.

docs/source/development/export-sequence.puml

@@ -0,0 +1,84 @@
+@startuml
+'https://plantuml.com/sequence-diagram
+
+autonumber
+
+User -> ExportController: configure export using form
+activate ExportController
+ExportController -> ExportForm: build form
+activate ExportForm
+
+loop for every ExportElement (Filter, Aggregator)
+    ExportForm -> ExportElement: `buildForm`
+    activate ExportElement
+    ExportElement -> ExportForm: add form to builders
+    deactivate ExportElement
+end
+
+ExportForm -> ExportController
+deactivate ExportForm
+
+ExportController -> User: show form
+deactivate ExportController
+
+note left of User: Configure the export:\ncheck filters, aggregators, …
+
+User -> ExportController: post configuration of the export
+activate ExportController
+
+ExportController -> ExportForm: `getData`
+activate ExportForm
+ExportForm -> ExportController: return data: list of entities, etc.
+deactivate ExportForm
+
+loop for every ExportElement (Filter, Aggregator)
+    ExportController -> ExportElement: serializeData (data)
+    activate ExportElement
+    ExportElement -> ExportController: return serializedData (simple array with string, int, …)
+    deactivate ExportElement
+end
+
+ExportController -> Database: `INSERT INTO RequestGeneration_table` (insert new entity)
+ExportController -> MessageQueue: warn about a new request
+activate MessageQueue
+ExportController -> User: "ok, generation is in process"
+deactivate ExportController
+
+note left of User: The user see a waiting screen
+
+MessageQueue -> MessengerConsumer: forward the message to the MessengerConsumer
+deactivate MessageQueue
+activate MessengerConsumer
+MessengerConsumer -> Database: `SELECT * FROM RequestGeneration_table WHERE id = %s`
+activate Database
+Database -> MessengerConsumer: return RequestGeneration with serializedData
+deactivate Database
+
+loop for every ExportElement (Filter, Aggregator)
+    MessengerConsumer -> ExportElement: deserializeData
+    activate ExportElement
+    ExportElement -> MessengerConsumer: return data (list of entities, etc.) from the serialized array
+    deactivate ExportElement
+    MessengerConsumer -> ExportElement: alter the sql query (`ExportElement::alterQuery`)
+    activate ExportElement
+    ExportElement -> MessengerConsumer: return the query with WHERE and GROUP BY clauses
+    deactivate ExportElement
+end
+
+MessengerConsumer -> MessengerConsumer: prepare the export
+MessengerConsumer -> MessengerConsumer: save the export as a stored object
+MessengerConsumer -> Database: `UPDATE RequestGeneration_table SET ready = true`
+deactivate MessengerConsumer
+
+User -> ExportController: pull every 5s to know if the export is generated
+activate ExportController
+ExportController -> User: warn the export is generated
+deactivate ExportController
+
+User -> ExportController: download the export from object storage
+
+
+
+
+
+@enduml

docs/source/development/messages-to-users.rst

@@ -15,24 +15,31 @@ Messages to users, flashbags and buttons
 Flashbags
 ==========
 
-The four following levels are defined : 
+The four following levels are defined :
 
 +-----------+----------------------------------------------------------------------------------------------+
 |Key        |Intent                                                                                        |
 +===========+==============================================================================================+
-|alert      |A message not linked with the user action, but which should require an action or a            |
-|           |correction.                                                                                   |
-+-----------+----------------------------------------------------------------------------------------------+
 |success    |The user action succeeds.                                                                     |
 +-----------+----------------------------------------------------------------------------------------------+
 |notice     |A simple message to give information to the user. The message may be linked or not linked with|
 |           |the user action.                                                                              |
 +-----------+----------------------------------------------------------------------------------------------+
-|warning    |A message linked with an action, the user should correct.                                     |
-+-----------+----------------------------------------------------------------------------------------------+
 |error      |The user's action failed: he must correct something to process the action.                    |
 +-----------+----------------------------------------------------------------------------------------------+
 
+We can use :code:`TranslatableMessage` (and other :code:`TranslatableMessageInterface` instances) into the controller:
+
+.. code-block:: php
+
+   // in a controller action:
+   if (($session = $request->getSession()) instanceof Session) {
+       $session->getFlashBag()->add(
+           'success',
+           new TranslatableMessage('saved_export.Saved export is saved!')
+       );
+   }
+
 .. seealso::
 
    `Flash Messages on Symfony documentation <http://symfony.com/doc/current/book/controller.html#flash-messages>`_
@@ -66,7 +73,7 @@ To add the action on button, use them as class along with ``sc-button`` :
 |           |                | - Submitting this form will remove the entity                                |
 +-----------+----------------+------------------------------------------------------------------------------+
 | Edit      | ``bt-edit`` or | Link to a form to edit an entity                                             |
-|           | ``bt-update``  |                                                                              | 
+|           | ``bt-update``  |                                                                              |
 +-----------+----------------+------------------------------------------------------------------------------+
 | Save      | ``bt-save``    | Submitting this form will save change on the entity                          |
 +-----------+----------------+------------------------------------------------------------------------------+

package.json

@@ -11,6 +11,7 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
+    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
@@ -79,12 +80,12 @@
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
+    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
     "specs-validate": "swagger-cli validate templates/api/specs.yaml",
     "specs-create-dir": "mkdir -p templates/api",
     "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
     "version": "node --version",
-    "eslint": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
+    "eslint": "eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
   },
   "private": true
 }

phpstan-baseline.neon

@@ -2154,11 +2154,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
 
-		-
-			message: "#^Instanceof between string and DateTimeInterface will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
-
 		-
 			message: "#^PHPDoc tag @var for property Chill\\\\MainBundle\\\\Export\\\\Helper\\\\ExportAddressHelper\\:\\:\\$unitNamesKeysCache contains unresolvable type\\.$#"
 			count: 1

phpstan.dist.neon

@@ -3,7 +3,7 @@ parameters:
     paths:
         - src/
         - utils/
-    tmpDir: .cache/
+    tmpDir: var/cache/phpstan
     reportUnmatchedIgnoredErrors: false
     excludePaths:
         - .php_cs*

phpunit.rector.xml

@@ -1,13 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" beStrictAboutOutputDuringTests="true" failOnRisky="true" failOnWarning="true" colors="true" cacheDirectory="var/cache/phpunit.rector.cache" requireCoverageMetadata="true" beStrictAboutCoverageMetadata="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  <testsuites>
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
-    <testsuite name="default">
+         bootstrap="vendor/autoload.php"
-      <directory>utils/rector/tests</directory>
+         executionOrder="depends,defects"
-    </testsuite>
+         beStrictAboutOutputDuringTests="true"
-  </testsuites>
+         failOnRisky="true"
-  <source>
+         failOnWarning="true"
-    <include>
+         colors="true"
-      <directory suffix=".php">utils/rector/src</directory>
+         cacheDirectory="var/cache/phpunit.rector.cache"
-    </include>
+         requireCoverageMetadata="true"
-  </source>
+         beStrictAboutCoverageMetadata="true"
+         displayDetailsOnTestsThatTriggerWarnings="true">
+    <testsuites>
+        <testsuite name="default">
+            <directory>utils/rector/tests</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">utils/rector/src</directory>
+        </include>
+    </source>
 </phpunit>

phpunit.xml.dist

@@ -58,6 +58,10 @@
       <!-- temporarily removed, the time to find a fix -->
       <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
     </testsuite>
+
+    <testsuite name="TicketBundle">
+      <directory suffix="Test.php">src/Bundle/ChillTicketBundle/tests/</directory>
+    </testsuite>
     <!--
         <testsuite name="ReportBundle">
             <directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>

rector.php

@@ -18,14 +18,15 @@ return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
         __DIR__ . '/docs',
         __DIR__ . '/src',
+        __DIR__ . '/rector.php',
     ]);
 
     $rectorConfig->skip([
         \Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class => __DIR__ . 'src/Bundle/ChillMainBundle/Service/Notifier/LegacyOvhCloudFactory.php'
     ]);
 
-    $rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/test/App_KernelTestDebugContainer.xml  ');
+    //$rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/test/App_KernelTestDebugContainer.xml  ');
-    $rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
+    //$rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
 
     //$rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
     //$rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');
@@ -39,16 +40,11 @@ return static function (RectorConfig $rectorConfig): void {
     // part of the symfony 54 rules
     $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
     $rectorConfig->rule(\Rector\Symfony\Symfony60\Rector\MethodCall\GetHelperControllerToServiceRector::class);
-    $rectorConfig->disableParallel();
+    //$rectorConfig->disableParallel();
 
     //define sets of rules
     $rectorConfig->sets([
         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,
     ]);
@@ -66,11 +62,6 @@ return static function (RectorConfig $rectorConfig): void {
     // some routes are added twice if it remains activated
     // $rectorConfig->rule(\Rector\Symfony\Configs\Rector\ClassMethod\AddRouteAnnotationRector::class);
 
-    // chill rules
-    $rectorConfig->rules([
-        \Chill\Utils\Rector\Rector\ChillBundleMakeDataProviderStaticForAbstractExportTestRector::class,
-    ]);
-
     // skip some path...
     $rectorConfig->skip([
         // waiting for fixing this bug: https://github.com/rectorphp/rector-doctrine/issues/342
@@ -94,4 +85,6 @@ return static function (RectorConfig $rectorConfig): void {
         new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency'),
         new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation'),
     ]);
+
+
 };

resources/dev.Caddyfile

@@ -0,0 +1,20 @@
+{
+	# Désactive les redirections automatiques HTTP -> HTTPS
+	# auto_https off
+	# Désactive le port 80 par défaut
+	# default_bind :8080
+}
+
+localhost:8043 {
+	 mercure {
+	 	# Publisher JWT key
+	 	publisher_jwt !ChangeThisMercureHubJWTSecretKey!
+	 	# Subscriber JWT key
+	 	subscriber_jwt !ChangeThisMercureHubJWTSecretKey!
+	 	cors_origins http://chill-bundles.wip https://chill-bundles.wip
+	 	ui
+	 	demo
+	 }
+
+	 respond "Not Found" 404
+}

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -48,28 +48,6 @@ class ActivityReasonCategoryController extends AbstractController
         ]);
     }
 
-    /**
-     * Displays a form to edit an existing ActivityReasonCategory entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/edit', name: 'chill_activity_activityreasoncategory_edit')]
-    public function editAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
-        }
-
-        $editForm = $this->createEditForm($entity);
-
-        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
-            'entity' => $entity,
-            'edit_form' => $editForm->createView(),
-        ]);
-    }
-
     /**
      * Lists all ActivityReasonCategory entities.
      */
@@ -100,29 +78,10 @@ class ActivityReasonCategoryController extends AbstractController
         ]);
     }
 
-    /**
-     * Finds and displays a ActivityReasonCategory entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/show', name: 'chill_activity_activityreasoncategory_show')]
-    public function showAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
-        }
-
-        return $this->render('@ChillActivity/ActivityReasonCategory/show.html.twig', [
-            'entity' => $entity,
-        ]);
-    }
-
     /**
      * Edits an existing ActivityReasonCategory entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update', methods: ['POST', 'PUT'])]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update')]
     public function updateAction(Request $request, mixed $id)
     {
         $em = $this->managerRegistry->getManager();
@@ -139,7 +98,7 @@ class ActivityReasonCategoryController extends AbstractController
         if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreasoncategory_edit', ['id' => $id]);
+            return $this->redirectToRoute('chill_activity_activityreasoncategory', ['id' => $id]);
         }
 
         return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
@@ -178,7 +137,7 @@ class ActivityReasonCategoryController extends AbstractController
     {
         $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
             'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
+            'method' => 'POST',
         ]);
 
         $form->add('submit', SubmitType::class, ['label' => 'Update']);

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -17,7 +17,6 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * ActivityReason controller.
@@ -50,28 +49,6 @@ class ActivityReasonController extends AbstractController
         ]);
     }
 
-    /**
-     * Displays a form to edit an existing ActivityReason entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/edit', name: 'chill_activity_activityreason_edit')]
-    public function editAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(ActivityReason::class)->find($id);
-
-        if (null === $entity) {
-            throw new NotFoundHttpException('Unable to find ActivityReason entity.');
-        }
-
-        $editForm = $this->createEditForm($entity);
-
-        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
-            'entity' => $entity,
-            'edit_form' => $editForm->createView(),
-        ]);
-    }
-
     /**
      * Lists all ActivityReason entities.
      */
@@ -102,29 +79,10 @@ class ActivityReasonController extends AbstractController
         ]);
     }
 
-    /**
-     * Finds and displays a ActivityReason entity.
-     */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/show', name: 'chill_activity_activityreason_show')]
-    public function showAction(mixed $id)
-    {
-        $em = $this->managerRegistry->getManager();
-
-        $entity = $em->getRepository(ActivityReason::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
-        }
-
-        return $this->render('@ChillActivity/ActivityReason/show.html.twig', [
-            'entity' => $entity,
-        ]);
-    }
-
     /**
      * Edits an existing ActivityReason entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update', methods: ['POST', 'PUT'])]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update')]
     public function updateAction(Request $request, mixed $id)
     {
         $em = $this->managerRegistry->getManager();
@@ -180,7 +138,7 @@ class ActivityReasonController extends AbstractController
     {
         $form = $this->createForm(ActivityReasonType::class, $entity, [
             'action' => $this->generateUrl('chill_activity_activityreason_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
+            'method' => 'POST',
         ]);
 
         $form->add('submit', SubmitType::class, ['label' => 'Update']);

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php

@@ -24,7 +24,7 @@ class ByActivityNumberAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->addSelect('(SELECT COUNT(activity.id) FROM '.Activity::class.' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
@@ -41,12 +41,27 @@ class ByActivityNumberAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return static function ($value) {
             if ('_header' === $value) {

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityTypeAggregator.php

@@ -33,7 +33,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
         private TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('after_date', PickRollingDateType::class, [
@@ -46,6 +46,21 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['after_date' => $formData['after_date']->normalize(), 'before_date' => $formData['before_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['after_date' => \Chill\MainBundle\Service\RollingDate\RollingDate::fromNormalized($formData['after_date']), 'before_date' => \Chill\MainBundle\Service\RollingDate\RollingDate::fromNormalized($formData['before_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -54,7 +69,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
         ];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function (int|string|null $value): string {
             if ('_header' === $value) {
@@ -69,12 +84,12 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::PREFIX.'_actype_id'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.acp.by_activity_type.title';
     }
@@ -84,7 +99,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -115,7 +130,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
             ->addGroupBy("{$p}_actype_id");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php

@@ -27,7 +27,7 @@ class BySocialActionAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialActions', 'actsocialaction');
@@ -42,17 +42,32 @@ class BySocialActionAggregator implements AggregatorInterface
         return Declarations::ACTIVITY_ACP;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value) {
             if ('_header' === $value) {

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php

@@ -27,7 +27,7 @@ class BySocialIssueAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialIssues', 'actsocialissue');
@@ -42,17 +42,32 @@ class BySocialIssueAggregator implements AggregatorInterface
         return Declarations::ACTIVITY_ACP;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -25,7 +25,7 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.location', 'actloc');
@@ -39,17 +39,32 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form required for this aggregator
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -69,7 +84,7 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
         return [self::KEY];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.activity.by_location.Title';
     }

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

@@ -22,14 +22,29 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
 {
     public function __construct(private ActivityPresenceRepositoryInterface $activityPresenceRepository, private TranslatableStringHelperInterface $translatableStringHelper) {}
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function (int|string|null $value): string {
             if ('_header' === $value) {
@@ -44,7 +59,7 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['activity_presence_aggregator_attendee'];
     }
@@ -59,13 +74,13 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('IDENTITY(activity.attendee) AS activity_presence_aggregator_attendee');
         $qb->addGroupBy('activity_presence_aggregator_attendee');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }

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

@@ -36,7 +36,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         // add select element
         if ('reasons' === $data['level']) {
@@ -72,7 +72,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add(
             'level',
@@ -89,6 +89,21 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         );
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['level' => $formData['level']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['level' => $formData['level']];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -96,7 +111,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         ];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value) use ($data) {
             if ('_header' === $value) {
@@ -125,7 +140,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         // add select element
         if ('reasons' === $data['level']) {
@@ -139,12 +154,12 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         throw new \RuntimeException('The data provided are not recognised.');
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Aggregate by activity reason';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
+    public function validateForm($data, ExecutionContextInterface $context): void
     {
         if (null === $data['level']) {
             $context

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

@@ -29,7 +29,7 @@ class ActivityTypeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acttype', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.activityType', 'acttype');
@@ -44,17 +44,32 @@ class ActivityTypeAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form required for this aggregator
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): callable
     {
         return function (int|string|null $value): string {
             if ('_header' === $value) {
@@ -74,7 +89,7 @@ class ActivityTypeAggregator implements AggregatorInterface
         return [self::KEY];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Aggregate by activity type';
     }

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

@@ -29,7 +29,7 @@ class ActivityUserAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         // add select element
         $qb->addSelect(sprintf('IDENTITY(activity.user) AS %s', self::KEY));
@@ -43,17 +43,32 @@ class ActivityUserAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // nothing to add
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, $values, $data): \Closure
+    public function getLabels($key, $values, $data): callable
     {
         return function ($value) {
             if ('_header' === $value) {
@@ -70,7 +85,7 @@ class ActivityUserAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::KEY];
     }

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

@@ -27,7 +27,7 @@ class ActivityUsersAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actusers', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.users', 'actusers');
@@ -43,17 +43,32 @@ class ActivityUsersAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // nothing to add on the form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value) {
             if ('_header' === $value) {
@@ -70,12 +85,12 @@ class ActivityUsersAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['activity_users_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Aggregate by activity users';
     }

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

@@ -34,7 +34,7 @@ class ActivityUsersJobAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -65,14 +65,29 @@ class ActivityUsersJobAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -34,7 +34,7 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -65,14 +65,29 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ class ByCreatorAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('IDENTITY(activity.createdBy) AS creator_aggregator');
         $qb->addGroupBy('creator_aggregator');
@@ -38,17 +38,32 @@ class ByCreatorAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ class ByThirdpartyAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acttparty', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.thirdParties', 'acttparty');
@@ -42,17 +42,32 @@ class ByThirdpartyAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -34,7 +34,7 @@ class CreatorJobAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -65,14 +65,29 @@ class CreatorJobAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -34,7 +34,7 @@ class CreatorScopeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -65,14 +65,29 @@ class CreatorScopeAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -32,7 +32,7 @@ class DateAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $order = null;
 
@@ -67,7 +67,7 @@ class DateAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('frequency', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -76,12 +76,27 @@ class DateAggregator implements AggregatorInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['frequency' => self::DEFAULT_CHOICE];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return static function ($value) use ($data): string {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ class LocationTypeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.location', 'actloc');
@@ -42,17 +42,32 @@ class LocationTypeAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/HouseholdAggregator.php

@@ -24,17 +24,32 @@ final readonly class HouseholdAggregator implements AggregatorInterface
 {
     public function __construct(private HouseholdRepository $householdRepository) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // nothing to add here
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function (int|string|null $value): string|int {
             if ('_header' === $value) {
@@ -49,12 +64,12 @@ final readonly class HouseholdAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['activity_household_agg'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.person.by_household.title';
     }
@@ -64,7 +79,7 @@ final readonly class HouseholdAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->join(
             HouseholdMember::class,
@@ -92,7 +107,7 @@ final readonly class HouseholdAggregator implements AggregatorInterface
             ->addGroupBy('activity_household_agg');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY_PERSON;
     }

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/PersonAggregator.php

@@ -21,27 +21,42 @@ final readonly class PersonAggregator implements AggregatorInterface
 {
     public function __construct(private LabelPersonHelper $labelPersonHelper) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // nothing to add here
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return $this->labelPersonHelper->getLabel($key, $values, 'export.aggregator.person.by_person.person');
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['activity_by_person_agg'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.person.by_person.title';
     }
@@ -51,14 +66,14 @@ final readonly class PersonAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->addSelect('IDENTITY(activity.person) AS activity_by_person_agg')
             ->addGroupBy('activity_by_person_agg');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY_PERSON;
     }

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

@@ -27,17 +27,32 @@ final readonly class PersonsAggregator implements AggregatorInterface
 
     public function __construct(private LabelPersonHelper $labelPersonHelper) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // nothing to add here
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         if ($key !== self::PREFIX.'_pid') {
             throw new \UnexpectedValueException('this key should not be handled: '.$key);
@@ -46,12 +61,12 @@ final readonly class PersonsAggregator implements AggregatorInterface
         return $this->labelPersonHelper->getLabel($key, $values, 'export.aggregator.activity.by_persons.Persons');
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::PREFIX.'_pid'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.activity.by_persons.Group activity by persons';
     }
@@ -61,7 +76,7 @@ final readonly class PersonsAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -71,7 +86,7 @@ final readonly class PersonsAggregator implements AggregatorInterface
             ->addGroupBy("{$p}_pid");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }

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

@@ -26,7 +26,7 @@ class SentReceivedAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('activity.sentReceived AS activity_sentreceived_aggregator')
             ->addGroupBy('activity_sentreceived_aggregator');
@@ -42,6 +42,21 @@ class SentReceivedAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php

@@ -15,6 +15,7 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -38,6 +39,21 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -72,7 +88,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_avg_activity_duration'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -87,7 +103,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php

@@ -15,6 +15,7 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -46,6 +47,21 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         // TODO: Implement buildForm() method.
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -80,7 +96,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return ['export_avg_activity_visit_duration'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -95,7 +111,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php

@@ -43,6 +43,21 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -77,7 +92,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -92,7 +107,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountHouseholdOnActivity.php

@@ -44,6 +44,21 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -78,7 +93,7 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -93,7 +108,7 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountPersonsOnActivity.php

@@ -43,6 +43,21 @@ class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -77,7 +92,7 @@ class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -92,7 +107,7 @@ class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php

@@ -17,6 +17,7 @@ use Chill\ActivityBundle\Export\Export\ListActivityHelper;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
 use Chill\MainBundle\Export\ListInterface;
@@ -38,6 +39,21 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
         $this->helper->buildForm($builder);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -73,7 +89,7 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return
             array_merge(
@@ -85,25 +101,23 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
             );
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return $this->helper->getResult($query, $data);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return ListActivityHelper::MSG_KEY.'List activity linked to a course';
     }
 
-    public function getType()
+    public function getType(): string
     {
         return $this->helper->getType();
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
-        $centers = array_map(static fn ($el) => $el['center'], $acl);
-
         $qb = $this->entityManager->createQueryBuilder();
 
         $qb
@@ -114,7 +128,7 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
             ->leftJoin('acppart.person', 'person')
             ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL');
 
-        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $data);
+        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $context->byUser, $data);
 
         $qb
             // some grouping are necessary

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php

@@ -40,9 +40,21 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getNormalizationVersion(): int
     {
-        // TODO: Implement buildForm() method.
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
     }
 
     public function getFormDefaultData(): array
@@ -79,7 +91,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_sum_activity_duration'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -94,7 +106,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php

@@ -40,9 +40,21 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getNormalizationVersion(): int
     {
-        // TODO: Implement buildForm() method.
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
     }
 
     public function getFormDefaultData(): array
@@ -79,7 +91,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return ['export_sum_activity_visit_duration'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -94,7 +106,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php

@@ -35,6 +35,21 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -64,17 +79,17 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Count activities linked to a person';
     }
@@ -84,7 +99,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountHouseholdOnActivity.php

@@ -36,6 +36,21 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -65,17 +80,17 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
         return static fn ($value) => '_header' === $value ? 'export.export.count_household_on_activity_person.header' : $value;
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.export.count_household_on_activity_person.title';
     }
@@ -85,7 +100,7 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php

@@ -78,6 +78,21 @@ class ListActivity implements ListInterface, GroupedExportInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['fields' => $formData['fields']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['fields' => $formData['fields']];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -167,17 +182,17 @@ class ListActivity implements ListInterface, GroupedExportInterface
         }
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return $data['fields'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'List activity linked to a person';
     }
@@ -187,7 +202,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php

@@ -49,6 +49,21 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -84,17 +99,17 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         return static fn (string $value) => '_header' === $value ? $header : $value;
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['export_stat_activity'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         if (self::SUM === $this->action) {
             return 'Sum activity linked to a person duration';
@@ -108,7 +123,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(
             static fn (array $el): Center => $el['center'],

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php

@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
@@ -25,6 +26,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 final readonly class ActivityTypeFilter implements FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     private const BASE_EXISTS = 'SELECT 1 FROM '.Activity::class.' act_type_filter_activity WHERE act_type_filter_activity.accompanyingPeriod = acp';
 
     public function __construct(
@@ -38,7 +40,7 @@ final readonly class ActivityTypeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $exists = self::BASE_EXISTS;
 
@@ -62,12 +64,12 @@ final readonly class ActivityTypeFilter implements FilterInterface
         }
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_activitytypes', EntityType::class, [
             'class' => ActivityType::class,
@@ -92,6 +94,21 @@ final readonly class ActivityTypeFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_activitytypes' => $this->normalizeDoctrineEntity($formData['accepted_activitytypes']), 'date_after' => $formData['date_after']?->normalize(), 'date_before' => $formData['date_before']?->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_activitytypes' => $this->denormalizeDoctrineEntity($formData['accepted_activitytypes'], $this->activityTypeRepository), 'date_after' => \Chill\MainBundle\Service\RollingDate\RollingDate::fromNormalized($formData['date_after']), 'date_before' => \Chill\MainBundle\Service\RollingDate\RollingDate::fromNormalized($formData['date_before'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -101,7 +118,7 @@ final readonly class ActivityTypeFilter implements FilterInterface
         ];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $types = [];
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php

@@ -12,23 +12,28 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\ExportDataNormalizerTrait;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Form\Type\PickSocialActionType;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class BySocialActionFilter implements FilterInterface
 {
-    public function __construct(private readonly SocialActionRender $actionRender) {}
+    use ExportDataNormalizerTrait;
+
+    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $socialActionRepository) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialActions', 'actsocialaction');
@@ -48,19 +53,36 @@ class BySocialActionFilter implements FilterInterface
         return Declarations::ACTIVITY_ACP;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_socialactions', PickSocialActionType::class, [
             'multiple' => true,
         ]);
     }
 
-    public function getFormDefaultData(): array
+    public function getNormalizationVersion(): int
     {
-        return [];
+        return 1;
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_socialactions' => $this->normalizeDoctrineEntity($formData['accepted_socialactions'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_socialactions' => $this->denormalizeDoctrineEntity($formData['accepted_socialactions'], $this->socialActionRepository)];
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'accepted_socialactions' => [],
+        ];
+    }
+
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $actions = [];
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php

@@ -12,23 +12,28 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\ExportDataNormalizerTrait;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Form\Type\PickSocialIssueType;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class BySocialIssueFilter implements FilterInterface
 {
-    public function __construct(private readonly SocialIssueRender $issueRender) {}
+    use ExportDataNormalizerTrait;
+
+    public function __construct(private readonly SocialIssueRender $issueRender, private readonly SocialIssueRepository $issueRepository) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialIssues', 'actsocialissue');
@@ -48,19 +53,34 @@ class BySocialIssueFilter implements FilterInterface
         return Declarations::ACTIVITY_ACP;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_socialissues', PickSocialIssueType::class, [
             'multiple' => true,
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_socialissues' => $this->normalizeDoctrineEntity($formData['accepted_socialissues'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_socialissues' => $this->denormalizeDoctrineEntity($formData['accepted_socialissues'], $this->issueRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $issues = [];
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
@@ -27,7 +28,7 @@ class HasNoActivityFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere('
@@ -43,17 +44,32 @@ class HasNoActivityFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form needed
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return ['Filtered acp which has no activities', []];
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -25,12 +26,12 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
         private RollingDateConverterInterface $rollingDateConverter,
     ) {}
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.filter.activity.course_having_activity_between_date.Title';
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('start_date', PickRollingDateType::class, [
@@ -41,6 +42,21 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['start_date' => $formData['start_date']->normalize(), 'end_date' => $formData['end_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['start_date' => RollingDate::fromNormalized($formData['start_date']), 'end_date' => RollingDate::fromNormalized($formData['end_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -49,7 +65,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
         ];
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
     {
         return [
             'export.filter.activity.course_having_activity_between_date.Only course having an activity between from and to',
@@ -65,7 +81,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $alias = 'act_period_having_act_betw_date_alias';
         $from = 'act_period_having_act_betw_date_start';
@@ -82,7 +98,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
             ->setParameter($to, $this->rollingDateConverter->convert($data['end_date']));
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return \Chill\PersonBundle\Export\Declarations::ACP_TYPE;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -30,7 +31,7 @@ class ActivityDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->between(
@@ -61,7 +62,7 @@ class ActivityDateFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('date_from', PickRollingDateType::class, [
@@ -72,12 +73,27 @@ class ActivityDateFilter implements FilterInterface
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['date_from' => $formData['date_from']->normalize(), 'date_to' => $formData['date_to']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['date_from' => RollingDate::fromNormalized($formData['date_from']), 'date_to' => RollingDate::fromNormalized($formData['date_to'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
     {
         return [
             'Filtered by date of activity: only between %date_from% and %date_to%',
@@ -88,7 +104,7 @@ class ActivityDateFilter implements FilterInterface
         ];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Filtered by date activity';
     }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php

@@ -13,6 +13,8 @@ namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Repository\ActivityPresenceRepositoryInterface;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\Common\Collections\Collection;
@@ -23,17 +25,20 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 final readonly class ActivityPresenceFilter implements FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
     public function __construct(
         private TranslatableStringHelperInterface $translatableStringHelper,
         private TranslatorInterface $translator,
+        private ActivityPresenceRepositoryInterface $activityPresenceRepository,
     ) {}
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.filter.activity.by_presence.Filter activity by activity presence';
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('presences', EntityType::class, [
             'class' => ActivityPresence::class,
@@ -45,12 +50,27 @@ final readonly class ActivityPresenceFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['presences' => $this->normalizeDoctrineEntity($formData['presences'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['presences' => $this->denormalizeDoctrineEntity($formData['presences'], $this->activityPresenceRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
     {
         $presences = array_map(
             fn (ActivityPresence $presence) => $this->translatableStringHelper->localize($presence->getName()),
@@ -68,14 +88,14 @@ final readonly class ActivityPresenceFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere('activity.attendee IN (:activity_presence_filter_presences)')
             ->setParameter('activity_presence_filter_presences', $data['presences']);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -15,6 +15,7 @@ use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -24,6 +25,8 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
     public function __construct(
         protected TranslatableStringHelperInterface $translatableStringHelper,
         protected ActivityTypeRepositoryInterface $activityTypeRepository,
@@ -34,7 +37,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
 
@@ -47,7 +50,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('types', EntityType::class, [
             'choices' => $this->activityTypeRepository->findAllActive(),
@@ -70,12 +73,27 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['types' => $this->normalizeDoctrineEntity($formData['types'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['types' => $this->denormalizeDoctrineEntity($formData['types'], $this->activityTypeRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
@@ -88,12 +106,12 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         ]];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Filter by activity type';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
+    public function validateForm($data, ExecutionContextInterface $context): void
     {
         if (null === $data['types'] || 0 === \count($data['types'])) {
             $context

src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php

@@ -12,26 +12,30 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Form\Type\PickUserOrMeDynamicType;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class ActivityUsersFilter implements FilterInterface
+final readonly class ActivityUsersFilter implements FilterInterface
 {
-    public function __construct(private readonly UserRender $userRender) {}
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
+    public function __construct(private UserRender $userRender, private UserRepositoryInterface $userRepository) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $orX = $qb->expr()->orX();
 
-        foreach ($data['accepted_users'] as $key => $user) {
+        foreach ($this->userOrMe($data['accepted_users'], $exportGenerationContext) as $key => $user) {
             $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u'.$key, 'activity.users'));
             $qb->setParameter('activity_users_filter_u'.$key, $user);
         }
@@ -39,29 +43,44 @@ class ActivityUsersFilter implements FilterInterface
         $qb->andWhere($orX);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
-        $builder->add('accepted_users', PickUserDynamicType::class, [
+        $builder->add('accepted_users', PickUserOrMeDynamicType::class, [
             'multiple' => true,
             'label' => 'Users',
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_users' => $this->normalizeUserOrMe($formData['accepted_users'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_users' => $this->denormalizeUserOrMe($formData['accepted_users'], $this->userRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
     {
         $users = [];
 
-        foreach ($data['accepted_users'] as $u) {
+        foreach ($this->userOrMe($data['accepted_users'], $context) as $u) {
             $users[] = $this->userRender->renderString($u, []);
         }
 

src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php

@@ -12,28 +12,32 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Form\Type\PickUserOrMeDynamicType;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class ByCreatorFilter implements FilterInterface
 {
-    public function __construct(private readonly UserRender $userRender) {}
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
+    public function __construct(private readonly UserRender $userRender, private readonly UserRepositoryInterface $userRepository) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere(
                 $qb->expr()->in('activity.createdBy', ':users')
             )
-            ->setParameter('users', $data['accepted_users']);
+            ->setParameter('users', $this->userOrMe($data['accepted_users'], $exportGenerationContext));
     }
 
     public function applyOn(): string
@@ -41,23 +45,38 @@ class ByCreatorFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
-        $builder->add('accepted_users', PickUserDynamicType::class, [
+        $builder->add('accepted_users', PickUserOrMeDynamicType::class, [
             'multiple' => true,
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_users' => $this->normalizeUserOrMe($formData['accepted_users'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_users' => $this->denormalizeUserOrMe($formData['accepted_users'], $this->userRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $users = [];
 
-        foreach ($data['accepted_users'] as $u) {
+        foreach ($this->userOrMe($data['accepted_users'], $context) as $u) {
             $users[] = $this->userRender->renderString($u, []);
         }
 

src/Bundle/ChillActivityBundle/Export/Filter/CreatorJobFilter.php

@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Filter;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -26,6 +27,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 final readonly class CreatorJobFilter implements FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     private const PREFIX = 'acp_act_filter_creator_job';
 
     public function __construct(
@@ -39,7 +41,7 @@ final readonly class CreatorJobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -75,7 +77,7 @@ final readonly class CreatorJobFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('jobs', EntityType::class, [
@@ -90,7 +92,22 @@ final readonly class CreatorJobFilter implements FilterInterface
             ]);
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['jobs' => $this->normalizeDoctrineEntity($formData['jobs'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['jobs' => $this->denormalizeDoctrineEntity($formData['jobs'], $this->userJobRepository)];
+    }
+
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $jobs = array_map(
             fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()),

src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php

@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Filter;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User\UserScopeHistory;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -24,6 +25,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class CreatorScopeFilter implements FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     private const PREFIX = 'acp_act_filter_creator_scope';
 
     public function __construct(
@@ -36,7 +38,7 @@ class CreatorScopeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -72,7 +74,7 @@ class CreatorScopeFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('scopes', EntityType::class, [
@@ -86,7 +88,22 @@ class CreatorScopeFilter implements FilterInterface
             ]);
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['scopes' => $this->normalizeDoctrineEntity($formData['scopes'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['scopes' => $this->denormalizeDoctrineEntity($formData['scopes'], $this->scopeRepository)];
+    }
+
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $scopes = [];
 

src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
@@ -35,7 +36,7 @@ class EmergencyFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
 
@@ -56,7 +57,7 @@ class EmergencyFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_emergency', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -66,12 +67,27 @@ class EmergencyFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_emergency' => $formData['accepted_emergency']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_emergency' => $formData['accepted_emergency']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_emergency' => self::DEFAULT_CHOICE];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return [
             'Filtered by emergency: only %emergency%', [

src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php

@@ -12,19 +12,27 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickUserLocationType;
+use Chill\MainBundle\Repository\LocationRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class LocationFilter implements FilterInterface
+final readonly class LocationFilter implements FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
+    public function __construct(
+        private LocationRepository $locationRepository,
+    ) {}
+
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb->andWhere(
             $qb->expr()->in('activity.location', ':location')
@@ -38,7 +46,7 @@ class LocationFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_location', PickUserLocationType::class, [
             'multiple' => true,
@@ -46,12 +54,27 @@ class LocationFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_location' => $this->normalizeDoctrineEntity($formData['accepted_location'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_location' => $this->denormalizeDoctrineEntity($formData['accepted_location'], $this->locationRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $locations = [];