upgrade phpunit config

Fixed: Do not send a confirmation message when the accompanying period is back to CONFIRM state

Closes #108

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

.gitignore

@@ -5,6 +5,7 @@ composer.lock
 docs/build/
 node_modules/*
 .php_cs.cache
+.cache/*
 
 ###> symfony/framework-bundle ###
 /.env.local

.gitlab-ci.yml

@@ -9,7 +9,7 @@ cache:
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
 # See http://docs.gitlab.com/ee/ci/services/README.html for examples.
 services:
-    - name: postgis/postgis:12-3.1-alpine
+    - name: postgis/postgis:14-3.3-alpine
       alias: db
     - name: redis
       alias: redis
@@ -21,7 +21,7 @@ variables:
     POSTGRES_USER: postgres
     POSTGRES_PASSWORD: postgres
     # configure database access
-    DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=12&charset=utf8
+    DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8
     # fetch the chill-app using git submodules
     GIT_SUBMODULE_STRATEGY: recursive
     REDIS_HOST: redis
@@ -37,12 +37,11 @@ stages:
 
 build:
     stage: Composer install
-    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     before_script:
-        - curl -sS https://getcomposer.org/installer | php
-        - php -d memory_limit=2G composer.phar config -g cache-dir "$(pwd)/.cache"
+        - composer config -g cache-dir "$(pwd)/.cache"
     script:
-        - php -d memory_limit=2G composer.phar install --optimize-autoloader --no-ansi --no-interaction --no-progress
+        - composer install --optimize-autoloader --no-ansi --no-interaction --no-progress
     cache:
         paths:
             - .cache/
@@ -54,9 +53,12 @@ build:
 
 code_style:
     stage: Tests
-    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     script:
-        - bin/grumphp run --tasks=phpcsfixer
+        - php-cs-fixer fix --dry-run -v --show-progress=none
+    cache:
+        paths:
+            - .cache/
     artifacts:
         expire_in: 30 min
         paths:
@@ -65,30 +67,49 @@ code_style:
 
 phpstan_tests:
     stage: Tests
-    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     script:
-        - bin/grumphp run --tasks=phpstan
+        - bin/phpstan analyze --memory-limit=2G
+    cache:
+        paths:
+            - .cache/
     artifacts:
         expire_in: 30 min
         paths:
             - bin
             - tests/app/vendor/
 
-psalm_tests:
+rector_tests:
     stage: Tests
-    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     script:
-        - bin/grumphp run --tasks=psalm
-    allow_failure: true
+        - bin/rector --dry-run
+    cache:
+        paths:
+            - .cache/
     artifacts:
         expire_in: 30 min
         paths:
             - bin
             - tests/app/vendor/
 
+# psalm_tests:
+#     stage: Tests
+#     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+#     script:
+#         - bin/psalm
+#     allow_failure: true
+#     artifacts:
+#         expire_in: 30 min
+#         paths:
+#             - bin
+#             - tests/app/vendor/
+
 unit_tests:
     stage: Tests
-    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    # until we fix testes
+    allow_failure: true
     script:
         - php tests/app/bin/console doctrine:migrations:migrate -n
         - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev

.php-cs-fixer.dist.php

@@ -24,7 +24,7 @@ $config = new PhpCsFixer\Config();
 $config
     ->setFinder($finder)
     ->setRiskyAllowed(true)
-    ->setCacheFile('.php_cs.cache')
+    ->setCacheFile('.cache/php-cs-fixer.cache')
     ->setUsingCache(true)
 ;
 
@@ -82,9 +82,36 @@ $riskyRules = [
 $untilFullSwitchToPhp8 = [
     'blank_line_between_import_groups' => false,
     'declare_strict_types' => true,
+    'multiline_whitespace_before_semicolons' => false,
+    'phpdoc_no_empty_return' => false,
 ];
 
 $rules = array_merge(
+    [
+        '@PhpCsFixer' => true,
+        '@PhpCsFixer:risky' => false,
+        '@Symfony' => false,
+        '@Symfony:risky' => false,
+        'ordered_class_elements' => [
+            'order' => [
+                'use_trait',
+                'constant_public',
+                'constant_protected',
+                'constant_private',
+                'property_public',
+                'property_protected',
+                'property_private',
+                'construct',
+                'destruct',
+                'magic',
+                'phpunit',
+                'method_public',
+                'method_protected',
+                'method_private',
+            ],
+            'sort_algorithm' => 'alpha',
+        ]
+    ],
     $rules,
     $riskyRules,
     $untilFullSwitchToPhp8,

composer.json

@@ -34,6 +34,7 @@
         "sensio/framework-extra-bundle": "^5.5",
         "spomky-labs/base64url": "^2.0",
         "symfony/browser-kit": "^4.4",
+        "symfony/clock": "^6.2",
         "symfony/css-selector": "^4.4",
         "symfony/expression-language": "^4.4",
         "symfony/form": "^4.4",
@@ -47,7 +48,6 @@
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "^4.4",
         "symfony/serializer": "^5.3",
-        "symfony/swiftmailer-bundle": "^3.5",
         "symfony/templating": "^4.4",
         "symfony/translation": "^4.4",
         "symfony/twig-bundle": "^4.4",
@@ -75,6 +75,7 @@
         "phpunit/phpunit": ">= 7.5",
         "psalm/plugin-phpunit": "^0.18.4",
         "psalm/plugin-symfony": "^4.0.2",
+        "rector/rector": "^0.15.23",
         "symfony/debug-bundle": "^5.1",
         "symfony/dotenv": "^4.4",
         "symfony/maker-bundle": "^1.20",

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

@@ -90,9 +90,7 @@ class CountPerson implements ExportInterface
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         // we gather all center the user choose.
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 

docs/source/development/entity-info.rst

@@ -0,0 +1,203 @@
+
+.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled "GNU
+Free Documentation License".
+
+.. _entity-info:
+
+Stats about event on entity in php world
+########################################
+
+It is necessary to be able to gather information about events for some entities:
+
+- when the event has been done;
+- who did it;
+- ...
+
+Those "infos" are not linked with right management, like describe in :ref:`timelines`.
+
+
+“infos” for some stats and info about an entity
+-----------------------------------------------
+
+Building an info means:
+
+- create an Entity, and map this entity to a SQL view (not a regular table);
+- use the framework to build this entity dynamically.
+
+A framework api is built to be able to build multiple “infos” entities
+through “union” views:
+
+-  use a command ``bin/console chill:db:sync-views`` to synchronize view (create view if it does not exists, or update
+   views when new SQL parts are added in the UNION query. Internally, this command call a new ``ViewEntityInfoManager``,
+   which iterate over available views to build the SQL;
+-  one can create a new “view entity info” by implementing a
+   ``ViewEntityInfoProviderInterface``
+-  this implementation of the interface is free to create another
+   interface for building each part of the UNION query. This interface
+   is created for AccompanyingPeriodInfo:
+   ``Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface``
+
+So, converting new “events” into rows for ``AccompanyingPeriodInfo`` is
+just implementing this interface!
+
+Implementation for AccompanyingPeriod (``AccompanyingPeriod/AccompanyingPeriodInfo``)
+-------------------------------------------------------------------------------------
+
+A class is created for computing some statistical info for an
+AccompanyingPeriod: ``AccompanyingPeriod/AccompanyingPeriodInfo``. This
+contains information about “something happens”, who did it and when.
+
+Having those info in table answer some questions like:
+
+-  when is the last and the first action (AccompanyingPeriodWork,
+   Activity, AccompanyingPeriodWorkEvaluation, …) on the period;
+-  who is “acting” on the period, and when is the last “action” for each
+   user.
+
+The AccompanyingPeriod info is mapped to a SQL view, not a table. The
+sql view is built dynamically (see below), and gather infos from
+ActivityBundle, PersonBundle, CalendarBundle, … It is possible to create
+custom bundle and add info on this view.
+
+.. code:: php
+
+   /**
+    *
+    * @ORM\Entity()
+    * @ORM\Table(name="view_chill_person_accompanying_period_info") <==== THIS IS A VIEW, NOT A TABLE
+    */
+   class AccompanyingPeriodInfo
+   {
+     // ...
+   }
+
+Why do we need this ?
+~~~~~~~~~~~~~~~~~~~~~
+
+For multiple jobs in PHP world:
+
+-  moving the accompanying period to another steps when inactive,
+   automatically;
+-  listing all the users which are intervening on the action on a new
+   “Liste des intervenants” page;
+-  filtering on exports
+
+Later, we will launch automatic anonymise for accompanying period and
+all related entities through this information.
+
+How is built the SQL views which is mapped to “info” entities ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The AccompanyingPeriodInfo entity is mapped by a SQL view (not a regular
+table).
+
+The sql view is built dynamically, it is a SQL view like this, for now (April 2023):
+
+.. code:: sql
+
+   create view view_chill_person_accompanying_period_info
+               (accompanyingperiod_id, relatedentity, relatedentityid, user_id, infodate, discriminator, metadata) as
+   SELECT w.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'::text AS relatedentity,
+          w.id                                                                        AS relatedentityid,
+          cpapwr.user_id,
+          w.enddate                                                                   AS infodate,
+          'accompanying_period_work_end'::text                                        AS discriminator,
+          '{}'::jsonb                                                                 AS metadata
+   FROM chill_person_accompanying_period_work w
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON w.id = cpapwr.accompanyingperiodwork_id
+   WHERE w.enddate IS NOT NULL
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+          e.id                                                                                  AS relatedentityid,
+          e.updatedby_id                                                                        AS user_id,
+          e.updatedat                                                                           AS infodate,
+          'accompanying_period_work_evaluation_updated_at'::text                                AS discriminator,
+          '{}'::jsonb                                                                           AS metadata
+   FROM chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+   WHERE e.updatedat IS NOT NULL
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+          e.id                                                                                  AS relatedentityid,
+          cpapwr.user_id,
+          e.maxdate                                                                             AS infodate,
+          'accompanying_period_work_evaluation_start'::text                                     AS discriminator,
+          '{}'::jsonb                                                                           AS metadata
+   FROM chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id
+   WHERE e.maxdate IS NOT NULL
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+          e.id                                                                                  AS relatedentityid,
+          cpapwr.user_id,
+          e.startdate                                                                           AS infodate,
+          'accompanying_period_work_evaluation_start'::text                                     AS discriminator,
+          '{}'::jsonb                                                                           AS metadata
+   FROM chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument'::text AS relatedentity,
+          doc.id                                                                                        AS relatedentityid,
+          doc.updatedby_id                                                                              AS user_id,
+          doc.updatedat                                                                                 AS infodate,
+          'accompanying_period_work_evaluation_document_updated_at'::text                               AS discriminator,
+          '{}'::jsonb                                                                                   AS metadata
+   FROM chill_person_accompanying_period_work_evaluation_document doc
+            JOIN chill_person_accompanying_period_work_evaluation e ON doc.accompanyingperiodworkevaluation_id = e.id
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+   WHERE doc.updatedat IS NOT NULL
+   UNION
+   SELECT cpapw.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation'::text AS relatedentity,
+          e.id                                                                                  AS relatedentityid,
+          cpapwr.user_id,
+          e.maxdate                                                                             AS infodate,
+          'accompanying_period_work_evaluation_max'::text                                       AS discriminator,
+          '{}'::jsonb                                                                           AS metadata
+   FROM chill_person_accompanying_period_work_evaluation e
+            JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id
+   WHERE e.maxdate IS NOT NULL
+   UNION
+   SELECT w.accompanyingperiod_id,
+          'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'::text AS relatedentity,
+          w.id                                                                        AS relatedentityid,
+          cpapwr.user_id,
+          w.startdate                                                                 AS infodate,
+          'accompanying_period_work_start'::text                                      AS discriminator,
+          '{}'::jsonb                                                                 AS metadata
+   FROM chill_person_accompanying_period_work w
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON w.id = cpapwr.accompanyingperiodwork_id
+   UNION
+   SELECT activity.accompanyingperiod_id,
+          'Chill\ActivityBundle\Entity\Activity'::text AS relatedentity,
+          activity.id                                  AS relatedentityid,
+          au.user_id,
+          activity.date                                AS infodate,
+          'activity_date'::text                        AS discriminator,
+          '{}'::jsonb                                  AS metadata
+   FROM activity
+            LEFT JOIN activity_user au ON activity.id = au.activity_id
+   WHERE activity.accompanyingperiod_id IS NOT NULL;
+
+As you can see, the view gather multiple SELECT queries and bind them
+with UNION.
+
+Each SELECT query is built dynamically, through a class implementing an
+interface: ``Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface``, `like
+here <https://gitlab.com/Chill-Projet/chill-bundles/-/blob/master/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php>`__
+
+To add new `SELECT` query in different `UNION` parts in the sql view, create a
+service and implements this interface: ``Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface``.

docs/source/development/index.rst

@@ -35,6 +35,7 @@ As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the fram
     manual/index.rst
     Assets <assets.rst>
     Cron Jobs <cronjob.rst>
+    Info about entities <entity-info.rst>
 
 Layout and UI
 **************

docs/source/development/timelines.rst

@@ -6,6 +6,8 @@
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
+.. _timelines:
+
 Timelines
 *********
 
@@ -18,24 +20,24 @@ Concept
 From an user point of view
 --------------------------
 
-Chill has two objectives : 
+Chill has two objectives :
 
 * make the administrative tasks more lightweight ;
 * help social workers to have all information they need to work
 
 To reach this second objective, Chill provides a special view: **timeline**. On a timeline view, information is gathered and shown on a single page, from the most recent event to the oldest one.
 
-The information gathered is linked to a *context*. This *context* may be, for instance : 
+The information gathered is linked to a *context*. This *context* may be, for instance :
 
 * a person : events linked to this person are shown on the page ;
 * a center: events linked to a center are shown. They may concern different peoples ;
-* ... 
+* ...
 
 In other word, the *context* is the kind of argument that will be used in the event's query.
 
 Let us recall that only the data the user has allowed to see should be shown.
 
-.. seealso:: 
+.. seealso::
 
    `The issue where the subject was first discussed <https://redmine.champs-libres.coop/issues/224>`_
 
@@ -43,30 +45,30 @@ Let us recall that only the data the user has allowed to see should be shown.
 For developers
 --------------
 
-The `Main` bundle provides interfaces and services to help to build timelines. 
+The `Main` bundle provides interfaces and services to help to build timelines.
 
 If a bundle wants to *push* information in a timeline, it should be create a service which implements `Chill\MainBundle\Timeline\TimelineProviderInterface`, and tag is with `chill.timeline` and arguments defining the supported context (you may use multiple `chill.timeline` tags in order to support multiple context with a single service/class).
 
-If a bundle wants to provide a new context for a timeline, the service `chill.main.timeline_builder` will helps to gather timeline's services supporting the defined context, and run queries across the models. 
+If a bundle wants to provide a new context for a timeline, the service `chill.main.timeline_builder` will helps to gather timeline's services supporting the defined context, and run queries across the models.
 
 .. _understanding-queries :
 
 Understanding queries
 ^^^^^^^^^^^^^^^^^^^^^
 
-Due to the fact that timelines should show only the X last events from Y differents tables, queries for a timeline may consume a lot of resources: at first on the database, and then on the ORM part, which will have to deserialize DB data to PHP classes, which may not be used if they are not part of the "last X events". 
+Due to the fact that timelines should show only the X last events from Y differents tables, queries for a timeline may consume a lot of resources: at first on the database, and then on the ORM part, which will have to deserialize DB data to PHP classes, which may not be used if they are not part of the "last X events".
 
-To avoid such load on database, the objects are queried in two steps : 
+To avoid such load on database, the objects are queried in two steps :
 
 1. An UNION request which gather the last X events, ordered by date. The data retrieved are the ID, the date, and a string key: a type. This type discriminates the data type.
-2. The PHP objects are queried by ID, the type helps the program to link id with the kind of objects. 
+2. The PHP objects are queried by ID, the type helps the program to link id with the kind of objects.
 
 Those methods should ensure that only X PHP objects will be gathered and build by the ORM.
 
 What does the master timeline builder service ?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
- When the service `chill.main.timeline_builder` is instanciated, the service is informed of each service taggued with `chill.timeline` tags. Then, 
+ When the service `chill.main.timeline_builder` is instanciated, the service is informed of each service taggued with `chill.timeline` tags. Then,
 
 1. The service build an UNION query by assembling column and tables names provided by the `fetchQuery` result ;
 2. The UNION query is run, the result contains an id and a type for each row (see :ref:`above <understanding-queries>`)
@@ -84,7 +86,7 @@ To push events on a timeline :
 Implementing the TimelineProviderInterface
 ------------------------------------------
 
-The has the following signature : 
+The has the following signature :
 
 .. code-block:: php
 
@@ -92,19 +94,19 @@ The has the following signature :
 
     interface TimelineProviderInterface
     {
-        
-        /** 
-         * 
+
+        /**
+         *
          * @param string $context
          * @param mixed[] $args the argument to the context.
          * @return TimelineSingleQuery
          * @throw  \LogicException if the context is not supported
          */
         public function fetchQuery($context, array $args);
-        
+
         /**
          * Indicate if the result type may be handled by the service
-         * 
+         *
          * @param string $type the key present in the SELECT query
          * @return boolean
          */
@@ -113,42 +115,42 @@ The has the following signature :
         /**
          * fetch entities from db into an associative array. The keys **MUST BE**
          * the id
-         * 
-         * All ids returned by all SELECT queries 
+         *
+         * All ids returned by all SELECT queries
          * (@see TimeLineProviderInterface::fetchQuery) and with the type
          * supported by the provider (@see TimelineProviderInterface::supportsType)
          * will be passed as argument.
-         * 
+         *
          * @param array $ids an array of id
          * @return mixed[] an associative array of entities, with id as key
          */
         public function getEntities(array $ids);
-        
+
         /**
          * return an associative array with argument to render the entity
          * in an html template, which will be included in the timeline page
-         * 
+         *
          * The result must have the following key :
-         * 
+         *
          * - `template` : the template FQDN
          * - `template_data`: the data required by the template
-         * 
-         * 
+         *
+         *
          * Example:
-         * 
+         *
          * ```
-         * array( 
+         * array(
          *    'template'      => 'ChillMyBundle:timeline:template.html.twig',
          *    'template_data' => array(
-         *             'accompanyingPeriod' => $entity, 
-         *              'person' => $args['person'] 
+         *             'accompanyingPeriod' => $entity,
+         *              'person' => $args['person']
          *         )
          *    );
          * ```
-         * 
+         *
          * `$context` and `$args` are defined by the bundle which will call the timeline
-         * rendering. 
-         * 
+         * rendering.
+         *
          * @param type $entity
          * @param type $context
          * @param array $args
@@ -156,7 +158,7 @@ The has the following signature :
          * @throws \LogicException if the context is not supported
          */
         public function getEntityTemplate($entity, $context, array $args);
-     
+
     }
 
 
@@ -176,7 +178,7 @@ The parameters should be replaced into the query by :code:`?`. They will be repl
 
 `$context` and `$args` are defined by the bundle which will call the timeline rendering. You may use them to build a different query depending on this context.
 
-For instance, if the context is `'person'`, the args will be this array : 
+For instance, if the context is `'person'`, the args will be this array :
 
 .. code-block:: php
 
