Update localizeString method to accept translatable string and locale parameters

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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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-20250424-142211.yaml

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -1,22 +0,0 @@
-## 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

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

.changes/v4.0.0.md

@@ -1,74 +0,0 @@
-## 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`)
-
-

.gitlab-ci.yml

@@ -46,7 +46,7 @@ stages:
 
 build:
     stage: Composer install
-    image: chill/base-image:8.3-edge
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     before_script:
         - composer config -g cache-dir "$(pwd)/.cache"
     script:
@@ -61,7 +61,7 @@ build:
 
 code_style:
     stage: Tests
-    image: chill/base-image:8.3-edge
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     script:
         - php-cs-fixer fix --dry-run -v --show-progress=none
     cache:
@@ -74,7 +74,7 @@ code_style:
 
 phpstan_tests:
     stage: Tests
-    image: chill/base-image:8.3-edge
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     variables:
         COMPOSER_MEMORY_LIMIT: 3G
     before_script:
@@ -91,7 +91,7 @@ phpstan_tests:
 
 rector_tests:
     stage: Tests
-    image: chill/base-image:8.3-edge
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     before_script:
         - bin/console cache:clear --env=dev
     script:
@@ -132,7 +132,7 @@ lint:
 
 unit_tests:
     stage: Tests
-    image: chill/base-image:8.3-edge
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     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. We do not support other databases.
+- **Database**: PostgreSQL with materialized views
 - **Other Services**: Redis, AMQP (RabbitMQ), SMTP
 
 ## Project Structure
@@ -149,42 +149,6 @@ 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.
@@ -254,7 +218,7 @@ class TicketTest extends TestCase
 
 #### Test Database
 
-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.
+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.
 
 ### Code Quality Tools
 

CHANGELOG.md

@@ -6,128 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## 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   

config/packages/chill.yaml

@@ -17,7 +17,6 @@ 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/messenger.yaml

@@ -5,6 +5,7 @@ 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://
@@ -18,9 +19,7 @@ framework:
                         async: ~
                     auto_setup: true
 
-            priority:
-                dsn: '%env(MESSENGER_TRANSPORT_DSN)%/priority'
-
+            priority: '%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'
@@ -62,8 +61,6 @@ 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

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

@@ -12,7 +12,6 @@ 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;
@@ -21,7 +20,6 @@ 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
     {
@@ -30,7 +28,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
     }
 
     // here, we alter the query created by Export
-    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
         // we create the clause here
@@ -54,13 +52,13 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
     }
 
     // we give information on which type of export this filter applies
-    public function applyOn(): string
+    public function applyOn()
     {
         return 'person';
     }
 
     // we build a form to collect some parameters from the users
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder): void
+    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
         $builder->add('date_from', DateType::class, [
             'label' => 'Born after this date',
@@ -76,18 +74,6 @@ 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()];
@@ -95,7 +81,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, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
+    public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s birtdate: '
             . 'between %date_from% and %date_to%', [
@@ -104,7 +90,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
             ], ];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'Filter by person\'s birthdate';
     }
