Correct syntax in .env file for redis_url

- Inject parameters directly instead of getting from container
- User PasswordHasher instead of EncoderFactory
- set parameters directly and correctly encode values to json

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

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

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

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

.changes/unreleased/Feature-20250904-181032.yaml

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

.changes/unreleased/Fixed-20250909-173639.yaml

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

.changes/v4.3.0.md

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

.editorconfig

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

.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 ###

.env.dev

@@ -0,0 +1,4 @@
+
+###> symfony/framework-bundle ###
+APP_SECRET=72759e571285ef25677c88f967a73386
+###< symfony/framework-bundle ###

.env.test

@@ -1,39 +1,5 @@
-# variables for .env environement
+# define your env variables for the test env here
-# 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
-ADMIN_PASSWORD=password
+DEFAULT_CARRIER_CODE=TEST
-
-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

.gitignore

@@ -33,7 +33,7 @@ config/packages/dev/*
 
 ###> phpunit/phpunit ###
 /phpunit.xml
-.phpunit.result.cache
+/.phpunit.cache/
 ###< phpunit/phpunit ###
 
 /.php-cs-fixer.cache

.junie/guidelines.md

@@ -234,16 +234,20 @@ 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: so, do not change the directory to any bundle directory before running tests).
+The tests are run from the project's root (not from the bundle's root).
-
-Tests must be run using the `symfony` command:
 
 ```bash
+# Run all tests
+vendor/bin/phpunit
+
+# Run tests for a specific bundle
+vendor/bin/phpunit --testsuite NameBundle
+
 # Run a specific test file
-symfony composer exec phpunit -- path/to/TestFile.php
+vendor/bin/phpunit path/to/TestFile.php
 
 # Run a specific test method
-symfony composer exec phpunit -- --filter methodName path/to/TestFile.php
+vendor/bin/phpunit --filter methodName path/to/TestFile.php
 ```
 
 #### Test Structure

.prettierrc

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

.vscode/launch.json

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

.vscode/tasks.json

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

CHANGELOG.md

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

CONVENTIONS-fr.md

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

composer.json

@@ -8,7 +8,7 @@
         "social worker"
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "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": "^2.13.0",
+        "doctrine/orm": "^3.5.2",
         "erusev/parsedown": "^1.7",
         "knplabs/knp-menu-bundle": "^3.0",
-        "knplabs/knp-time-bundle": "^1.12",
+        "knplabs/knp-time-bundle": "^2.0",
         "knpuniversity/oauth2-client-bundle": "^2.10",
         "league/csv": "^9.7.1",
         "lexik/jwt-authentication-bundle": "^2.16",
@@ -32,54 +32,53 @@
         "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/asset": "^5.4",
+        "symfony/amqp-messenger": "^7.3",
-        "symfony/browser-kit": "^5.4",
+        "symfony/asset": "^7.2",
-        "symfony/cache": "^5.4",
+        "symfony/browser-kit": "^7.2",
-        "symfony/clock": "^6.2",
+        "symfony/cache": "^7.2",
-        "symfony/config": "^5.4",
+        "symfony/clock": "^7.2",
-        "symfony/console": "^5.4",
+        "symfony/config": "^7.2",
-        "symfony/css-selector": "^5.4",
+        "symfony/console": "^7.2",
-        "symfony/dom-crawler": "^5.4",
+        "symfony/css-selector": "^7.2",
-        "symfony/error-handler": "^5.4",
+        "symfony/dom-crawler": "^7.2",
-        "symfony/event-dispatcher": "^5.4",
+        "symfony/error-handler": "^7.2",
-        "symfony/event-dispatcher-contracts": "^2.4",
+        "symfony/event-dispatcher": "^7.2",
-        "symfony/expression-language": "^5.4",
+        "symfony/event-dispatcher-contracts": "^3.0",
-        "symfony/filesystem": "^5.4",
+        "symfony/expression-language": "^7.2",
-        "symfony/finder": "^5.4",
+        "symfony/filesystem": "^7.2",
-        "symfony/form": "^5.4",
+        "symfony/finder": "^7.2",
-        "symfony/framework-bundle": "^5.4",
+        "symfony/form": "^7.2",
-        "symfony/http-client": "^5.4",
+        "symfony/framework-bundle": "^7.2",
-        "symfony/http-foundation": "^5.4",
+        "symfony/http-client": "^7.2",
-        "symfony/intl": "^5.4",
+        "symfony/http-foundation": "^7.2",
-        "symfony/mailer": "^5.4",
+        "symfony/intl": "^7.2",
-        "symfony/messenger": "^5.4",
+        "symfony/mailer": "^7.2",
-        "symfony/mime": "^5.4",
+        "symfony/messenger": "^7.2",
+        "symfony/mime": "^7.2",
         "symfony/monolog-bundle": "^3.5",
-        "symfony/notifier": "^5.4",
+        "symfony/notifier": "^7.2",
-        "symfony/options-resolver": "^5.4",
+        "symfony/options-resolver": "^7.2",
-        "symfony/ovh-cloud-notifier": "^5.4",
+        "symfony/ovh-cloud-notifier": "^7.2",
-        "symfony/process": "^5.4",
+        "symfony/polyfill-intl-messageformatter": "^1.32",
-        "symfony/property-access": "^5.4",
+        "symfony/process": "^7.2",
-        "symfony/property-info": "^5.4",
+        "symfony/property-access": "^7.2",
-        "symfony/routing": "^5.4",
+        "symfony/property-info": "^7.2",
-        "symfony/security-bundle": "^5.4",
+        "symfony/routing": "^7.2",
-        "symfony/security-core": "^5.4",
+        "symfony/security-bundle": "^7.3",
-        "symfony/security-csrf": "^5.4",
+        "symfony/security-core": "^7.2",
-        "symfony/security-guard": "^5.4",
+        "symfony/security-csrf": "^7.2",
-        "symfony/security-http": "^5.4",
+        "symfony/security-http": "^7.2",
-        "symfony/serializer": "^5.4",
+        "symfony/serializer": "^7.2",
-        "symfony/string": "^5.4",
+        "symfony/string": "^7.2",
-        "symfony/templating": "^5.4",
+        "symfony/translation": "^7.2",
-        "symfony/translation": "^5.4",
+        "symfony/twig-bundle": "^7.2",
-        "symfony/twig-bundle": "^5.4",
         "symfony/ux-translator": "^2.22",
-        "symfony/validator": "^5.4",
+        "symfony/validator": "^7.2",
-        "symfony/webpack-encore-bundle": "^1.11",
+        "symfony/webpack-encore-bundle": "^2.0",
-        "symfony/workflow": "^5.4",
+        "symfony/workflow": "^7.2",
-        "symfony/yaml": "^5.4",
+        "symfony/yaml": "^7.2",
         "thenetworg/oauth2-azure": "^2.0",
         "twig/extra-bundle": "^3.0",
         "twig/intl-extra": "^3.0",
@@ -101,16 +100,15 @@
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^10.5.24",
         "rector/rector": "^1.1.0",
-        "symfony/amqp-messenger": "^5.4.45",
+        "symfony/debug-bundle": "^7.2",
-        "symfony/debug-bundle": "^5.4",
+        "symfony/dotenv": "^7.2",
-        "symfony/dotenv": "^5.4",
         "symfony/flex": "^2.4",
         "symfony/maker-bundle": "^1.20",
         "symfony/phpunit-bridge": "^7.1",
-        "symfony/runtime": "^5.4",
+        "symfony/runtime": "^7.2",
-        "symfony/stopwatch": "^5.4",
+        "symfony/stopwatch": "^7.2",
-        "symfony/var-dumper": "^5.4",
+        "symfony/var-dumper": "^7.2",
-        "symfony/web-profiler-bundle": "^5.4"
+        "symfony/web-profiler-bundle": "^7.2"
     },
     "conflict": {
         "symfony/symfony": "*"
@@ -133,7 +131,6 @@
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
             "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
-            "Chill\\TicketBundle\\": "src/Bundle/ChillTicketBundle/src",
             "Chill\\Utils\\Rector\\": "utils/rector/src"
         }
     },

config/bundles.php

@@ -14,7 +14,6 @@ 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],
@@ -35,7 +34,6 @@ 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],
 ];

config/packages/chill_doc_store.yaml

@@ -1,5 +1,5 @@
 chill_doc_store:
-    use_driver: local_storage
+    use_driver: openstack
     local_storage:
         storage_path: '%kernel.project_dir%/var/storage'
     openstack:

config/packages/chill_ticket.yaml

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

config/packages/csrf.yaml

@@ -0,0 +1,11 @@
+# Enable stateless CSRF protection for forms and logins/logouts
+framework:
+    form:
+        csrf_protection:
+            token_id: submit
+
+    csrf_protection:
+        stateless_token_ids:
+            - submit
+            - authenticate
+            - logout

config/packages/doctrine.yaml

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

config/packages/doctrine_migrations_chill.yaml

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

config/packages/framework.yaml

@@ -4,6 +4,16 @@ 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:

config/packages/messenger.yaml

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

config/packages/notifier.yaml

@@ -1,8 +1,8 @@
 framework:
     notifier:
         texter_transports:
-            #ovhcloud: '%env(OVHCLOUD_DSN)%'
+        #ovhcloud: '%env(OVHCLOUD_DSN)%'
-            #ovhcloud: '%env(SHORT_MESSAGE_DSN)%'
+        #ovhcloud: '%env(SHORT_MESSAGE_DSN)%'
         channel_policy:
             # use chat/slack, chat/telegram, sms/twilio or sms/nexmo
             urgent: ['email']

config/packages/property_info.yaml

@@ -0,0 +1,3 @@
+framework:
+    property_info:
+        enabled: true

config/packages/security.yaml

@@ -1,5 +1,4 @@
 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'
@@ -28,16 +27,13 @@ security:
             pattern: ^/wopi
             provider: chill_chain_provider
             stateless: true
-            guard:
+            jwt: ~
-                authenticators:
-                    - lexik_jwt_authentication.jwt_token_authenticator
         dav:
             pattern: ^/dav
             provider: chill_chain_provider
             stateless: true
-            guard:
+            custom_authenticator:
-                authenticators:
+                - Chill\DocStoreBundle\Security\Authenticator\JWTOnDavUrlAuthenticator
-                    - 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:
@@ -63,7 +59,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: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/(login|logout), roles: PUBLIC_ACCESS }
         - { path: ^/public, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/wopi, roles: IS_AUTHENTICATED_FULLY }
         # access for homepage, the homepage redirect admin to admin section

config/packages/sensio_framework_extra.yaml

@@ -1,3 +0,0 @@
-sensio_framework_extra:
-    router:
-        annotations: false

config/packages/workflow_chill.yaml

@@ -7,7 +7,8 @@ framework:
                         - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument
                         - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork
                         - Chill\DocStoreBundle\Entity\AccompanyingCourseDocument
-                label:
+                label: Suivi
+                translated_labels:
                     fr: 'Suivi'
             support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
             marking_store:
@@ -16,11 +17,13 @@ framework:
             places:
                 initial:
                     metadata:
-                        label:
+                        label: Étape initiale
+                        translated_labels:
                             fr: Étape initiale
                 attenteModification:
                     metadata:
-                        label:
+                        label: En attente de modification du document
+                        translated_labels:
                             fr: En attente de modification du document
                         validationFilterInputLabels:
                             forward: {fr: Modification effectuée}
@@ -28,7 +31,8 @@ framework:
                             neutral: {fr: Autre}
                 attenteMiseEnForme:
                     metadata:
-                        label:
+                        label: En attente de mise en forme
+                        translated_labels:
                             fr: En attente de mise en forme
                         validationFilterInputLabels:
                             forward: {fr: Mise en forme terminée}
@@ -36,7 +40,8 @@ framework:
                             neutral: {fr: Autre}
                 attenteVisa:
                     metadata:
-                        label:
+                        label: En attente de visa
+                        translated_labels:
                             fr: En attente de visa
                         validationFilterInputLabels:
                             forward: {fr: Visa accordé}
@@ -47,7 +52,8 @@ framework:
                         isSignature: ['user', 'person']
                         onSignatureCompleted:
                             transitionName: signatureApplied
-                        label:
+                        label: En attente de signature
+                        translated_labels:
                             fr: En attente de signature
                         validationFilterInputLabels:
                             forward: {fr: Signature accordée}
@@ -55,7 +61,8 @@ framework:
                             neutral: {fr: Autre}
                 postSignature:
                     metadata:
-                        label:
+                        label: Signatures traitées
+                        translated_labels:
                             fr: Signatures traitées
                         validationFilterInputLabels:
                             forward: {fr: Poursuite du traitement}
@@ -63,7 +70,8 @@ framework:
                             neutral: {fr: Autre}
                 attenteTraitement:
                     metadata:
-                        label:
+                        label: En attente de traitement
+                        translated_labels:
                             fr: En attente de traitement
                         validationFilterInputLabels:
                             forward: {fr: Traitement terminé favorablement}
@@ -71,7 +79,8 @@ framework:
                             neutral: {fr: Autre}
                 attenteEnvoi:
                     metadata:
-                        label:
+                        label: En attente d'envoi
+                        translated_labels:
                             fr: En attente d'envoi
                         validationFilterInputLabels:
                             forward: {fr: Document envoyé}
@@ -79,7 +88,8 @@ framework:
                             neutral: {fr: Autre}
                 attenteValidationMiseEnForme:
                     metadata:
-                        label:
+                        label: En attente de validation de la mise en forme
+                        translated_labels:
                             fr: En attente de validation de la mise en forme
                         validationFilterInputLabels:
                             forward: {fr: Validation de la mise en forme}
@@ -89,7 +99,8 @@ framework:
                     metadata:
                         isSentExternal: true
                         onExternalView: clotureApresLectureEnvoiExterne
-                        label:
+                        label: En attente d'ouverture par un destinataire externe
+                        translated_labels:
                             fr: En attente d'ouverture par un destinataire externe
                         validationFilterInputLabels:
                             forward: {fr: Document reçu par un destinataire externe}
@@ -99,13 +110,15 @@ framework:
                     metadata:
                         isFinal: true
                         isFinalPositive: false
-                        label:
+                        label: Annulé
+                        translated_labels:
                             fr: Annulé
                 final:
                     metadata:
                         isFinal: true
                         isFinalPositive: true
-                        label:
+                        label: Finalisé
+                        translated_labels:
                             fr: Finalisé
             transitions:
                 # transition qui avancent
@@ -114,7 +127,8 @@ framework:
                         - initial
                     to: attenteModification
                     metadata:
-                        label:
+                        label: Demande de modification du document
+                        translated_labels:
                             fr: Demande de modification du document
                         isForward: true
                 demandeMiseEnForme:
@@ -123,7 +137,8 @@ framework:
                         - attenteModification
                     to: attenteMiseEnForme
                     metadata:
-                        label:
+                        label: Demande de mise en forme
+                        translated_labels:
                             fr: Demande de mise en forme
                         isForward: true
                 demandeValidationMiseEnForme:
@@ -131,7 +146,8 @@ framework:
                         - attenteMiseEnForme
                     to: attenteValidationMiseEnForme
                     metadata:
-                        label:
+                        label: Demande de validation de la mise en forme
+                        translated_labels:
                             fr: Demande de validation de la mise en forme
                         isForward: true
                 demandeVisa:
@@ -144,7 +160,8 @@ framework:
                         - attenteTraitement
                     to: attenteVisa
                     metadata:
-                        label:
+                        label: Demande de visa
+                        translated_labels:
                             fr: Demande de visa
                         isForward: true
                 demandeSignature:
@@ -157,14 +174,18 @@ framework:
                         - attenteTraitement
                     to: attenteSignature
                     metadata:
-                        label: {fr: Demande de signature}
+                        label: Demande de signature
+                        translated_labels:
+                            fr: Demande de signature
                         isForward: true
                 signatureApplied:
                     from:
                         - attenteSignature
                     to: postSignature
                     metadata:
-                        label: {fr: Signatures appliquées}
+                        label: Signatures appliquées
+                        translated_labels:
+                            fr: Signatures appliquées
                         isForward: true
                         transitionGuard: 'system' # can be 'system+only-dest' or 'only-dest' (only-dest is default)
                 demandeTraitement:
@@ -177,7 +198,9 @@ framework:
                         - postSignature
                     to: attenteTraitement
                     metadata:
-                        label: {fr: Demande de traitement}
+                        label: Demande de traitement
+                        translated_labels:
+                            fr: Demande de traitement
                         isForward: true
                 demandeEnvoi:
                     from:
@@ -190,7 +213,9 @@ framework:
                         - attenteTraitement
                     to: attenteEnvoi
                     metadata:
-                        label: {fr: Demande d'envoi}
+                        label: Demande d'envoi
+                        translated_labels:
+                            fr: Demande d'envoi
                         isForward: true
                 demandeEnvoiExterne:
                     from:
@@ -203,7 +228,9 @@ framework:
                         - attenteTraitement
                     to: attenteReceptionExternal
                     metadata:
-                        label: {fr: Envoi sécurisé par courrier électronique}
+                        label: Envoi sécurisé par courrier électronique
+                        translated_labels:
+                            fr: Envoi sécurisé par courrier électronique
                         isForward: true
                 clotureApresLectureEnvoiExterne:
                     from:
@@ -213,7 +240,9 @@ framework:
                     metadata:
                         transitionGuard: system
                         isForward:  true
-                        label: {fr: Consultation de l'envoi sécurisé}
+                        label: Consultation de l'envoi sécurisé
+                        translated_labels:
+                            fr: Consultation de l'envoi sécurisé
                 annulation:
                     from:
                         - initial
@@ -227,7 +256,9 @@ framework:
                         - attenteEnvoi
                     to: annule
                     metadata:
-                        label: {fr: Annulation}
+                        label: Annulation
+                        translated_labels:
+                            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
@@ -237,27 +268,35 @@ framework:
                         - attenteValidationMiseEnForme
                     to: attenteMiseEnForme
                     metadata:
-                        label: {fr: Demande de mise en forme supplémentaire}
+                        label: Demande de mise en forme supplémentaire
+                        translated_labels:
+                            fr: Demande de mise en forme supplémentaire
                 demandeVisaSupplementaire:
                     from:
                         - attenteVisa
                     to: attenteVisa
                     metadata:
-                        label: {fr: Demande de visa supplémentaire}
+                        label: Demande de visa supplémentaire
+                        translated_labels:
+                            fr: Demande de visa supplémentaire
                         isForward: true
                 demandeSignatureSupplementaire:
                     from:
                         - postSignature
                     to: attenteSignature
                     metadata:
-                        label: {fr: Demande de signature supplémentaire}
+                        label: Demande de signature supplémentaire
+                        translated_labels:
+                            fr: Demande de signature supplémentaire
                         isForward: true
                 demandeTraitementSupplementaire:
                     from:
                         - attenteTraitement
                     to: attenteTraitement
                     metadata:
-                        label: {fr: Demande de traitement supplémentaire}
+                        label: Demande de traitement supplémentaire
+                        translated_labels:
+                            fr: Demande de traitement supplémentaire
                 # transitions qui renvoient vers une étape précédente
                 refusEtModificationDocument:
                     from:
@@ -267,7 +306,8 @@ framework:
                         - attenteEnvoi
                     to: attenteModification
                     metadata:
-                        label:
+                        label: Refus et demande de modification du document
+                        translated_labels:
                             fr: Refus et demande de modification du document
                         isForward: false
                 refusEtDemandeMiseEnForme:
@@ -277,7 +317,9 @@ framework:
                         - attenteEnvoi
                     to: attenteMiseEnForme
                     metadata:
-                        label: {fr: Refus et demande de mise en forme}
+                        label: Refus et demande de mise en forme
+                        translated_labels:
+                            fr: Refus et demande de mise en forme
                         isForward: false
                 refusEtDemandeVisa:
                     from:
@@ -285,21 +327,27 @@ framework:
                         - attenteEnvoi
                     to: attenteVisa
                     metadata:
-                        label: {fr: Refus et demande de visa}
+                        label: Refus et demande de visa
+                        translated_labels:
+                            fr: Refus et demande de visa
                         isForward: false
                 refusEtDemandeSignature:
                     from:
                         - attenteEnvoi
                     to: attenteSignature
                     metadata:
-                        label: {fr: Refus et demande de signature}
+                        label: Refus et demande de signature
+                        translated_labels:
+                            fr: Refus et demande de signature
                         isForward: false
                 refusEtDemandeTraitement:
                     from:
                         - attenteEnvoi
                     to: attenteTraitement
                     metadata:
-                        label: {fr: Refus et demande de traitement}
+                        label: Refus et demande de traitement
+                        translated_labels:
+                            fr: Refus et demande de traitement
                         isForward: false
                 # transition vers final
                 initialToFinal:
@@ -307,7 +355,9 @@ framework:
                         - initial
                     to: final
                     metadata:
-                        label: {fr: Clotûre immédiate et cloture positive}
+                        label: Clotûre immédiate et cloture positive
+                        translated_labels:
+                            fr: Clotûre immédiate et cloture positive
                         isForward: true
                 attenteMiseEnFormeToFinal:
                     from:
@@ -315,33 +365,43 @@ framework:
                         - attenteValidationMiseEnForme
                     to: final
                     metadata:
-                        label: {fr: Mise en forme terminée et cloture positive}
+                        label: Mise en forme terminée et cloture positive
+                        translated_labels:
+                            fr: Mise en forme terminée et cloture positive
                         isForward: true
                 attenteVisaToFinal:
                     from:
                         - attenteVisa
                     to: final
                     metadata:
-                        label: {fr: Accorde le visa et cloture positive}
+                        label: Accorde le visa et cloture positive
+                        translated_labels:
+                            fr: Accorde le visa et cloture positive
                         isForward: true
                 postSignatureToFinal:
                     from:
                         - postSignature
                     to: final
                     metadata:
-                        label: {fr: Cloture positive}
+                        label: Cloture positive
+                        translated_labels:
+                            fr: Cloture positive
                         isForward: true
                 attenteTraitementToFinal:
                     from:
                         - attenteTraitement
                     to: final
                     metadata:
-                        label: {fr: Traitement terminé et cloture positive}
+                        label: Traitement terminé et cloture positive
+                        translated_labels:
+                            fr: Traitement terminé et cloture positive
                         isForward: true
                 attenteEnvoiToFinal:
                     from:
                         - attenteEnvoi
                     to: final
                     metadata:
-                        label: {fr: Envoyé et cloture positive}
+                        label: Envoyé et cloture positive
+                        translated_labels:
+                            fr: Envoyé et cloture positive
                         isForward: true

config/routes/annotations.yaml

@@ -1,3 +0,0 @@
-kernel:
-    resource: ../../src/app/Kernel.php
-    type: annotation

config/routes/chill_ticket.yaml

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

config/routes/security.yaml

@@ -0,0 +1,3 @@
+_security_logout:
+    resource: security.route_loader.logout
+    type: service

config/services.yaml

@@ -6,8 +6,15 @@
 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 }

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

@@ -14,7 +14,6 @@ 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;
@@ -22,6 +21,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
     use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
     // add specific role for this filter
     public function addRole(): ?string
     {
@@ -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, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         // we create the clause here
@@ -76,21 +76,25 @@ 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
@@ -98,7 +102,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'),
             ], ];
@@ -120,13 +124,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();
         }
 
@@ -135,7 +139,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();
         }
     }

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

@@ -32,7 +32,7 @@ class CountPerson implements ExportInterface
         $this->entityManager = $em;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // this export does not add any form
     }

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

@@ -11,94 +11,24 @@
 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
 
-Create a new directory with Bundle class
+TODO
-----------------------------------------
-
-.. 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",
-        }
-    }
-    }
 
 
-Register the bundle
+.. rubric:: Footnotes
--------------------
-
-Register in the file :code:`config/bundles.php`:
-
-.. code-block:: php
-
-    Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
-
-And import routes in :code:`config/routes/chill_some_bundle.yaml`:
-
-.. code-block:: yaml
-
-   chill_ticket_bundle:
-       resource: '@ChillSomeBundle/config/routes.yaml'
-
-Add the doctrine_migration namespace
-------------------------------------
-
-Add the namespace to :code:`config/packages/doctrine_migrations_chill.yaml`
-
-.. code-block:: diff
-
-   doctrine_migrations:
-       migrations_paths:
-   +        'Chill\Some\Ticket': '@ChillSomeBundle/migrations'
-
-Dump autoloading
-----------------
-
-.. code-block:: bash
-
-   symfony composer dump-autoload
 
+.. [#f1] Be aware that we use the Affero GPL Licence, which ensure that all users must have access to derivative works done with this software.

docs/source/development/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()
+    public function yourAction(): \Symfony\Component\HttpFoundation\Response
     {
         $em = $this->managerRegistry->getManager();
         // first, get the number of total item are available

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)
+    public function listAction($id): \Symfony\Component\HttpFoundation\Response
     {
         /** @var \Chill\PersonBundle\Entity\Person $person */
         $person = $this->get('chill.person.repository.person')