@@ -197,7 +199,7 @@ You should find in the bundle documentation which contexts are arguments the bun
 
 .. note::
 
-    We encourage to use `ClassMetaData` to define column names arguments. If you change your column names, changes will be reflected automatically during the execution of your code. 
+    We encourage to use `ClassMetaData` to define column names arguments. If you change your column names, changes will be reflected automatically during the execution of your code.
 
 Example of an implementation :
 
@@ -215,13 +217,13 @@ Example of an implementation :
      */
     class TimelineReportProvider implements TimelineProviderInterface
     {
-        
+
         /**
          *
          * @var EntityManager
          */
         protected $em;
-        
+
         public function __construct(EntityManager $em)
         {
             $this->em = $em;
@@ -230,9 +232,9 @@ Example of an implementation :
         public function fetchQuery($context, array $args)
             {
                 $this->checkContext($context);
-                
+
                 $metadata = $this->em->getClassMetadata('ChillReportBundle:Report');
-                
+
                 return TimelineSingleQuery::fromArray([
                    'id' => $metadata->getColumnName('id'),
                    'type' => 'report',
@@ -254,11 +256,11 @@ Example of an implementation :
 The `supportsType` function
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This function indicate to the master `chill.main.timeline_builder` service (which orchestrate the build of UNION queries) that the service supports the type indicated in the result's array of the `fetchQuery` function. 
+This function indicate to the master `chill.main.timeline_builder` service (which orchestrate the build of UNION queries) that the service supports the type indicated in the result's array of the `fetchQuery` function.
 
-The implementation of our previous example will be : 
+The implementation of our previous example will be :
 
-.. code-block:: php 
+.. code-block:: php
 
 
     namespace Chill\ReportBundle\Timeline;
@@ -272,7 +274,7 @@ The implementation of our previous example will be :
         //...
 
         /**
-         * 
+         *
          * {@inheritDoc}
          */
         public function supportsType($type)
@@ -304,12 +306,12 @@ The results **must be** an array where the id given by the UNION query (remember
         {
             $reports = $this->em->getRepository('ChillReportBundle:Report')
                   ->findBy(array('id' => $ids));
-            
+
             $result = array();
             foreach($reports as $report) {
                 $result[$report->getId()] = $report;
             }
-            
+
             return $result;
         }
 
@@ -318,9 +320,9 @@ The results **must be** an array where the id given by the UNION query (remember
 The `getEntityTemplate` function
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This is where the master service will collect information to render the entity. 
+This is where the master service will collect information to render the entity.
 
-The result must be an associative array with : 
+The result must be an associative array with :
 
 - **template** is the FQDN of the template ;
 - **template_data** is an associative array where keys are the variables'names for this template, and values are the values.
@@ -332,8 +334,8 @@ Example :
     array(
         'template' => 'ChillMyBundle:timeline:template.html.twig',
         'template_data' => array(
-            'period' => $entity, 
-            'person' => $args['person'] 
+            'period' => $entity,
+            'person' => $args['person']
             )
         );
 
@@ -349,7 +351,7 @@ Create a timeline with his own context
 
 You have to create a Controller which will execute the service `chill.main.timeline_builder`. Using the `Chill\MainBundle\Timeline\TimelineBuilder::getTimelineHTML` function, you will get an HTML representation of the timeline, which you may include with twig `raw` filter.
 
-Example : 
+Example :
 
 .. code-block:: php
 

docs/source/installation/index.rst

@@ -129,12 +129,12 @@ This script will :
 
 .. note::
 
-   In some cases it can happen that an old image (chill_base_php or chill_php) stored in the docker cache will make the script fail. To solve this problem you have to delete the image and the container, before the make init :
+   In some cases it can happen that an old image (chill_base_php82 or chill_php82) stored in the docker cache will make the script fail. To solve this problem you have to delete the image and the container, before the make init :
 
     .. code-block:: bash
 
        docker-compose images php
-       docker rmi -f chill_php:prod
+       docker rmi -f chill_php82:prod
        docker-compose rm php
 
 
@@ -151,6 +151,7 @@ This script will :
 
    # mount into to container
    ./docker-php.sh
+   bin/console chill:db:sync-views
    # and load fixtures
    bin/console doctrine:migrations:migrate
 
@@ -161,7 +162,7 @@ Chill will be available at ``http://localhost:8001.`` Currently, there isn't any
 
    # mount into to container
    ./docker-php.sh
-   # and load fixtures
+   # and load fixtures (do not this for production)
    bin/console doctrine:fixtures:load --purge-with-truncate
 
 There are several users available:
@@ -204,8 +205,10 @@ How to create the database schema (= run migrations) ?
    # if a container is running
    ./docker-php.sh
    bin/console doctrine:migrations:migrate
+   bin/console chill:db:sync-views
    # if not
    docker-compose run --user $(id -u) php bin/console doctrine:migrations:migrate
+   docker-compose run --user $(id -u) php bin/console chill:db:sync-views
 
 
 How to read the email sent by the program ?
@@ -236,6 +239,23 @@ How to open a terminal in the project
    # if not
    docker-compose run --user $(id -u) php /bin/bash
 
+How to run cron-jobs ?
+======================
+
+Some command must be executed in :ref:`cron jobs <cronjob>`. To execute them:
+
+.. code-block:: bash
+
+   # if a container is running
+   ./docker-php.sh
+   bin/console chill:cron-job:execute
+   # some of them are executed only during the night. So, we have to force the execution during the day:
+   bin/console chill:cron-job:execute 'name-of-the-cron'
+   # if not
+   docker-compose run --user $(id -u) php bin/console chill:cron-job:execute
+   # some of them are executed only during the night. So, we have to force the execution during the day:
+   docker-compose run --user $(id -u) php bin/console chill:cron-job:execute 'name-of-the-cron'
+
 How to run composer ?
 =====================
 

docs/source/installation/prod.rst

@@ -38,6 +38,14 @@ This should be adapted to your needs:
 
 * Think about how you will backup your database. Some adminsys find easier to store database outside of docker, which might be easier to administrate or replicate.
 
+Run migrations on each update
+=============================
+
+Every time you start a new version, you should apply update the sql schema:
+
+- running ``bin/console doctrine:migration:migrate`` to run sql migration;
+- synchonizing sql views to the last state: ``bin/console chill:db:sync-views``
+
 Cron jobs
 =========
 

package.json

@@ -1,7 +1,7 @@
 {
-    "name": "chill",
-    "version": "2.0.0",
-    "devDependencies": {
+  "name": "chill",
+  "version": "2.0.0",
+  "devDependencies": {
     "@alexlafroscia/yaml-merge": "^4.0.0",
     "@apidevtools/swagger-cli": "^4.0.4",
     "@babel/core": "^7.20.5",
@@ -34,13 +34,14 @@
     "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@fullcalendar/core": "^5.11.0",
-    "@fullcalendar/daygrid": "^5.11.0",
-    "@fullcalendar/interaction": "^5.11.0",
-    "@fullcalendar/list": "^5.11.0",
-    "@fullcalendar/timegrid": "^5.11.0",
-    "@fullcalendar/vue3": "^5.11.1",
+    "@fullcalendar/core": "^6.1.4",
+    "@fullcalendar/daygrid": "^6.1.4",
+    "@fullcalendar/interaction": "^6.1.4",
+    "@fullcalendar/list": "^6.1.4",
+    "@fullcalendar/timegrid": "^6.1.4",
+    "@fullcalendar/vue3": "^6.1.4",
     "@popperjs/core": "^2.9.2",
+    "@types/leaflet": "^1.9.3",
     "dropzone": "^5.7.6",
     "es6-promise": "^4.2.8",
     "leaflet": "^1.7.1",

phpstan-baseline-level-2.neon

@@ -235,11 +235,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
 
-		-
-			message: "#^Call to method Chill\\\\MainBundle\\\\Entity\\\\Address\\:\\:getPostcode\\(\\) with incorrect case\\: getPostCode$#"
-			count: 6
-			path: src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
-
 		-
 			message: "#^Only booleans are allowed in a negated boolean, null given\\.$#"
 			count: 1

phpstan-baseline-level-3.neon

@@ -10,41 +10,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
 
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\) of method Chill\\\\ActivityBundle\\\\Service\\\\DocGenerator\\\\ActivityContext\\:\\:buildPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:buildPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\) of method Chill\\\\ActivityBundle\\\\Service\\\\DocGenerator\\\\ActivityContext\\:\\:storeGenerated\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:storeGenerated\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReason\\) of method Chill\\\\ActivityBundle\\\\Templating\\\\Entity\\\\ActivityReasonRender\\:\\:renderString\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderString\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
-
 		-
 			message: "#^Return type \\(array\\<array\\<string\\>\\>\\) of method Chill\\\\AsideActivityBundle\\\\Security\\\\AsideActivityVoter\\:\\:getRolesWithHierarchy\\(\\) should be covariant with return type \\(array\\<string, array\\<int, string\\>\\>\\) of method Chill\\\\MainBundle\\\\Security\\\\ProvideRoleHierarchyInterface\\:\\:getRolesWithHierarchy\\(\\)$#"
 			count: 1
 			path: src/Bundle/ChillAsideActivityBundle/src/Security/AsideActivityVoter.php
 
-		-
-			message: "#^Parameter \\#1 \\$asideActivityCategory \\(Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory\\) of method Chill\\\\AsideActivityBundle\\\\Templating\\\\Entity\\\\CategoryRender\\:\\:renderBox\\(\\) should be contravariant with parameter \\$entity \\(Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderBox\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
-
-		-
-			message: "#^Parameter \\#1 \\$asideActivityCategory \\(Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory\\) of method Chill\\\\AsideActivityBundle\\\\Templating\\\\Entity\\\\CategoryRender\\:\\:renderString\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderString\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
-
-		-
-			message: "#^Parameter \\#1 \\$asideActivityCategory \\(Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory\\) of method Chill\\\\AsideActivityBundle\\\\Templating\\\\Entity\\\\CategoryRender\\:\\:supports\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:supports\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
-
 		-
 			message: "#^Parameter \\#1 \\$criteria \\(array\\<string, mixed\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$criteria \\(array\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findBy\\(\\)$#"
 			count: 1
@@ -80,70 +50,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php
 
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContext\\:\\:getFormData\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:getFormData\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContext\\:\\:hasPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:hasPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
-		-
-			message: "#^Parameter \\#3 \\$contextGenerationData \\(array\\{mainPerson\\?\\: Chill\\\\PersonBundle\\\\Entity\\\\Person, thirdParty\\?\\: Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty, title\\: string\\}\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContext\\:\\:getData\\(\\) should be contravariant with parameter \\$contextGenerationData \\(array\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContextInterface\\:\\:getData\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
-		-
-			message: "#^Parameter \\#3 \\$contextGenerationData \\(array\\{mainPerson\\?\\: Chill\\\\PersonBundle\\\\Entity\\\\Person, thirdParty\\?\\: Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty, title\\: string\\}\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContext\\:\\:getData\\(\\) should be contravariant with parameter \\$contextGenerationData \\(array\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:getData\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContext\\:\\:buildPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:buildPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContext\\:\\:storeGenerated\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:storeGenerated\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
-		-
-			message: "#^Parameter \\#4 \\$contextGenerationData \\(array\\{mainPerson\\?\\: Chill\\\\PersonBundle\\\\Entity\\\\Person, thirdParty\\?\\: Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty, title\\: string\\}\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContext\\:\\:storeGenerated\\(\\) should be contravariant with parameter \\$contextGenerationData \\(array\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContextInterface\\:\\:storeGenerated\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
-		-
-			message: "#^Parameter \\#4 \\$contextGenerationData \\(array\\{mainPerson\\?\\: Chill\\\\PersonBundle\\\\Entity\\\\Person, thirdParty\\?\\: Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty, title\\: string\\}\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContext\\:\\:storeGenerated\\(\\) should be contravariant with parameter \\$contextGenerationData \\(array\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:storeGenerated\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContextInterface\\:\\:getData\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:getData\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
-
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContextInterface\\:\\:getFormData\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:getFormData\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
-
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContextInterface\\:\\:hasPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:hasPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContextInterface\\:\\:buildPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:buildPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContextInterface\\:\\:storeGenerated\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:storeGenerated\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContextInterface.php
 
 		-
 			message: "#^Return type \\(int\\|void\\|null\\) of method Chill\\\\CustomFieldsBundle\\\\Command\\\\CreateFieldsOnGroupCommand\\:\\:execute\\(\\) should be covariant with return type \\(int\\) of method Symfony\\\\Component\\\\Console\\\\Command\\\\Command\\:\\:execute\\(\\)$#"
@@ -505,20 +411,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
 
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\CommentRender\\:\\:renderBox\\(\\) should be contravariant with parameter \\$entity \\(Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderBox\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\CommentRender\\:\\:renderString\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderString\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\MainBundle\\\\Entity\\\\User\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\UserRender\\:\\:renderString\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderString\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
 
 		-
 			message: "#^Parameter \\#1 \\$value \\(string\\) of method Chill\\\\MainBundle\\\\Validation\\\\Validator\\\\ValidPhonenumber\\:\\:validate\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
@@ -550,11 +442,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
 
-		-
-			message: "#^Return type \\(int\\|void\\|null\\) of method Chill\\\\PersonBundle\\\\Command\\\\ImportPeopleFromCSVCommand\\:\\:execute\\(\\) should be covariant with return type \\(int\\) of method Symfony\\\\Component\\\\Console\\\\Command\\\\Command\\:\\:execute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
 		-
 			message: "#^Parameter \\#3 \\$query \\(Doctrine\\\\ORM\\\\QueryBuilder\\) of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdCompositionTypeApiController\\:\\:customizeQuery\\(\\) should be contravariant with parameter \\$query \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:customizeQuery\\(\\)$#"
 			count: 1
@@ -840,90 +727,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
 
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\AccompanyingPeriodContext\\:\\:buildPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:buildPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\AccompanyingPeriodContext\\:\\:storeGenerated\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:storeGenerated\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
-
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\AccompanyingPeriodWorkEvaluationContext\\:\\:getData\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:getData\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
-
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\AccompanyingPeriodWorkEvaluationContext\\:\\:getFormData\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:getFormData\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
-
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\AccompanyingPeriodWorkEvaluationContext\\:\\:hasPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:hasPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\AccompanyingPeriodWorkEvaluationContext\\:\\:buildPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:buildPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
-
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\PersonContext\\:\\:hasPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:hasPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\PersonContext\\:\\:buildPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:buildPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\PersonContext\\:\\:storeGenerated\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:storeGenerated\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
-
-		-
-			message: "#^Parameter \\#2 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\PersonContextInterface\\:\\:hasPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:hasPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\PersonContextInterface\\:\\:buildPublicForm\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextWithPublicFormInterface\\:\\:buildPublicForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Service\\\\DocGenerator\\\\PersonContextInterface\\:\\:storeGenerated\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\DocGeneratorBundle\\\\Context\\\\DocGeneratorContextInterface\\:\\:storeGenerated\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContextInterface.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\ClosingMotive\\) of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\ClosingMotiveRender\\:\\:renderString\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderString\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
-
-		-
-			message: "#^Parameter \\#1 \\$person \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\PersonRender\\:\\:renderBox\\(\\) should be contravariant with parameter \\$entity \\(Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderBox\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
-
-		-
-			message: "#^Parameter \\#1 \\$person \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\PersonRender\\:\\:renderString\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderString\\(\\)$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
-
-		-
-			message: "#^Parameter \\#1 \\$socialIssue \\(Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\SocialIssue\\) of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\SocialIssueRender\\:\\:renderBox\\(\\) should be contravariant with parameter \\$entity \\(Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderBox\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
-
-		-
-			message: "#^Parameter \\#1 \\$socialIssue \\(Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\SocialIssue\\) of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\SocialIssueRender\\:\\:renderString\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderString\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
 
 		-
 			message: "#^Parameter \\#1 \\$object \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationDocument\\) of method Chill\\\\PersonBundle\\\\Workflow\\\\AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler\\:\\:getRelatedObjects\\(\\) should be contravariant with parameter \\$object \\(object\\) of method Chill\\\\MainBundle\\\\Workflow\\\\EntityWorkflowHandlerInterface\\:\\:getRelatedObjects\\(\\)$#"
@@ -980,26 +783,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
 
-		-
-			message: "#^Parameter \\#1 \\$thirdParty \\(Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\) of method Chill\\\\ThirdPartyBundle\\\\Serializer\\\\Normalizer\\\\ThirdPartyNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\ThirdPartyBundle\\\\Serializer\\\\Normalizer\\\\ThirdPartyNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\) of method Chill\\\\ThirdPartyBundle\\\\Templating\\\\Entity\\\\ThirdPartyRender\\:\\:renderBox\\(\\) should be contravariant with parameter \\$entity \\(Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderBox\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\) of method Chill\\\\ThirdPartyBundle\\\\Templating\\\\Entity\\\\ThirdPartyRender\\:\\:renderString\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderString\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
-
 		-
 			message: "#^Parameter \\#1 \\$document \\(Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getBasename\\(\\) should be contravariant with parameter \\$document \\(ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document\\) of method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\DocumentManagerInterface\\:\\:getBasename\\(\\)$#"
 			count: 1

phpstan-baseline-level-4.neon

@@ -175,21 +175,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
 
-		-
-			message: "#^Call to method getCategory\\(\\) on an unknown class Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
-
-		-
-			message: "#^Call to method getName\\(\\) on an unknown class Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\ActivityBundle\\\\Templating\\\\Entity\\\\ActivityReasonRender\\:\\:renderBox\\(\\) has invalid type Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
-
 		-
 			message: "#^Parameter \\$context of method Chill\\\\ActivityBundle\\\\Timeline\\\\TimelineActivityProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
 			count: 1
@@ -255,11 +240,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
 
-		-
-			message: "#^Call to an undefined method Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory\\:\\:getName\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
-
 		-
 			message: "#^Call to method DateTimeImmutable\\:\\:add\\(\\) on a separate line has no effect\\.$#"
 			count: 1
@@ -275,11 +255,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
 
-		-
-			message: "#^Instanceof between Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory and Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
-
 		-
 			message: "#^Static call to instance method Chill\\\\BudgetBundle\\\\Calculator\\\\CalculatorInterface\\:\\:getAlias\\(\\)\\.$#"
 			count: 3
@@ -430,11 +405,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
 
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\BudgetBundle\\\\Templating\\\\BudgetElementTypeRender\\:\\:renderBox\\(\\) has invalid type Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Templating/BudgetElementTypeRender.php
-
 		-
 			message: "#^Property Chill\\\\CalendarBundle\\\\Command\\\\AzureGrantAdminConsentAndAcquireToken\\:\\:\\$clientRegistry is never read, only written\\.$#"
 			count: 1
@@ -500,11 +470,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCalendarBundle/Entity/Calendar.php
 
-		-
-			message: "#^Method Chill\\\\CalendarBundle\\\\Entity\\\\Calendar\\:\\:getUsers\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\MainBundle\\\\Entity\\\\User\\> but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), Chill\\\\MainBundle\\\\Entity\\\\User\\|null\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Entity/Calendar.php
-
 		-
 			message: "#^Property Chill\\\\CalendarBundle\\\\Entity\\\\CalendarRange\\:\\:\\$id is never written, only read\\.$#"
 			count: 1
@@ -570,16 +535,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
 
-		-
-			message: "#^Default value of the parameter \\#3 \\$contextGenerationData \\(array\\{\\}\\) of method Chill\\\\CalendarBundle\\\\Service\\\\DocGenerator\\\\CalendarContext\\:\\:getData\\(\\) is incompatible with type array\\{mainPerson\\?\\: Chill\\\\PersonBundle\\\\Entity\\\\Person, thirdParty\\?\\: Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty, title\\: string\\}\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
-		-
-			message: "#^Offset 'trackDatetime' does not exist on array\\{askMainPerson\\: bool, mainPersonLabel\\: string\\|null, askThirdParty\\: bool, thirdPartyLabel\\: string\\|null, trackDateTime\\: bool\\}\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php
-
 		-
 			message: "#^Call to an undefined method Symfony\\\\Component\\\\Console\\\\Helper\\\\HelperInterface\\:\\:ask\\(\\)\\.$#"
 			count: 1
@@ -1155,11 +1110,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
 
-		-
-			message: "#^Property Chill\\\\DocGeneratorBundle\\\\Controller\\\\DocGeneratorTemplateController\\:\\:\\$client is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between null and int will always evaluate to false\\.$#"
 			count: 1
@@ -1230,11 +1180,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillDocStoreBundle/Entity/Document.php
 
-		-
-			message: "#^Method Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\:\\:getCreationDate\\(\\) should return DateTime but returns DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
-
 		-
 			message: "#^Property Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\:\\:\\$id is never written, only read\\.$#"
 			count: 1
@@ -2120,15 +2065,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/Country.php
 
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable\\:\\:getUserId\\(\\) has invalid return type Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\interger\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable\\:\\:getUserId\\(\\) should return Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\interger but returns int\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
 
 		-
 			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\GeographicalUnit\\:\\:\\$geom is unused\\.$#"
@@ -2530,11 +2466,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
 
-		-
-			message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Center\\\\GroupingCenterInterface\\:\\:getName\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
-
 		-
 			message: "#^Property Chill\\\\MainBundle\\\\Form\\\\Type\\\\Select2CountryType\\:\\:\\$requestStack is never read, only written\\.$#"
 			count: 1
@@ -2700,11 +2631,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
 
-		-
-			message: "#^Call to method getRoleScopes\\(\\) on an unknown class Chill\\\\MainBundle\\\\Entity\\\\PermissionGroup\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
 		-
 			message: "#^Empty array passed to foreach\\.$#"
 			count: 1
@@ -2860,11 +2786,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
 
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\interger will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
-
 		-
 			message: "#^Method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DateNormalizer\\:\\:normalize\\(\\) should return array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|null but return statement is missing\\.$#"
 			count: 1
@@ -2930,46 +2851,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
 
-		-
-			message: "#^PHPDoc tag @param for parameter \\$addr with type mixed is not subtype of native type Chill\\\\MainBundle\\\\Entity\\\\Address\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(Address addr\\)\\: Unexpected token \"addr\", expected variable at offset 26$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\the will always evaluate to true\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between Chill\\\\MainBundle\\\\Entity\\\\the and 'FR' will always evaluate to false\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRender\\:\\:renderBox\\(\\) has invalid type Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\ChillEntityRenderInterface\\:\\:renderBox\\(\\) has invalid type Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\UserRender\\:\\:renderBox\\(\\) has invalid type Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
-
 		-
 			message: "#^PHPDoc tag @return has invalid value \\(array\\<'to'\\: DateTimeImmutable, 'from'\\: DateTimeImmutable\\>\\)\\: Unexpected token \"\\:\", expected '\\>' at offset 29$#"
 			count: 1
@@ -3140,111 +3021,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
 
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:\\:\\$force\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:\\:\\$headers\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:\\:\\$helperSet\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:\\:\\$input\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:\\:\\$output\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:\\:\\$person\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:\\:\\$rawHeaders\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:\\:\\$row\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:\\:\\$skipPerson\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQuery\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Call to method buildForm\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Elseif branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\View\\\\ChoiceGroupView will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Instanceof between Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\View\\\\ChoiceView and Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\View\\\\ChoiceView will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Command\\\\ImportPeopleFromCSVCommand\\:\\:processTextType\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Command\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Console\\\\Helper\\\\Table\\:\\:render\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^PHPDoc tag @var above foreach loop does not specify variable name\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Parameter \\$value of method Chill\\\\PersonBundle\\\\Command\\\\ImportPeopleFromCSVCommand\\:\\:processTextType\\(\\) has invalid type Chill\\\\PersonBundle\\\\Command\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between false and false will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
 		-
 			message: "#^PHPDoc tag @var for property Chill\\\\PersonBundle\\\\Command\\\\ImportSocialWorkMetadata\\:\\:\\$importer with type Psr\\\\Log\\\\LoggerInterface is not subtype of native type Chill\\\\PersonBundle\\\\Service\\\\Import\\\\ChillImporter\\.$#"
 			count: 1
@@ -3505,31 +3281,12 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
 
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getAvailablePersonLocation\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Person\\> but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), Chill\\\\PersonBundle\\\\Entity\\\\Person\\|null\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getComments\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), mixed\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
 
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getCreatedAt\\(\\) should return DateTime\\|null but returns DateTimeInterface\\|null\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
 
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getOpenParticipations\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), mixed\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getParticipationsContainsPerson\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), mixed\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getRecursiveSocialActions\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Entity\\\\SocialAction\\.$#"
 			count: 1
@@ -3655,26 +3412,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
 
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getCurrentMembersIds\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), int\\|null\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getCurrentPersons\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), Chill\\\\PersonBundle\\\\Entity\\\\Person\\|null\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getMembersDuringMembership\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\> but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), mixed\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getMembersOnRange\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), mixed\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
 		-
 			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\> is incompatible with native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
 			count: 1
