merge upgrade-sf5 branch to have latest fixes

remove unnecessary constraints from 3party properties acronym and nameCompany
Update vue toast version and implementation
2025-09-19 21:24:59 +00:00 · 2024-06-06 13:01:12 +02:00 · 2024-05-29 11:37:42 +02:00 · 2024-05-29 11:37:04 +02:00 · 2024-05-23 14:05:14 +02:00 · 2024-05-23 13:47:33 +02:00
298 changed files with 13087 additions and 3244 deletions
--- a/.changes/unreleased/Feature-20240522-164933.yaml
+++ b/.changes/unreleased/Feature-20240522-164933.yaml
@@ -0,0 +1,5 @@
+kind: Feature
+body: Add job bundle (module emploi)
+time: 2024-05-22T16:49:33.730465146+02:00
+custom:
+  Issue: ""
--- a/.changes/v2.20.0.md
+++ b/.changes/v2.20.0.md
@@ -1,21 +0,0 @@
-## v2.20.0 - 2024-06-05
-### Fixed
-* ([#170](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/170)) Display agents traitants instead of accompanying period referrer in export list social actions.
-* Added translations for choices of durations (> 5 hours)
-### Feature
-* ([#145](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/145)) Allow to open documents in LibreOffice locally (need configuration within security);
-
-  This endpoint should be added to make the endpoint works properly:
-
-  ```yaml
-  security:
-      firewalls:
-          dav:
-               pattern: ^/dav
-               provider: chain_provider
-               stateless: true
-               guard:
-                   authenticators:
-                       - Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
-
-  ```
--- a/.changes/v2.20.1.md
+++ b/.changes/v2.20.1.md
@@ -1,3 +0,0 @@
-## v2.20.1 - 2024-06-05
-### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 
--- a/.changes/v2.21.0.md
+++ b/.changes/v2.21.0.md
@@ -1,31 +0,0 @@
-## v2.21.0 - 2024-06-18
-### Feature
-* Add flash menu buttons in search results, to open directly a new calendar, or a new activity in an accompanying period
-* ([#122](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/122)) Improve the list of calendar in the search results: make all calendar clicable, and display a list of calendars
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add start date and end date on filters "filter course by referrer job" and "filter course by referrer scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] the aggregator "Group by referrer" now accept a date range.
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's jobs"
-* ([#168](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/168) In the UX, display user job and service at the time when he performs an action:
-  now, the job and service is shown:
-  * at the activity's date,
-  * at the appointment's date,
-  * when the user is marked as referrer for an accompanying period work,
-  * when the user apply a transition in a workflow,
-  * when the user updates or creates "something" ("created/updated by ... at ..."),
-  * or when he wrote a comment,
-  * …
-
-### Traduction francophone
-* Ajout d'un menu "flash" dans les résultats de recherche, pour créer un rendez-vous ou un échange dans un parcours depuis les résultats de recherche;
-* Améliore la liste des rendez-vous dans les résultats de recherche: les rendez-vous sont cliquables;
-* [exports] Ajout d'intervalles de dates pour des filtres et regroupements des parcours par référent, métier du référent, service du référent;
-* Affiche le métier et le service des utilisateurs à la date à laquelle il a exécuté une action. Le métier et le service est affiché:
-  * à la date d'un échange,
-  * au jour d'un rendez-vous,
-  * quand l'utilisateur est devenu référent d'un parcours d'accompagnement,
-  * quand il a appliqué une transition sur un workflow,
-  * quand il a mise à jour ou créé une fiche, dans les mentions "créé / mise à jour par ..., le ...",
-  * quand il a mis à jour un commentaire,
-  * …
-
--- a/.changes/v2.22.0.md
+++ b/.changes/v2.22.0.md
@@ -1,6 +0,0 @@
-## v2.22.0 - 2024-06-25
-### Feature
-* ([#216](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/216)) [event bundle] exports  added for the event module
-
-### Traduction francophone
-* Exports sont ajoutés pour la module événement.
--- a/.changes/v2.22.1.md
+++ b/.changes/v2.22.1.md
@@ -1,5 +0,0 @@
-## v2.22.1 - 2024-07-01
-### Fixed
-* Remove debug word 
-### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 
--- a/.changes/v2.22.2.md
+++ b/.changes/v2.22.2.md
@@ -1,3 +0,0 @@
-## v2.22.2 - 2024-07-03
-### Fixed
-* Remove scope required for event participation stats 
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,81 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


-## v2.22.2 - 2024-07-03
-### Fixed
-* Remove scope required for event participation stats 
-
-## v2.22.1 - 2024-07-01
-### Fixed
-* Remove debug word 
-### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 
-
-## v2.22.0 - 2024-06-25
-### Feature
-* ([#216](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/216)) [event bundle] exports  added for the event module
-
-### Traduction francophone
-* Exports sont ajoutés pour la module événement.
-
-## v2.21.0 - 2024-06-18
-### Feature
-* Add flash menu buttons in search results, to open directly a new calendar, or a new activity in an accompanying period
-* ([#122](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/122)) Improve the list of calendar in the search results: make all calendar clicable, and display a list of calendars
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add start date and end date on filters "filter course by referrer job" and "filter course by referrer scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] the aggregator "Group by referrer" now accept a date range.
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's jobs"
-* ([#168](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/168) In the UX, display user job and service at the time when he performs an action:
-  now, the job and service is shown:
-  * at the activity's date,
-  * at the appointment's date,
-  * when the user is marked as referrer for an accompanying period work,
-  * when the user apply a transition in a workflow,
-  * when the user updates or creates "something" ("created/updated by ... at ..."),
-  * or when he wrote a comment,
-  * …
-
-### Traduction francophone
-* Ajout d'un menu "flash" dans les résultats de recherche, pour créer un rendez-vous ou un échange dans un parcours depuis les résultats de recherche;
-* Améliore la liste des rendez-vous dans les résultats de recherche: les rendez-vous sont cliquables;
-* [exports] Ajout d'intervalles de dates pour des filtres et regroupements des parcours par référent, métier du référent, service du référent;
-* Affiche le métier et le service des utilisateurs à la date à laquelle il a exécuté une action. Le métier et le service est affiché:
-  * à la date d'un échange,
-  * au jour d'un rendez-vous,
-  * quand l'utilisateur est devenu référent d'un parcours d'accompagnement,
-  * quand il a appliqué une transition sur un workflow,
-  * quand il a mise à jour ou créé une fiche, dans les mentions "créé / mise à jour par ..., le ...",
-  * quand il a mis à jour un commentaire,
-  * …
-
-
-## v2.20.1 - 2024-06-05
-### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 
-
-## v2.20.0 - 2024-06-05
-### Fixed
-* ([#170](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/170)) Display agents traitants instead of accompanying period referrer in export list social actions.
-* Added translations for choices of durations (> 5 hours)
-### Feature
-* ([#145](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/145)) Allow to open documents in LibreOffice locally (need configuration within security);
-
-  This endpoint should be added to make the endpoint works properly:
-
-  ```yaml
-  security:
-      firewalls:
-          dav:
-               pattern: ^/dav
-               provider: chain_provider
-               stateless: true
-               guard:
-                   authenticators:
-                       - Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
-
-  ```
-
 ## v2.19.0 - 2024-05-14
 ### Feature
 * ([#197](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/197)) Make the script which subscribe to microsoft calendars changes more tolerant to errors or missing configuration on the microsoft side
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
        "doctrine/doctrine-migrations-bundle": "^3.0",
        "doctrine/orm": "^2.13.0",
        "erusev/parsedown": "^1.7",
+        "graylog2/gelf-php": "^1.5",
        "knplabs/knp-menu-bundle": "^3.0",
        "knplabs/knp-time-bundle": "^1.12",
        "knpuniversity/oauth2-client-bundle": "^2.10",
@@ -91,12 +92,12 @@
        "phpstan/phpstan": "^1.9",
        "phpstan/phpstan-deprecation-rules": "^1.1",
        "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^10.5.24",
+        "phpunit/phpunit": ">= 7.5",
        "rector/rector": "^1.1.0",
        "symfony/debug-bundle": "^5.4",
        "symfony/dotenv": "^5.4",
        "symfony/maker-bundle": "^1.20",
-        "symfony/phpunit-bridge": "^7.1",
+        "symfony/phpunit-bridge": "^5.4",
        "symfony/runtime": "^5.4",
        "symfony/stopwatch": "^5.4",
        "symfony/var-dumper": "^5.4"
@@ -114,6 +115,8 @@
            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
            "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
            "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
+            "Chill\\FranceTravailApiBundle\\": "src/Bundle/ChillFranceTravailApiBundle/src",
+            "Chill\\JobBundle\\": "src/Bundle/ChillJobBundle/src",
            "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
            "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
            "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
--- a/docs/source/_static/code/exports/BirthdateFilter.php
+++ b/docs/source/_static/code/exports/BirthdateFilter.php
@@ -21,7 +21,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
    // add specific role for this filter
-    public function addRole()
+    public function addRole(): ?string
    {
        // we do not need any new role for this filter, so we return null
        return null;
--- a/docs/source/installation/index.rst
+++ b/docs/source/installation/index.rst
@@ -56,7 +56,7 @@ We strongly encourage you to initialize a git repository at this step, to track
   cat <<< "$(jq '.extra.symfony += {"endpoint": ["flex://defaults", "https://gitlab.com/api/v4/projects/57371968/repository/files/index.json/raw?ref=main"]}' composer.json)" > composer.json
   # install chill and some dependencies
   # TODO fix the suffix "alpha1" and replace by ^3.0.0 when version 3.0.0 will be released
-   symfony composer require chill-project/chill-bundles v3.0.0-RC3 champs-libres/wopi-lib dev-master@dev champs-libres/wopi-bundle dev-master@dev
+   symfony composer require chill-project/chill-bundles v3.0.0-alpha1 champs-libres/wopi-lib dev-master@dev champs-libres/wopi-bundle dev-master@dev

 We encourage you to accept the inclusion of the "Docker configuration from recipes": this is the documented way to run the database.
 You must also accept to configure recipes from the contrib repository, unless you want to configure the bundles manually).
@@ -95,7 +95,7 @@ custom developments. But most of the time, this should be fine.

 You have to configure some local variables, which are described in the :code:`.env` file. The secrets should not be stored
 in this :code:`.env` file, but instead using the `secrets management tool <https://symfony.com/doc/current/configuration/secrets.html>`_
-or in the :code:`.env.local` file, which should not be committed to the git repository.
+or in the :code:`.env.local` file, which should not be commited to the git repository.

 You do not need to set variables for the smtp server, redis server and relatorio server, as they are generated automatically
 by the symfony server, from the docker compose services.
@@ -110,15 +110,10 @@ you can either:
  .. code-block:: env

     ADMIN_PASSWORD=\$2y\$13\$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm
-     # note: if you copy-paste the line above, the password will be "admin".

 - add the generated password to the secrets manager (**note**: you must add the generated hashed password to the secrets env,
  not the password in clear text).

- set up the jwt authentication bundle
-
-Some environment variables are available for the JWT authentication bundle in the :code:`.env` file. 
-
 Prepare migrations and other tools
 **********************************

@@ -135,8 +130,6 @@ To continue the installation process, you will have to run migrations:
   symfony console messenger:setup-transports
   # prepare some views
   symfony console chill:db:sync-views
-   # generate jwt token, required for some api features (webdav access, ...)
-   symfony console lexik:jwt:generate-keypair

 .. warning::

@@ -171,7 +164,7 @@ can rely on the whole chill framework, meaning there is no need to add them to t
 You will require some bundles to have the following development tools:

 - add fixtures
- add profiler and debug bundle
+- add profiler and var-dumper to debug

 Install fixtures
 ****************
@@ -186,7 +179,7 @@ Install fixtures
 This will generate user accounts, centers, and some basic configuration.

 The accounts created are: :code:`center a_social`, :code:`center b_social`, :code:`center a_direction`, ...  The full list is
-visible in the "users" table: :code:`docker compose exec database psql -U app -c "SELECT username FROM users"`.
+visibile in the "users" table: :code:`docker compose exec database psql -U app -c "SELECT username FROM users"`.

 The password is always :code:`password`.

@@ -199,7 +192,7 @@ Add web profiler and debugger

 .. code-block:: bash

-   symfony composer require --dev symfony/web-profiler-bundle symfony/debug-bundle
+   symfony composer require --dev symfony/web-profiler-bundle symfony/var-dumper

 Working on chill bundles
 ************************
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
    "popper.js": "^1.16.1",
    "postcss-loader": "^7.0.2",
    "raw-loader": "^4.0.2",
-    "sass-loader": "^13.0.0",
+    "sass-loader": "^14.0.0",
    "select2": "^4.0.13",
    "select2-bootstrap-theme": "0.1.0-beta.10",
    "style-loader": "^3.3.1",
@@ -46,11 +46,9 @@
    "@fullcalendar/vue3": "^6.1.4",
    "@popperjs/core": "^2.9.2",
    "@types/leaflet": "^1.9.3",
-    "@types/dompurify": "^3.0.5",
    "dropzone": "^5.7.6",
    "es6-promise": "^4.2.8",
    "leaflet": "^1.7.1",
-    "marked": "^12.0.2",
    "masonry-layout": "^4.2.2",
    "mime": "^4.0.0",
    "swagger-ui": "^4.15.5",
@@ -58,7 +56,7 @@
    "vue": "^3.2.37",
    "vue-i18n": "^9.1.6",
    "vue-multiselect": "3.0.0-alpha.2",
-    "vue-toast-notification": "^2.0",
+    "vue-toast-notification": "^3.1.2",
    "vuex": "^4.0.0"
  },
  "browserslist": [
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,34 +1,29 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php

 		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\:\\:\\$required \\(false\\) does not accept bool\\.$#"
 			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php

 		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
 			count: 2
-			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php

 		-
-			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php

 		-
 			message: "#^Variable \\$participation might not be defined\\.$#"
@@ -40,6 +35,106 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php

+		-
+			message: "#^Comparison operation \"\\>\" between \\(bool\\|int\\|Redis\\) and 0 results in an error\\.$#"
+			count: 1
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php
+
+		-
+			message: "#^Variable \\$response might not be defined\\.$#"
+			count: 1
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php
+
+		-
+			message: "#^Function GuzzleHttp\\\\Psr7\\\\get not found\\.$#"
+			count: 1
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
+
+		-
+			message: "#^Function GuzzleHttp\\\\Psr7\\\\str not found\\.$#"
+			count: 2
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
+
+		-
+			message: "#^Parameter \\#1 \\$seconds of function sleep expects int, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php
+
+		-
+			message: "#^Parameter \\#1 \\$interval of method DateTimeImmutable\\:\\:add\\(\\) expects DateInterval, string\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Entity/Immersion.php
+
+		-
+			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Entity/Immersion.php
+
+		-
+			message: "#^Property Chill\\\\JobBundle\\\\Entity\\\\Rome\\\\Metier\\:\\:\\$appellations is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php
+
+		-
+			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListCSPerson\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php
+
+		-
+			message: "#^Variable \\$f might not be defined\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php
+
+		-
+			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListFrein\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Export/ListFrein.php
+
+		-
+			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListProjetProfessionnel\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php
+
+		-
+			message: "#^Property Chill\\\\JobBundle\\\\Form\\\\ChoiceLoader\\\\RomeAppellationChoiceLoader\\:\\:\\$appellationRepository \\(Chill\\\\JobBundle\\\\Repository\\\\Rome\\\\AppellationRepository\\) does not accept Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\JobBundle\\\\Entity\\\\Rome\\\\Appellation\\>\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Result of && is always false\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between array\\{\\} and Symfony\\\\Component\\\\Validator\\\\ConstraintViolationListInterface will always evaluate to false\\.$#"
+			count: 2
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Variable \\$metier might not be defined\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#1 \\$interval of method DateTimeImmutable\\:\\:add\\(\\) expects DateInterval, string\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php
+
+		-
+			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php
+
 		-
 			message: "#^Cannot unset offset '_token' on array\\{formatter\\: mixed, export\\: mixed, centers\\: mixed, alias\\: string\\}\\.$#"
 			count: 1
@@ -65,11 +160,31 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php

+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:userHasAccessForCenter\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
+
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php

+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
+
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1
--- a/rector.php
+++ b/rector.php
@@ -28,6 +28,9 @@ return static function (RectorConfig $rectorConfig): void {

    // register a single rule
    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeFromPropertyTypeRector::class);
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\Class_\MergeDateTimePropertyTypeDeclarationRector::class);
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector::class);

    // part of the symfony 54 rules
    $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
@@ -36,12 +39,8 @@ return static function (RectorConfig $rectorConfig): void {

    //define sets of rules
    $rectorConfig->sets([
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_50,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_50_TYPES,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_51,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_52,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_53,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_54,
+        \Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_82,
+        \Rector\Symfony\Set\SymfonyLevelSetList::UP_TO_SYMFONY_54,
        \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
        \Rector\Doctrine\Set\DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
    ]);
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
@@ -79,11 +79,9 @@ class ActivityReason
    /**
     * Set active.
     *
-     * @param bool $active
-     *
     * @return ActivityReason
     */
-    public function setActive($active)
+    public function setActive(bool $active)
    {
        $this->active = $active;

@@ -110,11 +108,9 @@ class ActivityReason
    /**
     * Set name.
     *
-     * @param array $name
-     *
     * @return ActivityReason
     */
-    public function setName($name)
+    public function setName(array $name)
    {
        $this->name = $name;

--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\ActivityBundle\Menu;
-
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Security;
-
-final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuilderInterface
-{
-    public function __construct(private Security $security) {}
-
-    public static function getMenuIds(): array
-    {
-        return ['accompanying_course_quick_menu'];
-    }
-
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingCourse */
-        $accompanyingCourse = $parameters['accompanying-course'];
-
-        if ($this->security->isGranted(ActivityVoter::CREATE, $accompanyingCourse)) {
-            $menu
-                ->addChild('Create a new activity in accompanying course', [
-                    'route' => 'chill_activity_activity_new',
-                    'routeParameters' => [
-                        // 'activityType_id' => '',
-                        'accompanying_period_id' => $accompanyingCourse->getId(),
-                    ],
-                ])
-                ->setExtras([
-                    'order' => 10,
-                    'icon' => 'plus',
-                ])
-            ;
-        }
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -68,7 +68,7 @@
                    <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
                    <div class="wl-col list">
                        <p class="wl-item">
-                            <span class="badge-user">{{ activity.user|chill_entity_render_box({'at_date': activity.date}) }}</span>
+                            <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                        </p>
                    </div>
                </div>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
@@ -87,7 +87,7 @@
                            <li>
                                {% if bloc.type == 'user' %}
                                    <span class="badge-user">
-                                        {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
+                                        {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
                                    </span>
                                {% else %}
                                    {{ _self.insert_onthefly(bloc.type, item) }}
@@ -114,7 +114,7 @@
                <li>
                    {% if bloc.type == 'user' %}
                        <span class="badge-user">
-                            {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
+                            {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
                        </span>
                    {% else %}
                        {{ _self.insert_onthefly(bloc.type, item) }}
@@ -142,7 +142,7 @@
                        <span class="wl-item">
                            {% if bloc.type == 'user' %}
                                <span class="badge-user">
-                                    {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
+                                    {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
                                    {%- if context == 'calendar_accompanyingCourse' or context == 'calendar_person' %}
                                        {% set invite = entity.inviteForUser(item) %}
                                        {% if invite is not null %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
@@ -41,7 +41,7 @@
                        {% if activity.user and t.userVisible %}
                            <li>
                                <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <span class="badge-user">{{ activity.user|chill_entity_render_box({'at_date': activity.date}) }}</span>
+                                <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                            </li>
                        {% endif %}

--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -37,7 +37,7 @@
                {%- if entity.user is not null %}
                    <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
                    <dd>
-                        <span class="badge-user">{{ entity.user|chill_entity_render_box({'at_date': entity.date}) }}</span>
+                        <span class="badge-user">{{ entity.user|chill_entity_render_box }}</span>
                    </dd>
                {% endif %}

--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -145,7 +145,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                throw new \RuntimeException('Could not determine context of activity.');
            }
        } elseif ($subject instanceof AccompanyingPeriod) {
-            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep() || AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
+            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
                if (\in_array($attribute, [self::UPDATE, self::CREATE, self::DELETE], true)) {
                    return false;
                }
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
@@ -60,7 +60,7 @@ final class TranslatableActivityTypeTest extends KernelTestCase
        $this->assertInstanceOf(
            ActivityType::class,
            $form->getData()['type'],
-            'The data is an instance of Chill\ActivityBundle\Entity\ActivityType'
+            'The data is an instance of Chill\\ActivityBundle\\Entity\\ActivityType'
        );
        $this->assertEquals($type->getId(), $form->getData()['type']->getId());

--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -77,18 +77,6 @@ Choose a type: Choisir un type
 4 hours: 4 heures
 4 hours 30: 4 heures 30
 5 hours: 5 heures
-5 hours 30: 5 heure 30
-6 hours: 6 heures
-6 hours 30: 6 heure 30
-7 hours: 7 heures
-7 hours 30: 7 heure 30
-8 hours: 8 heures
-8 hours 30: 8 heure 30
-9 hours: 9 heures
-9 hours 30: 9 heure 30
-10 hours: 10 heures
-11 hours: 11 heures
-12 hours: 12 heures
 Concerned groups: Parties concernées par l'échange
 Persons in accompanying course: Usagers du parcours
 Third persons: Tiers non-pro.
@@ -222,7 +210,6 @@ Documents label: Libellé du champ Documents
 # activity type category admin
 ActivityTypeCategory list: Liste des catégories des types d'échange
 Create a new activity type category: Créer une nouvelle catégorie de type d'échange
-Create a new activity in accompanying course: Créer un échange dans le parcours

 # activity delete
 Remove activity: Supprimer un échange
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -49,13 +49,13 @@
 										<li>
 											<span>
 												<abbr class="referrer" title={{ 'Created by'|trans }}>{{ 'By'|trans }}:</abbr>
-												<b>{{ entity.createdBy|chill_entity_render_box({'at_date': entity.date}) }}</b>
+												<b>{{ entity.createdBy|chill_entity_render_box }}</b>
 											</span>
 										</li>
 										<li>
 											<span>
 												<abbr class="referrer" title={{ 'Created for'|trans }}>{{ 'For'|trans }}:</abbr>
-												<b>{{ entity.agent|chill_entity_render_box({'at_date': entity.date}) }}</b>
+												<b>{{ entity.agent|chill_entity_render_box }}</b>

 											</span>
 										</li>
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -18,11 +18,11 @@
 				<dd>{{ entity.type|chill_entity_render_box }}</dd>

 				<dt class="inline">{{ 'Created by'|trans }}</dt>
-				<dd>{{ entity.createdBy|chill_entity_render_box({'at_date': entity.date}) }}</dd>
+				<dd>{{ entity.createdBy }}</dd>

 				<dt class="inline">{{ 'Created for'|trans }}</dt>
-				<dd>{{ entity.agent|chill_entity_render_box({'at_date': entity.date}) }}</dd>
-
+				<dd>{{ entity.agent }}</dd>
+                
                <dt class="inline">{{ 'Asideactivity location'|trans }}</dt>
                {%- if entity.location.name is defined -%}
                    <dd>{{ entity.location.name }}</dd>
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -72,21 +72,21 @@ days: jours
 1 hour 30: 1 heure 30
 1 hour 45: 1 heure 45
 2 hours: 2 heures
-2 hours 30: 2 heures 30
+2 hours 30: 2 heure 30
 3 hours: 3 heures
-3 hours 30: 3 heures 30
+3 hours 30: 3 heure 30
 4 hours: 4 heures
-4 hours 30: 4 heures 30
+4 hours 30: 4 heure 30
 5 hours: 5 heures
-5 hours 30: 5 heures 30
+5 hours 30: 5 heure 30
 6 hours: 6 heures
-6 hours 30: 6 heures 30
+6 hours 30: 6 heure 30
 7 hours: 7 heures
-7 hours 30: 7 heures 30
+7 hours 30: 7 heure 30
 8 hours: 8 heures
-8 hours 30: 8 heures 30
+8 hours 30: 8 heure 30
 9 hours: 9 heures
-9 hours 30: 9 heures 30
+9 hours 30: 9 heure 30
 10 hours: 10 heures
 1/2 day: 1/2 jour
 1 day: 1 jour
--- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
@@ -100,7 +100,7 @@ class Charge extends AbstractElement implements HasCentersInterface
        return $this;
    }

-    public function setHelp($help)
+    public function setHelp(?string $help)
    {
        $this->help = $help;

--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -440,16 +440,6 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
        return $this->startDate;
    }

-    /**
-     * get the date of the calendar.
-     *
-     * Useful for showing the date of the calendar event, required by twig in some places.
-     */
-    public function getDate(): ?\DateTimeImmutable
-    {
-        return $this->getStartDate();
-    }
-
    public function getStatus(): ?string
    {
        return $this->status;
--- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\CalendarBundle\Menu;
-
-use Chill\CalendarBundle\Security\Voter\CalendarVoter;
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Security;
-
-final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuilderInterface
-{
-    public function __construct(private Security $security) {}
-
-    public static function getMenuIds(): array
-    {
-        return ['accompanying_course_quick_menu'];
-    }
-
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingCourse */
-        $accompanyingCourse = $parameters['accompanying-course'];
-
-        if ($this->security->isGranted(CalendarVoter::CREATE, $accompanyingCourse)) {
-            $menu
-                ->addChild('Create a new calendar in accompanying course', [
-                    'route' => 'chill_calendar_calendar_new',
-                    'routeParameters' => [
-                        'accompanying_period_id' => $accompanyingCourse->getId(),
-                    ],
-                ])
-                ->setExtras([
-                    'order' => 20,
-                    'icon' => 'plus',
-                ])
-            ;
-        }
-    }
-}
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
@@ -37,12 +37,12 @@ class RemoteEventConverter
     * valid when the remote string contains also a timezone, like in
     * lastModifiedDate.
     */
-    final public const REMOTE_DATETIMEZONE_FORMAT = 'Y-m-d\TH:i:s.u?P';
+    final public const REMOTE_DATETIMEZONE_FORMAT = 'Y-m-d\\TH:i:s.u?P';

    /**
     * Same as above, but sometimes the date is expressed with only 6 milliseconds.
     */
-    final public const REMOTE_DATETIMEZONE_FORMAT_ALT = 'Y-m-d\TH:i:s.uP';
+    final public const REMOTE_DATETIMEZONE_FORMAT_ALT = 'Y-m-d\\TH:i:s.uP';

    private const REMOTE_DATE_FORMAT = 'Y-m-d\TH:i:s.u0';

--- a/src/Bundle/ChillCalendarBundle/Resources/public/chill/chill.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/chill.js
@@ -1,2 +1 @@
 import './scss/badge.scss';
-import './scss/calendar-list.scss';
--- a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
@@ -1,26 +0,0 @@
-ul.calendar-list {
-    list-style-type: none;
-    padding: 0;
-    & > li {
-        display: inline-block;
-    }
-    & > li:nth-child(n+2) {
-        margin-left: 0.25rem;
-    }
-}
-
-div.calendar-list {
-
-    ul.calendar-list {
-        display: inline-block;
-    }
-
-    & > a.calendar-list__global {
-        display: inline-block;;
-        padding: 0.2rem;
-        min-width: 2rem;
-        border: 1px solid var(--bs-chill-blue);
-        border-radius: 0.25rem;
-        text-align: center;
-    }
-}
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -55,7 +55,7 @@
                        <div class="item-col">
                            <ul class="list-content">
                                {% if calendar.mainUser is not empty %}
-                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
+                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box }}</span>
                                {% endif %}
                            </ul>
                        </div>
@@ -132,7 +132,7 @@
                                            <li class="cancel">
                                                <span class="createdBy">
                                                     {{ 'Created by'|trans }}
-                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
+                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
                                                </span>
                                            </li>
                                            {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
--- a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
+++ b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
@@ -89,7 +89,7 @@ class CalendarVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
            switch ($attribute) {
                case self::SEE:
                case self::CREATE:
-                    if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep() || AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
+                    if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
                        return false;
                    }

--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -26,7 +26,6 @@ The calendar item has been successfully removed.: Le rendez-vous a été supprim
 From the day: Du
 to the day: au
 Transform to activity: Transformer en échange
-Create a new calendar in accompanying course: Créer un rendez-vous dans le parcours
 Will send SMS: Un SMS de rappel sera envoyé
 Will not send SMS: Aucun SMS de rappel ne sera envoyé
 SMS already sent: Un SMS a été envoyé
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
@@ -172,11 +172,9 @@ class CustomField
    /**
     * Set active.
     *
-     * @param bool $active
-     *
     * @return CustomField
     */
-    public function setActive($active)
+    public function setActive(bool $active)
    {
        $this->active = $active;

@@ -224,18 +222,16 @@ class CustomField
    /**
     * Set order.
     *
-     * @param float $order
-     *
     * @return CustomField
     */
-    public function setOrdering($order)
+    public function setOrdering(?float $order)
    {
        $this->ordering = $order;

        return $this;
    }

-    public function setRequired($required)
+    public function setRequired(bool $required)
    {
        $this->required = $required;

@@ -245,7 +241,7 @@ class CustomField
    /**
     * @return $this
     */
-    public function setSlug($slug)
+    public function setSlug(?string $slug)
    {
        $this->slug = $slug;

@@ -255,11 +251,9 @@ class CustomField
    /**
     * Set type.
     *
-     * @param string $type
-     *
     * @return CustomField
     */
-    public function setType($type)
+    public function setType(?string $type)
    {
        $this->type = $type;

--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
@@ -129,7 +129,7 @@ class Option
    /**
     * @return $this
     */
-    public function setActive($active)
+    public function setActive(bool $active)
    {
        $this->active = $active;

@@ -139,7 +139,7 @@ class Option
    /**
     * @return $this
     */
-    public function setInternalKey($internal_key)
+    public function setInternalKey(string $internal_key)
    {
        $this->internalKey = $internal_key;

@@ -149,7 +149,7 @@ class Option
    /**
     * @return $this
     */
-    public function setKey($key)
+    public function setKey(?string $key)
    {
        $this->key = $key;

--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
@@ -69,7 +69,7 @@ class CustomFieldsDefaultGroup
     *
     * @return CustomFieldsDefaultGroup
     */
-    public function setCustomFieldsGroup($customFieldsGroup)
+    public function setCustomFieldsGroup(?CustomFieldsGroup $customFieldsGroup)
    {
        $this->customFieldsGroup = $customFieldsGroup;

@@ -79,11 +79,9 @@ class CustomFieldsDefaultGroup
    /**
     * Set entity.
     *
-     * @param string $entity
-     *
     * @return CustomFieldsDefaultGroup
     */
-    public function setEntity($entity)
+    public function setEntity(?string $entity)
    {
        $this->entity = $entity;

--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
@@ -165,11 +165,9 @@ class CustomFieldsGroup
    /**
     * Set entity.
     *
-     * @param string $entity
-     *
     * @return CustomFieldsGroup
     */
-    public function setEntity($entity)
+    public function setEntity(?string $entity)
    {
        $this->entity = $entity;

--- a/src/Bundle/ChillDocGeneratorBundle/Test/DocGenNormalizerTestAbstract.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Test/DocGenNormalizerTestAbstract.php
@@ -1,65 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\DocGeneratorBundle\Test;
-
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-
-/**
- * @template T of object
- */
-abstract class DocGenNormalizerTestAbstract extends KernelTestCase
-{
-    public function testNullValueHasSameKeysAsNull(): void
-    {
-        $normalizedObject = $this->getNormalizer()->normalize($this->provideNotNullObject(), 'docgen', [
-            AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => $this->provideDocGenExpectClass(),
-        ]);
-        $nullNormalizedObject = $this->getNormalizer()->normalize(null, 'docgen', [
-            AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => $this->provideDocGenExpectClass(),
-        ]);
-
-        self::assertEqualsCanonicalizing(array_keys($normalizedObject), array_keys($nullNormalizedObject));
-        self::assertArrayHasKey('isNull', $nullNormalizedObject, 'each object must have an "isNull" key');
-        self::assertTrue($nullNormalizedObject['isNull'], 'isNull key must be true for null objects');
-        self::assertFalse($normalizedObject['isNull'], 'isNull key must be false for null objects');
-
-        foreach ($normalizedObject as $key => $value) {
-            if (in_array($key, ['isNull', 'type'])) {
-                continue;
-            }
-
-            if (is_array($value)) {
-                if (array_is_list($value)) {
-                    self::assertEquals([], $nullNormalizedObject[$key], "list must be serialized as an empty array, in {$key}");
-                } else {
-                    self::assertEqualsCanonicalizing(array_keys($value), array_keys($nullNormalizedObject[$key]), "sub-object must have the same keys, in {$key}");
-                }
-            } elseif (is_string($value)) {
-                self::assertEquals('', $nullNormalizedObject[$key], 'strings must be ');
-            }
-        }
-    }
-
-    /**
-     * @return T
-     */
-    abstract public function provideNotNullObject(): object;
-
-    /**
-     * @return class-string<T>
-     */
-    abstract public function provideDocGenExpectClass(): string;
-
-    abstract public function getNormalizer(): NormalizerInterface;
-}
--- a/src/Bundle/ChillDocStoreBundle/Entity/Document.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
@@ -129,7 +129,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
        return $this;
    }

-    public function setUser($user): self
+    public function setUser(?\Chill\MainBundle\Entity\User $user): self
    {
        $this->user = $user;

--- a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
@@ -86,7 +86,7 @@ class DocumentCategory
        return $this;
    }

-    public function setDocumentClass($documentClass): self
+    public function setDocumentClass(?string $documentClass): self
    {
        $this->documentClass = $documentClass;

--- a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
@@ -55,14 +55,14 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
        return $this->scope;
    }

-    public function setPerson($person): self
+    public function setPerson(Person $person): self
    {
        $this->person = $person;

        return $this;
    }

-    public function setScope($scope): self
+    public function setScope(?Scope $scope): self
    {
        $this->scope = $scope;

--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -313,19 +313,4 @@ class StoredObject implements Document, TrackCreationInterface

        return $this;
    }
-
-    public function saveHistory(): void
-    {
-        if ('' === $this->getFilename()) {
-            return;
-        }
-
-        $this->datas['history'][] = [
-            'filename' => $this->getFilename(),
-            'iv' => $this->getIv(),
-            'key_infos' => $this->getKeyInfos(),
-            'type' => $this->getType(),
-            'before' => (new \DateTimeImmutable('now'))->getTimestamp(),
-        ];
-    }
 }
--- a/src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php
@@ -57,8 +57,8 @@ class StoredObjectDataMapper implements DataMapperInterface

        /** @var StoredObject $viewData */
        if ($viewData->getFilename() !== $forms['stored_object']->getData()['filename']) {
-            // we want to keep the previous history
-            $viewData->saveHistory();
+            // we do not want to erase the previous object
+            $viewData = new StoredObject();
        }

        $viewData->setFilename($forms['stored_object']->getData()['filename']);
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
@@ -4,13 +4,13 @@
      Actions
    </button>
    <ul class="dropdown-menu">
-      <li v-if="props.canEdit && is_extension_editable(props.storedObject.type) && props.storedObject.status !== 'stored_object_created'">
+      <li v-if="props.canEdit && is_extension_editable(props.storedObject.type)">
        <wopi-edit-button :stored-object="props.storedObject" :classes="{'dropdown-item': true}" :execute-before-leave="props.executeBeforeLeave"></wopi-edit-button>
      </li>
      <li v-if="props.canEdit && is_extension_editable(props.storedObject.type) && props.davLink !== undefined && props.davLinkExpiration !== undefined">
        <desktop-edit-button :classes="{'dropdown-item': true}" :edit-link="props.davLink" :expiration-link="props.davLinkExpiration"></desktop-edit-button>
      </li>
-      <li v-if="props.storedObject.type != 'application/pdf' && is_extension_viewable(props.storedObject.type) && props.canConvertPdf && props.storedObject.status !== 'stored_object_created'">
+      <li v-if="props.storedObject.type != 'application/pdf' && is_extension_viewable(props.storedObject.type) && props.canConvertPdf">
        <convert-button :stored-object="props.storedObject" :filename="filename" :classes="{'dropdown-item': true}"></convert-button>
      </li>
      <li v-if="props.canDownload">
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
@@ -13,7 +13,7 @@ import {reactive} from "vue";
 import {StoredObject, StoredObjectCreated} from "../../types";

 interface ConvertButtonConfig {
-  storedObject: StoredObject,
+  storedObject: StoredObject|StoredObjectCreated,
  classes: { [key: string]: boolean},
  filename?: string,
 };
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
@@ -11,7 +11,7 @@ import {build_wopi_editor_link} from "./helpers";
 import {StoredObject, StoredObjectCreated, WopiEditButtonExecutableBeforeLeaveFunction} from "../../types";

 interface WopiEditButtonConfig {
-  storedObject: StoredObject,
+  storedObject: StoredObject|StoredObjectCreated,
  returnPath?: string,
  classes: {[k: string] : boolean},
  executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction,
--- a/src/Bundle/ChillDocStoreBundle/Tests/Entity/StoredObjectTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Entity/StoredObjectTest.php
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\DocStoreBundle\Tests\Entity;
-
-use Chill\DocStoreBundle\Entity\StoredObject;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class StoredObjectTest extends KernelTestCase
-{
-    public function testSaveHistory(): void
-    {
-        $storedObject = new StoredObject();
-        $storedObject
-            ->setFilename('test_0')
-            ->setIv([2, 4, 6, 8])
-            ->setKeyInfos(['key' => ['data0' => 'data0']])
-            ->setType('text/html');
-
-        $storedObject->saveHistory();
-
-        $storedObject
-            ->setFilename('test_1')
-            ->setIv([8, 10, 12])
-            ->setKeyInfos(['key' => ['data1' => 'data1']])
-            ->setType('text/text');
-
-        $storedObject->saveHistory();
-
-        self::assertEquals('test_0', $storedObject->getDatas()['history'][0]['filename']);
-        self::assertEquals([2, 4, 6, 8], $storedObject->getDatas()['history'][0]['iv']);
-        self::assertEquals(['key' => ['data0' => 'data0']], $storedObject->getDatas()['history'][0]['key_infos']);
-        self::assertEquals('text/html', $storedObject->getDatas()['history'][0]['type']);
-
-        self::assertEquals('test_1', $storedObject->getDatas()['history'][1]['filename']);
-        self::assertEquals([8, 10, 12], $storedObject->getDatas()['history'][1]['iv']);
-        self::assertEquals(['key' => ['data1' => 'data1']], $storedObject->getDatas()['history'][1]['key_infos']);
-        self::assertEquals('text/text', $storedObject->getDatas()['history'][1]['type']);
-    }
-}
--- a/src/Bundle/ChillDocStoreBundle/Tests/Form/StoredObjectTypeTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Form/StoredObjectTypeTest.php
@@ -56,14 +56,14 @@ class StoredObjectTypeTest extends TypeTestCase
            {"filename":"abcdef","iv":[10, 15, 20, 30],"keyInfos":[],"type":"text/html","status":"object_store_created"}
            JSON];
        $model = new StoredObject();
-        $originalObjectId = spl_object_hash($model);
+        $originalObjectId = spl_object_id($model);
        $form = $this->factory->create(StoredObjectType::class, $model, ['has_title' => true]);

        $form->submit($formData);

        $this->assertTrue($form->isSynchronized());
        $model = $form->getData();
-        $this->assertEquals($originalObjectId, spl_object_hash($model));
+        $this->assertNotEquals($originalObjectId, spl_object_hash($model));
        $this->assertEquals('abcdef', $model->getFilename());
        $this->assertEquals([10, 15, 20, 30], $model->getIv());
        $this->assertEquals('text/html', $model->getType());
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -15,7 +15,7 @@ use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
 use Chill\EventBundle\Form\EventType;
 use Chill\EventBundle\Form\Type\PickEventType;
-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -15,7 +15,7 @@ use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
 use Chill\EventBundle\Form\ParticipationType;
 use Chill\EventBundle\Repository\EventRepository;
-use Chill\EventBundle\Security\ParticipationVoter;
+use Chill\EventBundle\Security\Authorization\ParticipationVoter;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\Common\Collections\Collection;
--- a/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
+++ b/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
@@ -11,8 +11,8 @@ declare(strict_types=1);

 namespace Chill\EventBundle\DependencyInjection;

-use Chill\EventBundle\Security\EventVoter;
-use Chill\EventBundle\Security\ParticipationVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
+use Chill\EventBundle\Security\Authorization\ParticipationVoter;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -33,13 +33,12 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface

        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
        $loader->load('services.yaml');
-        $loader->load('services/security.yaml');
+        $loader->load('services/authorization.yaml');
        $loader->load('services/fixtures.yaml');
        $loader->load('services/forms.yaml');
        $loader->load('services/repositories.yaml');
        $loader->load('services/search.yaml');
        $loader->load('services/timeline.yaml');
-        $loader->load('services/export.yaml');
    }

    /** (non-PHPdoc).
--- a/src/Bundle/ChillEventBundle/Entity/Event.php
+++ b/src/Bundle/ChillEventBundle/Entity/Event.php
@@ -47,7 +47,7 @@ class Event implements HasCenterInterface, HasScopeInterface, TrackCreationInter
    private ?Scope $circle = null;

    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_MUTABLE)]
-    private ?\DateTime $date;
+    private ?\DateTime $date = null;

    #[ORM\Id]
    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
@@ -265,11 +265,9 @@ class Event implements HasCenterInterface, HasScopeInterface, TrackCreationInter
    /**
     * Set label.
     *
-     * @param string $label
-     *
     * @return Event
     */
-    public function setName($label)
+    public function setName(?string $label)
    {
        $this->name = $label;

--- a/src/Bundle/ChillEventBundle/Entity/EventType.php
+++ b/src/Bundle/ChillEventBundle/Entity/EventType.php
@@ -146,11 +146,9 @@ class EventType
    /**
     * Set active.
     *
-     * @param bool $active
-     *
     * @return EventType
     */
-    public function setActive($active)
+    public function setActive(bool $active)
    {
        $this->active = $active;

--- a/src/Bundle/ChillEventBundle/Entity/Role.php
+++ b/src/Bundle/ChillEventBundle/Entity/Role.php
@@ -81,11 +81,9 @@ class Role
    /**
     * Set active.
     *
-     * @param bool $active
-     *
     * @return Role
     */
-    public function setActive($active)
+    public function setActive(bool $active)
    {
        $this->active = $active;

--- a/src/Bundle/ChillEventBundle/Entity/Status.php
+++ b/src/Bundle/ChillEventBundle/Entity/Status.php
@@ -81,11 +81,9 @@ class Status
    /**
     * Set active.
     *
-     * @param bool $active
-     *
     * @return Status
     */
-    public function setActive($active)
+    public function setActive(bool $active)
    {
        $this->active = $active;

--- a/src/Bundle/ChillEventBundle/Export/Aggregator/EventDateAggregator.php
+++ b/src/Bundle/ChillEventBundle/Export/Aggregator/EventDateAggregator.php
@@ -1,110 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Aggregator;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class EventDateAggregator implements AggregatorInterface
-{
-    private const CHOICES = [
-        'by month' => 'month',
-        'by week' => 'week',
-        'by year' => 'year',
-    ];
-
-    private const DEFAULT_CHOICE = 'year';
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $order = null;
-
-        switch ($data['frequency']) {
-            case 'month':
-                $fmt = 'YYYY-MM';
-
-                break;
-
-            case 'week':
-                $fmt = 'YYYY-IW';
-
-                break;
-
-            case 'year':
-                $fmt = 'YYYY';
-                $order = 'DESC';
-
-                break;
-
-            default:
-                throw new \RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
-        }
-
-        $qb->addSelect(sprintf("TO_CHAR(event.date, '%s') AS date_aggregator", $fmt));
-        $qb->addGroupBy('date_aggregator');
-        $qb->addOrderBy('date_aggregator', $order);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('frequency', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-        ]);
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return ['frequency' => self::DEFAULT_CHOICE];
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return static function ($value) use ($data): string {
-            if ('_header' === $value) {
-                return 'by '.$data['frequency'];
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            return match ($data['frequency']) {
-                default => $value,
-            };
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['date_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group event by date';
-    }
-}
--- a/src/Bundle/ChillEventBundle/Export/Aggregator/EventTypeAggregator.php
+++ b/src/Bundle/ChillEventBundle/Export/Aggregator/EventTypeAggregator.php
@@ -1,81 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Aggregator;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\EventTypeRepository;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class EventTypeAggregator implements AggregatorInterface
-{
-    final public const KEY = 'event_type_aggregator';
-
-    public function __construct(protected EventTypeRepository $eventTypeRepository, protected TranslatableStringHelperInterface $translatableStringHelper) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!\in_array('eventtype', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('event.type', 'eventtype');
-        }
-
-        $qb->addSelect(sprintf('IDENTITY(event.type) AS %s', self::KEY));
-        $qb->addGroupBy(self::KEY);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form required for this aggregator
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getLabels($key, array $values, $data): \Closure
-    {
-        return function (int|string|null $value): string {
-            if ('_header' === $value) {
-                return 'Event type';
-            }
-
-            if (null === $value || '' === $value || null === $t = $this->eventTypeRepository->find($value)) {
-                return '';
-            }
-
-            return $this->translatableStringHelper->localize($t->getName());
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return [self::KEY];
-    }
-
-    public function getTitle()
-    {
-        return 'Group by event type';
-    }
-}
--- a/src/Bundle/ChillEventBundle/Export/Aggregator/RoleAggregator.php
+++ b/src/Bundle/ChillEventBundle/Export/Aggregator/RoleAggregator.php
@@ -1,81 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Aggregator;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\RoleRepository;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class RoleAggregator implements AggregatorInterface
-{
-    final public const KEY = 'part_role_aggregator';
-
-    public function __construct(protected RoleRepository $roleRepository, protected TranslatableStringHelperInterface $translatableStringHelper) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!\in_array('event_part', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('event_part.role', 'role');
-        }
-
-        $qb->addSelect(sprintf('IDENTITY(event_part.role) AS %s', self::KEY));
-        $qb->addGroupBy(self::KEY);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT_PARTICIPANTS;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form required for this aggregator
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getLabels($key, array $values, $data): \Closure
-    {
-        return function (int|string|null $value): string {
-            if ('_header' === $value) {
-                return 'Participant role';
-            }
-
-            if (null === $value || '' === $value || null === $r = $this->roleRepository->find($value)) {
-                return '';
-            }
-
-            return $this->translatableStringHelper->localize($r->getName());
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return [self::KEY];
-    }
-
-    public function getTitle()
-    {
-        return 'Group by participant role';
-    }
-}
--- a/src/Bundle/ChillEventBundle/Export/Declarations.php
+++ b/src/Bundle/ChillEventBundle/Export/Declarations.php
@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export;
-
-/**
- * This class declare constants used for the export framework.
- */
-abstract class Declarations
-{
-    final public const EVENT = 'event';
-
-    final public const EVENT_PARTICIPANTS = 'event_participants';
-}
--- a/src/Bundle/ChillEventBundle/Export/Export/CountEventParticipations.php
+++ b/src/Bundle/ChillEventBundle/Export/Export/CountEventParticipations.php
@@ -1,125 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Export;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\ParticipationRepository;
-use Chill\EventBundle\Security\ParticipationVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
-use Doctrine\ORM\Query;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-
-readonly class CountEventParticipations implements ExportInterface, GroupedExportInterface
-{
-    private bool $filterStatsByCenters;
-
-    public function __construct(
-        private ParticipationRepository $participationRepository,
-        ParameterBagInterface $parameterBag,
-    ) {
-        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder) {}
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription()
-    {
-        return 'Count participants to an event by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of events';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_count_event_participants' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Count event participants' : $value;
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['export_count_event_participants'];
-    }
-
-    public function getResult($query, $data)
-    {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle()
-    {
-        return 'Count event participants';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::EVENT_PARTICIPANTS;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $centers = array_map(static fn ($el) => $el['center'], $acl);
-
-        $qb = $this->participationRepository
-            ->createQueryBuilder('event_part')
-            ->join('event_part.person', 'person');
-
-        $qb->select('COUNT(event_part.id) as export_count_event_participants');
-
-        if ($this->filterStatsByCenters) {
-            $qb
-                ->andWhere(
-                    $qb->expr()->exists(
-                        'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
-                    AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                    )
-                )
-                ->setParameter('authorized_centers', $centers);
-        }
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return ParticipationVoter::STATS;
-    }
-
-    public function supportsModifiers()
-    {
-        return [
-            Declarations::EVENT_PARTICIPANTS,
-            PersonDeclarations::PERSON_TYPE,
-        ];
-    }
-}
--- a/src/Bundle/ChillEventBundle/Export/Export/CountEvents.php
+++ b/src/Bundle/ChillEventBundle/Export/Export/CountEvents.php
@@ -1,126 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Export;
-
-use Chill\EventBundle\Repository\EventRepository;
-use Chill\EventBundle\Security\EventVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
-use Doctrine\ORM\Query;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\EventBundle\Export\Declarations;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-
-readonly class CountEvents implements ExportInterface, GroupedExportInterface
-{
-    private bool $filterStatsByCenters;
-
-    public function __construct(
-        private EventRepository $eventRepository,
-        ParameterBagInterface $parameterBag,
-    ) {
-        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder) {}
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription()
-    {
-        return 'Count events by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of events';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_count_event' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Number of events' : $value;
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['export_count_event'];
-    }
-
-    public function getResult($query, $data)
-    {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle()
-    {
-        return 'Count events';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $centers = array_map(static fn ($el) => $el['center'], $acl);
-
-        $qb = $this->eventRepository
-            ->createQueryBuilder('event')
-            ->leftJoin('event.participations', 'epart')
-            ->leftJoin('epart.person', 'person');
-
-        $qb->select('COUNT(event.id) as export_count_event');
-
-        if ($this->filterStatsByCenters) {
-            $qb
-                ->andWhere(
-                    $qb->expr()->exists(
-                        'SELECT 1 FROM '.PersonCenterHistory::class.' acl_count_person_history WHERE acl_count_person_history.person = person
-                    AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                    )
-                )
-                ->setParameter('authorized_centers', $centers);
-        }
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return EventVoter::STATS;
-    }
-
-    public function supportsModifiers()
-    {
-        return [
-            Declarations::EVENT,
-            PersonDeclarations::PERSON_TYPE,
-        ];
-    }
-}
--- a/src/Bundle/ChillEventBundle/Export/Filter/EventDateFilter.php
+++ b/src/Bundle/ChillEventBundle/Export/Filter/EventDateFilter.php
@@ -1,95 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Filter;
-
-use Chill\EventBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class EventDateFilter implements FilterInterface
-{
-    public function __construct(protected TranslatorInterface $translator, private readonly RollingDateConverterInterface $rollingDateConverter) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->between(
-            'event.date',
-            ':date_from',
-            ':date_to'
-        );
-
-        if ($where instanceof Expr\Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter(
-            'date_from',
-            $this->rollingDateConverter->convert($data['date_from'])
-        );
-        $qb->setParameter(
-            'date_to',
-            $this->rollingDateConverter->convert($data['date_to'])
-        );
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('date_from', PickRollingDateType::class, [
-                'label' => 'Events after this date',
-            ])
-            ->add('date_to', PickRollingDateType::class, [
-                'label' => 'Events before this date',
-            ]);
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        return [
-            'Filtered by date of event: only between %date_from% and %date_to%',
-            [
-                '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
-                '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
-            ],
-        ];
-    }
-
-    public function getTitle()
-    {
-        return 'Filtered by event date';
-    }
-}
--- a/src/Bundle/ChillEventBundle/Export/Filter/EventTypeFilter.php
+++ b/src/Bundle/ChillEventBundle/Export/Filter/EventTypeFilter.php
@@ -1,94 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Filter;
-
-use Chill\EventBundle\Entity\EventType;
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\EventTypeRepository;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-
-class EventTypeFilter implements ExportElementValidatedInterface, FilterInterface
-{
-    public function __construct(
-        protected TranslatableStringHelperInterface $translatableStringHelper,
-        protected EventTypeRepository $eventTypeRepository
-    ) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $clause = $qb->expr()->in('event.type', ':selected_event_types');
-
-        $qb->andWhere($clause);
-        $qb->setParameter('selected_event_types', $data['types']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('types', EntityType::class, [
-            'choices' => $this->eventTypeRepository->findAllActive(),
-            'class' => EventType::class,
-            'choice_label' => fn (EventType $ety) => $this->translatableStringHelper->localize($ety->getName()),
-            'multiple' => true,
-            'expanded' => false,
-            'attr' => [
-                'class' => 'select2',
-            ],
-        ]);
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        $typeNames = array_map(
-            fn (EventType $t): string => $this->translatableStringHelper->localize($t->getName()),
-            $this->eventTypeRepository->findBy(['id' => $data['types'] instanceof \Doctrine\Common\Collections\Collection ? $data['types']->toArray() : $data['types']])
-        );
-
-        return ['Filtered by event type: only %list%', [
-            '%list%' => implode(', ', $typeNames),
-        ]];
-    }
-
-    public function getTitle()
-    {
-        return 'Filtered by event type';
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['types'] || 0 === \count($data['types'])) {
-            $context
-                ->buildViolation('At least one type must be chosen')
-                ->addViolation();
-        }
-    }
-}
--- a/src/Bundle/ChillEventBundle/Export/Filter/RoleFilter.php
+++ b/src/Bundle/ChillEventBundle/Export/Filter/RoleFilter.php
@@ -1,94 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Export\Filter;
-
-use Chill\EventBundle\Entity\Role;
-use Chill\EventBundle\Export\Declarations;
-use Chill\EventBundle\Repository\RoleRepository;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-
-class RoleFilter implements ExportElementValidatedInterface, FilterInterface
-{
-    public function __construct(
-        protected TranslatableStringHelperInterface $translatableStringHelper,
-        protected RoleRepository $roleRepository
-    ) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $clause = $qb->expr()->in('event_part.role', ':selected_part_roles');
-
-        $qb->andWhere($clause);
-        $qb->setParameter('selected_part_roles', $data['part_roles']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::EVENT_PARTICIPANTS;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('part_roles', EntityType::class, [
-            'choices' => $this->roleRepository->findAllActive(),
-            'class' => Role::class,
-            'choice_label' => fn (Role $r) => $this->translatableStringHelper->localize($r->getName()),
-            'multiple' => true,
-            'expanded' => false,
-            'attr' => [
-                'class' => 'select2',
-            ],
-        ]);
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        $roleNames = array_map(
-            fn (Role $r): string => $this->translatableStringHelper->localize($r->getName()),
-            $this->roleRepository->findBy(['id' => $data['part_roles'] instanceof \Doctrine\Common\Collections\Collection ? $data['part_roles']->toArray() : $data['part_roles']])
-        );
-
-        return ['Filtered by participant roles: only %list%', [
-            '%list%' => implode(', ', $roleNames),
-        ]];
-    }
-
-    public function getTitle()
-    {
-        return 'Filter by participant roles';
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['part_roles'] || 0 === \count($data['part_roles'])) {
-            $context
-                ->buildViolation('At least one role must be chosen')
-                ->addViolation();
-        }
-    }
-}
--- a/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
@@ -11,7 +11,7 @@ declare(strict_types=1);

 namespace Chill\EventBundle\Menu;

-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
--- a/src/Bundle/ChillEventBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillEventBundle/Menu/SectionMenuBuilder.php
@@ -11,7 +11,7 @@ declare(strict_types=1);

 namespace Chill\EventBundle\Menu;

-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
--- a/src/Bundle/ChillEventBundle/Repository/EventACLAwareRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/EventACLAwareRepository.php
@@ -13,7 +13,7 @@ namespace Chill\EventBundle\Repository;

 use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
 use Chill\PersonBundle\Entity\Person;
--- a/src/Bundle/ChillEventBundle/Repository/RoleRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/RoleRepository.php
@@ -12,57 +12,13 @@ declare(strict_types=1);
 namespace Chill\EventBundle\Repository;

 use Chill\EventBundle\Entity\Role;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\Persistence\ObjectRepository;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;

-readonly class RoleRepository implements ObjectRepository
+class RoleRepository extends ServiceEntityRepository
 {
-    private EntityRepository $repository;
-
-    public function __construct(EntityManagerInterface $entityManager, private TranslatableStringHelper $translatableStringHelper)
+    public function __construct(ManagerRegistry $registry)
    {
-        $this->repository = $entityManager->getRepository(Role::class);
-    }
-
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
-    {
-        return $this->repository->createQueryBuilder($alias, $indexBy);
-    }
-
-    public function find($id)
-    {
-        return $this->repository->find($id);
-    }
-
-    public function findAll(): array
-    {
-        return $this->repository->findAll();
-    }
-
-    public function findAllActive(): array
-    {
-        $roles = $this->repository->findBy(['active' => true]);
-
-        usort($roles, fn (Role $a, Role $b) => $this->translatableStringHelper->localize($a->getName()) <=> $this->translatableStringHelper->localize($b->getName()));
-
-        return $roles;
-    }
-
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
-    public function findOneBy(array $criteria)
-    {
-        return $this->repository->findOneBy($criteria);
-    }
-
-    public function getClassName(): string
-    {
-        return Role::class;
+        parent::__construct($registry, Role::class);
    }
 }
--- a/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
@@ -9,19 +9,18 @@ declare(strict_types=1);
 * the LICENSE file that was distributed with this source code.
 */

-namespace Chill\EventBundle\Security;
+namespace Chill\EventBundle\Security\Authorization;

 use Chill\EventBundle\Entity\Event;
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
-use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;

 /**
 * Description of EventVoter.
@@ -43,46 +42,61 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter

    final public const UPDATE = 'CHILL_EVENT_UPDATE';

-    final public const STATS = 'CHILL_EVENT_STATS';
+    /**
+     * @var AccessDecisionManagerInterface
+     */
+    protected $accessDecisionManager;

-    private readonly VoterHelperInterface $voterHelper;
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;

    public function __construct(
-        private readonly AuthorizationHelper $authorizationHelper,
-        private readonly LoggerInterface $logger,
-        VoterHelperFactoryInterface $voterHelperFactory
+        AccessDecisionManagerInterface $accessDecisionManager,
+        AuthorizationHelper $authorizationHelper,
+        LoggerInterface $logger
    ) {
-        $this->voterHelper = $voterHelperFactory
-            ->generate(self::class)
-            ->addCheckFor(null, [self::SEE])
-            ->addCheckFor(Event::class, [...self::ROLES])
-            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
-            ->addCheckFor(Center::class, [self::STATS])
-            ->build();
+        $this->accessDecisionManager = $accessDecisionManager;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->logger = $logger;
    }

    public function getRoles(): array
    {
-        return [...self::ROLES, self::STATS];
+        return self::ROLES;
    }

    public function getRolesWithHierarchy(): array
    {
        return [
-            'Event' => $this->getRoles(),
+            'Event' => self::ROLES,
        ];
    }

    public function getRolesWithoutScope(): array
    {
-        return [self::ROLES, self::STATS];
+        return [];
    }

    public function supports($attribute, $subject)
    {
-        return $this->voterHelper->supports($attribute, $subject);
+        return ($subject instanceof Event && \in_array($attribute, self::ROLES, true))
+            || ($subject instanceof Person && \in_array($attribute, [self::CREATE, self::SEE], true))
+            || (null === $subject && self::SEE === $attribute);
    }

+    /**
+     * @param string $attribute
+     * @param Event  $subject
+     *
+     * @return bool
+     */
    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
    {
        $this->logger->debug(sprintf('Voting from %s class', self::class));
@@ -104,5 +118,15 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter
            ->getReachableCenters($token->getUser(), $attribute);

        return \count($centers) > 0;
+
+        if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
+            return false;
+        }
+
+        return $this->authorizationHelper->userHasAccess(
+            $token->getUser(),
+            $subject,
+            $attribute
+        );
    }
 }
--- a/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
@@ -9,19 +9,18 @@ declare(strict_types=1);
 * the LICENSE file that was distributed with this source code.
 */

-namespace Chill\EventBundle\Security;
+namespace Chill\EventBundle\Security\Authorization;

 use Chill\EventBundle\Entity\Participation;
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
-use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;

 class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
@@ -40,48 +39,58 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar

    final public const UPDATE = 'CHILL_EVENT_PARTICIPATION_UPDATE';

-    final public const STATS = 'CHILL_EVENT_PARTICIPATION_STATS';
+    /**
+     * @var AccessDecisionManagerInterface
+     */
+    protected $accessDecisionManager;

-    private readonly VoterHelperInterface $voterHelper;
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;

    public function __construct(
-        private readonly AuthorizationHelper $authorizationHelper,
-        private readonly LoggerInterface $logger,
-        VoterHelperFactoryInterface $voterHelperFactory
+        AccessDecisionManagerInterface $accessDecisionManager,
+        AuthorizationHelper $authorizationHelper,
+        LoggerInterface $logger
    ) {
-        $this->voterHelper = $voterHelperFactory
-            ->generate(self::class)
-            ->addCheckFor(null, [self::SEE])
-            ->addCheckFor(Participation::class, [...self::ROLES])
-            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
-            ->addCheckFor(Center::class, [self::STATS])
-            ->build();
+        $this->accessDecisionManager = $accessDecisionManager;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->logger = $logger;
    }

    public function getRoles(): array
    {
-        return [...self::ROLES, self::STATS];
+        return self::ROLES;
    }

    public function getRolesWithHierarchy(): array
    {
        return [
-            'Participation' => $this->getRoles(),
+            'Event' => self::ROLES,
        ];
    }

    public function getRolesWithoutScope(): array
    {
-        return [self::ROLES, self::STATS];
+        return [];
    }

    public function supports($attribute, $subject)
    {
-        return $this->voterHelper->supports($attribute, $subject);
+        return ($subject instanceof Participation && \in_array($attribute, self::ROLES, true))
+            || ($subject instanceof Person && \in_array($attribute, [self::CREATE, self::SEE], true))
+            || (null === $subject && self::SEE === $attribute);
    }

    /**
-     * @param string $attribute
+     * @param string        $attribute
+     * @param Participation $subject
     *
     * @return bool
     */
@@ -106,5 +115,15 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
            ->getReachableCenters($token->getUser(), $attribute);

        return \count($centers) > 0;
+
+        if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
+            return false;
+        }
+
+        return $this->authorizationHelper->userHasAccess(
+            $token->getUser(),
+            $subject,
+            $attribute
+        );
    }
 }
--- a/src/Bundle/ChillEventBundle/Tests/Export/CountEventParticipationsTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Export/CountEventParticipationsTest.php
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Tests\Export;
-
-use Chill\EventBundle\Export\Export\CountEventParticipations;
-use Doctrine\ORM\AbstractQuery;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class CountEventParticipationsTest extends KernelTestCase
-{
-    private CountEventParticipations $countEventParticipations;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        self::bootKernel();
-        $this->countEventParticipations = self::getContainer()->get(CountEventParticipations::class);
-    }
-
-    public function testExecuteQuery(): void
-    {
-        $qb = $this->countEventParticipations->initiateQuery([], [], [])
-            ->setMaxResults(1);
-
-        $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
-
-        self::assertIsArray($results, 'smoke test: test that the result is an array');
-    }
-}
--- a/src/Bundle/ChillEventBundle/Tests/Export/CountEventTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Export/CountEventTest.php
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\EventBundle\Tests\Export;
-
-use Chill\EventBundle\Export\Export\CountEvents;
-use Doctrine\ORM\AbstractQuery;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class CountEventTest extends KernelTestCase
-{
-    private CountEvents $countEvents;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        self::bootKernel();
-        $this->countEvents = self::getContainer()->get(CountEvents::class);
-    }
-
-    public function testExecuteQuery(): void
-    {
-        $qb = $this->countEvents->initiateQuery([], [], [])
-            ->setMaxResults(1);
-
-        $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
-
-        self::assertIsArray($results, 'smoke test: test that the result is an array');
-    }
-}
--- a/src/Bundle/ChillEventBundle/Tests/Export/aggregators/EventDateAggregatorTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Export/aggregators/EventDateAggregatorTest.php
@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\aggregators;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Export\Aggregator\EventDateAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class EventDateAggregatorTest extends AbstractAggregatorTest
-{
-    private $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::getContainer()->get(EventDateAggregator::class);
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array|\Generator
-    {
-        yield ['frequency' => 'YYYY'];
-        yield ['frequency' => 'YYYY-MM'];
-        yield ['frequency' => 'YYYY-IV'];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-        ];
-    }
-}
--- a/src/Bundle/ChillEventBundle/Tests/Export/aggregators/EventTypeAggregatorTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Export/aggregators/EventTypeAggregatorTest.php
@@ -1,59 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\aggregators;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Export\Aggregator\EventTypeAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class EventTypeAggregatorTest extends AbstractAggregatorTest
-{
-    private $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::getContainer()->get(EventTypeAggregator::class);
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-        ];
-    }
-}
--- a/src/Bundle/ChillEventBundle/Tests/Export/aggregators/RoleAggregatorTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Export/aggregators/RoleAggregatorTest.php
@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\aggregators;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Entity\Participation;
-use Chill\EventBundle\Export\Aggregator\RoleAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class RoleAggregatorTest extends AbstractAggregatorTest
-{
-    private $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::getContainer()->get(RoleAggregator::class);
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-            $em->createQueryBuilder()
-                ->select('event_part')
-                ->from(Participation::class, 'event_part'),
-        ];
-    }
-}
--- a/src/Bundle/ChillEventBundle/Tests/Export/filters/EventDateFilterTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Export/filters/EventDateFilterTest.php
@@ -1,65 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\filters;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Export\Filter\EventDateFilter;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class EventDateFilterTest extends AbstractFilterTest
-{
-    private RollingDateConverterInterface $rollingDateConverter;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        self::bootKernel();
-
-        $this->rollingDateConverter = self::getContainer()->get(RollingDateConverterInterface::class);
-    }
-
-    public function getFilter()
-    {
-        return new EventDateFilter($this->rollingDateConverter);
-    }
-
-    public function getFormData()
-    {
-        return [
-            [
-                'date_from' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
-                'date_to' => new RollingDate(RollingDate::T_TODAY),
-            ],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-        ];
-    }
-}
--- a/src/Bundle/ChillEventBundle/Tests/Export/filters/EventTypeFilterTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Export/filters/EventTypeFilterTest.php
@@ -1,76 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\filters;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Entity\EventType;
-use Chill\EventBundle\Export\Filter\EventTypeFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class EventTypeFilterTest extends AbstractFilterTest
-{
-    private EventTypeFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-        $this->filter = self::getContainer()->get(EventTypeFilter::class);
-    }
-
-    public function getFilter(): EventTypeFilter|\Chill\MainBundle\Export\FilterInterface
-    {
-        return $this->filter;
-    }
-
-    public function getFormData()
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(EventType::class, 'et')
-            ->select('et')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'types' => new ArrayCollection([$a]),
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders()
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-        ];
-    }
-}
--- a/src/Bundle/ChillEventBundle/Tests/Export/filters/RoleFilterTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Export/filters/RoleFilterTest.php
@@ -1,81 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Export\filters;
-
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Entity\Participation;
-use Chill\EventBundle\Entity\Role;
-use Chill\EventBundle\Export\Filter\RoleFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class RoleFilterTest extends AbstractFilterTest
-{
-    private RoleFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->filter = self::getContainer()->get(RoleFilter::class);
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        self::bootKernel();
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(Role::class, 'r')
-            ->select('r')
-            ->getQuery()
-            ->setMaxResults(1)
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'roles' => new ArrayCollection([$a]),
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders()
-    {
-        self::bootKernel();
-
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('event.id')
-                ->from(Event::class, 'event'),
-            $em->createQueryBuilder()
-                ->select('event_part')
-                ->from(Participation::class, 'event_part'),
-        ];
-    }
-}
--- a/src/Bundle/ChillEventBundle/Tests/Repository/EventACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Repository/EventACLAwareRepositoryTest.php
@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\EventBundle\Tests\Repository;

 use Chill\EventBundle\Repository\EventACLAwareRepository;
-use Chill\EventBundle\Security\EventVoter;
+use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
--- a/src/Bundle/ChillEventBundle/config/services/authorization.yaml
+++ b/src/Bundle/ChillEventBundle/config/services/authorization.yaml
@@ -0,0 +1,18 @@
+services:
+    chill_event.event_voter:
+        class: Chill\EventBundle\Security\Authorization\EventVoter
+        arguments:
+            - "@security.access.decision_manager"
+            - "@chill.main.security.authorization.helper"
+            - "@logger"
+        tags:
+            - { name: security.voter }
+
+    chill_event.event_participation:
+        class: Chill\EventBundle\Security\Authorization\ParticipationVoter
+        arguments:
+            - "@security.access.decision_manager"
+            - "@chill.main.security.authorization.helper"
+            - "@logger"
+        tags:
+            - { name: security.voter }
--- a/src/Bundle/ChillEventBundle/config/services/export.yaml
+++ b/src/Bundle/ChillEventBundle/config/services/export.yaml
@@ -1,41 +0,0 @@
-services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-
-    # indicators
-
-    Chill\EventBundle\Export\Export\CountEvents:
-        tags:
-            - { name: chill.export, alias: 'count_events' }
-    Chill\EventBundle\Export\Export\CountEventParticipations:
-        tags:
-            - { name: chill.export, alias: 'count_event_participants' }
-
-    # filters
-
-    Chill\EventBundle\Export\Filter\EventDateFilter:
-        tags:
-            - { name: chill.export_filter, alias: 'event_date_filter' }
-
-    Chill\EventBundle\Export\Filter\EventTypeFilter:
-        tags:
-            - { name: chill.export_filter, alias: 'event_type_filter' }
-
-    Chill\EventBundle\Export\Filter\RoleFilter:
-        tags:
-            - { name: chill.export_filter, alias: 'role_filter' }
-
-    # aggregators
-
-    Chill\EventBundle\Export\Aggregator\EventTypeAggregator:
-        tags:
-            - { name: chill.export_aggregator, alias: event_type_aggregator }
-
-    Chill\EventBundle\Export\Aggregator\EventDateAggregator:
-        tags:
-            - { name: chill.export_aggregator, alias: event_date_aggregator }
-
-    Chill\EventBundle\Export\Aggregator\RoleAggregator:
-        tags:
-            - { name: chill.export_aggregator, alias: role_aggregator }
--- a/src/Bundle/ChillEventBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
@@ -81,31 +81,9 @@ Pick an event: Choisir un événement
 Pick a type of event: Choisir un type d'événement
 Pick a moderator: Choisir un animateur

-# exports
 Select a format: Choisir un format
 Export: Exporter

-Count events: Nombre d'événements
-Count events by various parameters.: Compte le nombre d'événements selon divers critères
-Exports of events: Exports d'événements
-
-Filtered by event date: Filtrer par date d'événement
-'Filtered by date of event: only between %date_from% and %date_to%': "Filtré par date d'événement: uniquement entre le %date_from% et le %date_to%"
-Events after this date: Événements après cette date
-Events before this date: Événements avant cette date
-Filtered by event type: Filtrer par type d'événement
-'Filtered by event type: only %list%': "Filtré par type: uniquement %list%"
-Group event by date: Grouper par date d'événement
-Group by event type: Grouper par type d'événement
-
-Count event participants: Nombre de participations
-Count participants to an event by various parameters.: Compte le nombre de participations selon divers critères
-Exports of event participants: Exports de participations
-'Filtered by participant roles: only %list%': "Filtré par rôles de participation: uniquement %list%"
-Filter by participant roles: Filtrer par rôles de participation
-Part roles: Rôles de participation
-Group by participant role: Grouper par rôle de participation
-

 Events configuration: Configuration des événements
 Events configuration menu: Menu des événements
--- a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php
@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\FranceTravailApiBundle\ApiHelper;
+
+use Chill\MainBundle\Redis\ChillRedis;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+
+/**
+ * Wraps the pole emploi api.
+ */
+class ApiWrapper
+{
+    /**
+     * @var Client
+     */
+    private $client;
+
+    /**
+     * key for the bearer for the api pole emploi.
+     *
+     * This bearer is shared across users
+     */
+    public const UNPERSONAL_BEARER = 'api_pemploi_bear_';
+
+    public function __construct(private $clientId, private $clientSecret, private readonly ChillRedis $redis)
+    {
+        $this->client = new Client([
+            'base_uri' => 'https://entreprise.francetravail.fr/connexion/oauth2/access_token',
+        ]);
+    }
+
+    public function getPublicBearer($scopes): string
+    {
+        $cacheKey = $this->getCacheKey($scopes);
+
+        if ($this->redis->exists($cacheKey) > 0) {
+            $data = \unserialize($this->redis->get($cacheKey));
+
+            return $data->access_token;
+        }
+
+        try {
+            $response = $this->client->post('', [
+                'query' => ['realm' => '/partenaire'],
+                'headers' => [
+                    'Content-Type' => 'application/x-www-form-urlencoded',
+                ],
+                'form_params' => [
+                    'grant_type' => 'client_credentials',
+                    'client_id' => $this->clientId,
+                    'client_secret' => $this->clientSecret,
+                    'scope' => \implode(' ', \array_merge($scopes, ['application_'.$this->clientId])),
+                ],
+            ]);
+        } catch (ClientException $e) {
+            dump($e->getResponse());
+        }
+        $data = \json_decode((string) $response->getBody());
+
+        // set the key with an expiry time
+        $this->redis->setex(
+            $cacheKey,
+            $data->expires_in - 2,
+            \serialize($data)
+        );
+
+        return $data->access_token;
+    }
+
+    protected function getCacheKey($scopes)
+    {
+        return self::UNPERSONAL_BEARER.implode('', $scopes);
+    }
+}
--- a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
@@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\FranceTravailApiBundle\ApiHelper;
+
+use GuzzleHttp\Client;
+use Psr\Log\LoggerInterface;
+use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
+
+/**
+ * Queries for ROME partenaires api.
+ */
+class PartenaireRomeAppellation
+{
+    use ProcessRequestTrait;
+    /**
+     * @var ApiWrapper
+     */
+    protected $wrapper;
+
+    /**
+     * @var Client
+     */
+    protected $client;
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    private const BASE = 'https://api.pole-emploi.io/partenaire/rome-metiers/v1/metiers/';
+
+    public function __construct(
+        ApiWrapper $wrapper,
+        LoggerInterface $logger,
+        private \Symfony\Contracts\HttpClient\HttpClientInterface $httpClient,
+    ) {
+        $this->wrapper = $wrapper;
+        $this->logger = $logger;
+        $this->client = new Client([
+            'base_uri' => 'https://api.pole-emploi.io/partenaire/rome-metiers/v1/metiers/',
+        ]);
+    }
+
+    private function getBearer()
+    {
+        return $this->wrapper->getPublicBearer([
+            'api_rome-metiersv1',
+            'nomenclatureRome',
+        ]);
+    }
+
+    public function getListeAppellation(string $search): array
+    {
+        $bearer = $this->getBearer();
+
+        try {
+            $response = $this->httpClient->request(
+                'GET',
+                self::BASE.'appellation/requete',
+                [
+                    'headers' => [
+                        'Authorization' => 'Bearer '.$bearer,
+                        'Accept' => 'application/json',
+                    ],
+                    'query' => [
+                        'q' => $search,
+                    ],
+                ]
+            );
+
+            return $response->toArray()['resultats'];
+        } catch (HttpExceptionInterface $exception) {
+            throw $exception;
+        }
+    }
+
+    public function getAppellation(string $code): array
+    {
+        $bearer = $this->getBearer();
+
+        try {
+            $response = $this->httpClient->request('GET', sprintf(self::BASE.'appellation/%s', $code), [
+                'headers' => [
+                    'Authorization' => 'Bearer '.$bearer,
+                    'Accept' => 'application/json',
+                ],
+                'query' => [
+                    'champs' => 'code,libelle,metier(code,libelle)',
+                ],
+            ]);
+
+            return $response->toArray();
+        } catch (HttpExceptionInterface $exception) {
+            throw $exception;
+        }
+    }
+}
--- a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ProcessRequestTrait.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ProcessRequestTrait.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\FranceTravailApiBundle\ApiHelper;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\BadResponseException;
+use GuzzleHttp\Psr7;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Methods to process request against the api, and handle the
+ * Exceptions.
+ */
+trait ProcessRequestTrait
+{
+    /**
+     * Handle a request and 429 errors.
+     *
+     * @param Request $request    the request
+     * @param array   $parameters the requests parameters
+     */
+    protected function handleRequest(
+        Request $request,
+        array $parameters,
+        Client $client,
+        LoggerInterface $logger
+    ) {
+        return $this->handleRequestRecursive(
+            $request,
+            $parameters,
+            $client,
+            $logger
+        );
+    }
+
+    /**
+     * internal method to handle recursive requests.
+     *
+     * @throws BadResponseException
+     */
+    private function handleRequestRecursive(
+        Request $request,
+        array $parameters,
+        Client $client,
+        LoggerInterface $logger,
+        $counter = 0
+    ) {
+        try {
+            return $client->send($request, $parameters);
+        } catch (BadResponseException $e) {
+            if (
+                // get 429 exceptions
+                $e instanceof ClientException
+                && 429 === $e->getResponse()->getStatusCode()
+                && count($e->getResponse()->getHeader('Retry-After')) > 0) {
+                if ($counter > 5) {
+                    $logger->error('too much 429 response', [
+                        'request' => Psr7\get($e->getRequest()),
+                    ]);
+
+                    throw $e;
+                }
+
+                $delays = $e->getResponse()->getHeader('Retry-After');
+                $delay = \end($delays);
+
+                sleep($delay);
+
+                return $this->handleRequestRecursive(
+                    $request,
+                    $parameters,
+                    $client,
+                    $logger,
+                    $counter + 1
+                );
+            }
+
+            // handling other errors
+            $logger->error('Error while querying ROME api', [
+                'status_code' => $e->getResponse()->getStatusCode(),
+                'part' => 'appellation',
+                'request' => $e->getRequest()->getBody()->getContents(),
+                'response' => $e->getResponse()->getBody()->getContents(),
+            ]);
+
+            throw $e;
+        }
+    }
+}
--- a/src/Bundle/ChillFranceTravailApiBundle/src/ChillFranceTravailApiBundle.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/ChillFranceTravailApiBundle.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\FranceTravailApiBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ChillFranceTravailApiBundle extends Bundle {}
--- a/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\FranceTravailApiBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Routing\Annotation\Route;
+
+class RomeController extends AbstractController
+{
+    /**
+     * @var PartenaireRomeAppellation
+     */
+    protected $apiAppellation;
+
+    public function __construct(PartenaireRomeAppellation $apiAppellation)
+    {
+        $this->apiAppellation = $apiAppellation;
+    }
+
+    #[Route(path: '/{_locale}/france-travail/appellation/search.{_format}', name: 'chill_france_travail_api_appellation_search')]
+    public function appellationSearchAction(Request $request)
+    {
+        if (false === $request->query->has('q')) {
+            return new JsonResponse([]);
+        }
+
+        $appellations = $this->apiAppellation
+            ->getListeAppellation($request->query->get('q'));
+        $results = [];
+
+        foreach ($appellations as $appellation) {
+            $appellation['id'] = 'original-'.$appellation['code'];
+            $appellation['text'] = $appellation['libelle'];
+            $results[] = $appellation;
+        }
+
+        $computed = new \stdClass();
+        $computed->pagination = (new \stdClass());
+        $computed->pagination->more = false;
+        $computed->results = $results;
+
+        return new JsonResponse($computed);
+    }
+}
--- a/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/ChillFranceTravailApiExtension.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/ChillFranceTravailApiExtension.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\FranceTravailApiBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+
+/**
+ * This is the class that loads and manages your bundle configuration.
+ *
+ * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
+ */
+class ChillFranceTravailApiExtension extends Extension implements PrependExtensionInterface
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.yml');
+    }
+
+    public function prepend(ContainerBuilder $container): void
+    {
+        $this->prependRoute($container);
+    }
+
+    protected function prependRoute(ContainerBuilder $container): void
+    {
+        // declare routes for france travail api bundle
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillFranceTravailApiBundle/Resources/config/routing.yml',
+                ],
+            ],
+        ]);
+    }
+}
--- a/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\FranceTravailApiBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+/**
+ * This is the class that validates and merges configuration from your app/config files.
+ *
+ * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/configuration.html}
+ */
+class Configuration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder('chill_france_travail_api');
+        $rootNode = $treeBuilder->getRootNode();
+        // Here you should define the parameters that are allowed to
+        // configure your bundle. See the documentation linked above for
+        // more information on that topic.
+
+        return $treeBuilder;
+    }
+}
--- a/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/routing.yml
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/routing.yml
@@ -0,0 +1,3 @@
+chill_france_travail_api_controllers:
+    resource: "@ChillFranceTravailApiBundle/Controller"
+    type: annotation
--- a/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/services.yml
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/services.yml
@@ -0,0 +1,16 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Chill\FranceTravailApiBundle\ApiHelper\ApiWrapper:
+        $clientId: '%env(FRANCE_TRAVAIL_CLIENT_ID)%'
+        $clientSecret: '%env(FRANCE_TRAVAIL_CLIENT_SECRET)%'
+        $redis: '@Chill\MainBundle\Redis\ChillRedis'
+
+    Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation: ~
+
+    Chill\FranceTravailApiBundle\Controller\RomeController:
+        autowire: true
+        autoconfigure: true
+        tags: ['controller.service_arguments']
--- a/src/Bundle/ChillFranceTravailApiBundle/src/Resources/views/.gitkeep
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/Resources/views/.gitkeep
@@ -0,0 +1 @@
+
--- a/src/Bundle/ChillFranceTravailApiBundle/src/Tests/ApiHelper/PartenaireRomeAppellationTest.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/Tests/ApiHelper/PartenaireRomeAppellationTest.php
@@ -0,0 +1,93 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\FranceTravailApiBundle\Tests\ApiHelper;
+
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation;
+
+/**
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ *
+ * @internal
+ *
+ * @coversNothing
+ */
+class PartenaireRomeAppellationTest extends KernelTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        self::bootKernel();
+    }
+
+    public function testGetListeMetiersSimple()
+    {
+        /** @var PartenaireRomeAppellation $appellations */
+        $appellations = self::$kernel
+            ->getContainer()
+            ->get(PartenaireRomeAppellation::class)
+        ;
+
+        $data = $appellations->getListeAppellation('arb');
+
+        $this->assertTrue(\is_array($data));
+        $this->assertNotNull($data[0]->libelle);
+        $this->assertNotNull($data[0]->code);
+    }
+
+    public function testGetListeMetiersTooMuchRequests()
+    {
+        /** @var PartenaireRomeMetier $appellations */
+        $appellations = self::$kernel
+            ->getContainer()
+            ->get(PartenaireRomeAppellation::class)
+        ;
+
+        $appellations->getListeAppellation('arb');
+        $appellations->getListeAppellation('ing');
+        $appellations->getListeAppellation('rob');
+        $appellations->getListeAppellation('chori');
+        $data = $appellations->getListeAppellation('camion');
+
+        $this->assertTrue(
+            $data[0] instanceof \stdClass,
+            'assert that first index of data is an instance of stdClass'
+        );
+    }
+
+    public function testGetAppellation()
+    {
+        /** @var PartenaireRomeMetier $appellations */
+        $appellations = self::$kernel
+            ->getContainer()
+            ->get(PartenaireRomeAppellation::class)
+        ;
+
+        $a = $appellations->getListeAppellation('arb');
+
+        $full = $appellations->getAppellation($a[0]->code);
+
+        $this->assertNotNull(
+            $full->libelle,
+            'assert that libelle is not null'
+        );
+        $this->assertTrue(
+            $full->metier instanceof \stdClass,
+            'assert that metier is returned'
+        );
+        $this->assertNotNull(
+            $full->metier->libelle,
+            'assert that metier->libelle is not null'
+        );
+    }
+}
--- a/src/Bundle/ChillFranceTravailApiBundle/src/Tests/Controller/RomeControllerTest.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/Tests/Controller/RomeControllerTest.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\FranceTravailApiBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class RomeControllerTest extends WebTestCase
+{
+    public function testAppellationsearch()
+    {
+        $client = static::createClient();
+
+        $crawler = $client->request('GET', '/{_locale}/pole-emploi/appellation/search');
+    }
+}
--- a/src/Bundle/ChillJobBundle/src/ChillJobBundle.php
+++ b/src/Bundle/ChillJobBundle/src/ChillJobBundle.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\JobBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ChillJobBundle extends Bundle {}
--- a/src/Bundle/ChillJobBundle/src/Controller/CSCrudReportController.php
+++ b/src/Bundle/ChillJobBundle/src/Controller/CSCrudReportController.php
@@ -0,0 +1,123 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\JobBundle\Controller;
+
+use Chill\PersonBundle\CRUD\Controller\EntityPersonCRUDController;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Chill\JobBundle\Entity\Immersion;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * CRUD Controller for reports (Frein, ...).
+ */
+class CSCrudReportController extends EntityPersonCRUDController
+{
+    protected function onBeforeRedirectAfterSubmission(string $action, $entity, FormInterface $form, Request $request): ?Response
+    {
+        $next = $request->request->get('submit', 'save-and-close');
+
+        return match ($next) {
+            'save-and-close', 'delete-and-close' => $this->redirectToRoute('chill_job_report_index', [
+                'person' => $entity->getPerson()->getId(),
+            ]),
+            default => parent::onBeforeRedirectAfterSubmission($action, $entity, $form, $request),
+        };
+    }
+
+    protected function duplicateEntity(string $action, Request $request)
+    {
+        if ('cscv' === $this->getCrudName()) {
+            $id = $request->query->get('duplicate_id', 0);
+            /** @var \Chill\JobBundle\Entity\CV $cv */
+            $cv = $this->getEntity($action, $id, $request);
+            $em = $this->managerRegistry->getManager();
+
+            $em->detach($cv);
+
+            foreach ($cv->getExperiences() as $experience) {
+                $cv->removeExperience($experience);
+                $em->detach($experience);
+                $cv->addExperience($experience);
+            }
+            foreach ($cv->getFormations() as $formation) {
+                $cv->removeFormation($formation);
+                $em->detach($formation);
+                $cv->addFormation($formation);
+            }
+
+            return $cv;
+        }
+        if ('projet_prof' === $this->getCrudName()) {
+            $id = $request->query->get('duplicate_id', 0);
+            /** @var \Chill\JobBundle\Entity\ProjetProfessionnel $original */
+            $original = $this->getEntity($action, $id, $request);
+
+            $new = parent::duplicateEntity($action, $request);
+
+            foreach ($original->getSouhait() as $s) {
+                $new->addSouhait($s);
+            }
+            foreach ($original->getValide() as $s) {
+                $new->addValide($s);
+            }
+
+            return $new;
+        }
+
+        return parent::duplicateEntity($action, $request);
+    }
+
+    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    {
+        if ($entity instanceof Immersion) {
+            if ('edit' === $action || 'new' === $action) {
+                return parent::createFormFor($action, $entity, $formClass, [
+                    'center' => $entity->getPerson()->getCenter(),
+                ]);
+            }
+            if ('bilan' === $action) {
+                return parent::createFormFor($action, $entity, $formClass, [
+                    'center' => $entity->getPerson()->getCenter(),
+                    'step' => 'bilan',
+                ]);
+            }
+            if ('delete' === $action) {
+                return parent::createFormFor($action, $entity, $formClass, $formOptions);
+            }
+            throw new \LogicException("this step {$action} is not supported");
+        }
+
+        return parent::createFormFor($action, $entity, $formClass, $formOptions);
+    }
+
+    protected function onPreFlush(string $action, $entity, FormInterface $form, Request $request)
+    {
+        // for immersion / edit-bilan action
+        if ('bilan' === $action) {
+            /* @var $entity Immersion */
+            $entity->setIsBilanFullfilled(true);
+        }
+
+        parent::onPreFlush($action, $entity, $form, $request);
+    }
+
+    /**
+     * Edit immersion bilan.
+     *
+     * @param int $id
+     */
+    public function editBilan(Request $request, $id): Response
+    {
+        return $this->formEditAction('bilan', $request, $id);
+    }
+}
--- a/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php
+++ b/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php
@@ -0,0 +1,150 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\JobBundle\Controller;
+
+use Chill\PersonBundle\CRUD\Controller\OneToOneEntityPersonCRUDController;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Chill\JobBundle\Form\CSPersonPersonalSituationType;
+use Chill\JobBundle\Form\CSPersonDispositifsType;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+
+class CSPersonController extends OneToOneEntityPersonCRUDController
+{
+    #[Route(path: '{_locale}/person/job/personal_situation/{id}/edit', name: 'chill_crud_job_personal_situation_edit')]
+    public function personalSituationEdit(Request $request, $id): Response
+    {
+        return $this->formEditAction(
+            'ps_situation_edit',
+            $request,
+            $id,
+            CSPersonPersonalSituationType::class
+        );
+    }
+
+    #[Route(path: '{_locale}/person/job/dispositifs/{id}/edit', name: 'chill_crud_job_dispositifs_edit')]
+    public function dispositifsEdit(Request $request, $id)
+    {
+        return $this->formEditAction(
+            'dispositifs_edit',
+            $request,
+            $id,
+            CSPersonDispositifsType::class
+        );
+    }
+
+    #[Route(path: '{_locale}/person/job/{person}/personal_situation', name: 'chill_crud_job_personal_situation_view')]
+    public function personalSituationView(Request $request, $person): Response
+    {
+        return $this->viewAction('ps_situation_view', $request, $person);
+    }
+
+    #[Route(path: '{_locale}/person/job/{person}/dispositifs', name: 'chill_crud_job_dispositifs_view')]
+    public function dispositifsView(Request $request, $person): Response
+    {
+        return $this->viewAction('dispositifs_view', $request, $person);
+    }
+
+    protected function generateRedirectOnCreateRoute($action, Request $request, $entity): string
+    {
+        $route = '';
+
+        switch ($action) {
+            case 'ps_situation_view':
+                $route = 'chill_crud_job_personal_situation_edit';
+                break;
+            case 'dispositifs_view':
+                $route = 'chill_crud_job_dispositifs_edit';
+                break;
+            default:
+                parent::generateRedirectOnCreateRoute($action, $request, $entity);
+        }
+
+        return $this->generateUrl($route, ['id' => $entity->getPerson()->getId()]);
+    }
+
+    protected function checkACL($action, $entity): void
+    {
+        match ($action) {
+            'ps_situation_edit', 'dispositifs_edit' => $this->denyAccessUnlessGranted(
+                PersonVoter::UPDATE,
+                $entity->getPerson()
+            ),
+            'ps_situation_view', 'dispositifs_view' => $this->denyAccessUnlessGranted(
+                PersonVoter::SEE,
+                $entity->getPerson()
+            ),
+            default => parent::checkACL($action, $entity),
+        };
+    }
+
+    protected function onBeforeRedirectAfterSubmission(string $action, $entity, FormInterface $form, Request $request): ?Response
+    {
+        return match ($action) {
+            'ps_situation_edit' => $this->redirectToRoute(
+                'chill_crud_'.$this->getCrudName().'_personal_situation_view',
+                ['person' => $entity->getId()]
+            ),
+            'dispositifs_edit' => $this->redirectToRoute(
+                'chill_crud_'.$this->getCrudName().'_dispositifs_view',
+                ['person' => $entity->getId()]
+            ),
+            default => null,
+        };
+    }
+
+    protected function getTemplateFor($action, $entity, Request $request): string
+    {
+        return match ($action) {
+            'ps_situation_edit' => '@ChillJob/CSPerson/personal_situation_edit.html.twig',
+            'dispositifs_edit' => '@ChillJob/CSPerson/dispositifs_edit.html.twig',
+            'ps_situation_view' => '@ChillJob/CSPerson/personal_situation_view.html.twig',
+            'dispositifs_view' => '@ChillJob/CSPerson/dispositifs_view.html.twig',
+            default => parent::getTemplateFor($action, $entity, $request),
+        };
+    }
+
+    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    {
+        switch ($action) {
+            case 'ps_situation_edit':
+            case 'dispositifs_edit':
+                $form = $this->createForm($formClass, $entity, \array_merge(
+                    $formOptions,
+                    ['center' => $entity->getPerson()->getCenter()]
+                ));
+                $this->customizeForm($action, $form);
+
+                return $form;
+
+            default:
+                return parent::createFormFor($action, $entity, $formClass, $formOptions);
+        }
+    }
+
+    protected function generateLabelForButton($action, $formName, $form): string
+    {
+        switch ($action) {
+            case 'ps_situation_edit':
+            case 'dispositifs_edit':
+                if ('submit' === $formName) {
+                    return 'Enregistrer';
+                }
+                throw new \LogicException("this formName is not supported: {$formName}");
+                break;
+            default:
+                return 'Enregistrer';
+        }
+    }
+}
--- a/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php
+++ b/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\JobBundle\Controller;
+
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\HttpFoundation\Response;
+use Chill\JobBundle\Entity\Frein;
+use Chill\JobBundle\Entity\CV;
+use Chill\JobBundle\Entity\Immersion;
+use Chill\JobBundle\Entity\ProjetProfessionnel;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\JobBundle\Security\Authorization\JobVoter;
+
+class CSReportController extends AbstractController
+{
+    public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {}
+
+    #[Route(path: '{_locale}/person/job/{person}/report', name: 'chill_job_report_index')]
+    public function index(Person $person): Response
+    {
+        $this->denyAccessUnlessGranted(PersonVoter::SEE, $person, 'The access to '
+            .'person is denied');
+
+        $reports = $this->getReports($person);
+
+        return $this->render('@ChillJob/Report/index.html.twig', \array_merge([
+            'person' => $person,
+        ], $reports));
+    }
+
+    protected function getReports(Person $person): array
+    {
+        $results = [];
+
+        $kinds = [];
+
+        if ($this->isGranted(JobVoter::REPORT_CV, $person)) {
+            $kinds['cvs'] = CV::class;
+        }
+
+        if ($this->isGranted(JobVoter::REPORT_NEW, $person)) {
+            $kinds = \array_merge($kinds, [
+                'cvs' => CV::class,
+                'freins' => Frein::class,
+                'immersions' => Immersion::class,
+                'projet_professionnels' => ProjetProfessionnel::class,
+            ]);
+        }
+
+        foreach ($kinds as $key => $className) {
+            $ordering = match ($key) {
+                'immersions' => ['debutDate' => 'DESC'],
+                default => ['reportDate' => 'DESC'],
+            };
+            $results[$key] = $this->managerRegistry->getManager()
+                ->getRepository($className)
+                ->findBy(['person' => $person], $ordering);
+        }
+
+        return $results;
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Julie Lenaerts	635b1ee537	merge upgrade-sf5 branch to have latest fixes	2024-06-06 13:01:12 +02:00
Julie Lenaerts	3fd6e52e9d	remove unnecessary constraints from 3party properties acronym and nameCompany	2024-05-29 11:37:42 +02:00
Julie Lenaerts	f60a595ab6	Update vue toast version and implementation	2024-05-29 11:37:04 +02:00
Julie Lenaerts	436ef33dbc	final fix for appellation selector: define metier when appellation already exists	2024-05-23 14:05:14 +02:00
Julie Lenaerts	405aad7333	fix rome appellation selector and admin	2024-05-23 13:47:33 +02:00
Julie Lenaerts	a5c2576124	Fix the appellation selection for projet professional	2024-05-23 12:46:12 +02:00
Julie Lenaerts	33a6f9996e	remove dumps	2024-05-22 21:02:17 +02:00
Julie Lenaerts	b96cbc5594	rector fixes	2024-05-22 17:13:27 +02:00
Julie Lenaerts	854d72fa42	php cs fixes	2024-05-22 17:12:49 +02:00
Julie Lenaerts	cd6fd091dc	resolve merge conflicts	2024-05-22 16:57:28 +02:00
Julie Lenaerts	cb5ade3d14	add changie for module emploi	2024-05-22 16:49:45 +02:00
Julie Lenaerts	dddb6d66bc	php cs fixes after merge	2024-05-22 16:44:02 +02:00
Julie Lenaerts	d34f9450b8	Merge branch 'add-module-emploi' of gitlab.com:Chill-Projet/chill-bundles into add-module-emploi	2024-05-22 16:43:02 +02:00
Julie Lenaerts	9ce1788a14	phpstan en rector fixes	2024-05-22 16:42:47 +02:00
Julie Lenaerts	2895638f3b	php cs fixes	2024-05-22 15:26:23 +02:00
Julie Lenaerts	2708bafb1f	Export for list person with cs_person columns fixed	2024-05-22 15:24:39 +02:00
Julie Lenaerts	7d309136b1	minor last fixes for immersion and remove of dumps	2024-05-22 08:53:56 +02:00
Julie Lenaerts	82d3ec4d6f	Merge branch 'add-module-emploi' of gitlab.com:Chill-Projet/chill-bundles into add-module-emploi	2024-05-22 08:40:46 +02:00
Julie Lenaerts	cad2dea148	Wip: add jsonb fields to export	2024-05-16 09:26:40 +02:00
Julie Lenaerts	bff14aa700	minor last fixes for immersion and remove of dumps	2024-05-15 16:02:14 +02:00
Julie Lenaerts	66570cd430	merge add-module-emploi into testing	2024-05-15 15:19:24 +02:00
Julie Lenaerts	53df2ec9ba	Merge branch 'master' into testing-2024-03	2024-05-15 15:17:49 +02:00
Julie Lenaerts	068503a830	Merge branch 'master' into add-module-emploi	2024-05-15 14:36:36 +02:00
Julie Lenaerts	c07a728f1d	Wip: add jsonb fields to export	2024-05-15 14:35:51 +02:00
Julie Lenaerts	b7e61c6747	merge master into module emploi branch	2024-05-15 14:26:51 +02:00
Julie Lenaerts	97846a5877	add basic fields csperson to list person export	2024-05-14 11:01:45 +02:00
Julie Lenaerts	4ed9d3d8e2	Fix API call	2024-05-14 07:49:48 +02:00
Julie Lenaerts	d82d534a4c	Try to fix API: adjust to new urls, but still receiving error code 400	2024-05-07 11:15:10 +02:00
Julie Lenaerts	684f28291a	reinstate exports	2024-05-07 11:14:39 +02:00
Julie Lenaerts	526882a5b6	phpstan, rector and cs fixes	2024-04-29 15:39:05 +02:00
Julie Lenaerts	422b6b99eb	Change translation for the group of voter rights	2024-04-29 15:28:13 +02:00
Julie Lenaerts	02b150b0a5	fix delete of reports in crud config + template	2024-04-29 15:25:15 +02:00
Julie Lenaerts	20c27c100c	Name change from CSConnecte to Job	2024-04-29 15:20:23 +02:00
Julie Lenaerts	12a22bcc13	template + form + property fixes for emploi reports	2024-04-29 14:13:37 +02:00
Julie Lenaerts	cba8a342d5	more template fixes	2024-04-24 18:02:06 +02:00
Julie Lenaerts	6f55ba15d6	Split crud controllers for each report entity	2024-04-24 17:40:31 +02:00
Julie Lenaerts	454ab73303	WIP fix emploi reports	2024-04-24 17:11:26 +02:00
Julie Lenaerts	800942bc92	Add missing columns to report tables	2024-04-24 17:10:30 +02:00
Julie Lenaerts	c4e7683e48	fix templates for personal situation	2024-04-24 15:02:24 +02:00
Julie Lenaerts	28c986fddf	controller with crud logic + templates fixed for dispositif	2024-04-24 14:52:19 +02:00
Julie Lenaerts	adca4f0d6a	php cs fixes	2024-04-24 12:28:55 +02:00
Julie Lenaerts	7b25c8e390	New migration to take care of everything needed for ChillJobBundle	2024-04-24 12:27:49 +02:00
Julie Lenaerts	0b5be0419b	Move old migrations to directory 'old' just in case	2024-04-24 12:27:23 +02:00
Julie Lenaerts	650e85c481	Fix crudconfig	2024-04-24 11:44:14 +02:00
Julie Lenaerts	56d5d08ed3	Run rector on ListCSPerson file	2024-04-24 11:34:06 +02:00
Julie Lenaerts	d3390ca334	Phpstan error for unused parameter fixed	2024-04-24 10:49:19 +02:00
Julie Lenaerts	511c0af5fa	Last php cs fix	2024-04-24 10:40:09 +02:00
Julie Lenaerts	4c354c47c9	Fix construct method for ListCSPerson	2024-04-24 10:39:46 +02:00
Julie Lenaerts	d8b6cef7b4	rector fixes	2024-04-24 10:18:07 +02:00
Julie Lenaerts	e312929d86	php cs fixes	2024-04-24 10:16:54 +02:00
Julie Lenaerts	20b38af812	Create phpstan baseline for level 5 taking into account new bundles	2024-04-24 10:16:16 +02:00
Julie Lenaerts	2f07be0843	Revert "adjust phpstan baselines" This reverts commit `a71573136a`.	2024-04-24 10:11:02 +02:00
Julie Lenaerts	11c069a2ff	Revert "phpstan baseline 5 updated" This reverts commit `deaab80270`.	2024-04-24 10:10:55 +02:00
Julie Lenaerts	3929602f59	Revert "php style fixes" This reverts commit `38fcccfd83`.	2024-04-24 10:09:25 +02:00
Julie Lenaerts	38fcccfd83	php style fixes	2024-04-23 21:22:29 +02:00
Julie Lenaerts	deaab80270	phpstan baseline 5 updated	2024-04-23 21:22:19 +02:00
Julie Lenaerts	a71573136a	adjust phpstan baselines	2024-04-23 21:12:57 +02:00
Julie Lenaerts	b1082f6a55	fix phpstan errors level 3	2024-04-23 21:03:42 +02:00
Julie Lenaerts	dcc285e976	fix phpstan errors level 2	2024-04-23 20:52:22 +02:00
Julie Lenaerts	ed3e0f889e	Rector changes + namespace changes	2024-04-23 17:43:23 +02:00
Julie Lenaerts	63fe8070c4	Rector passed again on JobBundle entities	2024-04-19 11:30:47 +02:00
Julie Lenaerts	8e3322f578	rector rules for upgrade to php 8.2 and symfony 5.4 applied + php cs fixer	2024-04-19 10:56:49 +02:00
Julie Lenaerts	00756a3bde	Move migrations directory to src	2024-04-19 10:33:40 +02:00
Julie Lenaerts	2c68224e9c	Add jobBundle and FranceTravailApiBundle	2024-04-19 10:21:17 +02:00
Julien Fastré	166d7fe0b0	Merge branch 'master' into testing-2024-03	2024-03-26 22:14:51 +01:00
Julien Fastré	ab9d5439c1	Release 2.18.1	2024-03-26 22:08:30 +01:00
Julien Fastré	0737838dd6	Fix layout in admin document generation A layout issue in the admin document generation has been fixed, particularly in the ChillDocGeneratorBundle. Unnecessary elements such as table headers and multiple entity data rows in DocGeneratorTemplate have been removed, simplifying the view page and improving its performance.	2024-03-26 22:08:01 +01:00
Julien Fastré	88bac5b5d8	Merge remote-tracking branch 'origin/145-permettre-de-visualiser-les-documents-dans-libreoffice-en-utilisant-webdav' into testing-2024-03	2024-03-26 21:34:15 +01:00
Julien Fastré	cf1df462dc	optional parameter after the required one	2024-01-15 21:18:51 +01:00
Julien Fastré	a0328b9d68	Apply new CS rules on the webdav feature	2024-01-15 20:38:03 +01:00
Julien Fastré	813a80d6f9	Dav: add UI to edit document	2024-01-15 20:22:14 +01:00
Julien Fastré	ab95bb157e	Dav: add some documentation on classes	2024-01-15 20:19:03 +01:00
Julien Fastré	18fd1dbc4a	Dav: Introduce access control inside de dav controller	2024-01-15 20:19:03 +01:00
Julien Fastré	a35f7656cb	Dav: refactor WebdavController	2024-01-15 20:19:03 +01:00
Julien Fastré	ff05f9f48a	Dav: implements JWT extraction from the URL, and add the access_token in dav urls	2024-01-15 20:19:02 +01:00
Julien Fastré	482c494034	Webdav: fully implements the controller and response The controller is tested from real request scraped from apache mod_dav implementation. The requests were scraped using a wireshark-like tool. Those requests have been adapted to suit to our xml.	2024-01-15 20:19:02 +01:00