do not allow to remove doc or evaluations if workflow is associated

fix parcours localisation

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

.env

@@ -1,64 +0,0 @@
-##
-##  Manually dump .env files in .env.local.php with
-## `$ composer symfony:dump-env prod`
-##
-
-## Project environment
-APP_ENV=dev
-
-## Enable debug
-APP_DEBUG=true
-
-## Locale
-LOCALE=fr
-
-## Framework secret
-APP_SECRET=ThisTokenIsNotSoSecretChangeIt
-
-## Symfony/swiftmailer
-MAILER_TRANSPORT=smtp
-MAILER_HOST=smtp
-MAILER_PORT=1025
-MAILER_CRYPT=
-MAILER_AUTH=
-MAILER_USER=
-MAILER_PASSWORD=
-MAILER_URL=${MAILER_TRANSPORT}://${MAILER_HOST}:${MAILER_PORT}?encryption=${MAILER_CRYPT}&auth_mode=${MAILER_AUTH}&username=${MAILER_USER}&password=${MAILER_PASSWORD}
-
-## Notifications
-NOTIFICATION_HOST=localhost:8001
-NOTIFICATION_FROM_EMAIL=admin@chill.social
-NOTIFICATION_FROM_NAME=Chill
-
-## Gelf
-GELF_HOST=gelf
-GELF_PORT=12201
-
-## OVH OpenStack Storage User/Role
-OS_USERNAME=
-OS_PASSWORD=
-OS_TENANT_ID=
-OS_REGION_NAME=GRA
-OS_AUTH_URL=https://auth.cloud.ovh.net/v2.0/
-
-## 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=~
-
-## DOCKER IMAGES REGISTRY
-#IMAGE_PHP=
-#IMAGE_NGINX=
-
-## DOCKER IMAGES VERSION
-#VERSION=test
-VERSION=prod

.gitlab-ci.yml

@@ -29,6 +29,7 @@ variables:
     REDIS_URL: redis://redis:6379
     # change vendor dir to make the app install into tests/apps
     COMPOSER_VENDOR_DIR: tests/app/vendor
+    DEFAULT_CARRIER_CODE: BE
 
 stages:
     - Composer install
@@ -78,6 +79,7 @@ psalm_tests:
     image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
     script:
         - bin/grumphp run --tasks=psalm
+    allow_failure: true
     artifacts:
         expire_in: 30 min
         paths:

CHANGELOG.md

