Fix validation of household address history

The CalendarDocVoter now also supports Calendar instances, not only CalendarDoc instances. This allows refining permissions checks based on the actual instance type. In addition, the ChillCalendarBundle's view has been updated to correctly use permissions when displaying action buttons. Obsolete TODO comments are also removed.

.changes/unreleased/Fixed-20240410-103736.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix resolving of centers for an household, which will fix in turn the access
+  control
+time: 2024-04-10T10:37:36.462484988+02:00
+custom:
+  Issue: ""

.changes/v2.15.1.md

@@ -0,0 +1,5 @@
+## v2.15.1 - 2023-12-20
+### Fixed
+* Fix the household export query to exclude accompanying periods that are in draft state. 
+### DX
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 

.changes/v2.15.2.md

@@ -0,0 +1,5 @@
+## v2.15.2 - 2024-01-11
+### Fixed
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
+### DX
+* Set placeholder to False for expanded EntityType form fields where required is set to False. 

.changes/v2.16.0.md

@@ -0,0 +1,15 @@
+## v2.16.0 - 2024-02-08
+### Feature
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
+* Modernize the event bundle, with some new fields and multiple improvements 
+### Fixed
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+### UX
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 

.changes/v2.16.1.md

@@ -0,0 +1,3 @@
+## v2.16.1 - 2024-02-09
+### Fixed
+* Force bootstrap version to avoid error in builds with newer version 

.changes/v2.16.2.md

@@ -0,0 +1,3 @@
+## v2.16.2 - 2024-02-21
+### Fixed
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 

.changes/v2.16.3.md

@@ -0,0 +1,5 @@
+## v2.16.3 - 2024-02-26
+### Fixed
+* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
+### UX
+* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 

.changes/v2.17.0.md

@@ -0,0 +1,9 @@
+## v2.17.0 - 2024-03-19
+### Feature
+* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
+* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
+* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
+* ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
+### Fixed
+* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
+* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 

.changes/v2.18.0.md

@@ -0,0 +1,5 @@
+## v2.18.0 - 2024-03-26
+### Feature
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
+### Fixed
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 

.changes/v2.18.1.md

@@ -0,0 +1,3 @@
+## v2.18.1 - 2024-03-26
+### Fixed
+* Fix layout issue in document generation for admin (minor) 

.editorconfig

@@ -23,3 +23,7 @@ max_line_length = 0
 indent_size = 2
 indent_style = space
 
+[.rst]
+ident_size = 3
+ident_style = space
+

.env

@@ -0,0 +1,94 @@
+#  * .env                contains default values for the environment variables needed by the app
+#  * .env.local          uncommitted file with local overrides
+#  * .env.$APP_ENV       committed environment-specific defaults
+#  * .env.$APP_ENV.local uncommitted environment-specific overrides
+#
+# Real environment variables win over .env files.
+#
+# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
+#
+# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
+
+## Locale
+LOCALE=fr
+
+###> symfony/framework-bundle ###
+# this should be set in docker-compose.yml file
+APP_ENV=prod
+APP_SECRET=ChangeItf2b58287ef7f9976409d3f6c72529e99ChangeIt
+TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
+TRUSTED_HOSTS='^(localhost|example\.com|nginx)$'
+###< symfony/framework-bundle ###
+
+## Wopi server for editing documents online
+WOPI_SERVER=http://collabora:9980
+
+# must be manually set in .env.local
+# ADMIN_PASSWORD=
+
+###> symfony/mailer ###
+# MAILER_DSN=null://null
+###< symfony/mailer ###
+
+## Notifications
+NOTIFICATION_HOST=localhost:8001
+NOTIFICATION_FROM_EMAIL=admin@chill.social
+NOTIFICATION_FROM_NAME="Chill <admin@chill.social>"
+
+## Pgadmin credential
+PGADMIN_DEFAULT_EMAIL=
+PGADMIN_DEFAULT_PASSWORD=
+
+## OVH OpenStack Storage Container
+ASYNC_UPLOAD_TEMP_URL_KEY=
+ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
+ASYNC_UPLOAD_TEMP_URL_CONTAINER=
+
+## Redis Cache
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
+
+## Twilio
+TWILIO_SID=~
+TWILIO_SECRET=~
+DEFAULT_CARRIER_CODE=BE
+
+ADD_ADDRESS_DEFAULT_COUNTRY=BE
+
+ADD_ADDRESS_MAP_CENTER_X=50.8443
+ADD_ADDRESS_MAP_CENTER_Y=4.3523
+ADD_ADDRESS_MAP_CENTER_Z=15
+
+SHORT_MESSAGE_DSN=null://null
+
+## DOCKER IMAGES REGISTRY
+#IMAGE_PHP=
+#IMAGE_NGINX=
+
+## DOCKER IMAGES TAG
+#VERSION=test
+#VERSION=prod
+
+###> symfony/messenger ###
+# Choose one of the transports below
+# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
+# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
+MESSENGER_TRANSPORT_DSN=sync://
+MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
+###< symfony/messenger ###
+
+###> doctrine/doctrine-bundle ###
+# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
+#
+DATABASE_URL="postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8"
+###< doctrine/doctrine-bundle ###
+
+###> lexik/jwt-authentication-bundle ###
+JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
+JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
+JWT_PASSPHRASE=2a30f6ba26521a2613821da35f28386e
+###< lexik/jwt-authentication-bundle ###

.env.test

@@ -4,6 +4,8 @@
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 
+TRUSTED_HOSTS=
+
 ADMIN_PASSWORD=password
 
 LOCALE=fr

.gitlab-ci.yml

@@ -20,6 +20,7 @@ services:
 
 # Set any variables we need
 variables:
+    APP_ENV: test
     GIT_DEPTH: 1
     # Configure postgres environment variables (https://hub.docker.com/r/_/postgres/)
     POSTGRES_USER: postgres
@@ -34,6 +35,8 @@ variables:
     DEFAULT_CARRIER_CODE: BE
     # force a timezone
     TZ: Europe/Brussels
+    # avoid direct deprecations (using symfony phpunit bridge: https://symfony.com/doc/4.x/components/phpunit_bridge.html#internal-deprecations
+    SYMFONY_DEPRECATIONS_HELPER: max[total]=99999999&max[self]=0&max[direct]=45&verbose=0
 
 stages:
     - Composer install
@@ -51,7 +54,7 @@ build:
         paths:
             - .cache/
     artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
         paths:
             - bin
             - vendor/
@@ -65,7 +68,7 @@ code_style:
         paths:
             - .cache/
     artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
         paths:
             - bin
             - vendor/
@@ -79,7 +82,7 @@ phpstan_tests:
         paths:
             - .cache/
     artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
         paths:
             - bin
             - vendor/
@@ -94,7 +97,7 @@ rector_tests:
         paths:
             - .cache/
     artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
         paths:
             - bin
             - vendor/
@@ -118,10 +121,10 @@ unit_tests:
         - php tests/console doctrine:migrations:migrate -n --env=test
         - php tests/console chill:db:sync-views --env=test
         - php -d memory_limit=2G tests/console cache:clear --env=test
-        - php -d memory_limit=3G tests/console doctrine:fixtures:load -n
+        - php -d memory_limit=3G tests/console doctrine:fixtures:load -n --env=test
         - php -d memory_limit=4G bin/phpunit --colors=never --exclude-group dbIntensive
     artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
         paths:
             - bin
             - vendor/

.php-cs-fixer.dist.php

@@ -112,6 +112,7 @@ $rules = array_merge(
             ],
             'sort_algorithm' => 'alpha',
         ],
+        'single_line_empty_body' => true,
     ],
     $rules,
     $riskyRules,

.readthedocs.yml

@@ -1,10 +1,14 @@
 ---
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.7"
+
 sphinx:
   configuration: docs/source/conf.py
 
 python:
-  version: 3.7
   install:
-    - requirements: docs/requirements.txt
+    - requirements: docs/requirements.txt

CHANGELOG.md

@@ -6,6 +6,68 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v2.18.1 - 2024-03-26
+### Fixed
+* Fix layout issue in document generation for admin (minor) 
+
+## v2.18.0 - 2024-03-26
+### Feature
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
+### Fixed
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
+
+## v2.17.0 - 2024-03-19
+### Feature
+* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
+* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
+* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
+* ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
+### Fixed
+* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
+* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
+
+## v2.16.3 - 2024-02-26
+### Fixed
+* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
+### UX
+* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
+
+## v2.16.2 - 2024-02-21
+### Fixed
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
+
+## v2.16.1 - 2024-02-09
+### Fixed
+* Force bootstrap version to avoid error in builds with newer version 
+
+## v2.16.0 - 2024-02-08
+### Feature
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
+* Modernize the event bundle, with some new fields and multiple improvements 
+### Fixed
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+### UX
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
+
+## v2.15.2 - 2024-01-11
+### Fixed
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
+### DX
+* Set placeholder to False for expanded EntityType form fields where required is set to False. 
+
+## v2.15.1 - 2023-12-20
+### Fixed
+* Fix the household export query to exclude accompanying periods that are in draft state. 
+### DX
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
+
 ## v2.15.0 - 2023-12-11
 ### Feature
 * ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 

MIGRATION.md