docs/source/development/user-interface/widgets/ChillMainConfiguration.php

@@ -31,7 +31,7 @@ class ChillMainConfiguration implements ConfigurationInterface
         $this->setWidgetFactories($widgetFactories);
     }
 
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder
     {
         $treeBuilder = new TreeBuilder('chill_main');
         $rootNode = $treeBuilder->getRootNode();

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)
+    public function addWidgetFactory(WidgetFactoryInterface $factory): void
     {
         $this->widgetFactories[] = $factory;
     }
 
-    public function getConfiguration(array $config, ContainerBuilder $container)
+    public function getConfiguration(array $config, ContainerBuilder $container): ?\Symfony\Component\Config\Definition\ConfigurationInterface
     {
         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)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         // configuration for main bundle
         $configuration = $this->getConfiguration($configs, $container);

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)
+    public function configureOptions($place, NodeBuilder $node): void
     {
         $node->booleanNode('only_active')
             ->defaultTrue()

docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php

@@ -124,7 +124,7 @@ class ChillPersonAddAPersonWidget implements WidgetInterface
     /**
      * @return UserInterface
      */
-    private function getUser()
+    private function getUser(): void
     {
         // return a user
     }

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)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         // ...
     }
@@ -32,7 +32,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
      *
      * @param \Chill\PersonBundle\DependencyInjection\containerBuilder $container
      */
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $container->prependExtensionConfig('chill_main', [
             'widgets' => [

package.json

@@ -11,6 +11,7 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
+    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
@@ -79,12 +80,12 @@
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/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> 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": "eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
+    "eslint": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
   },
   "private": true
 }

phpunit.xml.dist

@@ -1,88 +1,34 @@
 <?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"
-    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"/>
-    <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>
-        -->
-    <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">
+<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-      <directory suffix="Test.php">src/Bundle/ChillTicketBundle/tests/</directory>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    </testsuite>
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    <!--
+         backupGlobals="false"
-        <testsuite name="ReportBundle">
+         colors="true"
-            <directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>
+         failOnNotice="true"
+         failOnWarning="true"
+         bootstrap="tests/bootstrap.php"
+         cacheDirectory=".phpunit.cache"
+>
+    <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>
         </testsuite>
-        -->
+    </testsuites>
-    <!--
+
-        <testsuite name="TaskBundle">
+    <source ignoreSuppressionOfDeprecations="true" restrictNotices="true" restrictWarnings="true">
-            <directory suffix="Test.php">src/Bundle/ChillTaskBundle/Tests</directory>
+        <include>
-        </testsuite>
+            <directory>src</directory>
-        -->
+        </include>
-    <testsuite name="ThirdPartyBundle">
+    </source>
-      <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>

rector.php

@@ -13,23 +13,24 @@ 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__.'/docs',
-        __DIR__ . '/src',
+        __DIR__.'/src',
-        __DIR__ . '/rector.php',
+        __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->symfonyContainerXml(__DIR__ . '/var/cache/dev/test/App_KernelTestDebugContainer.xml  ');
-    //$rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
+    // $rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
 
-    //$rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
+    // $rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
-    //$rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');
+    // $rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');
 
     // register a single rule
     $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
@@ -37,54 +38,72 @@ return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rule(Rector\TypeDeclaration\Rector\Class_\MergeDateTimePropertyTypeDeclarationRector::class);
     $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector::class);
 
