Merge branch '71-fix-bug-add-urgent-on-init-modal-add-config-homepage' into 'ticket-app-master'

Correction de bugs, ajout champs urgents dans la modal d'initialisation du ticket et ajout d'un configuration pour l'affichage des tabs dans la homepage See merge request Chill-Projet/chill-bundles!884
Correction de bugs, ajout champs urgents dans la modal d'initialisation du ticket et ajout d'un configuration pour l'affichage des tabs dans la homepage
2025-09-25 08:05:00 +00:00 · 2025-09-22 09:23:30 +00:00 · 2025-09-22 09:23:30 +00:00 · 2025-09-16 11:16:57 +00:00 · 2025-09-16 11:16:57 +00:00 · 2025-09-15 09:17:23 +00:00
1674 changed files with 45165 additions and 29072 deletions
--- a/.changes/unreleased/Feature-20240530-160003.yaml
+++ b/.changes/unreleased/Feature-20240530-160003.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: |
+  Upgrade import of address list to the last version of compiled addresses of belgian-best-address
+time: 2024-05-30T16:00:03.440767606+02:00
+custom:
+  Issue: ""
--- a/.changes/unreleased/Feature-20240531-190242.yaml
+++ b/.changes/unreleased/Feature-20240531-190242.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: |
+  Upgrade CKEditor and refactor configuration with use of typescript
+time: 2024-05-31T19:02:42.776662753+02:00
+custom:
+  Issue: ""
--- a/.changes/unreleased/Feature-20250904-181032.yaml
+++ b/.changes/unreleased/Feature-20250904-181032.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Add a command to generate a list of permissions
+time: 2025-09-04T18:10:32.334524026+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
--- a/.changes/unreleased/Fixed-20250909-173639.yaml
+++ b/.changes/unreleased/Fixed-20250909-173639.yaml
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix display of 'duplicate' and 'merge' buttons in CRUD templates
-time: 2025-09-09T17:36:39.960419639+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
--- a/.changes/v4.3.0.md
+++ b/.changes/v4.3.0.md
@@ -1,10 +0,0 @@
-## v4.3.0 - 2025-09-08
-### Feature
-* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
-* Add a command to generate a list of permissions   
-* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
-
-  **Schema Change**: Add columns or tables
-### Fixed
-* fix date formatting in calendar range display   
-* Change route URL to avoid clash with person duplicate controller method   
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,11 +19,11 @@ max_line_length = 80
 [COMMIT_EDITMSG]
 max_line_length = 0

-[*.{js, vue, ts}]
+[*.{js,vue,ts}]
 indent_size = 2
 indent_style = space

-[.rst]
-ident_size = 3
-ident_style = space
+[*.rst]
+indent_size = 3
+indent_style = space

--- a/.env
+++ b/.env
@@ -86,7 +86,7 @@ ADD_ADDRESS_MAP_CENTER_Z=15
 ## Redis Cache & redis database
 REDIS_HOST=redis
 REDIS_PORT=6379
-REDIS_URL="redis://${REDIS_HOST}:${REDIS_PORT}"
+REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
 ###< chill-project/chill-bundles ###

 ###> symfony/ovh-cloud-notifier ###