@@ -3960,21 +3697,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
 
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingCourseFilters\\\\ReferrerFilter\\:\\:\\$userRender is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
-
 		-
 			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingCourseFilters\\\\SocialActionFilter\\:\\:\\$translatableStringHelper is never read, only written\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
 
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingCourseFilters\\\\UserJobFilter\\:\\:getUserJob\\(\\) is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
-
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingCourseFilters\\\\UserScopeFilter\\:\\:getUserMainScope\\(\\) is unused\\.$#"
 			count: 1
@@ -4140,11 +3867,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
 
-		-
-			message: "#^Dead catch \\- Exception is never thrown in the try block\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
-
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\PersonSearch\\:\\:renderResult\\(\\) should return string but returns array\\<string, array\\<bool\\|Chill\\\\PersonBundle\\\\Entity\\\\Person\\>\\>\\.$#"
 			count: 1
@@ -4320,11 +4042,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
 
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), Chill\\\\PersonBundle\\\\Entity\\\\Person\\|null\\>\\:\\:add\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
-
 		-
 			message: "#^Call to function array_key_exists\\(\\) with 'category' and array will always evaluate to true\\.$#"
 			count: 1
@@ -4375,26 +4092,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
 
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\ClosingMotiveRender\\:\\:renderBox\\(\\) has invalid type Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
-
-		-
-			message: "#^Call to method getTitle\\(\\) on an unknown class Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\ResourceKindRender\\:\\:renderBox\\(\\) has invalid type Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
-
-		-
-			message: "#^Parameter \\$socialAction of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\SocialActionRender\\:\\:renderBox\\(\\) has invalid type Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
-
 		-
 			message: "#^Call to method getId\\(\\) on an unknown class ChillPersonBundle\\:AccompanyingPeriod\\.$#"
 			count: 1
@@ -5030,11 +4727,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
 
-		-
-			message: "#^Method Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:getActiveChildren\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection but returns Doctrine\\\\Common\\\\Collections\\\\ReadableCollection\\<\\(int\\|string\\), mixed\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
-
 		-
 			message: "#^PHPDoc tag @return with type DateTime\\|null is not subtype of native type DateTimeImmutable\\|null\\.$#"
 			count: 1

phpstan-baseline-level-5.neon

@@ -25,21 +25,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
 
-		-
-			message: "#^Parameter \\#1 \\$name of method Chill\\\\MainBundle\\\\Entity\\\\Country\\:\\:setName\\(\\) expects string, array\\<string, string\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
-
-		-
-			message: "#^Parameter \\#1 \\$title of method Chill\\\\MainBundle\\\\Entity\\\\LocationType\\:\\:setTitle\\(\\) expects array, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
-
-		-
-			message: "#^Parameter \\#1 \\$status of method Chill\\\\CalendarBundle\\\\Entity\\\\Invite\\:\\:setStatus\\(\\) expects string, array\\<string, string\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
-
 		-
 			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRemovedMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
 			count: 1
@@ -440,21 +425,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
 
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Parameter \\#1 \\$mobilenumber of method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:setMobilenumber\\(\\) expects libphonenumber\\\\PhoneNumber\\|null, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Parameter \\#1 \\$phonenumber of method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:setPhonenumber\\(\\) expects libphonenumber\\\\PhoneNumber\\|null, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
 		-
 			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
 			count: 1
@@ -570,11 +540,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
 
-		-
-			message: "#^Parameter \\#1 \\$entity of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\ClosingMotiveRender\\:\\:renderString\\(\\) expects Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\ClosingMotive, Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
-
 		-
 			message: "#^Parameter \\#1 \\$entityName of method Doctrine\\\\ORM\\\\EntityManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillPersonBundle\\:AccompanyingPeriod\\>, string given\\.$#"
 			count: 1

phpstan-baseline.neon