-    // part of the symfony 54 rules
+    // Add return types to controller methods
-    $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector::class);
-    $rectorConfig->rule(\Rector\Symfony\Symfony60\Rector\MethodCall\GetHelperControllerToServiceRector::class);
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector::class);
-    //$rectorConfig->disableParallel();
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector::class);
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector::class);
 
-    //define sets of rules
+    // 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();
+
+    // define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_82,
+//        LevelSetList::UP_TO_PHP_82,
-        \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
+//        SymfonySetList::SYMFONY_60,
-        \Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_90,
+//        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,
     ]);
 
-    $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class, [
+    $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Symfony\Component\Serializer\Annotation\Context'),
+        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_\StaticDataProviderClassMethodRector::class,
-        \Rector\PHPUnit\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector::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\AccompanyingPeriod\AccompanyingPeriodValidity'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential'),
+        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\Household\MaxHolder'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer'),
+        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\LocationValidity'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap'),
+        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\AccompanyingPeriod\ResourceDuplicateCheck'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\Birthdate'),
+        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\Person\PersonHasCenter'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate'),
+        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\ActivityBundle\Validator\Constraints\ActivityValidity'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists'),
+        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\Validation\Constraint\PhonenumberConstraint'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency'),
+        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\MainBundle\Workflow\Validator\EntityWorkflowCreation'),
     ]);