--- a/.env.dev
+++ b/.env.dev
@@ -1,4 +0,0 @@
-
-###> symfony/framework-bundle ###
-APP_SECRET=72759e571285ef25677c88f967a73386
-###< symfony/framework-bundle ###
--- a/.env.test
+++ b/.env.test
@@ -1,5 +1,39 @@
-# define your env variables for the test env here
+# variables for .env environement
+# those variables suits for gitlab-ci
+# Run tests from root to adapt your own environment
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
-DEFAULT_CARRIER_CODE=TEST
+
+ADMIN_PASSWORD=password
+
+JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
+JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
+JWT_PASSPHRASE=2a30f6ba26521a2613821da35f28386e
+
+TWILIO_SID=~
+TWILIO_SECRET=~
+DEFAULT_CARRIER_CODE=BE
+
+ADD_ADDRESS_DEFAULT_COUNTRY=BE
+ADD_ADDRESS_MAP_CENTER_X=50.8443
+ADD_ADDRESS_MAP_CENTER_Y=4.3523
+ADD_ADDRESS_MAP_CENTER_Z=15
+
+SHORT_MESSAGE_DSN=null://null
+MESSENGER_TRANSPORT_DSN=sync://
+
+###> doctrine/doctrine-bundle ###
+# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
+#
+DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5454/test?serverVersion=14&charset=utf8"
+###< doctrine/doctrine-bundle ###
+
+ASYNC_UPLOAD_TEMP_URL_KEY=
+ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
+ASYNC_UPLOAD_TEMP_URL_CONTAINER=
+
+MAILER_DSN=null://null
+
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6363
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,7 @@ config/packages/dev/*

 ###> phpunit/phpunit ###
 /phpunit.xml
-/.phpunit.cache/
+.phpunit.result.cache
 ###< phpunit/phpunit ###

 /.php-cs-fixer.cache
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -234,15 +234,9 @@ This must be a decision made by a human, not by an AI. Every AI task must abort

 #### Running Tests

-The tests are run from the project's root (not from the bundle's root).
+The tests are run from the project's root (not from the bundle's root: so, do not change the directory to any bundle directory before running tests).

 ```bash
-# Run all tests
-vendor/bin/phpunit
-
-# Run tests for a specific bundle
-vendor/bin/phpunit --testsuite NameBundle
-
 # Run a specific test file
 vendor/bin/phpunit path/to/TestFile.php

--- a/.prettierrc
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "tabWidth": 2,
+  "useTabs": false
+}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,30 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Chill Debug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000,
+            "pathMappings": {
+                "/var/www/html": "${workspaceFolder}"
+            },
+            "preLaunchTask": "symfony"
+        },
+        {
+            "name": "Yarn Encore Dev (Watch)",
+            "type": "node-terminal",
+            "request": "launch",
+            "command": "yarn encore dev --watch",
+            "cwd": "${workspaceFolder}"
+        }
+    ],
+    "compounds": [
+        {
+            "name": "Chill Debug + Yarn Encore Dev (Watch)",
+            "configurations": ["Chill Debug", "Yarn Encore Dev (Watch)"]
+        }
+    ]
+}
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -0,0 +1,23 @@
+{
+    "tasks": [
+        {
+            "type": "shell",
+            "command": "symfony",
+            "args": [
+                "server:start",
+                "--allow-http",
+                "--no-tls",
+                "--port=8000",
+                "--allow-all-ip",
+                "-d"
+            ],
+            "label": "symfony"
+        },
+        {
+            "type": "shell",
+            "command": "yarn",
+            "args": ["encore", "dev", "--watch"],
+            "label": "webpack"
+        }
+    ]
+}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,17 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


-## v4.3.0 - 2025-09-08
-### Feature
-* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
-* Add a command to generate a list of permissions   
-* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
-
-  **Schema Change**: Add columns or tables
-### Fixed
-* fix date formatting in calendar range display   
-* Change route URL to avoid clash with person duplicate controller method   
-
 ## v4.2.1 - 2025-09-03
 ### Fixed
 * Fix exports to work with DirectExportInterface   
--- a/CONVENTIONS-fr.md
+++ b/CONVENTIONS-fr.md
@@ -54,7 +54,7 @@ Arborescence:
    - person
    - personvendee
    - household_edit_metadata
-        - index.js
+        - index.ts
 ```

 ## Organisation des feuilles de styles
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
        "social worker"
    ],
    "require": {
-        "php": "^8.3",
+        "php": "^8.2",
        "ext-dom": "*",
        "ext-json": "*",
        "ext-openssl": "*",
@@ -19,10 +19,10 @@
        "doctrine/data-fixtures": "^1.8",
        "doctrine/doctrine-bundle": "^2.1",
        "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "^3.5.2",
+        "doctrine/orm": "^2.13.0",
        "erusev/parsedown": "^1.7",
        "knplabs/knp-menu-bundle": "^3.0",
-        "knplabs/knp-time-bundle": "^2.0",
+        "knplabs/knp-time-bundle": "^1.12",
        "knpuniversity/oauth2-client-bundle": "^2.10",
        "league/csv": "^9.7.1",
        "lexik/jwt-authentication-bundle": "^2.16",
@@ -32,53 +32,54 @@
        "ovh/ovh": "^3.0",
        "phpoffice/phpspreadsheet": "^1.16",
        "ramsey/uuid-doctrine": "^1.7",
+        "sensio/framework-extra-bundle": "^5.5",
        "smalot/pdfparser": "^2.10",
        "spomky-labs/base64url": "^2.0",
-        "symfony/amqp-messenger": "^7.3",
-        "symfony/asset": "^7.2",
-        "symfony/browser-kit": "^7.2",
-        "symfony/cache": "^7.2",
-        "symfony/clock": "^7.2",
-        "symfony/config": "^7.2",
-        "symfony/console": "^7.2",
-        "symfony/css-selector": "^7.2",
-        "symfony/dom-crawler": "^7.2",
-        "symfony/error-handler": "^7.2",
-        "symfony/event-dispatcher": "^7.2",
-        "symfony/event-dispatcher-contracts": "^3.0",
-        "symfony/expression-language": "^7.2",
-        "symfony/filesystem": "^7.2",
-        "symfony/finder": "^7.2",
-        "symfony/form": "^7.2",
-        "symfony/framework-bundle": "^7.2",
-        "symfony/http-client": "^7.2",
-        "symfony/http-foundation": "^7.2",
-        "symfony/intl": "^7.2",
-        "symfony/mailer": "^7.2",
-        "symfony/messenger": "^7.2",
-        "symfony/mime": "^7.2",
+        "symfony/asset": "^5.4",
+        "symfony/browser-kit": "^5.4",
+        "symfony/cache": "^5.4",
+        "symfony/clock": "^6.2",
+        "symfony/config": "^5.4",
+        "symfony/console": "^5.4",
+        "symfony/css-selector": "^5.4",
+        "symfony/dom-crawler": "^5.4",
+        "symfony/error-handler": "^5.4",
+        "symfony/event-dispatcher": "^5.4",
+        "symfony/event-dispatcher-contracts": "^2.4",
+        "symfony/expression-language": "^5.4",
+        "symfony/filesystem": "^5.4",
+        "symfony/finder": "^5.4",
+        "symfony/form": "^5.4",
+        "symfony/framework-bundle": "^5.4",
+        "symfony/http-client": "^5.4",
+        "symfony/http-foundation": "^5.4",
+        "symfony/intl": "^5.4",
+        "symfony/mailer": "^5.4",
+        "symfony/messenger": "^5.4",
+        "symfony/mime": "^5.4",
        "symfony/monolog-bundle": "^3.5",
-        "symfony/notifier": "^7.2",
-        "symfony/options-resolver": "^7.2",
-        "symfony/ovh-cloud-notifier": "^7.2",
-        "symfony/polyfill-intl-messageformatter": "^1.32",
-        "symfony/process": "^7.2",
-        "symfony/property-access": "^7.2",
-        "symfony/property-info": "^7.2",
-        "symfony/routing": "^7.2",
-        "symfony/security-bundle": "^7.3",
-        "symfony/security-core": "^7.2",
-        "symfony/security-csrf": "^7.2",
-        "symfony/security-http": "^7.2",
-        "symfony/serializer": "^7.2",
-        "symfony/string": "^7.2",
-        "symfony/translation": "^7.2",
-        "symfony/twig-bundle": "^7.2",
+        "symfony/notifier": "^5.4",
+        "symfony/options-resolver": "^5.4",
+        "symfony/ovh-cloud-notifier": "^5.4",
+        "symfony/process": "^5.4",
+        "symfony/property-access": "^5.4",
+        "symfony/property-info": "^5.4",
+        "symfony/routing": "^5.4",
+        "symfony/security-bundle": "^5.4",
+        "symfony/security-core": "^5.4",
+        "symfony/security-csrf": "^5.4",
+        "symfony/security-guard": "^5.4",
+        "symfony/security-http": "^5.4",
+        "symfony/serializer": "^5.4",
+        "symfony/string": "^5.4",
+        "symfony/templating": "^5.4",
+        "symfony/translation": "^5.4",
+        "symfony/twig-bundle": "^5.4",
        "symfony/ux-translator": "^2.22",
-        "symfony/validator": "^7.2",
-        "symfony/webpack-encore-bundle": "^2.0",
-        "symfony/workflow": "^7.2",
-        "symfony/yaml": "^7.2",
+        "symfony/validator": "^5.4",
+        "symfony/webpack-encore-bundle": "^1.11",
+        "symfony/workflow": "^5.4",
+        "symfony/yaml": "^5.4",
        "thenetworg/oauth2-azure": "^2.0",
        "twig/extra-bundle": "^3.0",
        "twig/intl-extra": "^3.0",
@@ -100,15 +101,16 @@
        "phpstan/phpstan-strict-rules": "^1.0",
        "phpunit/phpunit": "^10.5.24",
        "rector/rector": "^1.1.0",
-        "symfony/debug-bundle": "^7.2",
-        "symfony/dotenv": "^7.2",
+        "symfony/amqp-messenger": "^5.4.45",
+        "symfony/debug-bundle": "^5.4",
+        "symfony/dotenv": "^5.4",
        "symfony/flex": "^2.4",
        "symfony/maker-bundle": "^1.20",
        "symfony/phpunit-bridge": "^7.1",
-        "symfony/runtime": "^7.2",
-        "symfony/stopwatch": "^7.2",
-        "symfony/var-dumper": "^7.2",
-        "symfony/web-profiler-bundle": "^7.2"
+        "symfony/runtime": "^5.4",
+        "symfony/stopwatch": "^5.4",
+        "symfony/var-dumper": "^5.4",
+        "symfony/web-profiler-bundle": "^5.4"
    },
    "conflict": {
        "symfony/symfony": "*"
@@ -131,6 +133,7 @@
            "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
            "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
            "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
+            "Chill\\TicketBundle\\": "src/Bundle/ChillTicketBundle/src",
            "Chill\\Utils\\Rector\\": "utils/rector/src"
        }
    },
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -14,6 +14,7 @@ return [
    Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
    Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true],
    Misd\PhoneNumberBundle\MisdPhoneNumberBundle::class => ['all' => true],
+    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
    Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
@@ -34,6 +35,7 @@ return [
    Chill\ThirdPartyBundle\ChillThirdPartyBundle::class => ['all' => true],
    Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
    Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
+    Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
    Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
 ];
--- a/config/packages/chill_doc_store.yaml
+++ b/config/packages/chill_doc_store.yaml
@@ -1,5 +1,5 @@
 chill_doc_store:
-    use_driver: openstack
+    use_driver: local_storage
    local_storage:
        storage_path: '%kernel.project_dir%/var/storage'
    openstack:
--- a/config/packages/chill_ticket.yaml
+++ b/config/packages/chill_ticket.yaml
@@ -0,0 +1,5 @@
+chill_ticket:
+    ticket:
+        person_per_ticket:    one # One of "one"; "many"
+        response_time_exceeded_delay: PT12H
+
--- a/config/packages/csrf.yaml
+++ b/config/packages/csrf.yaml
@@ -1,11 +0,0 @@
-# Enable stateless CSRF protection for forms and logins/logouts
-framework:
-    form:
-        csrf_protection:
-            token_id: submit
-
-    csrf_protection:
-        stateless_token_ids:
-            - submit
-            - authenticate
-            - logout
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -7,7 +7,6 @@ doctrine:
        #server_version: '16'
        use_savepoints: true
    orm:
-        enable_lazy_ghost_objects: true
        auto_generate_proxy_classes: true
        naming_strategy: doctrine.orm.naming_strategy.default
        auto_mapping: true
--- a/config/packages/doctrine_migrations_chill.yaml
+++ b/config/packages/doctrine_migrations_chill.yaml
@@ -14,6 +14,7 @@ doctrine_migrations:
        'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
        'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
        'Chill\Migrations\Report': '@ChillReportBundle/migrations'
+        'Chill\Migrations\Ticket': '@ChillTicketBundle/migrations'
    all_or_nothing:
        true

--- a/config/packages/framework.yaml
+++ b/config/packages/framework.yaml
@@ -4,16 +4,6 @@ framework:
    #csrf_protection: true
    http_method_override: false

-
-    # Enable EntityValueResolver for automatic entity injection in controllers
-    # This replaces the functionality previously provided by SensioFrameworkExtraBundle
-    http_client:
-        enabled: true
-
-    request:
-        formats:
-            json: ['application/json']
-
    # Enables session support. Note that the session will ONLY be started if you read or write from it.
    # Remove or comment this section to explicitly disable session support.
    session:
--- a/config/packages/messenger.yaml
+++ b/config/packages/messenger.yaml
@@ -1,5 +1,7 @@
 framework:
    messenger:
+        # reset services after consuming messages
+        reset_on_message: true

        # Uncomment this (and the failed transport below) to send failed messages to this transport for later handling.
        failure_transport: failed
--- a/config/packages/notifier.yaml
+++ b/config/packages/notifier.yaml
@@ -1,8 +1,8 @@
 framework:
    notifier:
        texter_transports:
-        #ovhcloud: '%env(OVHCLOUD_DSN)%'
-        #ovhcloud: '%env(SHORT_MESSAGE_DSN)%'
+            #ovhcloud: '%env(OVHCLOUD_DSN)%'
+            #ovhcloud: '%env(SHORT_MESSAGE_DSN)%'
        channel_policy:
            # use chat/slack, chat/telegram, sms/twilio or sms/nexmo
            urgent: ['email']
--- a/config/packages/property_info.yaml
+++ b/config/packages/property_info.yaml
@@ -1,3 +0,0 @@
-framework:
-    property_info:
-        enabled: true
--- a/config/packages/security.yaml
+++ b/config/packages/security.yaml
@@ -1,4 +1,5 @@
 security:
+    enable_authenticator_manager: true
    # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
    password_hashers:
        Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
@@ -27,13 +28,16 @@ security:
            pattern: ^/wopi
            provider: chill_chain_provider
            stateless: true
-            jwt: ~
+            guard:
+                authenticators:
+                    - lexik_jwt_authentication.jwt_token_authenticator
        dav:
            pattern: ^/dav
            provider: chill_chain_provider
            stateless: true
-            custom_authenticator:
-                - Chill\DocStoreBundle\Security\Authenticator\JWTOnDavUrlAuthenticator
+            guard:
+                authenticators:
+                    - Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
        # this firewall is the main firewall for chill. It should be the last one in the stack,
        # unless you have specific needs
        chill_main:
@@ -59,7 +63,7 @@ security:
    # Note: Only the *first* access control that matches will be used
    access_control:
        # those lines are added by chill-bundles recipes, and are requires to make chill-bundles working
-        - { path: ^/(login|logout), roles: PUBLIC_ACCESS }
+        - { path: ^/(login|logout), roles: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: ^/public, roles: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: ^/wopi, roles: IS_AUTHENTICATED_FULLY }
        # access for homepage, the homepage redirect admin to admin section
--- a/config/packages/sensio_framework_extra.yaml
+++ b/config/packages/sensio_framework_extra.yaml
@@ -0,0 +1,3 @@
+sensio_framework_extra:
+    router:
+        annotations: false
--- a/config/packages/workflow_chill.yaml
+++ b/config/packages/workflow_chill.yaml
@@ -7,8 +7,7 @@ framework:
                        - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument
                        - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork
                        - Chill\DocStoreBundle\Entity\AccompanyingCourseDocument
-                label: Suivi
-                translated_labels:
+                label:
                    fr: 'Suivi'
            support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
            marking_store:
@@ -17,13 +16,11 @@ framework:
            places:
                initial:
                    metadata:
-                        label: Étape initiale
-                        translated_labels:
+                        label:
                            fr: Étape initiale
                attenteModification:
                    metadata:
-                        label: En attente de modification du document
-                        translated_labels:
+                        label:
                            fr: En attente de modification du document
                        validationFilterInputLabels:
                            forward: {fr: Modification effectuée}
@@ -31,8 +28,7 @@ framework:
                            neutral: {fr: Autre}
                attenteMiseEnForme:
                    metadata:
-                        label: En attente de mise en forme
-                        translated_labels:
+                        label:
                            fr: En attente de mise en forme
                        validationFilterInputLabels:
                            forward: {fr: Mise en forme terminée}
@@ -40,8 +36,7 @@ framework:
                            neutral: {fr: Autre}
                attenteVisa:
                    metadata:
-                        label: En attente de visa
-                        translated_labels:
+                        label:
                            fr: En attente de visa
                        validationFilterInputLabels:
                            forward: {fr: Visa accordé}
@@ -52,8 +47,7 @@ framework:
                        isSignature: ['user', 'person']
                        onSignatureCompleted:
                            transitionName: signatureApplied
-                        label: En attente de signature
-                        translated_labels:
+                        label:
                            fr: En attente de signature
                        validationFilterInputLabels:
                            forward: {fr: Signature accordée}
@@ -61,8 +55,7 @@ framework:
                            neutral: {fr: Autre}
                postSignature:
                    metadata:
-                        label: Signatures traitées
-                        translated_labels:
+                        label:
                            fr: Signatures traitées
                        validationFilterInputLabels:
                            forward: {fr: Poursuite du traitement}
@@ -70,8 +63,7 @@ framework:
                            neutral: {fr: Autre}
                attenteTraitement:
                    metadata:
-                        label: En attente de traitement
-                        translated_labels:
+                        label:
                            fr: En attente de traitement
                        validationFilterInputLabels:
                            forward: {fr: Traitement terminé favorablement}
@@ -79,8 +71,7 @@ framework:
                            neutral: {fr: Autre}
                attenteEnvoi:
                    metadata:
-                        label: En attente d'envoi
-                        translated_labels:
+                        label:
                            fr: En attente d'envoi
                        validationFilterInputLabels:
                            forward: {fr: Document envoyé}
@@ -88,8 +79,7 @@ framework:
                            neutral: {fr: Autre}
                attenteValidationMiseEnForme:
                    metadata:
-                        label: En attente de validation de la mise en forme
-                        translated_labels:
+                        label:
                            fr: En attente de validation de la mise en forme
                        validationFilterInputLabels:
                            forward: {fr: Validation de la mise en forme}
@@ -99,8 +89,7 @@ framework:
                    metadata:
                        isSentExternal: true
                        onExternalView: clotureApresLectureEnvoiExterne
-                        label: En attente d'ouverture par un destinataire externe
-                        translated_labels:
+                        label:
                            fr: En attente d'ouverture par un destinataire externe
                        validationFilterInputLabels:
                            forward: {fr: Document reçu par un destinataire externe}
@@ -110,15 +99,13 @@ framework:
                    metadata:
                        isFinal: true
                        isFinalPositive: false
-                        label: Annulé
-                        translated_labels:
+                        label:
                            fr: Annulé
                final:
                    metadata:
                        isFinal: true
                        isFinalPositive: true
-                        label: Finalisé
-                        translated_labels:
+                        label:
                            fr: Finalisé
            transitions:
                # transition qui avancent
@@ -127,8 +114,7 @@ framework:
                        - initial
                    to: attenteModification
                    metadata:
-                        label: Demande de modification du document
-                        translated_labels:
+                        label:
                            fr: Demande de modification du document
                        isForward: true
                demandeMiseEnForme:
@@ -137,8 +123,7 @@ framework:
                        - attenteModification
                    to: attenteMiseEnForme
                    metadata:
-                        label: Demande de mise en forme
-                        translated_labels:
+                        label:
                            fr: Demande de mise en forme
                        isForward: true
                demandeValidationMiseEnForme:
@@ -146,8 +131,7 @@ framework:
                        - attenteMiseEnForme
                    to: attenteValidationMiseEnForme
                    metadata:
-                        label: Demande de validation de la mise en forme
-                        translated_labels:
+                        label:
                            fr: Demande de validation de la mise en forme
                        isForward: true
                demandeVisa:
@@ -160,8 +144,7 @@ framework:
                        - attenteTraitement
                    to: attenteVisa
                    metadata:
-                        label: Demande de visa
-                        translated_labels:
+                        label:
                            fr: Demande de visa
                        isForward: true
                demandeSignature:
@@ -174,18 +157,14 @@ framework:
                        - attenteTraitement
                    to: attenteSignature
                    metadata:
-                        label: Demande de signature
-                        translated_labels:
-                            fr: Demande de signature
+                        label: {fr: Demande de signature}
                        isForward: true
                signatureApplied:
                    from:
                        - attenteSignature
                    to: postSignature
                    metadata:
-                        label: Signatures appliquées
-                        translated_labels:
-                            fr: Signatures appliquées
+                        label: {fr: Signatures appliquées}
                        isForward: true
                        transitionGuard: 'system' # can be 'system+only-dest' or 'only-dest' (only-dest is default)
                demandeTraitement:
@@ -198,9 +177,7 @@ framework:
                        - postSignature
                    to: attenteTraitement
                    metadata:
-                        label: Demande de traitement
-                        translated_labels:
-                            fr: Demande de traitement
+                        label: {fr: Demande de traitement}
                        isForward: true
                demandeEnvoi:
                    from:
@@ -213,9 +190,7 @@ framework:
                        - attenteTraitement
                    to: attenteEnvoi
                    metadata:
-                        label: Demande d'envoi
-                        translated_labels:
-                            fr: Demande d'envoi
+                        label: {fr: Demande d'envoi}
                        isForward: true
                demandeEnvoiExterne:
                    from:
@@ -228,9 +203,7 @@ framework:
                        - attenteTraitement
                    to: attenteReceptionExternal
                    metadata:
-                        label: Envoi sécurisé par courrier électronique
-                        translated_labels:
-                            fr: Envoi sécurisé par courrier électronique
+                        label: {fr: Envoi sécurisé par courrier électronique}
                        isForward: true
                clotureApresLectureEnvoiExterne:
                    from:
@@ -240,9 +213,7 @@ framework:
                    metadata:
                        transitionGuard: system
                        isForward:  true
-                        label: Consultation de l'envoi sécurisé
-                        translated_labels:
-                            fr: Consultation de l'envoi sécurisé
+                        label: {fr: Consultation de l'envoi sécurisé}
                annulation:
                    from:
                        - initial
@@ -256,9 +227,7 @@ framework:
                        - attenteEnvoi
                    to: annule
                    metadata:
-                        label: Annulation
-                        translated_labels:
-                            fr: Annulation
+                        label: {fr: Annulation}
                        isForward: false
                        transitionGuard: 'system+only-dest' # can be 'system+only-dest' or 'only-dest' (only-dest is default)
                # transitions qui répètent l'étape
@@ -268,35 +237,27 @@ framework:
                        - attenteValidationMiseEnForme
                    to: attenteMiseEnForme
                    metadata:
-                        label: Demande de mise en forme supplémentaire
-                        translated_labels:
-                            fr: Demande de mise en forme supplémentaire
+                        label: {fr: Demande de mise en forme supplémentaire}
                demandeVisaSupplementaire:
                    from:
                        - attenteVisa
                    to: attenteVisa
                    metadata:
-                        label: Demande de visa supplémentaire
-                        translated_labels:
-                            fr: Demande de visa supplémentaire
+                        label: {fr: Demande de visa supplémentaire}
                        isForward: true
                demandeSignatureSupplementaire:
                    from:
                        - postSignature
                    to: attenteSignature
                    metadata:
-                        label: Demande de signature supplémentaire
-                        translated_labels:
-                            fr: Demande de signature supplémentaire
+                        label: {fr: Demande de signature supplémentaire}
                        isForward: true
                demandeTraitementSupplementaire:
                    from:
                        - attenteTraitement
                    to: attenteTraitement
                    metadata:
-                        label: Demande de traitement supplémentaire
-                        translated_labels:
-                            fr: Demande de traitement supplémentaire
+                        label: {fr: Demande de traitement supplémentaire}
                # transitions qui renvoient vers une étape précédente
                refusEtModificationDocument:
                    from:
@@ -306,8 +267,7 @@ framework:
                        - attenteEnvoi
                    to: attenteModification
                    metadata:
-                        label: Refus et demande de modification du document
-                        translated_labels:
+                        label:
                            fr: Refus et demande de modification du document
                        isForward: false
                refusEtDemandeMiseEnForme:
@@ -317,9 +277,7 @@ framework:
                        - attenteEnvoi
                    to: attenteMiseEnForme
                    metadata:
-                        label: Refus et demande de mise en forme
-                        translated_labels:
-                            fr: Refus et demande de mise en forme
+                        label: {fr: Refus et demande de mise en forme}
                        isForward: false
                refusEtDemandeVisa:
                    from:
@@ -327,27 +285,21 @@ framework:
                        - attenteEnvoi
                    to: attenteVisa
                    metadata:
-                        label: Refus et demande de visa
-                        translated_labels:
-                            fr: Refus et demande de visa
+                        label: {fr: Refus et demande de visa}
                        isForward: false
                refusEtDemandeSignature:
                    from:
                        - attenteEnvoi
                    to: attenteSignature
                    metadata:
-                        label: Refus et demande de signature
-                        translated_labels:
-                            fr: Refus et demande de signature
+                        label: {fr: Refus et demande de signature}
                        isForward: false
                refusEtDemandeTraitement:
                    from:
                        - attenteEnvoi
                    to: attenteTraitement
                    metadata:
-                        label: Refus et demande de traitement
-                        translated_labels:
-                            fr: Refus et demande de traitement
+                        label: {fr: Refus et demande de traitement}
                        isForward: false
                # transition vers final
                initialToFinal:
@@ -355,9 +307,7 @@ framework:
                        - initial
                    to: final
                    metadata:
-                        label: Clotûre immédiate et cloture positive
-                        translated_labels:
-                            fr: Clotûre immédiate et cloture positive
+                        label: {fr: Clotûre immédiate et cloture positive}
                        isForward: true
                attenteMiseEnFormeToFinal:
                    from:
@@ -365,43 +315,33 @@ framework:
                        - attenteValidationMiseEnForme
                    to: final
                    metadata:
-                        label: Mise en forme terminée et cloture positive
-                        translated_labels:
-                            fr: Mise en forme terminée et cloture positive
+                        label: {fr: Mise en forme terminée et cloture positive}
                        isForward: true
                attenteVisaToFinal:
                    from:
                        - attenteVisa
                    to: final
                    metadata:
-                        label: Accorde le visa et cloture positive
-                        translated_labels:
-                            fr: Accorde le visa et cloture positive
+                        label: {fr: Accorde le visa et cloture positive}
                        isForward: true
                postSignatureToFinal:
                    from:
                        - postSignature
                    to: final
                    metadata:
-                        label: Cloture positive
-                        translated_labels:
-                            fr: Cloture positive
+                        label: {fr: Cloture positive}
                        isForward: true
                attenteTraitementToFinal:
                    from:
                        - attenteTraitement
                    to: final
                    metadata:
-                        label: Traitement terminé et cloture positive
-                        translated_labels:
-                            fr: Traitement terminé et cloture positive
+                        label: {fr: Traitement terminé et cloture positive}
                        isForward: true
                attenteEnvoiToFinal:
                    from:
                        - attenteEnvoi
                    to: final
                    metadata:
-                        label: Envoyé et cloture positive
-                        translated_labels:
-                            fr: Envoyé et cloture positive
+                        label: {fr: Envoyé et cloture positive}
                        isForward: true
--- a/config/routes/annotations.yaml
+++ b/config/routes/annotations.yaml
@@ -0,0 +1,3 @@
+kernel:
+    resource: ../../src/app/Kernel.php
+    type: annotation
--- a/config/routes/chill_ticket.yaml
+++ b/config/routes/chill_ticket.yaml
@@ -0,0 +1,2 @@
+chill_ticket_bundle:
+    resource: '@ChillTicketBundle/config/routes.yaml'
--- a/config/routes/security.yaml
+++ b/config/routes/security.yaml
@@ -1,3 +0,0 @@
-_security_logout:
-    resource: security.route_loader.logout
-    type: service
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -6,15 +6,8 @@
 parameters:

 services:
-    #alias to inject container into AbstractController::setContainer
-    Psr\Container\ContainerInterface: '@service_container'
-
    # default configuration for services in *this* file
    _defaults:
        autowire: true      # Automatically injects dependencies in your services.
        autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.

-    # Custom entity value resolver to replace SensioFrameworkExtraBundle functionality
-    Chill\MainBundle\ArgumentResolver\EntityValueResolver:
-        tags:
-            - { name: controller.argument_value_resolver, priority: 50 }
--- a/docs/source/_static/code/exports/BirthdateFilter.php
+++ b/docs/source/_static/code/exports/BirthdateFilter.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Export\Filter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
+use DateTime;
 use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -21,7 +22,6 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
-
    // add specific role for this filter
    public function addRole(): ?string
    {
@@ -30,7 +30,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
    }

    // here, we alter the query created by Export
-    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
    {
        $where = $qb->getDQLPart('where');
        // we create the clause here
@@ -76,25 +76,21 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
            'format' => 'dd-MM-yyyy',
        ]);
    }
-
    public function getNormalizationVersion(): int
    {
        return 1;
    }
-
    public function normalizeFormData(array $formData): array
    {
        return ['date_from' => $this->normalizeDate($formData['date_from']), 'date_to' => $this->normalizeDate($formData['date_to'])];
    }
-
    public function denormalizeFormData(array $formData, int $fromVersion): array
    {
        return ['date_from' => $this->denormalizeDate($formData['date_from']), 'date_to' => $this->denormalizeDate($formData['date_to'])];
    }
-
    public function getFormDefaultData(): array
    {
-        return ['date_from' => new \DateTime(), 'date_to' => new \DateTime()];
+        return ['date_from' => new DateTime(), 'date_to' => new DateTime()];
    }

    // here, we create a simple string which will describe the action of
@@ -102,7 +98,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
    {
        return ['Filtered by person\'s birtdate: '
-            .'between %date_from% and %date_to%', [
+            . 'between %date_from% and %date_to%', [
                '%date_from%' => $data['date_from']->format('d-m-Y'),
                '%date_to%' => $data['date_to']->format('d-m-Y'),
            ], ];
@@ -124,13 +120,13 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac

        if (null === $date_from) {
            $context->buildViolation('The "date from" should not be empty')
-                // ->atPath('date_from')
+                //->atPath('date_from')
                ->addViolation();
        }

        if (null === $date_to) {
            $context->buildViolation('The "date to" should not be empty')
-                // ->atPath('date_to')
+                //->atPath('date_to')
                ->addViolation();
        }

@@ -139,7 +135,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
            && $date_from >= $date_to
        ) {
            $context->buildViolation('The date "date to" should be after the '
-                .'date given in "date from" field')
+                . 'date given in "date from" field')
                ->addViolation();
        }
    }
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -32,7 +32,7 @@ class CountPerson implements ExportInterface
        $this->entityManager = $em;
    }

-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
    {
        // this export does not add any form
    }
--- a/docs/source/development/create-a-new-bundle.rst
+++ b/docs/source/development/create-a-new-bundle.rst
@@ -11,24 +11,94 @@
 Create a new bundle
 *******************

-Create your own bundle is not a trivial task.
-
-The easiest way to achieve this is seems to be : 
-
-1. Prepare a fresh installation of the chill project, in a new directory
-2. Create a new bundle in this project, in the src directory
-3. Initialize a git repository **at the root bundle**, and create your initial commit.
-4. Register the bundle with composer/packagist. If you do not plan to distribute your bundle with packagist, you may use a custom repository for achieve this [#f1]_
-5. Move to a development installation, made as described in the :ref:`installation-for-development` section, and add your new repository to the composer.json file
-6. Work as :ref:`usual <editing-code-and-commiting>`
-
 .. warning::

    This part of the doc is not yet tested

-TODO
+Create a new directory with Bundle class
+----------------------------------------
+
+.. code-block:: bash
+
+   mkdir -p src/Bundle/ChillSomeBundle/src/config
+   mkdir -p src/Bundle/ChillSomeBundle/src/Controller
+
+Add a bundle file
+
+.. code-block:: php
+
+    <?php
+
+    declare(strict_types=1);
+
+    /*
+     * Chill is a software for social workers
+     *
+     * For the full copyright and license information, please view
+     * the LICENSE file that was distributed with this source code.
+     */
+
+    namespace Chill\SomeBundle;
+
+    use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+    class ChillSomeBundle extends Bundle {}
+
+And a route file:
+
+.. code-block:: yaml
+
+   chill_ticket_controller:
+       resource: '@ChillTicketBundle/Controller/'
+       type: annotation
+
+Register the new psr-4 namespace
+--------------------------------
+
+In composer.json, add the new psr4 namespace
+
+.. code-block:: diff
+
+    {
+    "autoload": {
+        "psr-4": {
+    +        "Chill\\SomeBundle\\": "src/Bundle/ChillSomeBundle/src",
+        }
+    }
+    }


