CS: Autofix.

chill-main work in progress
Add missing form type wirings.
2025-10-31 17:28:23 +00:00 · 2022-02-01 09:35:04 +01:00 · 2022-02-01 09:35:04 +01:00 · 2022-02-01 09:35:04 +01:00 · 2022-02-01 09:35:04 +01:00 · 2022-02-01 09:35:04 +01:00
1255 changed files with 49220 additions and 26471 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,10 +18,3 @@ max_line_length = 80

 [COMMIT_EDITMSG]
 max_line_length = 0
-<<<<<<< Updated upstream
-=======
-
-[*.{js, vue, ts}]
-indent_size = 2
-indent_style = space
->>>>>>> Stashed changes
--- a/.env
+++ b/.env
@@ -0,0 +1,64 @@
+##
+##  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
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,3 @@ docs/build/

 /.php-cs-fixer.cache
 /.idea/
-/.psalm/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,6 @@ 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
@@ -79,7 +78,6 @@ 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:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,271 +11,16 @@ and this project adheres to
 ## Unreleased

 <!-- write down unreleased development here -->
-* [workflow]: added pagination to workflow list page
-* [homepage_widget]: null error on tasks widget fixed
-* [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
-* [search]: Order of birthdate fields changed in advanced search to avoid confusion.
-* [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
-* [filiation]: Allow the deletion of a relationship in filiations (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/608)
-* [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
-
-## Test releases
-
-### 2022-05-30
-
-* fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost)
-
-### 2022-05-27
-
-* [storedobject] add title field on StoredObject entity + use it in activity documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
-* [main] add a "read more..." on comment embeddable when overflown (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
-* [person] add closing motive to closed acc course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/603)
-* [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586)
-* [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601)
-* [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702)
-* [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
-* [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
-* [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
-* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
-* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
-
-
-### 2022-05-06
-
-* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-
-### 2021-04-29
-
-* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
-* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
-* Load relationships without gender in french fixtures
-* Add command to remove old draft accompanying periods
-* [parcours]: If users assings him/herself as referrer and job is not null. Update parcours job (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/578)
-
-### 2021-04-28
-
-* [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593)
-* [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561)
-* [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560)
-* [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565)
-* [parcours]: Comments can be unpinned + edit/delete for all users that are allowed to edit parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/566)
-
-### 2021-04-26
-
-* [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
-* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
-* [Person_search] Closed parcours shown within an accordeon that can be opened/closed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/574)
-
-### 2021-04-24
-
-* [notification email on course designation] allow raw string in email content generation
-* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
-* [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634)
-* [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572)
-* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570)
-* [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573)
-* [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943)
-* [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older
-* [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
-* [Notifications] delay the sending of notificaiton to kernel.terminate
-* [Notifications / Period user change] fix the sending of notification when user changes
-* [Activity form] invert 'incoming' and 'receiving' in Activity form
-* [Activity form] keep the same order for 'attendee' field in new and edit form
-* [list with period] use "sameas" test operator to introduce requestor in list
-* [notification email on course designation] allow raw string in email content generation
-* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
-* [evaluation_document] changing date to datetime in order to display the time at which document was created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/569)
-
-
-### 2021-04-13
-
-* [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
-* [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
-* [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);
-* [docgen] add a new context with a list of activities in course
-* [docgen] add a comment in budget lines
-* [notifications] allow to send a notification to an email address. The address receive an access link
-* [adresses] add constraints in database to avoid errors later: postcode not null, and validfrom <= validto
-* [accompanying work editor] add a label on document title input
-
-### 2021-04-07
-
-* notification list: move action buttons outside of the toggle
-* fix detecting of non-read notification
-* filter users which are disabled in search user api
-* order query for location and add pagination in list
-* allow every person which has part for a workflow  to see the workflow page
-* able to see the workflow if the evaluation document has been deleted
-* hardcode the list of supported mime types for edition with collabora
-* list of accompanying course: allow to see the pinned comment in list_item
-
-### 2021-04-06
-
-* [main] notification toggle read: correct js syntax for compilation in production (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/548)
-* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535)
-* [activity] espace entre les boutons pour supprimer les documents
-
-
-### continuous release in February and March
-
-* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
-* [person] Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported and if no keyInfos
-(https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/585)
-* [activity] display error messages above the form in creating a new location (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/481)
-* [activity] show required field in activity edit/new by an asterix in the vuejs fields (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/494)
-* [ACL] fix allow to see the course, event if the scope'course does not contains the scope's user
-* [search] enforce limit of results for fetching rsults by search api https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/576
-* [activity] Fix delete button for document (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/554)
-* [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
-* [person] add person ressource to person docgen normaliser (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/517)
-* [person] AccompanyingCourseWorkEdit: fix deleting evaluation documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/546)
-* [person] AccompanyingCourseWorkEdit: download existing documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/512)
-* [person] AccompanyingCourseWorkEdit: replace document by a new one (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/511)
-* [person] AccompanyingPeriodWork: add referrers to work, add doctrine event listener to add logged user to referrers collection and display a referrers list in work list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/502)
-* [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
-* [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
-* [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)
-* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
-* [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)
-* [budget]: budget enabled for persons and households (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/469)
-*  [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)
-* [household] bugfix if position of member is null, renderbox no longer throws an error (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/480)
-* [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)
-* [activity] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
-* [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
-* [address] person badge in address history changed to open OnTheFly with all person info (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/489)
-* [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
-* [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
-* [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
-* [person_resource] separate create page created to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/504)
-* [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
-* [thirdparty] For contacts show current civility/profession in edit form + fix saving of edited information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/491)
-* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
-* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
-* [thirdparty] add firstname field to thirdparty 'child' or 'contact' types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/508)
-* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
-* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
-* [parcours] List of parcours for a specific user so they can be reassigned in case of absence (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/509)
-* [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
-* [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
-* [filiation] Possible to add person (or create onthefly) to add to filiation graph + add relation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/519)
-* [household] Within parcours listing page of household add create button (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/560)
-* [person_resource] bugfix when adding thirdparty or freetext resource + prevent personOwner themselves to be added. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/526)
-* [aside_activity] style correction + sticky-form create button (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/529)
-* [budget] order within the menu adjusted (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/592)
-* [onthefly] fix create person. Bug was noticed in filiation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/591)
-* [parcours] Create document buttons made sticky (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/532)
-* [person] Trailing guillemet removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/530)
-* [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537)
-* [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542)
-
-* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
-## 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 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)
-* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
-
-
-### 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)
-* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.


+## Test releases
+
 ### 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)
@@ -286,6 +31,7 @@ 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
@@ -321,7 +67,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
@@ -479,7 +225,6 @@ 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
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -2,14 +2,7 @@

 en cours de rédaction

-## Translations

-
-Par bundle, toutes les traductions des pages twig se trouvent dans un seul fichier `translations/messages.fr.yaml`.
-
-## Emplacement des fichiers
-
-Les controllers, form type & templates twig sont placés à la racine des dossiers `Controller`, `Form` & `Ressources/views`, respectivement. Pour les pages Admin, on ne les mets plus dans des sous-dossiers Admin.
 ## Assets: nommage des entrypoints

 Trois types d'entrypoint:
@@ -153,20 +146,19 @@ Ces règles n'ont pas toujours été utilisées par le passé. Elles sont souhai

 Les routes sont nommées de cette manière:

-`chill_(api|crud)_bundle_(api)_entite_action`
+`chill_bundle_entite_action`

 1. d'abord chill_ (pour tous les modules chill)
-2. ensuite `crud` ou `api`, optionnel, automatiquement ajouté si la route est générée par la configuration
-3. ensuite une string qui indique le bundle (`main`, `person`, `activity`, ...)
-4. ensuite, `api`, si la route est une route d'api.
-5. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
-6. ensuite une action (`list`, `view`, `edit`, `new`, ...)
+2. ensuite une string qui est identique, par bundle
+3. si le point est un point d'api (json), alors ajouter la string `api`
+4. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
+5. ensuite une action (`list`, `view`, `edit`, `new`, ...)

-Le fait d'indiquer `api` en quatrième position permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
+Le fait d'indiquer `api` en 3 permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)

 Si les points 4 et 5 sont inexistants, alors ils sont remplacés par d'autres éléments de manière à garantir l'unicité de la route, et sa bonne compréhension.

-### Nommage des URL
+### URL

 Les URL respectent également une convention:

@@ -227,14 +219,6 @@ Les éléments suivants devraient se trouver dans la liste:

 Ces éléments peuvent être entrecoupés de l'identifiant d'une entité. Dans ce cas, cet identifiant se place juste après l'entité auquel il se rapporte.

-#### Pour les URL de l'espace Admin
-
-Même conventions que dans les autres pages html de l'application, **mais `admin` est ajouté en deuxième position**. Soit:
-
-
-`/{_locale}/admin/bundle/entity/{id}/action`
-
-
 ## Règles UI chill

 ### Titre des pages
--- a/BIN
+++ b/BIN
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,8 @@
    "require": {
        "php": "^7.4",
        "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
-        "champs-libres/wopi-bundle": "dev-master#6dd8e0a14e00131eb4b889ecc30270ee4a0e5224",
-        "champs-libres/wopi-lib": "dev-master#8615f4a45a39fc2b6a98765ea835fcfd39618787",
+        "champs-libres/wopi-bundle": "dev-master#59b468503b9413f8d588ef9e626e7675560db3d8",
+        "champs-libres/wopi-lib": "dev-master#0e1da19bb6de820080b8651867a7e475be590060",
        "doctrine/doctrine-bundle": "^2.1",
        "doctrine/doctrine-migrations-bundle": "^3.0",
        "doctrine/orm": "^2.7",
@@ -21,8 +21,7 @@
        "knplabs/knp-time-bundle": "^1.12",
        "league/csv": "^9.7.1",
        "nyholm/psr7": "^1.4",
-        "ocramius/package-versions": "^1.10 || ^2",
-        "odolbeau/phone-number-bundle": "^3.6",
+        "ocramius/package-versions": "^1.10",
        "phpoffice/phpspreadsheet": "^1.16",
        "ramsey/uuid-doctrine": "^1.7",
        "sensio/framework-extra-bundle": "^5.5",
@@ -33,7 +32,6 @@
        "symfony/expression-language": "^4.4",
        "symfony/form": "^4.4",
        "symfony/framework-bundle": "^4.4",
-        "symfony/http-foundation": "^4.4",
        "symfony/intl": "^4.4",
        "symfony/mailer": "^5.4",
        "symfony/mime": "^5.4",
@@ -45,7 +43,6 @@
        "symfony/translation": "^4.4",
        "symfony/twig-bundle": "^4.4",
        "symfony/validator": "^4.4",
-        "symfony/web-link": "*",
        "symfony/webpack-encore-bundle": "^1.11",
        "symfony/workflow": "^4.4",
        "symfony/yaml": "^4.4",
@@ -96,8 +93,7 @@
    "autoload-dev": {
        "psr-4": {
            "App\\": "tests/app/src/",
-            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
-            "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
+            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
        }
    },
    "config": {
@@ -106,8 +102,7 @@
            "ergebnis/composer-normalize": true,
            "ocramius/package-versions": true,
            "phpro/grumphp": true,
-            "phpstan/extension-installer": true,
-            "roave/you-are-using-it-wrong": true
+            "phpstan/extension-installer": true
        },
        "bin-dir": "bin",
        "optimize-autoloader": true,
--- a/docs/source/development/pagination.rst
+++ b/docs/source/development/pagination.rst
@@ -32,7 +32,7 @@ Then, render the pagination using the dedicated twig function.

   {% block title 'Item list'|trans %}

-   {% block content %}
+   {% block personcontent %}

   <table>

--- a/docs/source/development/user-interface/layout-template-usage.rst
+++ b/docs/source/development/user-interface/layout-template-usage.rst
@@ -156,7 +156,7 @@ This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the p

 It proposes 1 new block :

-* content
+* personcontent

  * where to display the information of the person

--- a/docs/source/installation/index.rst
+++ b/docs/source/installation/index.rst
@@ -65,17 +65,6 @@ This script will :
 4. build assets


-.. note::
-
-   In some cases it can happen that an old image (chill_base_php or chill_php) stored in the docker cache will make the script fail. To solve this problem you have to delete the image and the container, before the make init :
-
-    .. code-block:: bash
-
-       docker-compose images php
-       docker rmi -f chill_php:prod
-       docker-compose rm php
-
-
 4. Start the project
 ====================

--- a/grumphp.yml
+++ b/grumphp.yml
@@ -24,7 +24,6 @@ parameters:
        - "/spec/"
        - "/var/"
        - "/vendor/"
-        - "/tests/app"

    # Psalm
    tasks.psalm.blocking: true
--- a/phpstan-critical.neon
+++ b/phpstan-critical.neon
@@ -5,6 +5,11 @@ parameters:
            count: 1
            path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

+        -
+            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdParticipationAt\\.$#"
+            count: 3
+            path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
        -
            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#"
            count: 1
@@ -20,6 +25,11 @@ 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
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@@ -25,6 +25,16 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php

+		-
+			message: "#^Only booleans are allowed in &&, mixed given on the right side\\.$#"
+			count: 3
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 3
@@ -240,6 +250,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/Address.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -280,6 +295,11 @@ 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
@@ -305,6 +325,11 @@ 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
@@ -335,6 +360,11 @@ parameters:
 			count: 6
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -440,8 +470,18 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+
 		-
 			message: "#^Method Chill\\\\ThirdPartyBundle\\\\Search\\\\ThirdPartySearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,7 +3,6 @@ parameters:
    paths:
        - src/
    excludePaths:
-        - .php_cs*
        - docs/
        - src/Bundle/*/Tests/*
        - src/Bundle/*/tests/*
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -40,9 +40,6 @@
        <testsuite name="DocGeneratorBundle">
            <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
        </testsuite>
-        <testsuite name="WopiBundle">
-            <directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
-        </testsuite>
    </testsuites>

    <listeners>
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.18.0.0">
+<files psalm-version="v4.15.0@a1b5e489e6fcebe40cb804793d964e99fc347820">
  <file src="src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php">
    <UndefinedClass occurrences="4">
      <code>'ChillActivityBundle:ActivityReasonCategory'</code>
@@ -47,11 +47,6 @@
      <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>
@@ -169,18 +164,72 @@
      <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>
@@ -205,6 +254,11 @@
      <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>
@@ -234,6 +288,11 @@
      <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>
@@ -338,6 +397,10 @@
    </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>
@@ -345,6 +408,61 @@
      <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>
@@ -352,6 +470,11 @@
      <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>
@@ -447,6 +570,9 @@
    <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>
@@ -462,6 +588,10 @@
    </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>
@@ -761,6 +891,11 @@
      <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>
@@ -789,6 +924,11 @@
      <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>
@@ -916,15 +1056,158 @@
    </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>
@@ -1129,6 +1412,20 @@
      <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>
@@ -1208,13 +1505,33 @@
    </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>
@@ -1226,19 +1543,40 @@
    </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>
@@ -1248,25 +1586,140 @@
    </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">
@@ -1367,13 +1820,20 @@
      <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>
-    <UndefinedDocblockClass occurrences="31">
-      <code>$client</code>
-      <code>$client</code>
+    <MethodSignatureMismatch occurrences="2">
+      <code>public function setUp()</code>
+      <code>public static function setUpBeforeClass()</code>
+    </MethodSignatureMismatch>
+    <UndefinedDocblockClass occurrences="29">
      <code>$client</code>
      <code>$client</code>
      <code>$client</code>
@@ -1405,7 +1865,16 @@
      <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>
@@ -1413,6 +1882,10 @@
    </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>
@@ -1485,6 +1958,11 @@
      <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>
@@ -1510,6 +1988,11 @@
      <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>
--- a/psalm.xml
+++ b/psalm.xml
@@ -6,7 +6,6 @@
    xmlns="https://getpsalm.org/schema/config"
    xsi:schemaLocation="https://getpsalm.org/schema/config tests/app/vendor/vimeo/psalm/config.xsd"
    errorBaseline="psalm-baseline.xml"
-    cacheDirectory="./.psalm"
 >
    <projectFiles>
        <directory name="src" />
@@ -14,15 +13,4 @@
            <directory name="./tests/" />
        </ignoreFiles>
    </projectFiles>
-
-    <!-- suppress error around parameter bags - see https://github.com/symfony/symfony/issues/45609#issuecomment-1056816975 -->
-    <!-- maybe to desactivate with php 8.1 ? -->
-    <issueHandlers>
-        <UndefinedDocblockClass>
-            <errorLevel type="suppress">
-                <referencedClass name="UnitEnum" />
-            </errorLevel>
-        </UndefinedDocblockClass>
-    </issueHandlers>
-
 </psalm>
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -21,7 +21,6 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
-use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -35,7 +34,6 @@ 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;
@@ -57,8 +55,6 @@ final class ActivityController extends AbstractController

    private ActivityTypeRepository $activityTypeRepository;

-    private CenterResolverManagerInterface $centerResolver;
-
    private EntityManagerInterface $entityManager;

    private EventDispatcherInterface $eventDispatcher;
@@ -85,8 +81,7 @@ final class ActivityController extends AbstractController
        EntityManagerInterface $entityManager,
        EventDispatcherInterface $eventDispatcher,
        LoggerInterface $logger,
-        SerializerInterface $serializer,
-        CenterResolverManagerInterface $centerResolver
+        SerializerInterface $serializer
    ) {
        $this->activityACLAwareRepository = $activityACLAwareRepository;
        $this->activityTypeRepository = $activityTypeRepository;
@@ -100,7 +95,6 @@ final class ActivityController extends AbstractController
        $this->eventDispatcher = $eventDispatcher;
        $this->logger = $logger;
        $this->serializer = $serializer;
-        $this->centerResolver = $centerResolver;
    }

    /**
@@ -184,15 +178,14 @@ final class ActivityController extends AbstractController
    {
        $view = null;

+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
        $entity = $this->activityRepository->find($id);

        if (null === $entity) {
            throw $this->createNotFoundException('Unable to find Activity entity.');
        }

-        $accompanyingPeriod = $entity->getAccompanyingPeriod();
-        $person = $entity->getPerson();
-
        if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
            $accompanyingPeriod = $entity->getAccompanyingPeriod();
@@ -203,46 +196,21 @@ final class ActivityController extends AbstractController
        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);

        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
+            'center' => $entity->getCenter(),
            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
-        ]);
-
-        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);
+        ])->handleRequest($request);

        if ($form->isSubmitted() && $form->isValid()) {
            $this->entityManager->persist($entity);
            $this->entityManager->flush();

+            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
+
            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
            $params['id'] = $entity->getId();

-            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(),
-                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', $params),
-                    ]
-                );
-            }
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
-
            return $this->redirectToRoute('chill_activity_activity_show', $params);
        }

@@ -421,43 +389,16 @@ final class ActivityController extends AbstractController
        $this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);

        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
+            'center' => $entity->getCenter(),
            'role' => new Role('CHILL_ACTIVITY_CREATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
-        ]);
-
-        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);
+        ])->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(),
-                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', [
-                            'id' => $entity->getId(),
-                        ]),
-                    ]
-                );
-            }
-
            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));

            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -54,7 +54,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -75,7 +75,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();

        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
            'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -125,7 +125,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -54,7 +54,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -75,7 +75,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->findAll();
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();

        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
            'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -125,7 +125,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -61,6 +61,8 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
                ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
                ActivityVoter::FULL => [
+                    ActivityVoter::CREATE_PERSON,
+                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
                    ActivityVoter::DELETE,
                    ActivityVoter::UPDATE,
                ],
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -15,9 +15,8 @@ use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
-use Chill\MainBundle\Entity\HasCentersInterface;
-use Chill\MainBundle\Entity\HasScopesInterface;
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@@ -36,7 +35,6 @@ use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
-use Symfony\Component\Validator\Constraints as Assert;

 /**
 * Class Activity.
@@ -55,7 +53,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 *     getUserFunction="getUser",
 * path="scope")
 */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
 {
    public const SENTRECEIVED_RECEIVED = 'received';

@@ -95,7 +93,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

    /**
     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
-     * @Assert\Valid(traverse=true)
     */
    private Collection $documents;

@@ -135,11 +132,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     */
    private ?Collection $persons = null;

-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     */
-    private PrivateCommentEmbeddable $privateComment;
-
    /**
     * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
     * @Groups({"docgen:read"})
@@ -199,7 +191,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    {
        $this->reasons = new ArrayCollection();
        $this->comment = new CommentEmbeddable();
-        $this->privateComment = new PrivateCommentEmbeddable();
        $this->persons = new ArrayCollection();
        $this->thirdParties = new ArrayCollection();
        $this->documents = new ArrayCollection();
@@ -240,22 +231,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    {
        if (!$this->socialActions->contains($socialAction)) {
            $this->socialActions[] = $socialAction;
-            $this->ensureSocialActionConsistency();
        }

        return $this;
    }

-    /**
-     * Add a social issue.
-     *
-     * Note: the social issue consistency (the fact that only yougest social issues
-     * are kept) is processed by an entity listener:
-     *
-     * @see{\Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener}
-     *
-     * @return $this
-     */
    public function addSocialIssue(SocialIssue $socialIssue): self
    {
        if (!$this->socialIssues->contains($socialIssue)) {
@@ -306,17 +286,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     * get the center
     * center is extracted from person.
     */
-    public function getCenters(): iterable
+    public function getCenter(): ?Center
    {
        if ($this->person instanceof Person) {
-            return [$this->person->getCenter()];
+            return $this->person->getCenter();
        }

-        if ($this->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            return $this->getAccompanyingPeriod()->getCenters() ?? [];
-        }
-
-        return [];
+        return null;
    }

    public function getComment(): CommentEmbeddable
@@ -381,7 +357,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        if (null !== $this->accompanyingPeriod) {
            $personsAssociated = [];

-            foreach ($this->accompanyingPeriod->getOpenParticipations() as $participation) {
+            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
                if ($this->persons->contains($participation->getPerson())) {
                    $personsAssociated[] = $participation->getPerson();
                }
@@ -411,11 +387,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return [];
    }

-    public function getPrivateComment(): PrivateCommentEmbeddable
-    {
-        return $this->privateComment;
-    }
-
    public function getReasons(): Collection
    {
        return $this->reasons;
@@ -426,19 +397,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->scope;
    }

-    public function getScopes(): iterable
-    {
-        if (null !== $this->getAccompanyingPeriod()) {
-            return $this->getAccompanyingPeriod()->getScopes();
-        }
-
-        if (null !== $this->getPerson()) {
-            return [$this->scope];
-        }
-
-        return [];
-    }
-
    public function getSentReceived(): string
    {
        return $this->sentReceived;
@@ -615,13 +573,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this;
    }

-    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
-    {
-        $this->privateComment = $privateComment;
-
-        return $this;
-    }
-
    public function setReasons(?ArrayCollection $reasons): self
    {
        $this->reasons = $reasons;
@@ -680,13 +631,4 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

        return $this;
    }
-
-    private function ensureSocialActionConsistency(): void
-    {
-        $ancestors = SocialAction::findAncestorSocialActions($this->getSocialActions());
-
-        foreach ($ancestors as $ancestor) {
-            $this->removeSocialAction($ancestor);
-        }
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -167,16 +167,6 @@ class ActivityType
     */
    private int $personVisible = self::FIELD_REQUIRED;

-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
-    private string $privateCommentLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
-    private int $privateCommentVisible = self::FIELD_OPTIONAL;
-
    /**
     * @ORM\Column(type="string", nullable=false, options={"default": ""})
     */
@@ -281,7 +271,7 @@ class ActivityType
    public function checkSocialActionsVisibility(ExecutionContextInterface $context, $payload)
    {
        if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
-            if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
+            if (!($this->socialIssuesVisible === 2 && $this->socialActionsVisible === 1)) {
                $context
                    ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value')
                    ->atPath('socialActionsVisible')
@@ -426,16 +416,6 @@ class ActivityType
        return $this->personVisible;
    }

-    public function getPrivateCommentLabel(): string
-    {
-        return $this->privateCommentLabel;
-    }
-
-    public function getPrivateCommentVisible(): int
-    {
-        return $this->privateCommentVisible;
-    }
-
    public function getReasonsLabel(): string
    {
        return $this->reasonsLabel;
@@ -708,20 +688,6 @@ class ActivityType
        return $this;
    }

-    public function setPrivateCommentLabel(string $privateCommentLabel): self
-    {
-        $this->privateCommentLabel = $privateCommentLabel;
-
-        return $this;
-    }
-
-    public function setPrivateCommentVisible(int $privateCommentVisible): self
-    {
-        $this->privateCommentVisible = $privateCommentVisible;
-
-        return $this;
-    }
-
    public function setReasonsLabel(string $reasonsLabel): self
    {
        $this->reasonsLabel = $reasonsLabel;
--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -66,6 +66,9 @@ class ActivityEntityListener
                    $newAction->addPerson($person);
                }

+                foreach ($associatedThirdparties as $thirdparty) {
+                    $newAction->setHandlingThierparty($thirdparty);
+                }
                $this->em->persist($newAction);
                $this->em->flush();
            }
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+++ b/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;
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/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\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;

 class ActivityDateFilter implements FilterInterface
 {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+++ b/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;

--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -14,20 +14,16 @@ namespace Chill\ActivityBundle\Form;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\DocStoreBundle\Form\StoredObjectType;
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
-use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@@ -53,7 +49,6 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;

-use Symfony\Component\Security\Core\Role\Role;
 use function in_array;

 class ActivityType extends AbstractType
@@ -113,25 +108,24 @@ class ActivityType extends AbstractType
        $activityType = $options['activityType'];

        // TODO revoir la gestion des center au niveau du form des activité.
-        if ($options['center'] instanceof Center && null !== $options['data']->getPerson()) {
+        if ($options['center']) {
            $builder->add('scope', ScopePickerType::class, [
                'center' => $options['center'],
-                'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
-                'required' => true,
+                'role' => $options['role'],
+                // TODO make required again once scope and rights are fixed
+                'required' => false,
            ]);
        }

        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
        $accompanyingPeriod = null;

-        if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
+        if ($options['accompanyingPeriod']) {
            $accompanyingPeriod = $options['accompanyingPeriod'];
        }

        if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
-            $builder->add('socialIssues', HiddenType::class, [
-                'required' => $activityType->getSocialIssuesVisible() === 2,
-            ]);
+            $builder->add('socialIssues', HiddenType::class);
            $builder->get('socialIssues')
                ->addModelTransformer(new CallbackTransformer(
                    static function (iterable $socialIssuesAsIterable): string {
@@ -157,9 +151,7 @@ class ActivityType extends AbstractType
        }

        if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
-            $builder->add('socialActions', HiddenType::class, [
-                'required' => $activityType->getSocialActionsVisible() === 2,
-            ]);
+            $builder->add('socialActions', HiddenType::class);
            $builder->get('socialActions')
                ->addModelTransformer(new CallbackTransformer(
                    static function (iterable $socialActionsAsIterable): string {
@@ -221,10 +213,12 @@ class ActivityType extends AbstractType
            ]);
        }

-        if ($activityType->isVisible('user') && $options['center'] instanceof Center) {
-            $builder->add('user', PickUserDynamicType::class, [
+        if ($activityType->isVisible('user') && $options['center']) {
+            $builder->add('user', UserPickerType::class, [
                'label' => $activityType->getLabel('user'),
                'required' => $activityType->isRequired('user'),
+                'center' => $options['center'],
+                'role' => $options['role'],
            ]);
        }

@@ -253,13 +247,6 @@ class ActivityType extends AbstractType
            ]);
        }

-        if ($activityType->isVisible('privateComment')) {
-            $builder->add('privateComment', PrivateCommentType::class, [
-                'label' => '' === $activityType->getLabel('privateComment') ? 'private comment' : $activityType->getPrivateCommentLabel(),
-                'required' => false,
-            ]);
-        }
-
        if ($activityType->isVisible('persons')) {
            $builder->add('persons', HiddenType::class);
            $builder->get('persons')
@@ -318,11 +305,9 @@ class ActivityType extends AbstractType
                'label' => $activityType->getLabel('documents'),
                'required' => $activityType->isRequired('documents'),
                'allow_add' => true,
-                'allow_delete' => true,
                'button_add_label' => 'activity.Insert a document',
                'button_remove_label' => 'activity.Remove a document',
                'empty_collection_explain' => 'No documents',
-                'entry_options' => ['has_title' => true],
            ]);
        }

@@ -353,9 +338,7 @@ class ActivityType extends AbstractType
        }

        if ($activityType->isVisible('location')) {
-            $builder->add('location', HiddenType::class, [
-                'required' => $activityType->getLocationVisible() === 2,
-            ])
+            $builder->add('location', HiddenType::class)
                ->get('location')
                ->addModelTransformer(new CallbackTransformer(
                    static function (?Location $location): string {
@@ -383,8 +366,8 @@ class ActivityType extends AbstractType
                'label' => $activityType->getLabel('sentReceived'),
                'required' => $activityType->isRequired('sentReceived'),
                'choices' => [
-                    'Received' => Activity::SENTRECEIVED_RECEIVED,
                    'Sent' => Activity::SENTRECEIVED_SENT,
+                    'Received' => Activity::SENTRECEIVED_RECEIVED,
                ],
            ]);
        }
@@ -443,8 +426,8 @@ class ActivityType extends AbstractType

        $resolver
            ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
-            ->setAllowedTypes('center', ['null', Center::class])
-            ->setAllowedTypes('role', [Role::class, 'string'])
+            ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
+            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
            ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
    }
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -57,7 +57,7 @@ class ActivityTypeType extends AbstractType
        $fields = [
            'persons', 'user', 'date', 'location', 'persons',
            'thirdParties', 'durationTime', 'travelTime', 'attendee',
-            'reasons', 'comment', 'privateComment', 'sentReceived', 'documents',
+            'reasons', 'comment', 'sentReceived', 'documents',
            'emergency', 'socialIssues', 'socialActions', 'users',
        ];

@@ -69,9 +69,6 @@ class ActivityTypeType extends AbstractType
                    'empty_data' => '',
                ]);
        }
-
-        $builder
-            ->add('commentVisible', ActivityFieldPresence::class);
    }

    public function configureOptions(OptionsResolver $resolver)
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -15,6 +15,8 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;

+use function in_array;
+
 final class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
    private Security $security;
@@ -30,38 +32,27 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
            return;
        }

-        $menu->addChild('Activities', [
-            'route' => 'chill_activity_admin_index',
-        ])
-            ->setAttribute('class', 'list-group-item-header')
-            ->setExtras([
-                'order' => 5000,
-                'icons' => ['exchange'],
-            ]);
-
-        $menu->addChild('Activity Reasons', [
-            'route' => 'chill_activity_activityreason',
-        ])->setExtras(['order' => 5010]);
-
-        $menu->addChild('Activity Reasons Category', [
-            'route' => 'chill_activity_activityreasoncategory',
-        ])->setExtras(['order' => 5020]);
-
-        $menu->addChild('Activity type', [
-            'route' => 'chill_activity_type_admin',
-        ])->setExtras(['order' => 5030]);
-
-        $menu->addChild('Activity Presences', [
-            'route' => 'chill_crud_activity_presence_index',
-        ])->setExtras(['order' => 5040]);
-
-        $menu->addChild('Activity Types Categories', [
-            'route' => 'chill_activity_type_category_admin',
-        ])->setExtras(['order' => 5050]);
+        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
+            $menu->addChild('Activities', [
+                'route' => 'chill_admin_activity_index',
+            ])
+                ->setExtras([
+                    'order' => 2000,
+                    'explain' => 'Activity configuration',
+                ]);
+        } else {
+            $menu
+                ->addChild('Activities', [
+                    'route' => 'chill_admin_activity_index',
+                ])
+                ->setExtras([
+                    'order' => '60',
+                ]);
+        }
    }

    public static function getMenuIds(): array
    {
-        return ['admin_section', 'admin_activity'];
+        return ['admin_index', 'admin_section', 'admin_activity'];
    }
 }
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/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\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;

 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -12,20 +12,13 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Repository;

 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Entity\ActivityPresence;
-use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Chill\MainBundle\Entity\Location;
-use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
@@ -79,86 +72,6 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
            ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
    }

-    public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array
-    {
-        $rsm = new ResultSetMappingBuilder($this->em);
-
-        $sql = '
-        SELECT
-            a.id AS activity_id,
-            date,
-            CASE WHEN durationtime IS NOT NULL THEN (EXTRACT(EPOCH from durationtime) / 60)::int ELSE 0 END AS durationtimeminute,
-            attendee_id,
-            comment_comment,
-            emergency,
-            sentreceived,
-            CASE WHEN traveltime IS NOT NULL THEN (EXTRACT(EPOCH from traveltime) / 60)::int ELSE 0 END AS traveltimeminute,
-            t.id AS type_id, t.name as type_name,
-            p.id AS presence_id, p.name AS presence_name,
-            location.id AS location_id, location.address_id, location.name AS location_name, location.phonenumber1, location.phonenumber2, location.email,
-            location.locationtype_id, locationtype.title AS locationtype_title,
-            users.userids AS userids,
-            thirdparties.thirdpartyids,
-            persons.personids,
-            actions.socialactionids,
-            issues.socialissueids
-
-        FROM activity a
-        LEFT JOIN chill_main_location location ON a.location_id = location.id
-        LEFT JOIN chill_main_location_type locationtype ON location.locationtype_id = locationtype.id
-        LEFT JOIN activitytpresence p ON a.attendee_id = p.id
-        LEFT JOIN activitytype t ON a.type_id = t.id
-        LEFT JOIN LATERAL (SELECT jsonb_agg(user_id) userids, activity_id FROM activity_user AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS users ON TRUE
-        LEFT JOIN LATERAL (SELECT jsonb_agg(thirdparty_id) thirdpartyids, activity_id FROM activity_thirdparty AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS thirdparties ON TRUE
-        LEFT JOIN LATERAL (SELECT jsonb_agg(person_id) personids, activity_id FROM activity_person AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS persons ON TRUE
-        LEFT JOIN LATERAL (SELECT jsonb_agg(socialaction_id) socialactionids, activity_id FROM chill_activity_activity_chill_person_socialaction AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS actions ON TRUE
-        LEFT JOIN LATERAL (SELECT jsonb_agg(socialissue_id) socialissueids, activity_id FROM chill_activity_activity_chill_person_socialissue AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS issues ON TRUE
-
-        WHERE accompanyingperiod_id = ?
-        ORDER BY a.date DESC, a.id DESC
-        LIMIT ?
-        ';
-
-        $rsm
-            ->addEntityResult(Activity::class, 'a')
-            ->addFieldResult('a', 'activity_id', 'id')
-            ->addFieldResult('a', 'date', 'date')
-            ->addFieldResult('a', 'comment', 'comment')
-            ->addFieldResult('a', 'sentreceived', 'sentReceived')
-            ->addFieldResult('a', 'emergency', 'emergency')
-            ->addJoinedEntityResult(Location::class, 'location', 'a', 'location')
-            ->addFieldResult('location', 'location_id', 'id')
-            ->addFieldResult('location', 'location_name', 'name')
-            ->addFieldResult('location', 'phonenumber1', 'phonenumber1')
-            ->addFieldResult('location', 'phonenumber2', 'phonenumber2')
-            ->addFieldResult('location', 'email', 'email')
-            ->addJoinedEntityResult(LocationType::class, 'locationType', 'location', 'locationType')
-            ->addFieldResult('locationType', 'locationtype_id', 'id')
-            ->addFieldResult('locationType', 'locationtype_title', 'title')
-            ->addJoinedEntityResult(ActivityType::class, 'activityType', 'a', 'activityType')
-            ->addFieldResult('activityType', 'type_id', 'id')
-            ->addFieldResult('activityType', 'type_name', 'name')
-            ->addJoinedEntityResult(ActivityPresence::class, 'activityPresence', 'a', 'attendee')
-            ->addFieldResult('activityPresence', 'presence_id', 'id')
-            ->addFieldResult('activityPresence', 'presence_name', 'name')
-
-            // results which cannot be mapped into entity
-            ->addScalarResult('comment_comment', 'comment', Types::TEXT)
-            ->addScalarResult('userids', 'userIds', Types::JSON)
-            ->addScalarResult('thirdpartyids', 'thirdPartyIds', Types::JSON)
-            ->addScalarResult('personids', 'personIds', Types::JSON)
-            ->addScalarResult('socialactionids', 'socialActionIds', Types::JSON)
-            ->addScalarResult('socialissueids', 'socialIssueIds', Types::JSON)
-            ->addScalarResult('durationtimeminute', 'durationTimeMinute', Types::INTEGER)
-            ->addScalarResult('traveltimeminute', 'travelTimeMinute', Types::INTEGER);
-
-        $nq = $this->em->createNativeQuery($sql, $rsm);
-
-        $nq->setParameter(0, $period->getId())->setParameter(1, $limit);
-
-        return $nq->getResult(AbstractQuery::HYDRATE_ARRAY);
-    }
-
    /**
     * @param array $orderBy
     *
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -21,15 +21,6 @@ interface ActivityACLAwareRepositoryInterface
     */
    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;

-    /**
-     * Return a list of activities, simplified as array (not object).
-     *
-     * The aim of this method is to get a long list of activities and keep performance.
-     *
-     * @return array an array of array, each item representing an activity
-     */
-    public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array;
-
    /**
     * @return Activity[]|array
     */
--- a/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
@@ -1,23 +0,0 @@
-div.chill-dropzone__below-zone {
-    a.btn-delete {
-        display: none;
-    }
-}
-
-ul[data-collection-name="documents"] {
-    button.remove-entry {
-        margin: 0.5rem 0!important;
-    }
-}
-
-
-// do it in js does not work
-// document.addEventListener('DOMContentLoaded', e => {
-//     const dropzoneBelow = document.querySelectorAll('div.chill-dropzone__below-zone');
-//     dropzoneBelow.forEach(
-//         d => {
-//             const a = d.querySelector('a.btn-delete');
-//             d.removeChild(a);
-//         }
-//     )
-// });
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
@@ -19,18 +19,14 @@
         </ul>
      </div>

-      <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>
+      <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>

   </teleport>
 </template>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
@@ -1,7 +1,7 @@
 <template>
   <li>
-      <span :title="person.text" @click.prevent="$emit('remove', person)">
-         <span class="chill_denomination">
+      <span :title="person.text">
+         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
            <person-text :person="person" :isCut="true"></person-text>
         </span>
      </span>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -1,7 +1,7 @@
 <template>
    <teleport to="#location">
        <div class="mb-3 row">
-            <label :class="locationClassList">
+            <label class="col-form-label col-sm-4">
                {{ $t("activity.location") }}
            </label>
            <div class="col-sm-8">
@@ -41,12 +41,6 @@ export default {
        NewLocation,
        VueMultiselect,
    },
-    data() {
-        return {
-            locationClassList:
-               `col-form-label col-sm-4 ${document.querySelector('input#chill_activitybundle_activity_location').getAttribute('required') ? 'required' : ''}`,
-        }
-    },
    computed: {
        ...mapState(["activity", "availableLocations"]),
        ...mapGetters(["suggestedEntities"]),
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -18,12 +18,6 @@
                </template>
                <template v-slot:body>
                    <form>
-                        <div class="alert alert-warning" v-if="errors.length">
-                            <ul>
-                                <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
-                            </ul>
-                        </div>
-
                        <div class="form-floating mb-3">
                            <select class="form-select form-select-lg" id="type" required v-model="selectType">
                                <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
@@ -60,6 +54,11 @@
                            <label for="email">{{ $t('activity.location_fields.email') }}</label>
                        </div>

+                        <div class="alert alert-warning" v-if="errors.length">
+                            <ul>
+                                <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
+                            </ul>
+                        </div>
                    </form>
                </template>
                <template v-slot:footer>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -3,7 +3,7 @@

      <div class="mb-3 row">
         <div class="col-4">
-            <label :class="socialIssuesClassList">{{ $t('activity.social_issues') }}</label>
+            <label class="col-form-label">{{ $t('activity.social_issues') }}</label>
         </div>
         <div class="col-8">

@@ -42,7 +42,7 @@

      <div class="mb-3 row">
         <div class="col-4">
-            <label :class="socialActionsClassList">{{ $t('activity.social_actions') }}</label>
+            <label class="col-form-label">{{ $t('activity.social_actions') }}</label>
         </div>
         <div class="col-8">

@@ -54,19 +54,19 @@
               {{ $t('activity.select_first_a_social_issue') }}
            </span>

-            <template v-else-if="socialActionsList.length > 0">
-               <check-social-action
-                  v-if="socialIssuesSelected.length || socialActionsSelected.length"
-                  v-for="action in socialActionsList"
-                  :key="action.id"
-                  :action="action"
-                  :selection="socialActionsSelected"
-                  @updateSelected="updateActionsSelected">
-               </check-social-action>
-            </template>
+             <template v-else-if="socialActionsList.length > 0">
+                 <check-social-action
+                     v-if="socialIssuesSelected.length || socialActionsSelected.length"
+                     v-for="action in socialActionsList"
+                     :key="action.id"
+                     :action="action"
+                     :selection="socialActionsSelected"
+                     @updateSelected="updateActionsSelected">
+                 </check-social-action>
+             </template>

            <span v-else-if="actionAreLoaded && socialActionsList.length === 0" class="inline-choice chill-no-data-statement mt-3">
-               {{ $t('activity.social_action_list_empty') }}
+                {{ $t('activity.social_action_list_empty') }}
            </span>


@@ -94,10 +94,6 @@ export default {
         issueIsLoading: false,
         actionIsLoading: false,
         actionAreLoaded: false,
-         socialIssuesClassList:
-            `col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialIssues').getAttribute('required') ? 'required' : ''}`,
-         socialActionsClassList:
-            `col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialActions').getAttribute('required') ? 'required' : ''}`,
      }
   },
   computed: {
@@ -111,7 +107,7 @@ export default {
         return this.$store.state.socialIssuesOther;
      },
      socialActionsList() {
-         return this.$store.getters.socialActionsListSorted;
+         return this.$store.state.socialActionsList;
      },
      socialActionsSelected() {
         return this.$store.state.activity.socialActions;
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
@@ -2,15 +2,11 @@ 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;
@@ -33,54 +29,3 @@ 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);
-    })
-
-});
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
@@ -101,9 +101,6 @@ const store = createStore({
                            state.activity.activityType.thirdPartiesVisible !== 0)
                );
        },
-        socialActionsListSorted(state) {
-            return [ ...state.socialActionsList].sort((a, b) => a.ordering - b.ordering);
-        },
    },
    mutations: {
        // SocialIssueAcc
@@ -134,6 +131,7 @@ const store = createStore({
            state.socialActionsList = [];
        },
        addActionInList(state, action) {
+            //console.log('add action list', action.id);
            state.socialActionsList.push(action);
        },
        updateActionsSelected(state, actions) {
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
@@ -110,8 +110,10 @@ 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);
-                if (location !== undefined & store.state.activity.location === null) {
+                console.log(location);
+                if (location !== undefined) {
                    store.dispatch('updateLocation', location);
                    break;
                }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php
@@ -0,0 +1,56 @@
+<?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);
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
+
+class AppKernel extends Kernel
+{
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir() . '/ActivityBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir() . '/ActivityBundle/logs';
+    }
+
+    public function registerBundles()
+    {
+        return [
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Chill\PersonBundle\ChillPersonBundle(),
+            new Chill\MainBundle\ChillMainBundle(),
+            new Chill\ActivityBundle\ChillActivityBundle(),
+            new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            //add here all the required bundle (some bundle are not required)
+        ];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php
@@ -0,0 +1,20 @@
+<?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);
+
+use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
+
+/** @var ClassLoader $loader */
+$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
+
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+
+return $loader;
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/bootstrap.php.cache
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/bootstrap.php.cache
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php.meta
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php.meta
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.xml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.xml
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainerCompiler.log
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainerCompiler.log
@@ -0,0 +1,438 @@
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "assets._default_package" (parent: assets.path_package).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.chain_provider" (parent: security.user.provider.chain).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory" (parent: security.user.provider.in_memory).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory_admin" (parent: security.user.provider.in_memory.user).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.users" (parent: doctrine.orm.security.user.provider).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.dev" (parent: security.firewall.context).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.context_listener.0" (parent: security.context_listener).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout_listener.default" (parent: security.logout_listener).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout.success_handler.default" (parent: security.logout.success_handler).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.dao.default" (parent: security.authentication.provider.dao).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.success_handler.default.form_login" (parent: security.authentication.success_handler).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.failure_handler.default.form_login" (parent: security.authentication.failure_handler).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form" (parent: security.authentication.listener.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form.default" (parent: security.authentication.listener.form).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.form_entry_point.default" (parent: security.authentication.form_entry_point).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.anonymous.default" (parent: security.authentication.listener.anonymous).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.anonymous.default" (parent: security.authentication.provider.anonymous).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.exception_listener.default" (parent: security.exception_listener).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.default" (parent: security.firewall.context).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.eventdispatcher" (parent: swiftmailer.transport.eventdispatcher.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.authhandler" (parent: swiftmailer.transport.authhandler.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.buffer" (parent: swiftmailer.transport.buffer.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.smtp" (parent: swiftmailer.transport.smtp.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default" (parent: swiftmailer.mailer.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.plugin.messagelogger" (parent: swiftmailer.plugin.messagelogger.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.configuration" (parent: doctrine.dbal.connection.configuration).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.profiling.default" (parent: doctrine.dbal.logger.profiling).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.chain.default" (parent: doctrine.dbal.logger.chain).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.event_manager" (parent: doctrine.dbal.connection.event_manager).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection" (parent: doctrine.dbal.connection).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_configuration" (parent: doctrine.orm.configuration).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_metadata_cache" (parent: doctrine_cache.abstract.array).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_result_cache" (parent: doctrine_cache.abstract.array).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_query_cache" (parent: doctrine_cache.abstract.array).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_manager_configurator" (parent: doctrine.orm.manager_configurator.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_entity_manager" (parent: doctrine.orm.entity_manager.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.request" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.translation" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.security" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.templating" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.profiler" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.router" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.php" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.event" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.assetic" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.doctrine" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "validator.mapping.class_metadata_factory"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "assetic.value_supplier"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.dbal.event_manager"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.metadata.annotation_reader"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.default_entity_manager.event_manager"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "sensio_framework_extra.security.expression_language"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.logging.inner"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.data_collector.inner"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.path_package"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.url_package"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.static_version_strategy"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.firewall.context"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory.user"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.chain"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout_listener"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.handler.cookie_clearing"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.success_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.form_entry_point"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_success_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.success_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_failure_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.failure_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.form"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_form"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.simple_success_failure_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_preauth"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.x509"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.remote_user"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.basic"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.digest"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.dao"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.simple"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.pre_authenticated"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.exception_listener"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.switchuser_listener"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.rememberme"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.rememberme"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.persistent"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.simplehash"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "monolog.logger_prototype"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.mailer.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.sendmail.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.mail.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.null.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.buffer.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.authhandler.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.eventdispatcher.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.redirecting.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.antiflood.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.impersonate.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.messagelogger.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.smtp.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.spool.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.file.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.memory.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assetic.worker.ensure_filter"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.apc"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.array"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.file_system"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.php_file"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcache"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcached"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.redis"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.wincache"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.xcache"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.zenddata"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.mongodb"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.riak"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.couchbase"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.chain"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.profiling"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.event_manager"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.configuration"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.configuration"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.entity_manager.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.manager_configurator.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.security.user.provider"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session" previously pointing to "session.storage.mock_file" to "session.storage.filesystem".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.native" previously pointing to "session.handler.native_file" to "session.handler".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.php_bridge" previously pointing to "session.handler.native_file" to "session.handler".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "assetic.twig_directory_resource.kernel" previously pointing to "templating.loader.filesystem" to "templating.loader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.text" previously pointing to "templating.engine.twig" to "templating".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.choice" previously pointing to "templating.engine.twig" to "templating".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.title" previously pointing to "templating.engine.twig" to "templating".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "translator_listener" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "validator.builder" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "data_collector.translation" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.trans" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.custom_fields_group_type" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "locale_listener" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "templating.helper.router" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router.cache_warmer" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router_listener" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.logout_url_generator" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.routing" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.profiler" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.router" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.controller.listener" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.routing.loader.annot_class" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.user_password_encoder.generic" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.validator.user_password" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.authentication.provider.dao.default" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig" previously pointing to "twig.loader.filesystem" to "twig.loader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.email_sender.listener" previously pointing to "monolog.logger" to "logger".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.mailer.default" previously pointing to "swiftmailer.mailer.default.transport.smtp" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.cache_warmer.template_paths" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.asset_manager_cache_warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translation.warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "router.cache_warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.proxy_cache_warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.selector" to "translator.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.history" to "test.client".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.cookiejar" to "test.client".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.attribute_bag" to "session".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.flash_bag" to "session".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1" to "form.resolved_type_factory".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.extension" to "form.registry".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.type_extension.form.request_handler" to "form.type_extension.form.http_foundation".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.server_params" to "form.type_extension.form.request_handler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_generator" to "security.csrf.token_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_storage" to "security.csrf.token_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets._default_package" to "assets.packages".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "validator.validator_factory" to "validator.builder".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "profiler.storage" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.config" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.ajax" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.exception" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.events" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.logger" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.time" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.memory" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.twig" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.security" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.data_collector" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.doctrine" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.xml" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.yml" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.php" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_dir" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_file" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.resolver" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "debug.event_dispatcher.parent" to "debug.event_dispatcher".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "controller_resolver" to "debug.controller_resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.dao.default" to "security.authentication.manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.anonymous.default" to "security.authentication.manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.expression_voter" to "security.access.decision_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.role_hierarchy_voter" to "security.access.decision_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.authenticated_voter" to "security.access.decision_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.expression_language" to "security.access.expression_voter".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.firewall.map" to "security.firewall".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d" to "security.firewall.map".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.retry_entry_point" to "security.channel_listener".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user.provider.concrete.in_memory_admin" to "security.user.provider.concrete.in_memory".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.success_handler.default" to "security.logout_listener.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.handler.session" to "security.logout_listener.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user_checker" to "security.authentication.provider.dao.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.session_strategy" to "security.authentication.listener.form.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.success_handler.default.form_login" to "security.authentication.listener.form.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.failure_handler.default.form_login" to "security.authentication.listener.form.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.form_entry_point.default" to "security.exception_listener.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.channel_listener" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.context_listener.0" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout_listener.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.form.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.anonymous.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_listener" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.exception_listener.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.logout_url" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.security" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.profiler" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.trans" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.assets" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.actions" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.code" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.routing" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.yaml" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug.stopwatch" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.expression" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpkernel" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.form" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_extension" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.twig.doctrine_extension" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.dump" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.webprofiler" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.app_variable" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.configurator.environment" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.renderer" to "twig.extension.form".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.engine" to "twig.form.renderer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1" to "swiftmailer.mailer.default.transport.authhandler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2" to "swiftmailer.mailer.default.transport.authhandler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3" to "swiftmailer.mailer.default.transport.authhandler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.transport.replacementfactory" to "swiftmailer.mailer.default.transport.buffer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillpersonbundle" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillmainbundle" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.kernel" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.parameter_bag" to "assetic.asset_factory".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.value_supplier.default" to "assetic.twig_extension".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader.real" to "assetic.twig_formula_loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.config_cache" to "assetic.twig_formula_loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger.chain.default" to "doctrine.dbal.default_connection.configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger" to "doctrine.dbal.logger.chain.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.configuration" to "doctrine.dbal.default_connection".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.event_manager" to "doctrine.dbal.default_connection".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_metadata_driver" to "doctrine.orm.default_configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.naming_strategy.default" to "doctrine.orm.default_configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.quote_strategy.default" to "doctrine.orm.default_configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_configuration" to "doctrine.orm.default_entity_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.security.expression_language.default" to "sensio_framework_extra.security.listener".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.doctrine_step" to "sensio_distribution.webconfigurator".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.secret_step" to "sensio_distribution.webconfigurator".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.logging" to "translator".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.buffer" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.authhandler" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.eventdispatcher" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "controller_resolver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.logging"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.selector"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translation.warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.flash_bag"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.attribute_bag"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.handler.write_check"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.extension"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.type_extension.form.request_handler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.server_params"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_generator"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_storage"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_package"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets._default_package"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.engine.delegating"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.cache_warmer.template_paths"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.cache"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.chain"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.mapping.cache.apc"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.validator_factory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "profiler.storage"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.config"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.ajax"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.exception"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.events"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.logger"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.time"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.memory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.resolver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.xml"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.yml"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.php"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "router.cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.cached_reader"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "debug.event_dispatcher.parent"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.session_strategy"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user_checker"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.expression_language"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.authenticated_voter"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.role_hierarchy_voter"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.expression_voter"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.firewall.map"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.retry_entry_point"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.basic_entry_point"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.digest_entry_point"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.channel_listener"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.handler.session"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_listener"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.rememberme.token.provider.in_memory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.logout_url"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.security"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.security"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user.provider.concrete.in_memory_admin"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener.0"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout_listener.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.success_handler.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.dao.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.success_handler.default.form_login"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.failure_handler.default.form_login"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.form.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.form_entry_point.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.exception_listener.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.app_variable"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.native_filesystem"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.chain"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.profiler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.twig"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.trans"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.assets"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.actions"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.code"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.routing"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.yaml"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug.stopwatch"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.expression"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpkernel"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.form"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.engine"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.renderer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.configurator.environment"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.chrome_php"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.gelf_message"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.html"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.json"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.line"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.loggly"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.normalizer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.scalar"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.wildfire"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.failover"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.mailinvoker"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.replacementfactory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.data_collector"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.eventdispatcher"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.authhandler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.buffer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.config_cache"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.asset_manager_cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.worker.cache_busting"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.parameter_bag"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.value_supplier.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_extension"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader.real"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.doctrine"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.twig.doctrine_extension"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.configuration"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger.chain.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.event_manager"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.proxy_cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.listeners.resolve_target_entity"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.underscore"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.ansi"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_configuration"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_yml_metadata_driver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_metadata_driver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_dir"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_file"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.security.expression_language.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.dump"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.webprofiler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.doctrine_step"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.secret_step"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillpersonbundle"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillmainbundle"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.kernel"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.finder" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets.empty_version_strategy" to "assets.packages".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "annotations.reader" to "annotation_reader".
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_version_strategy"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.finder"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.reader"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.http_utils"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_map"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpfoundation"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_class"; reason: unused
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/classes.map
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/classes.map
@@ -0,0 +1,88 @@
+<?php return array (
+  0 => 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
+  1 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
+  2 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage',
+  3 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler',
+  4 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy',
+  5 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy',
+  6 => 'Symfony\\Component\\HttpFoundation\\Session\\Session',
+  7 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables',
+  8 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference',
+  9 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser',
+  10 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\TemplateLocator',
+  11 => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
+  12 => 'Symfony\\Component\\Routing\\RequestContext',
+  13 => 'Symfony\\Component\\Routing\\Router',
+  14 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher',
+  15 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\Router',
+  16 => 'Symfony\\Component\\Config\\FileLocator',
+  17 => 'Symfony\\Component\\Debug\\ErrorHandler',
+  18 => 'Symfony\\Component\\EventDispatcher\\Event',
+  19 => 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher',
+  20 => 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener',
+  21 => 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener',
+  22 => 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver',
+  23 => 'Symfony\\Component\\HttpKernel\\Event\\KernelEvent',
+  24 => 'Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent',
+  25 => 'Symfony\\Component\\HttpKernel\\Event\\FilterResponseEvent',
+  26 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent',
+  27 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent',
+  28 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent',
+  29 => 'Symfony\\Component\\HttpKernel\\KernelEvents',
+  30 => 'Symfony\\Component\\HttpKernel\\Config\\FileLocator',
+  31 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameParser',
+  32 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
+  33 => 'Symfony\\Component\\Security\\Http\\Firewall',
+  34 => 'Symfony\\Component\\Security\\Core\\User\\UserProviderInterface',
+  35 => 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationProviderManager',
+  36 => 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorage',
+  37 => 'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager',
+  38 => 'Symfony\\Component\\Security\\Core\\Authorization\\AuthorizationChecker',
+  39 => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\VoterInterface',
+  40 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallMap',
+  41 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallContext',
+  42 => 'Symfony\\Component\\HttpFoundation\\RequestMatcher',
+  43 => 'Twig_Environment',
+  44 => 'Twig_Extension',
+  45 => 'Twig_Extension_Core',
+  46 => 'Twig_Extension_Escaper',
+  47 => 'Twig_Extension_Optimizer',
+  48 => 'Twig_LoaderInterface',
+  49 => 'Twig_Markup',
+  50 => 'Twig_Template',
+  51 => 'Monolog\\Formatter\\FormatterInterface',
+  52 => 'Monolog\\Formatter\\LineFormatter',
+  53 => 'Monolog\\Handler\\HandlerInterface',
+  54 => 'Monolog\\Handler\\AbstractHandler',
+  55 => 'Monolog\\Handler\\AbstractProcessingHandler',
+  56 => 'Monolog\\Handler\\StreamHandler',
+  57 => 'Monolog\\Handler\\FingersCrossedHandler',
+  58 => 'Monolog\\Handler\\FilterHandler',
+  59 => 'Monolog\\Handler\\TestHandler',
+  60 => 'Monolog\\Logger',
+  61 => 'Symfony\\Bridge\\Monolog\\Logger',
+  62 => 'Symfony\\Bridge\\Monolog\\Handler\\DebugHandler',
+  63 => 'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface',
+  64 => 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
+  65 => 'Symfony\\Bundle\\AsseticBundle\\DefaultValueSupplier',
+  66 => 'Symfony\\Bundle\\AsseticBundle\\Factory\\AssetFactory',
+  67 => 'Doctrine\\Common\\Annotations\\DocLexer',
+  68 => 'Doctrine\\Common\\Annotations\\FileCacheReader',
+  69 => 'Doctrine\\Common\\Annotations\\PhpParser',
+  70 => 'Doctrine\\Common\\Annotations\\Reader',
+  71 => 'Doctrine\\Common\\Lexer',
+  72 => 'Doctrine\\Common\\Persistence\\ConnectionRegistry',
+  73 => 'Doctrine\\Common\\Persistence\\Proxy',
+  74 => 'Doctrine\\Common\\Util\\ClassUtils',
+  75 => 'Doctrine\\Bundle\\DoctrineBundle\\Registry',
+  76 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
+  77 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ParamConverterListener',
+  78 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DateTimeParamConverter',
+  79 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DoctrineParamConverter',
+  80 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterInterface',
+  81 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterManager',
+  82 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\TemplateListener',
+  83 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\HttpCacheListener',
+  84 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\SecurityListener',
+  85 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
+);
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config.yml
@@ -0,0 +1,77 @@
+imports:
+    - { resource: parameters.yml }
+
+framework:
+    secret:          Not very secret
+    router:          { resource: "%kernel.root_dir%/config/routing.yml" }
+    form:            true
+    csrf_protection: true
+    session:         ~
+    default_locale:  fr
+    translator:      { fallback: fr }
+    profiler:        { only_exceptions: false }
+    templating:
+        engines: ['twig']
+ 
+doctrine:
+    dbal:
+        driver:   pdo_pgsql
+        host:     "%database_host%"
+        port:     "%database_port%"
+        dbname:   "%database_name%"
+        user:     "%database_user%"
+        password: "%database_password%"
+        charset:  UTF8
+        mapping_types:
+            jsonb: json_array
+    orm:
+        auto_generate_proxy_classes: "%kernel.debug%"
+        auto_mapping: true
+        
+# Assetic Configuration
+assetic:
+    debug:          "%kernel.debug%"
+    use_controller: false
+    bundles:        [ ]
+    #java: /usr/bin/java
+    filters:
+        cssrewrite: ~
+        
+    
+security:
+    providers:
+        chain_provider:
+            chain :
+                providers: [in_memory, users]
+        in_memory:
+            memory:
+                users:
+                    admin: { password: olala, roles: 'ROLE_ADMIN' }
+        users:
+            entity:
+                class: Chill\MainBundle\Entity\User
+                property: username
+
+    encoders: 
+        Chill\MainBundle\Entity\User: 
+            algorithm: bcrypt
+        Symfony\Component\Security\Core\User\User: plaintext
+
+    firewalls:
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+
+        default:
+            anonymous: ~
+            form_login:
+                csrf_parameter: _csrf_token
+                csrf_token_id: authenticate
+                csrf_provider: form.csrf_provider
+            logout: ~
+            http_basic: 
+    access_control:
+        #disable authentication for tests
+        #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        #- { path: ^/admin, roles: ROLE_ADMIN }
+        #- { path: ^/, roles: ROLE_USER }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_dev.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_dev.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: config.yml } #here we import a config.yml file, this is not required
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.filesystem
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test.yml
@@ -0,0 +1,8 @@
+# config/config_test.yml
+imports:
+    - { resource: config.yml } #here we import a config.yml file, this is not required
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.filesystem
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test_customizable_entities_test_not_empty_config.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test_customizable_entities_test_not_empty_config.yml
@@ -0,0 +1,9 @@
+
+#required by ConfigCustomizablesEntitiesTest::testNotEmptyConfig
+
+imports:
+    - { resource: config_test.yml } 
+
+chill_custom_fields:
+    customizables_entities:
+        - { class: Test\With\A\Dummy\Entity, name: test }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml
@@ -0,0 +1,7 @@
+parameters:
+    database_host: chill__database
+    database_port: 5432
+    database_name: postgres
+    database_user: postgres
+    database_password: postgres
+    locale: fr
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.travis.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.travis.yml
@@ -0,0 +1,7 @@
+parameters:
+    database_host: 127.0.0.1
+    database_port: 5432
+    database_name: test0
+    database_user: postgres
+    database_password: postgres
+    locale: fr
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist
@@ -0,0 +1,7 @@
+parameters:
+    database_host: 127.0.0.1
+    database_port: 5434
+    database_name: symfony
+    database_user: symfony
+    database_password: symfony
+    locale: fr
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/routing.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/routing.yml
@@ -0,0 +1,10 @@
+cl_custom_fields:
+    resource: .
+    type: chill_routes
+    
+chill_main:
+    resource: "@ChillMainBundle/Resources/config/routing.yml"
+
+test_custom_field_form_render:
+    path: /customfieldsgroup/test/render/{id}
+    defaults: { _controller: ChillCustomFieldsBundle:CustomFieldsGroup:renderForm }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/console
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/console
@@ -0,0 +1,28 @@
+#!/usr/bin/env php
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
+// if you don't want to setup permissions the proper way, just uncomment the following PHP line
+// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
+// for more information
+//umask(0000);
+
+set_time_limit(0);
+
+/** @var \Composer\Autoload\ClassLoader $loader */
+$loader = require __DIR__.'/autoload.php';
+
+$input = new ArgvInput();
+$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+
+if ($debug) {
+    Debug::enable();
+}
+
+$kernel = new AppKernel($env, $debug);
+$application = new Application($kernel);
+$application->run($input);
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php
@@ -0,0 +1,41 @@
+<?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);
+
+use Symfony\Component\Debug\Debug;
+use Symfony\Component\HttpFoundation\Request;
+
+// If you don't want to setup permissions the proper way, just uncomment the following PHP line
+// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
+//umask(0000);
+
+// This check prevents access to debug front controllers that are deployed by accident to production servers.
+// Feel free to remove this, extend it, or make something more sophisticated.
+if (
+    isset($_SERVER['HTTP_CLIENT_IP'])
+    || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
+    || !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
+) {
+    header('HTTP/1.0 403 Forbidden');
+
+    exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
+}
+
+$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
+Debug::enable();
+
+require_once __DIR__ . '/../app/AppKernel.php';
+
+$kernel = new AppKernel('dev', true);
+$kernel->loadClassCache();
+$request = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/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_box }}
+                            {{ activity.user|chill_entity_render_string|capitalize }}
                        </p>
                    </div>
                </div>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
@@ -5,7 +5,7 @@

 {% block title  'Remove activity'|trans %}

-{% block content %}
+{% block personcontent %}
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
    {
        'title'             : 'Remove activity'|trans,
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -35,7 +35,7 @@
    {{ form_row(edit_form.socialActions) }}
 {% endif %}

-{%- if edit_form.socialIssues is defined or edit_form.socialActions is defined -%}
+{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
 <div id="social-issues-acc"></div>
 {% endif %}

@@ -83,19 +83,15 @@
    {{ form_row(edit_form.comment) }}
 {% endif %}

-{%- if edit_form.privateComment is defined -%}
-    {{ form_row(edit_form.privateComment) }}
-{% endif %}
-
 {%- if edit_form.attendee is defined -%}
    {{ form_row(edit_form.attendee) }}
 {% endif %}

 {%- 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 %}
@@ -120,11 +116,3 @@

 {{ form_end(edit_form) }}
 {# {{ form(delete_form) }} #}
-
-{% block js %}
-    {{ encore_entry_script_tags('mod_pickentity_type') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('mod_pickentity_type') }}
-{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -24,11 +24,12 @@
        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('page_edit_activity') }}
+    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
@@ -20,7 +20,7 @@

 {% block title  'Update activity'|trans %}

-{% block content %}
+{% block personcontent %}
 <div class="activity-edit">

    <div id="activity"></div> {# <=== vue component #}
@@ -39,9 +39,11 @@
        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 %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -2,30 +2,12 @@
    {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
        {% if no_action is not defined or no_action == false %}
            <li>
-                {% set showGroup = activity.accompanyingPeriod is not null and activity.accompanyingPeriod.hasUser and activity.accompanyingPeriod.user is not same as(app.user)  %}
-                <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
-                    {% if showGroup %}
-                        <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                            {{ 'notification.Notify'|trans }}
-                        </button>
-                        <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
-                            <li>
-                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id, 'tos': [activity.accompanyingPeriod.user.id]}) }}">
-                                    {{ 'notification.Notify referrer'|trans }}
-                                </a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
-                                    {{ 'notification.Notify any'|trans }}
-                                </a>
-                            </li>
-                        </ul>
-                    {% else %}
-                        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
-                            {{ 'notification.Notify'|trans }}
-                        </a>
-                    {% endif %}
-                </div>
+                <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                    'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',
+                    'entityId': activity.id
+                }) }}">
+                    <i class="fa fa-paper-plane fa-fw"></i>
+                    {{ 'notification.Notify'|trans }}</a>
            </li>
        {% endif %}
        {% if context == 'person' and activity.accompanyingPeriod is not empty %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -30,7 +30,7 @@
    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
 {% endblock %}

-{% block content %}
+{% block personcontent %}

    {% set person_id = null %}
    {% if person %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
+++ b/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|chill_entity_render_box}}</b>
+                                <b>{{ activity.user.usernameCanonical }}</b>
                            </li>
                        {% endif %}

--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -35,7 +35,7 @@
    {{ form_row(form.socialActions) }}
 {% endif %}

-{%- if form.socialIssues is defined or form.socialActions is defined -%}
+{%- if form.socialIssues is defined or form.socialIssues is defined -%}
    <div id="social-issues-acc"></div>
 {% endif %}

@@ -81,20 +81,16 @@
 {% endif %}

 {%- if form.comment is defined -%}
+    {# TODO .. public and private #}
    {{ form_row(form.comment) }}
 {% endif %}

-{%- if form.privateComment is defined -%}
-    {{ form_row(form.privateComment) }}
-{% endif %}
-
-{%- if form.attendee is defined -%}
-    {{ form_row(form.attendee) }}
-{% endif %}
-
 {%- 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 -%}
+    {{ form_row(form.attendee) }}
 {% endif %}

 {# TODO .. status #}
@@ -119,11 +115,3 @@
  </li>
 </ul>
 {{ form_end(form) }}
-
-{% block js %}
-    {{ encore_entry_script_tags('mod_pickentity_type') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('mod_pickentity_type') }}
-{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
@@ -17,6 +17,10 @@
    {{ 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>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
@@ -4,7 +4,7 @@

 {% block title 'Activity creation' |trans %}

-{% block content %}
+{% block personcontent %}
 <div class="activity-new">

    <div id="activity"></div> {# <=== vue component #}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
@@ -4,6 +4,6 @@

 {% block title 'Activity creation'|trans %}

-{% block content %}
+{% block personcontent %}
    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -1,5 +1,4 @@
 {%- set t = entity.type -%}
-{% set userId = app.user.id %}
 {%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}

 <h1>{{ "Activity"|trans }}</h1>
@@ -147,28 +146,13 @@
                </dd>
            {% endif %}

-            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.hasCommentForUser(app.user) %}
-                {% if t.privateCommentLabel is not empty %}
-                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
-                {% else %}
-                    <dt class="inline">{{ 'Private comment'|trans }}</dt>
-                {% endif %}
-                <dd>
-                    <section class="chill-entity entity-comment-embeddable">
-                        <blockquote class="chill-user-quote private-quote">
-                            {{ entity.privateComment.comments[userId] }}
-                        </blockquote>
-                    </section>
-                </dd>
-            {% endif %}
-
            {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
                <dt class="inline">{{ 'Documents'|trans }}</dt>
                <dd>
                    {% if entity.documents|length > 0 %}
                        <ul>
                            {% for d in entity.documents %}
-                                <li>{{ d.title }}{{ m.download_button(d) }}</li>
+                                <li>{{ m.download_button(d) }}</li>
                            {% endfor %}
                        </ul>
                    {% else %}
@@ -217,30 +201,9 @@
        </a>
    </li>
    <li>
-        {% set showGroup = entity.accompanyingPeriod is not null and entity.accompanyingPeriod.hasUser and entity.accompanyingPeriod.user is not same as(app.user)  %}
-        <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
-            {% if showGroup %}
-                <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                    {{ 'notification.Notify'|trans }}
-                </button>
-                <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
-                    <li>
-                        <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id, 'tos': [entity.accompanyingPeriod.user.id]}) }}">
-                            {{ 'notification.Notify referrer'|trans }}
-                        </a>
-                    </li>
-                    <li>
-                        <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-                            {{ 'notification.Notify any'|trans }}
-                        </a>
-                    </li>
-                </ul>
-            {% else %}
-                <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-                    {{ 'notification.Notify'|trans }}
-                </a>
-            {% endif %}
-        </div>
+        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
+            {{ 'notification.Notify'|trans }}
+        </a>
    </li>
    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
        <li>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -18,11 +18,11 @@

 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}

-{% block content -%}
+{% block personcontent -%}
 <div class="activity-show">
    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
 </div>
-{% endblock %}
+{% endblock personcontent %}

 {% block block_post_menu %}
    <div class="post-menu pt-4">
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/edit.html.twig
@@ -1,10 +1,10 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
-    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
+{% block layout_wvm_content %}
 {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
    {% block content_form_actions_view %}{% endblock %}
    {% block content_form_actions_save_and_show %}{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityPresence list'|trans }}</h1>
@@ -34,7 +34,7 @@
        </tbody>
    </table>

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li>
            <a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
                {{ 'Create a new activity presence'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/new.html.twig
@@ -1,11 +1,11 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
-    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
-    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
+{% block layout_wvm_content %}
+{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+    {% block content_form_actions_save_and_show %}{% endblock %}
+{% endembed %}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReason edit'|trans }}</h1>
@@ -8,7 +24,7 @@
    {{ form_row(edit_form.active) }}
    {{ form_row(edit_form.category) }}

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
        </li>
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReason list'|trans }}</h1>
@@ -29,11 +45,7 @@
        </tbody>
    </table>

-
-    <ul class="record_actions sticky-form-buttons">
-        <li class='cancel'>
-            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
-        </li>
+    <ul class="record_actions">
        <li>
            <a href="{{ path('chill_activity_activityreason_new') }}" class="btn btn-new">
                {{ 'Create a new activity reason'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReason creation'|trans }}</h1>
@@ -8,7 +24,7 @@
    {{ form_row(form.active) }}
    {{ form_row(form.category) }}

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
        </li>
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReason'|trans }}</h1>
@@ -22,7 +38,7 @@
        </tbody>
    </table>

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">
                {{ 'Back to the list'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReasonCategory edit'|trans }}</h1>
@@ -7,7 +23,7 @@
    {{ form_row(edit_form.name) }}
    {{ form_row(edit_form.active) }}

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                {{ 'Back to the list'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReasonCategory list'|trans }}</h1>
@@ -30,7 +46,7 @@
        </tbody>
    </table>

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li>
            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="btn btn-new">
                {{ 'Create a new activity category reason'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReasonCategory creation'|trans }}</h1>
@@ -7,7 +23,7 @@
    {{ form_row(form.name) }}
    {{ form_row(form.active) }}

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
        </li>
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityReasonCategory'|trans }}</h1>
@@ -21,7 +37,7 @@
            </tr>
        </tbody>
    </table>
-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                {{ 'Back to the list'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig
@@ -1,10 +1,10 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
+{% block layout_wvm_content %}
    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
        {% block content_form_actions_view %}{% endblock %}
        {% block content_form_actions_save_and_show %}{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
@@ -1,4 +1,20 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityType list'|trans }}</h1>
@@ -34,7 +50,7 @@
        </tbody>
    </table>

-        <ul class="record_actions sticky-form-buttons">
+        <ul class="record_actions">
        <li>
            <a href="{{ path('chill_crud_activity_type_new') }}" class="btn btn-create">
                {{ 'Create a new activity type'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/new.html.twig
@@ -1,10 +1,10 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
+{% block layout_wvm_content %}
    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
        {% block content_form_actions_save_and_show %}{% endblock %}
    {% endembed %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/edit.html.twig
@@ -1,12 +1,12 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
-    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
-    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-        {% block content_form_actions_view %}{% endblock %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
+{% block layout_wvm_content %}
+{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+    {% block content_form_actions_view %}{% endblock %}
+    {% block content_form_actions_save_and_show %}{% endblock %}
+{% endembed %}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block admin_content %}
    <h1>{{ 'ActivityTypeCategory list'|trans }}</h1>
@@ -34,7 +34,7 @@
        </tbody>
    </table>

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li>
            <a href="{{ path('chill_crud_activity_type_category_new') }}" class="btn btn-create">
                {{ 'Create a new activity type category'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/new.html.twig
@@ -1,11 +1,11 @@
-{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}

 {% block title %}
-    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}

-{% block admin_content %}
-    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
+{% block layout_wvm_content %}
+{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+    {% block content_form_actions_save_and_show %}{% endblock %}
+{% endembed %}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
 <info@champs-libres.coop> / <http://www.champs-libres.coop>
 *
 * This program is free software: you can redistribute it and/or modify
@@ -20,12 +20,12 @@

 {% block vertical_menu_content %}
    {{ chill_menu('admin_activity', {
-        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+        'layout': '@ChillActivity/Admin/menu_activity.html.twig',
    }) }}
 {% endblock %}

 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block content empty -->
+    {% block admin_content %}<!-- block personcontent empty -->
        <h1>{{ 'Activity configuration' |trans }}</h1>
    {% endblock %}
 {% endblock  %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
@@ -0,0 +1,20 @@
+{#
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ <info@champs-libres.coop> / <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
+{% block v_menu_title %}{{ 'Activity configuration menu'|trans }}{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -133,7 +133,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn

                // change attribute CREATE
                if (self::CREATE === $attribute) {
-                    return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject->getPerson(), $token);
+                    $attribute = self::CREATE_PERSON;
                }
            } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
@@ -144,8 +144,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                    if (AccompanyingPeriod::STEP_CLOSED === $subject->getAccompanyingPeriod()->getStep()) {
                        return false;
                    }
-
-                    return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject->getAccompanyingPeriod(), $token);
+                    $attribute = self::CREATE_ACCOMPANYING_COURSE;
                }
            } else {
                throw new RuntimeException('Could not determine context of activity.');
@@ -159,12 +158,12 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn

            // transform the attribute
            if (self::CREATE === $attribute) {
-                return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject, $token);
+                $attribute = self::CREATE_ACCOMPANYING_COURSE;
            }
        } elseif ($subject instanceof Person) {
            // transform the attribute
            if (self::CREATE === $attribute) {
-                return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject, $token);
+                $attribute = self::CREATE_PERSON;
            }
        }

--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -17,12 +17,13 @@ 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\PersonRenderInterface;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -43,7 +44,7 @@ class ActivityContext implements

    private NormalizerInterface $normalizer;

-    private PersonRenderInterface $personRender;
+    private PersonRender $personRender;

    private TranslatableStringHelperInterface $translatableStringHelper;

@@ -54,7 +55,7 @@ class ActivityContext implements
        NormalizerInterface $normalizer,
        TranslatableStringHelperInterface $translatableStringHelper,
        EntityManagerInterface $em,
-        PersonRenderInterface $personRender,
+        PersonRender $personRender,
        TranslatorInterface $translator,
        BaseContextData $baseContextData
    ) {
@@ -130,10 +131,8 @@ class ActivityContext implements
                        return $this->personRender->renderString($p, []);
                    },
                    'multiple' => false,
-                    'required' => false,
                    'expanded' => true,
                    'label' => $options[$key . 'Label'],
-                    'placeholder' => $this->translator->trans('Any person selected'),
                ]);
            }
        }
@@ -211,9 +210,11 @@ class ActivityContext implements
     */
    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
    {
-        $storedObject->setTitle($this->translatableStringHelper->localize($template->getName()));
-        $entity->addDocument($storedObject);
+        $doc = new StoredObject();
+        // TODO push document to remote

-        $this->em->persist($storedObject);
+        $this->em->persist($doc);
+
+        $entity->addDocument($doc);
    }
 }
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -1,286 +0,0 @@
-<?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\ActivityBundle\Service\DocGenerator;
-
-use Chill\ActivityBundle\Entity\ActivityPresence;
-use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
-use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
-use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
-use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use Chill\DocStoreBundle\Entity\StoredObject;
-use Chill\MainBundle\Entity\Location;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Repository\UserRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
-use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use DateTime;
-use libphonenumber\PhoneNumber;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-
-class ListActivitiesByAccompanyingPeriodContext implements
-    DocGeneratorContextWithAdminFormInterface,
-    DocGeneratorContextWithPublicFormInterface
-{
-    private AccompanyingPeriodContext $accompanyingPeriodContext;
-
-    private ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
-
-    private NormalizerInterface $normalizer;
-
-    private PersonRepository $personRepository;
-
-    private SocialActionRepository $socialActionRepository;
-
-    private SocialIssueRepository $socialIssueRepository;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private UserRepository $userRepository;
-
-    public function __construct(
-        AccompanyingPeriodContext $accompanyingPeriodContext,
-        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
-        NormalizerInterface $normalizer,
-        PersonRepository $personRepository,
-        SocialActionRepository $socialActionRepository,
-        SocialIssueRepository $socialIssueRepository,
-        ThirdPartyRepository $thirdPartyRepository,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        UserRepository $userRepository
-    ) {
-        $this->accompanyingPeriodContext = $accompanyingPeriodContext;
-        $this->activityACLAwareRepository = $activityACLAwareRepository;
-        $this->normalizer = $normalizer;
-        $this->personRepository = $personRepository;
-        $this->socialActionRepository = $socialActionRepository;
-        $this->socialIssueRepository = $socialIssueRepository;
-        $this->thirdPartyRepository = $thirdPartyRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->userRepository = $userRepository;
-    }
-
-    public function adminFormReverseTransform(array $data): array
-    {
-        return $this->accompanyingPeriodContext->adminFormReverseTransform($data);
-    }
-
-    public function adminFormTransform(array $data): array
-    {
-        return $this->accompanyingPeriodContext->adminFormTransform($data);
-    }
-
-    public function buildAdminForm(FormBuilderInterface $builder): void
-    {
-        $this->accompanyingPeriodContext->buildAdminForm($builder);
-    }
-
-    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
-    {
-        $this->accompanyingPeriodContext->buildPublicForm($builder, $template, $entity);
-    }
-
-    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
-    {
-        $data = $this->accompanyingPeriodContext->getData($template, $entity, $contextGenerationData);
-
-        $data['activities'] = $this->getActivitiesSimplified($entity);
-
-        return $data;
-    }
-
-    public function getDescription(): string
-    {
-        return 'docgen.Accompanying period with a list of activities description';
-    }
-
-    public function getEntityClass(): string
-    {
-        return AccompanyingPeriod::class;
-    }
-
-    public function getFormData(DocGeneratorTemplate $template, $entity): array
-    {
-        return $this->accompanyingPeriodContext->getFormData($template, $entity);
-    }
-
-    public static function getKey(): string
-    {
-        return self::class;
-    }
-
-    public function getName(): string
-    {
-        return 'docgen.Accompanying period with a list of activities';
-    }
-
-    public function hasAdminForm(): bool
-    {
-        return $this->accompanyingPeriodContext->hasAdminForm();
-    }
-
-    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool
-    {
-        return $this->accompanyingPeriodContext->hasPublicForm($template, $entity);
-    }
-
-    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
-    {
-        $this->accompanyingPeriodContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
-    }
-
-    private function getActivitiesSimplified(AccompanyingPeriod $period)
-    {
-        $activities =
-            $this->activityACLAwareRepository->findByAccompanyingPeriodSimplified($period);
-        $results = [];
-
-        foreach ($activities as $row) {
-            $activity = $row[0];
-
-            $activity['date'] = $this->normalizer->normalize($activity['date'], 'docgen', [
-                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => DateTime::class,
-            ]);
-
-            if (null === $activity['location']) {
-                $activity['location'] = $this->normalizer->normalize(null, 'docgen', [
-                    AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Location::class,
-                ]);
-                $activity['location']['type'] = 'location';
-            } else {
-                $activity['location']['isNull'] = false;
-                $activity['location']['type'] = 'location';
-
-                foreach (['1', '2'] as $key) {
-                    $activity['location']['phonenumber' . $key] = $this->normalizer->normalize(
-                        $activity['location']['phonenumber' . $key],
-                        'docgen',
-                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => PhoneNumber::class]
-                    );
-                }
-            }
-
-            if (is_numeric($activity['location']['locationType']['id'])) {
-                $activity['location']['locationType']['title'] = $this->translatableStringHelper->localize(
-                    $activity['location']['locationType']['title']
-                );
-                $activity['location']['locationType']['isNull'] = false;
-                $activity['location']['locationType']['type'] = 'locationType';
-            }
-
-            if (null !== $activity['activityType']) {
-                $activity['activityType']['name'] = $this->translatableStringHelper->localize(
-                    $activity['activityType']['name']
-                );
-                $activity['activityType']['isNull'] = false;
-                $activity['activityType']['type'] = 'activityType';
-            } else {
-                $activity['activityType'] = $this->normalizer->normalize(null, 'docgen', [
-                    AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => ActivityType::class,
-                ]);
-            }
-
-            if (null !== $activity['attendee']) {
-                $activity['attendee']['name'] = $this->translatableStringHelper->localize(
-                    $activity['attendee']['name']
-                );
-                $activity['attendee']['isNull'] = false;
-                $activity['attendee']['type'] = 'activityPresence';
-            } else {
-                $activity['attendee'] = $this->normalizer->normalize(null, 'docgen', [
-                    AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => ActivityPresence::class,
-                ]);
-            }
-
-            $activity['comment'] = (string) $row['comment'];
-            $activity['travelTimeMinute'] = $row['travelTimeMinute'];
-            $activity['durationTimeMinute'] = $row['durationTimeMinute'];
-
-            if (null !== $row['userIds']) {
-                foreach ($row['userIds'] as $id) {
-                    $activity['users'][] = $this->normalizer->normalize(
-                        $this->userRepository->find($id),
-                        'docgen',
-                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => User::class]
-                    );
-                }
-            } else {
-                $activity['users'] = [];
-            }
-
-            if (null !== $row['personIds']) {
-                foreach ($row['personIds'] as $id) {
-                    $activity['persons'][] = $this->normalizer->normalize(
-                        $this->personRepository->find($id),
-                        'docgen',
-                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Person::class]
-                    );
-                }
-            } else {
-                $activity['persons'] = [];
-            }
-
-            if (null !== $row['thirdPartyIds']) {
-                foreach ($row['thirdPartyIds'] as $id) {
-                    $activity['thirdParties'][] = $this->normalizer->normalize(
-                        $this->thirdPartyRepository->find($id),
-                        'docgen',
-                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => ThirdParty::class]
-                    );
-                }
-            } else {
-                $activity['thirdParties'] = [];
-            }
-
-            if (null !== $row['socialActionIds']) {
-                foreach ($row['socialActionIds'] as $id) {
-                    $activity['socialActions'][] = $this->normalizer->normalize(
-                        $this->socialActionRepository->find($id),
-                        'docgen',
-                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => SocialAction::class]
-                    );
-                }
-            } else {
-                $activity['socialActions'] = [];
-            }
-
-            if (null !== $row['socialIssueIds']) {
-                foreach ($row['socialIssueIds'] as $id) {
-                    $activity['socialIssues'][] = $this->normalizer->normalize(
-                        $this->socialIssueRepository->find($id),
-                        'docgen',
-                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => SocialIssue::class]
-                    );
-                }
-            } else {
-                $activity['socialIssues'] = [];
-            }
-
-            $results[] = $activity;
-        }
-
-        return $results;
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
@@ -11,7 +11,6 @@ declare(strict_types=1);

 namespace Chill\ActivityBundle\Tests\Controller;

-use Chill\ActivityBundle\Entity\ActivityType;
 use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Role\Role;
@@ -210,7 +209,7 @@ final class ActivityControllerTest extends WebTestCase

        //get the social PermissionGroup, and remove CHILL_ACTIVITY_*
        $socialPermissionGroup = $em
-            ->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)
+            ->getRepository('ChillMainBundle:PermissionsGroup')
            ->findOneByName('social');
        $withoutActivityPermissionGroup = (new \Chill\MainBundle\Entity\PermissionsGroup())
            ->setName('social without activity');
@@ -222,7 +221,7 @@ final class ActivityControllerTest extends WebTestCase
        }
        //create groupCenter
        $groupCenter = new \Chill\MainBundle\Entity\GroupCenter();
-        $groupCenter->setCenter($em->getRepository(\Chill\MainBundle\Entity\Center::class)
+        $groupCenter->setCenter($em->getRepository('ChillMainBundle:Center')
            ->findOneBy(['name' => 'Center A']))
            ->setPermissionsGroup($withoutActivityPermissionGroup);
        $em->persist($withoutActivityPermissionGroup);
@@ -250,7 +249,7 @@ final class ActivityControllerTest extends WebTestCase
        $em = self::$kernel->getContainer()
            ->get('doctrine.orm.entity_manager');

-        $activities = $em->getRepository(\Chill\ActivityBundle\Entity\Activity::class)
+        $activities = $em->getRepository('ChillActivityBundle:Activity')
            ->findBy(['person' => $person]);

        if (count($activities) === 0) {
@@ -282,7 +281,7 @@ final class ActivityControllerTest extends WebTestCase
        $em = self::$kernel->getContainer()
            ->get('doctrine.orm.entity_manager');

-        $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)
+        $person = $em->getRepository('ChillPersonBundle:Person')
            ->findOneBy([
                'firstName' => 'Depardieu',
                'lastName' => 'Gérard',
@@ -305,7 +304,7 @@ final class ActivityControllerTest extends WebTestCase
    {
        $reasons = self::$kernel->getContainer()
            ->get('doctrine.orm.entity_manager')
-            ->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)
+            ->getRepository('ChillActivityBundle:ActivityReason')
            ->findAll();

        $reason = $reasons[array_rand($reasons)];
@@ -324,7 +323,7 @@ final class ActivityControllerTest extends WebTestCase
    {
        $types = self::$kernel->getContainer()
            ->get('doctrine.orm.entity_manager')
-            ->getRepository(ActivityType::class)
+            ->getRepository('ChillActivityBundle:ActivityType')
            ->findAll();

        return $types[array_rand($types)];
@@ -340,7 +339,7 @@ final class ActivityControllerTest extends WebTestCase
    {
        $user = self::$kernel->getContainer()
            ->get('doctrine.orm.entity_manager')
-            ->getRepository(\Chill\MainBundle\Entity\User::class)
+            ->getRepository('ChillMainBundle:User')
            ->findOneByUsername($username);

        if (null === $user) {
@@ -350,7 +349,7 @@ final class ActivityControllerTest extends WebTestCase

        $center = self::$kernel->getContainer()
            ->get('doctrine.orm.entity_manager')
-            ->getRepository(\Chill\MainBundle\Entity\Center::class)
+            ->getRepository('ChillMainBundle:Center')
            ->findOneByName($centerName);

        // get scope reachable by both role UPDATE and DELETE
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pol Dellaiera	bddb6e615e	CS: Autofix.	2022-02-01 09:35:04 +01:00
Pol Dellaiera	a18ea30c8f	chill-main work in progress	2022-02-01 09:35:04 +01:00
Pol Dellaiera	2ba240525c	Add missing form type wirings.	2022-02-01 09:35:04 +01:00
Pol Dellaiera	5b76338fb0	Add new PhoneNumberType.	2022-02-01 09:35:04 +01:00
Pol Dellaiera	ce8399945a	Add new configuration property.	2022-02-01 09:35:04 +01:00
Pol Dellaiera	1605bc5d08	New migration file.	2022-02-01 09:35:03 +01:00