-
-
 };

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -74,8 +74,8 @@ final class ActivityController extends AbstractController
     /**
      * Deletes a Activity entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/delete', name: 'chill_activity_activity_delete', methods: ['GET', 'POST', 'DELETE'])]
+    #[\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)
+    public function deleteAction(Request $request, mixed $id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
     {
         $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()->getUsername(),
+                    'by_user' => $this->getUser()->getUserIdentifier(),
                     '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->createView(),
+            'delete_form' => $form,
             '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\Annotation\Route(path: '/{_locale}/activity/{id}/edit', name: 'chill_activity_activity_edit', methods: ['GET', 'POST', 'PUT'])]
+    #[\Symfony\Component\Routing\Attribute\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->createView(),
+            'edit_form' => $form,
-            'delete_form' => $deleteForm->createView(),
+            'delete_form' => $deleteForm,
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'activity_json' => $activity_array,
@@ -237,7 +237,7 @@ final class ActivityController extends AbstractController
     /**
      * Lists all Activity entities.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/', name: 'chill_activity_activity_list')]
+    #[\Symfony\Component\Routing\Attribute\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\Annotation\Route(path: '/{_locale}/activity/new', name: 'chill_activity_activity_new', methods: ['POST', 'GET'])]
+    #[\Symfony\Component\Routing\Attribute\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->get('activityData');
+            $activityData = $request->query->all('activityData');
         }
 
         if (
@@ -516,13 +516,13 @@ final class ActivityController extends AbstractController
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'entity' => $entity,
-            'form' => $form->createView(),
+            'form' => $form,
             'activity_json' => $activity_array,
             'default_location' => $defaultLocation,
         ]);
     }
 
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/select-type', name: 'chill_activity_activity_select_type')]
+    #[\Symfony\Component\Routing\Attribute\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\Annotation\Route(path: '/{_locale}/activity/{id}/show', name: 'chill_activity_activity_show')]
+    #[\Symfony\Component\Routing\Attribute\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->createView(),
+            'delete_form' => $deleteForm,
         ]);
     }
 

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -27,8 +27,8 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Creates a new ActivityReasonCategory entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/create', name: 'chill_activity_activityreasoncategory_create', methods: ['POST'])]
+    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreasoncategory/create', name: 'chill_activity_activityreasoncategory_create', methods: ['POST'])]
-    public function createAction(Request $request)
+    public function createAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
     {
         $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->createView(),
+            'form' => $form,
         ]);
     }
 
     /**
      * Lists all ActivityReasonCategory entities.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/', name: 'chill_activity_activityreasoncategory')]
+    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreasoncategory/', name: 'chill_activity_activityreasoncategory')]
-    public function indexAction()
+    public function indexAction(): \Symfony\Component\HttpFoundation\Response
     {
         $em = $this->managerRegistry->getManager();
 
@@ -66,23 +66,23 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Displays a form to create a new ActivityReasonCategory entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/new', name: 'chill_activity_activityreasoncategory_new')]
+    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreasoncategory/new', name: 'chill_activity_activityreasoncategory_new')]
-    public function newAction()
+    public function newAction(): \Symfony\Component\HttpFoundation\Response
     {
         $entity = new ActivityReasonCategory();
         $form = $this->createCreateForm($entity);
 
         return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
             'entity' => $entity,
-            'form' => $form->createView(),
+            'form' => $form,
         ]);
     }
 
     /**
      * Edits an existing ActivityReasonCategory entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update')]
+    #[\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)
+    public function updateAction(Request $request, mixed $id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
     {
         $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->createView(),
+            'edit_form' => $editForm,
         ]);
     }
 

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -28,8 +28,8 @@ class ActivityReasonController extends AbstractController
     /**
      * Creates a new ActivityReason entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/create', name: 'chill_activity_activityreason_create', methods: ['POST'])]
+    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreason/create', name: 'chill_activity_activityreason_create', methods: ['POST'])]
-    public function createAction(Request $request)
+    public function createAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
     {
         $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->createView(),
+            'form' => $form,
         ]);
     }
 
     /**
      * Lists all ActivityReason entities.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/', name: 'chill_activity_activityreason')]
+    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreason/', name: 'chill_activity_activityreason')]
-    public function indexAction()
+    public function indexAction(): \Symfony\Component\HttpFoundation\Response
     {
         $em = $this->managerRegistry->getManager();
 
@@ -67,23 +67,23 @@ class ActivityReasonController extends AbstractController
     /**
      * Displays a form to create a new ActivityReason entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/new', name: 'chill_activity_activityreason_new')]
+    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activityreason/new', name: 'chill_activity_activityreason_new')]
-    public function newAction()
+    public function newAction(): \Symfony\Component\HttpFoundation\Response
     {
         $entity = new ActivityReason();
         $form = $this->createCreateForm($entity);
 
         return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
             'entity' => $entity,
-            'form' => $form->createView(),
+            'form' => $form,
         ]);
     }
 
     /**
      * Edits an existing ActivityReason entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update')]
+    #[\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)
+    public function updateAction(Request $request, mixed $id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
     {
         $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->createView(),
+            'edit_form' => $editForm,
         ]);
     }
 

src/Bundle/ChillActivityBundle/Controller/AdminController.php

@@ -18,15 +18,15 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
  */
 class AdminController extends AbstractController
 {
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activity', name: 'chill_activity_admin_index')]
+    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activity', name: 'chill_activity_admin_index')]
-    public function indexActivityAction()
+    public function indexActivityAction(): \Symfony\Component\HttpFoundation\Response
     {
         return $this->render('@ChillActivity/Admin/layout_activity.html.twig');
     }
 
-    #[\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\Attribute\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')]
+    #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/activity_redirect_to_main', name: 'chill_admin_activity_redirect_to_admin_index')]
-    public function redirectToAdminIndexAction()
+    public function redirectToAdminIndexAction(): \Symfony\Component\HttpFoundation\RedirectResponse
     {
         return $this->redirectToRoute('chill_main_admin_central');
     }

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php

@@ -27,8 +27,6 @@ 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)

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)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $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)
+    public function prepend(ContainerBuilder $container): void
     {
         $this->prependRoutes($container);
         $this->prependAuthorization($container);
         $this->prependCruds($container);
     }
 
-    public function prependAuthorization(ContainerBuilder $container)
+    public function prependAuthorization(ContainerBuilder $container): void
     {
         $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)