-.. rubric:: Footnotes
+Register the bundle
+-------------------
+
+Register in the file :code:`config/bundles.php`:
+
+.. code-block:: php
+
+    Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
+
+And import routes in :code:`config/routes/chill_some_bundle.yaml`:
+
+.. code-block:: yaml
+
+   chill_ticket_bundle:
+       resource: '@ChillSomeBundle/config/routes.yaml'
+
+Add the doctrine_migration namespace
+------------------------------------
+
+Add the namespace to :code:`config/packages/doctrine_migrations_chill.yaml`
+
+.. code-block:: diff
+
+   doctrine_migrations:
+       migrations_paths:
+   +        'Chill\Some\Ticket': '@ChillSomeBundle/migrations'
+
+Dump autoloading
+----------------
+
+.. code-block:: bash
+
+   symfony composer dump-autoload

-.. [#f1] Be aware that we use the Affero GPL Licence, which ensure that all users must have access to derivative works done with this software.
--- a/docs/source/development/pagination/example.php
+++ b/docs/source/development/pagination/example.php
@@ -18,7 +18,7 @@ class example extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractControl
    public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry)
    {
    }
-    public function yourAction(): \Symfony\Component\HttpFoundation\Response
+    public function yourAction()
    {
        $em = $this->managerRegistry->getManager();
        // first, get the number of total item are available
--- a/docs/source/development/useful-snippets/controller-secured-for-person.php
+++ b/docs/source/development/useful-snippets/controller-secured-for-person.php
@@ -28,7 +28,7 @@ class ConsultationController extends \Symfony\Bundle\FrameworkBundle\Controller\
     *
     * @return \Symfony\Component\HttpFoundation\Response
     */
-    public function listAction($id): \Symfony\Component\HttpFoundation\Response
+    public function listAction($id)
    {
        /** @var \Chill\PersonBundle\Entity\Person $person */
        $person = $this->get('chill.person.repository.person')
--- a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
+++ b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
@@ -31,7 +31,7 @@ class ChillMainConfiguration implements ConfigurationInterface
        $this->setWidgetFactories($widgetFactories);
    }

-    public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder
+    public function getConfigTreeBuilder()
    {
        $treeBuilder = new TreeBuilder('chill_main');
        $rootNode = $treeBuilder->getRootNode();
--- a/docs/source/development/user-interface/widgets/ChillMainExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillMainExtension.php
@@ -27,12 +27,12 @@ class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesE
     */
    protected $widgetFactories = [];

-    public function addWidgetFactory(WidgetFactoryInterface $factory): void
+    public function addWidgetFactory(WidgetFactoryInterface $factory)
    {
        $this->widgetFactories[] = $factory;
    }

-    public function getConfiguration(array $config, ContainerBuilder $container): ?\Symfony\Component\Config\Definition\ConfigurationInterface
+    public function getConfiguration(array $config, ContainerBuilder $container)
    {
        return new Configuration($this->widgetFactories, $container);
    }
@@ -45,7 +45,7 @@ class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesE
        return $this->widgetFactories;
    }

-    public function load(array $configs, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container)
    {
        // configuration for main bundle
        $configuration = $this->getConfiguration($configs, $container);
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
@@ -25,7 +25,7 @@ class ChillPersonAddAPersonListWidgetFactory extends AbstractWidgetFactory
     * see http://symfony.com/doc/current/components/config/definition.html
     *
     */
-    public function configureOptions($place, NodeBuilder $node): void
+    public function configureOptions($place, NodeBuilder $node)
    {
        $node->booleanNode('only_active')
            ->defaultTrue()
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
@@ -124,7 +124,7 @@ class ChillPersonAddAPersonWidget implements WidgetInterface
    /**
     * @return UserInterface
     */
-    private function getUser(): void
+    private function getUser()
    {
        // return a user
    }
--- a/docs/source/development/user-interface/widgets/ChillPersonExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonExtension.php
@@ -22,7 +22,7 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 */
 class ChillPersonExtension extends Extension implements PrependExtensionInterface
 {
-    public function load(array $configs, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container)
    {
        // ...
    }
@@ -32,7 +32,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
     *
     * @param \Chill\PersonBundle\DependencyInjection\containerBuilder $container
     */
-    public function prepend(ContainerBuilder $container): void
+    public function prepend(ContainerBuilder $container)
    {
        $container->prependExtensionConfig('chill_main', [
            'widgets' => [
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
    "@hotwired/stimulus": "^3.0.0",
    "@luminateone/eslint-baseline": "^1.0.9",
    "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
    "@symfony/webpack-encore": "^4.1.0",
    "@tsconfig/node20": "^20.1.4",
    "@types/dompurify": "^3.0.5",
@@ -80,12 +79,12 @@
    "dev": "encore dev",
    "watch": "encore dev --watch",
    "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
+    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
    "specs-validate": "swagger-cli validate templates/api/specs.yaml",
    "specs-create-dir": "mkdir -p templates/api",
    "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
    "version": "node --version",
-    "eslint": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
+    "eslint": "eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
  },
  "private": true
 }
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,34 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         failOnNotice="true"
-         failOnWarning="true"
-         bootstrap="tests/bootstrap.php"
-         cacheDirectory=".phpunit.cache"
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    backupGlobals="false"
+    colors="true"
+    bootstrap="tests/bootstrap.php"
 >
-    <php>
-        <ini name="display_errors" value="1" />
-        <ini name="error_reporting" value="-1" />
-        <server name="APP_ENV" value="test" force="true" />
-        <server name="SHELL_VERBOSITY" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>tests</directory>
+  <php>
+    <ini name="display_errors" value="1" />
+    <ini name="error_reporting" value="-1"/>
+    <server name="APP_ENV" value="test" force="true"/>
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=93&amp;max[indirect]=999999"/>
+    <server name="SHELL_VERBOSITY" value="-1"/>
+      <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
+      <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
+      <ini name="date.timezone" value="Europe/Brussels" />
+  </php>
+  <testsuites>
+    <!--
+        <testsuite name="ActivityBundle">
+            <directory suffix="Test.php">src/Bundle/ChillActivityBundle/Tests/</directory>
        </testsuite>
-    </testsuites>
-
-    <source ignoreSuppressionOfDeprecations="true" restrictNotices="true" restrictWarnings="true">
-        <include>
-            <directory>src</directory>
-        </include>
-    </source>
+        -->
+    <testsuite name="AsideActivityBundle">
+      <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
+    </testsuite>
+    <testsuite name="BudgetBundle">
+      <directory suffix="Test.php">src/Bundle/ChillBudgetBundle/Tests/</directory>
+    </testsuite>
+    <testsuite name="CalendarBundle">
+      <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
+    </testsuite>
+    <!-- Missing CustomFieldBundle -->
+    <testsuite name="DocGeneratorBundle">
+      <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
+    </testsuite>
+    <testsuite name="DocStoreBundle">
+      <directory suffix="Test.php">src/Bundle/ChillDocStoreBundle/Tests/</directory>
+    </testsuite>
+    <!--
+        <testsuite name="EventBundle">
+            <directory suffix="Test.php">src/Bundle/ChillEventBundle/tests/</directory>
+        </testsuite>
+        -->
+    <testsuite name="MainBundle">
+      <directory suffix="Test.php">src/Bundle/ChillMainBundle/Tests/</directory>
+    </testsuite>
+    <testsuite name="PersonBundle">
+      <directory suffix="Test.php">src/Bundle/ChillPersonBundle/Tests/</directory>
+      <!-- we are rewriting accompanying periods... Work in progress -->
+      <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php</exclude>
+      <!-- we are rewriting address, Work in progress -->
+      <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php</exclude>
+      <!-- find a solution to create multiple configs -->
+      <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php</exclude>
+      <!-- temporarily removed, the time to find a fix -->
+      <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
+    </testsuite>

+    <testsuite name="TicketBundle">
+      <directory suffix="Test.php">src/Bundle/ChillTicketBundle/tests/</directory>
+    </testsuite>
+    <!--
+        <testsuite name="ReportBundle">
+            <directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>
+        </testsuite>
+        -->
+    <!--
+        <testsuite name="TaskBundle">
+            <directory suffix="Test.php">src/Bundle/ChillTaskBundle/Tests</directory>
+        </testsuite>
+        -->
+    <testsuite name="ThirdPartyBundle">
+      <directory suffix="Test.php">src/Bundle/ChillThirdPartyBundle/Tests</directory>
+    </testsuite>
+    <testsuite name="WopiBundle">
+      <directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
+    </testsuite>
+  </testsuites>
+  <!-- Run `composer require symfony/panther` before enabling this extension -->
+  <!--
    <extensions>
+        <extension class="Symfony\Component\Panther\ServerExtension" />
    </extensions>
+    -->
 </phpunit>
--- a/rector.php
+++ b/rector.php
@@ -13,24 +13,23 @@ use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Php80\Rector\Class_\AnnotationToAttributeRector;
 use Rector\Set\ValueObject\LevelSetList;
-use Rector\Symfony\Set\SymfonySetList;

 return static function (RectorConfig $rectorConfig): void {
    $rectorConfig->paths([
-        __DIR__.'/docs',
-        __DIR__.'/src',
-        __DIR__.'/rector.php',
+        __DIR__ . '/docs',
+        __DIR__ . '/src',
+        __DIR__ . '/rector.php',
    ]);

    $rectorConfig->skip([
-        Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class => __DIR__.'src/Bundle/ChillMainBundle/Service/Notifier/LegacyOvhCloudFactory.php',
+        \Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class => __DIR__ . 'src/Bundle/ChillMainBundle/Service/Notifier/LegacyOvhCloudFactory.php'
    ]);

-    // $rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/test/App_KernelTestDebugContainer.xml  ');
-    // $rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
+    //$rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/test/App_KernelTestDebugContainer.xml  ');
+    //$rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');

-    // $rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
-    // $rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');
+    //$rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
+    //$rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');

    // register a single rule
    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
@@ -38,72 +37,54 @@ return static function (RectorConfig $rectorConfig): void {
    $rectorConfig->rule(Rector\TypeDeclaration\Rector\Class_\MergeDateTimePropertyTypeDeclarationRector::class);
    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector::class);

-    // Add return types to controller methods
-    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector::class);
-    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector::class);
-    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector::class);
-    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector::class);
-
    // part of the symfony 54 rules
-    $rectorConfig->rule(Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
-    $rectorConfig->rule(Rector\Symfony\Symfony60\Rector\MethodCall\GetHelperControllerToServiceRector::class);
-    // $rectorConfig->disableParallel();
+    $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
+    $rectorConfig->rule(\Rector\Symfony\Symfony60\Rector\MethodCall\GetHelperControllerToServiceRector::class);
+    //$rectorConfig->disableParallel();

-    // define sets of rules
+    //define sets of rules
    $rectorConfig->sets([
-//        LevelSetList::UP_TO_PHP_82,
-//        SymfonySetList::SYMFONY_60,
-//        SymfonySetList::SYMFONY_61,
-//        SymfonySetList::SYMFONY_62,
-//        SymfonySetList::SYMFONY_63,
-//        SymfonySetList::SYMFONY_64,
-//        SymfonySetList::SYMFONY_70,
-//        SymfonySetList::SYMFONY_71,
-        Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_ORM_29,
-        Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_DBAL_30,
-        Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
-        Rector\Doctrine\Set\DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
+        LevelSetList::UP_TO_PHP_82,
+        \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
+        \Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_90,
    ]);

-    $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Symfony\Component\Serializer\Annotation\Context'),
+    $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class, [
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Symfony\Component\Serializer\Annotation\Context'),
    ]);

    // migrate for phpunit
    $rectorConfig->rules([
-        Rector\PHPUnit\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector::class,
-        Rector\PHPUnit\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector::class,
+        \Rector\PHPUnit\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector::class,
+        \Rector\PHPUnit\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector::class
    ]);

    // some routes are added twice if it remains activated
    // $rectorConfig->rule(\Rector\Symfony\Configs\Rector\ClassMethod\AddRouteAnnotationRector::class);

-    // chill rules
-    $rectorConfig->rules([
-        Chill\Utils\Rector\Rector\ChillBundleMakeDataProviderStaticForAbstractExportTestRector::class,
-    ]);
-
    // skip some path...
    $rectorConfig->skip([
        // waiting for fixing this bug: https://github.com/rectorphp/rector-doctrine/issues/342
-        Rector\Doctrine\CodeQuality\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector::class,
+        \Rector\Doctrine\CodeQuality\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector::class,
    ]);

    $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\MaxHolder'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\Birthdate'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\ActivityBundle\Validator\Constraints\ActivityValidity'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validation\Constraint\PhonenumberConstraint'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency'),
-        new Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\MaxHolder'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\Birthdate'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\ActivityBundle\Validator\Constraints\ActivityValidity'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validation\Constraint\PhonenumberConstraint'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation'),
    ]);
+
+
 };
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -74,8 +74,8 @@ final class ActivityController extends AbstractController
    /**
     * Deletes a Activity entity.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/activity/{id}/delete', name: 'chill_activity_activity_delete', methods: ['GET', 'POST', 'DELETE'])]
-    public function deleteAction(Request $request, mixed $id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/delete', name: 'chill_activity_activity_delete', methods: ['GET', 'POST', 'DELETE'])]
+    public function deleteAction(Request $request, mixed $id)
    {
        $view = null;

@@ -104,7 +104,7 @@ final class ActivityController extends AbstractController

            if ($form->isSubmitted() && $form->isValid()) {
                $this->logger->notice('An activity has been removed', [
-                    'by_user' => $this->getUser()->getUserIdentifier(),
+                    'by_user' => $this->getUser()->getUsername(),
                    'activity_id' => $activity->getId(),
                    'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
                    'comment' => $activity->getComment()->getComment(),
@@ -134,7 +134,7 @@ final class ActivityController extends AbstractController

        return $this->render($view, [
            'activity' => $activity,
-            'delete_form' => $form,
+            'delete_form' => $form->createView(),
            'person' => $person,
            'accompanyingCourse' => $accompanyingPeriod,
        ]);
@@ -143,7 +143,7 @@ final class ActivityController extends AbstractController
    /**
     * Displays a form to edit an existing Activity entity.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/activity/{id}/edit', name: 'chill_activity_activity_edit', methods: ['GET', 'POST', 'PUT'])]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/edit', name: 'chill_activity_activity_edit', methods: ['GET', 'POST', 'PUT'])]
    public function editAction(int $id, Request $request): Response
    {
        $view = null;
@@ -226,8 +226,8 @@ final class ActivityController extends AbstractController

        return $this->render($view, [
            'entity' => $entity,
-            'edit_form' => $form,
-            'delete_form' => $deleteForm,
+            'edit_form' => $form->createView(),
+            'delete_form' => $deleteForm->createView(),
            'person' => $person,
            'accompanyingCourse' => $accompanyingPeriod,
            'activity_json' => $activity_array,
@@ -237,7 +237,7 @@ final class ActivityController extends AbstractController
    /**
     * Lists all Activity entities.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/activity/', name: 'chill_activity_activity_list')]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/', name: 'chill_activity_activity_list')]
    public function listAction(Request $request): Response
    {
        $view = null;
@@ -341,7 +341,7 @@ final class ActivityController extends AbstractController
        return $filterBuilder->build();
    }

-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/activity/new', name: 'chill_activity_activity_new', methods: ['POST', 'GET'])]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/new', name: 'chill_activity_activity_new', methods: ['POST', 'GET'])]
    public function newAction(Request $request): Response
    {
        $view = null;
@@ -364,7 +364,7 @@ final class ActivityController extends AbstractController
        $activityData = null;

        if ($request->query->has('activityData')) {
-            $activityData = $request->query->all('activityData');
+            $activityData = $request->query->get('activityData');
        }

        if (
@@ -516,13 +516,13 @@ final class ActivityController extends AbstractController
            'person' => $person,
            'accompanyingCourse' => $accompanyingPeriod,
            'entity' => $entity,
-            'form' => $form,
+            'form' => $form->createView(),
            'activity_json' => $activity_array,
            'default_location' => $defaultLocation,
        ]);
    }

-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/activity/select-type', name: 'chill_activity_activity_select_type')]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/select-type', name: 'chill_activity_activity_select_type')]
    public function selectTypeAction(Request $request): Response
    {
        $view = null;
@@ -567,7 +567,7 @@ final class ActivityController extends AbstractController
        ]);
    }

-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/activity/{id}/show', name: 'chill_activity_activity_show')]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/show', name: 'chill_activity_activity_show')]
    public function showAction(Request $request, int $id): Response
    {
        $entity = $this->activityRepository->find($id);
@@ -611,7 +611,7 @@ final class ActivityController extends AbstractController
            'person' => $person,
            'accompanyingCourse' => $accompanyingPeriod,
            'entity' => $entity,
-            'delete_form' => $deleteForm,
+            'delete_form' => $deleteForm->createView(),
        ]);
    }

--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -27,8 +27,8 @@ class ActivityReasonCategoryController extends AbstractController
    /**
     * Creates a new ActivityReasonCategory entity.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreasoncategory/create', name: 'chill_activity_activityreasoncategory_create', methods: ['POST'])]
-    public function createAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/create', name: 'chill_activity_activityreasoncategory_create', methods: ['POST'])]
+    public function createAction(Request $request)
    {
        $entity = new ActivityReasonCategory();
        $form = $this->createCreateForm($entity);
@@ -44,15 +44,15 @@ class ActivityReasonCategoryController extends AbstractController

        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
            'entity' => $entity,
-            'form' => $form,
+            'form' => $form->createView(),
        ]);
    }

    /**
     * Lists all ActivityReasonCategory entities.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreasoncategory/', name: 'chill_activity_activityreasoncategory')]
-    public function indexAction(): \Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/', name: 'chill_activity_activityreasoncategory')]
+    public function indexAction()
    {
        $em = $this->managerRegistry->getManager();

@@ -66,23 +66,23 @@ class ActivityReasonCategoryController extends AbstractController
    /**
     * Displays a form to create a new ActivityReasonCategory entity.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreasoncategory/new', name: 'chill_activity_activityreasoncategory_new')]
-    public function newAction(): \Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/new', name: 'chill_activity_activityreasoncategory_new')]
+    public function newAction()
    {
        $entity = new ActivityReasonCategory();
        $form = $this->createCreateForm($entity);

        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
            'entity' => $entity,
-            'form' => $form,
+            'form' => $form->createView(),
        ]);
    }

    /**
     * Edits an existing ActivityReasonCategory entity.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update', methods: ['POST', 'PUT'])]
-    public function updateAction(Request $request, mixed $id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update')]
+    public function updateAction(Request $request, mixed $id)
    {
        $em = $this->managerRegistry->getManager();

@@ -103,7 +103,7 @@ class ActivityReasonCategoryController extends AbstractController

        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
            'entity' => $entity,
-            'edit_form' => $editForm,
+            'edit_form' => $editForm->createView(),
        ]);
    }

--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -28,8 +28,8 @@ class ActivityReasonController extends AbstractController
    /**
     * Creates a new ActivityReason entity.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreason/create', name: 'chill_activity_activityreason_create', methods: ['POST'])]
-    public function createAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/create', name: 'chill_activity_activityreason_create', methods: ['POST'])]
+    public function createAction(Request $request)
    {
        $entity = new ActivityReason();
        $form = $this->createCreateForm($entity);
@@ -45,15 +45,15 @@ class ActivityReasonController extends AbstractController

        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
            'entity' => $entity,
-            'form' => $form,
+            'form' => $form->createView(),
        ]);
    }

    /**
     * Lists all ActivityReason entities.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreason/', name: 'chill_activity_activityreason')]
-    public function indexAction(): \Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/', name: 'chill_activity_activityreason')]
+    public function indexAction()
    {
        $em = $this->managerRegistry->getManager();

@@ -67,23 +67,23 @@ class ActivityReasonController extends AbstractController
    /**
     * Displays a form to create a new ActivityReason entity.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreason/new', name: 'chill_activity_activityreason_new')]
-    public function newAction(): \Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/new', name: 'chill_activity_activityreason_new')]
+    public function newAction()
    {
        $entity = new ActivityReason();
        $form = $this->createCreateForm($entity);

        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
            'entity' => $entity,
-            'form' => $form,
+            'form' => $form->createView(),
        ]);
    }

    /**
     * Edits an existing ActivityReason entity.
     */
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update', methods: ['POST', 'PUT'])]
-    public function updateAction(Request $request, mixed $id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update')]
+    public function updateAction(Request $request, mixed $id)
    {
        $em = $this->managerRegistry->getManager();

@@ -104,7 +104,7 @@ class ActivityReasonController extends AbstractController

        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
            'entity' => $entity,
-            'edit_form' => $editForm,
+            'edit_form' => $editForm->createView(),
        ]);
    }