@@ -11,16 +11,121 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
-* renomme date de début en date d'ouverture dans le formulaire parcours
-
+* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
+* [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
+* [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)
+* [activity] do not override location if already exist (when validating new activity) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/470)
+* [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
+* [docstore] Add an API entrypoint for StoredObject (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
+* [person] Add the possibility of uploading existing documents to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
+* [person] Add title to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
+* [person] Order social issues by the field "ordering" (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/388)
+* [Person/Household list] when listing other simultaneous members of an household, exclude the members on person, not on members (avoid to show two membersship with the same person)
+* [draft periods] add a delete button (if acl granted) on each draft period listed on draft period page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/463)
+* [Person] Display suffixText in RenderPerson, PersonText.vue, RenderPersonBox.vue (was made for displaying "enfant confie") (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/441)
+* [person] residential address: show residential address or info in PersonRenderBox, refactor Residential Address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/439)
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+* [documents] Improve flex-table item-col placement when long buttons and long metadata
+* [thirdparty] Fix display of multiple contact badges so they wrap onto next line (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/482)
+* [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
+* [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
+* [template] do not list inactive templates (for doc generator)
+* [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
+* [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
+* [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
 
 ## Test releases
 
+### test release 2022-02-21
+
+* [notifications] Word 'un' changed to number '1' for notifications in user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/483)
+* [documents] 'gabarit' changed to 'modèle' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/405)
+* [person_resources] Menu name and order changed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/460)
+* workflow: fix sending notifications
+* [thirdparty] Extend the thirdparty search to thirdparty children (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/448)
+* [person]: AddPersons: allow creation of person or thirdparty only (no users) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [person]: AddPersons: allow creation of person or thirdparty depending on allowed types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [person]: AddPersons: add suggestion of name when creating new person or thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
+* [main] Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber)
+* [main] Address: stronger client-side validation of addresses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/449)
+* [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
+[activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
+[activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
+* [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465)
+* [Household]: Add end date in HouseholdMember form for 'enfant hors menage' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/434)
+* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
+* [parcours]: Order social activities and only display most recent three in parcours resumé (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/481)
+* [3party]: 3party: redirect to parent when contact (child) is opened in view page
+* [parcours / addresses]: launch an event when a person change address (either through changing household or because the household is associated to a new address). If the person is localising a course, the course location go back to a temporarily address.
+* [thirdparty]: address/phonenumber/email/fonction displayed in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/401)
+* [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465)
+* [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
+
+
+## Test releases
+* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
+
+### test release 2022-02-14
+
+* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
+* [doc-generator] do not set required fields for mainPerson, person1, person2 (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement#456)
+* [doc-generation] add age and obele in the mainPerson, person1 and person2 list + add obele in person renderString if addAge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/370)
+* [person] accompanying course work: fix on-the-fly update of thirdParty
+* fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
+* [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
+* [person] accompanying course work: fix on-the-fly update of thirdParty
+* [on-the-fly] close modal only after validation
+* [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
+* change order for accompanying course work list
+* [parcours]: Mes parcours brouillon added to user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/440)
+* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
+* [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432)
+* [parcours]: Only the referrer can toggle the intensity of the parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
+* [household]: display address of current household (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/415)
+* ajoute un ordre dans les localisation (api)
+* [pick entity]: fix translations in modal (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/419)
+* [homepage_widget]: fix translation on emergency badge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/440)
+* [person]: create person and household added to button dropdown (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/454)
+* display full address in address.text in normalization. Adapt AddressRenderBox
+* [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
+* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
+* [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
+
+
+### test release 2021-02-01
+
+* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
+* renomme date de début en date d'ouverture dans le formulaire parcours
+* [homepage widget] improve content tables, improve counter pluralization with style on number
+* [notification lists] add comments counter information
+* [workflows] fix popover header with previous transition
+* [parcours]: validation + message for closing parcours adjusted.
+* [household]: household composition double edit button replaced by a delete action (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/426)
+[fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
+[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+* [person]: Comment on marital status is possible even if marital status is not defined (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/421)
+* [parcours]: In the list of person results the requestor is not displayed if defined as anonymous (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/424)
+* [bugfix]: modal closes and newly created person/thirdparty is selected when multiple persons/thirdparties are created through the modal (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/429)
+* [person_resource]: Onthefly button added to view person/thirdparty and badge differentiation for a contact-thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/428)
+* [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
+* [AddAddress] disable multiselect search, and rely only on most pertinent Cities and Street computed backend
+* [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+
+
+## Test releases
+=======
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+>>>>>>> issue422_and_others_on_AddPersons
+
+=======
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+
+>>>>>>> b0d50d315c8e00959a967badac9cf5057ab2b4bc
 ### test release 2021-01-31
 
-[fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
-[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.  
 * [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)
 * [person] accompanying course: close modal when edit participation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
 * [person] accompanying course: treat validation error when editing on-the-fly entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
@@ -31,7 +136,6 @@ and this project adheres to
 * [user]: page with accompanying periods to which is user is referent (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/408)
 * [person] age added to renderstring + renderbox/ vue component created to display person text (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/389)
 * [household member editor] allow to push to existing household
-* [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
 
 
 ### test release 2021-01-28
@@ -67,7 +171,7 @@ and this project adheres to
 * [popover] add popover html popup mechanism (used by workflow breadcrumb)
 * [templates] improve updatedBy macro in item metadatas
 * [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385)
-* [workflow] 
+* [workflow]
   * add My workflow section with my opened subscriptions
   * apply workflow on documents, accompanyingCourseWork and Evaluations
 * [wopi-link] a new vue component allow to open wopi link in a fullscreen chill-themed modal
@@ -225,6 +329,7 @@ and this project adheres to
 * add an endpoint for checking permissions. See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
 * [activity] for a new activity: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
 * [calendar] for a new rdv: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
+* [period] Validation added when period is confidential and confirmed -> user cannot be null.
 
 
 ## Test releases

composer.json

@@ -22,6 +22,7 @@
         "league/csv": "^9.7.1",
         "nyholm/psr7": "^1.4",
         "ocramius/package-versions": "^1.10",
+        "odolbeau/phone-number-bundle": "^3.6",
         "phpoffice/phpspreadsheet": "^1.16",
         "ramsey/uuid-doctrine": "^1.7",
         "sensio/framework-extra-bundle": "^5.5",

phpstan-critical.neon

@@ -25,11 +25,6 @@ parameters:
             count: 1
             path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
 
-        -
-            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Household\\\\MembersEditorFactory\\:\\:\\$validator\\.$#"
-            count: 2
-            path: src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
-
         -
             message: "#^Variable variables are not allowed\\.$#"
             count: 4

phpstan-deprecations.neon

@@ -105,15 +105,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\ListActivity\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
-
 		-
 			message:
 				"""
@@ -141,15 +132,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityDateFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
-
 		-
 			message:
 				"""
@@ -195,15 +177,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\PersonHavingActivityBetweenDateFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
-
 		-
 			message:
 				"""
@@ -213,15 +186,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Menu\\\\PersonMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
-
 		-
 			message:
 				"""
@@ -258,15 +222,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\AsideActivityBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
-
 		-
 			message:
 				"""
@@ -276,15 +231,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\AbstractElementController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
-
 		-
 			message:
 				"""
@@ -294,24 +240,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\ElementController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
-
 		-
 			message:
 				"""
@@ -321,15 +249,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\CalendarBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
-
 		-
 			message:
 				"""
@@ -399,33 +318,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\CustomFieldsBundle\\\\Form\\\\CustomFieldsGroupType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
-
-		-
-			message:
-				"""
-					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-					Use getReachableCircles$#
-				"""
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\DocStoreBundle\\\\Controller\\\\DocumentPersonController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
 		-
 			message:
 				"""
@@ -435,15 +327,6 @@ parameters:
 			count: 6
 			path: src/Bundle/ChillEventBundle/Controller/EventController.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Controller\\\\EventController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
 		-
 			message:
 				"""
@@ -462,42 +345,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickEventType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickRoleType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickStatusType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Menu\\\\PersonMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
-
 		-
 			message:
 				"""
@@ -507,24 +354,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Controller\\\\FamilyMemberController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
-
 		-
 			message:
 				"""
@@ -534,24 +363,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
 
-		-
-			message:
-				"""
-					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
-
-		-
-			message:
-				"""
-					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
 		-
 			message:
 				"""
@@ -561,15 +372,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
 
-		-
-			message:
-				"""
-					#^Return type of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getTranslator\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
 		-
 			message:
 				"""
@@ -588,24 +390,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Controller\\\\PasswordController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
 		-
 			message:
 				"""
@@ -678,42 +462,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVPivotedListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadsheetListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
-
 		-
 			message:
 				"""
@@ -732,15 +480,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\PostalCodeType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
-
 		-
 			message:
 				"""
@@ -764,38 +503,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/UserType.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Notification\\\\Mailer\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Notification/Mailer.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 2
 			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Routing\\\\MenuBuilder\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Routing\\\\MenuComposer\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Routing/MenuComposer.php
-
 		-
 			message:
 				"""
@@ -882,15 +594,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Validation\\\\Validator\\\\RoleScopeScopePresence\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
-
 		-
 			message:
 				"""
@@ -927,15 +630,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$trans of method Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseWorkController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
-
 		-
 			message:
 				"""
@@ -945,33 +639,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdMemberController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
 		-
 			message:
 				"""
@@ -981,15 +648,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
 		-
 			message: "#^Access to deprecated property \\$proxyAccompanyingPeriodOpenState of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\.$#"
 			count: 2
@@ -1004,15 +662,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\CountryOfBirthAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
-
 		-
 			message:
 				"""
@@ -1022,15 +671,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\GenderAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
-
 		-
 			message:
 				"""
@@ -1040,15 +680,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\NationalityAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
-
 		-
 			message:
 				"""
@@ -1085,15 +716,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPerson\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
 		-
 			message:
 				"""
@@ -1121,15 +743,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPersonDuplicate\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
-
 		-
 			message:
 				"""
@@ -1175,15 +788,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\GenderFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
-
 		-
 			message:
 				"""
@@ -1225,24 +829,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Form\\\\Type\\\\PickPersonType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Menu\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
-
 		-
 			message:
 				"""
@@ -1306,15 +892,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportList\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
 		-
 			message:
 				"""
@@ -1324,15 +901,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportListProvider\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
-
 		-
 			message:
 				"""
@@ -1414,15 +982,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Controller\\\\TaskController\\:\\:applyTransitionAction\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
-
 		-
 			message:
 				"""
@@ -1468,33 +1027,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\MenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
-
 		-
 			message:
 				"""
@@ -1531,33 +1063,6 @@ parameters:
 			count: 3
 			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
 
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Controller\\\\ThirdPartyController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Form\\\\Type\\\\PickThirdPartyType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Menu\\\\MenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
-
 		-
 			message:
 				"""

phpstan-types.neon

@@ -295,11 +295,6 @@ parameters:
 			count: 3
 			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
 
-		-
-			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
@@ -325,11 +320,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="v4.15.0@a1b5e489e6fcebe40cb804793d964e99fc347820">
+<files psalm-version="4.18.0.0">
   <file src="src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php">
     <UndefinedClass occurrences="4">
       <code>'ChillActivityBundle:ActivityReasonCategory'</code>
@@ -47,6 +47,11 @@
       <code>Activity[]|array</code>
     </UndefinedDocblockClass>
   </file>
+  <file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php">
+    <DuplicateClass occurrences="1">
+      <code>AppKernel</code>
+    </DuplicateClass>
+  </file>
   <file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php">
     <MissingFile occurrences="1">
       <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
@@ -164,72 +169,18 @@
       <code>type</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
     <UndefinedDocblockClass occurrences="1">
       <code>\Chill\PersonBundle\Export\Filter\PersonHavingActivityBetweenDateFilter</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
     <TooFewArguments occurrences="2"/>
     <UndefinedDocblockClass occurrences="1">
       <code>Prophecy\Prophet</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
     <UndefinedDocblockClass occurrences="1">
       <code>type</code>
     </UndefinedDocblockClass>
@@ -254,11 +205,6 @@
       <code>$asideActivityCategory</code>
     </ParamNameMismatch>
   </file>
-  <file src="src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php">
     <InvalidStaticInvocation occurrences="3">
       <code>$calculator::getAlias()</code>
@@ -288,11 +234,6 @@
       <code>'ChillCalendarBundle:Calendar'</code>
     </UndefinedClass>
   </file>
-  <file src="src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php">
     <UndefinedClass occurrences="1">
       <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
@@ -397,10 +338,6 @@
     </UndefinedDocblockClass>
   </file>
   <file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
     <UndefinedDocblockClass occurrences="4">
       <code>type</code>
       <code>type</code>
@@ -408,61 +345,6 @@
       <code>type</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillDocStoreBundle:AccompanyingCourseDocument'</code>
-    </UndefinedClass>
-  </file>
   <file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php">
     <UndefinedClass occurrences="3">
       <code>'ChillDocStoreBundle:DocumentCategory'</code>
@@ -470,11 +352,6 @@
       <code>'ChillDocStoreBundle:DocumentCategory'</code>
     </UndefinedClass>
   </file>
-  <file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillDocStoreBundle:PersonDocument'</code>
-    </UndefinedClass>
-  </file>
   <file src="src/Bundle/ChillDocStoreBundle/Entity/Document.php">
     <UndefinedDocblockClass occurrences="1">
       <code>\Chill\PersonBundle\Entity\user</code>
@@ -570,9 +447,6 @@
     <InvalidParamDefault occurrences="1">
       <code>type</code>
     </InvalidParamDefault>
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="8">
       <code>'ChillEventBundle:Event'</code>
       <code>'ChillEventBundle:Event'</code>
@@ -588,10 +462,6 @@
     </UndefinedDocblockClass>
   </file>
   <file src="src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="1">
       <code>'ChillMainBundle:Scope'</code>
     </UndefinedClass>
@@ -891,11 +761,6 @@
       <code>OptionsResolverInterface</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillMainBundle/Notification/Mailer.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>\Symfony\Component\Mailer\Exception\TransportExceptionInterface</code>
-    </UndefinedDocblockClass>
-  </file>
   <file src="src/Bundle/ChillMainBundle/Pagination/PageGenerator.php">
     <UndefinedVariable occurrences="1">
       <code>$current</code>
@@ -924,11 +789,6 @@
       <code>$onlyEnabled</code>
     </ParamNameMismatch>
   </file>
-  <file src="src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php">
-    <DuplicateClass occurrences="1">
-      <code>AppKernel</code>
-    </DuplicateClass>
-  </file>
   <file src="src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php">
     <MissingFile occurrences="1">
       <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
@@ -1056,158 +916,15 @@
     </UndefinedClass>
   </file>
   <file src="src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
     <UndefinedDocblockClass occurrences="1">
       <code>type</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>protected function tearDown()</code>
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
-    <UndefinedDocblockClass occurrences="40">
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>Prophecy\Prophet</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php">
-    <UndefinedClass occurrences="1">
-      <code>CenterType</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="1">
-      <code>CenterType</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
     <UndefinedDocblockClass occurrences="1">
       <code>unknown</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php">
     <UndefinedDocblockClass occurrences="1">
       <code>unknown</code>
@@ -1412,20 +1129,6 @@
       <code>OptionsResolverInterface</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php">
-    <UndefinedClass occurrences="6">
-      <code>$qb</code>
-      <code>$qb</code>
-      <code>$qb</code>
-      <code>QueryBuilder</code>
-      <code>SocialAction</code>
-      <code>SocialAction</code>
-    </UndefinedClass>
-    <UndefinedVariable occurrences="2">
-      <code>$action</code>
-      <code>$orderBy</code>
-    </UndefinedVariable>
-  </file>
   <file src="src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php">
     <DuplicateClass occurrences="1">
       <code>AppKernel</code>
@@ -1505,33 +1208,13 @@
     </ParamNameMismatch>
   </file>
   <file src="src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="2">
       <code>AccompanyingPeriodRepository</code>
       <code>stdClass</code>
     </UndefinedClass>
   </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php">
     <InvalidThrow occurrences="1"/>
-    <MethodSignatureMismatch occurrences="3">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="3">
       <code>'ChillMainBundle:Center'</code>
       <code>'ChillPersonBundle:AccompanyingPeriod\ClosingMotive'</code>
@@ -1543,40 +1226,19 @@
     </UndefinedDocblockClass>
   </file>
   <file src="src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function tearDown()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="1">
       <code>User</code>
     </UndefinedClass>
   </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php">
     <InvalidScope occurrences="1">
       <code>$this</code>
     </InvalidScope>
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="1">
       <code>'ChillPersonBundle:Person'</code>
     </UndefinedClass>
   </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public static function tearDownAfterClass()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="2">
       <code>'ChillMainBundle:Country'</code>
       <code>'ChillPersonBundle:Person'</code>
@@ -1586,140 +1248,25 @@
     </UndefinedDocblockClass>
   </file>
   <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="2">
       <code>'ChillMainBundle:Country'</code>
       <code>'ChillPersonBundle:Person'</code>
     </UndefinedClass>
   </file>
   <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="1">
       <code>'ChillPersonBundle:Person'</code>
     </UndefinedClass>
   </file>
   <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="1">
       <code>'ChillPersonBundle:Person'</code>
     </UndefinedClass>
   </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php">
     <AssignmentToVoid occurrences="1">
       <code>$participationL</code>
     </AssignmentToVoid>
-    <NullReference occurrences="1">
-      <code>getEndDate</code>
-    </NullReference>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
   </file>
   <file src="src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php">
     <UndefinedClass occurrences="1">
@@ -1820,20 +1367,13 @@
       <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
     </MissingFile>
   </file>
-  <file src="src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php">
     <InvalidParamDefault occurrences="1">
       <code>type</code>
     </InvalidParamDefault>
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
-    <UndefinedDocblockClass occurrences="29">
+    <UndefinedDocblockClass occurrences="31">
+      <code>$client</code>
+      <code>$client</code>
       <code>$client</code>
       <code>$client</code>
       <code>$client</code>
@@ -1865,16 +1405,7 @@
       <code>type</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php">
-    <UndefinedClass occurrences="1">
-      <code>Exception</code>
-    </UndefinedClass>
-  </file>
   <file src="src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
     <UndefinedDocblockClass occurrences="3">
       <code>type</code>
       <code>type</code>
@@ -1882,10 +1413,6 @@
     </UndefinedDocblockClass>
   </file>
   <file src="src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
     <UndefinedClass occurrences="1">
       <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
     </UndefinedClass>
@@ -1958,11 +1485,6 @@
       <code>CacheItempPoolInterface</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php">
     <UndefinedClass occurrences="1">
       <code>$taggedService-&gt;getClass()::getKey()</code>
@@ -1988,11 +1510,6 @@
       <code>$thirdParty</code>
     </ParamNameMismatch>
   </file>
-  <file src="src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
   <file src="src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php">
     <UndefinedDocblockClass occurrences="6">
       <code>$object</code>

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -34,6 +34,7 @@ use Psr\Log\LoggerInterface;
 use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -200,12 +201,36 @@ final class ActivityController extends AbstractController
             'role' => new Role('CHILL_ACTIVITY_UPDATE'),
             'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
+        ]);
+
+        if ($form->has('documents')) {
+            $form->add('gendocTemplateId', HiddenType::class, [
+                'mapped' => false,
+                'data' => null,
+                'attr' => [
+                    // required for js
+                    'data-template-id' => 'data-template-id',
+                ],
+            ]);
+        }
+
+        $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
             $this->entityManager->persist($entity);
             $this->entityManager->flush();
 
+            if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
+                return $this->redirectToRoute(
+                    'chill_docgenerator_generate_from_template',
+                    [
+                        'template' => $form->get('gendocTemplateId')->getData(),
+                        'entityClassName' => Activity::class,
+                        'entityId' => $entity->getId(),
+                    ]
+                );
+            }
+
             $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
@@ -393,12 +418,36 @@ final class ActivityController extends AbstractController
             'role' => new Role('CHILL_ACTIVITY_CREATE'),
             'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
+        ]);
+
+        if ($form->has('documents')) {
+            $form->add('gendocTemplateId', HiddenType::class, [
+                'mapped' => false,
+                'data' => null,
+                'attr' => [
+                    // required for js
+                    'data-template-id' => 'data-template-id',
+                ],
+            ]);
+        }
+
+        $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
             $this->entityManager->persist($entity);
             $this->entityManager->flush();
 
+            if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
+                return $this->redirectToRoute(
+                    'chill_docgenerator_generate_from_template',
+                    [
+                        'template' => $form->get('gendocTemplateId')->getData(),
+                        'entityClassName' => Activity::class,
+                        'entityId' => $entity->getId(),
+                    ]
+                );
+            }
+
             $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -357,7 +357,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         if (null !== $this->accompanyingPeriod) {
             $personsAssociated = [];
 
-            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
+            foreach ($this->accompanyingPeriod->getOpenParticipations() as $participation) {
                 if ($this->persons->contains($participation->getPerson())) {
                     $personsAssociated[] = $participation->getPerson();
                 }

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

@@ -24,9 +24,9 @@ use Doctrine\ORM\Query;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function count;

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

@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ActivityDateFilter implements FilterInterface
 {

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

@@ -29,8 +29,8 @@ use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -15,7 +15,7 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {

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

@@ -19,14 +19,18 @@
          </ul>
       </div>
 
-      <add-persons
-         buttonTitle="activity.add_persons"
-         modalTitle="activity.add_persons"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersonsOptions"
-         @addNewPersons="addNewPersons"
-         ref="addPersons">
-      </add-persons>
+      <ul class="record_actions">
+         <li class="add-persons">
+            <add-persons
+               buttonTitle="activity.add_persons"
+               modalTitle="activity.add_persons"
+               v-bind:key="addPersons.key"
+               v-bind:options="addPersonsOptions"
+               @addNewPersons="addNewPersons"
+               ref="addPersons">
+            </add-persons>
+         </li>
+      </ul>
 
    </teleport>
 </template>

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

@@ -1,7 +1,7 @@
 <template>
    <li>
-      <span :title="person.text">
-         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
+      <span :title="person.text" @click.prevent="$emit('remove', person)">
+         <span class="chill_denomination">
             <person-text :person="person" :isCut="true"></person-text>
          </span>
       </span>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js

@@ -2,11 +2,15 @@ import { createApp } from 'vue';
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
 import { activityMessages } from './i18n'
 import store from './store'
+import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
+import {fetchTemplates} from 'ChillDocGeneratorAssets/api/pickTemplate.js';
 
 import App from './App.vue';
 
 const i18n = _createI18n(activityMessages);
 
+// app for activity
+
 const hasSocialIssues = document.querySelector('#social-issues-acc') !== null;
 const hasLocation = document.querySelector('#location') !== null;
 const hasPerson = document.querySelector('#add-persons') !== null;
@@ -29,3 +33,54 @@ const app = createApp({
 .use(i18n)
 .component('app', App)
 .mount('#activity');
+
+
+// app for picking template
+
+const i18nGendoc = _createI18n({});
+
+document.querySelectorAll('div[data-docgen-template-picker]').forEach(el => {
+    fetchTemplates(el.dataset.entityClass).then(templates => {
+        const picker = {
+            template:
+                '<pick-template :templates="this.templates" :preventDefaultMoveToGenerate="true" ' +
+                    ':entityClass="faked" @go-to-generate-document="generateDoc"></pick-template>',
+            components: {
+                PickTemplate,
+            },
+            data() {
+                return {
+                    templates: templates,
+                    entityId: el.dataset.entityId,
+                }
+            },
+            methods: {
+                generateDoc({event, link, template}) {
+                    console.log('generateDoc');
+                    console.log('link', link);
+                    console.log('template', template);
+
+                    let hiddenInput = document.querySelector("input[data-template-id]");
+
+                    if (hiddenInput === null) {
+                        console.error('hidden input not found');
+                        return;
+                    }
+
+                    hiddenInput.value = template;
+
+                    let form = document.querySelector('form[name="chill_activitybundle_activity"');
+
+                    if (form === null) {
+                        console.error('form not found');
+                        return;
+                    }
+
+                    form.submit();
+                }
+            }
+        };
+        createApp(picker).use(i18nGendoc).mount(el);
+    })
+
+});

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js

@@ -110,10 +110,8 @@ export default function prepareLocations(store) {
         console.log('default loation id', window.default_location_id);
         if (window.default_location_id) {
             for (let group of store.state.availableLocations) {
-                console.log(group);
                 let location = group.locations.find((l) => l.id === window.default_location_id);
-                console.log(location);
-                if (location !== undefined) {
+                if (location !== undefined & store.state.activity.location === null) {
                     store.dispatch('updateLocation', location);
                     break;
                 }

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

@@ -68,7 +68,7 @@
                     <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
                     <div class="wl-col list">
                         <p class="wl-item">
-                            {{ activity.user|chill_entity_render_string|capitalize }}
+                            {{ activity.user|chill_entity_render_box }}
                         </p>
                     </div>
                 </div>

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

@@ -89,9 +89,9 @@
 
 {%- if edit_form.documents is defined -%}
     {{ form_row(edit_form.documents) }}
+    <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
 {% endif %}
 
-<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
 
 {% set person_id = null %}
 {% if entity.person %}

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

@@ -24,12 +24,10 @@
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
-    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
-    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}

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

@@ -39,11 +39,9 @@
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
-    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}
 
 {% block css %}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
-    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}

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

@@ -13,7 +13,7 @@
                         <p class="date-label">{{ activity.date|format_date('short') }}</p>
                     {%- endif -%}
 
-                    <span class="like-h3">{{ activity.type.name | localize_translatable_string }}</span>
+                    <span class="like-h3">{{ activity.type.name|localize_translatable_string }}</span>
 
                     {% if activity.emergency %}
                         <span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
@@ -41,7 +41,7 @@
                         {% if activity.user and t.userVisible %}
                             <li>
                                 <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <b>{{ activity.user.usernameCanonical }}</b>
+                                <b>{{ activity.user|chill_entity_render_box}}</b>
                             </li>
                         {% endif %}
 

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

@@ -87,6 +87,7 @@
 
 {%- if form.documents is defined -%}
     {{ form_row(form.documents) }}
+    <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
 {% endif %}
 
 {%- if form.attendee is defined -%}

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

@@ -17,10 +17,6 @@
     {{ parent() }}
     {{ encore_entry_script_tags('mod_async_upload') }}
     <script type="text/javascript">
-        window.addEventListener('DOMContentLoaded', function (e) {
-            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
-            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
-        });
         window.activity = {{ activity_json|json_encode|raw }};
         {% if default_location is not null %}window.default_location_id = {{ default_location.id }}{% endif %};
     </script>

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

@@ -17,13 +17,12 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
-use Chill\DocStoreBundle\Entity\Document;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -44,7 +43,7 @@ class ActivityContext implements
 
     private NormalizerInterface $normalizer;
 
-    private PersonRender $personRender;
+    private PersonRenderInterface $personRender;
 
     private TranslatableStringHelperInterface $translatableStringHelper;
 
@@ -55,7 +54,7 @@ class ActivityContext implements
         NormalizerInterface $normalizer,
         TranslatableStringHelperInterface $translatableStringHelper,
         EntityManagerInterface $em,
-        PersonRender $personRender,
+        PersonRenderInterface $personRender,
         TranslatorInterface $translator,
         BaseContextData $baseContextData
     ) {
@@ -210,11 +209,8 @@ class ActivityContext implements
      */
     public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
     {
-        $doc = new StoredObject();
-        // TODO push document to remote
+        $entity->addDocument($storedObject);
 
-        $this->em->persist($doc);
-
-        $entity->addDocument($doc);
+        $this->em->persist($storedObject);
     }
 }

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Aggregator;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Aggregator;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Aggregator;
+namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Filter;
+namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Filter;
+namespace Chill\ActivityBundle\Tests\Export\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use DateTime;

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

@@ -76,7 +76,7 @@ activity:
     Insert a document: Insérer un document
     Remove a document: Supprimer le document
     comment: Commentaire
-No documents: Pas de documents
+No documents: Aucun document
 
 #timeline
 '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php

@@ -167,7 +167,6 @@ class AsideActivityCategory
         }
 
         $this->parent = $parent;
-        dump($this);
 
         return $this;
     }

src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php

@@ -16,7 +16,7 @@ use Chill\TaskBundle\Templating\UI\CountNotificationTask;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {

src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php

@@ -20,7 +20,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function get_class;
 

src/Bundle/ChillBudgetBundle/Controller/ElementController.php

@@ -21,7 +21,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_merge;
 use function count;

src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php

@@ -15,7 +15,7 @@ use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {

src/Bundle/ChillBudgetBundle/config/services/menu.yaml

@@ -2,6 +2,6 @@ services:
     Chill\AMLI\BudgetBundle\Menu\UserMenuBuilder:
         arguments:
             $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
         tags:
             - { name: 'chill.menu_builder' }

src/Bundle/ChillCalendarBundle/Form/CalendarType.php

@@ -97,8 +97,6 @@ class CalendarType extends AbstractType
                     return $res;
                 },
                 static function (?string $dateAsString): DateTimeImmutable {
-                    dump($dateAsString);
-
                     return new DateTimeImmutable($dateAsString);
                 }
             ));

src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php

@@ -16,7 +16,7 @@ use Chill\TaskBundle\Templating\UI\CountNotificationTask;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {

src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php

@@ -19,7 +19,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 

src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\CustomFieldsBundle\Tests;
+namespace Chill\CustomFieldsBundle\Tests\CustomFields;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
 use Chill\CustomFieldsBundle\Entity\CustomField;

src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\CustomFieldsBundle\Tests;
+namespace Chill\CustomFieldsBundle\Tests\CustomFields;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber;
 use Chill\CustomFieldsBundle\Entity\CustomField;

src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php

@@ -9,10 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Chill\CustomFieldsBundle\Tests;
+namespace Chill\CustomFieldsBundle\Tests\CustomFields;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldText;
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Tests\CustomFieldTestHelper;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**

src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\CustomFieldsBundle\Tests;
+namespace Chill\CustomFieldsBundle\Tests\Routing;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;

src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php

@@ -207,21 +207,21 @@ final class DocGeneratorTemplateController extends AbstractController
             $context instanceof DocGeneratorContextWithPublicFormInterface
             && $context->hasPublicForm($template, $entity) || $isTest
         ) {
-            if ($context instanceof DocGeneratorContextWithPublicFormInterface) {
+            if ($context instanceof DocGeneratorContextWithPublicFormInterface && $context->hasPublicForm($template, $entity)) {
                 $builder = $this->createFormBuilder(
                     array_merge(
                         $context->getFormData($template, $entity),
                         $isTest ? ['test_file' => null] : []
                     )
                 );
+
+                $context->buildPublicForm($builder, $template, $entity);
             } else {
                 $builder = $this->createFormBuilder(
                     ['test_file' => null]
                 );
             }
 
-            $context->buildPublicForm($builder, $template, $entity);
-
             if ($isTest) {
                 $builder->add('test_file', FileType::class, [
                     'label' => 'Template file',

src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php

@@ -70,6 +70,7 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
 
         $builder
             ->where('t.entity LIKE :entity')
+            ->andWhere($builder->expr()->eq('t.active', "'TRUE'"))
             ->setParameter('entity', addslashes($entity));
 
         return $builder

src/Bundle/ChillDocGeneratorBundle/Resources/public/lib/document-generator.js

@@ -0,0 +1,13 @@
+
+const buildLink = function(templateId, entityId, entityClass) {
+    const
+        entityIdEncoded = encodeURI(entityId),
+        returnPath = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash),
+        entityClassEncoded = encodeURI(entityClass),
+        url = `/fr/doc/gen/generate/from/${templateId}/for/${entityClassEncoded}/${entityIdEncoded}?returnPath=${returnPath}`
+    ;
+    console.log('computed Url');
+    return url;
+};
+
+export {buildLink};

src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue

@@ -16,12 +16,12 @@
                         <div class="input-group mb-3">
                             <select class="form-select" v-model="template">
                                 <option disabled selected value="">{{ $t('choose_a_template') }}</option>
-                                <template v-for="t in templates">
-                                    <option v-bind:value="t.id">{{ t.name.fr || 'Aucun nom défini' }}</option>
+                                <template v-for="t in templates" :key="t.id">
+                                    <option :value="t.id" >{{ t.name.fr || 'Aucun nom défini' }}</option>
                                 </template>
                             </select>
-                            <button v-if="canGenerate" class="btn btn-update btn-sm change-icon" type="button" @click="generateDocument"><i class="fa fa-fw fa-cog"></i></button>
-                            <button v-else class="btn btn-update btn-sm change-icon" type="button" disabled ><i class="fa fa-fw fa-cog"></i></button>
+                            <a v-if="canGenerate" class="btn btn-update btn-sm change-icon" :href="buildUrlGenerate" @click.prevent="clickGenerate($event, buildUrlGenerate)"><i class="fa fa-fw fa-cog"></i></a>
+                            <a v-else class="btn btn-update btn-sm change-icon" href="#" disabled ><i class="fa fa-fw fa-cog"></i></a>
                         </div>
                     </div>
                 </div>
@@ -39,24 +39,27 @@
 
 <script>
 
+import {buildLink} from 'ChillDocGeneratorAssets/lib/document-generator';
+
 export default {
     name: "PickTemplate",
     props: {
         entityId: [String, Number],
         entityClass: {
             type: String,
-            required: true,
+            required: false,
         },
         templates: {
             type: Array,
             required: true,
         },
-        // beforeMove execute "something" before
-        beforeMove: {
-            type: Function,
+        preventDefaultMoveToGenerate: {
+            type: Boolean,
             required: false,
+            default: false,
         }
     },
+    emits: ['goToGenerateDocument'],
     data() {
         return {
             template: null,
@@ -74,66 +77,37 @@ export default {
             return true;
         },
         getDescription() {
+            if (null === this.template) {
+                return '';
+            }
             let desc = this.templates.find(t => t.id === this.template);
             if (null === desc) {
                 return '';
             }
             return desc.description || '';
         },
+        buildUrlGenerate() {
+            if (null === this.template) {
+                return '#';
+            }
+
+            return buildLink(this.template, this.entityId, this.entityClass);
+        }
     },
     methods: {
-        generateDocument() {
-            console.log('generateDocument');
-            console.log('beforeMove', this.beforeMove);
-            if (this.beforeMove != null) {
-                console.log('execute before move');
-                let r = this.beforeMove();
-                if (r instanceof Promise) {
-                    r.then((obj) => this.goToGenerate(obj));
-                } else {
-                    this.goToGenerate();
-                }
-            } else {
-                this.goToGenerate();
-            }
-        },
-        goToGenerate(obj) {
-            console.log('goToGenerate');
-            console.log('obj', obj);
-            console.log('entityId', this.entityId);
-            let
-                realId = this.entityId,
-                realEntityClass = this.entityClass
-            ;
-
-            if (obj !== undefined) {
-                if (obj.entityId !== undefined) {
-                    realId = obj.entityId;
-                }
-                if (obj.entityClass !== undefined) {
-                    realEntityClass = obj.entityClass;
-                }
+        clickGenerate(event, link) {
+            if (!this.preventDefaultMoveToGenerate) {
+                window.location.assign(link);
             }
 
-            console.log('realId', realId);
-            console.log('realEntityClass', realEntityClass);
-
-            const
-                entityId = encodeURI(realId),
-                returnPath = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash),
-                fqdnEntityClass = encodeURI(realEntityClass),
-                url = `/fr/doc/gen/generate/from/${this.template}/for/${fqdnEntityClass}/${entityId}?returnPath=${returnPath}`
-            ;
-
-            console.log('I will generate your doc at', url);
-            window.location.assign(url);
+            this.$emit('goToGenerateDocument', {event, link, template: this.template});
         },
     },
     i18n: {
         messages: {
             fr: {
                 generate_document: 'Générer un document',
-                select_a_template: 'Choisir un gabarit',
+                select_a_template: 'Choisir un modèle',
                 choose_a_template: 'Choisir',
             }
         }

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

@@ -2,11 +2,11 @@ docgen:
     Generate a document: Génerer un document
     Generate: Génerer
     Document generation: Génération de documents
-    Manage templates and document generation: Gestion des documents générés et de leurs gabarits
+    Manage templates and document generation: Gestion des documents générés et de leurs modèles
     Pick template context: Choisir un contexte
     Context: Contexte
-    New template: Nouveau gabarit
-    Edit template: Modifier gabarit
+    New template: Nouveau modèle
+    Edit template: Modifier modèle
     test generate: Tester la génération
     With context: 'Avec le contexte :'
 

src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php

@@ -13,12 +13,16 @@ namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\DocStoreBundle\Form\AccompanyingCourseDocumentType;
+use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use DateTime;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -29,20 +33,15 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class DocumentAccompanyingCourseController extends AbstractController
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected AuthorizationHelper $authorizationHelper;
 
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
+    protected EventDispatcherInterface $eventDispatcher;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
+
+    private AccompanyingCourseDocumentRepository $courseRepository;
+
+    private PaginatorFactory $paginatorFactory;
 
     /**
      * DocumentAccompanyingCourseController constructor.
@@ -50,29 +49,49 @@ class DocumentAccompanyingCourseController extends AbstractController
     public function __construct(
         TranslatorInterface $translator,
         EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper
+        AuthorizationHelper $authorizationHelper,
+        PaginatorFactory $paginatorFactory,
+        AccompanyingCourseDocumentRepository $courseRepository
     ) {
         $this->translator = $translator;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->courseRepository = $courseRepository;
     }
 
     /**
-     * @Route("/{id}", name="accompanying_course_document_delete", methods="DELETE")
+     * @Route("/{id}/delete", name="chill_docstore_accompanying_course_document_delete")
      */
     public function delete(Request $request, AccompanyingPeriod $course, AccompanyingCourseDocument $document): Response
     {
         $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::DELETE, $document);
 
-        if ($this->isCsrfTokenValid('delete' . $document->getId(), $request->request->get('_token'))) {
-            $em = $this->getDoctrine()->getManager();
-            $em->remove($document);
-            $em->flush();
+        $form = $this->createForm(FormType::class);
+        $form->add('submit', SubmitType::class, ['label' => 'Delete']);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->remove($document);
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator->trans('The document is successfully removed'));
+
+            if ($request->query->has('returnPath')) {
+                return $this->redirect($request->query->get('returnPath'));
+            }
+
+            return $this->redirectToRoute('accompanying_course_document_index', ['course' => $course->getId()]);
         }
 
-        return $this->redirectToRoute(
-            'accompanying_course_document_index',
-            ['accompanyingCourse' => $course->getId()]
+        return $this->render(
+            'ChillDocStoreBundle:AccompanyingCourseDocument:delete.html.twig',
+            [
+                'document' => $document,
+                'delete_form' => $form->createView(),
+                'accompanyingCourse' => $course,
+            ]
         );
     }
 
@@ -130,11 +149,15 @@ class DocumentAccompanyingCourseController extends AbstractController
 
         $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::SEE, $course);
 
-        $documents = $em
-            ->getRepository('ChillDocStoreBundle:AccompanyingCourseDocument')
+        $total = $this->courseRepository->countByCourse($course);
+        $pagination = $this->paginatorFactory->create($total);
+
+        $documents = $this->courseRepository
             ->findBy(
                 ['course' => $course],
-                ['date' => 'DESC']
+                ['date' => 'DESC'],
+                $pagination->getItemsPerPage(),
+                $pagination->getCurrentPageFirstItemNumber()
             );
 
         return $this->render(
@@ -142,6 +165,7 @@ class DocumentAccompanyingCourseController extends AbstractController
             [
                 'documents' => $documents,
                 'accompanyingCourse' => $course,
+                'pagination' => $pagination,
             ]
         );
     }

src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php

@@ -13,7 +13,9 @@ namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Form\PersonDocumentType;
+use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -21,10 +23,12 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use DateTime;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class DocumentPersonController.
@@ -35,20 +39,15 @@ use Symfony\Component\Translation\TranslatorInterface;
  */
 class DocumentPersonController extends AbstractController
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected AuthorizationHelper $authorizationHelper;
 
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
+    protected EventDispatcherInterface $eventDispatcher;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository;
 
     /**
      * DocumentPersonController constructor.
@@ -56,30 +55,49 @@ class DocumentPersonController extends AbstractController
     public function __construct(
         TranslatorInterface $translator,
         EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper
+        AuthorizationHelper $authorizationHelper,
+        PaginatorFactory $paginatorFactory,
+        PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository
     ) {
         $this->translator = $translator;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->personDocumentACLAwareRepository = $personDocumentACLAwareRepository;
     }
 
     /**
-     * @Route("/{id}", name="person_document_delete", methods="DELETE")
+     * @Route("/{id}/delete", name="chill_docstore_person_document_delete")
      */
     public function delete(Request $request, Person $person, PersonDocument $document): Response
     {
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-        $this->denyAccessUnlessGranted('CHILL_PERSON_DOCUMENT_DELETE', $document);
+        $this->denyAccessUnlessGranted(PersonDocumentVoter::DELETE, $document);
 
-        if ($this->isCsrfTokenValid('delete' . $document->getId(), $request->request->get('_token'))) {
-            $em = $this->getDoctrine()->getManager();
-            $em->remove($document);
-            $em->flush();
+        $form = $this->createForm(FormType::class);
+        $form->add('submit', SubmitType::class, ['label' => 'Delete']);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->remove($document);
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator->trans('The document is successfully removed'));
+
+            if ($request->query->has('returnPath')) {
+                return $this->redirect($request->query->get('returnPath'));
+            }
+
+            return $this->redirectToRoute('person_document_index', ['person' => $person->getId()]);
         }
 
-        return $this->redirectToRoute(
-            'person_document_index',
-            ['person' => $person->getId()]
+        return $this->render(
+            'ChillDocStoreBundle:PersonDocument:delete.html.twig',
+            [
+                'document' => $document,
+                'delete_form' => $form->createView(),
+                'person' => $person,
+            ]
         );
     }
 
@@ -98,7 +116,6 @@ class DocumentPersonController extends AbstractController
             PersonDocumentType::class,
             $document,
             [
-                'center' => $document->getCenter(),
                 'role' => 'CHILL_PERSON_DOCUMENT_UPDATE',
             ]
         );
@@ -156,19 +173,15 @@ class DocumentPersonController extends AbstractController
 
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
 
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableScopes(
-                $this->getUser(),
-                PersonDocumentVoter::SEE,
-                $person->getCenter()
-            );
+        $total = $this->personDocumentACLAwareRepository->countByPerson($person);
+        $pagination = $this->paginatorFactory->create($total);
 
-        $documents = $em
-            ->getRepository('ChillDocStoreBundle:PersonDocument')
-            ->findBy(
-                ['person' => $person, 'scope' => $reachableScopes],
-                ['date' => 'DESC']
-            );
+        $documents = $this->personDocumentACLAwareRepository->findByPerson(
+            $person,
+            [],
+            $pagination->getItemsPerPage(),
+            $pagination->getCurrentPageFirstItemNumber()
+        );
 
         $event = new PrivacyEvent($person, [
             'element_class' => PersonDocument::class,
@@ -181,6 +194,7 @@ class DocumentPersonController extends AbstractController
             [
                 'documents' => $documents,
                 'person' => $person,
+                'pagination' => $pagination,
             ]
         );
     }
@@ -202,7 +216,6 @@ class DocumentPersonController extends AbstractController
         $document->setDate(new DateTime('Now'));
 
         $form = $this->createForm(PersonDocumentType::class, $document, [
-            'center' => $document->getCenter(),
             'role' => 'CHILL_PERSON_DOCUMENT_CREATE',
         ]);
         $form->handleRequest($request);

src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php

@@ -17,6 +17,7 @@ use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
@@ -38,6 +39,7 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/menu.yaml');
         $loader->load('services/fixtures.yaml');
         $loader->load('services/form.yaml');
+        $loader->load('services/templating.yaml');
     }
 
     public function prepend(ContainerBuilder $container)
@@ -45,6 +47,28 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $this->prependRoute($container);
         $this->prependAuthorization($container);
         $this->prependTwig($container);
+        $this->prependApis($container);
+    }
+
+    protected function prependApis(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'apis' => [
+                [
+                    'class' => \Chill\DocStoreBundle\Entity\StoredObject::class,
+                    'name' => 'stored_object',
+                    'base_path' => '/api/1.0/docstore/stored-object',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_POST => true,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
     }
 
     protected function prependAuthorization(ContainerBuilder $container)

src/Bundle/ChillDocStoreBundle/Entity/Document.php

@@ -11,7 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\DocStoreBundle\Entity;
 
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
@@ -20,8 +26,12 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
  * @ORM\MappedSuperclass
  */
-class Document implements HasScopeInterface
+class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdateInterface
 {
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
     /**
      * @ORM\ManyToOne(targetEntity="Chill\DocStoreBundle\Entity\DocumentCategory")
      * @ORM\JoinColumns({
@@ -67,6 +77,11 @@ class Document implements HasScopeInterface
      */
     private $scope;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate")
+     */
+    private $template;
+
     /**
      * @ORM\Column(type="text")
      * @Assert\Length(
@@ -82,9 +97,6 @@ class Document implements HasScopeInterface
      */
     private $user;
 
-    /**
-     * @return DocumentCategory
-     */
     public function getCategory(): ?DocumentCategory
     {
         return $this->category;
@@ -115,11 +127,16 @@ class Document implements HasScopeInterface
      *
      * @return \Chill\MainBundle\Entity\Scope
      */
-    public function getScope()
+    public function getScope(): ?Scope
     {
         return $this->scope;
     }
 
+    public function getTemplate(): ?DocGeneratorTemplate
+    {
+        return $this->template;
+    }
+
     public function getTitle(): ?string
     {
         return $this->title;
@@ -165,6 +182,13 @@ class Document implements HasScopeInterface
         return $this;
     }
 
+    public function setTemplate(?DocGeneratorTemplate $template): self
+    {
+        $this->template = $template;
+
+        return $this;
+    }
+
     public function setTitle(string $title): self
     {
         $this->title = $title;

src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php

@@ -34,19 +34,19 @@ class StoredObject implements AsyncFileInterface, Document
 {
     /**
      * @ORM\Column(type="datetime", name="creation_date")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "write"})
      */
     private DateTimeInterface $creationDate;
 
     /**
      * @ORM\Column(type="json", name="datas")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "write"})
      */
     private array $datas = [];
 
     /**
      * @ORM\Column(type="text")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "write"})
      */
     private $filename;
 
@@ -54,30 +54,32 @@ class StoredObject implements AsyncFileInterface, Document
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "write"})
      */
     private $id;
 
     /**
      * @var int[]
      * @ORM\Column(type="json", name="iv")
+     * @Serializer\Groups({"write"})
      */
     private array $iv = [];
 
     /**
      * @ORM\Column(type="json", name="key")
+     * @Serializer\Groups({"write"})
      */
     private array $keyInfos = [];
 
     /**
      * @ORM\Column(type="text", name="type")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "write"})
      */
     private string $type = '';
 
     /**
      * @ORM\Column(type="uuid", unique=true)
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "write"})
      */
     private UuidInterface $uuid;
 

src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php

@@ -13,15 +13,15 @@ namespace Chill\DocStoreBundle\Form;
 
 use Chill\DocStoreBundle\Entity\Document;
 use Chill\DocStoreBundle\Entity\PersonDocument;
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectManager;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -29,36 +29,29 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonDocumentType extends AbstractType
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    private CenterResolverDispatcher $centerResolverDispatcher;
 
-    /**
-     * @var ObjectManager
-     */
-    protected $om;
+    private ParameterBagInterface $parameterBag;
 
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
 
-    /**
-     * the user running this form.
-     *
-     * @var User
-     */
-    protected $user;
+    private TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
-        TranslatableStringHelper $translatableStringHelper
+        TranslatableStringHelperInterface $translatableStringHelper,
+        ScopeResolverDispatcher $scopeResolverDispatcher,
+        ParameterBagInterface $parameterBag
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
+        $this->parameterBag = $parameterBag;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $document = $options['data'];
+        $isScopeConcerned = $this->scopeResolverDispatcher->isConcerned($document);
+
         $builder
             ->add('title', TextType::class)
             ->add('description', ChillTextareaType::class, [
@@ -67,10 +60,6 @@ class PersonDocumentType extends AbstractType
             ->add('object', StoredObjectType::class, [
                 'error_bubbling' => true,
             ])
-            ->add('scope', ScopePickerType::class, [
-                'center' => $options['center'],
-                'role' => $options['role'],
-            ])
             ->add('date', ChillDateType::class)
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
@@ -84,6 +73,13 @@ class PersonDocumentType extends AbstractType
                     return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
                 },
             ]);
+
+        if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
+            $builder->add('scope', ScopePickerType::class, [
+                'center' => $this->centerResolverDispatcher->resolveCenter($document),
+                'role' => $options['role'],
+            ]);
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -92,8 +88,7 @@ class PersonDocumentType extends AbstractType
             'data_class' => Document::class,
         ]);
 
-        $resolver->setRequired(['role', 'center'])
-            ->setAllowedTypes('role', ['string'])
-            ->setAllowedTypes('center', [\Chill\MainBundle\Entity\Center::class]);
+        $resolver->setRequired(['role'])
+            ->setAllowedTypes('role', ['string']);
     }
 }

src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php

@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Repository;
+
+use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
+
+class AccompanyingCourseDocumentRepository implements ObjectRepository
+{
+    private EntityManagerInterface $em;
+
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->em = $em;
+        $this->repository = $em->getRepository(AccompanyingCourseDocument::class);
+    }
+
+    public function buildQueryByCourse(AccompanyingPeriod $course): QueryBuilder
+    {
+        $qb = $this->repository->createQueryBuilder('d');
+
+        $qb
+            ->where($qb->expr()->eq('d.course', ':course'))
+            ->setParameter('course', $course);
+
+        return $qb;
+    }
+
+    public function countByCourse(AccompanyingPeriod $course): int
+    {
+        $qb = $this->buildQueryByCourse($course)->select('COUNT(d)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    public function find($id): ?AccompanyingCourseDocument
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?AccompanyingCourseDocument
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return AccompanyingCourseDocument::class;
+    }
+}

src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php

@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Repository;
+
+use Chill\DocStoreBundle\Entity\PersonDocument;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Security\Core\Security;
+
+class PersonDocumentACLAwareRepository implements PersonDocumentACLAwareRepositoryInterface
+{
+    private AuthorizationHelperInterface $authorizationHelper;
+
+    private CenterResolverDispatcher $centerResolverDispatcher;
+
+    private EntityManagerInterface $em;
+
+    private Security $security;
+
+    public function __construct(EntityManagerInterface $em, AuthorizationHelperInterface $authorizationHelper, CenterResolverDispatcher $centerResolverDispatcher, Security $security)
+    {
+        $this->em = $em;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->security = $security;
+    }
+
+    public function buildQueryByPerson(Person $person): QueryBuilder
+    {
+        $qb = $this->em->getRepository(PersonDocument::class)->createQueryBuilder('d');
+
+        $qb
+            ->where($qb->expr()->eq('d.person', ':person'))
+            ->setParameter('person', $person);
+
+        return $qb;
+    }
+
+    public function countByPerson(Person $person): int
+    {
+        $qb = $this->buildQueryByPerson($person)->select('COUNT(d)');
+
+        $this->addACL($qb, $person);
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    public function findByPerson(Person $person, array $orderBy = [], int $limit = 20, int $offset = 0): array
+    {
+        $qb = $this->buildQueryByPerson($person)->select('d');
+
+        $this->addACL($qb, $person);
+
+        foreach ($orderBy as [$field, $order]) {
+            $qb->addOrderBy($field, $order);
+        }
+
+        $qb->setFirstResult($offset)->setMaxResults($limit);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function addACL(QueryBuilder $qb, Person $person): void
+    {
+        $center = $this->centerResolverDispatcher->resolveCenter($person);
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableScopes(
+                $this->security->getUser(),
+                PersonDocumentVoter::SEE,
+                $center
+            );
+
+        $qb->andWhere($qb->expr()->in('d.scope', ':scopes'))
+            ->setParameter('scopes', $reachableScopes);
+    }
+}

src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Repository;
+
+use Chill\PersonBundle\Entity\Person;
+
+interface PersonDocumentACLAwareRepositoryInterface
+{
+    public function countByPerson(Person $person): int;
+
+    public function findByPerson(Person $person, array $orderBy = [], int $limit = 20, int $offset = 0): array;
+}

src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js

@@ -4,12 +4,12 @@ var initializeDownload = require('./downloader.js');
 
 
 /**
- * 
+ *
  * define a dropzone for chill usage
- * 
- * An event is launched when dropzone is initialize, allowing to customize events 
+ *
+ * An event is launched when dropzone is initialize, allowing to customize events
  * on dropzone :
- * 
+ *
  * ```
  * window.addEventListener("chill_dropzone_initialized", (e) => {
  *    // do something with dropzone:
@@ -18,7 +18,7 @@ var initializeDownload = require('./downloader.js');
  *    });
  * });
  * ```
- * 
+ *
  */
 
 // load css
@@ -37,7 +37,6 @@ var keyDefinition = {
 
 var searchForZones = function(root) {
     var zones = root.querySelectorAll('div[data-stored-object]');
-    
     for(let i=0; i < zones.length; i++) {
         initialize(zones[i]);
     }
@@ -48,32 +47,32 @@ var getUploadUrl = function(zoneData, files) {
         generateTempUrlPost  = zoneData.zone.querySelector('input[data-async-file-upload]').dataset.generateTempUrlPost,
         oReq = new XMLHttpRequest()
         ;
-    
+
     // arg, dropzone, you cannot handle async upload...
     oReq.open("GET", generateTempUrlPost, false);
     oReq.send();
-    
+
     if (oReq.readyState !== XMLHttpRequest.DONE) {
         throw new Error("Error while fetching url to upload");
     }
-    
+
     zoneData.params = JSON.parse(oReq.responseText);
-    
+
     return zoneData.params.url;
 };
 
 var encryptFile = function(originalFile, zoneData, done) {
-    var 
+    var
         iv = crypto.getRandomValues(new Uint8Array(16)),
         reader = new FileReader(),
         jsKey, rawKey
         ;
-        
+
     zoneData.originalType = originalFile.type;
-        
+
     reader.onload = e => {
         window.crypto.subtle.generateKey(keyDefinition, true, [ "encrypt", "decrypt" ])
-            .then(key => { 
+            .then(key => {
                 jsKey = key;
 
                 // we register the key somwhere
@@ -90,34 +89,34 @@ var encryptFile = function(originalFile, zoneData, done) {
                     rawKey: rawKey,
                     iv: iv
                 };
-                
+
                 done(new File( [ encrypted ], zoneData.suffix));
             });
     };
-    
+
     reader.readAsArrayBuffer(originalFile);
 };
 
 var addBelowButton = (btn, zone, zoneData) => {
     let
         belowZone = zone.querySelector('.chill-dropzone__below-zone');
-        
+
     if (belowZone === null) {
         belowZone = document.createElement('div');
         belowZone.classList.add('chill-dropzone__below-zone');
         zone.appendChild(belowZone);
     }
-            
+
     belowZone.appendChild(btn);
 };
 
 var createZone = (zone, zoneData) => {
-    var 
+    var
         created = document.createElement('div'),
         initMessage = document.createElement('div'),
         initContent = zone.dataset.labelInitMessage,
         dropzoneI;
-    
+
     created.classList.add('dropzone');
     initMessage.classList.add('dz-message');
     initMessage.appendChild(document.createTextNode(initContent));
@@ -142,7 +141,7 @@ var createZone = (zone, zoneData) => {
                 return zoneData.suffix;
             }
         });
-        
+
     dropzoneI.on("sending", function(file, xhr, formData) {
         formData.append("redirect", zoneData.params.redirect);
         formData.append("max_file_size", zoneData.params.max_file_size);
@@ -150,24 +149,24 @@ var createZone = (zone, zoneData) => {
         formData.append("expires", zoneData.params.expires);
         formData.append("signature", zoneData.params.signature);
     });
-    
+
     dropzoneI.on("success", function(file, response) {
         zoneData.currentFile = file;
         storeDataInForm(zone, zoneData);
     });
-    
+
     dropzoneI.on("addedfile", function(file) {
         if (zoneData.hasOwnProperty('currentFile')) {
             dropzoneI.removeFile(zoneData.currentFile);
         }
     });
-    
+
     dropzoneI.on("removedfile", function(file) {
         removeDataInForm(zone, zoneData);
     });
 
     zone.insertBefore(created, zone.firstChild);
-    
+
     let event = new CustomEvent("chill_dropzone_initialized", {
         detail: {
             dropzone: dropzoneI,
@@ -179,7 +178,7 @@ var createZone = (zone, zoneData) => {
 
 
 var initialize = function(zone) {
-    var 
+    var
         allowRemove = zone.dataset.allowRemove,
         zoneData = { zone: zone, suffix: createFilename(), allowRemove: allowRemove, old: null }
         ;
@@ -204,13 +203,13 @@ var createFilename = () => {
 };
 
 var storeDataInForm = (zone, zoneData) => {
-    var 
+    var
         inputKey = zone.querySelector('input[data-stored-object-key]'),
         inputIv  = zone.querySelector('input[data-stored-object-iv]'),
         inputObject = zone.querySelector('input[data-async-file-upload]'),
         inputType = zone.querySelector('input[data-async-file-type]')
         ;
-    
+
     inputKey.value = JSON.stringify(zoneData.crypto.rawKey);
     inputIv.value = JSON.stringify(Array.from(zoneData.crypto.iv));
     inputType.value = zoneData.originalType;
@@ -220,18 +219,18 @@ var storeDataInForm = (zone, zoneData) => {
 };
 
 const restoreDataInForm = (zone, zoneData) => {
-    var 
+    var
         inputKey = zone.querySelector('input[data-stored-object-key]'),
         inputIv  = zone.querySelector('input[data-stored-object-iv]'),
         inputObject = zone.querySelector('input[data-async-file-upload]'),
         inputType = zone.querySelector('input[data-async-file-type]')
         ;
-        
+
     if (zoneData.old === null) {
         console.log('should not have restored data');
         return;
     }
-    
+
     inputKey.value    = zoneData.old.key;
     inputIv.value     = zoneData.old.iv;
     inputType.value   = zoneData.old.type;
@@ -241,21 +240,21 @@ const restoreDataInForm = (zone, zoneData) => {
 };
 
 const hasDataInForm = (zone, zoneData) => {
-    var 
+    var
         inputObject = zone.querySelector('input[data-async-file-upload]')
         ;
-        
+
     return inputObject.value.length > 0;
 };
 
 var removeDataInForm = (zone, zoneData) => {
-    var 
+    var
         inputKey = zone.querySelector('input[data-stored-object-key]'),
         inputIv  = zone.querySelector('input[data-stored-object-iv]'),
         inputObject = zone.querySelector('input[data-async-file-upload]'),
         inputType = zone.querySelector('input[data-async-file-type]')
         ;
-        
+
     // store data for future usage
     zoneData.old = {
             key: inputKey.value,
@@ -268,7 +267,7 @@ var removeDataInForm = (zone, zoneData) => {
     inputIv.value = "";
     inputType.value = "";
     inputObject.value = "";
-    
+
     insertDownloadButton(zone);
 };
 
@@ -279,25 +278,25 @@ var insertRemoveButton = (zone, zoneData) => {
         labelRemove = zone.dataset.dictRemove,
         labelCancel = 'Restaurer'
         ;
-    
+
     removeButton.classList.add('btn', 'btn-delete');
     removeButton.textContent = labelRemove;
-    
+
     cancelButton.classList.add('btn', 'btn-cancel');
     cancelButton.textContent = labelCancel;
-    
+
     removeButton.addEventListener('click', (e) => {
         e.preventDefault();
         if (zoneData.allowRemove === 'true') {
             removeDataInForm(zone, zoneData);
             cancelButton.addEventListener('click', (e) => {
                 e.preventDefault();
-                
+
                 restoreDataInForm(zone, zoneData);
-                
+
                 cancelButton.remove();
                 zone.querySelector('.dropzone').remove();
-                
+
                 initialize(zone);
             });
         }
@@ -306,16 +305,16 @@ var insertRemoveButton = (zone, zoneData) => {
         removeButton.remove();
         createZone(zone, zoneData);
     });
-    
+
     addBelowButton(removeButton, zone, zoneData);
     // zone.appendChild(removeButton);
 };
 
 const removeDownloadButton = (zone, zoneData) => {
-    var 
+    var
         existingButtons = zone.querySelectorAll('a[data-download-button]')
         ;
-        
+
     // remove existing
     existingButtons.forEach(function(b) {
         b.remove();
@@ -323,7 +322,7 @@ const removeDownloadButton = (zone, zoneData) => {
 };
 
 var insertDownloadButton = (zone, zoneData) => {
-    var 
+    var
         existingButtons = zone.querySelectorAll('a[data-download-button]'),
         newButton = document.createElement('a'),
         inputKey = zone.querySelector('input[data-stored-object-key]'),
@@ -336,18 +335,18 @@ var insertDownloadButton = (zone, zoneData) => {
         tempUrlGenerator = zone.dataset.tempUrlGenerator,
         tempUrlGeneratorParams = new URLSearchParams()
         ;
-        
+
     // remove existing
     existingButtons.forEach(function(b) {
         b.remove();
     });
-    
+
     if (inputObject.value === '') {
         return;
     }
-    
+
     tempUrlGeneratorParams.append('object_name', inputObject.value);
-    
+
     newButton.dataset.downloadButton = true;
     newButton.dataset.key = inputKey.value;
     newButton.dataset.iv = inputIv.value;
@@ -357,7 +356,7 @@ var insertDownloadButton = (zone, zoneData) => {
     newButton.dataset.tempUrlGetGenerator = tempUrlGenerator + '?' + tempUrlGeneratorParams.toString();
     newButton.classList.add('btn', 'btn-download', 'dz-bt-below-dropzone');
     newButton.textContent = labelQuietButton;
-    
+
     addBelowButton(newButton, zone, zoneData);
     //zone.appendChild(newButton);
     initializeDownload(zone);
@@ -370,3 +369,5 @@ window.addEventListener('load', function(e) {
 window.addEventListener('collection-add-entry', function(e) {
     searchForZones(e.detail.entry);
 });
+
+export { searchForZones };

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue

@@ -0,0 +1,157 @@
+<template>
+   <a class="btn btn-create" :title="$t(buttonTitle)" @click="openModal">
+      <span>{{ $t(buttonTitle) }}</span>
+   </a>
+   <teleport to="body">
+      <div>
+         <modal v-if="modal.showModal"
+            :modalDialogClass="modal.modalDialogClass"
+            @close="modal.showModal = false">
+
+            <template v-slot:header>
+               {{ $t('upload_a_document') }}
+            </template>
+
+            <template v-slot:body>
+                <div id="dropZoneWrapper" ref="dropZoneWrapper">
+                    <div
+                        data-stored-object="data-stored-object"
+                        :data-label-preparing="$t('data_label_preparing')"
+                        :data-label-quiet-button="$t('data_label_quiet_button')"
+                        :data-label-ready="$t('data_label_ready')"
+                        :data-dict-file-too-big="$t('data_dict_file_too_big')"
+                        :data-dict-default-message="$t('data_dict_default_message')"
+                        :data-dict-remove-file="$t('data_dict_remove_file')"
+                        :data-dict-max-files-exceeded="$t('data_dict_max_files_exceeded')"
+                        :data-dict-cancel-upload="$t('data_dict_cancel_upload')"
+                        :data-dict-cancel-upload-confirm="$t('data_dict_cancel_upload_confirm')"
+                        :data-dict-upload-canceled="$t('data_dict_upload_canceled')"
+                        :data-dict-remove="$t('data_dict_remove')"
+                        :data-allow-remove="!options.required"
+                        data-temp-url-generator="/asyncupload/temp_url/generate/GET">
+                        <input
+                           type="hidden"
+                           data-async-file-upload="data-async-file-upload"
+                           data-generate-temp-url-post="/asyncupload/temp_url/generate/post?expires_delay=180&amp;submit_delay=3600"
+                           data-temp-url-get="/asyncupload/temp_url/generate/GET"
+                           :data-max-files="options.maxFiles"
+                           :data-max-post-size="options.maxPostSize"
+                           :v-model="dataAsyncFileUpload"
+                        >
+                        <input
+                           type="hidden"
+                           data-stored-object-key="1"
+                        >
+                        <input
+                           type="hidden"
+                           data-stored-object-iv="1"
+                        >
+                        <input
+                           type="hidden"
+                           data-async-file-type="1"
+                        >
+                    </div>
+                </div>
+            </template>
+
+            <template v-slot:footer>
+               <button class="btn btn-create"
+                  @click.prevent="saveDocument">
+                  {{ $t('action.add')}}
+            </button>
+            </template>
+
+         </modal>
+      </div>
+   </teleport>
+</template>
+
+<script>
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';
+import { searchForZones } from '../../module/async_upload/uploader';
+import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
+
+const i18n = {
+   messages: {
+      fr: {
+         upload_a_document: "Téléversez un document",
+         data_label_preparing: "Chargement...",
+         data_label_quiet_button: "Téléchargez le fichier existant",
+         data_label_ready: "Prêt à montrer",
+         data_dict_file_too_big: "Fichier trop volumineux",
+         data_dict_default_message: "Glissez votre fichier ou cliquez ici",
+         data_dict_remove_file: "Enlevez votre fichier pour en téléversez un autre",
+         data_dict_max_files_exceeded: "Nombre maximum de fichiers atteint. Enlevez les fichiers précédents",
+         data_dict_cancel_upload: "Annulez le téléversement",
+         data_dict_cancel_upload_confirm: "Êtes-vous sûr·e de vouloir annuler ce téléversement?",
+         data_dict_upload_canceled: "Téléversement annulé",
+         data_dict_remove: "Enlevez le fichier existant",
+      }
+   }
+};
+
+export default {
+   name: "AddAsyncUpload",
+   components: {
+      Modal
+   },
+   i18n,
+   props: [
+     'buttonTitle',
+     'options'
+   ],
+   emits: ['addDocument'],
+   data() {
+      return {
+         modal: {
+            showModal: false,
+            modalDialogClass: "modal-dialog-centered modal-md"
+         },
+      }
+   },
+   updated() {
+     if (this.modal.showModal){
+         searchForZones(this.$refs.dropZoneWrapper);
+     }
+   },
+   methods: {
+      openModal() {
+         this.modal.showModal = true;
+      },
+      saveDocument() {
+         const dropzone = this.$refs.dropZoneWrapper;
+         if (dropzone) {
+            const inputKey = dropzone.querySelector('input[data-stored-object-key]');
+            const inputIv  = dropzone.querySelector('input[data-stored-object-iv]');
+            const inputObject = dropzone.querySelector('input[data-async-file-upload]');
+            const inputType = dropzone.querySelector('input[data-async-file-type]');
+
+            const url = '/api/1.0/docstore/stored-object.json';
+            const body = {
+               filename: inputObject.value,
+               keyInfos: JSON.parse(inputKey.value),
+               iv: JSON.parse(inputIv.value),
+               type: inputType.value,
+            };
+            makeFetch('POST', url, body)
+               .then(r => {
+                  this.$emit("addDocument", r);
+                  this.modal.showModal = false;
+               })
+               .catch((error) => {
+                  if (error.name === 'ValidationException') {
+                     for (let v of error.violations) {
+                        this.$toast.open({message: v });
+                     }
+                  } else {
+                     console.error(error);
+                     this.$toast.open({message: 'An error occurred'});
+                  }
+               });
+         } else {
+            this.$toast.open({message: 'An error occurred - drop zone not found'});
+         }
+      }
+   }
+}
+</script>

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_delete_form.html.twig

@@ -1,5 +0,0 @@
-<form method="post" action="{{ path('accompanying_course_document_delete', {'id': document.id, 'course': course.id}) }}" onsubmit="return confirm('Are you sure you want to delete this item?');">
-	<input type="hidden" name="_method" value="DELETE">
-	<input type="hidden" name="_token" value="{{ csrf_token('delete' ~ document.id) }}">
-	<button class="btn btn-delete">{{ 'Delete' | trans }}</button>
-</form>

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig

@@ -1,4 +1,5 @@
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc document-item bg-chill-llight-gray">
@@ -8,14 +9,15 @@
             </div>
             <div class="col-8">
                 <h3>{{ document.title }}</h3>
-                <small>{{ document.object.type }}</small>
-            
+
+                {{ mm.mimeIcon(document.object.type) }}
+
                 {% if document.description is not empty %}
-                    <blockquote class="chill-user-quote mt-2">
+                    <blockquote class="chill-user-quote mt-4">
                         {{ document.description }}
                     </blockquote>
                 {% endif %}
-        
+
             </div>
         </div>
     </div>
@@ -32,30 +34,31 @@
 
 {% if display_action is defined and display_action == true %}
     <ul class="record_actions">
+        {% if document.course != null and is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', document.course) %}
+            <li>
+                <a href="{{ path('chill_person_accompanying_course_index', {'accompanying_period_id': document.course.id}) }}" class="btn btn-show change-icon">
+                    <i class="fa fa-random"></i> {{ 'Course number'|trans }} {{ document.course.id }}
+                </a>
+            </li>
+        {% endif %}
         <li>
             {{ m.download_button(document.object, document.title) }}
         </li>
         <li>
-        {% if not freezed %}
-            {% set button = {
-                'changeIcon': 'fa-unlock',
-            } %}{#
-                'changeClass'   string
-                'noText'        boolean
-            #}
-            {# vue component #}
-            <span
-                data-module="wopi-link"
-                data-wopi-url="{{ path('chill_wopi_file_edit', {'fileId': document.object.uuid}) }}"
-                data-doc-title="{{ document.title|e('html_attr') }}"
-                data-doc-type="{{ document.object.type|e('html_attr') }}"
-                data-button="{{ button|json_encode }}"
-            ></span>
-        {% else %}
-            <a class="btn btn-update change-icon disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
-                <i class="fa fa-lock me-2"></i>{{ 'Update document'|trans }}
-            </a>
+        {% if chill_document_is_editable(document.object) %}
+            {% if not freezed %}
+                {{ document.object|chill_document_edit_button({'title': document.title|e('html') }) }}
+            {% else %}
+                <a class="btn btn-wopilink disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
+                    {{ 'Update document'|trans }}
+                </a>
+            {% endif %}
+        {% endif %}
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', document) and document.course != null %}
+            <li>
+                <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': document.course.id, 'id': document.id}) }}" class="btn btn-show"></a>
+            </li>
         {% endif %}
         </li>
     </ul>
-{% endif %}
+{% endif %}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.title.html.twig

@@ -1,19 +0,0 @@
-{% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as m %}
-
-<div class="flex-grow-1 {% if add_classes is defined %}{{ add_classes }}{% else %}h2{% endif %}">
-    <div>
-        {% if concerne is defined and concerne == true %}
-            <span class="item-key">{{ 'Concerne'|trans }}: </span>
-        {% endif %}
-    
-        {{ 'workflow.Document (n°%doc%)'|trans({'%doc%': document.id}) }}
-    
-        {% if description is defined and description == true %}
-            {{ ' — ' ~ document.title }}
-        {% endif %}
-    </div>
-    
-    {% if breadcrumb is defined and breadcrumb == true %}
-        {{ m.breadcrumb(_context) }}
-    {% endif %}
-</div>

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig

@@ -0,0 +1,43 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}{{ 'Delete document ?' }}{% endblock %}
+
+{% block docdescription %}
+    <dl class="chill_view_data">
+        <dt>{{ 'Title'|trans }}</dt>
+        <dd>{{ document.title }}</dd>
+
+        {% if document.scope is not null %}
+            <dt>{{ 'Scope' | trans }}</dt>
+            <dd>{{ document.scope.name | localize_translatable_string }}</dd>
+        {% endif %}
+
+        <dt>{{ 'Category'|trans }}</dt>
+        <dd>{{ document.category.name|localize_translatable_string }}</dd>
+
+        <dt>{{ 'Description' | trans }}</dt>
+        <dd>
+            {% if document.description is empty %}
+                <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
+            {% else %}
+                <blockquote class="chill-user-quote">
+                    {{ document.description|chill_markdown_to_html }}
+                </blockquote>
+            {% endif %}
+        </dd>
+    </dl>
+{% endblock %}
+
+{% block content %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Delete document ?'|trans,
+        'display_content'   : block('docdescription'),
+        'confirm_question'  : 'Are you sure you want to remove this document ?'|trans,
+        'cancel_route'      : 'accompanying_course_document_index',
+        'cancel_parameters' : {'course' : accompanyingCourse.id, 'id': document.id},
+        'form'              : delete_form
+    } ) }}
+{% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig

@@ -19,14 +19,19 @@
 	{{ form_row(form.description) }}
 	{{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
-	<ul class="record_actions">
+	<ul class="record_actions sticky-form-buttons">
 		<li class="cancel">
 			<a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
-		<li class="edit">
-			<button class="btn btn-edit">{{ 'Edit'|trans }}</button>
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_accompanying_course_document_delete', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+            </li>
+        {% endif %}
+        <li class="edit">
+            <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
 		</li>
 	</ul>
 

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig

@@ -2,8 +2,6 @@
 
 {% set activeRouteKey = '' %}
 
-{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
-
 {% block title %}
 	{{ 'Documents' }}
 {% endblock %}
@@ -11,64 +9,37 @@
 {% block js %}
 	{{ parent() }}
 	{{ encore_entry_script_tags('mod_async_upload') }}
-  {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
 {% endblock %}
 
 {% block css %}
 	{{ parent() }}
 	{{ encore_entry_link_tags('mod_async_upload') }}
-  {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
 {% endblock %}
 
 {% block content %}
+<div class="document-list">
 	<h1>{{ 'Documents' }}</h1>
 
-	<table class="table table-bordered border-dark table-striped">
-
-		<thead>
-			<tr>
-				<th>{{ 'Title' | trans }}</th>
-				<th>{{ 'Category'|trans }}</th>
-				<th>{{ 'Actions' | trans }}</th>
-			</tr>
-		</thead>
-		<tbody>
+	{% if documents|length == 0 %}
+            <p class="chill-no-data-statement">{{ 'No documents'|trans }}</p>
+    {% else %}
+		<div class="flex-table chill-task-list">
 			{% for document in documents %}
-				<tr>
-					<td>{{ document.title }}</td>
-					<td>{% if document.category %}{{ document.category.name|localize_translatable_string }}{% endif %}</td>
-					<td>
-						<ul class="record_actions">
-							{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
-								<li>
-									{{ m.download_button(document.object, document.title) }}
-								</li>
-								<li>
-									<a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
-								</li>
-							{% endif %}
-							{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-								<li>
-									<a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
-								</li>
-							{% endif %}
-						</ul>
-					</td>
-				</tr>
-			{% else %}
-				<tr>
-					<td colspan="9" style="text-align:center;">
-						<span class="chill-no-data-statement">{{ 'Any document found'|trans }}</span>
-					</td>
-				</tr>
+				{% include '@ChillDocStore/List/list_item.html.twig' %}
 			{% endfor %}
-		</tbody>
-	</table>
+		</div>
+    {% endif %}
 
-    <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\AccompanyingPeriod" data-entity-id="{{ accompanyingCourse.id }}"></div>
+	{{ chill_pagination(pagination) }}
+
+	<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\AccompanyingPeriod" data-entity-id="{{ accompanyingCourse.id }}"></div>
 
 	{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE', accompanyingCourse) %}
-		<ul class="record_actions">
+		<ul class="record_actions sticky-form-buttons">
 			<li class="create">
 				<a href="{{ path('accompanying_course_document_new', {'course': accompanyingCourse.id}) }}" class="btn btn-create">
 					{{ 'Create'|trans }}
@@ -76,4 +47,6 @@
 			</li>
 		</ul>
 	{% endif %}
+
+</div>
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig

@@ -3,6 +3,7 @@
 {% set activeRouteKey = '' %}
 
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
 {% block title %}
 	{# {{ 'Detail of document of %name%'|trans({ '%name%': accompanyingCourse|chill_entity_render_string } ) }} #}
@@ -18,16 +19,18 @@
 {% block content %}
 <div class="document-show">
     <h1>{{ block('title') }}</h1>
-    
-    <dl class="chill_view_data">
+
+    {{ mm.mimeIcon(document.object.type) }}
+
+    <dl class="chill_view_data mt-4">
         <dt>{{ 'Title'|trans }}</dt>
         <dd>{{ document.title }}</dd>
-        
+
         {% if document.category is not null %}
             <dt>{{ 'Category'|trans }}</dt>
             <dd>{{ document.category.name|localize_translatable_string }}</dd>
         {% endif %}
-        
+
         <dt>{{ 'Description' | trans }}</dt>
         <dd>
             {% if document.description is empty %}
@@ -39,21 +42,30 @@
             {% endif %}
         </dd>
     </dl>
-    
+
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_accompanying_course_document_delete', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+            </li>
+        {% endif %}
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+            <li>
+                <a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}"
+                   class="btn btn-edit" title="{{ 'Edit attributes' | trans }}"></a>
+            </li>
+        {% endif %}
         <li>
             {{ m.download_button(document.object, document.title) }}
         </li>
-        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+        {% if chill_document_is_editable(document.object) %}
             <li>
-                <a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}" class="btn btn-edit">
-                    {{ 'Edit' | trans }}
-                </a>
+                {{ document.object|chill_document_edit_button }}
             </li>
         {% endif %}
         {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}
@@ -65,7 +77,7 @@
     </ul>
 </div>
 {% endblock %}
- 
+
 {% block block_post_menu %}
     <div class="post-menu pt-4"></div>
 {% endblock %}
@@ -74,4 +86,4 @@
     {{ parent() }}
     {{ encore_entry_script_tags('mod_async_upload') }}
     {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
-{% endblock %}
+{% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig

@@ -0,0 +1,9 @@
+
+{# Twig way
+    TODO: une route, un template avec un header CHILL et un iframe
+#}
+<a href="{{ chill_path_add_return_path('chill_wopi_file_edit', {'fileId': document.uuid}) }}"
+    class="btn btn-wopilink">
+    {{ 'online_edit_document'|trans }}
+</a>
+

src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig

@@ -0,0 +1,91 @@
+{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+{% import '@ChillPerson/Macro/updatedBy.html.twig' as mmm %}
+
+<div class="item-bloc">
+    <div class="item-row">
+        <div class="item-col" style="width: unset">
+            <div class="denomination h2">
+                {{ document.title }}
+            </div>
+            <div>
+                {{ mm.mimeIcon(document.object.type) }}
+            </div>
+            <div>
+                <p>{{ document.category.name|localize_translatable_string }}</p>
+            </div>
+            {% if document.template is not null %}
+                <div>
+                    <p>{{ document.template.name.fr }}</p>
+                </div>
+            {% endif %}
+        </div>
+
+        <div class="item-col">
+            <div class="container">
+                {% if document.date is not null %}
+                    <div class="dates row text-end">
+                        <span>{{ document.date|format_date('short') }}</span>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+    {% if document.description is not empty %}
+        <div class="item-row">
+            <blockquote class="chill-user-quote col">
+                {{ document.description|chill_markdown_to_html }}
+            </blockquote>
+        </div>
+    {% endif %}
+    <div class="item-row separator">
+        <div class="item-col item-meta">
+            {{ mmm.createdBy(document) }}
+        </div>
+        <ul class="item-col record_actions flex-shrink-1">
+            {% if document.course is defined %}
+                {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', document) %}
+                    <li class="delete">
+                        <a href="{{ chill_return_path_or('chill_docstore_accompanying_course_document_delete', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+                    <li>
+                        <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
+                    <li>
+                        {{ m.download_button(document.object, document.title) }}
+                    </li>
+                    <li>
+                        <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
+                    </li>
+                {% endif %}
+                <li>
+                    {{ chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) }}
+                </li>
+            {% else %}
+                {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
+                    <li class="delete">
+                        <a href="{{ chill_return_path_or('chill_docstore_person_document_delete', {'person': person.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
+                    <li>
+                        <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
+                    <li>
+                        {{ m.download_button(document.object, document.title) }}
+                    </li>
+                    <li>
+                        <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
+                    </li>
+                {% endif %}
+            {% endif %}
+        </ul>
+
+    </div>
+</div>

src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro_mimeicon.html.twig

@@ -0,0 +1,55 @@
+{% macro mimeIcon(type) %}
+    
+    {# mapping
+        forkawesome and mime type  https://gist.github.com/colemanw/9c9a12aae16a4bfe2678de86b661d922
+    #}
+    {% set mapmime = {
+        'image': 'fa-file-image-o',
+        'audio': 'fa-file-audio-o',
+        'video': 'fa-file-video-o',
+        'application/pdf': 'fa-file-pdf-o',
+        'application/msword': 'fa-file-word-o',
+        'application/vnd.ms-word': 'fa-file-word-o',
+        'application/vnd.oasis.opendocument.text': 'fa-file-word-o',
+        'application/vnd.openxmlformats-officedocument.wordprocessingml': 'fa-file-word-o',
+        'application/vnd.ms-excel': 'fa-file-excel-o',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml': 'fa-file-excel-o',
+        'application/vnd.oasis.opendocument.spreadsheet': 'fa-file-excel-o',
+        'application/vnd.ms-powerpoint': 'fa-file-powerpoint-o',
+        'application/vnd.openxmlformats-officedocument.presentationml': 'fa-file-powerpoint-o',
+        'application/vnd.oasis.opendocument.presentation': 'fa-file-powerpoint-o',
+        'text/plain': 'fa-file-text-o',
+        'text/html': 'fa-file-code-o',
+        'application/json': 'fa-file-code-o',
+        'application/gzip': 'fa-file-archive-o',
+        'application/zip': 'fa-file-archive-o',
+    } %}
+    
+    {% set icon = 'fa-file-o' %}
+    {% for key,val in mapmime %}
+        {% if type starts with key %}
+            {% set icon = val %}
+        {% endif %}
+    {% endfor %}
+    
+    {# TODO improve mapping
+        mime type and friendly name  https://gist.github.com/rosskmurphy/3724501
+    #}
+    {% set maptype = {
+        'fa-file-word-o': 'office document/texte',
+        'fa-file-excel-o': 'office document/tableur',
+        'fa-file-powerpoint-o': 'office document/presentation',
+    } %}
+    
+    {% set label = type %}
+    {% for key, val in maptype %}
+        {% if icon == key %}
+            {% set label = val %}
+        {% endif %}
+    {% endfor %}
+    
+    <div class="metadata">
+        <i class="fa {{ icon }} fa-lg me-1"></i>
+        {{ label|capitalize }}
+    </div>
+{% endmacro %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig

@@ -0,0 +1,43 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}{{ 'Delete document ?' }}{% endblock %}
+
+{% block docdescription %}
+    <dl class="chill_view_data">
+        <dt>{{ 'Title'|trans }}</dt>
+        <dd>{{ document.title }}</dd>
+
+        {% if document.scope is not null %}
+            <dt>{{ 'Scope' | trans }}</dt>
+            <dd>{{ document.scope.name | localize_translatable_string }}</dd>
+        {% endif %}
+
+        <dt>{{ 'Category'|trans }}</dt>
+        <dd>{{ document.category.name|localize_translatable_string }}</dd>
+
+        <dt>{{ 'Description' | trans }}</dt>
+        <dd>
+            {% if document.description is empty %}
+                <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
+            {% else %}
+                <blockquote class="chill-user-quote">
+                    {{ document.description|chill_markdown_to_html }}
+                </blockquote>
+            {% endif %}
+        </dd>
+    </dl>
+{% endblock %}
+
+{% block personcontent %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Delete document ?'|trans,
+        'display_content'   : block('docdescription'),
+        'confirm_question'  : 'Are you sure you want to remove this document ?'|trans,
+        'cancel_route'      : 'person_document_index',
+        'cancel_parameters' : {'person' : person.id, 'id': document.id},
+        'form'              : delete_form
+    } ) }}
+{% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig

@@ -30,24 +30,26 @@
     {{ form_row(form.title) }}
     {{ form_row(form.date) }}
     {{ form_row(form.category) }}
-    {{ form_row(form.scope) }}
+    {% if form.scope is defined %}
+        {{ form_row(form.scope) }}
+    {% endif %}
     {{ form_row(form.description) }}
     {{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
+            <a href="{{ chill_return_path_or('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
+        {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_person_document_delete', {'person': person.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+            </li>
+        {% endif %}
         <li class="edit">
             <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
         </li>
-        {# {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
-            <li class="delete">
-                {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }}
-            </li>
-        {% endif %} #}
     </ul>
 
     {{ form_end(form) }}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig

@@ -26,58 +26,40 @@
 {% endblock %}
 
 {% block js %}
+	{{ parent() }}
 	{{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+{% endblock %}
+
+{% block css %}
+	{{ parent() }}
+	{{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
 {% endblock %}
 
 {% block personcontent %}
+
+<div class="col-md-10 col-xxl">
 	<h1>{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
 
-	<table class="table table-bordered border-dark table-striped">
-
-		<thead>
-			<tr>
-				<th>{{ 'Title' | trans }}</th>
-				<th>{{ 'Category'|trans }}</th>
-				<th>{{ 'Circle' | trans }}</th>
-				<th>{{ 'Actions' | trans }}</th>
-			</tr>
-		</thead>
-		<tbody>
+	{% if documents|length == 0 %}
+            <p class="chill-no-data-statement">{{ 'No documents'|trans }}</p>
+    {% else %}
+		<div class="flex-table chill-task-list">
 			{% for document in documents %}
-				<tr>
-					<td>{{ document.title }}</td>
-					<td>{{ document.category.name|localize_translatable_string }}</td>
-					<td>{{ document.scope.name|localize_translatable_string }}</td>
-					<td>
-						<ul class="record_actions">
-							{% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
-								<li>
-									{{ m.download_button(document.object, document.title) }}
-								</li>
-								<li>
-									<a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
-								</li>
-							{% endif %}
-							{% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
-								<li>
-									<a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
-								</li>
-							{% endif %}
-						</ul>
-					</td>
-				</tr>
-			{% else %}
-				<tr>
-					<td colspan="9" style="text-align:center;">
-						<span class="chill-no-data-statement">{{ 'Any document found'|trans }}</span>
-					</td>
-				</tr>
+				{% include 'ChillDocStoreBundle:List:list_item.html.twig' %}
 			{% endfor %}
-		</tbody>
-	</table>
+		</div>
+    {% endif %}
+
+	{{ chill_pagination(pagination) }}
+
+	<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\Person" data-entity-id="{{ person.id }}"></div>
 
 	{% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
-		<ul class="record_actions">
+		<ul class="record_actions sticky-form-buttons">
 			<li class="create">
 				<a href="{{ path('person_document_new', {'person': person.id}) }}" class="btn btn-create">
 					{{ 'Create new document' | trans }}
@@ -85,4 +67,6 @@
 			</li>
 		</ul>
 	{% endif %}
+
+</div>
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig

@@ -40,9 +40,9 @@
 	{{ form_row(form.description) }}
 	{{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
-	<ul class="record_actions">
+	<ul class="record_actions sticky-form-buttons">
 		<li class="cancel">
-			<a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
+			<a href="{{ chill_return_path_or('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig

@@ -19,6 +19,7 @@
 {% set activeRouteKey = '' %}
 
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
 {% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
@@ -29,12 +30,16 @@
 {% block personcontent %}
     <h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
 
+    {{ mm.mimeIcon(document.object.type) }}
+
     <dl class="chill_view_data">
         <dt>{{ 'Title'|trans }}</dt>
         <dd>{{ document.title }}</dd>
 
+        {% if document.scope is not null %}
         <dt>{{ 'Scope' | trans }}</dt>
         <dd>{{ document.scope.name | localize_translatable_string }}</dd>
+        {% endif %}
 
         <dt>{{ 'Category'|trans }}</dt>
         <dd>{{ document.category.name|localize_translatable_string }}</dd>
@@ -52,16 +57,18 @@
 
     </dl>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
 
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
+        {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_person_document_delete', {'person': person.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+            </li>
+        {% endif %}
 
         {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
             <li>
@@ -71,5 +78,15 @@
             </li>
         {% endif %}
 
-    {# {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }} #}
+        <li>
+            {{ m.download_button(document.object, document.title) }}
+        </li>
+
+        {% if chill_document_is_editable(document.object) %}
+            <li>
+                {{ document.object|chill_document_edit_button }}
+            </li>
+        {% endif %}
+
+        {# {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }} #}
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php

@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Serializer\Normalizer;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\StoredObjectRepository;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
+use function array_key_exists;
+use function is_array;
+
+class StoredObjectDenormalizer implements DenormalizerInterface
+{
+    use ObjectToPopulateTrait;
+
+    private StoredObjectRepository $storedObjectRepository;
+
+    public function __construct(StoredObjectRepository $storedObjectRepository)
+    {
+        $this->storedObjectRepository = $storedObjectRepository;
+    }
+
+    public function denormalize($data, $type, $format = null, array $context = [])
+    {
+        $object = $this->extractObjectToPopulate(StoredObject::class, $context);
+
+        if (null !== $object) {
+            return $object;
+        }
+
+        return $this->storedObjectRepository->find($data['id']);
+    }
+
+    public function supportsDenormalization($data, $type, $format = null)
+    {
+        if (false === is_array($data)) {
+            return false;
+        }
+
+        if (false === array_key_exists('id', $data)) {
+            return false;
+        }
+
+        return StoredObject::class === $type;
+    }
+}

src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtension.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Templating;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+
+class WopiEditTwigExtension extends AbstractExtension
+{
+    public function getFilters(): array
+    {
+        return [
+            new TwigFilter('chill_document_edit_button', [WopiEditTwigExtensionRuntime::class, 'renderEditButton'], [
+                'needs_environment' => true,
+                'is_safe' => ['html'],
+            ]),
+        ];
+    }
+
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction('chill_document_is_editable', [WopiEditTwigExtensionRuntime::class, 'isEditable']),
+        ];
+    }
+}

src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php

@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Templating;
+
+use ChampsLibres\WopiLib\Contract\Service\Discovery\DiscoveryInterface;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Twig\Environment;
+use Twig\Extension\RuntimeExtensionInterface;
+
+use function array_key_exists;
+
+final class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
+{
+    private const TEMPLATE = '@ChillDocStore/Button/wopi_edit_document.html.twig';
+
+    private DiscoveryInterface $discovery;
+
+    public function __construct(DiscoveryInterface $discovery)
+    {
+        $this->discovery = $discovery;
+    }
+
+    public function isEditable(StoredObject $document): bool
+    {
+        $mime_type = $this->discovery->discoverMimeType($document->getType());
+
+        foreach ($mime_type as $item) {
+            if (array_key_exists('default', $item) && 'true' === $item['default']) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function renderEditButton(Environment $environment, StoredObject $document, ?array $options = null): string
+    {
+        return $environment->render(self::TEMPLATE, [
+            'document' => $document,
+            'options' => $options,
+        ]);
+    }
+}

src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php

@@ -12,21 +12,61 @@ declare(strict_types=1);
 namespace Chill\DocStoreBundle\Workflow;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
+use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandlerInterface
 {
     private EntityRepository $repository;
 
+    private TranslatorInterface $translator;
+
     /**
      * TODO: injecter le repository directement.
      */
-    public function __construct(EntityManagerInterface $em)
-    {
+    public function __construct(
+        EntityManagerInterface $em,
+        TranslatorInterface $translator
+    ) {
         $this->repository = $em->getRepository(AccompanyingCourseDocument::class);
+        $this->translator = $translator;
+    }
+
+    public function getDeletionRoles(): array
+    {
+        return [
+            AccompanyingCourseDocumentVoter::DELETE,
+        ];
+    }
+
+    public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        $course = $this->getRelatedEntity($entityWorkflow)
+            ->getCourse();
+        $persons = [];
+
+        if (null !== $course) {
+            $persons = $course->getCurrentParticipations()->map(static function (AccompanyingPeriodParticipation $participation) {
+                return $participation->getPerson();
+            })->toArray();
+        }
+
+        return [
+            'persons' => array_values($persons),
+        ];
+    }
+
+    public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        $doc = $this->getRelatedEntity($entityWorkflow);
+
+        return $this->translator->trans('workflow.Document (n°%doc%)', ['%doc%' => $entityWorkflow->getRelatedEntityId()])
+            . ' - ' . $doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingCourseDocument
@@ -34,6 +74,18 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         return $this->repository->find($entityWorkflow->getRelatedEntityId());
     }
 
+    /**
+     * @param AccompanyingCourseDocument $object
+     *
+     * @return array[]
+     */
+    public function getRelatedObjects(object $object): array
+    {
+        return [
+            ['entityClass' => AccompanyingCourseDocument::class, 'entityId' => $object->getId()],
+        ];
+    }
+
     public function getRoleShow(EntityWorkflow $entityWorkflow): ?string
     {
         return null;
@@ -52,14 +104,9 @@ class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandler
         ];
     }
 
-    public function getTemplateTitle(EntityWorkflow $entityWorkflow, array $options = []): string
+    public function isObjectSupported(object $object): bool
     {
-        return '@ChillDocStore/AccompanyingCourseDocument/_workflow.title.html.twig';
-    }
-
-    public function getTemplateTitleData(EntityWorkflow $entityWorkflow, array $options = []): array
-    {
-        return $this->getTemplateData($entityWorkflow, $options);
+        return $object instanceof AccompanyingCourseDocument;
     }
 
     public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool

src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml

@@ -0,0 +1,46 @@
+---
+openapi: "3.0.0"
+info:
+  version: "1.0.0"
+  title: "Chill api"
+  description: "Api documentation for chill. Currently, work in progress"
+servers:
+  - url: "/api"
+    description: "Your current dev server"
+
+components:
+  schemas:
+    StoredObject:
+      type: object
+      properties:
+        id:
+          type: integer
+        filename:
+          type: string
+        type:
+          type: string
+
+paths:
+  /1.0/docstore/stored-object.json:
+    post:
+      tags:
+        - storedobject
+      summary: Create a stored object
+      requestBody:
+        description: "A stored object"
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/StoredObject"
+      responses:
+        200:
+          description: "OK"
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/StoredObject"
+        403:
+          description: "Unauthorized"
+        422:
+          description: "Invalid data"

src/Bundle/ChillDocStoreBundle/chill.webpack.config.js

@@ -1,4 +1,7 @@
 module.exports = function(encore)
 {
+    encore.addAliases({
+        ChillDocStoreAssets: __dirname + '/Resources/public'
+    });
     encore.addEntry('mod_async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
 };

src/Bundle/ChillDocStoreBundle/config/services.yaml

@@ -6,7 +6,6 @@ services:
     autowire: true
     autoconfigure: true
     resource: "../Repository/"
-    tags: ["doctrine.repository_service"]
 
   Chill\DocStoreBundle\Form\DocumentCategoryType:
     class: Chill\DocStoreBundle\Form\DocumentCategoryType
@@ -16,8 +15,10 @@ services:
 
   Chill\DocStoreBundle\Form\PersonDocumentType:
     class: Chill\DocStoreBundle\Form\PersonDocumentType
-    arguments:
-      - "@chill.main.helper.translatable_string"
+    autowire: true
+    autoconfigure: true
+    # arguments:
+    #   - "@chill.main.helper.translatable_string"
     tags:
       - { name: form.type, alias: chill_docstorebundle_form_document }
 
@@ -32,3 +33,10 @@ services:
       resource: './../Workflow/'
       autoconfigure: true
       autowire: true
+
+  Chill\DocStoreBundle\Serializer\Normalizer\:
+      autowire: true
+      resource: '../Serializer/Normalizer/'
+      tags:
+          - { name: 'serializer.normalizer', priority: 16 }
+

src/Bundle/ChillDocStoreBundle/config/services/templating.yaml

@@ -0,0 +1,6 @@
+services:
+
+  Chill\DocStoreBundle\Templating\:
+    resource: ../../Templating
+    autoconfigure: true
+    autowire: true

src/Bundle/ChillDocStoreBundle/migrations/Version20220131093117.php

@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocStore;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Implementations of create and update traits for Document entity + template property added.
+ */
+final class Version20220131093117 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP CONSTRAINT FK_41DA53C5DA0FB8');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP CONSTRAINT FK_41DA53C3174800F');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP CONSTRAINT FK_41DA53C65FF1AEC');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP template_id');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP createdAt');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP updatedAt');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP createdBy_id');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP updatedBy_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F65DA0FB8');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F63174800F');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F665FF1AEC');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP template_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP createdAt');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP updatedAt');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP createdBy_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP updatedBy_id');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Implementations of create and update traits for Document entity + template property added';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD template_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD updatedBy_id INT DEFAULT NULL');
+        $this->addSql('COMMENT ON COLUMN chill_doc.accompanyingcourse_document.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_doc.accompanyingcourse_document.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD CONSTRAINT FK_A45098F65DA0FB8 FOREIGN KEY (template_id) REFERENCES chill_docgen_template (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD CONSTRAINT FK_A45098F63174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD CONSTRAINT FK_A45098F665FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_A45098F65DA0FB8 ON chill_doc.accompanyingcourse_document (template_id)');
+        $this->addSql('CREATE INDEX IDX_A45098F63174800F ON chill_doc.accompanyingcourse_document (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_A45098F665FF1AEC ON chill_doc.accompanyingcourse_document (updatedBy_id)');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD template_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD updatedBy_id INT DEFAULT NULL');
+        $this->addSql('COMMENT ON COLUMN chill_doc.person_document.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_doc.person_document.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C5DA0FB8 FOREIGN KEY (template_id) REFERENCES chill_docgen_template (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_41DA53C5DA0FB8 ON chill_doc.person_document (template_id)');
+        $this->addSql('CREATE INDEX IDX_41DA53C3174800F ON chill_doc.person_document (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_41DA53C65FF1AEC ON chill_doc.person_document (updatedBy_id)');
+    }
+}

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

@@ -10,6 +10,7 @@ New document for %name%: Nouveau document pour %name%
 Editing document for %name%: Modification d'un document pour %name%
 Edit Document: Modification d'un document
 Update document: Modifier le document
+Edit attributes: Modifier les propriétés du document
 Existing document: Document existant
 No document to download: Aucun document à télécharger
 'Choose a document category': Choisissez une catégorie de document
@@ -18,6 +19,12 @@ The document is successfully registered: Le document est enregistré
 The document is successfully updated: Le document est mis à jour
 Any description: Aucune description
 
+# delete
+Delete document ?: Supprimer le document ?
+Are you sure you want to remove this document ?: Êtes-vous sûr·e de vouloir supprimer ce document ?
+The document is successfully removed: Le document a été supprimé
+
+
 # dropzone upload
 File too big: Fichier trop volumineux
 Drop your file or click here: Cliquez ici ou faites glissez votre nouveau fichier dans cette zone
@@ -51,4 +58,7 @@ Id inside bundle: Identifiant
 Document class: Classe de document
 no records found:
 Create new category: Créer une nouvelle catégorie
-Back to the category list: Retour à la liste
+Back to the category list: Retour à la liste
+
+# WOPI EDIT
+online_edit_document: Éditer en ligne

src/Bundle/ChillEventBundle/Controller/EventController.php

@@ -38,7 +38,7 @@ use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 

src/Bundle/ChillEventBundle/Form/Type/PickEventType.php

@@ -28,7 +28,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function in_array;
 use function is_array;

src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php

@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Allow to pick a choice amongst different choices.

src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php

@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Allow to pick amongst type.

src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php

@@ -15,7 +15,7 @@ use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {

src/Bundle/ChillEventBundle/config/services/controller.yaml

@@ -5,7 +5,7 @@ services:
             $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
             $formFactoryInterface: '@Symfony\Component\Form\FormFactoryInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
             $paginator: '@chill_main.paginator_factory'
         public: true
         tags: ['controller.service_arguments']

src/Bundle/ChillEventBundle/config/services/forms.yaml

@@ -44,6 +44,6 @@ services:
             $tokenStorage: "@security.token_storage"
             $authorizationHelper: "@chill.main.security.authorization.helper"
             $urlGenerator: '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
         tags:
             - { name: form.type }

src/Bundle/ChillEventBundle/config/services/menu.yaml

@@ -2,6 +2,6 @@ services:
     Chill\EventBundle\Menu\PersonMenuBuilder:
         arguments:
             $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
         tags:
             - { name: 'chill.menu_builder' }

src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php

@@ -24,7 +24,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FamilyMemberController extends AbstractController
 {

src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php

@@ -15,7 +15,7 @@ use Chill\AMLI\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {

src/Bundle/ChillFamilyMembersBundle/Resources/config/services/menu.yml

@@ -2,6 +2,6 @@ services:
     Chill\AMLI\FamilyMembersBundle\Menu\UserMenuBuilder:
         arguments:
             $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
         tags:
             - { name: 'chill.menu_builder' }

src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php

@@ -20,8 +20,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_merge;
 

src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php

@@ -27,7 +27,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_merge;