@@ -0,0 +1,117 @@
+
+# Switch to symfony 5.0
+
+- the tag `chill.role` is now renamed to `chill_main.provide_role`.
+
+  **Note**: It is not necessary to apply this tag on service definition: the tag is automatically applyied if the
+  service implements `\Chill\MainBundle\Security\ProvideRoleInterface`.
+
+- those annotation can be converted to attribute:
+
+  - `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity`
+  - `Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential`
+  - `Chill\PersonBundle\Validator\Constraints\Household\MaxHolder`
+  - `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer`
+  - `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity`
+  - `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap`
+  - `Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck`
+  - `Chill\PersonBundle\Validator\Constraints\Person\Birthdate`
+  - `Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter`
+  - `Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate`
+  - `Chill\ActivityBundle\Validator\Constraints\ActivityValidity`
+  - `Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists`
+  - `Chill\MainBundle\Validation\Constraint\PhonenumberConstraint`
+  - `Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency`
+  - `Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation`
+
+  Here is the rector rule that can be used to switch attributes to annotations:
+
+  ```php
+    $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class, [
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\MaxHolder'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\Birthdate'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\ActivityBundle\Validator\Constraints\ActivityValidity'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validation\Constraint\PhonenumberConstraint'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation'),
+    ]);
+    ```
+
+- to keep cleaner definition in container's dependency injection and framework bundle, the definition of crud or api
+  requires to define explicitly a controller.
+
+  Before:
+
+  ```php
+  $container->prependExtensionConfig('chill_main', [
+      'apis' => [
+          [
+              'class' => ThirdParty::class,
+              'name' => 'thirdparty',
+              'base_path' => '/api/1.0/thirdparty/thirdparty',
+              'actions' => [
+                  '_entity' => [
+                      'methods' => [
+                          Request::METHOD_GET => true,
+                          Request::METHOD_HEAD => true,
+                          Request::METHOD_POST => true,
+                          Request::METHOD_PUT => true,
+                          Request::METHOD_PATCH => true,
+                      ],
+                      'roles' => [
+                          Request::METHOD_GET => ThirdPartyVoter::SHOW,
+                          Request::METHOD_HEAD => ThirdPartyVoter::SHOW,
+                          Request::METHOD_POST => ThirdPartyVoter::CREATE,
+                          Request::METHOD_PUT => ThirdPartyVoter::CREATE,
+                          Request::METHOD_PATCH => ThirdPartyVoter::CREATE,
+                      ],
+                  ],
+              ],
+          ],
+      ],
+  ]);
+
+  After:
+
+  ```php
+  $container->prependExtensionConfig('chill_main', [
+      'apis' => [
+          [
+              'class' => ThirdParty::class,
+              'controller' => ThirdPartyApiController::class,
+              'name' => 'thirdparty',
+              'base_path' => '/api/1.0/thirdparty/thirdparty',
+              'actions' => [
+                  '_entity' => [
+                      'methods' => [
+                          Request::METHOD_GET => true,
+                          Request::METHOD_HEAD => true,
+                          Request::METHOD_POST => true,
+                          Request::METHOD_PUT => true,
+                          Request::METHOD_PATCH => true,
+                      ],
+                      'roles' => [
+                          Request::METHOD_GET => ThirdPartyVoter::SHOW,
+                          Request::METHOD_HEAD => ThirdPartyVoter::SHOW,
+                          Request::METHOD_POST => ThirdPartyVoter::CREATE,
+                          Request::METHOD_PUT => ThirdPartyVoter::CREATE,
+                          Request::METHOD_PATCH => ThirdPartyVoter::CREATE,
+                      ],
+                  ],
+              ],
+          ],
+      ],
+  ]);
+
+  ```
+
+

composer.json

@@ -32,27 +32,47 @@
         "ramsey/uuid-doctrine": "^1.7",
         "sensio/framework-extra-bundle": "^5.5",
         "spomky-labs/base64url": "^2.0",
-        "symfony/browser-kit": "^4.4",
+        "symfony/asset": "^5.4",
+        "symfony/browser-kit": "^5.4",
+        "symfony/cache": "^5.4",
         "symfony/clock": "^6.2",
-        "symfony/css-selector": "^4.4",
+        "symfony/config": "^5.4",
-        "symfony/expression-language": "^4.4",
+        "symfony/console": "^5.4",
-        "symfony/form": "^4.4",
+        "symfony/css-selector": "^5.4",
-        "symfony/framework-bundle": "^4.4",
+        "symfony/dom-crawler": "^5.4",
-        "symfony/http-client": "^4.4 || ^5",
+        "symfony/error-handler": "^5.4",
-        "symfony/http-foundation": "^4.4",
+        "symfony/event-dispatcher": "^5.4",
-        "symfony/intl": "^4.4",
+        "symfony/expression-language": "^5.4",
+        "symfony/filesystem": "^5.4",
+        "symfony/finder": "^5.4",
+        "symfony/form": "^5.4",
+        "symfony/framework-bundle": "^5.4",
+        "symfony/http-client": "^5.4",
+        "symfony/http-foundation": "^5.4",
+        "symfony/intl": "^5.4",
         "symfony/mailer": "^5.4",
         "symfony/messenger": "^5.4",
         "symfony/mime": "^5.4",
         "symfony/monolog-bundle": "^3.5",
-        "symfony/security-bundle": "^4.4",
+        "symfony/options-resolver": "^5.4",
-        "symfony/serializer": "^5.3",
+        "symfony/process": "^5.4",
-        "symfony/translation": "^4.4",
+        "symfony/property-access": "^5.4",
-        "symfony/twig-bundle": "^4.4",
+        "symfony/property-info": "^5.4",
-        "symfony/validator": "^4.4",
+        "symfony/routing": "^5.4",
+        "symfony/security-bundle": "^5.4",
+        "symfony/security-core": "^5.4",
+        "symfony/security-csrf": "^5.4",
+        "symfony/security-guard": "^5.4",
+        "symfony/security-http": "^5.4",
+        "symfony/serializer": "^5.4",
+        "symfony/string": "^5.4",
+        "symfony/templating": "^5.4",
+        "symfony/translation": "^5.4",
+        "symfony/twig-bundle": "^5.4",
+        "symfony/validator": "^5.4",
         "symfony/webpack-encore-bundle": "^1.11",
-        "symfony/workflow": "^4.4",
+        "symfony/workflow": "^5.4",
-        "symfony/yaml": "^4.4",
+        "symfony/yaml": "^5.4",
         "thenetworg/oauth2-azure": "^2.0",
         "twig/extra-bundle": "^3.0",
         "twig/intl-extra": "^3.0",
@@ -72,16 +92,14 @@
         "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": ">= 7.5",
-        "psalm/plugin-phpunit": "^0.18.4",
+        "rector/rector": "^1.0.0",
-        "psalm/plugin-symfony": "^4.0.2",
+        "symfony/debug-bundle": "^5.4",
-        "rector/rector": "^0.17.7",
+        "symfony/dotenv": "^5.4",
-        "symfony/debug-bundle": "^5.1",
-        "symfony/dotenv": "^4.4",
         "symfony/maker-bundle": "^1.20",
-        "symfony/phpunit-bridge": "^4.4",
+        "symfony/phpunit-bridge": "^5.4",
-        "symfony/stopwatch": "^4.4",
+        "symfony/runtime": "^5.4",
-        "symfony/var-dumper": "^4.4",
+        "symfony/stopwatch": "^5.4",
-        "vimeo/psalm": "^4.30.0"
+        "symfony/var-dumper": "^5.4"
     },
     "conflict": {
         "symfony/symfony": "*"

docs/README.md

@@ -27,7 +27,7 @@ To compile this documentation :
 Contribute
 ===========
 
-Issue tracker : https://git.framasoft.org/groups/Chill-project/issues
+Issue tracker : https://gitlab.com/Chill-Projet/chill-bundles/-/issues
 
 Licence
 =======

docs/requirements.txt

@@ -1,6 +1,7 @@
 docutils==0.13.1
 Pygments==2.2.0
 sphinx==1.8.5
+Jinja2<3.1
 git+https://github.com/fabpot/sphinx-php.git@v2.0.2#egg_name=sphinx-php
 jsx-lexer===0.0.8
 sphinx_rtd_theme==0.5.0

docs/source/development/exports.rst

@@ -242,3 +242,129 @@ This is an example of the *filter by birthdate*. This filter asks some informati
    Continue to explain the export framework
 
 .. _main bundle: https://git.framasoft.org/Chill-project/Chill-Main
+
+
+With many-to-* relationship, why should we set WHERE clauses in an EXISTS subquery instead of a JOIN ?
+``````````````````````````````````````````````````````````````````````````````````````````````````````
+
+As we described above, the doctrine builder is converted into a sql query. Let's see how to compute the "number of course
+which count at least one activity type with the id 7". For the purpose of this demonstration, we will restrict this on
+two accompanying period only: the ones with id 329 and 334.
+
+Let's see the list of activities associated with those accompanying period:
+
+.. code-block:: sql
+
+   SELECT id, accompanyingperiod_id, type_id FROM activity WHERE accompanyingperiod_id IN (329, 334) AND type_id = 7
+       ORDER BY accompanyingperiod_id;
+
+We see that we have 6 activities for the accompanying period with id 329, and only one for the 334's one.
+
+.. csv-table::
+   :header: id, accompanyingperiod_id, type_id
+
+   990,329,7
+   986,329,7
+   987,329,7
+   993,329,7
+   991,329,7
+   992,329,7
+   1000,334,7
+
+Let's calculate the average duration for those accompanying periods, and the number of period:
+
+.. code-block:: sql
+
+   SELECT AVG(age(COALESCE(closingdate, CURRENT_DATE), openingdate)), COUNT(id) from chill_person_accompanying_period WHERE id IN (329, 334);
+
+The result of this query is:
+
+.. csv-table::
+   :header: AVG, COUNT
+
+   2 years 2 mons 21 days 12 hours 0 mins 0.0 secs,2
+
+Now, we count the number of accompanying period, adding a :code:`JOIN` clause which make a link to the :code:`activity` table, and add a :code:`WHERE` clause to keep
+only the accompanying period which contains the given activity type:
+
+.. code-block:: sql
+
+   SELECT COUNT(chill_person_accompanying_period.id) from chill_person_accompanying_period
+                 JOIN activity ON chill_person_accompanying_period.id = activity.accompanyingperiod_id
+                 WHERE chill_person_accompanying_period.id IN (329, 334) AND activity.type_id = 7;
+
+What are the results here ?
+
+.. csv-table::
+   :header: COUNT
+
+   7
+
+:code:`7` ! Why this result ? Because the number of lines is duplicated for each activity. Let's see the list of rows which
+are taken into account for the computation:
+
+.. code-block:: sql
+
+   SELECT chill_person_accompanying_period.id, activity.id from chill_person_accompanying_period
+   JOIN activity ON chill_person_accompanying_period.id = activity.accompanyingperiod_id
+   WHERE chill_person_accompanying_period.id IN (329, 334) AND activity.type_id = 7;
+
+.. csv-table::
+   :header: accompanyingperiod.id, activity.id
+
+   329,993
+   334,1000
+   329,987
+   329,990
+   329,991
+   329,992
+   329,986
+
+For each activity, a row is created and, as we count the number of non-null :code:`accompanyingperiod.id` columns, we
+count one entry for each activity (actually, we count the number of activities).
+
+So, let's use the :code:`DISTINCT` keyword to count only once the equal ids:
+
+.. code-block::
+
+   SELECT COUNT(DISTINCT chill_person_accompanying_period.id) from chill_person_accompanying_period
+   JOIN activity ON chill_person_accompanying_period.id = activity.accompanyingperiod_id
+   WHERE chill_person_accompanying_period.id IN (329, 334) AND activity.type_id = 7;
+
+Now, it works again...
+
+.. csv-table::
+   :header: COUNT
+
+   2
+
+But, for the average duration, this won't work: the duration which are equals (because the :code:`openingdate` is the same and
+:code:`closingdate` is still :code:`NULL`, for instance) will be counted only once, which will give unexpected result.
+
+The solution is to move the condition "having an activity with activity type with id 7" in a :code:`EXISTS` clause:
+
+.. code-block:: sql
+
+   SELECT COUNT(chill_person_accompanying_period.id) from chill_person_accompanying_period
+   WHERE chill_person_accompanying_period.id IN (329, 334) AND EXISTS (SELECT 1 FROM activity WHERE type_id = 7 AND accompanyingperiod_id = chill_person_accompanying_period.id);
+
+The result is correct without :code:`DISTINCT` keyword:
+
+.. csv-table::
+   :header: COUNT
+
+   2
+
+And we can now compute the average duration without fear:
+
+.. code-block:: sql
+
+  SELECT AVG(age(COALESCE(closingdate, CURRENT_DATE), openingdate)) from chill_person_accompanying_period
+  WHERE chill_person_accompanying_period.id IN (329, 334) AND EXISTS (SELECT 1 FROM activity WHERE type_id = 7 AND accompanyingperiod_id = chill_person_accompanying_period.id);
+
+Give the result:
+
+.. csv-table::
+   :header: AVG
+
+   2 years 2 mons 21 days 12 hours 0 mins 0.0 secs

docs/source/development/pagination/example.php

@@ -15,9 +15,12 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 class example extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
 {
+    public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry)
+    {
+    }
     public function yourAction()
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->managerRegistry->getManager();
         // first, get the number of total item are available
         $total = $em
             ->createQuery('SELECT COUNT (item.id) FROM ChillMyBundle:Item item')

docs/source/development/useful-snippets/controller-secured-for-person.php

@@ -18,6 +18,9 @@ use Symfony\Component\Security\Core\Role\Role;
 
 class ConsultationController extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
 {
+    public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry)
+    {
+    }
     /**
      * @param int $id personId
      *
@@ -48,7 +51,7 @@ class ConsultationController extends \Symfony\Bundle\FrameworkBundle\Controller\
         );
 
         // create a query which take circles into account
-        $consultations = $this->getDoctrine()->getManager()
+        $consultations = $this->managerRegistry->getManager()
             ->createQuery('SELECT c FROM ChillHealthBundle:Consultation c '
                 . 'WHERE c.patient = :person AND c.circle IN(:circles) '
                 . 'ORDER BY c.date DESC')

docs/source/installation/index.rst

@@ -48,8 +48,8 @@ Clone or download the chill-skeleton project and `cd` into the main directory.
 
 .. code-block:: bash
 
-   git clone https://gitlab.com/Chill-Projet/chill-skeleton-basic.git
+   git clone https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic.git
-   cd chill-app
+   cd chill-skeleton-basic
 
 
 As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.

exports_alias_conventions.md

@@ -5,72 +5,74 @@ Add condition with distinct alias on each export join clauses (Indicators + Filt
 
 These are alias conventions :
 
-| Entity                                  | Join                                    | Attribute                                  | Alias                                  |
+| Entity                                  | Join                                    | Attribute                                  | Alias                                      |
-|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:---------------------------------------|
+|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:-------------------------------------------|
-| AccompanyingPeriod::class               |                                         |                                            | acp                                    |
+| AccompanyingPeriodStepHistory::class    |                                         |                                            | acpstephistory (contexte ACP_STEP_HISTORY) |
-|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                                   |
+|                                         | AccompanyingPeriod::class               | acpstephistory.period                      | acp                                        |
-|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                                |
+| AccompanyingPeriod::class               |                                         |                                            | acp                                        |
-|                                         | Location::class                         | acp.administrativeLocation                 | acploc                                 |
+|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                                       |
-|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                              |
+|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                                    |
-|                                         | UserJob::class                          | acp.job                                    | acpjob                                 |
+|                                         | Location::class                         | acp.administrativeLocation                 | acploc                                     |
-|                                         | Origin::class                           | acp.origin                                 | acporigin                              |
+|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                                  |
-|                                         | Scope::class                            | acp.scopes                                 | acpscope                               |
+|                                         | UserJob::class                          | acp.job                                    | acpjob                                     |
-|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                         |
+|                                         | Origin::class                           | acp.origin                                 | acporigin                                  |
-|                                         | User::class                             | acp.user                                   | acpuser                                |
+|                                         | Scope::class                            | acp.scopes                                 | acpscope                                   |
-|                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                       |
+|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                             |
-|                                         | AccompanyingPeriodInfo::class           | not existing (using custom WITH clause)    | acpinfo                                |
+|                                         | User::class                             | acp.user                                   | acpuser                                    |
-| AccompanyingPeriodWork::class           |                                         |                                            | acpw                                   |
+|                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                           |
-|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                               |
+|                                         | AccompanyingPeriodInfo::class           | not existing (using custom WITH clause)    | acpinfo                                    |
-|                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                       |
+| AccompanyingPeriodWork::class           |                                         |                                            | acpw                                       |
-|                                         | Goal::class                             | acpw.goals                                 | goal                                   |
+|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                                   |
-|                                         | Result::class                           | acpw.results                               | result                                 |
+|                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                           |
-| AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                                |
+|                                         | Goal::class                             | acpw.goals                                 | goal                                       |
-|                                         | Person::class                           | acppart.person                             | partperson                             |
+|                                         | Result::class                           | acpw.results                               | result                                     |
-| AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                               |
+| AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                                    |
-|                                         | Evaluation::class                       | workeval.evaluation                        | eval                                   |
+|                                         | Person::class                           | acppart.person                             | partperson                                 |
-| AccompanyingPeriodInfo::class           |                                         |                                            | acpinfo                                |
+| AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                                   |
-|                                         | User::class                             | acpinfo.user                               | acpinfo_user                           |
+|                                         | Evaluation::class                       | workeval.evaluation                        | eval                                       |
-| Goal::class                             |                                         |                                            | goal                                   |
+| AccompanyingPeriodInfo::class           |                                         |                                            | acpinfo                                    |
-|                                         | Result::class                           | goal.results                               | goalresult                             |
+|                                         | User::class                             | acpinfo.user                               | acpinfo_user                               |
-| Person::class                           |                                         |                                            | person                                 |
+| Goal::class                             |                                         |                                            | goal                                       |
-|                                         | Center::class                           | person.center                              | center                                 |
+|                                         | Result::class                           | goal.results                               | goalresult                                 |
-|                                         | HouseholdMember::class                  | partperson.householdParticipations         | householdmember                        |
+| Person::class                           |                                         |                                            | person                                     |
-|                                         | MaritalStatus::class                    | person.maritalStatus                       | personmarital                          |
+|                                         | Center::class                           | person.center                              | center                                     |
-|                                         | VendeePerson::class                     |                                            | vp                                     |
+|                                         | HouseholdMember::class                  | partperson.householdParticipations         | householdmember                            |
-|                                         | VendeePersonMineur::class               |                                            | vpm                                    |
+|                                         | MaritalStatus::class                    | person.maritalStatus                       | personmarital                              |
-|                                         | CurrentPersonAddress::class             | person.currentPersonAddress                | currentPersonAddress (on a given date) |
+|                                         | VendeePerson::class                     |                                            | vp                                         |
-| ResidentialAddress::class               |                                         |                                            | resaddr                                |
+|                                         | VendeePersonMineur::class               |                                            | vpm                                        |
-|                                         | ThirdParty::class                       | resaddr.hostThirdParty                     | tparty                                 |
+|                                         | CurrentPersonAddress::class             | person.currentPersonAddress                | currentPersonAddress (on a given date)     |
-| ThirdParty::class                       |                                         |                                            | tparty                                 |
+| ResidentialAddress::class               |                                         |                                            | resaddr                                    |
-|                                         | ThirdPartyCategory::class               | tparty.categories                          | tpartycat                              |
+|                                         | ThirdParty::class                       | resaddr.hostThirdParty                     | tparty                                     |
-| HouseholdMember::class                  |                                         |                                            | householdmember                        |
+| ThirdParty::class                       |                                         |                                            | tparty                                     |
-|                                         | Household::class                        | householdmember.household                  | household                              |
+|                                         | ThirdPartyCategory::class               | tparty.categories                          | tpartycat                                  |
-|                                         | Person::class                           | householdmember.person                     | memberperson                           |
+| HouseholdMember::class                  |                                         |                                            | householdmember                            |
-|                                         |                                         | memberperson.center                        | membercenter                           |
+|                                         | Household::class                        | householdmember.household                  | household                                  |
-| Household::class                        |                                         |                                            | household                              |
+|                                         | Person::class                           | householdmember.person                     | memberperson                               |
-|                                         | HouseholdComposition::class             | household.compositions                     | composition                            |
+|                                         |                                         | memberperson.center                        | membercenter                               |
-| Activity::class                         |                                         |                                            | activity                               |
+| Household::class                        |                                         |                                            | household                                  |
-|                                         | Person::class                           | activity.person                            | actperson                              |
+|                                         | HouseholdComposition::class             | household.compositions                     | composition                                |
-|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                                    |
+| Activity::class                         |                                         |                                            | activity                                   |
-|                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity       |
+|                                         | Person::class                           | activity.person                            | actperson                                  |
-|                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity      |
+|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                                        |
-|                                         | ActivityType::class                     | activity.activityType                      | acttype                                |
+|                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity           |
-|                                         | Location::class                         | activity.location                          | actloc                                 |
+|                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity          |
-|                                         | SocialAction::class                     | activity.socialActions                     | actsocialaction                        |
+|                                         | ActivityType::class                     | activity.activityType                      | acttype                                    |
-|                                         | SocialIssue::class                      | activity.socialIssues                      | actsocialssue                          |
+|                                         | Location::class                         | activity.location                          | actloc                                     |
-|                                         | ThirdParty::class                       | activity.thirdParties                      | acttparty                              |
+|                                         | SocialAction::class                     | activity.socialActions                     | actsocialaction                            |
-|                                         | User::class                             | activity.user                              | actuser                                |
+|                                         | SocialIssue::class                      | activity.socialIssues                      | actsocialssue                              |
-|                                         | User::class                             | activity.users                             | actusers                               |
+|                                         | ThirdParty::class                       | activity.thirdParties                      | acttparty                                  |
-|                                         | ActivityReason::class                   | activity.reasons                           | actreasons                             |
+|                                         | User::class                             | activity.user                              | actuser                                    |
-|                                         | Center::class                           | actperson.center                           | actcenter                              |
+|                                         | User::class                             | activity.users                             | actusers                                   |
-|                                         | Person::class                           | activity.createdBy                         | actcreator                             |
+|                                         | ActivityReason::class                   | activity.reasons                           | actreasons                                 |
-| ActivityReason::class                   |                                         |                                            | actreasons                             |
+|                                         | Center::class                           | actperson.center                           | actcenter                                  |
-|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                           |
+|                                         | Person::class                           | activity.createdBy                         | actcreator                                 |
-| Calendar::class                         |                                         |                                            | cal                                    |
+| ActivityReason::class                   |                                         |                                            | actreasons                                 |
-|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                              |
+|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                               |
-|                                         | Location::class                         | cal.location                               | calloc                                 |
+| Calendar::class                         |                                         |                                            | cal                                        |
-|                                         | User::class                             | cal.user                                   | caluser                                |
+|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                                  |
-| VendeePerson::class                     |                                         |                                            | vp                                     |
+|                                         | Location::class                         | cal.location                               | calloc                                     |
-|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                                 |
+|                                         | User::class                             | cal.user                                   | caluser                                    |
-|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                                  |
+| VendeePerson::class                     |                                         |                                            | vp                                         |
-|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                                   |
+|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                                     |
+|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                                      |
+|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                                       |

package.json

@@ -14,12 +14,15 @@
     "@ckeditor/ckeditor5-vue": "^4.0.1",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node14": "^1.0.1",
+      "@types/dompurify": "^3.0.5",
     "bindings": "^1.5.0",
-    "bootstrap": "^5.0.1",
+    "bootstrap": "5.2.3",
     "chokidar": "^3.5.1",
+    "dompurify": "^3.1.0",
     "fork-awesome": "^1.1.7",
     "jquery": "^3.6.0",
     "node-sass": "^8.0.0",
+    "marked": "^12.0.1",
     "popper.js": "^1.16.1",
     "postcss-loader": "^7.0.2",
     "raw-loader": "^4.0.2",
@@ -46,7 +49,7 @@
     "es6-promise": "^4.2.8",
     "leaflet": "^1.7.1",
     "masonry-layout": "^4.2.2",
-    "mime": "^3.0.0",
+    "mime": "^4.0.0",
     "swagger-ui": "^4.15.5",
     "vis-network": "^9.1.0",
     "vue": "^3.2.37",

phpstan-baseline-deprecations-doctrine-orm.neon

@@ -0,0 +1,58 @@
+# See https://github.com/doctrine/orm/issues/11313 for a follow-up
+parameters:
+	ignoreErrors:
+		-
+			message: """
+				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Ascending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Ascending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Notification.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

phpstan-baseline-level-5.neon

@@ -100,11 +100,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Controller/EventController.php
 
-		-
-			message: "#^Parameter \\#1 \\$name of method Symfony\\\\Component\\\\Form\\\\FormFactoryInterface\\:\\:createNamedBuilder\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
 		-
 			message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, Chill\\\\MainBundle\\\\Entity\\\\Center given\\.$#"
 			count: 1
@@ -165,11 +160,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
 
-		-
-			message: "#^Parameter \\#1 \\$name of method Symfony\\\\Component\\\\Form\\\\FormFactoryInterface\\:\\:createNamedBuilder\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
 		-
 			message: "#^Parameter \\#3 \\$alias of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:exportFormStep\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
 			count: 1

phpstan-baseline.neon

@@ -1,5 +1,30 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+
 		-
 			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
 			count: 1

phpstan-deprecations-sf54.neon

@@ -0,0 +1,153 @@
+parameters:
+	ignoreErrors:
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 3
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\EncoderFactory\\:
+				since Symfony 5\\.3, use \\{@link PasswordHasherFactory\\} instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/MenuController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/UserController.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\EncoderFactory\\:
+				since Symfony 5\\.3, use \\{@link PasswordHasherFactory\\} instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 3
+			path: src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 13
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 4
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 7
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php

phpstan-deprecations.neon

@@ -1,36 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			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: 2
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Call to deprecated method setType\\(\\) of class Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
-		-
-			message: """
-				#^Fetching class constant class 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/Form/ActivityType.php
-
 
 		-
 			message: """
@@ -40,201 +9,10 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.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/Timeline/TimelineActivityProvider.php
-
-		-
-			message: """
-				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bridge\\\\Twig\\\\TwigEngine\\:
-				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Used function LogicException not found\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: """
-				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
-				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: """
-				#^Parameter \\$twigEngine of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bridge\\\\Twig\\\\TwigEngine\\:
-				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: """
-				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
-				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: """
-				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
-				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: """
-				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
-				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.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: 6
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: """
-				#^Fetching class constant class 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/ChillEventBundle/Form/EventType.php
-
-		-
-			message: """
-				#^Fetching class constant class 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/ChillEventBundle/Form/Type/PickEventType.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/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
-
-		-
-			message: """
-				#^Parameter \\$role of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getReachableCenters\\(\\) has typehint with 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/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: """
-				#^Call to deprecated method getLanguageBundle\\(\\) of class Symfony\\\\Component\\\\Intl\\\\Intl\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use \\{@see Languages\\} or \\{@see Scripts\\} instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
-
-		-
-			message: """
-				#^Call to deprecated method getRegionBundle\\(\\) of class Symfony\\\\Component\\\\Intl\\\\Intl\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use \\{@see Countries\\} instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.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/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: """
-				#^Parameter \\$role of anonymous function has typehint with 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/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: """
-				#^Call to deprecated method getLanguageBundle\\(\\) of class Symfony\\\\Component\\\\Intl\\\\Intl\\:
-				since Symfony 4\\.3, to be removed in 5\\.0\\. Use \\{@see Languages\\} or \\{@see Scripts\\} instead\\.$#
-			"""
-			count: 2
-			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
-
-		-
-			message: """
-				#^Return type of method Chill\\\\MainBundle\\\\Entity\\\\User\\:\\:getRoles\\(\\) has typehint with 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/ChillMainBundle/Entity/User.php
-
-		-
-			message: """
-				#^Class Chill\\\\MainBundle\\\\Form\\\\Event\\\\CustomizeFormEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
-
-		-
-			message: """
-				#^Fetching class constant class 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/ChillMainBundle/Form/Type/ScopePickerType.php
-
-		-
-			message: """
-				#^Fetching class constant class 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/ChillMainBundle/Form/Type/UserPickerType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
-
-		-
-			message: """
-				#^Parameter \\$attribute of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:userHasAccess\\(\\) has typehint with 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/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
 
 		-
 			message: """
@@ -244,14 +22,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
 
-		-
-			message: """
-				#^Parameter \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCircles\\(\\) has typehint with 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/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
 		-
 			message: """
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelper\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
@@ -276,14 +46,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
 
-		-
-			message: """
-				#^Class Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
-
 		-
 			message: """
 				#^Class Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcher implements deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
@@ -292,35 +54,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
-
-		-
-			message: """
-				#^Class Chill\\\\MainBundle\\\\Templating\\\\Events\\\\DelegatedBlockRenderingEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
-
-		-
-			message: """
-				#^Class Chill\\\\PersonBundle\\\\Actions\\\\ActionEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
-
-		-
-			message: """
-				#^Class Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
-				since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
-
 		-
 			message: """
 				#^Call to deprecated method getCurrentAccompanyingPeriod\\(\\) of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\:
@@ -329,56 +62,10 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
 
-		-
-			message: """
-				#^Class Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
-				since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
 		-
 			message: "#^Access to deprecated property \\$proxyAccompanyingPeriodOpenState of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Entity/Person.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/ChillPersonBundle/Form/AccompanyingPeriodType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
-
-		-
-			message: """
-				#^Fetching class constant class 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/ChillPersonBundle/Form/Type/PickPersonType.php
-
-		-
-			message: """
-				#^Class Chill\\\\PersonBundle\\\\Privacy\\\\AccompanyingPeriodPrivacyEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
-
-		-
-			message: """
-				#^Class Chill\\\\PersonBundle\\\\Privacy\\\\PrivacyEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
-
 		-
 			message: """
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriodACLAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
@@ -387,48 +74,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.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/ChillPersonBundle/Widget/PersonListWidget.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: 3
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-
-		-
-			message: """
-				#^Parameter \\$role of method Chill\\\\ReportBundle\\\\Form\\\\ReportType\\:\\:appendScopeChoices\\(\\) has typehint with 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/ChillReportBundle/Form/ReportType.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/ChillReportBundle/Search/ReportSearch.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: 2
-			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
-
 		-
 			message: """
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
@@ -437,46 +82,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
 
-		-
-			message: """
-				#^Parameter \\$role of method Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:setCreateForm\\(\\) has typehint with 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/ChillTaskBundle/Controller/SingleTaskController.php
-
-		-
-			message: """
-				#^Class Chill\\\\TaskBundle\\\\Event\\\\TaskEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Event/TaskEvent.php
-
-		-
-			message: """
-				#^Class Chill\\\\TaskBundle\\\\Event\\\\UI\\\\UIEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Event/UI/UIEvent.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: 4
-			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
-
-		-
-			message: """
-				#^Fetching class constant class 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/ChillTaskBundle/Form/SingleTaskType.php
-
 		-
 			message: """
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Form\\\\SingleTaskType\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
@@ -484,28 +89,3 @@ parameters:
 			"""
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.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/ChillTaskBundle/Repository/SingleTaskRepository.php
-
-		-
-			message: """
-				#^Class Chill\\\\TaskBundle\\\\Security\\\\Authorization\\\\AuthorizationEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
-				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.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: 3
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-

phpstan.neon.dist

@@ -31,4 +31,5 @@ includes:
     - phpstan-baseline-level-3.neon
     - phpstan-baseline-level-4.neon
     - phpstan-baseline-level-5.neon
-
+    - phpstan-deprecations-sf54.neon
+    - phpstan-baseline-deprecations-doctrine-orm.neon

phpunit.rector.xml

@@ -1,29 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" beStrictAboutOutputDuringTests="true" failOnRisky="true" failOnWarning="true" colors="true" cacheDirectory="var/cache/phpunit.rector.cache" requireCoverageMetadata="true" beStrictAboutCoverageMetadata="true">
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+  <testsuites>
-         bootstrap="tests/app/vendor/autoload.php"
+    <testsuite name="default">
-         cacheResultFile=".cache/phpunit/test-results-rector"
+      <directory>utils/rector/tests</directory>
-         executionOrder="depends,defects"
+    </testsuite>
-         forceCoversAnnotation="true"
+  </testsuites>
-         beStrictAboutCoversAnnotation="true"
+  <source>
-         beStrictAboutOutputDuringTests="true"
+    <include>
-         beStrictAboutTodoAnnotatedTests="true"
+      <directory suffix=".php">utils/rector/src</directory>
-         convertDeprecationsToExceptions="true"
+    </include>
-         failOnRisky="true"
+  </source>
-         failOnWarning="true"
-         verbose="true"
-         colors="true"
->
-    <testsuites>
-        <testsuite name="default">
-            <directory>utils/rector/tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <coverage cacheDirectory=".cache/phpunit/code-coverage-rector"
-              processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">utils/rector/src</directory>
-        </include>
-    </coverage>
 </phpunit>

phpunit.xml.dist

@@ -1,85 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="tests/bootstrap.php">
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+  <php>
-         backupGlobals="false"
+    <ini name="error_reporting" value="-1"/>
-         colors="true"
+    <server name="APP_ENV" value="test" force="true"/>
-         bootstrap="tests/bootstrap.php"
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=93&amp;max[indirect]=999999"/>
->
+    <server name="SHELL_VERBOSITY" value="-1"/>
-    <php>
+    <env name="KERNEL_CLASS" value="\App\Kernel"/>
-        <ini name="error_reporting" value="-1" />
+  </php>
-        <server name="APP_ENV" value="test" force="true" />
+  <testsuites>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0&amp;max[indirect]=999999" />
+    <!--
-        <server name="SHELL_VERBOSITY" value="-1" />
-        <env name="KERNEL_CLASS" value="\App\Kernel" />
-    </php>
-
-    <testsuites>
-        <!--
         <testsuite name="ActivityBundle">
             <directory suffix="Test.php">src/Bundle/ChillActivityBundle/Tests/</directory>
         </testsuite>
         -->
-        <testsuite name="AsideActivityBundle">
+    <testsuite name="AsideActivityBundle">
-            <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
+      <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
-        </testsuite>
+    </testsuite>
-        <testsuite name="BudgetBundle">
+    <testsuite name="BudgetBundle">
-            <directory suffix="Test.php">src/Bundle/ChillBudgetBundle/Tests/</directory>
+      <directory suffix="Test.php">src/Bundle/ChillBudgetBundle/Tests/</directory>
-        </testsuite>
+    </testsuite>
-        <testsuite name="CalendarBundle">
+    <testsuite name="CalendarBundle">
-            <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
+      <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
-        </testsuite>
+    </testsuite>
-        <!-- Missing CustomFieldBundle -->
+    <!-- Missing CustomFieldBundle -->
-        <testsuite name="DocGeneratorBundle">
+    <testsuite name="DocGeneratorBundle">
-            <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
+      <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
-        </testsuite>
+    </testsuite>
-        <testsuite name="DocStoreBundle">
+    <testsuite name="DocStoreBundle">
-            <directory suffix="Test.php">src/Bundle/ChillDocStoreBundle/Tests/</directory>
+      <directory suffix="Test.php">src/Bundle/ChillDocStoreBundle/Tests/</directory>
-        </testsuite>
+    </testsuite>
-        <!--
+    <!--
         <testsuite name="EventBundle">
             <directory suffix="Test.php">src/Bundle/ChillEventBundle/tests/</directory>
         </testsuite>
         -->
-       <testsuite name="MainBundle">
+    <testsuite name="MainBundle">
-         <directory suffix="Test.php">src/Bundle/ChillMainBundle/Tests/</directory>
+      <directory suffix="Test.php">src/Bundle/ChillMainBundle/Tests/</directory>
-       </testsuite>
+    </testsuite>
-       <testsuite name="PersonBundle">
+    <testsuite name="PersonBundle">
-         <directory suffix="Test.php">src/Bundle/ChillPersonBundle/Tests/</directory>
+      <directory suffix="Test.php">src/Bundle/ChillPersonBundle/Tests/</directory>
-         <!-- we are rewriting accompanying periods... Work in progress -->
+      <!-- we are rewriting accompanying periods... Work in progress -->
-         <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php</exclude>
+      <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php</exclude>
-         <!-- we are rewriting address, Work in progress -->
+      <!-- we are rewriting address, Work in progress -->
-         <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php</exclude>
+      <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php</exclude>
-         <!-- find a solution to create multiple configs -->
+      <!-- find a solution to create multiple configs -->
-         <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php</exclude>
+      <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php</exclude>
-         <!-- temporarily removed, the time to find a fix -->
+      <!-- temporarily removed, the time to find a fix -->
-         <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
+      <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
-        </testsuite>
+    </testsuite>
-        <!--
+    <!--
         <testsuite name="ReportBundle">
             <directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>
         </testsuite>
         -->
-        <!--
+    <!--
         <testsuite name="TaskBundle">
             <directory suffix="Test.php">src/Bundle/ChillTaskBundle/Tests</directory>
         </testsuite>
         -->
-        <testsuite name="ThirdPartyBundle">
+    <testsuite name="ThirdPartyBundle">
-            <directory suffix="Test.php">src/Bundle/ChillThirdPartyBundle/Tests</directory>
+      <directory suffix="Test.php">src/Bundle/ChillThirdPartyBundle/Tests</directory>
-        </testsuite>
+    </testsuite>
-        <testsuite name="WopiBundle">
+    <testsuite name="WopiBundle">
-            <directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
+      <directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
-        </testsuite>
+    </testsuite>
-    </testsuites>
+  </testsuites>
-
+  <!-- Run `composer require symfony/panther` before enabling this extension -->
-    <listeners>
+  <!--
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
-    <!-- Run `composer require symfony/panther` before enabling this extension -->
-    <!--
     <extensions>
         <extension class="Symfony\Component\Panther\ServerExtension" />
     </extensions>

rector.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
+use Rector\Php80\Rector\Class_\AnnotationToAttributeRector;
 use Rector\Set\ValueObject\LevelSetList;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -19,7 +20,7 @@ return static function (RectorConfig $rectorConfig): void {
         __DIR__ . '/src',
     ]);
 
-    $rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/testsApp_KernelDevDebugContainer.xml');
+    $rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/test/App_KernelTestDebugContainer.xml  ');
     $rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
 
     //$rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
@@ -27,29 +28,64 @@ return static function (RectorConfig $rectorConfig): void {
 
     // register a single rule
     $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+
+    // part of the symfony 54 rules
+    $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
+    $rectorConfig->rule(\Rector\Symfony\Symfony60\Rector\MethodCall\GetHelperControllerToServiceRector::class);
     $rectorConfig->disableParallel();
 
     //define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_82,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_50,
-        \Rector\Symfony\Set\SymfonyLevelSetList::UP_TO_SYMFONY_44,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_50_TYPES,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_51,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_52,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_53,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_54,
         \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
-        \Rector\PHPUnit\Set\PHPUnitLevelSetList::UP_TO_PHPUNIT_90,
+        \Rector\Doctrine\Set\DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
+    ]);
+
+    $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class, [
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Symfony\Component\Serializer\Annotation\Context'),
+    ]);
+
+    // migrate for phpunit
+    $rectorConfig->rules([
+        \Rector\PHPUnit\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector::class,
+        \Rector\PHPUnit\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector::class
     ]);
 
     // some routes are added twice if it remains activated
     // $rectorConfig->rule(\Rector\Symfony\Configs\Rector\ClassMethod\AddRouteAnnotationRector::class);
 
     // chill rules
-    //$rectorConfig->rule(\Chill\Utils\Rector\Rector\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector::class);
+    $rectorConfig->rules([
+        \Chill\Utils\Rector\Rector\ChillBundleMakeDataProviderStaticForAbstractExportTestRector::class,
+    ]);
 
     // skip some path...
     $rectorConfig->skip([
-        // we need to discuss this: are we going to have FALSE in tests instead of an error ?
-        \Rector\Php71\Rector\FuncCall\CountOnNullRector::class,
-
         // we must adapt service definition
         \Rector\Symfony\Symfony28\Rector\MethodCall\GetToConstructorInjectionRector::class,
         \Rector\Symfony\Symfony34\Rector\Closure\ContainerGetNameToTypeInTestsRector::class,
     ]);
+
+    $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\MaxHolder'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\Birthdate'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\ActivityBundle\Validator\Constraints\ActivityValidity'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validation\Constraint\PhonenumberConstraint'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency'),
+        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation'),
+    ]);
 };

src/Bundle/ChillActivityBundle/CHANGELOG.md

@@ -28,3 +28,4 @@ Version 1.5.5
 
 - [activity] replace dropdown for selecting reasons and use chillEntity for reason rendering
 - fix bug: error when trying to edit activity of which the type has been deactivated
+

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -24,6 +24,7 @@ use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\LocationRepository;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Security\ChillSecurity;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
@@ -67,13 +68,13 @@ final class ActivityController extends AbstractController
         private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
         private readonly PaginatorFactory $paginatorFactory,
+        private readonly ChillSecurity $security
     ) {}
 
     /**
      * Deletes a Activity entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/delete", name="chill_activity_activity_delete", methods={"GET", "POST", "DELETE"})
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/delete', name: 'chill_activity_activity_delete', methods: ['GET', 'POST', 'DELETE'])]
     public function deleteAction(Request $request, mixed $id)
     {
         $view = null;
@@ -141,9 +142,8 @@ final class ActivityController extends AbstractController
 
     /**
      * Displays a form to edit an existing Activity entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/edit", name="chill_activity_activity_edit", methods={"GET", "POST", "PUT"})
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/edit', name: 'chill_activity_activity_edit', methods: ['GET', 'POST', 'PUT'])]
     public function editAction(int $id, Request $request): Response
     {
         $view = null;
@@ -236,9 +236,8 @@ final class ActivityController extends AbstractController
 
     /**
      * Lists all Activity entities.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/", name="chill_activity_activity_list")
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/', name: 'chill_activity_activity_list')]
     public function listAction(Request $request): Response
     {
         $view = null;
@@ -342,9 +341,7 @@ final class ActivityController extends AbstractController
         return $filterBuilder->build();
     }
 
-    /**
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/new', name: 'chill_activity_activity_new', methods: ['POST', 'GET'])]
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/new", name="chill_activity_activity_new", methods={"POST", "GET"})
-     */
     public function newAction(Request $request): Response
     {
         $view = null;
@@ -384,7 +381,7 @@ final class ActivityController extends AbstractController
         }
 
         $entity = new Activity();
-        $entity->setUser($this->getUser());
+        $entity->setUser($this->security->getUser());
 
         if ($person instanceof Person) {
             $entity->setPerson($person);
@@ -399,7 +396,7 @@ final class ActivityController extends AbstractController
         $entity->setDate(new \DateTime('now'));
 
         if ($request->query->has('activityData')) {
-            $activityData = $request->query->get('activityData');
+            $activityData = $request->query->all('activityData');
 
             if (\array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
                 $durationTimeInMinutes = $activityData['durationTime'];
@@ -452,7 +449,7 @@ final class ActivityController extends AbstractController
             if (\array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
                 $comment = new CommentEmbeddable();
                 $comment->setComment($activityData['comment']);
-                $comment->setUserId($this->getUser()->getid());
+                $comment->setUserId($this->security->getUser()->getId());
                 $comment->setDate(new \DateTime('now'));
                 $entity->setComment($comment);
             }
@@ -513,7 +510,7 @@ final class ActivityController extends AbstractController
 
         $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
-        $defaultLocation = $this->getUser()->getCurrentLocation();
+        $defaultLocation = $this->security->getUser()->getCurrentLocation();
 
         return $this->render($view, [
             'person' => $person,
@@ -525,9 +522,7 @@ final class ActivityController extends AbstractController
         ]);
     }
 
-    /**
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/select-type', name: 'chill_activity_activity_select_type')]
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/select-type", name="chill_activity_activity_select_type")
-     */
     public function selectTypeAction(Request $request): Response
     {
         $view = null;
@@ -568,13 +563,11 @@ final class ActivityController extends AbstractController
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'data' => $data,
-            'activityData' => $request->query->get('activityData', []),
+            'activityData' => $request->query->all('activityData'),
         ]);
     }
 
-    /**
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/show', name: 'chill_activity_activity_show')]
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/show", name="chill_activity_activity_show")
-     */
     public function showAction(Request $request, int $id): Response
     {
         $entity = $this->activityRepository->find($id);
@@ -673,8 +666,8 @@ final class ActivityController extends AbstractController
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-        // TODO Add permission
+            // TODO Add permission
-        // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -22,11 +22,12 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class ActivityReasonCategoryController extends AbstractController
 {
+    public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {}
+
     /**
      * Creates a new ActivityReasonCategory entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/create", name="chill_activity_activityreasoncategory_create", methods={"POST"})
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/create', name: 'chill_activity_activityreasoncategory_create', methods: ['POST'])]
     public function createAction(Request $request)
     {
         $entity = new ActivityReasonCategory();
@@ -34,7 +35,7 @@ class ActivityReasonCategoryController extends AbstractController
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
+            $em = $this->managerRegistry->getManager();
             $em->persist($entity);
             $em->flush();
 
@@ -49,14 +50,13 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Displays a form to edit an existing ActivityReasonCategory entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/edit", name="chill_activity_activityreasoncategory_edit")
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/edit', name: 'chill_activity_activityreasoncategory_edit')]
     public function editAction(mixed $id)
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->managerRegistry->getManager();
 
-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -72,14 +72,13 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Lists all ActivityReasonCategory entities.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/", name="chill_activity_activityreasoncategory")
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/', name: 'chill_activity_activityreasoncategory')]
     public function indexAction()
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->managerRegistry->getManager();
 
-        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
+        $entities = $em->getRepository(ActivityReasonCategory::class)->findAll();
 
         return $this->render('@ChillActivity/ActivityReasonCategory/index.html.twig', [
             'entities' => $entities,
@@ -88,9 +87,8 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Displays a form to create a new ActivityReasonCategory entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/new", name="chill_activity_activityreasoncategory_new")
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/new', name: 'chill_activity_activityreasoncategory_new')]
     public function newAction()
     {
         $entity = new ActivityReasonCategory();
@@ -104,14 +102,13 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Finds and displays a ActivityReasonCategory entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/show", name="chill_activity_activityreasoncategory_show")
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/show', name: 'chill_activity_activityreasoncategory_show')]
     public function showAction(mixed $id)
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->managerRegistry->getManager();
 
-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -124,14 +121,13 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Edits an existing ActivityReasonCategory entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/update", name="chill_activity_activityreasoncategory_update", methods={"POST", "PUT"})
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update', methods: ['POST', 'PUT'])]
     public function updateAction(Request $request, mixed $id)
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->managerRegistry->getManager();
 
-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -24,13 +24,12 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  */
 class ActivityReasonController extends AbstractController
 {
-    public function __construct(private readonly ActivityReasonRepository $activityReasonRepository) {}
+    public function __construct(private readonly ActivityReasonRepository $activityReasonRepository, private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {}
 
     /**
      * Creates a new ActivityReason entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/create", name="chill_activity_activityreason_create", methods={"POST"})
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/create', name: 'chill_activity_activityreason_create', methods: ['POST'])]
     public function createAction(Request $request)
     {
         $entity = new ActivityReason();
@@ -38,7 +37,7 @@ class ActivityReasonController extends AbstractController
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
+            $em = $this->managerRegistry->getManager();
             $em->persist($entity);
             $em->flush();
 
@@ -53,14 +52,13 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Displays a form to edit an existing ActivityReason entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/edit", name="chill_activity_activityreason_edit")
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/edit', name: 'chill_activity_activityreason_edit')]
     public function editAction(mixed $id)
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->managerRegistry->getManager();
 
-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository(ActivityReason::class)->find($id);
 
         if (null === $entity) {
             throw new NotFoundHttpException('Unable to find ActivityReason entity.');
@@ -76,12 +74,11 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Lists all ActivityReason entities.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/", name="chill_activity_activityreason")
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/', name: 'chill_activity_activityreason')]
     public function indexAction()
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->managerRegistry->getManager();
 
         $entities = $this->activityReasonRepository->findAll();
 
@@ -92,9 +89,8 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Displays a form to create a new ActivityReason entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/new", name="chill_activity_activityreason_new")
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/new', name: 'chill_activity_activityreason_new')]
     public function newAction()
     {
         $entity = new ActivityReason();
@@ -108,14 +104,13 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Finds and displays a ActivityReason entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/show", name="chill_activity_activityreason_show")
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/show', name: 'chill_activity_activityreason_show')]
     public function showAction(mixed $id)
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->managerRegistry->getManager();
 
-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository(ActivityReason::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -128,14 +123,13 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Edits an existing ActivityReason entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/update", name="chill_activity_activityreason_update", methods={"POST", "PUT"})
      */
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update', methods: ['POST', 'PUT'])]
     public function updateAction(Request $request, mixed $id)
     {
-        $em = $this->getDoctrine()->getManager();
+        $em = $this->managerRegistry->getManager();
 
-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository(ActivityReason::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');

src/Bundle/ChillActivityBundle/Controller/AdminController.php

@@ -18,18 +18,14 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
  */
 class AdminController extends AbstractController
 {
-    /**
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activity', name: 'chill_activity_admin_index')]
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activity", name="chill_activity_admin_index")
-     */
     public function indexActivityAction()
     {
         return $this->render('@ChillActivity/Admin/layout_activity.html.twig');
     }
 
-    /**
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activity_redirect_to_main', name: 'chill_admin_aside_activity_redirect_to_admin_index', options: [null])]
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activity_redirect_to_main", name="chill_admin_aside_activity_redirect_to_admin_index", options={null})
+    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activity_redirect_to_main', name: 'chill_admin_activity_redirect_to_admin_index')]
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activity_redirect_to_main", name="chill_admin_activity_redirect_to_admin_index")
-     */
     public function redirectToAdminIndexAction()
     {
         return $this->redirectToRoute('chill_main_admin_central');

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

@@ -64,7 +64,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
             ->setPerson($person)
             ->setDate($this->faker->dateTimeThisYear())
             ->setDurationTime($this->faker->dateTime(36000))
-            ->setType($this->getRandomActivityType())
+            ->setActivityType($this->getRandomActivityType())
             ->setScope($this->getRandomScope());
 
         //      ->setAttendee($this->faker->boolean())

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -25,14 +25,12 @@ use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -43,25 +41,12 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Class Activity.
- *
- * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
- *
- * @ORM\Table(name="activity")
- *
- * @ORM\HasLifecycleCallbacks
- *
- * @DiscriminatorMap(typeProperty="type", mapping={
- *     "activity": Activity::class
- * })
- *
- * @ActivityValidator\ActivityValidity
- *
- * TODO see if necessary
- * UserCircleConsistency(
- *     "CHILL_ACTIVITY_SEE_DETAILS",
- *     getUserFunction="getUser",
- * path="scope")
  */
+#[DiscriminatorMap(typeProperty: 'type', mapping: ['activity' => Activity::class])]
+#[ORM\Entity(repositoryClass: \Chill\ActivityBundle\Repository\ActivityRepository::class)]
+#[ORM\HasLifecycleCallbacks]
+#[ORM\Table(name: 'activity')]
+#[ActivityValidator\ActivityValidity] // TODO see if necessary
 class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface, TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
@@ -72,176 +57,115 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     final public const SENTRECEIVED_SENT = 'sent';
 
-    /**
+    #[Groups(['read'])]
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
+    #[ORM\ManyToOne(targetEntity: AccompanyingPeriod::class)]
-     *
-     * @Groups({"read"})
-     */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
-    /**
+    #[Groups(['read', 'docgen:read'])]
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
+    #[SerializedName('activityType')]
-     *
+    #[ORM\ManyToOne(targetEntity: ActivityType::class)]
-     * @Groups({"read", "docgen:read"})
+    #[ORM\JoinColumn(name: 'type_id')]
-     *
-     * @SerializedName("activityType")
-     *
-     * @ORM\JoinColumn(name="type_id")
-     */
     private ActivityType $activityType;
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
+    #[ORM\ManyToOne(targetEntity: ActivityPresence::class)]
-     *
-     * @Groups({"docgen:read"})
-     */
     private ?ActivityPresence $attendee = null;
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+    #[ORM\Embedded(class: CommentEmbeddable::class, columnPrefix: 'comment_')]
-     *
-     * @Groups({"docgen:read"})
-     */
     private CommentEmbeddable $comment;
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @ORM\Column(type="datetime")
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_MUTABLE)]
-     *
-     * @Groups({"docgen:read"})
-     */
     private \DateTime $date;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
-     *
-     * @Assert\Valid(traverse=true)
-     *
      * @var Collection<StoredObject>
      */
+    #[Assert\Valid(traverse: true)]
+    #[ORM\ManyToMany(targetEntity: StoredObject::class, cascade: ['persist'])]
     private Collection $documents;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TIME_MUTABLE, nullable: true)]
-     * @ORM\Column(type="time", nullable=true)
-     */
     private ?\DateTime $durationTime = null;
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @ORM\Column(type="boolean", options={"default": false})
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, options: ['default' => false])]
-     *
-     * @Groups({"docgen:read"})
-     */
     private bool $emergency = false;
 
-    /**
+    #[Groups(['read', 'docgen:read'])]
-     * @ORM\Id
+    #[ORM\Id]
-     *
+    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
-     * @ORM\Column(name="id", type="integer")
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
-     *
-     * @ORM\GeneratedValue(strategy="AUTO")
-     *
-     * @Groups({"read", "docgen:read"})
-     */
     private ?int $id = null;
 
-    /**
+    #[Groups(['read', 'docgen:read'])]
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+    #[ORM\ManyToOne(targetEntity: Location::class)]
-     *
-     * @groups({"read", "docgen:read"})
-     */
     private ?Location $location = null;
 
-    /**
+    #[ORM\ManyToOne(targetEntity: Person::class)]
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
-     */
     private ?Person $person = null;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
-     *
-     * @Groups({"read", "docgen:read"})
-     *
      * @var Collection<Person>
      */
+    #[Groups(['read', 'docgen:read'])]
+    #[ORM\ManyToMany(targetEntity: Person::class)]
     private Collection $persons;
 
-    /**
+    #[ORM\Embedded(class: PrivateCommentEmbeddable::class, columnPrefix: 'privateComment_')]
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     */
     private PrivateCommentEmbeddable $privateComment;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
-     *
-     * @Groups({"docgen:read"})
-     *
      * @var Collection<ActivityReason>
      */
+    #[Groups(['docgen:read'])]
+    #[ORM\ManyToMany(targetEntity: ActivityReason::class)]
     private Collection $reasons;
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+    #[ORM\ManyToOne(targetEntity: Scope::class)]
-     *
-     * @Groups({"docgen:read"})
-     */
     private ?Scope $scope = null;
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @ORM\Column(type="string", options={"default": ""})
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, options: ['default' => ''])]
-     *
-     * @Groups({"docgen:read"})
-     */
     private string $sentReceived = '';
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
-     *
-     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
-     *
-     * @Groups({"read", "docgen:read"})
-     *
      * @var Collection<SocialAction>
      */
+    #[Groups(['read', 'docgen:read'])]
+    #[ORM\ManyToMany(targetEntity: SocialAction::class)]
+    #[ORM\JoinTable(name: 'chill_activity_activity_chill_person_socialaction')]
     private Collection $socialActions;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
-     *
-     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
-     *
-     * @Groups({"read", "docgen:read"})
-     *
      * @var Collection<SocialIssue>
      */
+    #[Groups(['read', 'docgen:read'])]
+    #[ORM\ManyToMany(targetEntity: SocialIssue::class)]
+    #[ORM\JoinTable(name: 'chill_activity_activity_chill_person_socialissue')]
     private Collection $socialIssues;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
-     *
-     * @Groups({"read", "docgen:read"})
-     *
      * @var Collection<ThirdParty>
      */
+    #[Groups(['read', 'docgen:read'])]
+    #[ORM\ManyToMany(targetEntity: ThirdParty::class)]
     private Collection $thirdParties;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TIME_MUTABLE, nullable: true)]
-     * @ORM\Column(type="time", nullable=true)
-     */
     private ?\DateTime $travelTime = null;
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+    #[ORM\ManyToOne(targetEntity: User::class)]
-     *
-     * @Groups({"docgen:read"})
-     */
     private ?User $user = null;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
-     *
-     * @Groups({"read", "docgen:read"})
-     *
      * @var Collection<User>
      */
+    #[Groups(['read', 'docgen:read'])]
+    #[ORM\ManyToMany(targetEntity: User::class)]
     private Collection $users;
 
     public function __construct()
@@ -385,9 +309,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->documents;
     }
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @Groups({"docgen:read"})
-     */
     public function getDurationMinute(): int
     {
         if (null === $this->durationTime) {
@@ -515,9 +437,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->travelTime;
     }
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @Groups({"docgen:read"})
-     */
     public function getTravelTimeMinute(): int
     {
         if (null === $this->travelTime) {

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -16,38 +16,24 @@ use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * Class ActivityPresence.
- *
- * @ORM\Entity
- *
- * @ORM\Table(name="activitytpresence")
- *
- * @ORM\HasLifecycleCallbacks
  */
+#[ORM\Entity]
+#[ORM\HasLifecycleCallbacks]
+#[ORM\Table(name: 'activitytpresence')]
 class ActivityPresence
 {
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
-     * @ORM\Column(type="boolean")
-     */
     private bool $active = true;
 
-    /**
+    #[Serializer\Groups(['docgen:read'])]
-     * @ORM\Id
+    #[ORM\Id]
-     *
+    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
-     * @ORM\Column(name="id", type="integer")
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
-     *
-     * @ORM\GeneratedValue(strategy="AUTO")
-     *
-     * @Serializer\Groups({"docgen:read"})
-     */
     private ?int $id = null;
 
-    /**
+    #[Serializer\Groups(['docgen:read'])]
-     * @ORM\Column(type="json")
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
-     *
+    #[Serializer\Context(['is-translatable' => true], groups: ['docgen:read'])]
-     * @Serializer\Groups({"docgen:read"})
-     *
-     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
-     */
     private array $name = [];
 
     /**

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -15,39 +15,24 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Class ActivityReason.
- *
- * @ORM\Entity
- *
- * @ORM\Table(name="activityreason")
- *
- * @ORM\HasLifecycleCallbacks
  */
+#[ORM\Entity]
+#[ORM\HasLifecycleCallbacks]
+#[ORM\Table(name: 'activityreason')]
 class ActivityReason
 {
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
-     * @ORM\Column(type="boolean")
-     */
     private bool $active = true;
 
-    /**
+    #[ORM\ManyToOne(targetEntity: ActivityReasonCategory::class, inversedBy: 'reasons')]
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
-     * inversedBy="reasons")
-     */
     private ?ActivityReasonCategory $category = null;
 
-    /**
+    #[ORM\Id]
-     * @ORM\Id
+    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
-     *
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
-     * @ORM\Column(name="id", type="integer")
-     *
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
     private ?int $id = null;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
-     * @ORM\Column(type="json")
-     */
     private array $name;
 
     /**

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -17,45 +17,32 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Class ActivityReasonCategory.
- *
- * @ORM\Entity
- *
- * @ORM\Table(name="activityreasoncategory")
- *
- * @ORM\HasLifecycleCallbacks
  */
+#[ORM\Entity]
+#[ORM\HasLifecycleCallbacks]
+#[ORM\Table(name: 'activityreasoncategory')]
 class ActivityReasonCategory implements \Stringable
 {
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
-     * @ORM\Column(type="boolean")
-     */
     private bool $active = true;
 
-    /**
+    #[ORM\Id]
-     * @ORM\Id
+    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
-     *
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
-     * @ORM\Column(name="id", type="integer")
-     *
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
     private ?int $id = null;
 
     /**
      * @var string
-     *
-     * @ORM\Column(type="json")
      */
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
     private $name;
 
     /**
      * Array of ActivityReason.
      *
      * @var Collection<ActivityReason>
-     *
-     * @ORM\OneToMany(
-     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReason",
-     * mappedBy="category")
      */
+    #[ORM\OneToMany(targetEntity: ActivityReason::class, mappedBy: 'category')]
     private Collection $reasons;
 
     /**

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -19,13 +19,10 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * Class ActivityType.
- *
- * @ORM\Entity
- *
- * @ORM\Table(name="activitytype")
- *
- * @ORM\HasLifecycleCallbacks
  */
+#[ORM\Entity]
+#[ORM\HasLifecycleCallbacks]
+#[ORM\Table(name: 'activitytype')]
 class ActivityType
 {
     final public const FIELD_INVISIBLE = 0;
@@ -36,262 +33,169 @@ class ActivityType
 
     /**
      * @deprecated not in use
-     *
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
     private string $accompanyingPeriodLabel = '';
 
     /**
      * @deprecated not in use
-     *
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
      */
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
     private int $accompanyingPeriodVisible = self::FIELD_INVISIBLE;
 
-    /**
+    #[Groups(['read'])]
-     * @ORM\Column(type="boolean")
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
-     *
-     * @Groups({"read"})
-     */
     private bool $active = true;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $attendeeLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $attendeeVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\ManyToOne(targetEntity: ActivityTypeCategory::class)]
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityTypeCategory")
-     */
     private ?ActivityTypeCategory $category = null;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $commentLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $commentVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $dateLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 2])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 2})
-     */
     private int $dateVisible = self::FIELD_REQUIRED;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $documentsLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $documentsVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $durationTimeLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $durationTimeVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $emergencyLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $emergencyVisible = self::FIELD_INVISIBLE;
 
-    /**
+    #[Groups(['docgen:read'])]
-     * @ORM\Id
+    #[ORM\Id]
-     *
+    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
-     * @ORM\Column(name="id", type="integer")
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
-     *
-     * @ORM\GeneratedValue(strategy="AUTO")
-     *
-     * @Groups({"docgen:read"})
-     */
     private ?int $id = null;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $locationLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $locationVisible = self::FIELD_INVISIBLE;
 
-    /**
+    #[Groups(['read', 'docgen:read'])]
-     * @ORM\Column(type="json")
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
-     *
+    #[Serializer\Context(['is-translatable' => true], groups: ['docgen:read'])]
-     * @Groups({"read", "docgen:read"})
-     *
-     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
-     */
     private array $name = [];
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::FLOAT, options: ['default' => '0.0'])]
-     * @ORM\Column(type="float", options={"default": "0.0"})
-     */
     private float $ordering = 0.0;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $personLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $personsLabel = '';
 
-    /**
+    #[Groups(['read'])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     *
-     * @Groups({"read"})
-     */
     private int $personsVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 2])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 2})
-     */
     private int $personVisible = self::FIELD_REQUIRED;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $privateCommentLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $privateCommentVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $reasonsLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $reasonsVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $sentReceivedLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $sentReceivedVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $socialActionsLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $socialActionsVisible = self::FIELD_INVISIBLE;
 
     /**
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     *
      * @deprecated not in use
      */
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
     private string $socialDataLabel = '';
 
     /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     *
      * @deprecated not in use
      */
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
     private int $socialDataVisible = self::FIELD_INVISIBLE;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $socialIssuesLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $socialIssuesVisible = self::FIELD_INVISIBLE;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $thirdPartiesLabel = '';
 
-    /**
+    #[Groups(['read'])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     *
-     * @Groups({"read"})
-     */
     private int $thirdPartiesVisible = self::FIELD_INVISIBLE;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $travelTimeLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
     private int $travelTimeVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $userLabel = '';
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, options: ['default' => ''])]
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
     private string $usersLabel = '';
 
-    /**
+    #[Groups(['read'])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 1])]
-     *
-     * @Groups({"read"})
-     */
     private int $usersVisible = self::FIELD_OPTIONAL;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::SMALLINT, nullable: false, options: ['default' => 2])]
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 2})
-     */
     private int $userVisible = self::FIELD_REQUIRED;
 
-    /**
+    #[Assert\Callback]
-     * @Assert\Callback
-     */
     public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload)
     {
         if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
-            if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
+            // if social issues are invisible then social actions cannot be optional or required + if social issues are optional then social actions shouldn't be required
+            if (
+                (0 === $this->socialIssuesVisible && (1 === $this->socialActionsVisible || 2 === $this->socialActionsVisible))
+                || (1 === $this->socialIssuesVisible && 2 === $this->socialActionsVisible)
+            ) {
                 $context
                     ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value')
                     ->atPath('socialActionsVisible')

src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php

@@ -13,37 +13,23 @@ namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
+#[ORM\Entity]
- * @ORM\Entity
+#[ORM\HasLifecycleCallbacks]
- *
+#[ORM\Table(name: 'activitytypecategory')]
- * @ORM\Table(name="activitytypecategory")
- *
- * @ORM\HasLifecycleCallbacks
- */
 class ActivityTypeCategory
 {
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
-     * @ORM\Column(type="boolean")
-     */
     private bool $active = true;
 
-    /**
+    #[ORM\Id]
-     * @ORM\Id
+    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
-     *
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
-     * @ORM\Column(name="id", type="integer")
-     *
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
     private ?int $id = null;
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
-     * @ORM\Column(type="json")
-     */
     private array $name = [];
 
-    /**
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::FLOAT, options: ['default' => '0.0'])]
-     * @ORM\Column(type="float", options={"default": "0.0"})
-     */
     private float $ordering = 0.0;
 
     /**

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityTypeAggregator.php

@@ -56,7 +56,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, mixed $data)
     {
-        return function (null|int|string $value): string {
+        return function (int|string|null $value): string {
             if ('_header' === $value) {
                 return 'export.aggregator.acp.by_activity_type.activity_type';
             }

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

@@ -31,7 +31,7 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, mixed $data)
     {
-        return function (null|int|string $value): string {
+        return function (int|string|null $value): string {
             if ('_header' === $value) {
                 return 'export.aggregator.activity.by_activity_presence.header';
             }

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

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
@@ -25,7 +25,11 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    public function __construct(protected ActivityReasonCategoryRepository $activityReasonCategoryRepository, protected ActivityReasonRepository $activityReasonRepository, protected TranslatableStringHelper $translatableStringHelper) {}
+    public function __construct(
+        protected ActivityReasonCategoryRepository $activityReasonCategoryRepository,
+        protected ActivityReasonRepository $activityReasonRepository,
+        protected TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -49,7 +53,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
 
         // make a jointure only if needed
         if (!\in_array('actreasons', $qb->getAllAliases(), true)) {
-            $qb->innerJoin('activity.reasons', 'actreasons');
+            $qb->leftJoin('activity.reasons', 'actreasons');
         }
 
         // join category if necessary
@@ -60,19 +64,12 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             }
         }
 
-        // add the "group by" part
+        $qb->addGroupBy($alias);
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (\count($groupBy) > 0) {
-            $qb->addGroupBy($alias);
-        } else {
-            $qb->groupBy($alias);
-        }
     }
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY_PERSON;
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -94,7 +91,9 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
 
     public function getFormDefaultData(): array
     {
-        return [];
+        return [
+            'level' => 'reasons',
+        ];
     }
 
     public function getLabels($key, array $values, $data)

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

@@ -56,7 +56,7 @@ class ActivityTypeAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, $data): \Closure
     {
-        return function (null|int|string $value): string {
+        return function (int|string|null $value): string {
             if ('_header' === $value) {
                 return 'Activity type';
             }

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

@@ -79,7 +79,7 @@ final readonly class CreatorJobFilter implements FilterInterface
     {
         $builder
             ->add('jobs', EntityType::class, [
-                'choices' => $this->userJobRepository->findAllOrderedByName(),
+                'choices' => $this->userJobRepository->findAllActive(),
                 'class' => UserJob::class,
                 'choice_label' => fn (UserJob $s) => $this->translatableStringHelper->localize(
                     $s->getLabel()

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

@@ -15,6 +15,7 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
@@ -26,7 +27,8 @@ class CreatorScopeFilter implements FilterInterface
     private const PREFIX = 'acp_act_filter_creator_scope';
 
     public function __construct(
-        private readonly TranslatableStringHelper $translatableStringHelper
+        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly ScopeRepositoryInterface $scopeRepository,
     ) {}
 
     public function addRole(): ?string
@@ -75,6 +77,7 @@ class CreatorScopeFilter implements FilterInterface
         $builder
             ->add('scopes', EntityType::class, [
                 'class' => Scope::class,
+                'choices' => $this->scopeRepository->findAllActive(),
                 'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
                     $s->getName()
                 ),

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

@@ -16,6 +16,7 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\QueryBuilder;
@@ -27,7 +28,8 @@ class UsersJobFilter implements FilterInterface
     private const PREFIX = 'act_filter_user_job';
 
     public function __construct(
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly UserJobRepositoryInterface $userJobRepository
     ) {}
 
     public function addRole(): ?string
@@ -68,6 +70,7 @@ class UsersJobFilter implements FilterInterface
         $builder
             ->add('jobs', EntityType::class, [
                 'class' => UserJob::class,
+                'choices' => $this->userJobRepository->findAllActive(),
                 'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
                 'multiple' => true,
                 'expanded' => true,

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -95,7 +95,7 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod|null $accompanyingPeriod */
+        /** @var AccompanyingPeriod|null $accompanyingPeriod */
         $accompanyingPeriod = null;
 
         if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
@@ -183,6 +183,7 @@ class ActivityType extends AbstractType
             $builder->add('attendee', EntityType::class, [
                 'label' => $activityType->getLabel('attendee'),
                 'required' => $activityType->isRequired('attendee'),
+                'placeholder' => false,
                 'expanded' => true,
                 'class' => ActivityPresence::class,
                 'choice_label' => fn (ActivityPresence $activityPresence) => $this->translatableStringHelper->localize($activityPresence->getName()),
@@ -404,7 +405,7 @@ class ActivityType extends AbstractType
             ->setAllowedTypes('center', ['null', Center::class, 'array'])
             ->setAllowedTypes('role', ['string'])
             ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
-            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
+            ->setAllowedTypes('accompanyingPeriod', [AccompanyingPeriod::class, 'null']);
     }
 
     public function getBlockPrefix(): string

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -27,7 +27,7 @@ final readonly class PersonMenuBuilder implements LocalMenuBuilderInterface
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        /** @var \Chill\PersonBundle\Entity\Person $person */
+        /** @var Person $person */
         $person = $parameters['person'];
 
         if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -242,7 +242,8 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
             thirdparties.thirdpartyids,
             persons.personids,
             actions.socialactionids,
-            issues.socialissueids
+            issues.socialissueids,
+            a.user_id
 
         FROM activity a
         LEFT JOIN chill_main_location location ON a.location_id = location.id
@@ -282,6 +283,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
             ->addJoinedEntityResult(ActivityPresence::class, 'activityPresence', 'a', 'attendee')
             ->addFieldResult('activityPresence', 'presence_id', 'id')
             ->addFieldResult('activityPresence', 'presence_name', 'name')
+            ->addScalarResult('user_id', 'userId', Types::INTEGER)
 
             // results which cannot be mapped into entity
             ->addScalarResult('comment_comment', 'comment', Types::TEXT)

src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php

@@ -35,14 +35,14 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         private Security $security
     ) {}
 
-    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface
     {
         $query = $this->buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext($person, $startDate, $endDate, $content);
 
         return $this->addFetchQueryByPersonACL($query, $person);
     }
 
-    public function buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    public function buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
         $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -71,7 +71,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         return $this->addWhereClauses($query, $startDate, $endDate, $content);
     }
 
-    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
         $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -122,7 +122,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         return $this->addWhereClauses($query, $startDate, $endDate, $content);
     }
 
-    private function addWhereClauses(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    private function addWhereClauses(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
 

src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php

@@ -25,12 +25,12 @@ interface ActivityDocumentACLAwareRepositoryInterface
      *
      * This method must check the rights to see a document: the user must be allowed to see the given activities
      */
-    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface;
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface;
 
     /**
      * Return a fetch query for querying document's activities for an activity in accompanying periods, but for a given person.
      *
      * This method must check the rights to see a document: the user must be allowed to see the given accompanying periods
      */
-    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery;
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery;
 }

src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php

@@ -34,7 +34,7 @@ class ActivityPresenceRepository implements ActivityPresenceRepositoryInterface
         return $this->repository->findAll();
     }
 
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php

@@ -25,7 +25,7 @@ interface ActivityPresenceRepositoryInterface
     /**
      * @return array|ActivityPresence[]
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
 
     public function findOneBy(array $criteria): ?ActivityPresence;
 

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php

@@ -48,7 +48,7 @@ final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
     /**
      * @return array|ActivityType[]
      */
-    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Service\DocGenerator;
 
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
@@ -111,7 +112,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
     }
 
     /**
-     * @return list
+     * @return list<Activity>
      */
     private function filterActivitiesByUser(array $activities, User $user): array
     {
@@ -119,16 +120,22 @@ class ListActivitiesByAccompanyingPeriodContext implements
             array_filter(
                 $activities,
                 function ($activity) use ($user) {
+                    $u = $activity['user'];
+
+                    if (null !== $u && $u['username'] === $user->getUserIdentifier()) {
+                        return true;
+                    }
+
                     $activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []);
 
-                    return \in_array($user->getUsername(), $activityUsernames, true);
+                    return \in_array($user->getUserIdentifier(), $activityUsernames, true);
                 }
             )
         );
     }
 
     /**
-     * @return list
+     * @return list<AccompanyingPeriod\AccompanyingPeriodWork>
      */
     private function filterWorksByUser(array $works, User $user): array
     {
@@ -136,9 +143,9 @@ class ListActivitiesByAccompanyingPeriodContext implements
             array_filter(
                 $works,
                 function ($work) use ($user) {
-                    $workUsernames = array_map(static fn ($user) => $user['username'], $work['referrers'] ?? []);
+                    $workUsernames = array_map(static fn (User $user) => $user['username'], $work['referrers'] ?? []);
 
-                    return \in_array($user->getUsername(), $workUsernames, true);
+                    return \in_array($user->getUserIdentifier(), $workUsernames, true);
                 }
             )
         );
@@ -215,6 +222,15 @@ class ListActivitiesByAccompanyingPeriodContext implements
         foreach ($activities as $row) {
             $activity = $row[0];
 
+            $user = match (null === $row['userId']) {
+                false => $this->userRepository->find($row['userId']),
+                true => null,
+            };
+
+            $activity['user'] = $this->normalizer->normalize($user, 'docgen', [
+                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => User::class,
+            ]);
+
             $activity['date'] = $this->normalizer->normalize($activity['date'], 'docgen', [
                 AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => \DateTime::class,
             ]);

src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php

@@ -36,7 +36,7 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
         private ActivityDocumentACLAwareRepositoryInterface $activityDocumentACLAwareRepository,
     ) {}
 
-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
         $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -99,7 +99,7 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
         return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
     }
 
-    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         return $this->activityDocumentACLAwareRepository
             ->buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext($person, $startDate, $endDate, $content);

src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php

@@ -27,7 +27,7 @@ final readonly class PersonActivityGenericDocProvider implements GenericDocForPe
         private ActivityDocumentACLAwareRepositoryInterface $personActivityDocumentACLAwareRepository,
     ) {}
 
-    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         return $this->personActivityDocumentACLAwareRepository->buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(
             $person,

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

@@ -310,7 +310,7 @@ final class ActivityControllerTest extends WebTestCase
     }
 
     /**
-     * @return \Chill\ActivityBundle\Entity\ActivityType
+     * @return ActivityType
      */
     private function getRandomActivityType()
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByActivityTypeAggregatorTest.php

@@ -36,9 +36,9 @@ class ByActivityTypeAggregatorTest extends AbstractAggregatorTest
         parent::setUp();
 
         self::bootKernel();
-        $this->rollingDateConverter = self::$container->get(RollingDateConverterInterface::class);
+        $this->rollingDateConverter = self::getContainer()->get(RollingDateConverterInterface::class);
-        $this->activityTypeRepository = self::$container->get(ActivityTypeRepositoryInterface::class);
+        $this->activityTypeRepository = self::getContainer()->get(ActivityTypeRepositoryInterface::class);
-        $this->translatableStringHelper = self::$container->get(TranslatableStringHelperInterface::class);
+        $this->translatableStringHelper = self::getContainer()->get(TranslatableStringHelperInterface::class);
     }
 
     public function getAggregator()
@@ -50,7 +50,7 @@ class ByActivityTypeAggregatorTest extends AbstractAggregatorTest
         );
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         return [
             [
@@ -72,11 +72,10 @@ class ByActivityTypeAggregatorTest extends AbstractAggregatorTest
         ];
     }
 
-    public function getQueryBuilders()
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php

@@ -29,7 +29,7 @@ final class BySocialActionAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.bysocialaction_aggregator');
+        $this->aggregator = self::getContainer()->get('chill.activity.export.bysocialaction_aggregator');
     }
 
     public function getAggregator()
@@ -37,18 +37,17 @@ final class BySocialActionAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php

@@ -29,7 +29,7 @@ final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.bysocialissue_aggregator');
+        $this->aggregator = self::getContainer()->get('chill.activity.export.bysocialissue_aggregator');
     }
 
     public function getAggregator()
@@ -37,18 +37,17 @@ final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -31,8 +31,8 @@ class ActivityPresenceAggregatorTest extends AbstractAggregatorTest
     protected function setUp(): void
     {
         self::bootKernel();
-        $this->translatableStringHelper = self::$container->get(TranslatableStringHelperInterface::class);
+        $this->translatableStringHelper = self::getContainer()->get(TranslatableStringHelperInterface::class);
-        $this->activityPresenceRepository = self::$container->get(ActivityPresenceRepositoryInterface::class);
+        $this->activityPresenceRepository = self::getContainer()->get(ActivityPresenceRepositoryInterface::class);
     }
 
     public function getAggregator()
@@ -40,18 +40,17 @@ class ActivityPresenceAggregatorTest extends AbstractAggregatorTest
         return new ActivityPresenceAggregator($this->activityPresenceRepository, $this->translatableStringHelper);
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders()
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -9,10 +9,10 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\PersonAggregators;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
+use Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -32,15 +32,16 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get(ActivityReasonAggregator::class);
+        $this->aggregator = self::getContainer()->get(ActivityReasonAggregator::class);
+        /*
+            $request = $this->prophesize()
+                ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+            $this->aggregator = self::$container->get(ActivityReasonAggregator::class);
 
-        $request = $this->prophesize()
+            $request->getLocale()->willReturn('fr');
-            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
-        $request->getLocale()->willReturn('fr');
+            self::getContainer()->get('request_stack')
-
+                    ->push($request->reveal());*/
-        self::$container->get('request_stack')
-            ->push($request->reveal());
     }
 
     public function getAggregator()
@@ -48,7 +49,7 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             ['level' => 'reasons'],
@@ -56,16 +57,20 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
+                ->from(Activity::class, 'activity')
+                ->join('activity.person', 'person'),
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'accompanyingPeriod'),
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from(Activity::class, 'activity')

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

@@ -34,14 +34,14 @@ final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get(ActivityTypeAggregator::class);
+        $this->aggregator = self::getContainer()->get(ActivityTypeAggregator::class);
 
         $request = $this->prophesize()
             ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
         $request->getLocale()->willReturn('fr');
 
-        self::$container->get('request_stack')
+        self::getContainer()->get('request_stack')
             ->push($request->reveal());
     }
 
@@ -50,18 +50,17 @@ final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders()
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -34,14 +34,14 @@ final class ActivityUserAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get('chill.activity.export.user_aggregator');
+        $this->aggregator = self::getContainer()->get('chill.activity.export.user_aggregator');
 
         $request = $this->prophesize()
             ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
         $request->getLocale()->willReturn('fr');
 
-        self::$container->get('request_stack')
+        self::getContainer()->get('request_stack')
             ->push($request->reveal());
     }
 
@@ -50,18 +50,17 @@ final class ActivityUserAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -29,7 +29,7 @@ final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get(ByThirdpartyAggregator::class);
+        $this->aggregator = self::getContainer()->get(ByThirdpartyAggregator::class);
     }
 
     public function getAggregator()
@@ -37,18 +37,17 @@ final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -29,7 +29,7 @@ final class ByUserAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get(ByCreatorAggregator::class);
+        $this->aggregator = self::getContainer()->get(ByCreatorAggregator::class);
     }
 
     public function getAggregator()
@@ -37,18 +37,17 @@ final class ByUserAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -29,7 +29,7 @@ final class CreatorJobAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get(CreatorJobAggregator::class);
+        $this->aggregator = self::getContainer()->get(CreatorJobAggregator::class);
     }
 
     public function getAggregator()
@@ -37,18 +37,17 @@ final class CreatorJobAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -29,7 +29,7 @@ final class CreatorScopeAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get(CreatorScopeAggregator::class);
+        $this->aggregator = self::getContainer()->get(CreatorScopeAggregator::class);
     }
 
     public function getAggregator()
@@ -37,18 +37,17 @@ final class CreatorScopeAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -29,7 +29,7 @@ final class DateAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get(DateAggregator::class);
+        $this->aggregator = self::getContainer()->get(DateAggregator::class);
     }
 
     public function getAggregator()
@@ -37,7 +37,7 @@ final class DateAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [
@@ -52,11 +52,10 @@ final class DateAggregatorTest extends AbstractAggregatorTest
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -29,7 +29,7 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest
     {
         self::bootKernel();
 
-        $this->aggregator = self::$container->get(LocationTypeAggregator::class);
+        $this->aggregator = self::getContainer()->get(LocationTypeAggregator::class);
     }
 
     public function getAggregator()
@@ -37,18 +37,17 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest
         return $this->aggregator;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/PersonAggregatorTest.php

@@ -29,7 +29,7 @@ class PersonAggregatorTest extends AbstractAggregatorTest
     protected function setUp(): void
     {
         self::bootKernel();
-        $this->labelPersonHelper = self::$container->get(LabelPersonHelper::class);
+        $this->labelPersonHelper = self::getContainer()->get(LabelPersonHelper::class);
     }
 
     public function getAggregator()
@@ -37,16 +37,15 @@ class PersonAggregatorTest extends AbstractAggregatorTest
         return new PersonAggregator($this->labelPersonHelper);
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         return [[]];
     }
 
-    public function getQueryBuilders()
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -30,7 +30,7 @@ class PersonsAggregatorTest extends AbstractAggregatorTest
     {
         parent::setUp();
         self::bootKernel();
-        $this->labelPersonHelper = self::$container->get(LabelPersonHelper::class);
+        $this->labelPersonHelper = self::getContainer()->get(LabelPersonHelper::class);
     }
 
     public function getAggregator()
@@ -38,18 +38,17 @@ class PersonsAggregatorTest extends AbstractAggregatorTest
         return new PersonsAggregator($this->labelPersonHelper);
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getQueryBuilders()
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityDurationTest.php

@@ -29,20 +29,20 @@ final class AvgActivityDurationTest extends AbstractExportTest
 
     public function getExport()
     {
-        $activityRepository = self::$container->get(ActivityRepository::class);
+        $activityRepository = self::getContainer()->get(ActivityRepository::class);
 
         yield new AvgActivityDuration($activityRepository, $this->getParameters(true));
         yield new AvgActivityDuration($activityRepository, $this->getParameters(false));
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination(): array
+    public static function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/AvgActivityVisitDurationTest.php

@@ -29,20 +29,20 @@ final class AvgActivityVisitDurationTest extends AbstractExportTest
 
     public function getExport()
     {
-        $em = self::$container->get(EntityManagerInterface::class);
+        $em = self::getContainer()->get(EntityManagerInterface::class);
 
         yield new AvgActivityVisitDuration($em, $this->getParameters(true));
         yield new AvgActivityVisitDuration($em, $this->getParameters(false));
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination(): array
+    public static function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountActivityTest.php

@@ -29,20 +29,20 @@ final class CountActivityTest extends AbstractExportTest
 
     public function getExport()
     {
-        $em = self::$container->get(EntityManagerInterface::class);
+        $em = self::getContainer()->get(EntityManagerInterface::class);
 
         yield new CountActivity($em, $this->getParameters(true));
         yield new CountActivity($em, $this->getParameters(false));
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination(): array
+    public static function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountHouseholdOnActivityTest.php

@@ -29,7 +29,7 @@ class CountHouseholdOnActivityTest extends AbstractExportTest
     protected function setUp(): void
     {
         self::bootKernel();
-        $this->entityManager = self::$container->get(EntityManagerInterface::class);
+        $this->entityManager = self::getContainer()->get(EntityManagerInterface::class);
     }
 
     public function getExport()
@@ -38,14 +38,14 @@ class CountHouseholdOnActivityTest extends AbstractExportTest
         yield new CountHouseholdOnActivity($this->entityManager, $this->getParameters(false));
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination()
+    public static function getModifiersCombination(): array
     {
         return [
             [

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/CountPersonsOnActivityTest.php

@@ -31,18 +31,18 @@ class CountPersonsOnActivityTest extends AbstractExportTest
 
     public function getExport()
     {
-        $em = self::$container->get(EntityManagerInterface::class);
+        $em = self::getContainer()->get(EntityManagerInterface::class);
 
         yield new CountPersonsOnActivity($em, $this->getParameters(true));
         yield new CountPersonsOnActivity($em, $this->getParameters(false));
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         return [[]];
     }
 
-    public function getModifiersCombination()
+    public static function getModifiersCombination(): array
     {
         return [[
             Declarations::ACTIVITY,

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityDurationTest.php

@@ -29,20 +29,20 @@ final class SumActivityDurationTest extends AbstractExportTest
 
     public function getExport()
     {
-        $em = self::$container->get(EntityManagerInterface::class);
+        $em = self::getContainer()->get(EntityManagerInterface::class);
 
         yield new SumActivityDuration($em, $this->getParameters(true));
         yield new SumActivityDuration($em, $this->getParameters(false));
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination(): array
+    public static function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToACP/SumActivityVisitDurationTest.php

@@ -28,25 +28,25 @@ final class SumActivityVisitDurationTest extends AbstractExportTest
     {
         self::bootKernel();
 
-        $this->export = self::$container->get('chill.activity.export.sum_activity_visit_duration_linked_to_acp');
+        $this->export = self::getContainer()->get('chill.activity.export.sum_activity_visit_duration_linked_to_acp');
     }
 
     public function getExport()
     {
-        $em = self::$container->get(EntityManagerInterface::class);
+        $em = self::getContainer()->get(EntityManagerInterface::class);
 
         yield new SumActivityVisitDuration($em, $this->getParameters(true));
         yield new SumActivityVisitDuration($em, $this->getParameters(false));
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination(): array
+    public static function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountActivityTest.php

@@ -29,20 +29,20 @@ final class CountActivityTest extends AbstractExportTest
 
     public function getExport()
     {
-        $activityRepository = self::$container->get(ActivityRepository::class);
+        $activityRepository = self::getContainer()->get(ActivityRepository::class);
 
         yield new CountActivity($activityRepository, $this->getParameters(true));
         yield new CountActivity($activityRepository, $this->getParameters(false));
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination(): array
+    public static function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/CountHouseholdOnActivityTest.php

@@ -29,7 +29,7 @@ class CountHouseholdOnActivityTest extends AbstractExportTest
     protected function setUp(): void
     {
         self::bootKernel();
-        $this->activityRepository = self::$container->get(ActivityRepository::class);
+        $this->activityRepository = self::getContainer()->get(ActivityRepository::class);
     }
 
     public function getExport()
@@ -38,14 +38,14 @@ class CountHouseholdOnActivityTest extends AbstractExportTest
         yield new CountHouseholdOnActivity($this->activityRepository, $this->getParameters(false));
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination()
+    public static function getModifiersCombination(): array
     {
         return [
             [

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/ListActivityTest.php

@@ -39,16 +39,16 @@ final class ListActivityTest extends AbstractExportTest
 
         $request->getLocale()->willReturn('fr');
 
-        self::$container->get('request_stack')
+        self::getContainer()->get('request_stack')
             ->push($request->reveal());
     }
 
     public function getExport()
     {
-        $em = self::$container->get(EntityManagerInterface::class);
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $translator = self::$container->get(TranslatorInterface::class);
+        $translator = self::getContainer()->get(TranslatorInterface::class);
-        $translatableStringHelper = self::$container->get(TranslatableStringHelperInterface::class);
+        $translatableStringHelper = self::getContainer()->get(TranslatableStringHelperInterface::class);
-        $activityRepository = self::$container->get(ActivityRepository::class);
+        $activityRepository = self::getContainer()->get(ActivityRepository::class);
 
         yield new ListActivity(
             $em,
@@ -67,7 +67,7 @@ final class ListActivityTest extends AbstractExportTest
         );
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         return [
             ['fields' => [
@@ -89,7 +89,7 @@ final class ListActivityTest extends AbstractExportTest
         ];
     }
 
-    public function getModifiersCombination()
+    public static function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Export/LinkedToPerson/StatActivityDurationTest.php

@@ -33,19 +33,19 @@ final class StatActivityDurationTest extends AbstractExportTest
 
     public function getExport()
     {
-        $activityRepository = self::$container->get(ActivityRepository::class);
+        $activityRepository = self::getContainer()->get(ActivityRepository::class);
         yield new StatActivityDuration($activityRepository, $this->getParameters(true), 'sum');
         yield new StatActivityDuration($activityRepository, $this->getParameters(false), 'sum');
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [],
         ];
     }
 
-    public function getModifiersCombination(): array
+    public static function getModifiersCombination(): array
     {
         return [
             ['activity'],

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php

@@ -33,7 +33,7 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get(\Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter::class);
+        $this->filter = self::getContainer()->get(\Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter::class);
     }
 
     public function getFilter()
@@ -41,20 +41,17 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-
         $array = $em->createQueryBuilder()
             ->from(ActivityType::class, 'at')
             ->select('at')
             ->getQuery()
             ->setMaxResults(1)
             ->getResult();
-
         $data = [];
-
         foreach ($array as $a) {
             $data[] = [
                 'accepted_activitytypes' => [],
@@ -86,11 +83,10 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
         return $data;
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -30,7 +30,7 @@ final class ByCreatorFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get(ByCreatorFilter::class);
+        $this->filter = self::getContainer()->get(ByCreatorFilter::class);
     }
 
     public function getFilter()
@@ -38,20 +38,17 @@ final class ByCreatorFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-
         $array = $em->createQueryBuilder()
             ->from(User::class, 'u')
             ->select('u')
             ->getQuery()
             ->setMaxResults(2)
             ->getResult();
-
         $data = [];
-
         foreach ($array as $a) {
             $data[] = [
                 'accepted_users' => $a,
@@ -61,11 +58,10 @@ final class ByCreatorFilterTest extends AbstractFilterTest
         return $data;
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php

@@ -30,7 +30,7 @@ final class BySocialActionFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get(\Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter::class);
+        $this->filter = self::getContainer()->get(\Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter::class);
     }
 
     public function getFilter()
@@ -38,20 +38,16 @@ final class BySocialActionFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
-
         $array = $em->createQueryBuilder()
             ->from(SocialAction::class, 'sa')
             ->select('sa')
             ->getQuery()
             ->getResult();
-
         $data = [];
-
         foreach ($array as $a) {
             $data[] = [
                 'accepted_socialactions' => new ArrayCollection([$a]),
@@ -61,11 +57,10 @@ final class BySocialActionFilterTest extends AbstractFilterTest
         return $data;
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php

@@ -31,7 +31,7 @@ final class BySocialIssueFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get(BySocialIssueFilter::class);
+        $this->filter = self::getContainer()->get(BySocialIssueFilter::class);
     }
 
     public function getFilter()
@@ -39,20 +39,17 @@ final class BySocialIssueFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-
         $array = $em->createQueryBuilder()
             ->from(SocialIssue::class, 'si')
             ->select('si')
             ->getQuery()
             ->setMaxResults(2)
             ->getResult();
-
         $data = [];
-
         foreach ($array as $a) {
             $data[] = [
                 'accepted_socialissues' => new ArrayCollection([$a]),
@@ -62,13 +59,12 @@ final class BySocialIssueFilterTest extends AbstractFilterTest
         return $data;
     }
 
-    public function getQueryBuilders(): array
+    public static function getQueryBuilders(): iterable
     {
         if (null === self::$kernel) {
             self::bootKernel();
         }
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
 
         return [
             $em->createQueryBuilder()

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

@@ -30,7 +30,7 @@ final class ActivityDateFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get(ActivityDateFilter::class);
+        $this->filter = self::getContainer()->get(ActivityDateFilter::class);
     }
 
     public function getFilter()
@@ -38,7 +38,7 @@ final class ActivityDateFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public static function getFormData(): array
     {
         return [
             [
@@ -48,16 +48,13 @@ final class ActivityDateFilterTest extends AbstractFilterTest
         ];
     }
 
-    public function getQueryBuilders(): iterable
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
-
         yield $em->createQueryBuilder()
             ->select('count(activity.id)')
             ->from(Activity::class, 'activity');
-
         self::ensureKernelShutdown();
     }
 }

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

@@ -35,8 +35,8 @@ class ActivityPresenceFilterTest extends AbstractFilterTest
         parent::setUp();
         self::bootKernel();
 
-        $this->translator = self::$container->get(TranslatorInterface::class);
+        $this->translator = self::getContainer()->get(TranslatorInterface::class);
-        $this->translatableStringHelper = self::$container->get(TranslatableStringHelperInterface::class);
+        $this->translatableStringHelper = self::getContainer()->get(TranslatableStringHelperInterface::class);
     }
 
     public function getFilter()
@@ -44,11 +44,10 @@ class ActivityPresenceFilterTest extends AbstractFilterTest
         return new ActivityPresenceFilter($this->translatableStringHelper, $this->translator);
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         self::bootKernel();
-
+        $presences = self::getContainer()->get(ActivityPresenceRepositoryInterface::class)
-        $presences = self::$container->get(ActivityPresenceRepositoryInterface::class)
             ->findAll();
 
         return [
@@ -61,16 +60,13 @@ class ActivityPresenceFilterTest extends AbstractFilterTest
         ];
     }
 
-    public function getQueryBuilders()
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
-
         yield $em->createQueryBuilder()
             ->select('count(activity.id)')
             ->from(Activity::class, 'activity');
-
         self::ensureKernelShutdown();
     }
 }

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

@@ -33,14 +33,14 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $this->filter = self::$container->get('chill.activity.export.reason_filter');
+        $this->filter = self::getContainer()->get('chill.activity.export.reason_filter');
 
         $request = $this->prophesize()
             ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
         $request->getLocale()->willReturn('fr');
 
-        self::$container->get(RequestStack::class)
+        self::getContainer()->get(RequestStack::class)
             ->push($request->reveal());
     }
 
@@ -49,35 +49,29 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData()
+    public static function getFormData(): array
     {
         self::bootKernel();
         $data = [];
-
+        $em = self::getContainer()
-        $em = self::$container
             ->get(EntityManagerInterface::class);
-
         $reasons = $em->createQuery('SELECT reason '
                 .'FROM ChillActivityBundle:ActivityReason reason')
             ->getResult();
-
         // generate an array of 5 different combination of results
         for ($i = 0; 5 > $i; ++$i) {
             $data[] = ['reasons' => new ArrayCollection(array_splice($reasons, ($i + 1) * -1))];
             $data[] = ['reasons' => array_splice($reasons, ($i + 1) * -1)];
         }
-
         self::ensureKernelShutdown();
 
         return $data;
     }
 
-    public function getQueryBuilders(): iterable
+    public static function getQueryBuilders(): iterable
     {
         self::bootKernel();
-
+        $em = self::getContainer()->get(EntityManagerInterface::class);
-        $em = self::$container->get(EntityManagerInterface::class);
-
         yield $em->createQueryBuilder()
             ->select('count(activity.id)')
             ->from('ChillActivityBundle:Activity', 'activity');
@@ -90,7 +84,6 @@ final class ActivityReasonFilterTest extends AbstractFilterTest
             ->from('ChillActivityBundle:Activity', 'activity')
             ->join('activity.reasons', 'reasons')
             ->join('reasons.category', 'category');
-
         self::ensureKernelShutdown();
     }
 }