--- a/src/Bundle/ChillActivityBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
@@ -18,15 +18,15 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 */
 class AdminController extends AbstractController
 {
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activity', name: 'chill_activity_admin_index')]
-    public function indexActivityAction(): \Symfony\Component\HttpFoundation\Response
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activity', name: 'chill_activity_admin_index')]
+    public function indexActivityAction()
    {
        return $this->render('@ChillActivity/Admin/layout_activity.html.twig');
    }

-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activity_redirect_to_main', name: 'chill_admin_aside_activity_redirect_to_admin_index', options: [null])]
-    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activity_redirect_to_main', name: 'chill_admin_activity_redirect_to_admin_index')]
-    public function redirectToAdminIndexAction(): \Symfony\Component\HttpFoundation\RedirectResponse
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activity_redirect_to_main', name: 'chill_admin_aside_activity_redirect_to_admin_index', options: [null])]
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activity_redirect_to_main', name: 'chill_admin_activity_redirect_to_admin_index')]
+    public function redirectToAdminIndexAction()
    {
        return $this->redirectToRoute('chill_main_admin_central');
    }
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
@@ -27,6 +27,8 @@ use Faker\Factory as FakerFactory;

 class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 {
+    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
    private readonly \Faker\Generator $faker;

    public function __construct(private readonly EntityManagerInterface $em)
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -25,7 +25,7 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 */
 class ChillActivityExtension extends Extension implements PrependExtensionInterface
 {
-    public function load(array $configs, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container)
    {
        $configuration = new Configuration();
        $config = $this->processConfiguration($configuration, $configs);
@@ -44,14 +44,14 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
        $loader->load('services/doctrine.entitylistener.yaml');
    }

-    public function prepend(ContainerBuilder $container): void
+    public function prepend(ContainerBuilder $container)
    {
        $this->prependRoutes($container);
        $this->prependAuthorization($container);
        $this->prependCruds($container);
    }

-    public function prependAuthorization(ContainerBuilder $container): void
+    public function prependAuthorization(ContainerBuilder $container)
    {
        $container->prependExtensionConfig('security', [
            'role_hierarchy' => [
@@ -71,7 +71,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
    /** (non-PHPdoc).
     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
     */
-    public function prependRoutes(ContainerBuilder $container): void
+    public function prependRoutes(ContainerBuilder $container)
    {
        // add routes for custom bundle
        $container->prependExtensionConfig('chill_main', [
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -22,7 +22,7 @@ use function is_int;
 */
 class Configuration implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder
+    public function getConfigTreeBuilder()
    {
        $treeBuilder = new TreeBuilder('chill_activity');
        $rootNode = $treeBuilder->getRootNode();
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
@@ -40,7 +40,7 @@ class ActivityReason
     *
     * @return bool
     */
-    public function getActive(): bool
+    public function getActive()
    {
        return $this->active;
    }
@@ -58,7 +58,7 @@ class ActivityReason
     *
     * @return int
     */
-    public function getId(): ?int
+    public function getId()
    {
        return $this->id;
    }
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
@@ -61,7 +61,7 @@ class ActivityReasonCategory implements \Stringable
     *
     * @return bool
     */
-    public function getActive(): bool
+    public function getActive()
    {
        return $this->active;
    }
@@ -71,7 +71,7 @@ class ActivityReasonCategory implements \Stringable
     *
     * @return int
     */
-    public function getId(): ?int
+    public function getId()
    {
        return $this->id;
    }
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -188,7 +188,7 @@ class ActivityType
    private int $userVisible = self::FIELD_REQUIRED;

    #[Assert\Callback]
-    public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload): void
+    public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload)
    {
        if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
            // if social issues are invisible then social actions cannot be optional or required + if social issues are optional then social actions shouldn't be required
@@ -461,17 +461,11 @@ class ActivityType
    {
        $property = $field.'Visible';

-        // Get the real class name (not the proxy)
-        $class = get_class($this);
-        if (str_contains($class, '__CG__')) {
-            $class = get_parent_class($this);
-        }
-        $realClass = $class;
-
-        if (!property_exists($realClass, $property)) {
+        if (!property_exists($this, $property)) {
            throw new \InvalidArgumentException('Field "'.$field.'" not found');
        }

+        /* @phpstan-ignore-next-line */
        return self::FIELD_INVISIBLE !== $this->{$property};
    }

--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -21,7 +21,7 @@ class ActivityEntityListener
 {
    public function __construct(private readonly EntityManagerInterface $em, private readonly AccompanyingPeriodWorkRepository $workRepository) {}

-    public function persistActionToCourse(Activity $activity): void
+    public function persistActionToCourse(Activity $activity)
    {
        if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
            $period = $activity->getAccompanyingPeriod();
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityTypeAggregator.php
@@ -53,7 +53,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface

    public function normalizeFormData(array $formData): array
    {
-        return ['after_date' => $formData['after_date']?->normalize(), 'before_date' => $formData['before_date']?->normalize()];
+        return ['after_date' => $formData['after_date']->normalize(), 'before_date' => $formData['before_date']->normalize()];
    }

    public function denormalizeFormData(array $formData, int $fromVersion): array
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -42,7 +42,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
    {
        // TODO: Implement buildForm() method.
    }
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountHouseholdOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountHouseholdOnActivity.php
@@ -42,7 +42,7 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    public function buildForm(FormBuilderInterface $builder): void {}
+    public function buildForm(FormBuilderInterface $builder) {}

    public function getNormalizationVersion(): int
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
@@ -34,7 +34,7 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
        private FilterListAccompanyingPeriodHelperInterface $filterListAccompanyingPeriodHelper,
    ) {}

-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
    {
        $this->helper->buildForm($builder);
    }
@@ -154,7 +154,7 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
        return ActivityStatsVoter::LISTS;
    }

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

-    public function buildForm(FormBuilderInterface $builder): void {}
+    public function buildForm(FormBuilderInterface $builder) {}

    public function getNormalizationVersion(): int
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -11,7 +11,6 @@ declare(strict_types=1);

 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;

-use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
@@ -60,7 +59,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    public function buildForm(FormBuilderInterface $builder): void
+    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('fields', ChoiceType::class, [
            'multiple' => true,
@@ -215,7 +214,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
        $qb = $this->entityManager->createQueryBuilder();

        $qb
-            ->from(Activity::class, 'activity')
+            ->from('ChillActivityBundle:Activity', 'activity')
            ->join('activity.person', 'person')
            ->join(
                HouseholdMember::class,
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
@@ -19,7 +19,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class ActivityReasonCategoryType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options): void
+    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $builder
            ->add('name', TranslatableStringFormType::class)
@@ -29,7 +29,7 @@ class ActivityReasonCategoryType extends AbstractType
    /**
     * @param OptionsResolverInterface $resolver
     */
-    public function configureOptions(OptionsResolver $resolver): void
+    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults([
            'data_class' => \Chill\ActivityBundle\Entity\ActivityReasonCategory::class,
@@ -39,7 +39,7 @@ class ActivityReasonCategoryType extends AbstractType
    /**
     * @return string
     */
-    public function getBlockPrefix(): string
+    public function getBlockPrefix()
    {
        return 'chill_activitybundle_activityreasoncategory';
    }
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
@@ -21,7 +21,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class ActivityReasonType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options): void
+    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $builder
            ->add('name', TranslatableStringFormType::class)
@@ -29,7 +29,7 @@ class ActivityReasonType extends AbstractType
            ->add('category', TranslatableActivityReasonCategoryType::class);
    }

-    public function configureOptions(OptionsResolver $resolver): void
+    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults([
            'data_class' => ActivityReason::class,
@@ -39,7 +39,7 @@ class ActivityReasonType extends AbstractType
    /**
     * @return string
     */
-    public function getBlockPrefix(): string
+    public function getBlockPrefix()
    {
        return 'chill_activitybundle_activityreason';
    }
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -27,7 +27,7 @@ class ActivityTypeType extends AbstractType
 {
    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}

-    public function buildForm(FormBuilderInterface $builder, array $options): void
+    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $builder
            ->add('name', TranslatableStringFormType::class)
@@ -67,7 +67,7 @@ class ActivityTypeType extends AbstractType
            ->add('commentVisible', ActivityFieldPresence::class);
    }

-    public function configureOptions(OptionsResolver $resolver): void
+    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults([
            'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class,
--- a/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
@@ -18,7 +18,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class ActivityFieldPresence extends AbstractType
 {
-    public function configureOptions(OptionsResolver $resolver): void
+    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults(
            [
@@ -31,7 +31,7 @@ class ActivityFieldPresence extends AbstractType
        );
    }

-    public function getParent(): ?string
+    public function getParent()
    {
        return ChoiceType::class;
    }
--- a/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
@@ -30,7 +30,7 @@ class PickActivityReasonType extends AbstractType
        private readonly TranslatableStringHelperInterface $translatableStringHelper,
    ) {}

-    public function configureOptions(OptionsResolver $resolver): void
+    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults(
            [
@@ -49,12 +49,12 @@ class PickActivityReasonType extends AbstractType
        );
    }

-    public function getBlockPrefix(): string
+    public function getBlockPrefix()
    {
        return 'translatable_activity_reason';
    }

-    public function getParent(): ?string
+    public function getParent()
    {
        return EntityType::class;
    }
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
@@ -25,7 +25,7 @@ class TranslatableActivityReasonCategoryType extends AbstractType
 {
    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}

-    public function configureOptions(OptionsResolver $resolver): void
+    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults(
            [
@@ -36,7 +36,7 @@ class TranslatableActivityReasonCategoryType extends AbstractType
        );
    }

-    public function getParent(): ?string
+    public function getParent()
    {
        return EntityType::class;
    }
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
@@ -22,7 +22,7 @@ class TranslatableActivityType extends AbstractType
 {
    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper, protected ActivityTypeRepositoryInterface $activityTypeRepository) {}

-    public function configureOptions(OptionsResolver $resolver): void
+    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults(
            [
@@ -34,12 +34,12 @@ class TranslatableActivityType extends AbstractType
        );
    }

-    public function getBlockPrefix(): string
+    public function getBlockPrefix()
    {
        return 'translatable_activity_type';
    }

-    public function getParent(): ?string
+    public function getParent()
    {
        return EntityType::class;
    }
--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -16,7 +16,7 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
-use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;

 /**
@@ -30,7 +30,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
    ) {}

-    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
    {
        $period = $parameters['accompanyingCourse'];

--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
@@ -14,7 +14,7 @@ namespace Chill\ActivityBundle\Menu;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
-use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\Security;

 final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuilderInterface
 {
@@ -25,7 +25,7 @@ final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuil
        return ['accompanying_course_quick_menu'];
    }

-    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
    {
        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingCourse */
        $accompanyingCourse = $parameters['accompanying-course'];
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -13,7 +13,7 @@ namespace Chill\ActivityBundle\Menu;

 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
-use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\Security;

 /**
 * @implements LocalMenuBuilderInterface<array>
@@ -22,7 +22,7 @@ final readonly class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
    public function __construct(private Security $security) {}

-    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
    {
        if (!$this->security->isGranted('ROLE_ADMIN')) {
            return;
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -30,7 +30,7 @@ final readonly class PersonMenuBuilder implements LocalMenuBuilderInterface
        private TranslatorInterface $translator,
    ) {}

-    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
    {
        /** @var Person $person */
        $person = $parameters['person'];
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -33,7 +33,7 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\Security;

 final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
@@ -24,7 +24,7 @@ use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\Security;

 final readonly class ActivityDocumentACLAwareRepository implements ActivityDocumentACLAwareRepositoryInterface
 {
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
@@ -1,7 +1,7 @@
 <template>
-    <concerned-groups v-if="hasPerson" />
-    <social-issues-acc v-if="hasSocialIssues" />
-    <location v-if="hasLocation" />
+  <concerned-groups v-if="hasPerson" />
+  <social-issues-acc v-if="hasSocialIssues" />
+  <location v-if="hasLocation" />
 </template>

 <script>
@@ -10,12 +10,12 @@ import SocialIssuesAcc from "./components/SocialIssuesAcc.vue";
 import Location from "./components/Location.vue";

 export default {
-    name: "App",
-    props: ["hasSocialIssues", "hasLocation", "hasPerson"],
-    components: {
-        ConcernedGroups,
-        SocialIssuesAcc,
-        Location,
-    },
+  name: "App",
+  props: ["hasSocialIssues", "hasLocation", "hasPerson"],
+  components: {
+    ConcernedGroups,
+    SocialIssuesAcc,
+    Location,
+  },
 };
 </script>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
@@ -1,46 +1,43 @@
 <template>
-    <teleport to="#add-persons" v-if="isComponentVisible">
-        <div class="flex-bloc concerned-groups" :class="getContext">
-            <persons-bloc
-                v-for="bloc in contextPersonsBlocs"
-                :key="bloc.key"
-                :bloc="bloc"
-                :bloc-width="getBlocWidth"
-                :set-persons-in-bloc="setPersonsInBloc"
-            />
-        </div>
-        <div
-            v-if="
-                getContext === 'accompanyingCourse' &&
-                suggestedEntities.length > 0
-            "
+  <teleport to="#add-persons" v-if="isComponentVisible">
+    <div class="flex-bloc concerned-groups" :class="getContext">
+      <persons-bloc
+        v-for="bloc in contextPersonsBlocs"
+        :key="bloc.key"
+        :bloc="bloc"
+        :bloc-width="getBlocWidth"
+        :set-persons-in-bloc="setPersonsInBloc"
+      />
+    </div>
+    <div
+      v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0"
+    >
+      <ul class="list-suggest add-items inline">
+        <li
+          v-for="(p, i) in suggestedEntities"
+          @click="addSuggestedEntity(p)"
+          :key="`suggestedEntities-${i}`"
        >
-            <ul class="list-suggest add-items inline">
-                <li
-                    v-for="(p, i) in suggestedEntities"
-                    @click="addSuggestedEntity(p)"
-                    :key="`suggestedEntities-${i}`"
-                >
-                    <person-text v-if="p.type === 'person'" :person="p" />
-                    <span v-else>{{ p.text }}</span>
-                </li>
-            </ul>
-        </div>
+          <person-text v-if="p.type === 'person'" :person="p" />
+          <span v-else>{{ p.text }}</span>
+        </li>
+      </ul>
+    </div>

-        <ul class="record_actions">
-            <li class="add-persons">
-                <add-persons
-                    :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
-                    :modalTitle="trans(ACTIVITY_ADD_PERSONS)"
-                    v-bind:key="addPersons.key"
-                    v-bind:options="addPersonsOptions"
-                    @addNewPersons="addNewPersons"
-                    ref="addPersons"
-                >
-                </add-persons>
-            </li>
-        </ul>
-    </teleport>
+    <ul class="record_actions">
+      <li class="add-persons">
+        <add-persons
+          :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
+          :modalTitle="trans(ACTIVITY_ADD_PERSONS)"
+          v-bind:key="addPersons.key"
+          v-bind:options="addPersonsOptions"
+          @addNewPersons="addNewPersons"
+          ref="addPersons"
+        >
+        </add-persons>
+      </li>
+    </ul>
+  </teleport>
 </template>

 <script>
@@ -49,208 +46,208 @@ import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import PersonsBloc from "./ConcernedGroups/PersonsBloc.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 import {
-    ACTIVITY_BLOC_PERSONS,
-    ACTIVITY_BLOC_PERSONS_ASSOCIATED,
-    ACTIVITY_BLOC_THIRDPARTY,
-    ACTIVITY_BLOC_USERS,
-    ACTIVITY_ADD_PERSONS,
-    trans,
+  ACTIVITY_BLOC_PERSONS,
+  ACTIVITY_BLOC_PERSONS_ASSOCIATED,
+  ACTIVITY_BLOC_THIRDPARTY,
+  ACTIVITY_BLOC_USERS,
+  ACTIVITY_ADD_PERSONS,
+  trans,
 } from "translator";

 export default {
-    name: "ConcernedGroups",
-    components: {
-        AddPersons,
-        PersonsBloc,
-        PersonText,
+  name: "ConcernedGroups",
+  components: {
+    AddPersons,
+    PersonsBloc,
+    PersonText,
+  },
+  setup() {
+    return {
+      trans,
+      ACTIVITY_ADD_PERSONS,
+    };
+  },
+  data() {
+    return {
+      personsBlocs: [
+        {
+          key: "persons",
+          title: trans(ACTIVITY_BLOC_PERSONS),
+          persons: [],
+          included: false,
+        },
+        {
+          key: "personsAssociated",
+          title: trans(ACTIVITY_BLOC_PERSONS_ASSOCIATED),
+          persons: [],
+          included: window.activity
+            ? window.activity.activityType.personsVisible !== 0
+            : true,
+        },
+        {
+          key: "personsNotAssociated",
+          title: "activity.bloc_persons_not_associated",
+          persons: [],
+          included: window.activity
+            ? window.activity.activityType.personsVisible !== 0
+            : true,
+        },
+        {
+          key: "thirdparty",
+          title: trans(ACTIVITY_BLOC_THIRDPARTY),
+          persons: [],
+          included: window.activity
+            ? window.activity.activityType.thirdPartiesVisible !== 0
+            : true,
+        },
+        {
+          key: "users",
+          title: trans(ACTIVITY_BLOC_USERS),
+          persons: [],
+          included: window.activity
+            ? window.activity.activityType.usersVisible !== 0
+            : true,
+        },
+      ],
+      addPersons: {
+        key: "activity",
+      },
+    };
+  },
+  computed: {
+    isComponentVisible() {
+      return window.activity
+        ? window.activity.activityType.personsVisible !== 0 ||
+            window.activity.activityType.thirdPartiesVisible !== 0 ||
+            window.activity.activityType.usersVisible !== 0
+        : true;
    },
-    setup() {
-        return {
-            trans,
-            ACTIVITY_ADD_PERSONS,
-        };
+    ...mapState({
+      persons: (state) => state.activity.persons,
+      thirdParties: (state) => state.activity.thirdParties,
+      users: (state) => state.activity.users,
+      accompanyingCourse: (state) => state.activity.accompanyingPeriod,
+    }),
+    ...mapGetters(["suggestedEntities"]),
+    getContext() {
+      return this.accompanyingCourse ? "accompanyingCourse" : "person";
    },
-    data() {
-        return {
-            personsBlocs: [
-                {
-                    key: "persons",
-                    title: trans(ACTIVITY_BLOC_PERSONS),
-                    persons: [],
-                    included: false,
-                },
-                {
-                    key: "personsAssociated",
-                    title: trans(ACTIVITY_BLOC_PERSONS_ASSOCIATED),
-                    persons: [],
-                    included: window.activity
-                        ? window.activity.activityType.personsVisible !== 0
-                        : true,
-                },
-                {
-                    key: "personsNotAssociated",
-                    title: "activity.bloc_persons_not_associated",
-                    persons: [],
-                    included: window.activity
-                        ? window.activity.activityType.personsVisible !== 0
-                        : true,
-                },
-                {
-                    key: "thirdparty",
-                    title: trans(ACTIVITY_BLOC_THIRDPARTY),
-                    persons: [],
-                    included: window.activity
-                        ? window.activity.activityType.thirdPartiesVisible !== 0
-                        : true,
-                },
-                {
-                    key: "users",
-                    title: trans(ACTIVITY_BLOC_USERS),
-                    persons: [],
-                    included: window.activity
-                        ? window.activity.activityType.usersVisible !== 0
-                        : true,
-                },
-            ],
-            addPersons: {
-                key: "activity",
-            },
-        };
+    contextPersonsBlocs() {
+      return this.personsBlocs.filter((bloc) => bloc.included !== false);
    },
-    computed: {
-        isComponentVisible() {
-            return window.activity
-                ? window.activity.activityType.personsVisible !== 0 ||
-                      window.activity.activityType.thirdPartiesVisible !== 0 ||
-                      window.activity.activityType.usersVisible !== 0
-                : true;
-        },
-        ...mapState({
-            persons: (state) => state.activity.persons,
-            thirdParties: (state) => state.activity.thirdParties,
-            users: (state) => state.activity.users,
-            accompanyingCourse: (state) => state.activity.accompanyingPeriod,
-        }),
-        ...mapGetters(["suggestedEntities"]),
-        getContext() {
-            return this.accompanyingCourse ? "accompanyingCourse" : "person";
-        },
-        contextPersonsBlocs() {
-            return this.personsBlocs.filter((bloc) => bloc.included !== false);
-        },
-        addPersonsOptions() {
-            let optionsType = [];
-            if (window.activity) {
-                if (window.activity.activityType.personsVisible !== 0) {
-                    optionsType.push("person");
-                }
-                if (window.activity.activityType.thirdPartiesVisible !== 0) {
-                    optionsType.push("thirdparty");
-                }
-                if (window.activity.activityType.usersVisible !== 0) {
-                    optionsType.push("user");
-                }
-            } else {
-                optionsType = ["person", "thirdparty", "user"];
-            }
-            return {
-                type: optionsType,
-                priority: null,
-                uniq: false,
-                button: {
-                    size: "btn-sm",
-                },
-            };
-        },
-        getBlocWidth() {
-            return Math.round(100 / this.contextPersonsBlocs.length) + "%";
+    addPersonsOptions() {
+      let optionsType = [];
+      if (window.activity) {
+        if (window.activity.activityType.personsVisible !== 0) {
+          optionsType.push("person");
+        }
+        if (window.activity.activityType.thirdPartiesVisible !== 0) {
+          optionsType.push("thirdparty");
+        }
+        if (window.activity.activityType.usersVisible !== 0) {
+          optionsType.push("user");
+        }
+      } else {
+        optionsType = ["person", "thirdparty", "user"];
+      }
+      return {
+        type: optionsType,
+        priority: null,
+        uniq: false,
+        button: {
+          size: "btn-sm",
        },
+      };
    },
-    mounted() {
-        this.setPersonsInBloc();
+    getBlocWidth() {
+      return Math.round(100 / this.contextPersonsBlocs.length) + "%";
    },
-    methods: {
-        setPersonsInBloc() {
-            let groups;
-            if (this.accompanyingCourse) {
-                groups = this.splitPersonsInGroups();
-            }
-            this.personsBlocs.forEach((bloc) => {
-                if (this.accompanyingCourse) {
-                    switch (bloc.key) {
-                        case "personsAssociated":
-                            bloc.persons = groups.personsAssociated;
-                            bloc.included = true;
-                            break;
-                        case "personsNotAssociated":
-                            bloc.persons = groups.personsNotAssociated;
-                            bloc.included = true;
-                            break;
-                    }
-                } else {
-                    switch (bloc.key) {
-                        case "persons":
-                            bloc.persons = this.persons;
-                            bloc.included = true;
-                            break;
-                    }
-                }
-                switch (bloc.key) {
-                    case "thirdparty":
-                        bloc.persons = this.thirdParties;
-                        break;
-                    case "users":
-                        bloc.persons = this.users;
-                        break;
-                }
-            }, groups);
-        },
-        splitPersonsInGroups() {
-            let personsAssociated = [];
-            let personsNotAssociated = this.persons;
-            let participations = this.getCourseParticipations();
-            this.persons.forEach((person) => {
-                participations.forEach((participation) => {
-                    if (person.id === participation.id) {
-                        //console.log(person.id);
-                        personsAssociated.push(person);
-                        personsNotAssociated = personsNotAssociated.filter(
-                            (p) => p !== person,
-                        );
-                    }
-                });
-            });
-            return {
-                personsAssociated: personsAssociated,
-                personsNotAssociated: personsNotAssociated,
-            };
-        },
-        getCourseParticipations() {
-            let participations = [];
-            this.accompanyingCourse.participations.forEach((participation) => {
-                if (!participation.endDate) {
-                    participations.push(participation.person);
-                }
-            });
-            return participations;
-        },
-        addNewPersons({ selected, modal }) {
-            console.log("@@@ CLICK button addNewPersons", selected);
-            selected.forEach((item) => {
-                this.$store.dispatch("addPersonsInvolved", item);
-            }, this);
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-            this.setPersonsInBloc();
-        },
-        addSuggestedEntity(person) {
-            this.$store.dispatch("addPersonsInvolved", {
-                result: person,
-                type: "person",
-            });
-            this.setPersonsInBloc();
-        },
+  },
+  mounted() {
+    this.setPersonsInBloc();
+  },
+  methods: {
+    setPersonsInBloc() {
+      let groups;
+      if (this.accompanyingCourse) {
+        groups = this.splitPersonsInGroups();
+      }
+      this.personsBlocs.forEach((bloc) => {
+        if (this.accompanyingCourse) {
+          switch (bloc.key) {
+            case "personsAssociated":
+              bloc.persons = groups.personsAssociated;
+              bloc.included = true;
+              break;
+            case "personsNotAssociated":
+              bloc.persons = groups.personsNotAssociated;
+              bloc.included = true;
+              break;
+          }
+        } else {
+          switch (bloc.key) {
+            case "persons":
+              bloc.persons = this.persons;
+              bloc.included = true;
+              break;
+          }
+        }
+        switch (bloc.key) {
+          case "thirdparty":
+            bloc.persons = this.thirdParties;
+            break;
+          case "users":
+            bloc.persons = this.users;
+            break;
+        }
+      }, groups);
    },
+    splitPersonsInGroups() {
+      let personsAssociated = [];
+      let personsNotAssociated = this.persons;
+      let participations = this.getCourseParticipations();
+      this.persons.forEach((person) => {
+        participations.forEach((participation) => {
+          if (person.id === participation.id) {
+            //console.log(person.id);
+            personsAssociated.push(person);
+            personsNotAssociated = personsNotAssociated.filter(
+              (p) => p !== person,
+            );
+          }
+        });
+      });
+      return {
+        personsAssociated: personsAssociated,
+        personsNotAssociated: personsNotAssociated,
+      };
+    },
+    getCourseParticipations() {
+      let participations = [];
+      this.accompanyingCourse.participations.forEach((participation) => {
+        if (!participation.endDate) {
+          participations.push(participation.person);
+        }
+      });
+      return participations;
+    },
+    addNewPersons({ selected, modal }) {
+      console.log("@@@ CLICK button addNewPersons", selected);
+      selected.forEach((item) => {
+        this.$store.dispatch("addPersonsInvolved", item);
+      }, this);
+      this.$refs.addPersons.resetSearch(); // to cast child method
+      modal.showModal = false;
+      this.setPersonsInBloc();
+    },
+    addSuggestedEntity(person) {
+      this.$store.dispatch("addPersonsInvolved", {
+        result: person,
+        type: "person",
+      });
+      this.setPersonsInBloc();
+    },
+  },
 };
 </script>

--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
@@ -1,29 +1,29 @@
 <template>
-    <li>
-        <span :title="person.text" @click.prevent="$emit('remove', person)">
-            <span class="chill_denomination">
-                <person-text :person="person" :is-cut="true" />
-            </span>
-        </span>
-    </li>
+  <li>
+    <span :title="person.text" @click.prevent="$emit('remove', person)">
+      <span class="chill_denomination">
+        <person-text :person="person" :is-cut="true" />
+      </span>
+    </span>
+  </li>
 </template>

 <script>
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";

 export default {
-    name: "PersonBadge",
-    props: ["person"],
-    components: {
-        PersonText,
-    },
-    // computed: {
-    //    textCutted() {
-    //       let more = (this.person.text.length > 15) ?'…' : '';
-    //       return this.person.text.slice(0,15) + more;
-    //    }
-    // },
-    emits: ["remove"],
+  name: "PersonBadge",
+  props: ["person"],
+  components: {
+    PersonText,
+  },
+  // computed: {
+  //    textCutted() {
+  //       let more = (this.person.text.length > 15) ?'…' : '';
+  //       return this.person.text.slice(0,15) + more;
+  //    }
+  // },
+  emits: ["remove"],
 };
 </script>

--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
@@ -1,38 +1,38 @@
 <template>
-    <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
-        <div class="item-row">
-            <div class="item-col">
-                <h4>{{ $t(bloc.title) }}</h4>
-            </div>
-            <div class="item-col">
-                <ul class="list-suggest remove-items">
-                    <person-badge
-                        v-for="person in bloc.persons"
-                        :key="person.id"
-                        :person="person"
-                        @remove="removePerson"
-                    />
-                </ul>
-            </div>
-        </div>
+  <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
+    <div class="item-row">
+      <div class="item-col">
+        <h4>{{ $t(bloc.title) }}</h4>
+      </div>
+      <div class="item-col">
+        <ul class="list-suggest remove-items">
+          <person-badge
+            v-for="person in bloc.persons"
+            :key="person.id"
+            :person="person"
+            @remove="removePerson"
+          />
+        </ul>
+      </div>
    </div>
+  </div>
 </template>

 <script>
 import PersonBadge from "./PersonBadge.vue";
 export default {
-    name: "PersonsBloc",
-    components: {
-        PersonBadge,
-    },
-    props: ["bloc", "setPersonsInBloc", "blocWidth"],
-    methods: {
-        removePerson(item) {
-            console.log("@@ CLICK remove person: item", item);
-            this.$store.dispatch("removePersonInvolved", item);
-            this.setPersonsInBloc();
-        },
+  name: "PersonsBloc",
+  components: {
+    PersonBadge,
+  },
+  props: ["bloc", "setPersonsInBloc", "blocWidth"],
+  methods: {
+    removePerson(item) {
+      console.log("@@ CLICK remove person: item", item);
+      this.$store.dispatch("removePersonInvolved", item);
+      this.setPersonsInBloc();
    },
+  },
 };
 </script>

--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -1,32 +1,32 @@
 <template>
-    <teleport to="#location">
-        <div class="mb-3 row">
-            <label :class="locationClassList">
-                {{ trans(ACTIVITY_LOCATION) }}
-            </label>
-            <div class="col-sm-8">
-                <VueMultiselect
-                    name="selectLocation"
-                    id="selectLocation"
-                    label="name"
-                    track-by="id"
-                    open-direction="top"
-                    :multiple="false"
-                    :searchable="true"
-                    :placeholder="trans(ACTIVITY_CHOOSE_LOCATION)"
-                    :custom-label="customLabel"
-                    :select-label="trans(MULTISELECT_SELECT_LABEL)"
-                    :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
-                    :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
-                    :options="availableLocations"
-                    group-values="locations"
-                    group-label="locationGroup"
-                    v-model="location"
-                />
-                <new-location v-bind:available-locations="availableLocations" />
-            </div>
-        </div>
-    </teleport>
+  <teleport to="#location">
+    <div class="mb-3 row">
+      <label :class="locationClassList">
+        {{ trans(ACTIVITY_LOCATION) }}
+      </label>
+      <div class="col-sm-8">
+        <VueMultiselect
+          name="selectLocation"
+          id="selectLocation"
+          label="name"
+          track-by="id"
+          open-direction="top"
+          :multiple="false"
+          :searchable="true"
+          :placeholder="trans(ACTIVITY_CHOOSE_LOCATION)"
+          :custom-label="customLabel"
+          :select-label="trans(MULTISELECT_SELECT_LABEL)"
+          :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
+          :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
+          :options="availableLocations"
+          group-values="locations"
+          group-label="locationGroup"
+          v-model="location"
+        />
+        <new-location v-bind:available-locations="availableLocations" />
+      </div>
+    </div>
+  </teleport>
 </template>

 <script>
@@ -35,60 +35,60 @@ import VueMultiselect from "vue-multiselect";
 import NewLocation from "./Location/NewLocation.vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
-    trans,
-    ACTIVITY_LOCATION,
-    ACTIVITY_CHOOSE_LOCATION,
-    MULTISELECT_SELECT_LABEL,
-    MULTISELECT_DESELECT_LABEL,
-    MULTISELECT_SELECTED_LABEL,
+  trans,
+  ACTIVITY_LOCATION,
+  ACTIVITY_CHOOSE_LOCATION,
+  MULTISELECT_SELECT_LABEL,
+  MULTISELECT_DESELECT_LABEL,
+  MULTISELECT_SELECTED_LABEL,
 } from "translator";

 export default {
-    name: "Location",
-    components: {
-        NewLocation,
-        VueMultiselect,
+  name: "Location",
+  components: {
+    NewLocation,
+    VueMultiselect,
+  },
+  setup() {
+    return {
+      trans,
+      ACTIVITY_LOCATION,
+      ACTIVITY_CHOOSE_LOCATION,
+      MULTISELECT_SELECT_LABEL,
+      MULTISELECT_DESELECT_LABEL,
+      MULTISELECT_SELECTED_LABEL,
+    };
+  },
+  data() {
+    return {
+      locationClassList: `col-form-label col-sm-4 ${document.querySelector("input#chill_activitybundle_activity_location").getAttribute("required") ? "required" : ""}`,
+    };
+  },
+  computed: {
+    ...mapState(["activity", "availableLocations"]),
+    ...mapGetters(["suggestedEntities"]),
+    location: {
+      get() {
+        return this.activity.location;
+      },
+      set(value) {
+        this.$store.dispatch("updateLocation", value);
+      },
    },
-    setup() {
-        return {
-            trans,
-            ACTIVITY_LOCATION,
-            ACTIVITY_CHOOSE_LOCATION,
-            MULTISELECT_SELECT_LABEL,
-            MULTISELECT_DESELECT_LABEL,
-            MULTISELECT_SELECTED_LABEL,
-        };
+  },
+  methods: {
+    labelAccompanyingCourseLocation(value) {
+      return `${value.address.text} (${localizeString(value.locationType.title)})`;
    },
-    data() {
-        return {
-            locationClassList: `col-form-label col-sm-4 ${document.querySelector("input#chill_activitybundle_activity_location").getAttribute("required") ? "required" : ""}`,
-        };
-    },
-    computed: {
-        ...mapState(["activity", "availableLocations"]),
-        ...mapGetters(["suggestedEntities"]),
-        location: {
-            get() {
-                return this.activity.location;
-            },
-            set(value) {
-                this.$store.dispatch("updateLocation", value);
-            },
-        },
-    },
-    methods: {
-        labelAccompanyingCourseLocation(value) {
-            return `${value.address.text} (${localizeString(value.locationType.title)})`;
-        },
-        customLabel(value) {
-            return value.locationType
-                ? value.name
-                    ? value.name === "__AccompanyingCourseLocation__"
-                        ? this.labelAccompanyingCourseLocation(value)
-                        : `${value.name} (${localizeString(value.locationType.title)})`
-                    : localizeString(value.locationType.title)
-                : "";
-        },
+    customLabel(value) {
+      return value.locationType
+        ? value.name
+          ? value.name === "__AccompanyingCourseLocation__"
+            ? this.labelAccompanyingCourseLocation(value)
+            : `${value.name} (${localizeString(value.locationType.title)})`
+          : localizeString(value.locationType.title)
+        : "";
    },
+  },
 };
 </script>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -1,123 +1,114 @@
 <template>
-    <div>
-        <ul class="record_actions">
-            <li>
-                <a class="btn btn-sm btn-create" @click="openModal">
-                    {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
-                </a>
-            </li>
-        </ul>
+  <div>
+    <ul class="record_actions">
+      <li>
+        <a class="btn btn-sm btn-create" @click="openModal">
+          {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
+        </a>
+      </li>
+    </ul>

-        <teleport to="body">
-            <modal
-                v-if="modal.showModal"
-                :modalDialogClass="modal.modalDialogClass"
-                @close="modal.showModal = false"
-            >
-                <template #header>
-                    <h3 class="modal-title">
-                        {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
-                    </h3>
-                </template>
-                <template #body>
-                    <form>
-                        <div class="alert alert-warning" v-if="errors.length">
-                            <ul>
-                                <li v-for="(e, i) in errors" :key="i">
-                                    {{ e }}
-                                </li>
-                            </ul>
-                        </div>
+    <teleport to="body">
+      <modal
+        v-if="modal.showModal"
+        :modalDialogClass="modal.modalDialogClass"
+        @close="modal.showModal = false"
+      >
+        <template #header>
+          <h3 class="modal-title">
+            {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
+          </h3>
+        </template>
+        <template #body>
+          <form>
+            <div class="alert alert-warning" v-if="errors.length">
+              <ul>
+                <li v-for="(e, i) in errors" :key="i">
+                  {{ e }}
+                </li>
+              </ul>
+            </div>

-                        <div class="form-floating mb-3">
-                            <select
-                                class="form-select form-select-lg"
-                                id="type"
-                                required
-                                v-model="selectType"
-                            >
-                                <option selected disabled value="">
-                                    {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
-                                </option>
-                                <option
-                                    v-for="t in locationTypes"
-                                    :value="t"
-                                    :key="t.id"
-                                >
-                                    {{ localizeString(t.title) }}
-                                </option>
-                            </select>
-                            <label>{{
-                                trans(ACTIVITY_LOCATION_FIELDS_TYPE)
-                            }}</label>
-                        </div>
+            <div class="form-floating mb-3">
+              <select
+                class="form-select form-select-lg"
+                id="type"
+                required
+                v-model="selectType"
+              >
+                <option selected disabled value="">
+                  {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
+                </option>
+                <option v-for="t in locationTypes" :value="t" :key="t.id">
+                  {{ localizeString(t.title) }}
+                </option>
+              </select>
+              <label>{{ trans(ACTIVITY_LOCATION_FIELDS_TYPE) }}</label>
+            </div>

-                        <div class="form-floating mb-3">
-                            <input
-                                class="form-control form-control-lg"
-                                id="name"
-                                v-model="inputName"
-                                placeholder
-                            />
-                            <label for="name">{{
-                                trans(ACTIVITY_LOCATION_FIELDS_NAME)
-                            }}</label>
-                        </div>
+            <div class="form-floating mb-3">
+              <input
+                class="form-control form-control-lg"
+                id="name"
+                v-model="inputName"
+                placeholder
+              />
+              <label for="name">{{
+                trans(ACTIVITY_LOCATION_FIELDS_NAME)
+              }}</label>
+            </div>

-                        <add-address
-                            :context="addAddress.context"
-                            :options="addAddress.options"
-                            :addressChangedCallback="submitNewAddress"
-                            v-if="showAddAddress"
-                            ref="addAddress"
-                        />
+            <add-address
+              :context="addAddress.context"
+              :options="addAddress.options"
+              :addressChangedCallback="submitNewAddress"
+              v-if="showAddAddress"
+              ref="addAddress"
+            />

-                        <div class="form-floating mb-3" v-if="showContactData">
-                            <input
-                                class="form-control form-control-lg"
-                                id="phonenumber1"
-                                v-model="inputPhonenumber1"
-                                placeholder
-                            />
-                            <label for="phonenumber1">{{
-                                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER1)
-                            }}</label>
-                        </div>
-                        <div class="form-floating mb-3" v-if="hasPhonenumber1">
-                            <input
-                                class="form-control form-control-lg"
-                                id="phonenumber2"
-                                v-model="inputPhonenumber2"
-                                placeholder
-                            />
-                            <label for="phonenumber2">{{
-                                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER2)
-                            }}</label>
-                        </div>
-                        <div class="form-floating mb-3" v-if="showContactData">
-                            <input
-                                class="form-control form-control-lg"
-                                id="email"
-                                v-model="inputEmail"
-                                placeholder
-                            />
-                            <label for="email">{{
-                                trans(ACTIVITY_LOCATION_FIELDS_EMAIL)
-                            }}</label>
-                        </div>
-                    </form>
-                </template>
-                <template #footer>
-                    <button
-                        class="btn btn-save"
-                        @click.prevent="saveNewLocation"
-                    >
-                        {{ trans(SAVE) }}
-                    </button>
-                </template>
-            </modal>
-        </teleport>
-    </div>
+            <div class="form-floating mb-3" v-if="showContactData">
+              <input
+                class="form-control form-control-lg"
+                id="phonenumber1"
+                v-model="inputPhonenumber1"
+                placeholder
+              />
+              <label for="phonenumber1">{{
+                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER1)
+              }}</label>
+            </div>
+            <div class="form-floating mb-3" v-if="hasPhonenumber1">
+              <input
+                class="form-control form-control-lg"
+                id="phonenumber2"
+                v-model="inputPhonenumber2"
+                placeholder
+              />
+              <label for="phonenumber2">{{
+                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER2)
+              }}</label>
+            </div>
+            <div class="form-floating mb-3" v-if="showContactData">
+              <input
+                class="form-control form-control-lg"
+                id="email"
+                v-model="inputEmail"
+                placeholder
+              />
+              <label for="email">{{
+                trans(ACTIVITY_LOCATION_FIELDS_EMAIL)
+              }}</label>
+            </div>
+          </form>
+        </template>
+        <template #footer>
+          <button class="btn btn-save" @click.prevent="saveNewLocation">
+            {{ trans(SAVE) }}
+          </button>
+        </template>
+      </modal>
+    </teleport>
+  </div>
 </template>

 <script>
@@ -128,237 +119,236 @@ import { getLocationTypes } from "../../api";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
-    SAVE,
-    ACTIVITY_LOCATION_FIELDS_EMAIL,
-    ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
-    ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
-    ACTIVITY_LOCATION_FIELDS_NAME,
-    ACTIVITY_LOCATION_FIELDS_TYPE,
-    ACTIVITY_CHOOSE_LOCATION_TYPE,
-    ACTIVITY_CREATE_NEW_LOCATION,
-    trans,
+  SAVE,
+  ACTIVITY_LOCATION_FIELDS_EMAIL,
+  ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
+  ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
+  ACTIVITY_LOCATION_FIELDS_NAME,
+  ACTIVITY_LOCATION_FIELDS_TYPE,
+  ACTIVITY_CHOOSE_LOCATION_TYPE,
+  ACTIVITY_CREATE_NEW_LOCATION,
+  trans,
 } from "translator";

 export default {
-    name: "NewLocation",
-    components: {
-        Modal,
-        AddAddress,
+  name: "NewLocation",
+  components: {
+    Modal,
+    AddAddress,
+  },
+  setup() {
+    return {
+      trans,
+      SAVE,
+      ACTIVITY_LOCATION_FIELDS_EMAIL,
+      ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
+      ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
+      ACTIVITY_LOCATION_FIELDS_NAME,
+      ACTIVITY_LOCATION_FIELDS_TYPE,
+      ACTIVITY_CHOOSE_LOCATION_TYPE,
+      ACTIVITY_CREATE_NEW_LOCATION,
+    };
+  },
+  props: ["availableLocations"],
+  data() {
+    return {
+      errors: [],
+      selected: {
+        type: null,
+        name: null,
+        addressId: null,
+        phonenumber1: null,
+        phonenumber2: null,
+        email: null,
+      },
+      locationTypes: [],
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-scrollable modal-xl",
+      },
+      addAddress: {
+        options: {
+          button: {
+            text: {
+              create: "activity.create_address",
+              edit: "activity.edit_address",
+            },
+            size: "btn-sm",
+          },
+          title: {
+            create: "activity.create_address",
+            edit: "activity.edit_address",
+          },
+        },
+        context: {
+          target: {
+            //name, id
+          },
+          edit: false,
+          addressId: null,
+          defaults: window.addaddress,
+        },
+      },
+    };
+  },
+  computed: {
+    ...mapState(["activity"]),
+    selectType: {
+      get() {
+        return this.selected.type;
+      },
+      set(value) {
+        this.selected.type = value;
+      },
    },
-    setup() {
-        return {
-            trans,
-            SAVE,
-            ACTIVITY_LOCATION_FIELDS_EMAIL,
-            ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
-            ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
-            ACTIVITY_LOCATION_FIELDS_NAME,
-            ACTIVITY_LOCATION_FIELDS_TYPE,
-            ACTIVITY_CHOOSE_LOCATION_TYPE,
-            ACTIVITY_CREATE_NEW_LOCATION,
+    inputName: {
+      get() {
+        return this.selected.name;
+      },
+      set(value) {
+        this.selected.name = value;
+      },
+    },
+    inputEmail: {
+      get() {
+        return this.selected.email;
+      },
+      set(value) {
+        this.selected.email = value;
+      },
+    },
+    inputPhonenumber1: {
+      get() {
+        return this.selected.phonenumber1;
+      },
+      set(value) {
+        this.selected.phonenumber1 = value;
+      },
+    },
+    inputPhonenumber2: {
+      get() {
+        return this.selected.phonenumber2;
+      },
+      set(value) {
+        this.selected.phonenumber2 = value;
+      },
+    },
+    hasPhonenumber1() {
+      return (
+        this.selected.phonenumber1 !== null && this.selected.phonenumber1 !== ""
+      );
+    },
+    showAddAddress() {
+      let cond = false;
+      if (this.selected.type) {
+        if (this.selected.type.addressRequired !== "never") {
+          cond = true;
+        }
+      }
+      return cond;
+    },
+    showContactData() {
+      let cond = false;
+      if (this.selected.type) {
+        if (this.selected.type.contactData !== "never") {
+          cond = true;
+        }
+      }
+      return cond;
+    },
+  },
+  mounted() {
+    this.getLocationTypesList();
+  },
+  methods: {
+    localizeString,
+    checkForm() {
+      let cond = true;
+      this.errors = [];
+      if (!this.selected.type) {
+        this.errors.push("Type de localisation requis");
+        cond = false;
+      } else {
+        if (
+          this.selected.type.addressRequired === "required" &&
+          !this.selected.addressId
+        ) {
+          this.errors.push("Adresse requise");
+          cond = false;
+        }
+        if (
+          this.selected.type.contactData === "required" &&
+          !this.selected.phonenumber1
+        ) {
+          this.errors.push("Numéro de téléphone requis");
+          cond = false;
+        }
+        if (
+          this.selected.type.contactData === "required" &&
+          !this.selected.email
+        ) {
+          this.errors.push("Adresse email requise");
+          cond = false;
+        }
+      }
+      return cond;
+    },
+    getLocationTypesList() {
+      getLocationTypes().then((results) => {
+        this.locationTypes = results.filter(
+          (t) => t.availableForUsers === true,
+        );
+      });
+    },
+    openModal() {
+      this.modal.showModal = true;
+    },
+    saveNewLocation() {
+      if (this.checkForm()) {
+        let body = {
+          type: "location",
+          name: this.selected.name,
+          locationType: {
+            id: this.selected.type.id,
+            type: "location-type",
+          },
+          phonenumber1: this.selected.phonenumber1,
+          phonenumber2: this.selected.phonenumber2,
+          email: this.selected.email,
        };
-    },
-    props: ["availableLocations"],
-    data() {
-        return {
-            errors: [],
-            selected: {
-                type: null,
-                name: null,
-                addressId: null,
-                phonenumber1: null,
-                phonenumber2: null,
-                email: null,
+        if (this.selected.addressId) {
+          body = Object.assign(body, {
+            address: {
+              id: this.selected.addressId,
            },
-            locationTypes: [],
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-scrollable modal-xl",
-            },
-            addAddress: {
-                options: {
-                    button: {
-                        text: {
-                            create: "activity.create_address",
-                            edit: "activity.edit_address",
-                        },
-                        size: "btn-sm",
-                    },
-                    title: {
-                        create: "activity.create_address",
-                        edit: "activity.edit_address",
-                    },
-                },
-                context: {
-                    target: {
-                        //name, id
-                    },
-                    edit: false,
-                    addressId: null,
-                    defaults: window.addaddress,
-                },
-            },
-        };
-    },
-    computed: {
-        ...mapState(["activity"]),
-        selectType: {
-            get() {
-                return this.selected.type;
-            },
-            set(value) {
-                this.selected.type = value;
-            },
-        },
-        inputName: {
-            get() {
-                return this.selected.name;
-            },
-            set(value) {
-                this.selected.name = value;
-            },
-        },
-        inputEmail: {
-            get() {
-                return this.selected.email;
-            },
-            set(value) {
-                this.selected.email = value;
-            },
-        },
-        inputPhonenumber1: {
-            get() {
-                return this.selected.phonenumber1;
-            },
-            set(value) {
-                this.selected.phonenumber1 = value;
-            },
-        },
-        inputPhonenumber2: {
-            get() {
-                return this.selected.phonenumber2;
-            },
-            set(value) {
-                this.selected.phonenumber2 = value;
-            },
-        },
-        hasPhonenumber1() {
-            return (
-                this.selected.phonenumber1 !== null &&
-                this.selected.phonenumber1 !== ""
-            );
-        },
-        showAddAddress() {
-            let cond = false;
-            if (this.selected.type) {
-                if (this.selected.type.addressRequired !== "never") {
-                    cond = true;
-                }
-            }
-            return cond;
-        },
-        showContactData() {
-            let cond = false;
-            if (this.selected.type) {
-                if (this.selected.type.contactData !== "never") {
-                    cond = true;
-                }
-            }
-            return cond;
-        },
-    },
-    mounted() {
-        this.getLocationTypesList();
-    },
-    methods: {
-        localizeString,
-        checkForm() {
-            let cond = true;
-            this.errors = [];
-            if (!this.selected.type) {
-                this.errors.push("Type de localisation requis");
-                cond = false;
-            } else {
-                if (
-                    this.selected.type.addressRequired === "required" &&
-                    !this.selected.addressId
-                ) {
-                    this.errors.push("Adresse requise");
-                    cond = false;
-                }
-                if (
-                    this.selected.type.contactData === "required" &&
-                    !this.selected.phonenumber1
-                ) {
-                    this.errors.push("Numéro de téléphone requis");
-                    cond = false;
-                }
-                if (
-                    this.selected.type.contactData === "required" &&
-                    !this.selected.email
-                ) {
-                    this.errors.push("Adresse email requise");
-                    cond = false;
-                }
-            }
-            return cond;
-        },
-        getLocationTypesList() {
-            getLocationTypes().then((results) => {
-                this.locationTypes = results.filter(
-                    (t) => t.availableForUsers === true,
-                );
-            });
-        },
-        openModal() {
-            this.modal.showModal = true;
-        },
-        saveNewLocation() {
-            if (this.checkForm()) {
-                let body = {
-                    type: "location",
-                    name: this.selected.name,
-                    locationType: {
-                        id: this.selected.type.id,
-                        type: "location-type",
-                    },
-                    phonenumber1: this.selected.phonenumber1,
-                    phonenumber2: this.selected.phonenumber2,
-                    email: this.selected.email,
-                };
-                if (this.selected.addressId) {
-                    body = Object.assign(body, {
-                        address: {
-                            id: this.selected.addressId,
-                        },
-                    });
-                }
+          });
+        }

-                makeFetch("POST", "/api/1.0/main/location.json", body)
-                    .then((response) => {
-                        this.$store.dispatch("addAvailableLocationGroup", {
-                            locationGroup: "Localisations nouvellement créées",
-                            locations: [response],
-                        });
-                        this.$store.dispatch("updateLocation", response);
-                        this.modal.showModal = false;
-                    })
-                    .catch((error) => {
-                        if (error.name === "ValidationException") {
-                            for (let v of error.violations) {
-                                this.errors.push(v);
-                            }
-                        } else {
-                            this.errors.push("An error occurred");
-                        }
-                    });
+        makeFetch("POST", "/api/1.0/main/location.json", body)
+          .then((response) => {
+            this.$store.dispatch("addAvailableLocationGroup", {
+              locationGroup: "Localisations nouvellement créées",
+              locations: [response],
+            });
+            this.$store.dispatch("updateLocation", response);
+            this.modal.showModal = false;
+          })
+          .catch((error) => {
+            if (error.name === "ValidationException") {
+              for (let v of error.violations) {
+                this.errors.push(v);
+              }
+            } else {
+              this.errors.push("An error occurred");
            }
-        },
-        submitNewAddress(payload) {
-            this.selected.addressId = payload.addressId;
-            this.addAddress.context.addressId = payload.addressId;
-            this.addAddress.context.edit = true;
-        },
+          });
+      }
    },
+    submitNewAddress(payload) {
+      this.selected.addressId = payload.addressId;
+      this.addAddress.context.addressId = payload.addressId;
+      this.addAddress.context.edit = true;
+    },
+  },
 };
 </script>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -1,103 +1,98 @@
 <template>
-    <teleport to="#social-issues-acc">
-        <div class="mb-3 row">
-            <div class="col-4">
-                <label :class="socialIssuesClassList">{{
-                    trans(ACTIVITY_SOCIAL_ISSUES)
-                }}</label>
-            </div>
-            <div class="col-8">
-                <check-social-issue
-                    v-for="issue in socialIssuesList"
-                    :key="issue.id"
-                    :issue="issue"
-                    :selection="socialIssuesSelected"
-                    @updateSelected="updateIssuesSelected"
-                >
-                </check-social-issue>
+  <teleport to="#social-issues-acc">
+    <div class="mb-3 row">
+      <div class="col-4">
+        <label :class="socialIssuesClassList">{{
+          trans(ACTIVITY_SOCIAL_ISSUES)
+        }}</label>
+      </div>
+      <div class="col-8">
+        <check-social-issue
+          v-for="issue in socialIssuesList"
+          :key="issue.id"
+          :issue="issue"
+          :selection="socialIssuesSelected"
+          @updateSelected="updateIssuesSelected"
+        >
+        </check-social-issue>

-                <div class="my-3">
-                    <VueMultiselect
-                        name="otherIssues"
-                        label="text"
-                        track-by="id"
-                        open-direction="bottom"
-                        :close-on-select="true"
-                        :preserve-search="false"
-                        :reset-after="true"
-                        :hide-selected="true"
-                        :taggable="false"
-                        :multiple="false"
-                        :searchable="true"
-                        :allow-empty="true"
-                        :show-labels="false"
-                        :loading="issueIsLoading"
-                        :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
-                        :options="socialIssuesOther"
-                        @select="addIssueInList"
-                    >
-                    </VueMultiselect>
-                </div>
-            </div>
+        <div class="my-3">
+          <VueMultiselect
+            name="otherIssues"
+            label="text"
+            track-by="id"
+            open-direction="bottom"
+            :close-on-select="true"
+            :preserve-search="false"
+            :reset-after="true"
+            :hide-selected="true"
+            :taggable="false"
+            :multiple="false"
+            :searchable="true"
+            :allow-empty="true"
+            :show-labels="false"
+            :loading="issueIsLoading"
+            :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
+            :options="socialIssuesOther"
+            @select="addIssueInList"
+          >
+          </VueMultiselect>
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-3 row">
+      <div class="col-4">
+        <label :class="socialActionsClassList">{{
+          trans(ACTIVITY_SOCIAL_ACTIONS)
+        }}</label>
+      </div>
+      <div class="col-8">
+        <div v-if="actionIsLoading === true">
+          <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
        </div>

-        <div class="mb-3 row">
-            <div class="col-4">
-                <label :class="socialActionsClassList">{{
-                    trans(ACTIVITY_SOCIAL_ACTIONS)
-                }}</label>
-            </div>
-            <div class="col-8">
-                <div v-if="actionIsLoading === true">
-                    <i
-                        class="chill-green fa fa-circle-o-notch fa-spin fa-lg"
-                    ></i>
-                </div>
+        <span
+          v-else-if="socialIssuesSelected.length === 0"
+          class="inline-choice chill-no-data-statement mt-3"
+        >
+          {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
+        </span>

-                <span
-                    v-else-if="socialIssuesSelected.length === 0"
-                    class="inline-choice chill-no-data-statement mt-3"
-                >
-                    {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
-                </span>
+        <template
+          v-else-if="
+            socialActionsList.length > 0 &&
+            (socialIssuesSelected.length || socialActionsSelected.length)
+          "
+        >
+          <div
+            id="actionsList"
+            v-for="group in socialActionsList"
+            :key="group.issue"
+          >
+            <span class="badge bg-chill-l-gray text-dark">{{
+              group.issue
+            }}</span>
+            <check-social-action
+              v-for="action in group.actions"
+              :key="action.id"
+              :action="action"
+              :selection="socialActionsSelected"
+              @updateSelected="updateActionsSelected"
+            >
+            </check-social-action>
+          </div>
+        </template>

-                <template
-                    v-else-if="
-                        socialActionsList.length > 0 &&
-                        (socialIssuesSelected.length ||
-                            socialActionsSelected.length)
-                    "
-                >
-                    <div
-                        id="actionsList"
-                        v-for="group in socialActionsList"
-                        :key="group.issue"
-                    >
-                        <span class="badge bg-chill-l-gray text-dark">{{
-                            group.issue
-                        }}</span>
-                        <check-social-action
-                            v-for="action in group.actions"
-                            :key="action.id"
-                            :action="action"
-                            :selection="socialActionsSelected"
-                            @updateSelected="updateActionsSelected"
-                        >
-                        </check-social-action>
-                    </div>
-                </template>
-
-                <span
-                    v-else-if="
-                        actionAreLoaded && socialActionsList.length === 0
-                    "
-                    class="inline-choice chill-no-data-statement mt-3"
-                >
-                    {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
-                </span>
-            </div>
-        </div>
-    </teleport>
+        <span
+          v-else-if="actionAreLoaded && socialActionsList.length === 0"
+          class="inline-choice chill-no-data-statement mt-3"
+        >
+          {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
+        </span>
+      </div>
+    </div>
+  </teleport>
 </template>

 <script>
@@ -106,154 +101,153 @@ import CheckSocialIssue from "./SocialIssuesAcc/CheckSocialIssue.vue";
 import CheckSocialAction from "./SocialIssuesAcc/CheckSocialAction.vue";
 import { getSocialIssues, getSocialActionByIssue } from "../api.js";
 import {
-    ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
-    ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
-    ACTIVITY_SOCIAL_ACTIONS,
-    ACTIVITY_SOCIAL_ISSUES,
-    ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
-    trans,
+  ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+  ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+  ACTIVITY_SOCIAL_ACTIONS,
+  ACTIVITY_SOCIAL_ISSUES,
+  ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+  trans,
 } from "translator";

 export default {
-    name: "SocialIssuesAcc",
-    components: {
-        CheckSocialIssue,
-        CheckSocialAction,
-        VueMultiselect,
+  name: "SocialIssuesAcc",
+  components: {
+    CheckSocialIssue,
+    CheckSocialAction,
+    VueMultiselect,
+  },
+  setup() {
+    return {
+      trans,
+      ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+      ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+      ACTIVITY_SOCIAL_ACTIONS,
+      ACTIVITY_SOCIAL_ISSUES,
+      ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+    };
+  },
+  data() {
+    return {
+      issueIsLoading: false,
+      actionIsLoading: false,
+      actionAreLoaded: false,
+      socialIssuesClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialIssues").getAttribute("required") ? "required" : ""}`,
+      socialActionsClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialActions").getAttribute("required") ? "required" : ""}`,
+    };
+  },
+  computed: {
+    socialIssuesList() {
+      return this.$store.state.activity.accompanyingPeriod.socialIssues;
    },
-    setup() {
-        return {
-            trans,
-            ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
-            ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
-            ACTIVITY_SOCIAL_ACTIONS,
-            ACTIVITY_SOCIAL_ISSUES,
-            ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
-        };
+    socialIssuesSelected() {
+      return this.$store.state.activity.socialIssues;
    },
-    data() {
-        return {
-            issueIsLoading: false,
-            actionIsLoading: false,
-            actionAreLoaded: false,
-            socialIssuesClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialIssues").getAttribute("required") ? "required" : ""}`,
-            socialActionsClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialActions").getAttribute("required") ? "required" : ""}`,
-        };
+    socialIssuesOther() {
+      return this.$store.state.socialIssuesOther;
    },
-    computed: {
-        socialIssuesList() {
-            return this.$store.state.activity.accompanyingPeriod.socialIssues;
-        },
-        socialIssuesSelected() {
-            return this.$store.state.activity.socialIssues;
-        },
-        socialIssuesOther() {
-            return this.$store.state.socialIssuesOther;
-        },
-        socialActionsList() {
-            return this.$store.getters.socialActionsListSorted;
-        },
-        socialActionsSelected() {
-            return this.$store.state.activity.socialActions;
-        },
+    socialActionsList() {
+      return this.$store.getters.socialActionsListSorted;
    },
-    mounted() {
-        /* Load other issues in multiselect */
-        this.issueIsLoading = true;
-        this.actionAreLoaded = false;
-
-        getSocialIssues().then((response) => {
-            /* Add issues to the store */
-            this.$store.commit("updateIssuesOther", response);
-
-            /* Add in list the issues already associated (if not yet listed) */
-            this.socialIssuesSelected.forEach((issue) => {
-                if (
-                    this.socialIssuesList.filter((i) => i.id === issue.id)
-                        .length !== 1
-                ) {
-                    this.$store.commit("addIssueInList", issue);
-                }
-            });
-
-            /* Remove from multiselect the issues that are not yet in the checkbox list */
-            this.socialIssuesList.forEach((issue) => {
-                this.$store.commit("removeIssueInOther", issue);
-            });
-
-            /* Filter issues */
-            this.$store.commit("filterList", "issues");
-
-            /* Add in list the actions already associated (if not yet listed) */
-            this.socialActionsSelected.forEach((action) => {
-                this.$store.commit("addActionInList", action);
-            });
-
-            /* Filter actions */
-            this.$store.commit("filterList", "actions");
-
-            this.issueIsLoading = false;
-            this.actionAreLoaded = true;
-            this.updateActionsList();
-        });
+    socialActionsSelected() {
+      return this.$store.state.activity.socialActions;
    },
-    methods: {
-        /* When choosing an issue in multiselect, add it in checkboxes (as selected),
+  },
+  mounted() {
+    /* Load other issues in multiselect */
+    this.issueIsLoading = true;
+    this.actionAreLoaded = false;
+
+    getSocialIssues().then((response) => {
+      /* Add issues to the store */
+      this.$store.commit("updateIssuesOther", response);
+
+      /* Add in list the issues already associated (if not yet listed) */
+      this.socialIssuesSelected.forEach((issue) => {
+        if (
+          this.socialIssuesList.filter((i) => i.id === issue.id).length !== 1
+        ) {
+          this.$store.commit("addIssueInList", issue);
+        }
+      });
+
+      /* Remove from multiselect the issues that are not yet in the checkbox list */
+      this.socialIssuesList.forEach((issue) => {
+        this.$store.commit("removeIssueInOther", issue);
+      });
+
+      /* Filter issues */
+      this.$store.commit("filterList", "issues");
+
+      /* Add in list the actions already associated (if not yet listed) */
+      this.socialActionsSelected.forEach((action) => {
+        this.$store.commit("addActionInList", action);
+      });
+
+      /* Filter actions */
+      this.$store.commit("filterList", "actions");
+
+      this.issueIsLoading = false;
+      this.actionAreLoaded = true;
+      this.updateActionsList();
+    });
+  },
+  methods: {
+    /* When choosing an issue in multiselect, add it in checkboxes (as selected),
         remove it from multiselect, and add socialActions concerned
      */
-        addIssueInList(value) {
-            //console.log('addIssueInList', value);
-            this.$store.commit("addIssueInList", value);
-            this.$store.commit("removeIssueInOther", value);
-            this.$store.dispatch("addIssueSelected", value);
-            this.updateActionsList();
-        },
-        /* Update value for selected issues checkboxes
-         */
-        updateIssuesSelected(issues) {
-            //console.log('updateIssuesSelected', issues);
-            this.$store.dispatch("updateIssuesSelected", issues);
-            this.updateActionsList();
-        },
-        /* Update value for selected actions checkboxes
-         */
-        updateActionsSelected(actions) {
-            //console.log('updateActionsSelected', actions);
-            this.$store.dispatch("updateActionsSelected", actions);
-        },
-        /* Add socialActions concerned: after reset, loop on each issue selected
+    addIssueInList(value) {
+      //console.log('addIssueInList', value);
+      this.$store.commit("addIssueInList", value);
+      this.$store.commit("removeIssueInOther", value);
+      this.$store.dispatch("addIssueSelected", value);
+      this.updateActionsList();
+    },
+    /* Update value for selected issues checkboxes
+     */
+    updateIssuesSelected(issues) {
+      //console.log('updateIssuesSelected', issues);
+      this.$store.dispatch("updateIssuesSelected", issues);
+      this.updateActionsList();
+    },
+    /* Update value for selected actions checkboxes
+     */
+    updateActionsSelected(actions) {
+      //console.log('updateActionsSelected', actions);
+      this.$store.dispatch("updateActionsSelected", actions);
+    },
+    /* Add socialActions concerned: after reset, loop on each issue selected
         to get social actions concerned
      */
-        updateActionsList() {
-            this.resetActionsList();
-            this.socialIssuesSelected.forEach((item) => {
-                this.actionIsLoading = true;
-                getSocialActionByIssue(item.id).then(
-                    (actions) =>
-                        new Promise((resolve) => {
-                            actions.results.forEach((action) => {
-                                this.$store.commit("addActionInList", action);
-                            }, this);
+    updateActionsList() {
+      this.resetActionsList();
+      this.socialIssuesSelected.forEach((item) => {
+        this.actionIsLoading = true;
+        getSocialActionByIssue(item.id).then(
+          (actions) =>
+            new Promise((resolve) => {
+              actions.results.forEach((action) => {
+                this.$store.commit("addActionInList", action);
+              }, this);

-                            this.$store.commit("filterList", "actions");
+              this.$store.commit("filterList", "actions");

-                            this.actionIsLoading = false;
-                            this.actionAreLoaded = true;
-                            resolve();
-                        }),
-                );
-            }, this);
-        },
-        /* Reset socialActions List: flush list and restore selected actions
-         */
-        resetActionsList() {
-            this.$store.commit("resetActionsList");
-            this.actionAreLoaded = false;
-            this.socialActionsSelected.forEach((item) => {
-                this.$store.commit("addActionInList", item);
-            }, this);
-        },
+              this.actionIsLoading = false;
+              this.actionAreLoaded = true;
+              resolve();
+            }),
+        );
+      }, this);
    },
+    /* Reset socialActions List: flush list and restore selected actions
+     */
+    resetActionsList() {
+      this.$store.commit("resetActionsList");
+      this.actionAreLoaded = false;
+      this.socialActionsSelected.forEach((item) => {
+        this.$store.commit("addActionInList", item);
+      }, this);
+    },
+  },
 };
 </script>

@@ -263,18 +257,18 @@ export default {
@import "ChillMainAssets/chill/scss/chill_variables";

 span.multiselect__single {
-    display: none !important;
+  display: none !important;
 }

 #actionsList {
-    border-radius: 0.5rem;
-    padding: 1rem;
-    margin: 0.5rem;
-    background-color: whitesmoke;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  margin: 0.5rem;
+  background-color: whitesmoke;
 }

 span.badge {
-    margin-bottom: 0.5rem;
-    @include badge_social($social-issue-color);
+  margin-bottom: 0.5rem;
+  @include badge_social($social-issue-color);
 }
 </style>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
@@ -1,38 +1,38 @@
 <template>
-    <span class="inline-choice">
-        <div class="form-check">
-            <input
-                class="form-check-input"
-                type="checkbox"
-                v-model="selected"
-                name="action"
-                :id="action.id"
-                :value="action"
-            />
-            <label class="form-check-label" :for="action.id">
-                <span class="badge bg-light text-dark" :title="action.text">{{
-                    action.text
-                }}</span>
-            </label>
-        </div>
-    </span>
+  <span class="inline-choice">
+    <div class="form-check">
+      <input
+        class="form-check-input"
+        type="checkbox"
+        v-model="selected"
+        name="action"
+        :id="action.id"
+        :value="action"
+      />
+      <label class="form-check-label" :for="action.id">
+        <span class="badge bg-light text-dark" :title="action.text">{{
+          action.text
+        }}</span>
+      </label>
+    </div>
+  </span>
 </template>

 <script>
 export default {
-    name: "CheckSocialAction",
-    props: ["action", "selection"],
-    emits: ["updateSelected"],
-    computed: {
-        selected: {
-            set(value) {
-                this.$emit("updateSelected", value);
-            },
-            get() {
-                return this.selection;
-            },
-        },
+  name: "CheckSocialAction",
+  props: ["action", "selection"],
+  emits: ["updateSelected"],
+  computed: {
+    selected: {
+      set(value) {
+        this.$emit("updateSelected", value);
+      },
+      get() {
+        return this.selection;
+      },
    },
+  },
 };
 </script>

@@ -41,13 +41,13 @@ export default {
@import "ChillPersonAssets/chill/scss/mixins";
@import "ChillMainAssets/chill/scss/chill_variables";
 span.badge {
-    @include badge_social($social-action-color);
-    font-size: 95%;
-    margin-bottom: 5px;
-    margin-right: 1em;
-    max-width: 100%; /* Adjust as needed */
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  @include badge_social($social-action-color);
+  font-size: 95%;
+  margin-bottom: 5px;
+  margin-right: 1em;
+  max-width: 100%; /* Adjust as needed */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 </style>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
@@ -1,38 +1,36 @@
 <template>
-    <span class="inline-choice">
-        <div class="form-check">
-            <input
-                class="form-check-input"
-                type="checkbox"
-                v-model="selected"
-                name="issue"
-                :id="issue.id"
-                :value="issue"
-            />
-            <label class="form-check-label" :for="issue.id">
-                <span class="badge bg-chill-l-gray text-dark">{{
-                    issue.text
-                }}</span>
-            </label>
-        </div>
-    </span>
+  <span class="inline-choice">
+    <div class="form-check">
+      <input
+        class="form-check-input"
+        type="checkbox"
+        v-model="selected"
+        name="issue"
+        :id="issue.id"
+        :value="issue"
+      />
+      <label class="form-check-label" :for="issue.id">
+        <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
+      </label>
+    </div>
+  </span>
 </template>

 <script>
 export default {
-    name: "CheckSocialIssue",
-    props: ["issue", "selection"],
-    emits: ["updateSelected"],
-    computed: {
-        selected: {
-            set(value) {
-                this.$emit("updateSelected", value);
-            },
-            get() {
-                return this.selection;
-            },
-        },
+  name: "CheckSocialIssue",
+  props: ["issue", "selection"],
+  emits: ["updateSelected"],
+  computed: {
+    selected: {
+      set(value) {
+        this.$emit("updateSelected", value);
+      },
+      get() {
+        return this.selection;
+      },
    },
+  },
 };
 </script>

@@ -41,9 +39,9 @@ export default {
@import "ChillPersonAssets/chill/scss/mixins";
@import "ChillMainAssets/chill/scss/chill_variables";
 span.badge {
-    @include badge_social($social-issue-color);
-    font-size: 95%;
-    margin-bottom: 5px;
-    margin-right: 1em;
+  @include badge_social($social-issue-color);
+  font-size: 95%;
+  margin-bottom: 5px;
+  margin-right: 1em;
 }
 </style>
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
@@ -49,17 +49,17 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
        return $this->getAttributes();
    }

-    protected function supports(string $attribute, mixed $subject): bool
+    protected function supports($attribute, $subject)
    {
        return $this->helper->supports($attribute, $subject);
    }

-    protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
    {
        return $this->helper->voteOnAttribute($attribute, $subject, $token);
    }

-    private function getAttributes(): array
+    private function getAttributes()
    {
        return [self::STATS, self::LISTS];
    }
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStoredObjectVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStoredObjectVoter.php
@@ -17,7 +17,7 @@ use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter;
 use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
-use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\Security;

 class ActivityStoredObjectVoter extends AbstractStoredObjectVoter
 {
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -22,7 +22,7 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\Security;

 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
--- a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php
@@ -26,7 +26,7 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\Security;

 final readonly class AccompanyingPeriodActivityGenericDocProvider implements GenericDocForAccompanyingPeriodProviderInterface, GenericDocForPersonProviderInterface
 {
--- a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php
@@ -16,7 +16,7 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\DocStoreBundle\GenericDoc\FetchQueryInterface;
 use Chill\DocStoreBundle\GenericDoc\GenericDocForPersonProviderInterface;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Security\Core\Security;

 final readonly class PersonActivityGenericDocProvider implements GenericDocForPersonProviderInterface
 {
--- a/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php
+++ b/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php
@@ -25,7 +25,7 @@ trait PrepareActivityTrait
     *
     * @return Activity
     */
-    public function prepareActivity(Scope $scope, Person $person): \Chill\ActivityBundle\Entity\Activity
+    public function prepareActivity(Scope $scope, Person $person)
    {
        return (new Activity())
            ->setScope($scope)
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
@@ -25,7 +25,7 @@ final class ActivityControllerTest extends WebTestCase
    /**
     * @dataProvider getSecuredPagesUnauthenticated
     */
-    public function testAccessIsDeniedForUnauthenticated(mixed $url): void
+    public function testAccessIsDeniedForUnauthenticated(mixed $url)
    {
        $client = $this->createClient();

@@ -61,7 +61,7 @@ final class ActivityControllerTest extends WebTestCase
     * @param type $client
     * @param type $url
     */
-    public function testAccessIsDeniedForUnauthorized($client, $url): void
+    public function testAccessIsDeniedForUnauthorized($client, $url)
    {
        $client->request('GET', $url);

@@ -101,7 +101,7 @@ final class ActivityControllerTest extends WebTestCase
        ];
    }

-    public function testCompleteScenario(): void
+    public function testCompleteScenario()
    {
        // Create a new client to browse the application
        $client = $this->getAuthenticatedClient();
@@ -199,7 +199,7 @@ final class ActivityControllerTest extends WebTestCase
     *
     * @return \Chill\MainBundle\Entity\User a fake user within a group without activity
     */
-    private function createFakeUser(): \Chill\MainBundle\Entity\User
+    private function createFakeUser()
    {
        $container = self::$kernel->getContainer();
        $em = $container->get('doctrine.orm.entity_manager');
@@ -259,7 +259,7 @@ final class ActivityControllerTest extends WebTestCase
    /**
     * @return \Symfony\Component\BrowserKit\AbstractBrowser
     */
-    private function getAuthenticatedClient(mixed $username = 'center a_social'): \Symfony\Bundle\FrameworkBundle\KernelBrowser
+    private function getAuthenticatedClient(mixed $username = 'center a_social')
    {
        return self::createClient([], [
            'PHP_AUTH_USER' => $username,
--- a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
@@ -16,6 +16,7 @@ use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPer
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Doctrine\ORM\Event\LifecycleEventArgs;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;

@@ -69,32 +70,33 @@ final class ActivityTest extends TestCase
    public function testHierarchySocialIssues(): void
    {
        $listener = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
+        $event = $this->prophesize(LifecycleEventArgs::class)->reveal();

        $parent = new SocialIssue();
        $child = new SocialIssue();

-        $child->setParent($parent);
+        $parent->addChild($child);
        $grandChild = new SocialIssue();
-        $grandChild->setParent($child);
+        $child->addChild($grandChild);

        $activity = new Activity();
        $activity->setAccompanyingPeriod(new AccompanyingPeriod());

        $activity->addSocialIssue($parent);
-        $listener->preUpdate($activity);
+        $listener->preUpdate($activity, $event);

        $this->assertCount(1, $activity->getSocialIssues());
        $this->assertContains($parent, $activity->getSocialIssues());

        $activity->addSocialIssue($grandChild);
-        $listener->preUpdate($activity);
+        $listener->preUpdate($activity, $event);

        $this->assertCount(1, $activity->getSocialIssues());
        $this->assertContains($grandChild, $activity->getSocialIssues());
        $this->assertNotContains($parent, $activity->getSocialIssues());

        $activity->addSocialIssue($child);
-        $listener->preUpdate($activity);
+        $listener->preUpdate($activity, $event);

        $this->assertCount(1, $activity->getSocialIssues());
        $this->assertContains($grandChild, $activity->getSocialIssues());
@@ -102,7 +104,7 @@ final class ActivityTest extends TestCase
        $this->assertNotContains($child, $activity->getSocialIssues());

        $activity->addSocialIssue($another = new SocialIssue());
-        $listener->preUpdate($activity);
+        $listener->preUpdate($activity, $event);

        $this->assertCount(2, $activity->getSocialIssues());
        $this->assertContains($grandChild, $activity->getSocialIssues());
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByActivityTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByActivityTypeAggregatorTest.php
@@ -41,7 +41,7 @@ class ByActivityTypeAggregatorTest extends AbstractAggregatorTest
        $this->translatableStringHelper = self::getContainer()->get(TranslatableStringHelperInterface::class);
    }

-    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByActivityTypeAggregator
+    public function getAggregator()
    {
        return new ByActivityTypeAggregator(
            $this->rollingDateConverter,
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php
@@ -32,7 +32,7 @@ final class BySocialActionAggregatorTest extends AbstractAggregatorTest
        $this->aggregator = self::getContainer()->get('chill.activity.export.bysocialaction_aggregator');
    }

-    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregator
+    public function getAggregator()
    {
        return $this->aggregator;
    }
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php
@@ -32,7 +32,7 @@ final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
        $this->aggregator = self::getContainer()->get('chill.activity.export.bysocialissue_aggregator');
    }

-    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregator
+    public function getAggregator()
    {
        return $this->aggregator;
    }
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityPresenceAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityPresenceAggregatorTest.php
@@ -35,7 +35,7 @@ class ActivityPresenceAggregatorTest extends AbstractAggregatorTest
        $this->activityPresenceRepository = self::getContainer()->get(ActivityPresenceRepositoryInterface::class);
    }

-    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityPresenceAggregator
+    public function getAggregator()
    {
        return new ActivityPresenceAggregator($this->activityPresenceRepository, $this->translatableStringHelper);
    }
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php
@@ -44,7 +44,7 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
                    ->push($request->reveal());*/
    }

-    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
+    public function getAggregator()
    {
        return $this->aggregator;
    }
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
@@ -45,7 +45,7 @@ final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
            ->push($request->reveal());
    }

-    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator
+    public function getAggregator()
    {
        return $this->aggregator;
    }
--- a/Show More
+++ b/Show More