@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Variable property access on \\$this\\(Chill\\\\ActivityBundle\\\\Entity\\\\ActivityType\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityType.php
-
 		-
 			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
 			count: 1
@@ -20,11 +15,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
 
-		-
-			message: "#^Variable method call on object\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
 		-
 			message: "#^Cannot unset offset '_token' on array\\{formatter\\: mixed, export\\: mixed, centers\\: mixed, alias\\: string\\}\\.$#"
 			count: 1
@@ -50,46 +40,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
 
-		-
-			message: "#^Variable \\$message on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
-
-		-
-			message: "#^Variable \\$sqls on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
-
-		-
-			message: "#^Class Chill\\\\PersonBundle\\\\Entity\\\\Person constructor invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Variable \\$street1Value might not be defined\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Variable method call on mixed\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
-
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
 
-		-
-			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
-
-		-
-			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
-
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1

phpstan-deprecations.neon

@@ -32,14 +32,6 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
 
 
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
 		-
 			message: """
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
@@ -199,14 +191,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
 
-		-
-			message: """
-				#^Class Chill\\\\MainBundle\\\\Entity\\\\User implements deprecated interface Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\AdvancedUserInterface\\:
-				since Symfony 4\\.1$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/User.php
-
 		-
 			message: """
 				#^Return type of method Chill\\\\MainBundle\\\\Entity\\\\User\\:\\:getRoles\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -329,22 +313,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
 
-		-
-			message: """
-				#^Call to deprecated method getCurrentAccompanyingPeriod\\(\\) of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\:
-				since 1\\.1 use `getOpenedAccompanyingPeriod instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
 		-
 			message: """
 				#^Class Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
@@ -541,11 +509,3 @@ parameters:
 			count: 3
 			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
 
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
-

phpstan-types.neon

@@ -100,11 +100,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
 
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Entity\\\\Participation\\:\\:offsetGet\\(\\) should return mixed but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Participation.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -315,11 +310,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 6
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -340,21 +330,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
-
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\PersonSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
-
 		-
 			message: "#^Method Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\LoadReports\\:\\:getRandomChoice\\(\\) should return array\\<string\\>\\|string but return statement is missing\\.$#"
 			count: 1

phpstan.neon.dist

@@ -2,6 +2,7 @@ parameters:
     level: 5
     paths:
         - src/
+    tmpDir: .cache/
     reportUnmatchedIgnoredErrors: false
     excludePaths:
         - .php_cs*

phpunit.xml.dist

@@ -2,11 +2,20 @@
 
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="tests/app/vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="tests/app/tests/bootstrap.php"
->
+         cacheResultFile=".phpunit.cache/test-results"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="true"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true">
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="APP_ENV" value="test" force="true" />

rector.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/docs',
+        __DIR__ . '/src',
+    ]);
+
+    //$rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
+    //$rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');
+
+    // register a single rule
+    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+    $rectorConfig->disableParallel();
+
+    //define sets of rules
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_74
+    ]);
+
+    // skip some path...
+    $rectorConfig->skip([
+        // make rector stuck for some files
+        \Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector::class,
+
+        // we need to discuss this: are we going to have FALSE in tests instead of an error ?
+        \Rector\Php71\Rector\FuncCall\CountOnNullRector::class,
+
+        // must merge MR500 and review a typing of "ArrayCollection" in entities
+        \Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector::class,
+
+        // remove all PHP80 rules, in order to activate them one by one
+        \Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector::class,
+        \Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class,
+        \Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector::class,
+        \Rector\Php80\Rector\FuncCall\ClassOnObjectRector::class,
+        \Rector\Php80\Rector\ClassConstFetch\ClassOnThisVariableObjectRector::class,
+        \Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector::class,
+        \Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector::class,
+        \Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector::class,
+        \Rector\Php80\Rector\Ternary\GetDebugTypeRector::class,
+        \Rector\Php80\Rector\FunctionLike\MixedTypeRector::class,
+        \Rector\Php80\Rector\Property\NestedAnnotationToAttributeRector::class,
+        \Rector\Php80\Rector\FuncCall\Php8ResourceReturnToObjectRector::class,
+        \Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector::class,
+        \Rector\Php80\Rector\ClassMethod\SetStateToStaticRector::class,
+        \Rector\Php80\Rector\NotIdentical\StrContainsRector::class,
+        \Rector\Php80\Rector\Identical\StrEndsWithRector::class,
+        \Rector\Php80\Rector\Identical\StrStartsWithRector::class,
+        \Rector\Php80\Rector\Class_\StringableForToStringRector::class,
+        \Rector\Php80\Rector\FuncCall\TokenGetAllToObjectRector::class,
+        \Rector\Php80\Rector\FunctionLike\UnionTypesRector::class
+    ]);
+};

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -41,7 +41,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use function array_key_exists;
@@ -213,7 +212,7 @@ final class ActivityController extends AbstractController
 
         $form = $this->createForm(ActivityType::class, $entity, [
             'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
-            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
+            'role' => 'CHILL_ACTIVITY_UPDATE',
             'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
         ]);
@@ -442,7 +441,7 @@ final class ActivityController extends AbstractController
 
         $form = $this->createForm(ActivityType::class, $entity, [
             'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
-            'role' => new Role('CHILL_ACTIVITY_CREATE'),
+            'role' => 'CHILL_ACTIVITY_CREATE',
             'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
         ]);
@@ -651,8 +650,8 @@ final class ActivityController extends AbstractController
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-        // TODO Add permission
-        // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+            // TODO Add permission
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }

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

@@ -50,7 +50,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
             ->findAll();
 
         foreach ($persons as $person) {
-            $activityNbr = mt_rand(0, 3);
+            $activityNbr = random_int(0, 3);
 
             for ($i = 0; $i < $activityNbr; ++$i) {
                 $activity = $this->newRandomActivity($person);
@@ -75,7 +75,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 
         //      ->setAttendee($this->faker->boolean())
 
-        for ($i = 0; mt_rand(0, 4) > $i; ++$i) {
+        for ($i = 0; random_int(0, 4) > $i; ++$i) {
             $reason = $this->getRandomActivityReason();
 
             if (null !== $reason) {

src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php

@@ -26,7 +26,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_activity');
-        $rootNode = $treeBuilder->getRootNode('chill_activity');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()
@@ -59,9 +59,7 @@ class Configuration implements ConfigurationInterface
             ->info('The number of seconds of this duration. Must be an integer.')
             ->cannotBeEmpty()
             ->validate()
-            ->ifTrue(static function ($data) {
-                return !is_int($data);
-            })->thenInvalid('The value %s is not a valid integer')
+            ->ifTrue(static fn ($data) => !is_int($data))->thenInvalid('The value %s is not a valid integer')
             ->end()
             ->end()
             ->scalarNode('label')

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -195,7 +195,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      * @Groups({"docgen:read"})
      */
-    private User $user;
+    private ?User $user = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
@@ -257,12 +257,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     /**
      * Add a social issue.
      *
-     * Note: the social issue consistency (the fact that only yougest social issues
+     * Note: the social issue consistency (the fact that only youngest social issues
      * are kept) is processed by an entity listener:
      *
      * @see{\Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener}
-     *
-     * @return $this
      */
     public function addSocialIssue(SocialIssue $socialIssue): self
     {
@@ -270,6 +268,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
             $this->socialIssues[] = $socialIssue;
         }
 
+        if ($this->getAccompanyingPeriod() !== null) {
+            $this->getAccompanyingPeriod()->addSocialIssue($socialIssue);
+        }
+
         return $this;
     }
 
@@ -492,7 +494,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->activityType;
     }
 
-    public function getUser(): User
+    public function getUser(): ?User
     {
         return $this->user;
     }
@@ -550,6 +552,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     {
         $this->accompanyingPeriod = $accompanyingPeriod;
 
+        foreach ($this->getSocialIssues() as $issue) {
+            $this->accompanyingPeriod->addSocialIssue($issue);
+        }
+
         return $this;
     }
 
@@ -675,14 +681,14 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setUser(UserInterface $user): self
+    public function setUser(?User $user): self
     {
         $this->user = $user;
 
         return $this;
     }
 
-    public function setUsers(?Collection $users): self
+    public function setUsers(Collection $users): self
     {
         $this->users = $users;
 

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -34,7 +34,7 @@ class ActivityPresence
      * @ORM\GeneratedValue(strategy="AUTO")
      * @Serializer\Groups({"docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -122,7 +122,7 @@ class ActivityType
      * @ORM\GeneratedValue(strategy="AUTO")
      * @Groups({"docgen:read"})
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
@@ -380,6 +380,7 @@ class ActivityType
             throw new InvalidArgumentException('Field "' . $field . '" not found');
         }
 
+        /** @phpstan-ignore-next-line  */
         return $this->{$property};
     }
 
@@ -538,6 +539,7 @@ class ActivityType
             throw new InvalidArgumentException('Field "' . $field . '" not found');
         }
 
+        /** @phpstan-ignore-next-line  */
         return self::FIELD_REQUIRED === $this->{$property};
     }
 
@@ -549,6 +551,7 @@ class ActivityType
             throw new InvalidArgumentException('Field "' . $field . '" not found');
         }
 
+        /** @phpstan-ignore-next-line  */
         return self::FIELD_INVISIBLE !== $this->{$property};
     }
 

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

@@ -86,9 +86,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('activity');
 

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

@@ -87,9 +87,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository->createQueryBuilder('activity');
 

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

@@ -86,9 +86,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository
             ->createQueryBuilder('activity')

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

@@ -109,9 +109,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 

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

@@ -87,9 +87,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository
             ->createQueryBuilder('activity')

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

@@ -87,9 +87,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         $qb = $this->repository
             ->createQueryBuilder('activity')

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

@@ -137,13 +137,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
                     $activity = $activityRepository->find($value);
 
-                    return implode(', ', array_map(function (ActivityReason $r) {
-                        return '"' .
-                                $this->translatableStringHelper->localize($r->getCategory()->getName())
-                                . ' > ' .
-                                $this->translatableStringHelper->localize($r->getName())
-                                . '"';
-                    }, $activity->getReasons()->toArray()));
+                    return implode(', ', array_map(fn (ActivityReason $r) => '"' .
+                            $this->translatableStringHelper->localize($r->getCategory()->getName())
+                            . ' > ' .
+                            $this->translatableStringHelper->localize($r->getName())
+                            . '"', $activity->getReasons()->toArray()));
                 };
 
             case 'circle_name':
@@ -152,7 +150,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         return 'circle';
                     }
 
-                    return $this->translatableStringHelper->localize(json_decode($value, true));
+                    return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
                 };
 
             case 'type_name':
@@ -161,7 +159,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         return 'activity type';
                     }
 
-                    return $this->translatableStringHelper->localize(json_decode($value, true));
+                    return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
                 };
 
             default:
@@ -197,9 +195,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
         if (!array_key_exists('fields', $data)) {

src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php

@@ -179,7 +179,7 @@ class ListActivityHelper
                         }
                     }
 
-                    $decoded = json_decode($value);
+                    $decoded = json_decode($value, null, 512, JSON_THROW_ON_ERROR);
 
                     return implode(
                         '|',

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

@@ -61,12 +61,9 @@ class ActivityTypeFilter implements FilterInterface
         $builder->add('accepted_activitytypes', EntityType::class, [
             'class' => ActivityType::class,
             'choices' => $this->activityTypeRepository->findAllActive(),
-            'choice_label' => function (ActivityType $aty) {
-                return
-                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
-                    .
-                    $this->translatableStringHelper->localize($aty->getName());
-            },
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+            .
+            $this->translatableStringHelper->localize($aty->getName()),
             'multiple' => true,
             'expanded' => true,
         ]);

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

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserLocationType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class LocationFilter implements FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->andWhere(
+            $qb->expr()->in('activity.location', ':location')
+        );
+
+        $qb->setParameter('location', $data['accepted_location']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_location', PickUserLocationType::class, [
+            'multiple' => true,
+            'label' => 'pick location',
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $locations = [];
+
+        foreach ($data['accepted_location'] as $location) {
+            $locations[] = $location->getName();
+        }
+
+        return ['Filtered activity by location: only %locations%', [
+            '%locations%' => implode(', ', $locations),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by location';
+    }
+}

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

@@ -64,11 +64,9 @@ class UserScopeFilter implements FilterInterface
     {
         $builder->add('accepted_userscope', EntityType::class, [
             'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
-                    $s->getName()
-                );
-            },
+            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
+                $s->getName()
+            ),
             'multiple' => true,
             'expanded' => true,
         ]);

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

@@ -61,12 +61,9 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $builder->add('types', EntityType::class, [
             'choices' => $this->activityTypeRepository->findAllActive(),
             'class' => ActivityType::class,
-            'choice_label' => function (ActivityType $aty) {
-                return
-                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
-                    .
-                    $this->translatableStringHelper->localize($aty->getName());
-            },
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+            .
+            $this->translatableStringHelper->localize($aty->getName()),
             'group_by' => function (ActivityType $type) {
                 if (!$type->hasCategory()) {
                     return null;

src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php

@@ -32,7 +32,7 @@ class ActivityReasonCategoryType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory',
+            'data_class' => \Chill\ActivityBundle\Entity\ActivityReasonCategory::class,
         ]);
     }
 

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -211,13 +211,9 @@ class ActivityType extends AbstractType
                 'required' => $activityType->isRequired('attendee'),
                 'expanded' => true,
                 'class' => ActivityPresence::class,
-                'choice_label' => function (ActivityPresence $activityPresence) {
-                    return $this->translatableStringHelper->localize($activityPresence->getName());
-                },
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('a')
-                        ->where('a.active = true');
-                },
+                'choice_label' => fn (ActivityPresence $activityPresence) => $this->translatableStringHelper->localize($activityPresence->getName()),
+                'query_builder' => static fn (EntityRepository $er) => $er->createQueryBuilder('a')
+                    ->where('a.active = true'),
             ]);
         }
 
@@ -225,6 +221,7 @@ class ActivityType extends AbstractType
             $builder->add('user', PickUserDynamicType::class, [
                 'label' => $activityType->getLabel('user'),
                 'required' => $activityType->isRequired('user'),
+                'multiple' => false,
             ]);
         }
 
@@ -356,9 +353,7 @@ class ActivityType extends AbstractType
 
                         return (string) $location->getId();
                     },
-                    function (?string $id): ?Location {
-                        return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
-                    }
+                    fn (?string $id): ?Location => $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id])
                 ));
         }
 
@@ -400,9 +395,7 @@ class ActivityType extends AbstractType
                     // the datetimetransformer will then handle timezone as GMT
                     $timezoneUTC = new DateTimeZone('GMT');
                     /** @var DateTime $data */
-                    $data = $formEvent->getData() === null ?
-                        DateTime::createFromFormat('U', '300') :
-                        $formEvent->getData();
+                    $data = $formEvent->getData() ?? DateTime::createFromFormat('U', '300');
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
                     $data->add(new DateInterval('PT' . $seconds . 'S'));

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -45,9 +45,7 @@ class ActivityTypeType extends AbstractType
             ])
             ->add('category', EntityType::class, [
                 'class' => ActivityTypeCategory::class,
-                'choice_label' => function (ActivityTypeCategory $activityTypeCategory) {
-                    return $this->translatableStringHelper->localize($activityTypeCategory->getName());
-                },
+                'choice_label' => fn (ActivityTypeCategory $activityTypeCategory) => $this->translatableStringHelper->localize($activityTypeCategory->getName()),
             ])
             ->add('ordering', NumberType::class, [
                 'required' => true,

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

@@ -45,9 +45,7 @@ class PickActivityReasonType extends AbstractType
         $resolver->setDefaults(
             [
                 'class' => ActivityReason::class,
-                'choice_label' => function (ActivityReason $choice) {
-                    return $this->reasonRender->renderString($choice, []);
-                },
+                'choice_label' => fn (ActivityReason $choice) => $this->reasonRender->renderString($choice, []),
                 'group_by' => function (ActivityReason $choice): ?string {
                     if (null !== $category = $choice->getCategory()) {
                         return $this->translatableStringHelper->localize($category->getName());

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

@@ -38,10 +38,8 @@ class TranslatableActivityReasonCategoryType extends AbstractType
         $resolver->setDefaults(
             [
                 'class' => ActivityReasonCategory::class,
-                'choice_label' => function (ActivityReasonCategory $category) {
-                    return $this->translatableStringHelper->localize($category->getName())
-                        . (!$category->getActive() ? ' (' . $this->translator->trans('inactive') . ')' : '');
-                },
+                'choice_label' => fn (ActivityReasonCategory $category) => $this->translatableStringHelper->localize($category->getName())
+                    . (!$category->getActive() ? ' (' . $this->translator->trans('inactive') . ')' : ''),
             ]
         );
     }

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

@@ -39,9 +39,7 @@ class TranslatableActivityType extends AbstractType
                 'class' => ActivityType::class,
                 'active_only' => true,
                 'choices' => $this->activityTypeRepository->findAllActive(),
-                'choice_label' => function (ActivityType $type) {
-                    return $this->translatableStringHelper->localize($type->getName());
-                },
+                'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
             ]
         );
     }

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -18,6 +18,9 @@ use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+/**
+ * @implements LocalMenuBuilderInterface<array{accompanyingCourse: AccompanyingPeriod}>
+ */
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
     protected Security $security;

src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php

@@ -15,6 +15,9 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
 
+/**
+ * @implements LocalMenuBuilderInterface<array>
+ */
 final class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
     private Security $security;

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -13,21 +13,25 @@ namespace Chill\ActivityBundle\Menu;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Entity\Person;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-class PersonMenuBuilder implements LocalMenuBuilderInterface
+/**
+ * @implements LocalMenuBuilderInterface<array{person: Person}>
+ */
+final class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
      * @var AuthorizationCheckerInterface
      */
-    protected $authorizationChecker;
+    private $authorizationChecker;
 
     /**
      * @var TranslatorInterface
      */
-    protected $translator;
+    private $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
@@ -44,7 +48,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
 
         if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
             $menu->addChild(
-                $this->translator->trans('Activity list'),
+                $this->translator->trans('Activities'),
                 [
                     'route' => 'chill_activity_activity_list',
                     'routeParameters' => ['person_id' => $person->getId()],

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -254,9 +254,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
             $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), ActivityVoter::SEE, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                static function (Scope $scope) {
-                    return $scope->getId();
-                },
+                static fn (Scope $scope) => $scope->getId(),
                 $reachableScopes
             );
 

src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss

@@ -88,3 +88,11 @@ div.flex-bloc.concerned-groups {
       font-size: 120%;
    }
 }
+
+/// DOCUMENT LIST IN ACTIVITY ITEM
+li.document-list-item {
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+    margin-bottom: 0.3rem;
+}

src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig

@@ -63,12 +63,12 @@
                 </div>
             {% endif %}
 
-            {% if activity.user and t.userVisible %}
+            {% if activity.user is not null and t.userVisible %}
                 <div class="wl-row">
                     <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
                     <div class="wl-col list">
                         <p class="wl-item">
-                            {{ activity.user|chill_entity_render_box }}
+                            <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                         </p>
                     </div>
                 </div>
@@ -137,19 +137,42 @@
                         {{ activity.comment|chill_entity_render_box({
                             'disable_markdown': false,
                             'limit_lines': 3,
-                            'metadata': false
+                            'metadata': false,
                         }) }}
                     </div>
                 </div>
             {% endif %}
 
-            {#  Only if ACL SEE_DETAILS AND/OR only on template SHOW ??
-                durationTime
-                travelTime
-                comment
-                documents
-                attendee
-            #}
+            {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.privateComment.hasCommentForUser(app.user) %}
+                <div class="wl-row">
+                    <div class="wl-col title">
+                        <h3>{{ 'Private comment'|trans }}</h3>
+                    </div>
+                    <div class="wl-col list">
+                        <section class="chill-entity entity-comment-embeddable">
+                            <blockquote class="chill-user-quote private-quote">
+                                {{ activity.privateComment.comments[app.user.id]|chill_markdown_to_html }}
+                            </blockquote>
+                        </section>
+                    </div>
+                </div>
+            {% endif %}
+
+            {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.documents|length > 0 %}
+                <div class="wl-row">
+                    <div class="wl-col title">
+                        <h3>{{ 'Documents'|trans }}</h3>
+                    </div>
+                    <div class="wl-col list">
+                        <ul>
+                            {% for d in activity.documents %}
+                                <li class="document-list-item">{{ d.title|chill_print_or_message('document.Any title') }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', activity), {small: true}) }}</li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </div>
+            {% endif %}
+
         </div>
     </div>
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -5,7 +5,7 @@
 
     Maybe should we think about abstracting this file a bit more ? Moving it to PersonBundle ?
 #}
-{% if context == 'calendar_accompanyingCourse' %}
+{% if context == 'calendar_accompanyingCourse' or context == 'calendar_person' %}
     {% import "@ChillCalendar/_invite.html.twig" as invite %}
 {% endif %}
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig

@@ -8,11 +8,13 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -23,11 +23,13 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig

@@ -41,7 +41,7 @@
                         {% if activity.user and t.userVisible %}
                             <li>
                                 <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <b>{{ activity.user|chill_entity_render_box}}</b>
+                                <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                             </li>
                         {% endif %}
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -34,8 +34,12 @@
 
         <div class="item-row separator">
             <dl class="chill_view_data">
-                <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
-                <dd>{{ entity.user|chill_entity_render_box }}</dd>
+                {%- if entity.user is not null %}
+                    <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
+                    <dd>
+                        <span class="badge-user">{{ entity.user|chill_entity_render_box }}</span>
+                    </dd>
+                {% endif %}
 
                 {%- if entity.scope -%}
                     <dt class="inline">{{ 'Scope'|trans }}</dt>
@@ -168,7 +172,7 @@
                     {% if entity.documents|length > 0 %}
                         <ul>
                             {% for d in entity.documents %}
-                                <li>{{ d.title }} {{ d|chill_document_button_group() }}</li>
+                                <li class="document-list-item">{{ d.title|chill_print_or_message('document.Any title') }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', entity), {small: true}) }}</li>
                             {% endfor %}
                         </ul>
                     {% else %}

src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php

@@ -22,6 +22,7 @@ use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -31,6 +32,9 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+/**
+ * @implements DocGeneratorContextWithPublicFormInterface<Activity>
+ */
 class ActivityContext implements
     DocGeneratorContextWithAdminFormInterface,
     DocGeneratorContextWithPublicFormInterface
@@ -45,6 +49,8 @@ class ActivityContext implements
 
     private PersonRenderInterface $personRender;
 
+    private PersonRepository $personRepository;
+
     private TranslatableStringHelperInterface $translatableStringHelper;
 
     private TranslatorInterface $translator;
@@ -55,6 +61,7 @@ class ActivityContext implements
         TranslatableStringHelperInterface $translatableStringHelper,
         EntityManagerInterface $em,
         PersonRenderInterface $personRender,
+        PersonRepository $personRepository,
         TranslatorInterface $translator,
         BaseContextData $baseContextData
     ) {
@@ -63,6 +70,7 @@ class ActivityContext implements
         $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
         $this->personRender = $personRender;
+        $this->personRepository = $personRepository;
         $this->translator = $translator;
         $this->baseContextData = $baseContextData;
     }
@@ -126,9 +134,7 @@ class ActivityContext implements
                 $builder->add($key, EntityType::class, [
                     'class' => Person::class,
                     'choices' => $persons,
-                    'choice_label' => function (Person $p) {
-                        return $this->personRender->renderString($p, []);
-                    },
+                    'choice_label' => fn (Person $p) => $this->personRender->renderString($p, []),
                     'multiple' => false,
                     'required' => false,
                     'expanded' => true,
@@ -139,6 +145,32 @@ class ActivityContext implements
         }
     }
 
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $denormalized = [];
+
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            if (null !== ($id = ($data[$k] ?? null))) {
+                $denormalized[$k] = $this->personRepository->find($id);
+            } else {
+                $denormalized[$k] = null;
+            }
+        }
+
+        return $denormalized;
+    }
+
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $normalized = [];
+
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            $normalized[$k] = null === $data[$k] ? null : $data[$k]->getId();
+        }
+
+        return $normalized;
+    }
+
     public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
     {
         if (!$entity instanceof Activity) {
@@ -147,7 +179,7 @@ class ActivityContext implements
         $options = $template->getOptions();
 
         $data = [];
-        $data = array_merge($data, $this->baseContextData->getData());
+        $data = array_merge($data, $this->baseContextData->getData($contextGenerationData['creator'] ?? null));
         $data['activity'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => Activity::class, 'groups' => 'docgen:read']);
 
         $data['course'] = $this->normalizer->normalize($entity->getAccompanyingPeriod(), 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']);
@@ -206,9 +238,6 @@ class ActivityContext implements
         return $options['mainPerson'] || $options['person1'] || $options['person2'];
     }
 
-    /**
-     * @param Activity $entity
-     */
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
         $storedObject->setTitle($this->translatableStringHelper->localize($template->getName()));

src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php

@@ -34,10 +34,16 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use DateTime;
 use libphonenumber\PhoneNumber;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use function in_array;
 
+/**
+ * @implements DocGeneratorContextWithPublicFormInterface<AccompanyingPeriod>
+ * @implements DocGeneratorContextWithAdminFormInterface<AccompanyingPeriod>
+ */
 class ListActivitiesByAccompanyingPeriodContext implements
     DocGeneratorContextWithAdminFormInterface,
     DocGeneratorContextWithPublicFormInterface
@@ -69,7 +75,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
         SocialIssueRepository $socialIssueRepository,
         ThirdPartyRepository $thirdPartyRepository,
         TranslatableStringHelperInterface $translatableStringHelper,
-        UserRepository $userRepository
+        UserRepository $userRepository,
     ) {
         $this->accompanyingPeriodContext = $accompanyingPeriodContext;
         $this->activityACLAwareRepository = $activityACLAwareRepository;
@@ -100,14 +106,81 @@ class ListActivitiesByAccompanyingPeriodContext implements
     public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
     {
         $this->accompanyingPeriodContext->buildPublicForm($builder, $template, $entity);
+
+        $builder
+            ->add('myActivitiesOnly', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.myActivitiesOnly',
+            ])
+            ->add('myWorksOnly', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.myWorksOnly',
+            ]);
     }
 
-    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
+    public function contextGenerationDataDenormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $denormalized = $this->accompanyingPeriodContext->contextGenerationDataDenormalize($template, $entity, $data);
+
+        foreach (['myActivitiesOnly', 'myWorksOnly'] as $k) {
+            $denormalized[$k] = $data[$k];
+        }
+
+        return $denormalized;
+    }
+
+    public function contextGenerationDataNormalize(DocGeneratorTemplate $template, $entity, array $data): array
+    {
+        $normalized = $this->accompanyingPeriodContext->contextGenerationDataNormalize($template, $entity, $data);
+
+        foreach (['myActivitiesOnly', 'myWorksOnly'] as $k) {
+            $normalized[$k] = $data[$k] ?? false;
+        }
+
+        return $normalized;
+    }
+
+    private function filterActivitiesByUser(array $activities, User $user): array
+    {
+        return array_filter(
+            $activities,
+            function ($activity) use ($user) {
+                $activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []);
+                return in_array($user->getUsername(), $activityUsernames, true);
+            }
+        );
+    }
+
+    private function filterWorksByUser(array $works, User $user): array
+    {
+        return array_filter(
+            $works,
+            function ($work) use ($user) {
+                $workUsernames = array_map(static fn ($user) => $user['username'], $work['referrers'] ?? []);
+
+                return in_array($user->getUsername(), $workUsernames, true);
+            }
+        );
+    }
+
+    public function getData(DocGeneratorTemplate $template, object $entity, array $contextGenerationData = []): array
     {
         $data = $this->accompanyingPeriodContext->getData($template, $entity, $contextGenerationData);
 
-        $data['activities'] = $this->getActivitiesSimplified($entity);
+        $activities = $this->getActivitiesSimplified($entity);
+        $myActivitiesOnly = $contextGenerationData['myActivitiesOnly'];
 
+        if ($myActivitiesOnly && isset($contextGenerationData['creator'])) {
+            $activities = $this->filterActivitiesByUser($activities, $contextGenerationData['creator']);
+        }
+
+        $data['activities'] = $activities;
+
+        $myWorksOnly = $contextGenerationData['myWorksOnly'];
+
+        if ($myWorksOnly && isset($contextGenerationData['creator'])) {
+            $data['course']['works'] = $this->filterWorksByUser($data['course']['works'], $contextGenerationData['creator']);
+        }
         return $data;
     }
 
@@ -143,7 +216,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
 
     public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool
     {
-        return $this->accompanyingPeriodContext->hasPublicForm($template, $entity);
+        return true;
     }
 
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void

src/Bundle/ChillActivityBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/ActivityUsersDateQueryPartForAccompanyingPeriodInfo.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class ActivityUsersDateQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'activity.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return Activity::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'activity.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'au.user_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'activity.date';
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'activity_date';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return '\'{}\'::jsonb';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'activity
+            LEFT JOIN activity_user au on activity.id = au.activity_id';
+    }
+
+    public function getWhereClause(): string
+    {
+        return 'activity.accompanyingperiod_id IS NOT NULL';
+    }
+}

src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php

@@ -13,13 +13,18 @@ namespace Chill\ActivityBundle\Templating\Entity;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
+use Chill\MainBundle\Templating\Entity\BoxUtilsChillEntityRenderTrait;
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 
 /**
  * Render activity reason.
+ *
+ * @implements ChillEntityRenderInterface<ActivityReason>
  */
-class ActivityReasonRender extends AbstractChillEntityRender
+class ActivityReasonRender implements ChillEntityRenderInterface
 {
+    use BoxUtilsChillEntityRenderTrait;
     /**
      * @var TranslatableStringHelper
      */
@@ -51,9 +56,6 @@ class ActivityReasonRender extends AbstractChillEntityRender
             $this->getDefaultClosingBox();
     }
 
-    /**
-     * @param ActivityReason $entity
-     */
     public function renderString($entity, array $options): string
     {
         $category = '';

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

@@ -121,14 +121,14 @@ final class ActivityControllerTest extends WebTestCase
             $client->getResponse()->getStatusCode(),
             'Unexpected HTTP status code for GET /activity/'
         );
-        $crawler = $client->click($crawler->selectLink('Ajouter une nouvelle activité')
+        $crawler = $client->click($crawler->selectLink('Ajouter un nouvel échange')
             ->link());
 
         $reason1 = $this->getRandomActivityReason();
         $reason2 = $this->getRandomActivityReason([$reason1->getId()]);
 
         // Fill in the form and submit it
-        $form = $crawler->selectButton('Ajouter une nouvelle activité')->form([
+        $form = $crawler->selectButton('Ajouter un nouvel échange')->form([
             'chill_activitybundle_activity' => [
                 'date' => '15-01-2015',
                 'durationTime' => 600,
@@ -152,9 +152,9 @@ final class ActivityControllerTest extends WebTestCase
         );
 
         // Edit the entity
-        $crawler = $client->click($crawler->selectLink("Modifier l'activité")->link());
+        $crawler = $client->click($crawler->selectLink("Modifier l'échange")->link());
 
-        $form = $crawler->selectButton("Sauver l'activité")->form([
+        $form = $crawler->selectButton("Sauver l'échange")->form([
             'chill_activitybundle_activity' => [
                 'date' => '25-01-2015',
                 //  'remark' => 'Foo'
@@ -234,7 +234,7 @@ final class ActivityControllerTest extends WebTestCase
         $user = new \Chill\MainBundle\Entity\User();
         $user
             ->setPassword($container->get('security.password_encoder')
-            ->encodePassword($user, 'password'))
+                ->encodePassword($user, 'password'))
             ->setUsername($username)
             ->addGroupCenter($groupCenter);
 
@@ -369,12 +369,8 @@ final class ActivityControllerTest extends WebTestCase
                 $center
             );
         $reachableScopesId = array_intersect(
-            array_map(static function ($s) {
-                return $s->getId();
-            }, $reachableScopesDelete),
-            array_map(static function ($s) {
-                return $s->getId();
-            }, $reachableScopesUpdate)
+            array_map(static fn ($s) => $s->getId(), $reachableScopesDelete),
+            array_map(static fn ($s) => $s->getId(), $reachableScopesUpdate)
         );
 
         if (count($reachableScopesId) === 0) {

src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php

@@ -112,9 +112,9 @@ final class ActivityTypeTest extends KernelTestCase
             'attendee' => true,
         ]]);
 
-//        var_dump($form->getErrors()->count()); var_dump($form->isValid());
-//        foreach($form->getErrors() as $e) { fwrite(STDOUT, var_dump($e->getMessage())); }
-//        var_dump($form->getErrors());
+        //        var_dump($form->getErrors()->count()); var_dump($form->isValid());
+        //        foreach($form->getErrors() as $e) { fwrite(STDOUT, var_dump($e->getMessage())); }
+        //        var_dump($form->getErrors());
 
         $this->assertTrue($form->isSynchronized(), 'Test the form is synchronized');
         $this->assertTrue($form->isValid(), 'test the form is valid');
@@ -188,9 +188,7 @@ final class ActivityTypeTest extends KernelTestCase
 
         // map all the values in an array
         $values = array_map(
-            static function ($choice) {
-                return $choice->value;
-            },
+            static fn ($choice) => $choice->value,
             $view['activity']['durationTime']->vars['choices']
         );
 

src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php

@@ -79,15 +79,13 @@ final class TranslatableActivityReasonTest extends TypeTestCase
         $request = $prophet->prophesize();
         $translator = $prophet->prophesize();
 
-        $request->willExtend('Symfony\Component\HttpFoundation\Request');
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn($fallbackLocale);
 
-        $requestStack->willExtend('Symfony\Component\HttpFoundation\RequestStack');
-        $requestStack->getCurrentRequest()->will(static function () use ($request) {
-            return $request;
-        });
+        $requestStack->willExtend(\Symfony\Component\HttpFoundation\RequestStack::class);
+        $requestStack->getCurrentRequest()->will(static fn () => $request);
 
-        $translator->willExtend('Symfony\Component\Translation\Translator');
+        $translator->willExtend(\Symfony\Component\Translation\Translator::class);
         $translator->getFallbackLocales()->willReturn($locale);
 
         return new TranslatableStringHelper(

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

@@ -160,7 +160,7 @@ final class ActivityVoterTest extends KernelTestCase
     {
         $token = $this->prophet->prophesize();
         $token
-            ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+            ->willImplement('\\' . \Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class);
 
         if (null === $user) {
             $token->getUser()->willReturn(null);

src/Bundle/ChillActivityBundle/config/services.yaml

@@ -34,6 +34,7 @@ services:
         resource: '../Validator/Constraints/'
 
     Chill\ActivityBundle\Service\DocGenerator\:
-        autowire: true
-        autoconfigure: true
         resource: '../Service/DocGenerator/'
+
+    Chill\ActivityBundle\Service\EntityInfo\:
+        resource: '../Service/EntityInfo/'

src/Bundle/ChillActivityBundle/config/services/export.yaml

@@ -79,6 +79,11 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'accompanyingcourse_activitytype_filter' }
 
+    chill.activity.export.location_filter:
+        class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_location_filter' }
+
     chill.activity.export.locationtype_filter:
         class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter
         tags:

src/Bundle/ChillActivityBundle/translations/messages.fr.yml

@@ -1,41 +1,41 @@
 #general
-Show the activity: Voir l'activité
-Edit the activity: Modifier l'activité
-Activity: Activité
+Show the activity: Voir l'échange
+Edit the activity: Modifier l'échange
+Activity: Échange
 Duration time: Durée
 Duration Time: Durée
 durationTime:  durée
 Travel time: Durée de déplacement
-Attendee: Présence de la personne
-attendee: présence de la personne
+Attendee: Présence de l'usager
+attendee: présence de l'usager
 list_reasons: liste des sujets
 user_username: nom de l'utilisateur
 circle_name: nom du cercle
 Remark: Commentaire
 No comments: Aucun commentaire
-Add a new activity: Ajouter une nouvelle activité
-Activity list: Liste des activités
+Add a new activity: Ajouter une nouvel échange
+Activity list: Liste des échanges
 present: présent
 not present: absent
 Delete: Supprimer
 Update: Mettre à jour
-Update activity: Modifier l'activité
+Update activity: Modifier l'échange
 Scope: Cercle
-Activity data: Données de l'activité
-Activity location: Localisation de l'activité
+Activity data: Données de l'échange
+Activity location: Localisation de l'échange
 No reason associated: Aucun sujet
 No social issues associated: Aucune problématique sociale
 No social actions associated: Aucune action d'accompagnement
-There isn't any activities.: Aucune activité enregistrée.
-type_name: type de l'activité
+There isn't any activities.: Aucun échange enregistré.
+type_name: type de l'échange
 person_firstname: prénom
 person_lastname: nom de famille
-person_id: identifiant de la personne
+person_id: identifiant de l'usager
 Type: Type
 Invisible: Invisible
 Optional: Optionnel
 Required: Obligatoire
-Persons: Personnes
+Persons: Usagers
 Users: Utilisateurs
 Emergency: Urgent
 Sent received: Entrant / Sortant
@@ -50,10 +50,10 @@ received: Reçu
 
 
 #forms
-Activity creation: Nouvelle activité
+Activity creation: Nouvel échange
 Create: Créer
 Back to the list: Retour à la liste
-Save activity: Sauver l'activité
+Save activity: Sauver l'échange
 Reset form: Remise à zéro du formulaire
 Choose the duration: Choisir la durée
 Choose a type: Choisir un type
@@ -77,7 +77,7 @@ Choose a type: Choisir un type
 4 hours: 4 heures
 4 hours 30: 4 heures 30
 5 hours: 5 heures
-Concerned groups: Parties concernées
+Concerned groups: Parties concernées par l'échange
 Persons in accompanying course: Usagers du parcours
 Third persons: Tiers non-pro.
 Others persons: Usagers
@@ -90,47 +90,50 @@ activity:
 No documents: Aucun document
 
 #timeline
-'%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
+'%user% has done an %activity_type%': '%user% a effectué un échange de type "%activity_type%"'
 
 #controller
-'Success : activity created!': L'activité a été créée.
-'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'activité n'a pas été créée.
-'Success : activity updated!': L'activité a été mise à jour.
-'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'activité n'a pas été mise à jour.
+'Success : activity created!': L'échange a été créé.
+'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'échange n'a pas été créé.
+'Success : activity updated!': L'échange a été mis à jour.
+'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'échange n'a pas été mise à jour.
 
 # ROLES
-CHILL_ACTIVITY_CREATE: Créer une activité
-CHILL_ACTIVITY_UPDATE: Modifier une activité
-CHILL_ACTIVITY_SEE: Voir une activité
-CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des activités
-CHILL_ACTIVITY_DELETE: Supprimer une activité
-CHILL_ACTIVITY_STATS: Statistique des activités
-CHILL_ACTIVITY_LIST: Liste des activités
+CHILL_ACTIVITY_CREATE: Créer un échange
+CHILL_ACTIVITY_UPDATE: Modifier un échange
+CHILL_ACTIVITY_SEE: Voir un échange
+CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des échanges
+CHILL_ACTIVITY_DELETE: Supprimer un échange
+CHILL_ACTIVITY_STATS: Statistique des échanges
+CHILL_ACTIVITY_LIST: Liste des échanges
+CHILL_ACTIVITY_CREATE_PERSON: Créer un échange lié à un usager
+CHILL_ACTIVITY_CREATE_ACCOMPANYING_COURSE: Créer un échange lié à un parcours
+CHILL_ACTIVITY_FULL: Voir les détails, créer, supprimer et mettre à jour un échange
 
 # admin
-Activities: Activités
-Activity configuration: Configuration des activités
-Activity configuration menu: Configuration des activités
-Activity types: Types d'activité
-Activity type configuration: Configuration des categories d'activités
-Activity Reasons: Sujets d'une activité
-Activity Reasons Category: Catégories de sujet d'activités
-Activity Types Categories: Catégories des types d'activité
-Activity Presences: Presences aux activités
+Activities: Échanges
+Activity configuration: Configuration des échanges
+Activity configuration menu: Configuration des échanges
+Activity types: Types d'échange
+Activity type configuration: Configuration des catégories d'échanges
+Activity Reasons: Sujets d'un échange
+Activity Reasons Category: Catégories de sujet d'échanges
+Activity Types Categories: Catégories des types d'échange
+Activity Presences: Présences aux échanges
 Associated activity reason category is inactive: La catégorie de sujet attachée est inactive
 
 
 # Crud
 crud:
     activity_type:
-        title_new: Nouveau type d'activité
-        title_edit: Edition d'un type d'activité
+        title_new: Nouveau type d'échange
+        title_edit: Édition d'un type d'échange
     activity_type_category:
-        title_new: Nouvelle catégorie de type d'activité
-        title_edit: Edition d'une catégorie de type d'activité
+        title_new: Nouvelle catégorie de type d'échange
+        title_edit: Édition d'une catégorie de type d'échange
     activity_presence:
-        title_new: Nouvelle Présence aux activités
-        title_edit: Edition d'une Présence aux activités
+        title_new: Nouvelle présence aux échanges
+        title_edit: Édition d'une présence aux échanges
 
 # activity reason admin
 ActivityReason list: Liste des sujets
@@ -139,7 +142,7 @@ Active: Actif
 Category: Catégorie
 ActivityReason creation: Nouveau sujet
 ActivityReason edit: Modification d'un sujet
-ActivityReason: Sujet d'activité
+ActivityReason: Sujet d'échange
 The entity is inactive and won't be proposed: Le sujet est inactif et ne sera pas proposé
 The entity is active and will be proposed: Le sujet est actif et sera proposé
 
@@ -148,19 +151,19 @@ ActivityReasonCategory list: Catégories de sujets
 Create a new activity category reason: Créer une nouvelle catégorie
 ActivityReasonCategory creation: Nouvelle catégorie de sujet
 ActivityReasonCategory edit: Modification d'une catégorie de sujet
-ActivityReasonCategory: Catégorie de sujet d'activité
+ActivityReasonCategory: Catégorie de sujet d'échange
 ActivityReasonCategory is active and will be proposed: La catégorie est active et sera proposée
 ActivityReasonCategory is inactive and won't be proposed: La catégorie est inactive et ne sera pas proposée
 
 #activity presence admin
-ActivityPresence list: Liste des Présences aux activités
-Create a new activity presence: Créer une nouvelle "Présence aux activités"
+ActivityPresence list: Liste des présences aux échanges
+Create a new activity presence: Créer une nouvelle "Présence aux échanges"
 
 # activity type type admin
-ActivityType list: Types d'activités
-Create a new activity type: Créer un nouveau type d'activité
-Persons visible: Visibilité du champ Personnes
-Persons label: Libellé du champ Personnes
+ActivityType list: Types d'échanges
+Create a new activity type: Créer un nouveau type d'échange
+Persons visible: Visibilité du champ Usagers
+Persons label: Libellé du champ Usagers
 User visible: Visibilité du champ Utilisateur
 User label: Libellé du champ Utilisateur
 Date visible: Visibilité du champ Date
@@ -183,8 +186,8 @@ Private comment visible: Visibilité du champ Commentaire Privé
 Private comment label: Libellé du champ Commentaire Privé
 Emergency visible: Visibilité du champ Urgent
 Emergency label: Libellé du champ Urgent
-Accompanying period visible: Visibilité du champ Période d'accompagnement
-Accompanying period label: Libellé du champ Période d'accompagnement
+Accompanying period visible: Visibilité du champ parcours d'accompagnement
+Accompanying period label: Libellé du champ parcours d'accompagnement
 Social issues visible: Visibilité du champ Problématiques sociales
 Social issues label: Libellé du champ Problématiques sociales
 Social actions visible: Visibilité du champ Action sociale
@@ -197,136 +200,140 @@ Documents visible: Visibilité du champ Documents
 Documents label: Libellé du champ Documents
 
 # activity type category admin
-ActivityTypeCategory list: Liste des catégories des types d'activité
-Create a new activity type category: Créer une nouvelle catégorie de type d'activité
+ActivityTypeCategory list: Liste des catégories des types d'échange
+Create a new activity type category: Créer une nouvelle catégorie de type d'échange
 
 # activity delete
-Remove activity: Supprimer une activité
-Are you sure you want to remove the activity about "%name%" ?: Êtes-vous sûr de vouloir supprimer une activité qui concerne "%name%" ?
-The activity has been successfully removed.: L'activité a été supprimée.
+Remove activity: Supprimer un échange
+Are you sure you want to remove the activity about "%name%" ?: Êtes-vous sûr de vouloir supprimer un échange qui concerne "%name%" ?
+The activity has been successfully removed.: L'échange a été supprimé.
 
 # exports
-Exports of activities linked to a person: Exports des activités liées à une personne
-Number of activities linked to a person: Nombre d'activités liées à une personne
-Count activities linked to a person: Nombre d'activités
-Count activities linked to a person by various parameters.: Compte le nombre d'activités enregistrées et liées à une personne en fonction de différents paramètres.
-Sum activity linked to a person duration: Durée des activités
-Sum activities linked to a person duration: Durée des activités liés à un usager
-Sum activities linked to a person duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
-List activity linked to a person: Liste les activités
-List activities linked to a person: Liste des activités liés à un usager
-List activities linked to a person description: Crée la liste des activités en fonction de différents paramètres.
+Exports of activities linked to a person: Exports des échanges liés à un usager
+Number of activities linked to a person: Nombre d'échanges liés à un usager
+Count activities linked to a person: Nombre d'échanges
+Count activities linked to a person by various parameters.: Compte le nombre d'échanges enregistrés et liés à un usager en fonction de différents paramètres.
+Sum activity linked to a person duration: Durée des échanges
+Sum activities linked to a person duration: Durée des échanges liés à un usager
+Sum activities linked to a person duration by various parameters.: Additionne la durée des échanges en fonction de différents paramètres.
+List activity linked to a person: Liste les échanges
+List activities linked to a person: Liste des échanges liés à un usager
+List activities linked to a person description: Crée la liste des échanges en fonction de différents paramètres.
 
-Exports of activities linked to an accompanying period: Exports des activités liées à un parcours
-Number of activities linked to an accompanying period: Nombre d'activités liées à un parcours
-Count activities linked to an accompanying period: Nombre d'activités
-Count activities linked to an accompanying period by various parameters.: Compte le nombre d'activités enregistrées et liées à un parcours en fonction de différents paramètres.
-Sum activity linked to an accompanying period duration: Somme de la durée des activités
-Sum activities linked to an accompanying period duration: Somme de la durée des activités liées à un parcours
-Sum activities linked to an accompanying period duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
-Sum activity linked to an accompanying period visit duration: Somme de la durée de déplacement des activités
-Sum activities linked to an accompanying period visit duration: Somme de la durée de déplacement des activités liées à un parcours
-Sum activities linked to an accompanying period visit duration by various parameters.: Additionne la durée de déplacement des activités en fonction de différents paramètres.
-Average activity linked to an accompanying period duration: Moyenne de la durée des activités
-Average activities linked to an accompanying period duration: Moyenne de la durée des activités liées à un parcours
-Average activities linked to an accompanying period duration by various parameters.: Moyenne de la durée des activités en fonction de différents paramètres.
-Average activity linked to an accompanying period visit duration: Moyenne de la durée de déplacement des activités
-Average activities linked to an accompanying period visit duration: Moyenne de la durée de déplacement des activités liées à un parcours
-Average activities linked to an accompanying period visit duration by various parameters.: Moyenne de la durée de déplacement des activités en fonction de différents paramètres.
+Exports of activities linked to an accompanying period: Exports des échanges liés à un parcours
+Number of activities linked to an accompanying period: Nombre d'échanges liés à un parcours
+Count activities linked to an accompanying period: Nombre d'échanges
+Count activities linked to an accompanying period by various parameters.: Compte le nombre d'échanges enregistrés et liées à un parcours en fonction de différents paramètres.
+Sum activity linked to an accompanying period duration: Somme de la durée des échanges
+Sum activities linked to an accompanying period duration: Somme de la durée des échanges liés à un parcours
+Sum activities linked to an accompanying period duration by various parameters.: Additionne la durée des échanges en fonction de différents paramètres.
+Sum activity linked to an accompanying period visit duration: Somme de la durée de déplacement des échanges
+Sum activities linked to an accompanying period visit duration: Somme de la durée de déplacement des échanges liés à un parcours
+Sum activities linked to an accompanying period visit duration by various parameters.: Additionne la durée de déplacement des échanges en fonction de différents paramètres.
+Average activity linked to an accompanying period duration: Moyenne de la durée des échanges
+Average activities linked to an accompanying period duration: Moyenne de la durée des échanges liés à un parcours
+Average activities linked to an accompanying period duration by various parameters.: Moyenne de la durée des échanges en fonction de différents paramètres.
+Average activity linked to an accompanying period visit duration: Moyenne de la durée de déplacement des échanges
+Average activities linked to an accompanying period visit duration: Moyenne de la durée de déplacement des échanges liés à un parcours
+Average activities linked to an accompanying period visit duration by various parameters.: Moyenne de la durée de déplacement des échanges en fonction de différents paramètres.
 
 #filters
-Filter by reason: Filtrer les activités par sujet
+Filter by reason: Filtrer les échanges par sujet
 'Filtered by reasons: only %list%': 'Filtré par sujet: seulement %list%'
-'Filtered by activity type: only %list%': "Filtré par type d'activité: uniquement %list%"
-Filtered by date activity: Filtrer les activités par date
-Activities after this date: Activités après cette date
-Activities before this date: Activités avant cette date
-"Filtered by date of activity: only between %date_from% and %date_to%": "Filtré par date de l'activité: uniquement entre %date_from% et %date_to%"
-This date should be after the date given in "Implied in an activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "activités après cette date"
+'Filtered by activity type: only %list%': "Filtré par type d'échange: uniquement %list%"
+Filtered by date activity: Filtrer les échanges par date
+Activities after this date: Échanges après cette date
+Activities before this date: Échanges avant cette date
+"Filtered by date of activity: only between %date_from% and %date_to%": "Filtré par date de l'échange: uniquement entre %date_from% et %date_to%"
+This date should be after the date given in "Implied in an activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "échanges après cette date"
 
-Filtered by person having an activity in a period: Uniquement les personnes ayant eu une activité dans la période donnée
-Implied in an activity after this date: Impliqué dans une activité après cette date
-Implied in an activity before this date: Impliqué dans une activité avant cette date
-Filtered by person having an activity between %date_from% and %date_to% with reasons %reasons_name%: Filtré par personnes associées à une activité entre %date_from% et %date_to% avec les sujets %reasons_name%
-Activity reasons for those activities: Sujets de ces activités
+Filtered by person having an activity in a period: Uniquement les usagers ayant eu un échange dans la période donnée
+Implied in an activity after this date: Impliqué dans un échange après cette date
+Implied in an activity before this date: Impliqué dans un échange avant cette date
+Filtered by person having an activity between %date_from% and %date_to% with reasons %reasons_name%: Filtré par usager associées à un échange entre %date_from% et %date_to% avec les sujets %reasons_name%
+Activity reasons for those activities: Sujets de ces échanges
 
-Filter by activity type: Filtrer les activités par type
+Filter by activity type: Filtrer les échanges par type
 
-Filter activity by locationtype: Filtrer les activités par type de localisation
+Filter activity by location: Filtrer les échanges par localisation
+'Filtered activity by location: only %locations%': "Filtré par localisation: uniquement %locations%"
+Filter activity by locationtype: Filtrer les échanges par type de localisation
 'Filtered activity by locationtype: only %types%': "Filtré par type de localisation: uniquement %types%"
 Accepted locationtype: Types de localisation
 Accepted users: TMS(s)
-Filter activity by emergency: Filtrer les activités par urgence
+Filter activity by emergency: Filtrer les échanges par urgence
 'Filtered activity by emergency: only %emergency%': "Filtré par urgence: uniquement si %emergency%"
-activity is emergency: l'activité est urgente
-activity is not emergency: l'activité n'est pas urgente
-Filter activity by sentreceived: Filtrer les activités par envoyé/reçu
+activity is emergency: l'échange est urgent
+activity is not emergency: l'échange n'est pas urgent
+Filter activity by sentreceived: Filtrer les échanges par envoyé/reçu
 'Filtered activity by sentreceived: only %sentreceived%': "Filtré par envoyé/reçu: uniquement %sentreceived%"
 Accepted sentreceived: ''
-Filter activity by linked socialaction: Filtrer les activités par action liée
+Filter activity by linked socialaction: Filtrer les échanges par action liée
 'Filtered activity by linked socialaction: only %actions%': "Filtré par action liée: uniquement %actions%"
-Filter activity by linked socialissue: Filtrer les activités par problématique liée
+Filter activity by linked socialissue: Filtrer les échanges par problématique liée
 'Filtered activity by linked socialissue: only %issues%': "Filtré par problématique liée: uniquement %issues%"
-Filter activity by user: Filtrer les activités par créateur
-Filter activity by users: Filtrer les activités par utilisateur participant
-Filter activity by creator: Filtrer les activités par créateur de l'échange
+Filter activity by user: Filtrer les échanges par créateur
+Filter activity by users: Filtrer les échanges par utilisateur participant
+Filter activity by creator: Filtrer les échanges par créateur de l'échange
 'Filtered activity by user: only %users%': "Filtré par référent: uniquement %users%"
 'Filtered activity by users: only %users%': "Filtré par utilisateurs participants: uniquement %users%"
 'Filtered activity by creator: only %users%': "Filtré par créateur: uniquement %users%"
 Creators: Créateurs
-Filter activity by userscope: Filtrer les activités par service du créateur
+Filter activity by userscope: Filtrer les échanges par service du créateur
 'Filtered activity by userscope: only %scopes%': "Filtré par service du créateur: uniquement %scopes%"
 Accepted userscope: Services
 
-Filter acp which has no activity: Filtrer les parcours qui n’ont pas d’activité
-Filtered acp which has no activities: Filtrer les parcours sans activité associée
-Group acp by activity number: Grouper les parcours par nombre d’activité
+Filter acp which has no activity: Filtrer les parcours qui n’ont pas d’échange
+Filtered acp which has no activities: Filtrer les parcours sans échange associé
+Group acp by activity number: Grouper les parcours par nombre d’échange
 
 #aggregators
-Activity type: Type d'activité
-Activity user: Utilisateur lié à l'activité
+Activity type: Type d'échange
+Activity user: Utilisateur lié à l'échange
 By reason: Par sujet
 By category of reason: Par catégorie de sujet
 Reason's level: Niveau du sujet
-Group by reasons: Sujet d'activité
-Aggregate by activity user: Grouper les activités par référent
-Aggregate by activity users: Grouper les activités par utilisateurs participants
-Aggregate by activity type: Grouper les activités par type
-Aggregate by activity reason: Grouper les activités par sujet
-Aggregate by users scope: Grouper les activités par service principal de l'utilisateur
-Users 's scope: Service principal des utilisateurs participants à l'activité
-Aggregate by users job: Grouper les activités par métier des utilisateurs participants
-Users 's job: Métier des utilisateurs participants à l'activité
+Group by reasons: Sujet d'échange
+Aggregate by activity user: Grouper les échanges par référent
+Aggregate by activity users: Grouper les échanges par utilisateurs participants
+Aggregate by activity type: Grouper les échanges par type
+Aggregate by activity reason: Grouper les échanges par sujet
+Aggregate by users scope: Grouper les échanges par service principal de l'utilisateur
+Users 's scope: Service principal des utilisateurs participants à l'échange
+Aggregate by users job: Grouper les échanges par métier des utilisateurs participants
+Users 's job: Métier des utilisateurs participants à l'échange
 
-Group activity by locationtype: Grouper les activités par type de localisation
-Group activity by date: Grouper les activités par date
+Group activity by locationtype: Grouper les échanges par type de localisation
+Group activity by date: Grouper les échanges par date
 Frequency: Fréquence
 by month: Par mois
 by week: Par semaine
 for week: Semaine
 by year: Par année
 in year: En
-Group activity by creator: Grouper les activités par créateur de l'échange
-Group activity by creator scope: Grouper les activités par service du créateur de l'échange
-Group activity by linked thirdparties: Grouper les activités par tiers impliqué
+Group activity by creator: Grouper les échanges par créateur de l'échange
+Group activity by creator scope: Grouper les échanges par service du créateur de l'échange
+Group activity by linked thirdparties: Grouper les échanges par tiers impliqué
 Accepted thirdparty: Tiers impliqué
-Group activity by linked socialaction: Grouper les activités par action liée
-Group activity by linked socialissue: Grouper les activités par problématique liée
-Group activity by userscope: Grouper les activités par service du créateur
+Group activity by linked socialaction: Grouper les échanges par action liée
+Group activity by linked socialissue: Grouper les échanges par problématique liée
+Group activity by userscope: Grouper les échanges par service du créateur
 
-Last activities: Les dernières activités
+Last activities: Les derniers échanges
 
-See activity in accompanying course context: Voir l'activité dans le contexte du parcours d'accompagnement
+See activity in accompanying course context: Voir l'échange dans le contexte du parcours d'accompagnement
 
-You get notified of an activity which does not exists any more: Cette notification ne correspond pas à une activité valide.
-you are not allowed to see it details: La notification fait référence à une activité à laquelle vous n'avez pas accès.
-This is the minimal activity data: Activité n°
+You get notified of an activity which does not exists any more: Cette notification ne correspond pas à un échange valide.
+you are not allowed to see it details: La notification fait référence à un échange auquel vous n'avez pas accès.
+This is the minimal activity data: Échange n°
 
 docgen:
-    Activity basic: Echange
-    A basic context for activity: Contexte pour les activités
-    Accompanying period with a list of activities: Parcours d'accompagnement avec liste des activités
-    Accompanying period with a list of activities description: Ce contexte reprend les informations du parcours, et tous les activités pour un parcours. Les activités ne sont pas filtrés.
+    Activity basic: Échange
+    A basic context for activity: Contexte pour les échanges
+    Accompanying period with a list of activities: Parcours d'accompagnement avec liste des échanges
+    Accompanying period with a list of activities description: Ce contexte reprend les informations du parcours, et tous les échanges pour un parcours. Les échanges ne sont pas filtrés.
+    myActivitiesOnly: Prendre en compte uniquement les échanges dans lesquels je suis intervenu
+    myWorksOnly: Prendre en compte uniquement les actions d'accompagnement dont je suis référent
 
 export:
     list:
@@ -334,10 +341,10 @@ export:
             users name: Nom des utilisateurs
             users ids: Identifiant des utilisateurs
             third parties ids: Identifiant des tiers
-            persons ids: Identifiant des personnes
-            persons name: Nom des personnes
+            persons ids: Identifiant des usagers
+            persons name: Nom des usagers
             thirds parties: Tiers
-            date: Date de l'activité
+            date: Date de l'échange
             locationName: Localisation
             sent received: Envoyé ou reçu
             emergency: Urgence
@@ -346,17 +353,17 @@ export:
             travelTime: Durée de déplacement
             durationTime: Durée
             id: Identifiant
-            List activities linked to an accompanying course: Liste les activités liées à un parcours en fonction de différents filtres.
-            List activity linked to a course: Liste des activités liées à un parcours
+            List activities linked to an accompanying course: Liste les échanges liés à un parcours en fonction de différents filtres.
+            List activity linked to a course: Liste des échanges liés à un parcours
 
 
     filter:
         activity:
             by_usersjob:
-                Filter by users job: Filtrer les activités par métier d'au moins un utilisateur participant
+                Filter by users job: Filtrer les échanges par métier d'au moins un utilisateur participant
                 'Filtered activity by users job: only %jobs%': 'Filtré par métier d''au moins un utilisateur participant: seulement %jobs%'
             by_usersscope:
-                Filter by users scope: Filtrer les activités par services d'au moins un utilisateur participant
+                Filter by users scope: Filtrer les échanges par services d'au moins un utilisateur participant
                 'Filtered activity by users scope: only %scopes%': 'Filtré par service d''au moins un utilisateur participant: seulement %scopes%'
     aggregator:
         activity:
@@ -364,4 +371,4 @@ export:
                 Sent or received: Envoyé ou reçu
                 is sent: envoyé
                 is received: reçu
-                Group activity by sentreceived: Grouper les activités par envoyé / reçu
+                Group activity by sentreceived: Grouper les échanges par envoyé / reçu

src/Bundle/ChillActivityBundle/translations/messages.nl.yaml

@@ -47,10 +47,10 @@ Reasons: Onderwerpen
 
 
 #forms
-Activity creation: Nouvelle activité
+Activity creation: Nouvel échange
 Create: Créer
 Back to the list: Retour à la liste
-Save activity: Sauver l'activité
+Save activity: Sauver l'échange
 Reset form: Remise à zéro du formulaire
 Choose the duration: Choisir la durée
 Choose a type: Choisir un type
@@ -79,43 +79,43 @@ activity:
 No documents: Aucun document
 
 #timeline
-'%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
+'%user% has done an %activity_type%': '%user% a effectué un échange de type "%activity_type%"'
 
 #controller
-'Success : activity created!': L'activité a été créée.
-'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'activité n'a pas été créée.
-'Success : activity updated!': L'activité a été mise à jour.
-'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'activité n'a pas été mise à jour.
+'Success : activity created!': L'échange a été créé.
+'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'échange n'a pas été créé.
+'Success : activity updated!': L'échange a été mis à jour.
+'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'échange n'a pas été mis à jour.
 
 # ROLES
-CHILL_ACTIVITY_CREATE: Créer une activité
-CHILL_ACTIVITY_UPDATE: Modifier une activité
-CHILL_ACTIVITY_SEE: Voir une activité
-CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des activités
-CHILL_ACTIVITY_DELETE: Supprimer une activité
-CHILL_ACTIVITY_STATS: Statistique des activités
-CHILL_ACTIVITY_LIST: Liste des activités
+CHILL_ACTIVITY_CREATE: Créer un échange
+CHILL_ACTIVITY_UPDATE: Modifier un échange
+CHILL_ACTIVITY_SEE: Voir un échange
+CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des échanges
+CHILL_ACTIVITY_DELETE: Supprimer un échange
+CHILL_ACTIVITY_STATS: Statistique des échanges
+CHILL_ACTIVITY_LIST: Liste des échanges
 
 # admin
-Activities: Activités
-Activity configuration: Configuration des activités
-Activity configuration menu: Configuration des activités
-Activity types: Types d'activité
-Activity type configuration: Configuration des categories d'activités
-Activity Reasons: Sujets d'une activité
-Activity Reasons Category: Catégories de sujet d'activités
-Activity Types Categories: Catégories des types d'activité
-Activity Presences: Presences des activités
+Activities: Échanges
+Activity configuration: Configuration des échanges
+Activity configuration menu: Configuration des échanges
+Activity types: Types d'échange
+Activity type configuration: Configuration des categories d'échanges
+Activity Reasons: Sujets d'un échange
+Activity Reasons Category: Catégories de sujet d'échanges
+Activity Types Categories: Catégories des types d'échanges
+Activity Presences: Presences des échanges
 
 
 # Crud
 crud:
   activity_type:
-    title_new: Nouveau type d'activité
-    title_edit: Edition d'un type d'activité
+    title_new: Nouveau type d'échange
+    title_edit: Edition d'un type d'échange
   activity_type_category:
-    title_new: Nouvelle catégorie de type d'activité
-    title_edit: Edition d'une catégorie de type d'activité
+    title_new: Nouvelle catégorie de type d'échange
+    title_edit: Edition d'une catégorie de type d'échange
 
 # activity reason admin
 ActivityReason list: Liste des sujets
@@ -124,7 +124,7 @@ Active: Actif
 Category: Catégorie
 ActivityReason creation: Nouveau sujet
 ActivityReason edit: Modification d'un sujet
-ActivityReason: Sujet d'activité
+ActivityReason: Sujet d'échange
 The entity is inactive and won't be proposed: Le sujet est inactif et ne sera pas proposé
 The entity is active and will be proposed: Le sujet est actif et sera proposé
 
@@ -133,13 +133,13 @@ ActivityReasonCategory list: Catégories de sujets
 Create a new activity category reason: Créer une nouvelle catégorie
 ActivityReasonCategory creation: Nouvelle catégorie de sujet
 ActivityReasonCategory edit: Modification d'une catégorie de sujet
-ActivityReasonCategory: Catégorie de sujet d'activité
+ActivityReasonCategory: Catégorie de sujet d'échange
 ActivityReasonCategory is active and will be proposed: La catégorie est active et sera proposée
 ActivityReasonCategory is inactive and won't be proposed: La catégorie est inactive et ne sera pas proposée
 
 # activity type type admin
-ActivityType list: Types d'activités
-Create a new activity type: Créer un nouveau type d'activité
+ActivityType list: Types d'échanges
+Create a new activity type: Créer un nouveau type d'échange
 Persons visible: Visibilité du champ Personnes
 Persons label: Libellé du champ Personnes
 User visible: Visibilité du champ Utilisateur
@@ -177,20 +177,20 @@ Documents label: Libellé du champ Documents
 
 # activity type category admin
 ActivityTypeCategory list: Liste des catégories des types d'activité
-Create a new activity type category: Créer une nouvelle catégorie de type d'activité
+Create a new activity type category: Créer une nouvelle catégorie de type d'échange
 
 # activity delete
-Remove activity: Supprimer une activité
-Are you sure you want to remove the activity about "%name%" ?: Êtes-vous sûr de vouloir supprimer une activité qui concerne "%name%" ?
-The activity has been successfully removed.: L'activité a été supprimée.
+Remove activity: Supprimer un échange
+Are you sure you want to remove the activity about "%name%" ?: Êtes-vous sûr de vouloir supprimer un échange qui concerne "%name%" ?
+The activity has been successfully removed.: L'échange a été supprimée.
 
 # exports
-Count activities: Nombre d'activités
-Count activities by various parameters.: Compte le nombre d'activités enregistrées en fonction de différents paramètres.
-Sum activity duration: Total de la durée des activités
-Sum activities duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
-List activities: Liste les activités
-Number of activities: Nombre d'activités
+Count activities: Nombre d'échanges
+Count activities by various parameters.: Compte le nombre d'échanges enregistrées en fonction de différents paramètres.
+Sum activity duration: Total de la durée des échanges
+Sum activities duration by various parameters.: Additionne la durée des échanges en fonction de différents paramètres.
+List activities: Liste les échanges
+Number of activities: Nombre d'échanges
 
 #filters
 Filter by reason: Filtrer par sujet d'activité

src/Bundle/ChillActivityBundle/translations/validators.fr.yml

@@ -1,22 +1,22 @@
 The reasons's level should not be empty: Le niveau du sujet ne peut pas être vide
 At least one reason must be choosen: Au moins un sujet doit être choisi
-For this type of activity, you must add at least one person: Pour ce type d'activité, vous devez ajouter au moins un usager
-For this type of activity, you must add at least one user: Pour ce type d'activité, vous devez ajouter au moins un utilisateur
-For this type of activity, you must add at least one third party: Pour ce type d'activité, vous devez ajouter au moins un tiers
-For this type of activity, user is required: Pour ce type d'activité, l'utilisateur est requis
-For this type of activity, date is required: Pour ce type d'activité, la date est requise
-For this type of activity, location is required: Pour ce type d'activité, la localisation est requise
-For this type of activity, attendee is required: Pour ce type d'activité, le champ "Présence de la personne" est requis
-For this type of activity, duration time is required: Pour ce type d'activité, la durée est requise
-For this type of activity, travel time is required: Pour ce type d'activité, la durée du trajet est requise
-For this type of activity, reasons is required: Pour ce type d'activité, le champ "sujet" est requis
-For this type of activity, comment is required: Pour ce type d'activité, un commentaire est requis
-For this type of activity, sent/received is required: Pour ce type d'activité, le champ Entrant/Sortant est requis
-For this type of activity, document is required: Pour ce type d'activité, un document est requis
-For this type of activity, emergency is required: Pour ce type d'activité, le champ "Urgent" est requis
-For this type of activity, accompanying period is required: Pour ce type d'activité, le parcours d'accompagnement est requis
-For this type of activity, you must add at least one social issue: Pour ce type d'activité, vous devez ajouter au moins une problématique sociale
-For this type of activity, you must add at least one social action: Pour ce type d'activité, vous devez indiquer au moins une action sociale
+For this type of activity, you must add at least one person: Pour ce type d'échange, vous devez ajouter au moins un usager
+For this type of activity, you must add at least one user: Pour ce type d'échange, vous devez ajouter au moins un utilisateur
+For this type of activity, you must add at least one third party: Pour ce type d'échange, vous devez ajouter au moins un tiers
+For this type of activity, user is required: Pour ce type d'échange, l'utilisateur est requis
+For this type of activity, date is required: Pour ce type d'échange, la date est requise
+For this type of activity, location is required: Pour ce type d'échange, la localisation est requise
+For this type of activity, attendee is required: Pour ce type d'échange, le champ "Présence de l'usager" est requis
+For this type of activity, duration time is required: Pour ce type d'échange, la durée est requise
+For this type of activity, travel time is required: Pour ce type d'échange, la durée du trajet est requise
+For this type of activity, reasons is required: Pour ce type d'échange, le champ "sujet" est requis
+For this type of activity, comment is required: Pour ce type d'échange, un commentaire est requis
+For this type of activity, sent/received is required: Pour ce type d'échange, le champ Entrant/Sortant est requis
+For this type of activity, document is required: Pour ce type d'échange, un document est requis
+For this type of activity, emergency is required: Pour ce type d'échange, le champ "Urgent" est requis
+For this type of activity, accompanying period is required: Pour ce type d'échange, le parcours d'accompagnement est requis
+For this type of activity, you must add at least one social issue: Pour ce type d'échange, vous devez ajouter au moins une problématique sociale
+For this type of activity, you must add at least one social action: Pour ce type d'échange, vous devez indiquer au moins une action sociale
 
 # admin
 This parameter must be equal to social issue parameter: Ce paramètre doit être égal au paramètre "Visibilité du champs Problématiques sociales"

src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php

@@ -55,7 +55,7 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
                     $this->getReference('aside_activity_category_0')
                 )
                 ->setDate((new DateTimeImmutable('today'))
-                ->sub(new DateInterval('P' . random_int(1, 100) . 'D')));
+                    ->sub(new DateInterval('P' . random_int(1, 100) . 'D')));
 
             $manager->persist($activity);
         }

src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php

@@ -22,7 +22,7 @@ class Configuration implements ConfigurationInterface
     {
         $treeBuilder = new TreeBuilder('chill_aside_activity');
 
-        $treeBuilder->getRootNode('chill_aside_activity')
+        $treeBuilder->getRootNode()
             ->children()
             ->arrayNode('form')
             ->canBeEnabled()
@@ -132,9 +132,7 @@ class Configuration implements ConfigurationInterface
             ->info('The number of seconds of this duration. Must be an integer.')
             ->cannotBeEmpty()
             ->validate()
-            ->ifTrue(static function ($data) {
-                return !is_int($data);
-            })->thenInvalid('The value %s is not a valid integer')
+            ->ifTrue(static fn ($data) => !is_int($data))->thenInvalid('The value %s is not a valid integer')
             ->end()
             ->end()
             ->scalarNode('label')

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php

@@ -57,7 +57,7 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
      */
-    private ?int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="string", length=100, nullable=true)

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

@@ -53,19 +53,15 @@ class ByActivityTypeAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, $data)
     {
-        $this->asideActivityCategoryRepository->findBy(['id' => $values]);
-
         return function ($value): string {
             if ('_header' === $value) {
                 return 'export.aggregator.Aside activity type';
             }
 
-            if (null === $value) {
+            if (null === $value || null === $t = $this->asideActivityCategoryRepository->find($value)) {
                 return '';
             }
 
-            $t = $this->asideActivityCategoryRepository->find($value);
-
             return $this->translatableStringHelper->localize($t->getTitle());
         };
     }

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

@@ -0,0 +1,89 @@
+<?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\AsideActivityBundle\Export\Aggregator;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+use function in_array;
+
+class ByUserJobAggregator implements AggregatorInterface
+{
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private UserJobRepositoryInterface $userJobRepository;
+
+    public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->userJobRepository = $userJobRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('aside_user', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('aside.agent', 'aside_user');
+        }
+
+        $qb
+            ->addSelect('IDENTITY(aside_user.userJob) AS aside_activity_user_job_aggregator')
+            ->addGroupBy('aside_activity_user_job_aggregator');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Users \'s job';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $j = $this->userJobRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['aside_activity_user_job_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.Aggregate by user job';
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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\AsideActivityBundle\Export\Aggregator;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+use function in_array;
+
+class ByUserScopeAggregator implements AggregatorInterface
+{
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('aside_user', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('aside.agent', 'aside_user');
+        }
+
+        $qb
+            ->addSelect('IDENTITY(aside_user.mainScope) AS aside_activity_user_scope_aggregator')
+            ->addGroupBy('aside_activity_user_scope_aggregator');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Users \'s scope';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['aside_activity_user_scope_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.Aggregate by user scope';
+    }
+}

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

@@ -0,0 +1,102 @@
+<?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\AsideActivityBundle\Export\Export;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
+use Chill\AsideActivityBundle\Security\AsideActivityVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterface
+{
+    private AsideActivityRepository $repository;
+
+    public function __construct(
+        AsideActivityRepository $repository
+    ) {
+        $this->repository = $repository;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'export.Average aside activities duration';
+    }
+
+    public function getGroup(): string
+    {
+        return 'export.Exports of aside activities';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_avg_aside_activity_duration' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Average duration aside activities' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_avg_aside_activity_duration'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.Average aside activities duration';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository->createQueryBuilder('aside');
+
+        $qb
+            ->select('AVG(aside.duration) as export_avg_aside_activity_duration')
+            ->andWhere($qb->expr()->isNotNull('aside.duration'));
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AsideActivityVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [Declarations::ASIDE_ACTIVITY_TYPE];
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php

@@ -59,9 +59,7 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface
         $labels = array_combine($values, $values);
         $labels['_header'] = $this->getTitle();
 
-        return static function ($value) use ($labels) {
-            return $labels[$value];
-        };
+        return static fn ($value) => $labels[$value];
     }
 
     public function getQueryKeys($data): array
@@ -100,6 +98,8 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface
 
     public function supportsModifiers(): array
     {
-        return [];
+        return [
+            Declarations::ASIDE_ACTIVITY_TYPE,
+        ];
     }
 }

src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php

@@ -0,0 +1,239 @@
+<?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\AsideActivityBundle\Export\Export;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\AsideActivityBundle\Repository\AsideActivityCategoryRepository;
+use Chill\AsideActivityBundle\Security\AsideActivityVoter;
+use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\MainBundle\Export\Helper\DateTimeHelper;
+use Chill\MainBundle\Export\Helper\UserHelper;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use DateTimeInterface;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ListAsideActivity implements ListInterface, GroupedExportInterface
+{
+    private AsideActivityCategoryRepository $asideActivityCategoryRepository;
+
+    private CategoryRender $categoryRender;
+
+    private CenterRepositoryInterface $centerRepository;
+
+    private DateTimeHelper $dateTimeHelper;
+
+    private EntityManagerInterface $em;
+
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private UserHelper $userHelper;
+
+    public function __construct(
+        EntityManagerInterface $em,
+        DateTimeHelper $dateTimeHelper,
+        UserHelper $userHelper,
+        ScopeRepositoryInterface $scopeRepository,
+        CenterRepositoryInterface $centerRepository,
+        AsideActivityCategoryRepository $asideActivityCategoryRepository,
+        CategoryRender $categoryRender,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->em = $em;
+        $this->dateTimeHelper = $dateTimeHelper;
+        $this->userHelper = $userHelper;
+        $this->scopeRepository = $scopeRepository;
+        $this->centerRepository = $centerRepository;
+        $this->asideActivityCategoryRepository = $asideActivityCategoryRepository;
+        $this->categoryRender = $categoryRender;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_LIST];
+    }
+
+    public function getDescription()
+    {
+        return 'export.aside_activity.List of aside activities';
+    }
+
+    public function getGroup(): string
+    {
+        return 'export.Exports of aside activities';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        switch ($key) {
+            case 'id':
+            case 'note':
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.aside_activity.' . $key;
+                    }
+
+                    return $value ?? '';
+                };
+
+            case 'duration':
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.aside_activity.' . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    if ($value instanceof DateTimeInterface) {
+                        return $value->format('H:i:s');
+                    }
+
+                    return $value;
+                };
+
+            case 'createdAt':
+            case 'updatedAt':
+            case 'date':
+                return $this->dateTimeHelper->getLabel('export.aside_activity.' . $key);
+
+            case 'agent_id':
+            case 'creator_id':
+                return $this->userHelper->getLabel($key, $values, 'export.aside_activity.' . $key);
+
+            case 'aside_activity_type':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'export.aside_activity.aside_activity_type';
+                    }
+
+                    if (null === $value || '' === $value || null === $c = $this->asideActivityCategoryRepository->find($value)) {
+                        return '';
+                    }
+
+                    return $this->categoryRender->renderString($c, []);
+                };
+
+            case 'main_scope':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'export.aside_activity.main_scope';
+                    }
+
+                    if (null === $value || '' === $value || null === $c = $this->scopeRepository->find($value)) {
+                        return '';
+                    }
+
+                    return $this->translatableStringHelper->localize($c->getName());
+                };
+
+            case 'main_center':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'export.aside_activity.main_center';
+                    }
+
+                    if (null === $value || '' === $value || null === $c = $this->centerRepository->find($value)) {
+                        /** @var Center $c */
+                        return '';
+                    }
+
+                    return $c->getName();
+                };
+
+            default:
+                throw new LogicException('this key is not supported : ' . $key);
+        }
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [
+            'id',
+            'createdAt',
+            'updatedAt',
+            'agent_id',
+            'creator_id',
+            'main_scope',
+            'main_center',
+            'aside_activity_type',
+            'date',
+            'duration',
+            'note',
+        ];
+    }
+
+    public function getResult($query, $data): array
+    {
+        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
+    }
+
+    public function getTitle()
+    {
+        return 'export.aside_activity.List of aside activities';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->em->createQueryBuilder()
+            ->from(AsideActivity::class, 'aside')
+            ->leftJoin('aside.agent', 'agent');
+
+        $qb
+            ->addSelect('aside.id AS id')
+            ->addSelect('aside.createdAt AS createdAt')
+            ->addSelect('aside.updatedAt AS updatedAt')
+            ->addSelect('IDENTITY(aside.agent) AS agent_id')
+            ->addSelect('IDENTITY(aside.createdBy) AS creator_id')
+            ->addSelect('IDENTITY(agent.mainScope) AS main_scope')
+            ->addSelect('IDENTITY(agent.mainCenter) AS main_center')
+            ->addSelect('IDENTITY(aside.type) AS aside_activity_type')
+            ->addSelect('aside.date')
+            ->addSelect('aside.duration')
+            ->addSelect('aside.note');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AsideActivityVoter::STATS;
+    }
+
+    public function supportsModifiers()
+    {
+        return [Declarations::ASIDE_ACTIVITY_TYPE];
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.php

@@ -0,0 +1,102 @@
+<?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\AsideActivityBundle\Export\Export;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
+use Chill\AsideActivityBundle\Security\AsideActivityVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class SumAsideActivityDuration implements ExportInterface, GroupedExportInterface
+{
+    private AsideActivityRepository $repository;
+
+    public function __construct(
+        AsideActivityRepository $repository
+    ) {
+        $this->repository = $repository;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'export.Sum aside activities duration';
+    }
+
+    public function getGroup(): string
+    {
+        return 'export.Exports of aside activities';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_sum_aside_activity_duration' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Sum duration aside activities' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_sum_aside_activity_duration'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.Sum aside activities duration';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository
+            ->createQueryBuilder('aside');
+
+        $qb->select('SUM(aside.duration) as export_sum_aside_activity_duration')
+            ->andWhere($qb->expr()->isNotNull('aside.duration'));
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AsideActivityVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [Declarations::ASIDE_ACTIVITY_TYPE];
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php

@@ -80,8 +80,8 @@ class ByActivityTypeFilter implements FilterInterface
     public function describeAction($data, $format = 'string'): array
     {
         $types = array_map(
-            fn (AsideActivityCategory $t): string => $this->translatableStringHelper->localize($t->getName()),
-            $this->asideActivityTypeRepository->findBy(['id' => $data['types']->toArray()])
+            fn (AsideActivityCategory $t): string => $this->translatableStringHelper->localize($t->getTitle()),
+            $data['types']->toArray()
         );
 
         return ['export.filter.Filtered by aside activity type: only %type%', [

src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php

@@ -17,7 +17,6 @@ use Chill\MainBundle\Form\Type\Export\FilterType;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
@@ -46,25 +45,18 @@ class ByDateFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->between(
             'aside.date',
             ':date_from',
             ':date_to'
         );
 
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
+        $qb->andWhere($clause);
 
-        $qb->add('where', $where);
         $qb->setParameter(
             'date_from',
             $this->rollingDateConverter->convert($data['date_from'])
-        );
-        $qb->setParameter(
+        )->setParameter(
             'date_to',
             $this->rollingDateConverter->convert($data['date_to'])
         );

src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php

@@ -0,0 +1,74 @@
+<?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\AsideActivityBundle\Export\Filter;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByUserFilter implements FilterInterface
+{
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $clause = $qb->expr()->in('aside.agent', ':users');
+
+        $qb
+            ->andWhere($clause)
+            ->setParameter('users', $data['accepted_users']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_users', PickUserDynamicType::class, [
+            'multiple' => true,
+            'label' => 'Creators',
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $users = [];
+
+        foreach ($data['accepted_users'] as $u) {
+            $users[] = $this->userRender->renderString($u, []);
+        }
+
+        return ['export.filter.Filtered aside activity by user: only %users%', [
+            '%users%' => implode(', ', $users),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.Filter aside activity by user';
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php

@@ -0,0 +1,81 @@
+<?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\AsideActivityBundle\Export\Filter;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByUserJobFilter implements FilterInterface
+{
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AsideActivity::class . ' aside_activity_user_job_filter_act
+                JOIN aside_activity_user_job_filter_act.agent aside_activity_user_job_filter_user WHERE aside_activity_user_job_filter_user.userJob IN (:aside_activity_user_job_filter_jobs) AND aside_activity_user_job_filter_act = aside'
+                )
+            )
+            ->setParameter('aside_activity_user_job_filter_jobs', $data['jobs']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('jobs', EntityType::class, [
+            'class' => UserJob::class,
+            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return ['export.filter.Filtered aside activities by user jobs: only %jobs%', [
+            '%jobs%' => implode(
+                ', ',
+                array_map(
+                    fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()),
+                    $data['jobs']->toArray()
+                )
+            ),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'export.filter.Filter by user jobs';
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php

@@ -0,0 +1,88 @@
+<?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\AsideActivityBundle\Export\Filter;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByUserScopeFilter implements FilterInterface
+{
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        ScopeRepositoryInterface $scopeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AsideActivity::class . ' aside_activity_user_scope_filter_act
+                JOIN aside_activity_user_scope_filter_act.agent aside_activity_user_scope_filter_user WHERE aside_activity_user_scope_filter_user.mainScope IN (:aside_activity_user_scope_filter_scopes) AND  aside_activity_user_scope_filter_act = aside '
+                )
+            )
+            ->setParameter('aside_activity_user_scope_filter_scopes', $data['scopes']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('scopes', EntityType::class, [
+            'class' => Scope::class,
+            'choices' => $this->scopeRepository->findAllActive(),
+            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return ['export.filter.Filtered aside activities by user scope: only %scopes%', [
+            '%scopes%' => implode(
+                ', ',
+                array_map(
+                    fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
+                    $data['scopes']->toArray()
+                )
+            ),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'export.filter.Filter by user scope';
+    }
+}

src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php

@@ -28,22 +28,17 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 use function in_array;
 
 final class AsideActivityFormType extends AbstractType
 {
-    private TokenStorageInterface $storage;
-
     private array $timeChoices;
 
     public function __construct(
         ParameterBagInterface $parameterBag,
-        TokenStorageInterface $storage
     ) {
         $this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
-        $this->storage = $storage;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -100,9 +95,7 @@ final class AsideActivityFormType extends AbstractType
                     // the datetimetransformer will then handle timezone as GMT
                     $timezoneUTC = new DateTimeZone('GMT');
                     /** @var DateTimeImmutable $data */
-                    $data = $formEvent->getData() === null ?
-                        DateTime::createFromFormat('U', '300') :
-                        $formEvent->getData();
+                    $data = $formEvent->getData() ?? DateTime::createFromFormat('U', '300');
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
                     $data->add(new DateInterval('PT' . $seconds . 'S'));

src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php

@@ -44,17 +44,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 11,
                     'icons' => ['plus'],
                 ]);
-            $menu->addChild($this->translator->trans('Phonecall'), [
-                'route' => 'chill_crud_aside_activity_new',
-                'routeParameters' => [
-                    'type' => 1,
-                    'duration' => 900,
-                ],
-            ])
-                ->setExtras([
-                    'order' => 12,
-                    'icons' => ['plus'],
-                ]);
         }
     }
 

src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php

@@ -16,6 +16,9 @@ use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\Templating\EngineInterface;
 
+/**
+ * @implements ChillEntityRenderInterface<AsideActivityCategory>
+ */
 final class CategoryRender implements ChillEntityRenderInterface
 {
     public const DEFAULT_ARGS = [
@@ -45,9 +48,6 @@ final class CategoryRender implements ChillEntityRenderInterface
         return $parents;
     }
 
-    /**
-     * @param AsideActivityCategory $asideActivityCategory
-     */
     public function renderBox($asideActivityCategory, array $options): string
     {
         $options = array_merge(self::DEFAULT_ARGS, $options);
@@ -63,9 +63,6 @@ final class CategoryRender implements ChillEntityRenderInterface
         );
     }
 
-    /**
-     * @param AsideActivityCategory $asideActivityCategory
-     */
     public function renderString($asideActivityCategory, array $options): string
     {
         $options = array_merge(self::DEFAULT_ARGS, $options);
@@ -84,9 +81,6 @@ final class CategoryRender implements ChillEntityRenderInterface
         return implode($options[self::SEPERATOR_KEY], $titles);
     }
 
-    /**
-     * @param AsideActivityCategory $asideActivityCategory
-     */
     public function supports($asideActivityCategory, array $options): bool
     {
         return $asideActivityCategory instanceof AsideActivityCategory;

src/Bundle/ChillAsideActivityBundle/src/config/services.yaml

@@ -20,33 +20,3 @@ services:
     resource: "../Controller"
     autowire: true
     autoconfigure: true
-
-
-  ## Exports
-
-  # indicators
-  Chill\AsideActivityBundle\Export\Export\CountAsideActivity:
-    autowire: true
-    autoconfigure: true
-    tags:
-      - { name: chill.export, alias: count_asideactivity }
-
-  # filters
-  Chill\AsideActivityBundle\Export\Filter\ByDateFilter:
-    autowire: true
-    autoconfigure: true
-    tags:
-      - { name: chill.export_filter, alias: asideactivity_bydate_filter }
-
-  Chill\AsideActivityBundle\Export\Filter\ByActivityTypeFilter:
-    autowire: true
-    autoconfigure: true
-    tags:
-      - { name: chill.export_filter, alias: asideactivity_activitytype_filter }
-
-  # aggregators
-  Chill\AsideActivityBundle\Export\Aggregator\ByActivityTypeAggregator:
-    autowire: true
-    autoconfigure: true
-    tags:
-      - { name: chill.export_aggregator, alias: asideactivity_activitytype_aggregator }

src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml

@@ -3,11 +3,23 @@ services:
     autowire: true
     autoconfigure: true
 
+  Chill\AsideActivityBundle\Export\Export\ListAsideActivity:
+      tags:
+          - { name: chill.export, alias: 'list_aside_activity' }
+
   ## Indicators
   Chill\AsideActivityBundle\Export\Export\CountAsideActivity:
     tags:
       - { name: chill.export, alias: 'count_aside_activity' }
 
+  Chill\AsideActivityBundle\Export\Export\SumAsideActivityDuration:
+      tags:
+          - { name: chill.export, alias: 'sum_aside_activity_duration' }
+
+  Chill\AsideActivityBundle\Export\Export\AvgAsideActivityDuration:
+      tags:
+          - { name: chill.export, alias: 'avg_aside_activity_duration' }
+
   ## Filters
   chill.aside_activity.export.date_filter:
     class: Chill\AsideActivityBundle\Export\Filter\ByDateFilter
@@ -19,9 +31,34 @@ services:
     tags:
       - { name: chill.export_filter, alias: 'aside_activity_type_filter' }
 
+  chill.aside_activity.export.user_job_filter:
+      class: Chill\AsideActivityBundle\Export\Filter\ByUserJobFilter
+      tags:
+          - { name: chill.export_filter, alias: 'aside_activity_user_job_filter' }
+
+  chill.aside_activity.export.user_scope_filter:
+      class: Chill\AsideActivityBundle\Export\Filter\ByUserScopeFilter
+      tags:
+          - { name: chill.export_filter, alias: 'aside_activity_user_scope_filter' }
+
+  chill.aside_activity.export.user_filter:
+      class: Chill\AsideActivityBundle\Export\Filter\ByUserFilter
+      tags:
+          - { name: chill.export_filter, alias: 'aside_activity_user_filter' }
+
   ## Aggregators
 
   chill.aside_activity.export.type_aggregator:
     class: Chill\AsideActivityBundle\Export\Aggregator\ByActivityTypeAggregator
     tags:
-      - { name: chill.export_aggregator, alias: activity_type_aggregator }
+      - { name: chill.export_aggregator, alias: activity_type_aggregator }
+
+  chill.aside_activity.export.user_job_aggregator:
+      class: Chill\AsideActivityBundle\Export\Aggregator\ByUserJobAggregator
+      tags:
+          - { name: chill.export_aggregator, alias: aside_activity_user_job_aggregator }
+
+  chill.aside_activity.export.user_scope_aggregator:
+      class: Chill\AsideActivityBundle\Export\Aggregator\ByUserScopeAggregator
+      tags:
+          - { name: chill.export_aggregator, alias: aside_activity_user_scope_aggregator }

src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml

@@ -21,7 +21,7 @@ Type: Type
 Invisible: Invisible
 Optional: Optionnel
 Required: Obligatoire
-Persons: Personnes
+Persons: Usagers
 Users: Utilisateurs
 Emergency: Urgent
 by: "Par "
@@ -29,16 +29,16 @@ location: Lieu
 
 # Crud
 crud:
-  aside_activity:
-    title_view: Détail de l'activité annexe
-    title_new: Nouvelle activité annexe
-    title_edit: Édition d'une activité annexe
-    title_delete: Supprimer une activité annexe
-    button_delete: Supprimer
-    confirm_message_delete: Êtes-vous sûr de vouloir supprimer cette activité annexe?
-  aside_activity_category:
-    title_new: Nouvelle catégorie d'activité annexe
-    title_edit: Édition d'une catégorie de type d'activité
+    aside_activity:
+        title_view: Détail de l'activité annexe
+        title_new: Nouvelle activité annexe
+        title_edit: Édition d'une activité annexe
+        title_delete: Supprimer une activité annexe
+        button_delete: Supprimer
+        confirm_message_delete: Êtes-vous sûr de vouloir supprimer cette activité annexe?
+    aside_activity_category:
+        title_new: Nouvelle catégorie d'activité annexe
+        title_edit: Édition d'une catégorie de type d'activité
 
 #forms
 Create a new aside activity type: Nouvelle categorie d'activité annexe
@@ -50,7 +50,7 @@ For agent: Pour l'utilisateur
 date: Date
 Duration: Durée
 Note: Note
-Choose the agent for whom this activity is created: Choisissez l'agent pour qui l'activité est créée
+Choose the agent for whom this activity is created: Choisissez l'agent pour qui l'échange est créé
 Choose the activity category: Choisir la catégorie
 
 #Duration
@@ -169,19 +169,43 @@ Aside activity configuration: Configuration des activités annexes
 
 # exports
 export:
-  Exports of aside activities: Exports des activités annexes
-  Count aside activities: Nombre d'activités annexes
-  Count aside activities by various parameters.: Compte le nombre d'activités annexes selon divers critères
-  filter:
-    Filter by aside activity date: Filtrer les activités annexes par date
-    Filter by aside activity type: Filtrer les activités annexes par type d'activité
-    'Filtered by aside activity type: only %type%': "Filtré par type d'activité annexe: uniquement %type%"
-    This date should be after the date given in "Implied in an aside activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "activités annexes après cette date"
-    Aside activities after this date: Actvitités annexes après cette date
-    Aside activities before this date: Actvitités annexes avant cette date
-  aggregator:
-    Group by aside activity type: Grouper les activités annexes par type d'activité
-    Aside activity type: Type d'activité annexe
+    aside_activity:
+        List of aside activities: Liste des activités annexes
+        createdAt: Création
+        updatedAt: Dernière mise à jour
+        agent_id: Utilisateur
+        creator_id: Créateur
+        main_scope: Service principal de l'utilisateur
+        main_center: Centre principal de l'utilisteur
+        aside_activity_type: Catégorie d'activité annexe
+        date: Date
+        duration: Durée
+        note: Note
+
+    Exports of aside activities: Exports des activités annexes
+    Count aside activities: Nombre d'activités annexes
+    Count aside activities by various parameters.: Compte le nombre d'activités annexes selon divers critères
+    Average aside activities duration: Durée moyenne des activités annexes
+    Sum aside activities duration: Durée des activités annexes
+    filter:
+        Filter by aside activity date: Filtrer les activités annexes par date
+        Filter by aside activity type: Filtrer les activités annexes par type d'activité
+        'Filtered by aside activity type: only %type%': "Filtré par type d'activité annexe: uniquement %type%"
+        Filtered by aside activities between %dateFrom% and %dateTo%: Filtré par date d'activité annexe, entre %dateFrom% et %dateTo%
+        This date should be after the date given in "Implied in an aside activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "activités annexes après cette date"
+        Aside activities after this date: Actvitités annexes après cette date
+        Aside activities before this date: Actvitités annexes avant cette date
+        'Filtered aside activity by user: only %users%': "Filtré par utilisateur: uniquement %users%"
+        Filter aside activity by user: Filtrer par utilisateur
+        'Filtered aside activities by user jobs: only %jobs%': "Filtré par métier des utilisateurs: uniquement %jobs%"
+        Filter by user jobs: Filtrer les activités annexes par métier des utilisateurs
+        'Filtered aside activities by user scope: only %scopes%': "Filtré par service des utilisateur: uniquement %scopes%"
+        Filter by user scope: Filtrer les activités annexes par service d'utilisateur
+    aggregator:
+        Group by aside activity type: Grouper les activités annexes par type d'activité
+        Aside activity type: Type d'activité annexe
+        Aggregate by user job: Grouper les activités annexes par métier des utilisateurs
+        Aggregate by user scope: Grouper les activités annexes par service des utilisateurs
 
 # ROLES
 CHILL_ASIDE_ACTIVITY_STATS: Statistiques pour les activités annexes

src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php

@@ -11,12 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\BudgetBundle\Calculator;
 
-use Chill\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Entity\Resource;
 
 interface CalculatorInterface
 {
     /**
-     * @param AbstractElement[] $elements
+     * @param array<Charge|Resource> $elements
      */
     public function calculate(array $elements): ?CalculatorResult;
 

src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php

@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Calculator;
 
 use Chill\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Entity\Resource;
 use OutOfBoundsException;
 
 use function array_key_exists;
@@ -21,23 +23,26 @@ use function implode;
 class CalculatorManager
 {
     /**
-     * @var CalculatorInterface[]
+     * @var array<string, CalculatorInterface>
      */
-    protected $calculators = [];
+    private array $calculators = [];
 
-    protected $defaultCalculator = [];
+    /**
+     * @var string[]
+     */
+    private array $defaultCalculator = [];
 
     public function addCalculator(CalculatorInterface $calculator, bool $default)
     {
-        $this->calculators[$calculator::getAlias()] = $calculator;
+        $this->calculators[$calculator->getAlias()] = $calculator;
 
         if ($default) {
-            $this->defaultCalculator[] = $calculator::getAlias();
+            $this->defaultCalculator[] = $calculator->getAlias();
         }
     }
 
     /**
-     * @param AbstractElement[] $elements
+     * @param array<Resource|Charge> $elements
      *
      * @return CalculatorResult[]
      */
@@ -46,23 +51,17 @@ class CalculatorManager
         $results = [];
 
         foreach ($this->defaultCalculator as $alias) {
-            $calculator = $this->calculators[$alias];
-            $result = $calculator->calculate($elements);
+            $result = $this->getCalculator($alias)->calculate($elements);
 
             if (null !== $result) {
-                $results[$calculator::getAlias()] = $result;
+                $results[$alias] = $result;
             }
         }
 
         return $results;
     }
 
-    /**
-     * @param string $alias
-     *
-     * @return CalculatorInterface
-     */
-    public function getCalculator($alias)
+    public function getCalculator(string $alias): CalculatorInterface
     {
         if (false === array_key_exists($alias, $this->calculators)) {
             throw new OutOfBoundsException("The calculator with alias '{$alias}' does "

src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php

@@ -116,7 +116,7 @@ abstract class AbstractElementController extends AbstractController
             $indexPage = 'chill_budget_elements_household_index';
         }
 
-        $entity = null !== $element->getPerson() ? $element->getPerson() : $element->getHousehold();
+        $entity = $element->getPerson() ?? $element->getHousehold();
 
         $form = $this->createForm($this->getType(), $element);
         $form->add('submit', SubmitType::class);

src/Bundle/ChillBudgetBundle/Controller/ElementController.php

@@ -14,6 +14,8 @@ namespace Chill\BudgetBundle\Controller;
 use Chill\BudgetBundle\Calculator\CalculatorManager;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Entity\Resource;
+use Chill\BudgetBundle\Repository\ChargeRepository;
+use Chill\BudgetBundle\Repository\ResourceRepository;
 use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
@@ -29,24 +31,20 @@ use function count;
 
 class ElementController extends AbstractController
 {
-    protected CalculatorManager $calculator;
+    private CalculatorManager $calculator;
 
-    protected LoggerInterface $chillMainLogger;
+    private ResourceRepository $resourceRepository;
 
-    protected EntityManagerInterface $em;
-
-    protected TranslatorInterface $translator;
+    private ChargeRepository $chargeRepository;
 
     public function __construct(
-        EntityManagerInterface $em,
-        TranslatorInterface $translator,
-        LoggerInterface $chillMainLogger,
-        CalculatorManager $calculator
+        CalculatorManager $calculator,
+        ResourceRepository $resourceRepository,
+        ChargeRepository $chargeRepository,
     ) {
-        $this->em = $em;
-        $this->translator = $translator;
-        $this->chillMainLogger = $chillMainLogger;
         $this->calculator = $calculator;
+        $this->resourceRepository = $resourceRepository;
+        $this->chargeRepository = $chargeRepository;
     }
 
     /**
@@ -59,24 +57,10 @@ class ElementController extends AbstractController
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $person);
 
-        $charges = $this->em
-            ->getRepository(Charge::class)
-            ->findByPerson($person);
+        $charges = $this->chargeRepository->findAllByEntity($person);
+        $resources = $this->resourceRepository->findAllByEntity($person);
 
-        $ressources = $this->em
-            ->getRepository(Resource::class)
-            ->findByPerson($person);
-
-        $now = new DateTime('now');
-
-        $actualCharges = $this->em
-            ->getRepository(Charge::class)
-            ->findByEntityAndDate($person, $now);
-        $actualResources = $this->em
-            ->getRepository(Resource::class)
-            ->findByEntityAndDate($person, $now);
-
-        $elements = array_merge($actualCharges, $actualResources);
+        $elements = array_merge($charges, $resources);
 
         if (count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
@@ -85,7 +69,7 @@ class ElementController extends AbstractController
         return $this->render('ChillBudgetBundle:Person:index.html.twig', [
             'person' => $person,
             'charges' => $charges,
-            'resources' => $ressources,
+            'resources' => $resources,
             'results' => $results ?? [],
         ]);
     }
@@ -100,60 +84,19 @@ class ElementController extends AbstractController
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $household);
 
-        $charges = $this->em
-            ->getRepository(Charge::class)
-            ->findByHousehold($household);
+        $charges = $this->chargeRepository->findAllByEntity($household);
+        $resources = $this->resourceRepository->findAllByEntity($household);
 
-        $ressources = $this->em
-            ->getRepository(Resource::class)
-            ->findByHousehold($household);
-
-        $now = new DateTime('now');
-
-        $actualCharges = $this->em
-            ->getRepository(Charge::class)
-            ->findByEntityAndDate($household, $now);
-        $actualResources = $this->em
-            ->getRepository(Resource::class)
-            ->findByEntityAndDate($household, $now);
-
-        $elements = array_merge($actualCharges, $actualResources);
+        $elements = array_merge($charges, $resources);
 
         if (count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
         }
 
-        // quick solution to calculate the sum, difference and amount from
-        // controller. This should be done from the calculators
-        // TODO replace this by calculators
-        $wholeCharges = $actualCharges;
-        $wholeResources = $actualResources;
-
-        foreach ($household->getCurrentPersons() as $person) {
-            $wholeCharges = array_merge(
-                $wholeCharges,
-                $this->em
-                    ->getRepository(Charge::class)
-                    ->findByEntityAndDate($person, $now)
-            );
-            $wholeResources = array_merge(
-                $wholeResources,
-                $this->em
-                    ->getRepository(Resource::class)
-                    ->findByEntityAndDate($person, $now)
-            );
-        }
-
         return $this->render('ChillBudgetBundle:Household:index.html.twig', [
             'household' => $household,
             'charges' => $charges,
-            'resources' => $ressources,
-            'wholeResources' => array_filter($wholeResources, static function (Resource $r) use ($now) {
-                return $r->getStartDate() <= $now && ($r->getEndDate() === null || $r->getEndDate() >= $now);
-            }),
-            'wholeCharges' => array_filter($wholeCharges, static function (Charge $c) use ($now) {
-                return $c->getStartDate() <= $now && ($c->getEndDate() === null || $c->getEndDate() >= $now);
-            }),
+            'resources' => $resources,
             'results' => $results ?? [],
         ]);
     }

src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php

@@ -19,7 +19,7 @@ class CalculatorCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $manager = $container->getDefinition('Chill\BudgetBundle\Calculator\CalculatorManager');
+        $manager = $container->getDefinition(\Chill\BudgetBundle\Calculator\CalculatorManager::class);
 
         foreach ($container->findTaggedServiceIds('chill_budget.calculator') as $id => $tags) {
             foreach ($tags as $tag) {

src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php

@@ -19,7 +19,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_budget');
-        $rootNode = $treeBuilder->getRootNode('chill_budget');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php

@@ -41,7 +41,7 @@ abstract class AbstractElement
     /**
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private ?string $comment;
+    private ?string $comment = null;
 
     /**
      * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
@@ -50,7 +50,7 @@ abstract class AbstractElement
      *     message="The budget element's end date must be after the start date"
      * )
      */
-    private ?DateTimeImmutable $endDate;
+    private ?DateTimeImmutable $endDate = null;
 
     /**
      * @ORM\ManyToOne(

src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php

@@ -12,12 +12,17 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Type of charge.
  *
- * @ORM\Table(name="chill_budget.charge_type")
+ * @ORM\Table(name="chill_budget.charge_type",
+ *     uniqueConstraints={@ORM\UniqueConstraint(name="charge_kind_unique_type_idx", fields={"kind"})}
+ * )
  * @ORM\Entity
+ * @UniqueEntity(fields={"kind"})
  */
 class ChargeKind
 {
@@ -35,6 +40,8 @@ class ChargeKind
 
     /**
      * @ORM\Column(type="string", length=255, options={"default": ""}, nullable=false)
+     * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
+     * @Assert\Length(min=3)
      */
     private string $kind = '';
 

src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php

@@ -12,12 +12,17 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Type of resource.
  *
- * @ORM\Table(name="chill_budget.resource_type")
+ * @ORM\Table(name="chill_budget.resource_type", uniqueConstraints={
+ *     @ORM\UniqueConstraint(name="resource_kind_unique_type_idx", fields={"kind"})
+ * })
  * @ORM\Entity
+ * @UniqueEntity(fields={"kind"})
  */
 class ResourceKind
 {
@@ -35,6 +40,8 @@ class ResourceKind
 
     /**
      * @ORM\Column(type="string", length=255, nullable=false, options={"default": ""})
+     * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
+     * @Assert\Length(min=3)
      */
     private string $kind = '';
 

src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php

@@ -16,6 +16,7 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -25,7 +26,11 @@ class ChargeKindType extends AbstractType
     {
         $builder
             ->add('name', TranslatableStringFormType::class, [
-                'label' => 'Nom',
+                'label' => 'Title',
+            ])
+            ->add('kind', TextType::class, [
+                'label' => 'budget.admin.form.Charge_kind_key',
+                'help' => 'budget.admin.form.This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document',
             ])
             ->add('ordering', NumberType::class)
             ->add('isActive', CheckboxType::class, [