+    public function prependRoutes(ContainerBuilder $container): void
     {
         // add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [

src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php

@@ -22,7 +22,7 @@ use function is_int;
  */
 class Configuration implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder
     {
         $treeBuilder = new TreeBuilder('chill_activity');
         $rootNode = $treeBuilder->getRootNode();

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -40,7 +40,7 @@ class ActivityReason
      *
      * @return bool
      */
-    public function getActive()
+    public function getActive(): bool
     {
         return $this->active;
     }
@@ -58,7 +58,7 @@ class ActivityReason
      *
      * @return int
      */
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id;
     }

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -61,7 +61,7 @@ class ActivityReasonCategory implements \Stringable
      *
      * @return bool
      */
-    public function getActive()
+    public function getActive(): bool
     {
         return $this->active;
     }
@@ -71,7 +71,7 @@ class ActivityReasonCategory implements \Stringable
      *
      * @return int
      */
-    public function getId()
+    public function getId(): ?int
     {
         return $this->id;
     }

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)
+    public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload): void
     {
         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,11 +461,17 @@ class ActivityType
     {
         $property = $field.'Visible';
 
-        if (!property_exists($this, $property)) {
+        // 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)) {
             throw new \InvalidArgumentException('Field "'.$field.'" not found');
         }
 
-        /* @phpstan-ignore-next-line */
         return self::FIELD_INVISIBLE !== $this->{$property};
     }
 

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)
+    public function persistActionToCourse(Activity $activity): void
     {
         if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
             $period = $activity->getAccompanyingPeriod();

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

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)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // TODO: Implement buildForm() method.
     }

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) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
 
     public function getNormalizationVersion(): int
     {

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

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) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
 
     public function getNormalizationVersion(): int
     {

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

@@ -11,6 +11,7 @@ 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;
@@ -59,7 +60,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('fields', ChoiceType::class, [
             'multiple' => true,
@@ -214,7 +215,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         $qb = $this->entityManager->createQueryBuilder();
 
         $qb
-            ->from('ChillActivityBundle:Activity', 'activity')
+            ->from(Activity::class, 'activity')
             ->join('activity.person', 'person')
             ->join(
                 HouseholdMember::class,

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)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
@@ -29,7 +29,7 @@ class ActivityReasonCategoryType extends AbstractType
     /**
      * @param OptionsResolverInterface $resolver
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => \Chill\ActivityBundle\Entity\ActivityReasonCategory::class,
@@ -39,7 +39,7 @@ class ActivityReasonCategoryType extends AbstractType
     /**
      * @return string
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'chill_activitybundle_activityreasoncategory';
     }

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)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
@@ -29,7 +29,7 @@ class ActivityReasonType extends AbstractType
             ->add('category', TranslatableActivityReasonCategoryType::class);
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => ActivityReason::class,
@@ -39,7 +39,7 @@ class ActivityReasonType extends AbstractType
     /**
      * @return string
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'chill_activitybundle_activityreason';
     }

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)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
@@ -67,7 +67,7 @@ class ActivityTypeType extends AbstractType
             ->add('commentVisible', ActivityFieldPresence::class);
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class,

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)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
             [
@@ -31,7 +31,7 @@ class ActivityFieldPresence extends AbstractType
         );
     }
 
-    public function getParent()
+    public function getParent(): ?string
     {
         return ChoiceType::class;
     }

src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php

@@ -30,7 +30,7 @@ class PickActivityReasonType extends AbstractType
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
             [
@@ -49,12 +49,12 @@ class PickActivityReasonType extends AbstractType
         );
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'translatable_activity_reason';
     }
 
-    public function getParent()
+    public function getParent(): ?string
     {
         return EntityType::class;
     }

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)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
             [
@@ -36,7 +36,7 @@ class TranslatableActivityReasonCategoryType extends AbstractType
         );
     }
 
-    public function getParent()
+    public function getParent(): ?string
     {
         return EntityType::class;
     }

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)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
             [
@@ -34,12 +34,12 @@ class TranslatableActivityType extends AbstractType
         );
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'translatable_activity_type';
     }
 
-    public function getParent()
+    public function getParent(): ?string
     {
         return EntityType::class;
     }

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\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\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)
+    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
         $period = $parameters['accompanyingCourse'];
 

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\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\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)
+    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
         /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingCourse */
         $accompanyingCourse = $parameters['accompanying-course'];

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\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\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)
+    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
         if (!$this->security->isGranted('ROLE_ADMIN')) {
             return;

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)
+    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
         /** @var Person $person */
         $person = $parameters['person'];

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\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {

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\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 final readonly class ActivityDocumentACLAwareRepository implements ActivityDocumentACLAwareRepositoryInterface
 {

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue

@@ -1,7 +1,7 @@
 <template>
-  <concerned-groups v-if="hasPerson" />
+    <concerned-groups v-if="hasPerson" />
-  <social-issues-acc v-if="hasSocialIssues" />
+    <social-issues-acc v-if="hasSocialIssues" />
-  <location v-if="hasLocation" />
+    <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",
+    name: "App",
-  props: ["hasSocialIssues", "hasLocation", "hasPerson"],
+    props: ["hasSocialIssues", "hasLocation", "hasPerson"],
-  components: {
+    components: {
-    ConcernedGroups,
+        ConcernedGroups,
-    SocialIssuesAcc,
+        SocialIssuesAcc,
-    Location,
+        Location,
-  },
+    },
 };
 </script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -1,43 +1,46 @@
 <template>
-  <teleport to="#add-persons" v-if="isComponentVisible">
+    <teleport to="#add-persons" v-if="isComponentVisible">
-    <div class="flex-bloc concerned-groups" :class="getContext">
+        <div class="flex-bloc concerned-groups" :class="getContext">
-      <persons-bloc
+            <persons-bloc
-        v-for="bloc in contextPersonsBlocs"
+                v-for="bloc in contextPersonsBlocs"
-        :key="bloc.key"
+                :key="bloc.key"
-        :bloc="bloc"
+                :bloc="bloc"
-        :bloc-width="getBlocWidth"
+                :bloc-width="getBlocWidth"
-        :set-persons-in-bloc="setPersonsInBloc"
+                :set-persons-in-bloc="setPersonsInBloc"
-      />
+            />
-    </div>
+        </div>
-    <div
+        <div
-      v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0"
+            v-if="
-    >
+                getContext === 'accompanyingCourse' &&
-      <ul class="list-suggest add-items inline">
+                suggestedEntities.length > 0
-        <li
+            "
-          v-for="(p, i) in suggestedEntities"
-          @click="addSuggestedEntity(p)"
-          :key="`suggestedEntities-${i}`"
         >
-          <person-text v-if="p.type === 'person'" :person="p" />
+            <ul class="list-suggest add-items inline">
-          <span v-else>{{ p.text }}</span>
+                <li
-        </li>
+                    v-for="(p, i) in suggestedEntities"
-      </ul>
+                    @click="addSuggestedEntity(p)"
-    </div>
+                    :key="`suggestedEntities-${i}`"
+                >
+                    <person-text v-if="p.type === 'person'" :person="p" />
+                    <span v-else>{{ p.text }}</span>
+                </li>
+            </ul>
+        </div>
 
-    <ul class="record_actions">
+        <ul class="record_actions">
-      <li class="add-persons">
+            <li class="add-persons">
-        <add-persons
+                <add-persons
-          :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
+                    :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
-          :modalTitle="trans(ACTIVITY_ADD_PERSONS)"
+                    :modalTitle="trans(ACTIVITY_ADD_PERSONS)"
-          v-bind:key="addPersons.key"
+                    v-bind:key="addPersons.key"
-          v-bind:options="addPersonsOptions"
+                    v-bind:options="addPersonsOptions"
-          @addNewPersons="addNewPersons"
+                    @addNewPersons="addNewPersons"
-          ref="addPersons"
+                    ref="addPersons"
-        >
+                >
-        </add-persons>
+                </add-persons>
-      </li>
+            </li>
-    </ul>
+        </ul>
-  </teleport>
+    </teleport>
 </template>
 
 <script>
@@ -46,208 +49,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,
-  ACTIVITY_BLOC_PERSONS_ASSOCIATED,
+    ACTIVITY_BLOC_PERSONS_ASSOCIATED,
-  ACTIVITY_BLOC_THIRDPARTY,
+    ACTIVITY_BLOC_THIRDPARTY,
-  ACTIVITY_BLOC_USERS,
+    ACTIVITY_BLOC_USERS,
-  ACTIVITY_ADD_PERSONS,
+    ACTIVITY_ADD_PERSONS,
-  trans,
+    trans,
 } from "translator";
 
 export default {
-  name: "ConcernedGroups",
+    name: "ConcernedGroups",
-  components: {
+    components: {
-    AddPersons,
+        AddPersons,
-    PersonsBloc,
+        PersonsBloc,
-    PersonText,
+        PersonText,
-  },
+    },
-  setup() {
+    setup() {
-    return {
+        return {
-      trans,
+            trans,
-      ACTIVITY_ADD_PERSONS,
+            ACTIVITY_ADD_PERSONS,
-    };
+        };
-  },
+    },
-  data() {
+    data() {
-    return {
+        return {
-      personsBlocs: [
+            personsBlocs: [
-        {
+                {
-          key: "persons",
+                    key: "persons",
-          title: trans(ACTIVITY_BLOC_PERSONS),
+                    title: trans(ACTIVITY_BLOC_PERSONS),
-          persons: [],
+                    persons: [],
-          included: false,
+                    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;
         },
-        {
+        ...mapState({
-          key: "personsAssociated",
+            persons: (state) => state.activity.persons,
-          title: trans(ACTIVITY_BLOC_PERSONS_ASSOCIATED),
+            thirdParties: (state) => state.activity.thirdParties,
-          persons: [],
+            users: (state) => state.activity.users,
-          included: window.activity
+            accompanyingCourse: (state) => state.activity.accompanyingPeriod,
-            ? window.activity.activityType.personsVisible !== 0
+        }),
-            : true,
+        ...mapGetters(["suggestedEntities"]),
+        getContext() {
+            return this.accompanyingCourse ? "accompanyingCourse" : "person";
         },
-        {
+        contextPersonsBlocs() {
-          key: "personsNotAssociated",
+            return this.personsBlocs.filter((bloc) => bloc.included !== false);
-          title: "activity.bloc_persons_not_associated",
-          persons: [],
-          included: window.activity
-            ? window.activity.activityType.personsVisible !== 0
-            : true,
         },
-        {
+        addPersonsOptions() {
-          key: "thirdparty",
+            let optionsType = [];
-          title: trans(ACTIVITY_BLOC_THIRDPARTY),
+            if (window.activity) {
-          persons: [],
+                if (window.activity.activityType.personsVisible !== 0) {
-          included: window.activity
+                    optionsType.push("person");
-            ? window.activity.activityType.thirdPartiesVisible !== 0
+                }
-            : true,
+                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() {
-          key: "users",
+            return Math.round(100 / this.contextPersonsBlocs.length) + "%";
-          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;
     },
-    ...mapState({
+    mounted() {
-      persons: (state) => state.activity.persons,
+        this.setPersonsInBloc();
-      thirdParties: (state) => state.activity.thirdParties,
-      users: (state) => state.activity.users,
-      accompanyingCourse: (state) => state.activity.accompanyingPeriod,
-    }),
-    ...mapGetters(["suggestedEntities"]),
-    getContext() {
-      return this.accompanyingCourse ? "accompanyingCourse" : "person";
     },
-    contextPersonsBlocs() {
+    methods: {
-      return this.personsBlocs.filter((bloc) => bloc.included !== false);
+        setPersonsInBloc() {
-    },
+            let groups;
-    addPersonsOptions() {
+            if (this.accompanyingCourse) {
-      let optionsType = [];
+                groups = this.splitPersonsInGroups();
-      if (window.activity) {
+            }
-        if (window.activity.activityType.personsVisible !== 0) {
+            this.personsBlocs.forEach((bloc) => {
-          optionsType.push("person");
+                if (this.accompanyingCourse) {
-        }
+                    switch (bloc.key) {
-        if (window.activity.activityType.thirdPartiesVisible !== 0) {
+                        case "personsAssociated":
-          optionsType.push("thirdparty");
+                            bloc.persons = groups.personsAssociated;
-        }
+                            bloc.included = true;
-        if (window.activity.activityType.usersVisible !== 0) {
+                            break;
-          optionsType.push("user");
+                        case "personsNotAssociated":
-        }
+                            bloc.persons = groups.personsNotAssociated;
-      } else {
+                            bloc.included = true;
-        optionsType = ["person", "thirdparty", "user"];
+                            break;
-      }
+                    }
-      return {
+                } else {
-        type: optionsType,
+                    switch (bloc.key) {
-        priority: null,
+                        case "persons":
-        uniq: false,
+                            bloc.persons = this.persons;
-        button: {
+                            bloc.included = true;
-          size: "btn-sm",
+                            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();
         },
-      };
     },
-    getBlocWidth() {
-      return Math.round(100 / this.contextPersonsBlocs.length) + "%";
-    },
-  },
-  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>
 

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue

@@ -1,29 +1,29 @@
 <template>
-  <li>
+    <li>
-    <span :title="person.text" @click.prevent="$emit('remove', person)">
+        <span :title="person.text" @click.prevent="$emit('remove', person)">
-      <span class="chill_denomination">
+            <span class="chill_denomination">
-        <person-text :person="person" :is-cut="true" />
+                <person-text :person="person" :is-cut="true" />
-      </span>
+            </span>
-    </span>
+        </span>
-  </li>
+    </li>
 </template>
 
 <script>
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 
 export default {
-  name: "PersonBadge",
+    name: "PersonBadge",
-  props: ["person"],
+    props: ["person"],
-  components: {
+    components: {
-    PersonText,
+        PersonText,
-  },
+    },
-  // computed: {
+    // computed: {
-  //    textCutted() {
+    //    textCutted() {
-  //       let more = (this.person.text.length > 15) ?'…' : '';
+    //       let more = (this.person.text.length > 15) ?'…' : '';
-  //       return this.person.text.slice(0,15) + more;
+    //       return this.person.text.slice(0,15) + more;
-  //    }
+    //    }
-  // },
+    // },
-  emits: ["remove"],
+    emits: ["remove"],
 };
 </script>
 

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-bloc" :style="{ 'flex-basis': blocWidth }">
-    <div class="item-row">
+        <div class="item-row">
-      <div class="item-col">
+            <div class="item-col">
-        <h4>{{ $t(bloc.title) }}</h4>
+                <h4>{{ $t(bloc.title) }}</h4>
-      </div>
+            </div>
-      <div class="item-col">
+            <div class="item-col">
-        <ul class="list-suggest remove-items">
+                <ul class="list-suggest remove-items">
-          <person-badge
+                    <person-badge
-            v-for="person in bloc.persons"
+                        v-for="person in bloc.persons"
-            :key="person.id"
+                        :key="person.id"
-            :person="person"
+                        :person="person"
-            @remove="removePerson"
+                        @remove="removePerson"
-          />
+                    />
-        </ul>
+                </ul>
-      </div>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
 import PersonBadge from "./PersonBadge.vue";
 export default {
-  name: "PersonsBloc",
+    name: "PersonsBloc",
-  components: {
+    components: {
-    PersonBadge,
+        PersonBadge,
-  },
+    },
-  props: ["bloc", "setPersonsInBloc", "blocWidth"],
+    props: ["bloc", "setPersonsInBloc", "blocWidth"],
-  methods: {
+    methods: {
-    removePerson(item) {
+        removePerson(item) {
-      console.log("@@ CLICK remove person: item", item);
+            console.log("@@ CLICK remove person: item", item);
-      this.$store.dispatch("removePersonInvolved", item);
+            this.$store.dispatch("removePersonInvolved", item);
-      this.setPersonsInBloc();
+            this.setPersonsInBloc();
+        },
     },
-  },
 };
 </script>
 

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue

@@ -1,32 +1,32 @@
 <template>
-  <teleport to="#location">
+    <teleport to="#location">
-    <div class="mb-3 row">
+        <div class="mb-3 row">
-      <label :class="locationClassList">
+            <label :class="locationClassList">
-        {{ trans(ACTIVITY_LOCATION) }}
+                {{ trans(ACTIVITY_LOCATION) }}
-      </label>
+            </label>
-      <div class="col-sm-8">
+            <div class="col-sm-8">
-        <VueMultiselect
+                <VueMultiselect
-          name="selectLocation"
+                    name="selectLocation"
-          id="selectLocation"
+                    id="selectLocation"
-          label="name"
+                    label="name"
-          track-by="id"
+                    track-by="id"
-          open-direction="top"
+                    open-direction="top"
-          :multiple="false"
+                    :multiple="false"
-          :searchable="true"
+                    :searchable="true"
-          :placeholder="trans(ACTIVITY_CHOOSE_LOCATION)"
+                    :placeholder="trans(ACTIVITY_CHOOSE_LOCATION)"
-          :custom-label="customLabel"
+                    :custom-label="customLabel"
-          :select-label="trans(MULTISELECT_SELECT_LABEL)"
+                    :select-label="trans(MULTISELECT_SELECT_LABEL)"
-          :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
+                    :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
-          :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
+                    :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
-          :options="availableLocations"
+                    :options="availableLocations"
-          group-values="locations"
+                    group-values="locations"
-          group-label="locationGroup"
+                    group-label="locationGroup"
-          v-model="location"
+                    v-model="location"
-        />
+                />
-        <new-location v-bind:available-locations="availableLocations" />
+                <new-location v-bind:available-locations="availableLocations" />
-      </div>
+            </div>
-    </div>
+        </div>
-  </teleport>
+    </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,
+    trans,
-  ACTIVITY_LOCATION,
+    ACTIVITY_LOCATION,
-  ACTIVITY_CHOOSE_LOCATION,
+    ACTIVITY_CHOOSE_LOCATION,
-  MULTISELECT_SELECT_LABEL,
+    MULTISELECT_SELECT_LABEL,
-  MULTISELECT_DESELECT_LABEL,
+    MULTISELECT_DESELECT_LABEL,
-  MULTISELECT_SELECTED_LABEL,
+    MULTISELECT_SELECTED_LABEL,
 } from "translator";
 
 export default {
-  name: "Location",
+    name: "Location",
-  components: {
+    components: {
-    NewLocation,
+        NewLocation,
-    VueMultiselect,
+        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() {
-  methods: {
+        return {
-    labelAccompanyingCourseLocation(value) {
+            trans,
-      return `${value.address.text} (${localizeString(value.locationType.title)})`;
+            ACTIVITY_LOCATION,
+            ACTIVITY_CHOOSE_LOCATION,
+            MULTISELECT_SELECT_LABEL,
+            MULTISELECT_DESELECT_LABEL,
+            MULTISELECT_SELECTED_LABEL,
+        };
     },
-    customLabel(value) {
+    data() {
-      return value.locationType
+        return {
-        ? value.name
+            locationClassList: `col-form-label col-sm-4 ${document.querySelector("input#chill_activitybundle_activity_location").getAttribute("required") ? "required" : ""}`,
-          ? value.name === "__AccompanyingCourseLocation__"
+        };
-            ? this.labelAccompanyingCourseLocation(value)
+    },
-            : `${value.name} (${localizeString(value.locationType.title)})`
+    computed: {
-          : localizeString(value.locationType.title)
+        ...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)
+                : "";
+        },
     },
-  },
 };
 </script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue

@@ -1,114 +1,123 @@
 <template>
-  <div>
+    <div>
-    <ul class="record_actions">
+        <ul class="record_actions">
-      <li>
+            <li>
-        <a class="btn btn-sm btn-create" @click="openModal">
+                <a class="btn btn-sm btn-create" @click="openModal">
-          {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
+                    {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
-        </a>
+                </a>
-      </li>
+            </li>
-    </ul>
+        </ul>
 
-    <teleport to="body">
+        <teleport to="body">
-      <modal
+            <modal
-        v-if="modal.showModal"
+                v-if="modal.showModal"
-        :modalDialogClass="modal.modalDialogClass"
+                :modalDialogClass="modal.modalDialogClass"
-        @close="modal.showModal = false"
+                @close="modal.showModal = false"
-      >
+            >
-        <template #header>
+                <template #header>
-          <h3 class="modal-title">
+                    <h3 class="modal-title">
-            {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
+                        {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
-          </h3>
+                    </h3>
-        </template>
+                </template>
-        <template #body>
+                <template #body>
-          <form>
+                    <form>
-            <div class="alert alert-warning" v-if="errors.length">
+                        <div class="alert alert-warning" v-if="errors.length">
-              <ul>
+                            <ul>
-                <li v-for="(e, i) in errors" :key="i">
+                                <li v-for="(e, i) in errors" :key="i">
-                  {{ e }}
+                                    {{ e }}
-                </li>
+                                </li>
-              </ul>
+                            </ul>
-            </div>
+                        </div>
 
-            <div class="form-floating mb-3">
+                        <div class="form-floating mb-3">
-              <select
+                            <select
-                class="form-select form-select-lg"
+                                class="form-select form-select-lg"
-                id="type"
+                                id="type"
-                required
+                                required
-                v-model="selectType"
+                                v-model="selectType"
-              >
+                            >
-                <option selected disabled value="">
+                                <option selected disabled value="">
-                  {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
+                                    {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
-                </option>
+                                </option>
-                <option v-for="t in locationTypes" :value="t" :key="t.id">
+                                <option
-                  {{ localizeString(t.title) }}
+                                    v-for="t in locationTypes"
-                </option>
+                                    :value="t"
-              </select>
+                                    :key="t.id"
-              <label>{{ trans(ACTIVITY_LOCATION_FIELDS_TYPE) }}</label>
+                                >
-            </div>
+                                    {{ localizeString(t.title) }}
+                                </option>
+                            </select>
+                            <label>{{
+                                trans(ACTIVITY_LOCATION_FIELDS_TYPE)
+                            }}</label>
+                        </div>
 
-            <div class="form-floating mb-3">
+                        <div class="form-floating mb-3">
-              <input
+                            <input
-                class="form-control form-control-lg"
+                                class="form-control form-control-lg"
-                id="name"
+                                id="name"
-                v-model="inputName"
+                                v-model="inputName"
-                placeholder
+                                placeholder
-              />
+                            />
-              <label for="name">{{
+                            <label for="name">{{
-                trans(ACTIVITY_LOCATION_FIELDS_NAME)
+                                trans(ACTIVITY_LOCATION_FIELDS_NAME)
-              }}</label>
+                            }}</label>
-            </div>
+                        </div>
 
-            <add-address
+                        <add-address
-              :context="addAddress.context"
+                            :context="addAddress.context"
-              :options="addAddress.options"
+                            :options="addAddress.options"
-              :addressChangedCallback="submitNewAddress"
+                            :addressChangedCallback="submitNewAddress"
-              v-if="showAddAddress"
+                            v-if="showAddAddress"
-              ref="addAddress"
+                            ref="addAddress"
-            />
+                        />
 
-            <div class="form-floating mb-3" v-if="showContactData">
+                        <div class="form-floating mb-3" v-if="showContactData">
-              <input
+                            <input
-                class="form-control form-control-lg"
+                                class="form-control form-control-lg"
-                id="phonenumber1"
+                                id="phonenumber1"
-                v-model="inputPhonenumber1"
+                                v-model="inputPhonenumber1"
-                placeholder
+                                placeholder
-              />
+                            />
-              <label for="phonenumber1">{{
+                            <label for="phonenumber1">{{
-                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER1)
+                                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER1)
-              }}</label>
+                            }}</label>
-            </div>
+                        </div>
-            <div class="form-floating mb-3" v-if="hasPhonenumber1">
+                        <div class="form-floating mb-3" v-if="hasPhonenumber1">
-              <input
+                            <input
-                class="form-control form-control-lg"
+                                class="form-control form-control-lg"
-                id="phonenumber2"
+                                id="phonenumber2"
-                v-model="inputPhonenumber2"
+                                v-model="inputPhonenumber2"
-                placeholder
+                                placeholder
-              />
+                            />
-              <label for="phonenumber2">{{
+                            <label for="phonenumber2">{{
-                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER2)
+                                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER2)
-              }}</label>
+                            }}</label>
-            </div>
+                        </div>
-            <div class="form-floating mb-3" v-if="showContactData">
+                        <div class="form-floating mb-3" v-if="showContactData">
-              <input
+                            <input
-                class="form-control form-control-lg"
+                                class="form-control form-control-lg"
-                id="email"
+                                id="email"
-                v-model="inputEmail"
+                                v-model="inputEmail"
-                placeholder
+                                placeholder
-              />
+                            />
-              <label for="email">{{
+                            <label for="email">{{
-                trans(ACTIVITY_LOCATION_FIELDS_EMAIL)
+                                trans(ACTIVITY_LOCATION_FIELDS_EMAIL)
-              }}</label>
+                            }}</label>
-            </div>
+                        </div>
-          </form>
+                    </form>
-        </template>
+                </template>
-        <template #footer>
+                <template #footer>
-          <button class="btn btn-save" @click.prevent="saveNewLocation">
+                    <button
-            {{ trans(SAVE) }}
+                        class="btn btn-save"
-          </button>
+                        @click.prevent="saveNewLocation"
-        </template>
+                    >
-      </modal>
+                        {{ trans(SAVE) }}
-    </teleport>
+                    </button>
-  </div>
+                </template>
+            </modal>
+        </teleport>
+    </div>
 </template>
 
 <script>
@@ -119,236 +128,237 @@ import { getLocationTypes } from "../../api";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
-  SAVE,
+    SAVE,
-  ACTIVITY_LOCATION_FIELDS_EMAIL,
+    ACTIVITY_LOCATION_FIELDS_EMAIL,
-  ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
+    ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
-  ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
+    ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
-  ACTIVITY_LOCATION_FIELDS_NAME,
+    ACTIVITY_LOCATION_FIELDS_NAME,
-  ACTIVITY_LOCATION_FIELDS_TYPE,
+    ACTIVITY_LOCATION_FIELDS_TYPE,
-  ACTIVITY_CHOOSE_LOCATION_TYPE,
+    ACTIVITY_CHOOSE_LOCATION_TYPE,
-  ACTIVITY_CREATE_NEW_LOCATION,
+    ACTIVITY_CREATE_NEW_LOCATION,
-  trans,
+    trans,
 } from "translator";
 
 export default {
-  name: "NewLocation",
+    name: "NewLocation",
-  components: {
+    components: {
-    Modal,
+        Modal,
-    AddAddress,
+        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;
-      },
     },
-    inputName: {
+    setup() {
-      get() {
+        return {
-        return this.selected.name;
+            trans,
-      },
+            SAVE,
-      set(value) {
+            ACTIVITY_LOCATION_FIELDS_EMAIL,
-        this.selected.name = value;
+            ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
-      },
+            ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
-    },
+            ACTIVITY_LOCATION_FIELDS_NAME,
-    inputEmail: {
+            ACTIVITY_LOCATION_FIELDS_TYPE,
-      get() {
+            ACTIVITY_CHOOSE_LOCATION_TYPE,
-        return this.selected.email;
+            ACTIVITY_CREATE_NEW_LOCATION,
-      },
-      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, {
+    props: ["availableLocations"],
-            address: {
+    data() {
-              id: this.selected.addressId,
+        return {
+            errors: [],
+            selected: {
+                type: null,
+                name: null,
+                addressId: null,
+                phonenumber1: null,
+                phonenumber2: null,
+                email: null,
             },
-          });
+            locationTypes: [],
-        }
+            modal: {
-
+                showModal: false,
-        makeFetch("POST", "/api/1.0/main/location.json", body)
+                modalDialogClass: "modal-dialog-scrollable modal-xl",
-          .then((response) => {
+            },
-            this.$store.dispatch("addAvailableLocationGroup", {
+            addAddress: {
-              locationGroup: "Localisations nouvellement créées",
+                options: {
-              locations: [response],
+                    button: {
-            });
+                        text: {
-            this.$store.dispatch("updateLocation", response);
+                            create: "activity.create_address",
-            this.modal.showModal = false;
+                            edit: "activity.edit_address",
-          })
+                        },
-          .catch((error) => {
+                        size: "btn-sm",
-            if (error.name === "ValidationException") {
+                    },
-              for (let v of error.violations) {
+                    title: {
-                this.errors.push(v);
+                        create: "activity.create_address",
-              }
+                        edit: "activity.edit_address",
-            } else {
+                    },
-              this.errors.push("An error occurred");
+                },
+                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;
+        },
     },
-    submitNewAddress(payload) {
+    mounted() {
-      this.selected.addressId = payload.addressId;
+        this.getLocationTypesList();
-      this.addAddress.context.addressId = payload.addressId;
+    },
-      this.addAddress.context.edit = true;
+    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");
+                        }
+                    });
+            }
+        },
+        submitNewAddress(payload) {
+            this.selected.addressId = payload.addressId;
+            this.addAddress.context.addressId = payload.addressId;
+            this.addAddress.context.edit = true;
+        },
     },
-  },
 };
 </script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue

@@ -1,98 +1,103 @@
 <template>
-  <teleport to="#social-issues-acc">
+    <teleport to="#social-issues-acc">
-    <div class="mb-3 row">
+        <div class="mb-3 row">
-      <div class="col-4">
+            <div class="col-4">
-        <label :class="socialIssuesClassList">{{
+                <label :class="socialIssuesClassList">{{
-          trans(ACTIVITY_SOCIAL_ISSUES)
+                    trans(ACTIVITY_SOCIAL_ISSUES)
-        }}</label>
+                }}</label>
-      </div>
+            </div>
-      <div class="col-8">
+            <div class="col-8">
-        <check-social-issue
+                <check-social-issue
-          v-for="issue in socialIssuesList"
+                    v-for="issue in socialIssuesList"
-          :key="issue.id"
+                    :key="issue.id"
-          :issue="issue"
+                    :issue="issue"
-          :selection="socialIssuesSelected"
+                    :selection="socialIssuesSelected"
-          @updateSelected="updateIssuesSelected"
+                    @updateSelected="updateIssuesSelected"
-        >
+                >
-        </check-social-issue>
+                </check-social-issue>
 
-        <div class="my-3">
+                <div class="my-3">
-          <VueMultiselect
+                    <VueMultiselect
-            name="otherIssues"
+                        name="otherIssues"
-            label="text"
+                        label="text"
-            track-by="id"
+                        track-by="id"
-            open-direction="bottom"
+                        open-direction="bottom"
-            :close-on-select="true"
+                        :close-on-select="true"
-            :preserve-search="false"
+                        :preserve-search="false"
-            :reset-after="true"
+                        :reset-after="true"
-            :hide-selected="true"
+                        :hide-selected="true"
-            :taggable="false"
+                        :taggable="false"
-            :multiple="false"
+                        :multiple="false"
-            :searchable="true"
+                        :searchable="true"
-            :allow-empty="true"
+                        :allow-empty="true"
-            :show-labels="false"
+                        :show-labels="false"
-            :loading="issueIsLoading"
+                        :loading="issueIsLoading"
-            :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
+                        :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
-            :options="socialIssuesOther"
+                        :options="socialIssuesOther"
-            @select="addIssueInList"
+                        @select="addIssueInList"
-          >
+                    >
-          </VueMultiselect>
+                    </VueMultiselect>
-        </div>
+                </div>
-      </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>
 
-        <span
+        <div class="mb-3 row">
-          v-else-if="socialIssuesSelected.length === 0"
+            <div class="col-4">
-          class="inline-choice chill-no-data-statement mt-3"
+                <label :class="socialActionsClassList">{{
-        >
+                    trans(ACTIVITY_SOCIAL_ACTIONS)
-          {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
+                }}</label>
-        </span>
+            </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>
 
-        <template
+                <span
-          v-else-if="
+                    v-else-if="socialIssuesSelected.length === 0"
-            socialActionsList.length > 0 &&
+                    class="inline-choice chill-no-data-statement mt-3"
-            (socialIssuesSelected.length || socialActionsSelected.length)
+                >
-          "
+                    {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
-        >
+                </span>
-          <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
+                <template
-          v-else-if="actionAreLoaded && socialActionsList.length === 0"
+                    v-else-if="
-          class="inline-choice chill-no-data-statement mt-3"
+                        socialActionsList.length > 0 &&
-        >
+                        (socialIssuesSelected.length ||
-          {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
+                            socialActionsSelected.length)
-        </span>
+                    "
-      </div>
+                >
-    </div>
+                    <div
-  </teleport>
+                        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>
 </template>
 
 <script>
@@ -101,153 +106,154 @@ 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_SOCIAL_ACTION_LIST_EMPTY,
-  ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+    ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
-  ACTIVITY_SOCIAL_ACTIONS,
+    ACTIVITY_SOCIAL_ACTIONS,
-  ACTIVITY_SOCIAL_ISSUES,
+    ACTIVITY_SOCIAL_ISSUES,
-  ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+    ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
-  trans,
+    trans,
 } from "translator";
 
 export default {
-  name: "SocialIssuesAcc",
+    name: "SocialIssuesAcc",
-  components: {
+    components: {
-    CheckSocialIssue,
+        CheckSocialIssue,
-    CheckSocialAction,
+        CheckSocialAction,
-    VueMultiselect,
+        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;
     },
-    socialIssuesSelected() {
+    setup() {
-      return this.$store.state.activity.socialIssues;
+        return {
+            trans,
+            ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+            ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+            ACTIVITY_SOCIAL_ACTIONS,
+            ACTIVITY_SOCIAL_ISSUES,
+            ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+        };
     },
-    socialIssuesOther() {
+    data() {
-      return this.$store.state.socialIssuesOther;
+        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" : ""}`,
+        };
     },
-    socialActionsList() {
+    computed: {
-      return this.$store.getters.socialActionsListSorted;
+        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;
+        },
     },
-    socialActionsSelected() {
+    mounted() {
-      return this.$store.state.activity.socialActions;
+        /* 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: {
-  mounted() {
+        /* When choosing an issue in multiselect, add it in checkboxes (as selected),
-    /* 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) {
+        addIssueInList(value) {
-      //console.log('addIssueInList', value);
+            //console.log('addIssueInList', value);
-      this.$store.commit("addIssueInList", value);
+            this.$store.commit("addIssueInList", value);
-      this.$store.commit("removeIssueInOther", value);
+            this.$store.commit("removeIssueInOther", value);
-      this.$store.dispatch("addIssueSelected", value);
+            this.$store.dispatch("addIssueSelected", value);
-      this.updateActionsList();
+            this.updateActionsList();
-    },
+        },
-    /* Update value for selected issues checkboxes
+        /* Update value for selected issues checkboxes
-     */
+         */
-    updateIssuesSelected(issues) {
+        updateIssuesSelected(issues) {
-      //console.log('updateIssuesSelected', issues);
+            //console.log('updateIssuesSelected', issues);
-      this.$store.dispatch("updateIssuesSelected", issues);
+            this.$store.dispatch("updateIssuesSelected", issues);
-      this.updateActionsList();
+            this.updateActionsList();
-    },
+        },
-    /* Update value for selected actions checkboxes
+        /* Update value for selected actions checkboxes
-     */
+         */
-    updateActionsSelected(actions) {
+        updateActionsSelected(actions) {
-      //console.log('updateActionsSelected', actions);
+            //console.log('updateActionsSelected', actions);
-      this.$store.dispatch("updateActionsSelected", actions);
+            this.$store.dispatch("updateActionsSelected", actions);
-    },
+        },
-    /* Add socialActions concerned: after reset, loop on each issue selected
+        /* Add socialActions concerned: after reset, loop on each issue selected
          to get social actions concerned
       */
-    updateActionsList() {
+        updateActionsList() {
-      this.resetActionsList();
+            this.resetActionsList();
-      this.socialIssuesSelected.forEach((item) => {
+            this.socialIssuesSelected.forEach((item) => {
-        this.actionIsLoading = true;
+                this.actionIsLoading = true;
-        getSocialActionByIssue(item.id).then(
+                getSocialActionByIssue(item.id).then(
-          (actions) =>
+                    (actions) =>
-            new Promise((resolve) => {
+                        new Promise((resolve) => {
-              actions.results.forEach((action) => {
+                            actions.results.forEach((action) => {
-                this.$store.commit("addActionInList", action);
+                                this.$store.commit("addActionInList", action);
-              }, this);
+                            }, this);
 
-              this.$store.commit("filterList", "actions");
+                            this.$store.commit("filterList", "actions");
 
-              this.actionIsLoading = false;
+                            this.actionIsLoading = false;
-              this.actionAreLoaded = true;
+                            this.actionAreLoaded = true;
-              resolve();
+                            resolve();
-            }),
+                        }),
-        );
+                );
-      }, this);
+            }, 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);
+        },
     },
-    /* 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>
 
@@ -257,18 +263,18 @@ export default {
 @import "ChillMainAssets/chill/scss/chill_variables";
 
 span.multiselect__single {
-  display: none !important;
+    display: none !important;
 }
 
 #actionsList {
-  border-radius: 0.5rem;
+    border-radius: 0.5rem;
-  padding: 1rem;
+    padding: 1rem;
-  margin: 0.5rem;
+    margin: 0.5rem;
-  background-color: whitesmoke;
+    background-color: whitesmoke;
 }
 
 span.badge {
-  margin-bottom: 0.5rem;
+    margin-bottom: 0.5rem;
-  @include badge_social($social-issue-color);
+    @include badge_social($social-issue-color);
 }
 </style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue

@@ -1,38 +1,38 @@
 <template>
-  <span class="inline-choice">
+    <span class="inline-choice">
-    <div class="form-check">
+        <div class="form-check">
-      <input
+            <input
-        class="form-check-input"
+                class="form-check-input"
-        type="checkbox"
+                type="checkbox"
-        v-model="selected"
+                v-model="selected"
-        name="action"
+                name="action"
-        :id="action.id"
+                :id="action.id"
-        :value="action"
+                :value="action"
-      />
+            />
-      <label class="form-check-label" :for="action.id">
+            <label class="form-check-label" :for="action.id">
-        <span class="badge bg-light text-dark" :title="action.text">{{
+                <span class="badge bg-light text-dark" :title="action.text">{{
-          action.text
+                    action.text
-        }}</span>
+                }}</span>
-      </label>
+            </label>
-    </div>
+        </div>
-  </span>
+    </span>
 </template>
 
 <script>
 export default {
-  name: "CheckSocialAction",
+    name: "CheckSocialAction",
-  props: ["action", "selection"],
+    props: ["action", "selection"],
-  emits: ["updateSelected"],
+    emits: ["updateSelected"],
-  computed: {
+    computed: {
-    selected: {
+        selected: {
-      set(value) {
+            set(value) {
-        this.$emit("updateSelected", value);
+                this.$emit("updateSelected", value);
-      },
+            },
-      get() {
+            get() {
-        return this.selection;
+                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);
+    @include badge_social($social-action-color);
-  font-size: 95%;
+    font-size: 95%;
-  margin-bottom: 5px;
+    margin-bottom: 5px;
-  margin-right: 1em;
+    margin-right: 1em;
-  max-width: 100%; /* Adjust as needed */
+    max-width: 100%; /* Adjust as needed */
-  overflow: hidden;
+    overflow: hidden;
-  text-overflow: ellipsis;
+    text-overflow: ellipsis;
-  white-space: nowrap;
+    white-space: nowrap;
 }
 </style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue

@@ -1,36 +1,38 @@
 <template>
-  <span class="inline-choice">
+    <span class="inline-choice">
-    <div class="form-check">
+        <div class="form-check">
-      <input
+            <input
-        class="form-check-input"
+                class="form-check-input"
-        type="checkbox"
+                type="checkbox"
-        v-model="selected"
+                v-model="selected"
-        name="issue"
+                name="issue"
-        :id="issue.id"
+                :id="issue.id"
-        :value="issue"
+                :value="issue"
-      />
+            />
-      <label class="form-check-label" :for="issue.id">
+            <label class="form-check-label" :for="issue.id">
-        <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
+                <span class="badge bg-chill-l-gray text-dark">{{
-      </label>
+                    issue.text
-    </div>
+                }}</span>
-  </span>
+            </label>
+        </div>
+    </span>
 </template>
 
 <script>
 export default {
-  name: "CheckSocialIssue",
+    name: "CheckSocialIssue",
-  props: ["issue", "selection"],
+    props: ["issue", "selection"],
-  emits: ["updateSelected"],
+    emits: ["updateSelected"],
-  computed: {
+    computed: {
-    selected: {
+        selected: {
-      set(value) {
+            set(value) {
-        this.$emit("updateSelected", value);
+                this.$emit("updateSelected", value);
-      },
+            },
-      get() {
+            get() {
-        return this.selection;
+                return this.selection;
-      },
+            },
+        },
     },
-  },
 };
 </script>
 
@@ -39,9 +41,9 @@ export default {
 @import "ChillPersonAssets/chill/scss/mixins";
 @import "ChillMainAssets/chill/scss/chill_variables";
 span.badge {
-  @include badge_social($social-issue-color);
+    @include badge_social($social-issue-color);
-  font-size: 95%;
+    font-size: 95%;
-  margin-bottom: 5px;
+    margin-bottom: 5px;
-  margin-right: 1em;
+    margin-right: 1em;
 }
 </style>

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php

@@ -49,17 +49,17 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
         return $this->getAttributes();
     }
 
-    protected function supports($attribute, $subject)
+    protected function supports(string $attribute, mixed $subject): bool
     {
         return $this->helper->supports($attribute, $subject);
     }
 
-    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
+    protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
     {
         return $this->helper->voteOnAttribute($attribute, $subject, $token);
     }
 
-    private function getAttributes()
+    private function getAttributes(): array
     {
         return [self::STATS, self::LISTS];
     }

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\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 class ActivityStoredObjectVoter extends AbstractStoredObjectVoter
 {

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\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {

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\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 final readonly class AccompanyingPeriodActivityGenericDocProvider implements GenericDocForAccompanyingPeriodProviderInterface, GenericDocForPersonProviderInterface
 {

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\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 
 final readonly class PersonActivityGenericDocProvider implements GenericDocForPersonProviderInterface
 {

src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php

@@ -25,7 +25,7 @@ trait PrepareActivityTrait
      *
      * @return Activity
      */
-    public function prepareActivity(Scope $scope, Person $person)
+    public function prepareActivity(Scope $scope, Person $person): \Chill\ActivityBundle\Entity\Activity
     {
         return (new Activity())
             ->setScope($scope)

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

@@ -25,7 +25,7 @@ final class ActivityControllerTest extends WebTestCase
     /**
      * @dataProvider getSecuredPagesUnauthenticated
      */
-    public function testAccessIsDeniedForUnauthenticated(mixed $url)
+    public function testAccessIsDeniedForUnauthenticated(mixed $url): void
     {
         $client = $this->createClient();
 
@@ -61,7 +61,7 @@ final class ActivityControllerTest extends WebTestCase
      * @param type $client
      * @param type $url
      */
-    public function testAccessIsDeniedForUnauthorized($client, $url)
+    public function testAccessIsDeniedForUnauthorized($client, $url): void
     {
         $client->request('GET', $url);
 
@@ -101,7 +101,7 @@ final class ActivityControllerTest extends WebTestCase
         ];
     }
 
-    public function testCompleteScenario()
+    public function testCompleteScenario(): void
     {
         // 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()
+    private function createFakeUser(): \Chill\MainBundle\Entity\User
     {
         $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')
+    private function getAuthenticatedClient(mixed $username = 'center a_social'): \Symfony\Bundle\FrameworkBundle\KernelBrowser
     {
         return self::createClient([], [
             'PHP_AUTH_USER' => $username,

src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php

@@ -16,7 +16,6 @@ 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;
 
@@ -70,33 +69,32 @@ final class ActivityTest extends TestCase
     public function testHierarchySocialIssues(): void
     {
         $listener = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
-        $event = $this->prophesize(LifecycleEventArgs::class)->reveal();
 
         $parent = new SocialIssue();
         $child = new SocialIssue();
 
-        $parent->addChild($child);
+        $child->setParent($parent);
         $grandChild = new SocialIssue();
-        $child->addChild($grandChild);
+        $grandChild->setParent($child);
 
         $activity = new Activity();
         $activity->setAccompanyingPeriod(new AccompanyingPeriod());
 
         $activity->addSocialIssue($parent);
-        $listener->preUpdate($activity, $event);
+        $listener->preUpdate($activity);
 
         $this->assertCount(1, $activity->getSocialIssues());
         $this->assertContains($parent, $activity->getSocialIssues());
 
         $activity->addSocialIssue($grandChild);
-        $listener->preUpdate($activity, $event);
+        $listener->preUpdate($activity);
 
         $this->assertCount(1, $activity->getSocialIssues());
         $this->assertContains($grandChild, $activity->getSocialIssues());
         $this->assertNotContains($parent, $activity->getSocialIssues());
 
         $activity->addSocialIssue($child);
-        $listener->preUpdate($activity, $event);
+        $listener->preUpdate($activity);
 
         $this->assertCount(1, $activity->getSocialIssues());
         $this->assertContains($grandChild, $activity->getSocialIssues());
@@ -104,7 +102,7 @@ final class ActivityTest extends TestCase
         $this->assertNotContains($child, $activity->getSocialIssues());
 
         $activity->addSocialIssue($another = new SocialIssue());
-        $listener->preUpdate($activity, $event);
+        $listener->preUpdate($activity);
 
         $this->assertCount(2, $activity->getSocialIssues());
         $this->assertContains($grandChild, $activity->getSocialIssues());

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()
+    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByActivityTypeAggregator
     {
         return new ByActivityTypeAggregator(
             $this->rollingDateConverter,

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()
+    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregator
     {
         return $this->aggregator;
     }

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()
+    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregator
     {
         return $this->aggregator;
     }

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()
+    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityPresenceAggregator
     {
         return new ActivityPresenceAggregator($this->activityPresenceRepository, $this->translatableStringHelper);
     }

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php

@@ -44,7 +44,7 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
                     ->push($request->reveal());*/
     }
 
-    public function getAggregator()
+    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
     {
         return $this->aggregator;
     }

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php

@@ -45,7 +45,7 @@ final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
             ->push($request->reveal());
     }
 
-    public function getAggregator()
+    public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator
     {
         return $this->aggregator;
     }