@@ -113,7 +99,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): void
+    public function validateForm($data, ExecutionContextInterface $context)
     {
         $date_from = $data['date_from'];
         $date_to = $data['date_to'];

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

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

docs/source/development/export-sequence.puml

@@ -1,84 +0,0 @@
-@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,31 +15,24 @@ 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>`_
@@ -73,7 +66,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                          |
 +-----------+----------------+------------------------------------------------------------------------------+

phpstan-baseline.neon

@@ -2154,6 +2154,11 @@ 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: var/cache/phpstan
+    tmpDir: .cache/
     reportUnmatchedIgnoredErrors: false
     excludePaths:
         - .php_cs*

phpunit.rector.xml

@@ -1,24 +1,13 @@
 <?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"
-         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 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">
+  <testsuites>
+    <testsuite name="default">
+      <directory>utils/rector/tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">utils/rector/src</directory>
+    </include>
+  </source>
 </phpunit>

rector.php

@@ -18,15 +18,14 @@ 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->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
+    $rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/test/App_KernelTestDebugContainer.xml  ');
+    $rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
 
     //$rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
     //$rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');
@@ -40,11 +39,16 @@ 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,
     ]);
@@ -62,6 +66,11 @@ 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
@@ -85,6 +94,4 @@ 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'),
     ]);
-
-
 };

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -48,6 +48,28 @@ 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.
      */
@@ -78,10 +100,29 @@ 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')]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update', methods: ['POST', 'PUT'])]
     public function updateAction(Request $request, mixed $id)
     {
         $em = $this->managerRegistry->getManager();
@@ -98,7 +139,7 @@ class ActivityReasonCategoryController extends AbstractController
         if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreasoncategory', ['id' => $id]);
+            return $this->redirectToRoute('chill_activity_activityreasoncategory_edit', ['id' => $id]);
         }
 
         return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
@@ -137,7 +178,7 @@ class ActivityReasonCategoryController extends AbstractController
     {
         $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
             'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', ['id' => $entity->getId()]),
-            'method' => 'POST',
+            'method' => 'PUT',
         ]);
 
         $form->add('submit', SubmitType::class, ['label' => 'Update']);

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -17,6 +17,7 @@ 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.
@@ -49,6 +50,28 @@ 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.
      */
@@ -79,10 +102,29 @@ 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')]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update', methods: ['POST', 'PUT'])]
     public function updateAction(Request $request, mixed $id)
     {
         $em = $this->managerRegistry->getManager();
@@ -138,7 +180,7 @@ class ActivityReasonController extends AbstractController
     {
         $form = $this->createForm(ActivityReasonType::class, $entity, [
             'action' => $this->generateUrl('chill_activity_activityreason_update', ['id' => $entity->getId()]),
-            'method' => 'POST',
+            'method' => 'PUT',
         ]);
 
         $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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb
             ->addSelect('(SELECT COUNT(activity.id) FROM '.Activity::class.' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
@@ -41,27 +41,12 @@ 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): callable
+    public function getLabels($key, array $values, $data)
     {
         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): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder
             ->add('after_date', PickRollingDateType::class, [
@@ -46,21 +46,6 @@ 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 [
@@ -69,7 +54,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
         ];
     }
 
-    public function getLabels($key, array $values, mixed $data): callable
+    public function getLabels($key, array $values, mixed $data)
     {
         return function (int|string|null $value): string {
             if ('_header' === $value) {
@@ -84,12 +69,12 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data): array
+    public function getQueryKeys($data)
     {
         return [self::PREFIX.'_actype_id'];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'export.aggregator.acp.by_activity_type.title';
     }
@@ -99,7 +84,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -130,7 +115,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
             ->addGroupBy("{$p}_actype_id");
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialActions', 'actsocialaction');
@@ -42,32 +42,17 @@ class BySocialActionAggregator implements AggregatorInterface
         return Declarations::ACTIVITY_ACP;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, $data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialIssues', 'actsocialissue');
@@ -42,32 +42,17 @@ class BySocialIssueAggregator implements AggregatorInterface
         return Declarations::ACTIVITY_ACP;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, $data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.location', 'actloc');
@@ -39,32 +39,17 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -84,7 +69,7 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
         return [self::KEY];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'export.aggregator.activity.by_location.Title';
     }

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

@@ -22,29 +22,14 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
 {
     public function __construct(private ActivityPresenceRepositoryInterface $activityPresenceRepository, private TranslatableStringHelperInterface $translatableStringHelper) {}
 
-    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 buildForm(FormBuilderInterface $builder) {}
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data): callable
+    public function getLabels($key, array $values, mixed $data)
     {
         return function (int|string|null $value): string {
             if ('_header' === $value) {
@@ -59,7 +44,7 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data): array
+    public function getQueryKeys($data)
     {
         return ['activity_presence_aggregator_attendee'];
     }
@@ -74,13 +59,13 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb->addSelect('IDENTITY(activity.attendee) AS activity_presence_aggregator_attendee');
         $qb->addGroupBy('activity_presence_aggregator_attendee');
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         // add select element
         if ('reasons' === $data['level']) {
@@ -72,7 +72,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add(
             'level',
@@ -89,21 +89,6 @@ 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 [
@@ -111,7 +96,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         ];
     }
 
-    public function getLabels($key, array $values, $data): callable
+    public function getLabels($key, array $values, $data)
     {
         return function ($value) use ($data) {
             if ('_header' === $value) {
@@ -140,7 +125,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         };
     }
 
-    public function getQueryKeys($data): array
+    public function getQueryKeys($data)
     {
         // add select element
         if ('reasons' === $data['level']) {
@@ -154,12 +139,12 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         throw new \RuntimeException('The data provided are not recognised.');
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'Aggregate by activity reason';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context): void
+    public function validateForm($data, ExecutionContextInterface $context)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('acttype', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.activityType', 'acttype');
@@ -44,32 +44,17 @@ class ActivityTypeAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, $data): \Closure
     {
         return function (int|string|null $value): string {
             if ('_header' === $value) {
@@ -89,7 +74,7 @@ class ActivityTypeAggregator implements AggregatorInterface
         return [self::KEY];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         // add select element
         $qb->addSelect(sprintf('IDENTITY(activity.user) AS %s', self::KEY));
@@ -43,32 +43,17 @@ class ActivityUserAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, $values, $data): \Closure
     {
         return function ($value) {
             if ('_header' === $value) {
@@ -85,7 +70,7 @@ class ActivityUserAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data): array
+    public function getQueryKeys($data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('actusers', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.users', 'actusers');
@@ -43,32 +43,17 @@ class ActivityUsersAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, $data)
     {
         return function ($value) {
             if ('_header' === $value) {
@@ -85,12 +70,12 @@ class ActivityUsersAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data): array
+    public function getQueryKeys($data)
     {
         return ['activity_users_aggregator'];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -65,29 +65,14 @@ class ActivityUsersJobAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    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 buildForm(FormBuilderInterface $builder) {}
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): callable
+    public function getLabels($key, array $values, $data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -65,29 +65,14 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    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 buildForm(FormBuilderInterface $builder) {}
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): callable
+    public function getLabels($key, array $values, $data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('IDENTITY(activity.createdBy) AS creator_aggregator');
         $qb->addGroupBy('creator_aggregator');
@@ -38,32 +38,17 @@ class ByCreatorAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, $data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('acttparty', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.thirdParties', 'acttparty');
@@ -42,32 +42,17 @@ class ByThirdpartyAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, $data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -65,29 +65,14 @@ class CreatorJobAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    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 buildForm(FormBuilderInterface $builder) {}
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): callable
+    public function getLabels($key, array $values, $data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -65,29 +65,14 @@ class CreatorScopeAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    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 buildForm(FormBuilderInterface $builder) {}
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): callable
+    public function getLabels($key, array $values, $data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $order = null;
 
@@ -67,7 +67,7 @@ class DateAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('frequency', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -76,27 +76,12 @@ 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): callable
+    public function getLabels($key, array $values, $data)
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.location', 'actloc');
@@ -42,32 +42,17 @@ class LocationTypeAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
             if ('_header' === $value) {

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

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

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

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

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

@@ -27,32 +27,17 @@ final readonly class PersonsAggregator implements AggregatorInterface
 
     public function __construct(private LabelPersonHelper $labelPersonHelper) {}
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, mixed $data)
     {
         if ($key !== self::PREFIX.'_pid') {
             throw new \UnexpectedValueException('this key should not be handled: '.$key);
@@ -61,12 +46,12 @@ final readonly class PersonsAggregator implements AggregatorInterface
         return $this->labelPersonHelper->getLabel($key, $values, 'export.aggregator.activity.by_persons.Persons');
     }
 
-    public function getQueryKeys($data): array
+    public function getQueryKeys($data)
     {
         return [self::PREFIX.'_pid'];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'export.aggregator.activity.by_persons.Group activity by persons';
     }
@@ -76,7 +61,7 @@ final readonly class PersonsAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -86,7 +71,7 @@ final readonly class PersonsAggregator implements AggregatorInterface
             ->addGroupBy("{$p}_pid");
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb->addSelect('activity.sentReceived AS activity_sentreceived_aggregator')
             ->addGroupBy('activity_sentreceived_aggregator');
@@ -42,21 +42,6 @@ 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,7 +15,6 @@ 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;
@@ -39,21 +38,6 @@ 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 [];
@@ -88,7 +72,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return ['export_avg_activity_duration'];
     }
 
-    public function getResult($query, $data, ExportGenerationContext $context): array
+    public function getResult($query, $data)
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -103,7 +87,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -15,7 +15,6 @@ 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;
@@ -47,21 +46,6 @@ 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 [];
@@ -96,7 +80,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return ['export_avg_activity_visit_duration'];
     }
 
-    public function getResult($query, $data, ExportGenerationContext $context): array
+    public function getResult($query, $data)
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -111,7 +95,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -43,21 +43,6 @@ 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 [];
@@ -92,7 +77,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
+    public function getResult($query, $data)
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -107,7 +92,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -44,21 +44,6 @@ 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 [];
@@ -93,7 +78,7 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
+    public function getResult($query, $data)
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -108,7 +93,7 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -43,21 +43,6 @@ 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 [];
@@ -92,7 +77,7 @@ class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
+    public function getResult($query, $data)
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -107,7 +92,7 @@ class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -17,7 +17,6 @@ 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;
@@ -39,21 +38,6 @@ 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 [];
@@ -89,7 +73,7 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
         };
     }
 
-    public function getQueryKeys($data): array
+    public function getQueryKeys($data)
     {
         return
             array_merge(
@@ -101,23 +85,25 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
             );
     }
 
-    public function getResult($query, $data, ExportGenerationContext $context): array
+    public function getResult($query, $data)
     {
         return $this->helper->getResult($query, $data);
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return ListActivityHelper::MSG_KEY.'List activity linked to a course';
     }
 
-    public function getType(): string
+    public function getType()
     {
         return $this->helper->getType();
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
+
         $qb = $this->entityManager->createQueryBuilder();
 
         $qb
@@ -128,7 +114,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, $context->byUser, $data);
+        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $data);
 
         $qb
             // some grouping are necessary

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

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

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

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

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

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

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

@@ -36,21 +36,6 @@ 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 [];
@@ -80,17 +65,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): array
+    public function getQueryKeys($data)
     {
         return ['export_count_activity'];
     }
 
-    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
+    public function getResult($query, $data)
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'export.export.count_household_on_activity_person.title';
     }
@@ -100,7 +85,7 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
         return Declarations::ACTIVITY;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

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

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

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

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

@@ -14,7 +14,6 @@ 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;
@@ -26,7 +25,6 @@ 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(
@@ -40,7 +38,7 @@ final readonly class ActivityTypeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $exists = self::BASE_EXISTS;
 
@@ -64,12 +62,12 @@ final readonly class ActivityTypeFilter implements FilterInterface
         }
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_activitytypes', EntityType::class, [
             'class' => ActivityType::class,
@@ -94,21 +92,6 @@ 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 [
@@ -118,7 +101,7 @@ final readonly class ActivityTypeFilter implements FilterInterface
         ];
     }
 
-    public function describeAction($data, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         $types = [];
 

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

@@ -12,28 +12,23 @@ 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
 {
-    use ExportDataNormalizerTrait;
-
-    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $socialActionRepository) {}
+    public function __construct(private readonly SocialActionRender $actionRender) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialActions', 'actsocialaction');
@@ -53,36 +48,19 @@ class BySocialActionFilter implements FilterInterface
         return Declarations::ACTIVITY_ACP;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_socialactions', PickSocialActionType::class, [
             'multiple' => true,
         ]);
     }
 
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    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' => [],
-        ];
+        return [];
     }
 
-    public function describeAction($data, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         $actions = [];
 

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

@@ -12,28 +12,23 @@ 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
 {
-    use ExportDataNormalizerTrait;
-
-    public function __construct(private readonly SocialIssueRender $issueRender, private readonly SocialIssueRepository $issueRepository) {}
+    public function __construct(private readonly SocialIssueRender $issueRender) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialIssues', 'actsocialissue');
@@ -53,34 +48,19 @@ class BySocialIssueFilter implements FilterInterface
         return Declarations::ACTIVITY_ACP;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $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, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         $issues = [];
 

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

@@ -12,7 +12,6 @@ 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;
@@ -28,7 +27,7 @@ class HasNoActivityFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb
             ->andWhere('
@@ -44,32 +43,17 @@ class HasNoActivityFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         return ['Filtered acp which has no activities', []];
     }

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

@@ -12,7 +12,6 @@ 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;
@@ -26,12 +25,12 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
         private RollingDateConverterInterface $rollingDateConverter,
     ) {}
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'export.filter.activity.course_having_activity_between_date.Title';
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder
             ->add('start_date', PickRollingDateType::class, [
@@ -42,21 +41,6 @@ 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 [
@@ -65,7 +49,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
         ];
     }
 
-    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
+    public function describeAction($data, $format = 'string')
     {
         return [
             'export.filter.activity.course_having_activity_between_date.Only course having an activity between from and to',
@@ -81,7 +65,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $alias = 'act_period_having_act_betw_date_alias';
         $from = 'act_period_having_act_betw_date_start';
@@ -98,7 +82,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
             ->setParameter($to, $this->rollingDateConverter->convert($data['end_date']));
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         return \Chill\PersonBundle\Export\Declarations::ACP_TYPE;
     }

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

@@ -12,7 +12,6 @@ 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;
@@ -31,7 +30,7 @@ class ActivityDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->between(
@@ -62,7 +61,7 @@ class ActivityDateFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder
             ->add('date_from', PickRollingDateType::class, [
@@ -73,27 +72,12 @@ 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, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
+    public function describeAction($data, $format = 'string')
     {
         return [
             'Filtered by date of activity: only between %date_from% and %date_to%',
@@ -104,7 +88,7 @@ class ActivityDateFilter implements FilterInterface
         ];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'Filtered by date activity';
     }

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

@@ -13,8 +13,6 @@ 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;
@@ -25,20 +23,17 @@ 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(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'export.filter.activity.by_presence.Filter activity by activity presence';
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('presences', EntityType::class, [
             'class' => ActivityPresence::class,
@@ -50,27 +45,12 @@ 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, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
+    public function describeAction($data, $format = 'string')
     {
         $presences = array_map(
             fn (ActivityPresence $presence) => $this->translatableStringHelper->localize($presence->getName()),
@@ -88,14 +68,14 @@ final readonly class ActivityPresenceFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb
             ->andWhere('activity.attendee IN (:activity_presence_filter_presences)')
             ->setParameter('activity_presence_filter_presences', $data['presences']);
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         return Declarations::ACTIVITY;
     }

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

@@ -15,7 +15,6 @@ 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;
@@ -25,8 +24,6 @@ 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,
@@ -37,7 +34,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
 
@@ -50,7 +47,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('types', EntityType::class, [
             'choices' => $this->activityTypeRepository->findAllActive(),
@@ -73,27 +70,12 @@ 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, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
+    public function describeAction($data, $format = 'string')
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
@@ -106,12 +88,12 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         ]];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'Filter by activity type';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context): void
+    public function validateForm($data, ExecutionContextInterface $context)
     {
         if (null === $data['types'] || 0 === \count($data['types'])) {
             $context

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

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

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

@@ -12,32 +12,28 @@ 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\PickUserOrMeDynamicType;
-use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class ByCreatorFilter implements FilterInterface
 {
-    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
-
-    public function __construct(private readonly UserRender $userRender, private readonly UserRepositoryInterface $userRepository) {}
+    public function __construct(private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb
             ->andWhere(
                 $qb->expr()->in('activity.createdBy', ':users')
             )
-            ->setParameter('users', $this->userOrMe($data['accepted_users'], $exportGenerationContext));
+            ->setParameter('users', $data['accepted_users']);
     }
 
     public function applyOn(): string
@@ -45,38 +41,23 @@ class ByCreatorFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_users', PickUserOrMeDynamicType::class, [
+        $builder->add('accepted_users', PickUserDynamicType::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, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         $users = [];
 
-        foreach ($this->userOrMe($data['accepted_users'], $context) as $u) {
+        foreach ($data['accepted_users'] as $u) {
             $users[] = $this->userRender->renderString($u, []);
         }
 

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

@@ -14,7 +14,6 @@ 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;
@@ -27,7 +26,6 @@ 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(
@@ -41,7 +39,7 @@ final readonly class CreatorJobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -77,7 +75,7 @@ final readonly class CreatorJobFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder
             ->add('jobs', EntityType::class, [
@@ -92,22 +90,7 @@ final readonly class CreatorJobFilter implements FilterInterface
             ]);
     }
 
-    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
+    public function describeAction($data, $format = 'string'): array
     {
         $jobs = array_map(
             fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()),

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

@@ -14,7 +14,6 @@ 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;
@@ -25,7 +24,6 @@ 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(
@@ -38,7 +36,7 @@ class CreatorScopeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -74,7 +72,7 @@ class CreatorScopeFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder
             ->add('scopes', EntityType::class, [
@@ -88,22 +86,7 @@ class CreatorScopeFilter implements FilterInterface
             ]);
     }
 
-    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
+    public function describeAction($data, $format = 'string'): array
     {
         $scopes = [];
 

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

@@ -12,7 +12,6 @@ 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;
@@ -36,7 +35,7 @@ class EmergencyFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
 
@@ -57,7 +56,7 @@ class EmergencyFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_emergency', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -67,27 +66,12 @@ 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, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         return [
             'Filtered by emergency: only %emergency%', [

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

@@ -12,27 +12,19 @@ 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;
 
-final readonly class LocationFilter implements FilterInterface
+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, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->andWhere(
             $qb->expr()->in('activity.location', ':location')
@@ -46,7 +38,7 @@ final readonly class LocationFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_location', PickUserLocationType::class, [
             'multiple' => true,
@@ -54,27 +46,12 @@ final readonly 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, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         $locations = [];
 

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

@@ -12,11 +12,8 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\ExportDataNormalizerTrait;
-use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickLocationTypeType;
-use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
@@ -24,16 +21,14 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class LocationTypeFilter implements FilterInterface
 {
-    use ExportDataNormalizerTrait;
-
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private LocationTypeRepository $locationTypeRepository) {}
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->join('activity.location', 'actloc');
@@ -57,7 +52,7 @@ class LocationTypeFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_locationtype', PickLocationTypeType::class, [
             'multiple' => true,
@@ -65,27 +60,12 @@ class LocationTypeFilter implements FilterInterface
         ]);
     }
 
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    public function normalizeFormData(array $formData): array
-    {
-        return ['accepted_locationtype' => $this->normalizeDoctrineEntity($formData['accepted_locationtype'])];
-    }
-
-    public function denormalizeFormData(array $formData, int $fromVersion): array
-    {
-        return ['accepted_locationtype' => $this->denormalizeDoctrineEntity($formData['accepted_locationtype'], $this->locationTypeRepository)];
-    }
-
     public function getFormDefaultData(): array
     {
-        return ['accepted_locationtype' => []];
+        return [];
     }
 
-    public function describeAction($data, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         $types = [];
 

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php

@@ -15,7 +15,6 @@ use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\Common\Collections\Collection;
@@ -27,8 +26,6 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
-
     public function __construct(protected TranslatableStringHelper $translatableStringHelper, protected ActivityReasonRepository $activityReasonRepository) {}
 
     public function addRole(): ?string
@@ -36,7 +33,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
         $join = $qb->getDQLPart('join');
@@ -61,7 +58,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         return Declarations::ACTIVITY_PERSON;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('reasons', EntityType::class, [
             'class' => ActivityReason::class,
@@ -73,27 +70,12 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         ]);
     }
 
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    public function normalizeFormData(array $formData): array
-    {
-        return ['reasons' => $this->normalizeDoctrineEntity($formData['reasons'])];
-    }
-
-    public function denormalizeFormData(array $formData, int $fromVersion): array
-    {
-        return ['reasons' => $this->denormalizeDoctrineEntity($formData['reasons'], $this->activityReasonRepository)];
-    }
-
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
+    public function describeAction($data, $format = 'string')
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
@@ -109,12 +91,12 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         ];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'Filter by reason';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context): void
+    public function validateForm($data, ExecutionContextInterface $context)
     {
         if (null === $data['reasons'] || 0 === \count($data['reasons'])) {
             $context

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php

@@ -15,7 +15,6 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -40,7 +39,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         // create a subquery for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
@@ -93,7 +92,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         return Declarations::PERSON_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('date_from_rolling', PickRollingDateType::class, [
             'label' => 'export.filter.activity.person_between_dates.Implied in an activity after this date',
@@ -117,21 +116,6 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         }
     }
 
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    public function normalizeFormData(array $formData): array
-    {
-        return ['date_from_rolling' => $formData['date_from_rolling']->normalize(), 'date_to_rolling' => $formData['date_to_rolling']->normalize()];
-    }
-
-    public function denormalizeFormData(array $formData, int $fromVersion): array
-    {
-        return ['date_from_rolling' => RollingDate::fromNormalized($formData['date_from_rolling']), 'date_to_rolling' => RollingDate::fromNormalized($formData['date_to_rolling'])];
-    }
-
     public function getFormDefaultData(): array
     {
         return [
@@ -141,7 +125,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         ];
     }
 
-    public function describeAction($data, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         return [
             [] === $data['reasons'] ?
@@ -166,7 +150,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         return 'export.filter.activity.person_between_dates.title';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context): void
+    public function validateForm($data, ExecutionContextInterface $context)
     {
         if ($this->rollingDateConverter->convert($data['date_from_rolling'])
             >= $this->rollingDateConverter->convert($data['date_to_rolling'])) {

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

@@ -13,7 +13,6 @@ namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Tests\Export\Filter\PersonsFilterTest;
-use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
@@ -34,7 +33,7 @@ final readonly class PersonsFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -48,12 +47,12 @@ final readonly class PersonsFilter implements FilterInterface
         $qb->andWhere($orX);
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_persons', PickPersonDynamicType::class, [
             'multiple' => true,
@@ -61,21 +60,6 @@ final readonly class PersonsFilter implements FilterInterface
         ]);
     }
 
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    public function normalizeFormData(array $formData): array
-    {
-        return ['accepted_persons' => $formData['accepted_persons']];
-    }
-
-    public function denormalizeFormData(array $formData, int $fromVersion): array
-    {
-        return ['accepted_persons' => $formData['accepted_persons']];
-    }
-
     public function getFormDefaultData(): array
     {
         return [
@@ -83,7 +67,7 @@ final readonly class PersonsFilter implements FilterInterface
         ];
     }
 
-    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
+    public function describeAction($data, $format = 'string')
     {
         $users = [];
 

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

@@ -13,7 +13,6 @@ namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
 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;
@@ -37,7 +36,7 @@ class SentReceivedFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
 
@@ -58,7 +57,7 @@ class SentReceivedFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_sentreceived', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -69,27 +68,12 @@ class SentReceivedFilter implements FilterInterface
         ]);
     }
 
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    public function normalizeFormData(array $formData): array
-    {
-        return ['accepted_sentreceived' => $formData['accepted_sentreceived']];
-    }
-
-    public function denormalizeFormData(array $formData, int $fromVersion): array
-    {
-        return ['accepted_sentreceived' => $formData['accepted_sentreceived']];
-    }
-
     public function getFormDefaultData(): array
     {
         return ['accepted_sentreceived' => self::DEFAULT_CHOICE];
     }
 
-    public function describeAction($data, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         $sentreceived = array_flip(self::CHOICES)[$data['accepted_sentreceived']];
 

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

@@ -12,27 +12,23 @@ 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\PickUserOrMeDynamicType;
-use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-final readonly class UserFilter implements FilterInterface
+class UserFilter implements FilterInterface
 {
-    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
-
-    public function __construct(private UserRender $userRender, private UserRepositoryInterface $userRepository) {}
+    public function __construct(private readonly UserRender $userRender) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
 
@@ -45,7 +41,7 @@ final readonly class UserFilter implements FilterInterface
         }
 
         $qb->add('where', $where);
-        $qb->setParameter('users', $this->userOrMe($data['accepted_users'], $exportGenerationContext));
+        $qb->setParameter('users', $data['accepted_users']);
     }
 
     public function applyOn(): string
@@ -53,39 +49,24 @@ final readonly class UserFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_users', PickUserOrMeDynamicType::class, [
+        $builder->add('accepted_users', PickUserDynamicType::class, [
             'multiple' => true,
             'label' => 'Creators',
         ]);
     }
 
-    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, ExportGenerationContext $context): array
+    public function describeAction($data, $format = 'string'): array
     {
         $users = [];
 
-        foreach ($this->userOrMe($data['accepted_users'], $context) as $u) {
+        foreach ($data['accepted_users'] as $u) {
             $users[] = $this->userRender->renderString($u, []);
         }
 

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

@@ -15,7 +15,6 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
-use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -26,7 +25,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UsersJobFilter implements FilterInterface
 {
-    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     private const PREFIX = 'act_filter_user_job';
 
     public function __construct(
@@ -39,7 +37,7 @@ class UsersJobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -62,12 +60,12 @@ class UsersJobFilter implements FilterInterface
             );
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder
             ->add('jobs', EntityType::class, [
@@ -79,22 +77,7 @@ class UsersJobFilter implements FilterInterface
             ]);
     }
 
-    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): string|\Symfony\Contracts\Translation\TranslatableInterface|array
+    public function describeAction($data, $format = 'string')
     {
         return ['export.filter.activity.by_users_job.Filtered activity by users job: only %jobs%', [
             '%jobs%' => implode(
@@ -114,7 +97,7 @@ class UsersJobFilter implements FilterInterface
         ];
     }
 
-    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
+    public function getTitle()
     {
         return 'export.filter.activity.by_users_job.Filter by users job';
     }

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

@@ -15,7 +15,6 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User\UserScopeHistory;
-use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -26,7 +25,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UsersScopeFilter implements FilterInterface
 {
-    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     private const PREFIX = 'act_filter_user_scope';
 
     public function __construct(
@@ -39,7 +37,7 @@ class UsersScopeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -67,7 +65,7 @@ class UsersScopeFilter implements FilterInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder
             ->add('scopes', EntityType::class, [
@@ -79,22 +77,7 @@ class UsersScopeFilter implements FilterInterface
             ]);
     }
 
-    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
+    public function describeAction($data, $format = 'string'): array
     {
         return ['export.filter.activity.by_users_scope.Filtered activity by users scope: only %scopes%', [
             '%scopes%' => implode(

src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php

@@ -12,9 +12,8 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityPresence;
-use Doctrine\Persistence\ObjectRepository;
 
-interface ActivityPresenceRepositoryInterface extends ObjectRepository
+interface ActivityPresenceRepositoryInterface
 {
     public function find($id): ?ActivityPresence;
 

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -2,7 +2,7 @@ import "es6-promise/auto";
 import { createStore } from "vuex";
 import { postLocation } from "./api";
 import prepareLocations from "./store.locations.js";
-import { fetchResults, makeFetch } from "ChillMainAssets/lib/api/apiMethods";
+import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
 const debug = process.env.NODE_ENV !== "production";
 //console.log('window.activity', window.activity);
@@ -365,11 +365,11 @@ const store = createStore({
       const accompanyingPeriodId = state.activity.accompanyingPeriod.id;
       const url = `/api/1.0/person/accompanying-course/${accompanyingPeriodId}/works.json`;
       try {
-        const works = await fetchResults(url);
-        // console.log('works', works);
+        const works = await makeFetch("GET", url);
+        // console.log("works", works);
         commit("setAccompanyingPeriodWorks", works);
       } catch (error) {
-        console.error("Failed to fetch works:", error);
+        console.error("Failed to fetch accompanying period works:", error);
       }
     },
     getWhoAmI({ commit }) {

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig

@@ -3,7 +3,7 @@
 {% block admin_content %}
     <h1>{{ 'ActivityReason list'|trans }}</h1>
 
-    <table class="table table-bordered border-dark align-middle">
+    <table class="records_list">
         <thead>
             <tr>
                 <th>{{ 'Name'|trans }}</th>
@@ -29,7 +29,10 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_activity_activityreason_update', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                            <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
+                        </li>
+                        <li>
+                            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                         </li>
                     </ul>
                 </td>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig

@@ -3,7 +3,7 @@
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory list'|trans }}</h1>
 
-    <table class="table table-bordered border-dark align-middle">
+    <table class="records_list">
         <thead>
             <tr>
                 <th>{{ 'Name'|trans }}</th>
@@ -23,7 +23,10 @@
                 <td>
                     <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_update', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
+                    </li>
+                    <li>
+                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php

@@ -22,52 +22,6 @@ use Symfony\Component\Security\Core\Role\Role;
  */
 final class ActivityControllerTest extends WebTestCase
 {
-    /**
-     * @dataProvider getSecuredPagesUnauthenticated
-     */
-    public function testAccessIsDeniedForUnauthenticated(mixed $url)
-    {
-        $client = $this->createClient();
-
-        $client->request('GET', $url);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertTrue(
-            $client->getResponse()->isRedirect('http://localhost/login'),
-            sprintf('the page "%s" does not redirect to http://localhost/login', $url)
-        );
-    }
-
-    /**
-     * Provide a client unauthenticated and.
-     */
-    public function getSecuredPagesUnauthenticated()
-    {
-        self::bootKernel();
-        $person = $this->getPersonFromFixtures();
-        $activities = $this->getActivitiesForPerson($person);
-
-        return [
-            [sprintf('fr/person/%d/activity/', $person->getId())],
-            [sprintf('fr/person/%d/activity/new', $person->getId())],
-            [sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId())],
-            [sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId())],
-        ];
-    }
-
-    /**
-     * @dataProvider getSecuredPagesAuthenticated
-     *
-     * @param type $client
-     * @param type $url
-     */
-    public function testAccessIsDeniedForUnauthorized($client, $url)
-    {
-        $client->request('GET', $url);
-
-        $this->assertEquals(403, $client->getResponse()->getStatusCode());
-    }
-
     public function getSecuredPagesAuthenticated()
     {
         self::bootKernel();
@@ -101,6 +55,52 @@ final class ActivityControllerTest extends WebTestCase
         ];
     }
 
+    /**
+     * Provide a client unauthenticated and.
+     */
+    public function getSecuredPagesUnauthenticated()
+    {
+        self::bootKernel();
+        $person = $this->getPersonFromFixtures();
+        $activities = $this->getActivitiesForPerson($person);
+
+        return [
+            [sprintf('fr/person/%d/activity/', $person->getId())],
+            [sprintf('fr/person/%d/activity/new', $person->getId())],
+            [sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId())],
+            [sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId())],
+        ];
+    }
+
+    /**
+     * @dataProvider getSecuredPagesUnauthenticated
+     */
+    public function testAccessIsDeniedForUnauthenticated(mixed $url)
+    {
+        $client = $this->createClient();
+
+        $client->request('GET', $url);
+
+        $this->assertEquals(302, $client->getResponse()->getStatusCode());
+        $this->assertTrue(
+            $client->getResponse()->isRedirect('http://localhost/login'),
+            sprintf('the page "%s" does not redirect to http://localhost/login', $url)
+        );
+    }
+
+    /**
+     * @dataProvider getSecuredPagesAuthenticated
+     *
+     * @param type $client
+     * @param type $url
+     */
+    public function testAccessIsDeniedForUnauthorized($client, $url)
+    {
+        $client->request('GET', $url);
+
+        $this->assertEquals(403, $client->getResponse()->getStatusCode());
+    }
+
     public function testCompleteScenario()
     {
         // Create a new client to browse the application

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php

@@ -45,20 +45,14 @@ final class ByCreatorFilterTest extends AbstractFilterTest
             ->from(User::class, 'u')
             ->select('u')
             ->getQuery()
-            ->setMaxResults(1)
             ->getResult();
         $data = [];
-
         foreach ($array as $a) {
             $data[] = [
                 'accepted_users' => $a,
             ];
         }
 
-        $data[] = [
-            'accepted_users' => 'me',
-        ];
-
         return $data;
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php

@@ -55,10 +55,6 @@ final class UserFilterTest extends AbstractFilterTest
             ];
         }
 
-        $data[] = [
-            'accepted_users' => 'me',
-        ];
-
         return $data;
     }
 

src/Bundle/ChillActivityBundle/Tests/Repository/ActivityACLAwareRepositoryTest.php

@@ -137,64 +137,6 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
         self::assertIsArray($actual);
     }
 
-    public function provideDataFindByAccompanyingPeriod(): iterable
-    {
-        $this->setUp();
-
-        if (null === $period = $this->entityManager
-            ->createQueryBuilder()
-            ->select('a')
-            ->from(AccompanyingPeriod::class, 'a')
-            ->setMaxResults(1)
-            ->getQuery()
-            ->getSingleResult()) {
-            throw new \RuntimeException('no period found');
-        }
-
-        if ([] === $types = $this->entityManager
-            ->createQueryBuilder()
-            ->select('t')
-            ->from(ActivityType::class, 't')
-            ->setMaxResults(2)
-            ->getQuery()
-            ->getResult()) {
-            throw new \RuntimeException('no types');
-        }
-
-        if ([] === $jobs = $this->entityManager
-            ->createQueryBuilder()
-            ->select('j')
-            ->from(UserJob::class, 'j')
-            ->setMaxResults(2)
-            ->getQuery()
-            ->getResult()
-        ) {
-            $job = new UserJob();
-            $job->setLabel(['fr' => 'test']);
-            $this->entityManager->persist($job);
-            $this->entityManager->flush();
-        }
-
-        if (null === $user = $this->entityManager
-            ->createQueryBuilder()
-            ->select('u')
-            ->from(User::class, 'u')
-            ->setMaxResults(1)
-            ->getQuery()
-            ->getSingleResult()
-        ) {
-            throw new \RuntimeException('no user found');
-        }
-
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], []];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['my_activities' => true]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['types' => $types]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['jobs' => $jobs]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago')]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['before' => new \DateTimeImmutable('1 year ago')]];
-        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago'), 'before' => new \DateTimeImmutable('1 month ago')]];
-    }
-
     /**
      * @dataProvider provideDataFindByPerson
      */
@@ -349,4 +291,62 @@ class ActivityACLAwareRepositoryTest extends KernelTestCase
         yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['before' => new \DateTimeImmutable('1 year ago')]];
         yield [$person, $user, $centers, $scopes, ActivityVoter::SEE, 0, 5, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago'), 'before' => new \DateTimeImmutable('1 month ago')]];
     }
+
+    public function provideDataFindByAccompanyingPeriod(): iterable
+    {
+        $this->setUp();
+
+        if (null === $period = $this->entityManager
+            ->createQueryBuilder()
+            ->select('a')
+            ->from(AccompanyingPeriod::class, 'a')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult()) {
+            throw new \RuntimeException('no period found');
+        }
+
+        if ([] === $types = $this->entityManager
+            ->createQueryBuilder()
+            ->select('t')
+            ->from(ActivityType::class, 't')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult()) {
+            throw new \RuntimeException('no types');
+        }
+
+        if ([] === $jobs = $this->entityManager
+            ->createQueryBuilder()
+            ->select('j')
+            ->from(UserJob::class, 'j')
+            ->setMaxResults(2)
+            ->getQuery()
+            ->getResult()
+        ) {
+            $job = new UserJob();
+            $job->setLabel(['fr' => 'test']);
+            $this->entityManager->persist($job);
+            $this->entityManager->flush();
+        }
+
+        if (null === $user = $this->entityManager
+            ->createQueryBuilder()
+            ->select('u')
+            ->from(User::class, 'u')
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult()
+        ) {
+            throw new \RuntimeException('no user found');
+        }
+
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], []];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['my_activities' => true]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['types' => $types]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['jobs' => $jobs]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago')]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['before' => new \DateTimeImmutable('1 year ago')]];
+        yield [$period, $user, ActivityVoter::SEE, 0, 10, ['date' => 'DESC'], ['after' => new \DateTimeImmutable('1 year ago'), 'before' => new \DateTimeImmutable('1 month ago')]];
+    }
 }

src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php

@@ -57,46 +57,6 @@ final class ActivityVoterTest extends KernelTestCase
         $this->prophet = new \Prophecy\Prophet();
     }
 
-    public function testNullUser()
-    {
-        $token = $this->prepareToken();
-        $center = $this->prepareCenter(1, 'center');
-        $person = $this->preparePerson($center);
-        $scope = $this->prepareScope(1, 'default');
-        $activity = $this->prepareActivity($scope, $person);
-
-        $this->assertEquals(
-            VoterInterface::ACCESS_DENIED,
-            $this->voter->vote($token, $activity, ['CHILL_ACTIVITY_SEE']),
-            'assert that a null user is not allowed to see'
-        );
-    }
-
-    /**
-     * @dataProvider dataProvider_testVoteAction
-     *
-     * @param type   $expectedResult
-     * @param string $attribute
-     * @param string $message
-     */
-    public function testVoteAction(
-        $expectedResult,
-        User $user,
-        Scope $scope,
-        Center $center,
-        $attribute,
-        $message,
-    ) {
-        $token = $this->prepareToken($user);
-        $activity = $this->prepareActivity($scope, $this->preparePerson($center));
-
-        $this->assertEquals(
-            $expectedResult,
-            $this->voter->vote($token, $activity, [$attribute]),
-            $message
-        );
-    }
-
     public function dataProvider_testVoteAction()
     {
         $centerA = $this->prepareCenter(1, 'center A');
@@ -150,6 +110,46 @@ final class ActivityVoterTest extends KernelTestCase
         ];
     }
 
+    public function testNullUser()
+    {
+        $token = $this->prepareToken();
+        $center = $this->prepareCenter(1, 'center');
+        $person = $this->preparePerson($center);
+        $scope = $this->prepareScope(1, 'default');
+        $activity = $this->prepareActivity($scope, $person);
+
+        $this->assertEquals(
+            VoterInterface::ACCESS_DENIED,
+            $this->voter->vote($token, $activity, ['CHILL_ACTIVITY_SEE']),
+            'assert that a null user is not allowed to see'
+        );
+    }
+
+    /**
+     * @dataProvider dataProvider_testVoteAction
+     *
+     * @param type   $expectedResult
+     * @param string $attribute
+     * @param string $message
+     */
+    public function testVoteAction(
+        $expectedResult,
+        User $user,
+        Scope $scope,
+        Center $center,
+        $attribute,
+        $message,
+    ) {
+        $token = $this->prepareToken($user);
+        $activity = $this->prepareActivity($scope, $this->preparePerson($center));
+
+        $this->assertEquals(
+            $expectedResult,
+            $this->voter->vote($token, $activity, [$attribute]),
+            $message
+        );
+    }
+
     /**
      * prepare a token interface with correct rights.
      *

src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php

@@ -30,7 +30,7 @@ class ActivityValidity extends Constraint
 
     public $socialIssuesMessage = 'For this type of activity, you must add at least one social issue';
 
-    public function getTargets(): string
+    public function getTargets()
     {
         return self::CLASS_CONSTRAINT;
     }

src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php

@@ -30,7 +30,7 @@ class ByActivityTypeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('IDENTITY(aside.type) AS by_aside_activity_type_aggregator')
             ->addGroupBy('by_aside_activity_type_aggregator');
@@ -41,32 +41,17 @@ class ByActivityTypeAggregator implements AggregatorInterface
         return Declarations::ASIDE_ACTIVITY_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
     {
         // 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): callable
+    public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
             if ('_header' === $value) {

src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByLocationAggregator.php

@@ -26,27 +26,12 @@ class ByLocationAggregator implements AggregatorInterface
         // 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): callable
+    public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -75,7 +60,7 @@ class ByLocationAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb->addSelect('IDENTITY(aside.location) AS by_aside_activity_location_aggregator')
             ->addGroupBy('by_aside_activity_location_aggregator');

src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php

@@ -34,7 +34,7 @@ class ByUserJobAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -65,29 +65,14 @@ class ByUserJobAggregator implements AggregatorInterface
         return Declarations::ASIDE_ACTIVITY_TYPE;
     }
 
-    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 buildForm(FormBuilderInterface $builder) {}
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): callable
+    public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
             if ('_header' === $value) {

src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php

@@ -34,7 +34,7 @@ class ByUserScopeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $p = self::PREFIX;
 
@@ -64,29 +64,14 @@ class ByUserScopeAggregator implements AggregatorInterface
         return Declarations::ASIDE_ACTIVITY_TYPE;
     }
 
-    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 buildForm(FormBuilderInterface $builder) {}
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): callable
+    public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
             if ('_header' === $value) {

src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.php

@@ -26,21 +26,6 @@ class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterfac
 
     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 [];
@@ -75,7 +60,7 @@ class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterfac
         return ['export_avg_aside_activity_duration'];
     }
 
-    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
+    public function getResult($query, $data)
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -90,7 +75,7 @@ class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterfac
         return Declarations::ASIDE_ACTIVITY_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $qb = $this->repository->createQueryBuilder('aside');