fix bug of user filter not being combined with other filters

.changes/unreleased/DX-20230623-122408.yaml

@@ -0,0 +1,5 @@
+kind: DX
+body: '[FilterOrderHelper] add entity choice and singleCheckbox'
+time: 2023-06-23T12:24:08.133491895+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20230623-122530.yaml

@@ -0,0 +1,5 @@
+kind: Feature
+body: '[activity list] add filtering for activities list'
+time: 2023-06-23T12:25:30.49643551+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20230623-122702.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: '[activity list] in person context, show also the activities from the accompanying
+  periods where the person participates'
+time: 2023-06-23T12:27:02.159041095+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20230623-124438.yaml

@@ -0,0 +1,5 @@
+kind: Feature
+body: '[activity list] add pagination to the list of activities'
+time: 2023-06-23T12:44:38.879098862+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20230705-140336.yaml

@@ -0,0 +1,5 @@
+kind: Feature
+body: Allow filtering on the basis of a user within general tasks list
+time: 2023-07-05T14:03:36.664880092+02:00
+custom:
+  Issue: ""

.changes/unreleased/Feature-20231212-154841.yaml

@@ -1,5 +0,0 @@
-kind: Feature
-body: '[DX] move async-upload-bundle features into chill-bundles'
-time: 2023-12-12T15:48:41.954970271+01:00
-custom:
-  Issue: "221"

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

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

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

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

.changes/unreleased/Feature-20240614-153236.yaml

@@ -1,8 +0,0 @@
-kind: Feature
-body: |-
-  Electronic signature
-
-  Implementation of the electronic signature for documents within chill.
-time: 2024-06-14T15:32:36.875891692+02:00
-custom:
-  Issue: ""

.changes/unreleased/Feature-20240718-151233.yaml

@@ -1,5 +0,0 @@
-kind: Feature
-body: Metadata form added for person signatures
-time: 2024-07-18T15:12:33.8134266+02:00
-custom:
-  Issue: "288"

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

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

.changes/v2.10.0.md

@@ -1,20 +0,0 @@
-## v2.10.0 - 2023-10-24
-### Feature
-* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] Add a filter "grouping accompanying period by opening date" and "grouping accompanying period by closing date"
-* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a filter and aggregator on accompanying period work: group/filter by handling third party
-* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a filter and aggregator on activites: group/filter activities by people participating to the activities
-* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a grouping on accompanying period export: group by activity type associated to at least one activity within the accompanying period
-* [export] sort filters and aggregators by title
-* ([#179](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/179)) [export] create a parameter that will force to skip the filtering by center (ACL) when generating an export
-### Fixed
-* ([#177](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/177)) [export] fix date range selection on filter and grouping "by status of the course at date", on accompanying periods
-
-### Résumé francophone des changements
-
-- Ajout d'un regroupement sur les parcours: par date de cloture et d'ouverture;
-- Ajouter d'un filtre et regroupement par tiers traitant sur les actions d'accompagnement;
-- ajout d'un filtre et regroupement par usager participant sur les échanges
-- ajout d'un regroupement: par type d'activité associé au parcours;
-- trie les filtre et regroupements par ordre alphabétique dans els exports
-- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
-- correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"

.changes/v2.10.1.md

@@ -1,3 +0,0 @@
-## v2.10.1 - 2023-10-24
-### Fixed
-* Fix export controller when generating an export without any data in session 

.changes/v2.10.2.md

@@ -1,3 +0,0 @@
-## v2.10.2 - 2023-10-26
-### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 

.changes/v2.10.3.md

@@ -1,3 +0,0 @@
-## v2.10.3 - 2023-10-26
-### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 

.changes/v2.10.4.md

@@ -1,3 +0,0 @@
-## v2.10.4 - 2023-10-26
-### Fixed
-* Fix null value constraint errors when merging relationships in doubles 

.changes/v2.10.5.md

@@ -1,4 +0,0 @@
-## v2.10.5 - 2023-11-05
-### Fixed
-* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
-* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 

.changes/v2.10.6.md

@@ -1,4 +0,0 @@
-## v2.10.6 - 2023-11-07
-### Fixed
-* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 

.changes/v2.11.0.md

@@ -1,6 +0,0 @@
-## v2.11.0 - 2023-11-07
-### Feature
-* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
-### Fixed
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
-* Fix "group activity by creator job" aggregator 

.changes/v2.12.0.md

@@ -1,26 +0,0 @@
-## v2.12.0 - 2023-11-15
-### Feature
-* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add an aggregator "group activities by presence"
-* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add a filter "filter activity by activity presence"
-* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add an aggregator "group activities by person" (only for the activities saved in a person context)
-* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add a new aggregator "group peoples by postal code"
-* ([#200](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/200)) Export: split export about person on accompanying period work: one with the people associated with the work, another one with the people associated with the accompanying period
-* ([#204](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/204)) Add 3 new filters and 3 new aggregators for work action creator (with jobs and scopes)
-
-* ([#202](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/202)) Create export for the average duration of social work actions
-* ([#206](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/206)) Export: add a export which count persons on accompanying period work
-* ([#206](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/206)) Export: add an export which count persons on activity
-* ([#203](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/203)) Export: add clauses on the social work start date and end date within the filter "Filter accompanying period by accompanying period work"
-### Fixed
-* Export: fix typo in filter "filter accompanying period work on end date"
-* ([#189](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/189)) Export: Fix failure in export linked to household
-* ([#205](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/205)) Fix loading of accompanying period work referrers
-### Traduction francophone des principaux changements
-* export: ajout d'un regroupement "grouper les échanges par présence de l'usager";
-* export: ajout d'un filtre "filtre les échanges par présence de l'usager";
-* export: ajout d'un regroupement "regrouper les échanges par personne" (seulement pour les échanges enregistrés dans le contexte de l'usager);
-* export: ajout d'un regroupement "grouper les usagers par codes postaux"
-* export: séparation des exports sur les actions: dans l'un, les filtres des usagers portent sur les usagers concernés par l'action, dans l'autre, les filtres portent sur les usagers concernés par le parcours de l'action;
-* export: ajout de 3 nouveaux filtres et regroupements sur le créateur de l'action, son métier et son service;
-* export: correction de l'export sur les ménages liés aux parcours;
-* correction du chargement des actions d'accompagnement

.changes/v2.12.1.md

@@ -1,3 +0,0 @@
-## v2.12.1 - 2023-11-16
-### Fixed
-* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 

.changes/v2.13.0.md

@@ -1,9 +0,0 @@
-## v2.13.0 - 2023-11-21
-### Feature
-* ([#173](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/173)) Allow user to add a phonenumber to their profile which will be included in automatically generated documents
-### Fixed
-* ([#211](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/211)) Export: fix loading of "Group activity by type"
-* ([#190](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/190)) Export: fix loading of "group activity by reasons"
-* ([#213](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/213)) Export: fix usage of some Collection returned instead of array in export filters
-* ([#215](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/215)) Use only the string 'both' for gender (with a database migration)
-* ([#212](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/212)) Clean the database to make working the "Group people by gender" aggregator

.changes/v2.14.0.md

@@ -1,8 +0,0 @@
-## v2.14.0 - 2023-11-24
-### Feature
-* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
-### Fixed
-* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
-* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
-* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
-* Fix various errors in custom fields administration 

.changes/v2.14.1.md

@@ -1,5 +0,0 @@
-## v2.14.1 - 2023-11-29
-### Fixed
-* Export: fix list person with custom fields 
-* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
-* Fix error in ListEvaluation when "handling agents" are alone 

.changes/v2.15.0.md

@@ -1,11 +0,0 @@
-## v2.15.0 - 2023-12-11
-### Feature
-* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
-* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
-### Fixed
-* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
-* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
-* ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
- 
-* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
-* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 

.changes/v2.15.1.md

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

.changes/v2.15.2.md

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

.changes/v2.16.0.md

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

.changes/v2.16.1.md

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

.changes/v2.16.2.md

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

.changes/v2.16.3.md

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

.changes/v2.17.0.md

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

.changes/v2.18.0.md

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

.changes/v2.18.1.md

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

.changes/v2.18.2.md

@@ -1,3 +0,0 @@
-## v2.18.2 - 2024-04-12
-### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 

.changes/v2.19.0.md

@@ -1,20 +0,0 @@
-## v2.19.0 - 2024-05-14
-### Feature
-* ([#197](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/197)) Make the script which subscribe to microsoft calendars changes more tolerant to errors or missing configuration on the microsoft side
-* ([#276](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/276)) Take closing date into account when computing the geographical unit on accompanying period. When a person moved after an accompanying period is closed, the date of closing accompanying period is took into account if it is earlier than the date given by the user.
-### Fixed
-* ([#270](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/270)) Fix broken link in homepage when a evaluation from a closed acc period was present in the homepage widget
-* ([#275](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/275)) Allow the filter "filter accompanying period by geographical unit" to take period's location on address into account
-### UX
-* Form for document generation moved to the top of document list page
-* ([#266](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/266)) Event bundle: adjust certain graphical issues for better user experience
-
-
-### Traduction francophone des principaux changements
-
-- script de synchronisation des agendas de microsoft Outlook: le script est plus tolérant aux erreurs de configuration côté serveur (manque de droit d'accès);
-- dans les statistiques sur les parcours d'accompagnements, regroupement et filtre par unité géographique: lorsque la date de prise en compte de l'adresse est postérieure à la fermeture du parcours, c'est la date de fermeture du parcours qui est prise en compte (cela permet de tenir compte de la localisation de l'usager au moment de la fermeture dans le cas où celui-ci aurait déménagé par la suite);
-- sur la page d'accueil, il n'y a plus de rappel pour les évaluations pour les parcours cloturés;
-- correction du filtre "filtrer par zone géographique"
-- répétition du bouton pour générer un document en haut de la page "liste des documents", quand il y a plus de cinq documents;
-- module événement: améliorerations graphiques

.changes/v2.20.0.md

@@ -1,21 +0,0 @@
-## v2.20.0 - 2024-06-05
-### Fixed
-* ([#170](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/170)) Display agents traitants instead of accompanying period referrer in export list social actions.
-* Added translations for choices of durations (> 5 hours)
-### Feature
-* ([#145](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/145)) Allow to open documents in LibreOffice locally (need configuration within security);
-
-  This endpoint should be added to make the endpoint works properly:
-
-  ```yaml
-  security:
-      firewalls:
-          dav:
-               pattern: ^/dav
-               provider: chain_provider
-               stateless: true
-               guard:
-                   authenticators:
-                       - Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
-
-  ```

.changes/v2.20.1.md

@@ -1,3 +0,0 @@
-## v2.20.1 - 2024-06-05
-### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 

.changes/v2.21.0.md

@@ -1,31 +0,0 @@
-## v2.21.0 - 2024-06-18
-### Feature
-* Add flash menu buttons in search results, to open directly a new calendar, or a new activity in an accompanying period
-* ([#122](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/122)) Improve the list of calendar in the search results: make all calendar clicable, and display a list of calendars
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add start date and end date on filters "filter course by referrer job" and "filter course by referrer scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] the aggregator "Group by referrer" now accept a date range.
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's jobs"
-* ([#168](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/168) In the UX, display user job and service at the time when he performs an action:
-  now, the job and service is shown:
-  * at the activity's date,
-  * at the appointment's date,
-  * when the user is marked as referrer for an accompanying period work,
-  * when the user apply a transition in a workflow,
-  * when the user updates or creates "something" ("created/updated by ... at ..."),
-  * or when he wrote a comment,
-  * …
-
-### Traduction francophone
-* Ajout d'un menu "flash" dans les résultats de recherche, pour créer un rendez-vous ou un échange dans un parcours depuis les résultats de recherche;
-* Améliore la liste des rendez-vous dans les résultats de recherche: les rendez-vous sont cliquables;
-* [exports] Ajout d'intervalles de dates pour des filtres et regroupements des parcours par référent, métier du référent, service du référent;
-* Affiche le métier et le service des utilisateurs à la date à laquelle il a exécuté une action. Le métier et le service est affiché:
-  * à la date d'un échange,
-  * au jour d'un rendez-vous,
-  * quand l'utilisateur est devenu référent d'un parcours d'accompagnement,
-  * quand il a appliqué une transition sur un workflow,
-  * quand il a mise à jour ou créé une fiche, dans les mentions "créé / mise à jour par ..., le ...",
-  * quand il a mis à jour un commentaire,
-  * …
-

.changes/v2.5.0.md

@@ -1,39 +0,0 @@
-## v2.5.0 - 2023-07-14
-### Feature
-* Allow filtering on the basis of a user within general tasks lists
-* ([#120](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/120)) Adding OrderFilter to the list of social actions.
-* ([#125](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/125)) [export] Add a list for people with their associated course
-* [export] Add ordering by person's lastname or course opening date in list which concerns accompanying course or peoples
-* ([#128](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/128)) [Export] allow to group activities by localisation
-* ([#129](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/129)) [export] Add a filter "filter course having an activity between two dates"
-* ([#112](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/112)) [addresses] Add a cronjob to re-associate addresses with addresses reference every 6 hours
-* Improve filtering layout
-
-### Fixed
-* reimplement the visualization of all calculator results
-* ([#117](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/117)) Repair my unread notification list with actions and evaluations documents
-* ([#126](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/126)) Correct bug in thirdparty API search query: simplify address joins clause for child and parent kind
-
-### DX
-* Documentation for database principles
-* [cronjob] when a cronjob is executed, it may return an array of data that will be passed as argument on the next execution
-
-### UX
-* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Better integration of address details button: look, position, title tag
-* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Show address detail button on person and household banners
-* Improve residential address position on show onthefly modale
-
-### Traduction francophone des principaux changements
-
-* Ajout d'un filtre "par utilisateur" aux pages de tâche
-* Filtre des actions d'accompagnement par date, type, intervenant
-* export: liste des usagers concernés avec détail de leurs parcours
-* export: ajout d'un regroupement des échanges par localisation
-* export: ajout d'un filtre "parcours ayant reçu un échange entre deux dates"
-* ajout d'une tâche cron pour associer les adresses à une adresse de référence
-* correction: réparation de la liste des notifications sur la page d'accueil, dans le cas où une notification concerne une action ou un document dans une évaluation
-* correction: réparation de la recherche des tiers ayant des codes postaux similaires entre les parents et enfants
-* meilleure intégration du bouton "détail d'une adresse": améliration de la taille et de la position
-* bouton permettant de visualiser les détails d'une adresse (modale avec carte) dans la bannière "Usager" et "Ménage"
-* amélioration de la modale permettant de voir les détails d'un usager: les adresses de résidence sont dans la continuité des autres adresses, et non plus dans une colonne séparée
-* améliore le design et l'expérience utilisateur des filtres

.changes/v2.5.1.md

@@ -1,3 +0,0 @@
-## v2.5.1 - 2023-07-14
-### Fixed
-* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 

.changes/v2.5.2.md

@@ -1,3 +0,0 @@
-## v2.5.2 - 2023-07-15
-### Fixed
-* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead) 

.changes/v2.5.3.md

@@ -1,3 +0,0 @@
-## v2.5.3 - 2023-07-20
-### Fixed
-* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 

.changes/v2.6.0.md

@@ -1,21 +0,0 @@
-## v2.6.0 - 2023-09-14
-### Feature
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
-* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
-### Fixed
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
-* Missing translation in Work Actions exports 
-* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
-* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
-error when trying to reedit a saved export
-
- 
-* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
-* Add missing translation for comment field placeholder in repositionning household editor.
- 
-* Do not send an email to creator twice when adding a comment to a notification 
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
-### UX
-* Uniformize badge-person in household banner (background, size)
- 

.changes/v2.6.1.md

@@ -1,3 +0,0 @@
-## v2.6.1 - 2023-09-14
-### Fixed
-* Filter out active centers in exports, which uses a different PickCenterType. 

.changes/v2.6.2.md

@@ -1,3 +0,0 @@
-## v2.6.2 - 2023-09-18
-### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 

.changes/v2.6.3.md

@@ -1,4 +0,0 @@
-## v2.6.3 - 2023-09-19
-### Fixed
-* Remove id property from document 
-mappedsuperclass 

.changes/v2.7.0.md

@@ -1,6 +0,0 @@
-## v2.7.0 - 2023-09-27
-### Feature
-* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
-### Fixed
-* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
-* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 

.changes/v2.8.0.md

@@ -1,19 +0,0 @@
-## v2.8.0 - 2023-10-05
-
-### Feature
-
-* ([#162](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/162)) Reassigning list: when reassigning courses to a new user, the job associated with the course become the one of the new user (if any)
-* Reassining list: the length of the list is increased to 100 courses
-
-### Fixed
-
-* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) Fix filter "accompanying course by social action" to avoid duplication in list
-* ([#164](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/164)) View a third party: avoid errors when a contact has a civility
-* ([#163](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/163)) Fix the filters and aggregators on exports "count peoples"
-* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) From the database, avoid the creation of location history for same period and at same dates
-
-### Traduction francophone des principaux changements
-
-- Fonctionnalité: Réassigner les parcours en lot: lorsque des parcours sont réassignés "en lot", les parcours sont maintenant associés au métier du nouveau référent;
-- Correction: certaines causes qui créaient des doublons dans les listes ont été corrigées;
-- Correction des associations entre l'export "nombre de personnes" et les filtres et regroupements associés

.changes/v2.9.0.md

@@ -1,23 +0,0 @@
-## v2.9.0 - 2023-10-17
-### Feature
-* ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)) Add history to scopes and to jobs in administrator section. When user job or main scope of user is changed, automaticaly add a new row in history.
-* ([#146](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/146)) Allow closing motives to be identified as 'canceling the accompanying period' + don't take canceled accompanying periods into account
-* [export] add an aggregator for activities: group by job scope's creator aggregator
-* DX: prepare the code for the upgrade to symfony 5.4
-
-### Traductions francophones des principaux changements
-
-- ajout de l'historique des services et métiers pour les utilisateurs. Les exports, filtres et regroupements sont adaptés pour tenir compte du métier et du service
-  de l'utilisateur au moment de l'échange, de sa désignation comme agent traitant de l'échange ou du moment du rendez-vous ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)))
-- modification des motifs de cloture des parcours: ajout d'un chanmp "annule le parcours", qui permet d'indiquer que le motif "annule" le parcours. Les parcours annulés n'apparaissent
-  pas dans les statistiques
-- ajouter d'un regroupement pour les échanges: grouper par métier et service du créateur de l'échange
-
-
-### Possible BC break in configuration
-
-This release remove the use of deprecated package [symfony/templating](https://symfony.com/components/Templating).
-
-If you use this package in your own bundle (usually `src/` directory, or other dependencies), you should add this dependencies in your local composer.json (`composer require symfony/templating`).
-
-But if you do not need this any more, you must ensure that the configuration key `framework.templating` is removed. This is usually located into `config/packages/framework.yaml`. [See here an example](https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/commit/cc716beaecc239e6a189f3db62ea95f169a37505#diff-df607fe73ff82c569824a7392edf5e760e998efe)

.changes/v2.9.1.md

@@ -1,3 +0,0 @@
-## v2.9.1 - 2023-10-17
-### Fixed
-* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 

.changes/v2.9.2.md

@@ -1,3 +0,0 @@
-## v2.9.2 - 2023-10-17
-### Fixed
-* Fix possible null values in string's entities 

.changie.yaml

@@ -7,7 +7,7 @@ versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
 kindFormat: '### {{.Kind}}'
 # Note: it is possible to add a `.custom.Long` text manually into the yaml file produced by `changie new`. This will add a long description.
 changeFormat: >-
-    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{.Body}} {{ if and (.Custom.Long) (not (eq .Custom.Long "")) }}
+    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{.Body}} {{ if not (eq .Custom.Long "") }}
 
       {{ .Custom.Long }}{{ end }}
 custom:
@@ -30,8 +30,6 @@ kinds:
         auto: patch
     -   label: DX
         auto: patch
-    -   label: UX
-        auto: patch
 newlines:
     afterChangelogHeader: 1
     beforeChangelogVersion: 1

.editorconfig

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

.env

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

.env.test

@@ -3,41 +3,3 @@
 # Run tests from root to adapt your own environment
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
-
-TRUSTED_HOSTS=
-
-ADMIN_PASSWORD=password
-
-LOCALE=fr
-REDIS_URL=redis
-REDIS_PORT=6379
-REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
-
-JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
-JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
-JWT_PASSPHRASE=2a30f6ba26521a2613821da35f28386e
-
-TWILIO_SID=~
-TWILIO_SECRET=~
-DEFAULT_CARRIER_CODE=BE
-
-ADD_ADDRESS_DEFAULT_COUNTRY=BE
-
-ADD_ADDRESS_MAP_CENTER_X=50.8443
-ADD_ADDRESS_MAP_CENTER_Y=4.3523
-ADD_ADDRESS_MAP_CENTER_Z=15
-
-SHORT_MESSAGE_DSN=null://null
-MESSENGER_TRANSPORT_DSN=sync://
-###< symfony/messenger ###
-
-###> doctrine/doctrine-bundle ###
-# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
-# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
-#
-DATABASE_URL="postgresql://postgres:postgres@db:5432/test?serverVersion=14&charset=utf8"
-###< doctrine/doctrine-bundle ###
-
-ASYNC_UPLOAD_TEMP_URL_KEY=
-ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
-ASYNC_UPLOAD_TEMP_URL_CONTAINER=

.gitlab-ci.yml

@@ -3,7 +3,7 @@
 # Select what we should cache between builds
 cache:
     paths:
-        - /vendor/
+        - tests/app/vendor/
         - .cache
 
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
@@ -11,16 +11,11 @@ cache:
 services:
     - name: postgis/postgis:14-3.3-alpine
       alias: db
-      command:
-          - postgres
-          - "-c"
-          - max_connections=1000
     - name: redis
       alias: redis
 
 # Set any variables we need
 variables:
-    APP_ENV: test
     GIT_DEPTH: 1
     # Configure postgres environment variables (https://hub.docker.com/r/_/postgres/)
     POSTGRES_USER: postgres
@@ -28,15 +23,13 @@ variables:
     # configure database access
     DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8
     # fetch the chill-app using git submodules
-    # GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_STRATEGY: recursive
     REDIS_HOST: redis
     REDIS_PORT: 6379
     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
-    # force a timezone
-    TZ: Europe/Brussels
-    # avoid direct deprecations (using symfony phpunit bridge: https://symfony.com/doc/4.x/components/phpunit_bridge.html#internal-deprecations
-    SYMFONY_DEPRECATIONS_HELPER: max[total]=99999999&max[self]=0&max[direct]=45&verbose=0
 
 stages:
     - Composer install
@@ -54,10 +47,10 @@ build:
         paths:
             - .cache/
     artifacts:
-        expire_in: 1 day
+        expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 code_style:
     stage: Tests
@@ -68,10 +61,10 @@ code_style:
         paths:
             - .cache/
     artifacts:
-        expire_in: 1 day
+        expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 phpstan_tests:
     stage: Tests
@@ -82,25 +75,24 @@ phpstan_tests:
         paths:
             - .cache/
     artifacts:
-        expire_in: 1 day
+        expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 rector_tests:
     stage: Tests
     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     script:
-        - tests/console cache:clear
-        - bin/rector process --dry-run
+        - bin/rector --dry-run
     cache:
         paths:
             - .cache/
     artifacts:
-        expire_in: 1 day
+        expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 # psalm_tests:
 #     stage: Tests
@@ -117,17 +109,19 @@ rector_tests:
 unit_tests:
     stage: Tests
     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    # until we fix testes
+    allow_failure: true
     script:
-        - php tests/console doctrine:migrations:migrate -n --env=test
-        - php tests/console chill:db:sync-views --env=test
-        - php -d memory_limit=2G tests/console cache:clear --env=test
-        - php -d memory_limit=3G tests/console doctrine:fixtures:load -n --env=test
-        - php -d memory_limit=4G bin/phpunit --colors=never --exclude-group dbIntensive
+        - php tests/app/bin/console doctrine:migrations:migrate -n
+        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev
+        - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n
+        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test
+        - php -d memory_limit=4G bin/phpunit --colors=never
     artifacts:
-        expire_in: 1 day
+        expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 release:
     stage: Deploy

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "_exts/sphinx-php"]
 	path = _exts/sphinx-php
 	url = https://github.com/fabpot/sphinx-php.git
+[submodule "tests/app"]
+	path = tests/app
+	url = https://gitlab.com/Chill-projet/chill-app.git

.php-cs-fixer.dist.php

@@ -27,7 +27,6 @@ $config
     ->setRiskyAllowed(true)
     ->setCacheFile('.cache/php-cs-fixer.cache')
     ->setUsingCache(true)
-    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
 ;
 
 $rules = $config->getRules();
@@ -92,7 +91,7 @@ $rules = array_merge(
     [
         '@PhpCsFixer' => true,
         '@PhpCsFixer:risky' => false,
-        '@Symfony' => true,
+        '@Symfony' => false,
         '@Symfony:risky' => false,
         'ordered_class_elements' => [
             'order' => [
@@ -112,14 +111,13 @@ $rules = array_merge(
                 'method_private',
             ],
             'sort_algorithm' => 'alpha',
-        ],
-        'single_line_empty_body' => true,
+        ]
     ],
     $rules,
     $riskyRules,
     $untilFullSwitchToPhp8,
 );
 
-$rules['header_comment']['header'] = trim(file_get_contents(__DIR__.'/resource/header.txt'));
+$rules['header_comment']['header'] = trim(file_get_contents(__DIR__ . '/resource/header.txt'));
 
 return $config->setRules($rules);

.readthedocs.yml

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

CHANGELOG.md

@@ -6,419 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## v2.21.0 - 2024-06-18
-### Feature
-* Add flash menu buttons in search results, to open directly a new calendar, or a new activity in an accompanying period
-* ([#122](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/122)) Improve the list of calendar in the search results: make all calendar clicable, and display a list of calendars
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add start date and end date on filters "filter course by referrer job" and "filter course by referrer scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] the aggregator "Group by referrer" now accept a date range.
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's jobs"
-* ([#168](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/168) In the UX, display user job and service at the time when he performs an action:
-  now, the job and service is shown:
-  * at the activity's date,
-  * at the appointment's date,
-  * when the user is marked as referrer for an accompanying period work,
-  * when the user apply a transition in a workflow,
-  * when the user updates or creates "something" ("created/updated by ... at ..."),
-  * or when he wrote a comment,
-  * …
-
-### Traduction francophone
-* Ajout d'un menu "flash" dans les résultats de recherche, pour créer un rendez-vous ou un échange dans un parcours depuis les résultats de recherche;
-* Améliore la liste des rendez-vous dans les résultats de recherche: les rendez-vous sont cliquables;
-* [exports] Ajout d'intervalles de dates pour des filtres et regroupements des parcours par référent, métier du référent, service du référent;
-* Affiche le métier et le service des utilisateurs à la date à laquelle il a exécuté une action. Le métier et le service est affiché:
-  * à la date d'un échange,
-  * au jour d'un rendez-vous,
-  * quand l'utilisateur est devenu référent d'un parcours d'accompagnement,
-  * quand il a appliqué une transition sur un workflow,
-  * quand il a mise à jour ou créé une fiche, dans les mentions "créé / mise à jour par ..., le ...",
-  * quand il a mis à jour un commentaire,
-  * …
-
-
-## v2.20.1 - 2024-06-05
-### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 
-
-## v2.20.0 - 2024-06-05
-### Fixed
-* ([#170](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/170)) Display agents traitants instead of accompanying period referrer in export list social actions.
-* Added translations for choices of durations (> 5 hours)
-### Feature
-* ([#145](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/145)) Allow to open documents in LibreOffice locally (need configuration within security);
-
-  This endpoint should be added to make the endpoint works properly:
-
-  ```yaml
-  security:
-      firewalls:
-          dav:
-               pattern: ^/dav
-               provider: chain_provider
-               stateless: true
-               guard:
-                   authenticators:
-                       - Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
-
-  ```
-
-## v2.19.0 - 2024-05-14
-### Feature
-* ([#197](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/197)) Make the script which subscribe to microsoft calendars changes more tolerant to errors or missing configuration on the microsoft side
-* ([#276](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/276)) Take closing date into account when computing the geographical unit on accompanying period. When a person moved after an accompanying period is closed, the date of closing accompanying period is took into account if it is earlier than the date given by the user.
-### Fixed
-* ([#270](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/270)) Fix broken link in homepage when a evaluation from a closed acc period was present in the homepage widget
-* ([#275](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/275)) Allow the filter "filter accompanying period by geographical unit" to take period's location on address into account
-### UX
-* Form for document generation moved to the top of document list page
-* ([#266](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/266)) Event bundle: adjust certain graphical issues for better user experience
-
-
-### Traduction francophone des principaux changements
-
-- script de synchronisation des agendas de microsoft Outlook: le script est plus tolérant aux erreurs de configuration côté serveur (manque de droit d'accès);
-- dans les statistiques sur les parcours d'accompagnements, regroupement et filtre par unité géographique: lorsque la date de prise en compte de l'adresse est postérieure à la fermeture du parcours, c'est la date de fermeture du parcours qui est prise en compte (cela permet de tenir compte de la localisation de l'usager au moment de la fermeture dans le cas où celui-ci aurait déménagé par la suite);
-- sur la page d'accueil, il n'y a plus de rappel pour les évaluations pour les parcours cloturés;
-- correction du filtre "filtrer par zone géographique"
-- répétition du bouton pour générer un document en haut de la page "liste des documents", quand il y a plus de cinq documents;
-- module événement: améliorerations graphiques
-
-## v2.18.2 - 2024-04-12
-### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
-
-## v2.18.1 - 2024-03-26
-### Fixed
-* Fix layout issue in document generation for admin (minor) 
-
-## v2.18.0 - 2024-03-26
-### Feature
-* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
-### Fixed
-* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
-
-## v2.17.0 - 2024-03-19
-### Feature
-* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
-* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
-* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
-* ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
-### Fixed
-* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
-* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
-
-## v2.16.3 - 2024-02-26
-### Fixed
-* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
-### UX
-* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
-
-## v2.16.2 - 2024-02-21
-### Fixed
-* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
-
-## v2.16.1 - 2024-02-09
-### Fixed
-* Force bootstrap version to avoid error in builds with newer version 
-
-## v2.16.0 - 2024-02-08
-### Feature
-* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
-* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
-* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
-* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
-* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
-* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
-* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
-* Modernize the event bundle, with some new fields and multiple improvements 
-### Fixed
-* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
-* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
-### UX
-* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
-
-## v2.15.2 - 2024-01-11
-### Fixed
-* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
-### DX
-* Set placeholder to False for expanded EntityType form fields where required is set to False. 
-
-## v2.15.1 - 2023-12-20
-### Fixed
-* Fix the household export query to exclude accompanying periods that are in draft state. 
-### DX
-* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
-
-## v2.15.0 - 2023-12-11
-### Feature
-* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
-* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
-### Fixed
-* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
-* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
-* ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
- 
-* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
-* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 
-
-## v2.14.1 - 2023-11-29
-### Fixed
-* Export: fix list person with custom fields 
-* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
-* Fix error in ListEvaluation when "handling agents" are alone 
-
-## v2.14.0 - 2023-11-24
-### Feature
-* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
-### Fixed
-* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
-* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
-* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
-* Fix various errors in custom fields administration 
-
-## v2.13.0 - 2023-11-21
-### Feature
-* ([#173](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/173)) Allow user to add a phonenumber to their profile which will be included in automatically generated documents
-### Fixed
-* ([#211](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/211)) Export: fix loading of "Group activity by type"
-* ([#190](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/190)) Export: fix loading of "group activity by reasons"
-* ([#213](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/213)) Export: fix usage of some Collection returned instead of array in export filters
-* ([#215](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/215)) Use only the string 'both' for gender (with a database migration)
-* ([#212](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/212)) Clean the database to make working the "Group people by gender" aggregator
-
-## v2.12.1 - 2023-11-16
-### Fixed
-* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 
-
-## v2.12.0 - 2023-11-15
-### Feature
-* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add an aggregator "group activities by presence"
-* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add a filter "filter activity by activity presence"
-* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add an aggregator "group activities by person" (only for the activities saved in a person context)
-* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add a new aggregator "group peoples by postal code"
-* ([#200](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/200)) Export: split export about person on accompanying period work: one with the people associated with the work, another one with the people associated with the accompanying period
-* ([#204](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/204)) Add 3 new filters and 3 new aggregators for work action creator (with jobs and scopes)
-
-* ([#202](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/202)) Create export for the average duration of social work actions
-* ([#206](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/206)) Export: add a export which count persons on accompanying period work
-* ([#206](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/206)) Export: add an export which count persons on activity
-* ([#203](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/203)) Export: add clauses on the social work start date and end date within the filter "Filter accompanying period by accompanying period work"
-### Fixed
-* Export: fix typo in filter "filter accompanying period work on end date"
-* ([#189](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/189)) Export: Fix failure in export linked to household
-* ([#205](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/205)) Fix loading of accompanying period work referrers
-### Traduction francophone des principaux changements
-* export: ajout d'un regroupement "grouper les échanges par présence de l'usager";
-* export: ajout d'un filtre "filtre les échanges par présence de l'usager";
-* export: ajout d'un regroupement "regrouper les échanges par personne" (seulement pour les échanges enregistrés dans le contexte de l'usager);
-* export: ajout d'un regroupement "grouper les usagers par codes postaux"
-* export: séparation des exports sur les actions: dans l'un, les filtres des usagers portent sur les usagers concernés par l'action, dans l'autre, les filtres portent sur les usagers concernés par le parcours de l'action;
-* export: ajout de 3 nouveaux filtres et regroupements sur le créateur de l'action, son métier et son service;
-* export: correction de l'export sur les ménages liés aux parcours;
-* correction du chargement des actions d'accompagnement
-
-## v2.11.0 - 2023-11-07
-### Feature
-* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
-### Fixed
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
-* Fix "group activity by creator job" aggregator 
-
-## v2.10.6 - 2023-11-07
-### Fixed
-* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 
-
-## v2.10.5 - 2023-11-05
-### Fixed
-* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
-* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 
-
-## v2.10.4 - 2023-10-26
-### Fixed
-* Fix null value constraint errors when merging relationships in doubles 
-
-## v2.10.3 - 2023-10-26
-### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
-
-## v2.10.2 - 2023-10-26
-### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
-
-## v2.10.1 - 2023-10-24
-### Fixed
-* Fix export controller when generating an export without any data in session 
-
-## v2.10.0 - 2023-10-24
-### Feature
-* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] Add a filter "grouping accompanying period by opening date" and "grouping accompanying period by closing date"
-* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a filter and aggregator on accompanying period work: group/filter by handling third party
-* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a filter and aggregator on activites: group/filter activities by people participating to the activities
-* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a grouping on accompanying period export: group by activity type associated to at least one activity within the accompanying period
-* [export] sort filters and aggregators by title
-* ([#179](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/179)) [export] create a parameter that will force to skip the filtering by center (ACL) when generating an export
-### Fixed
-* ([#177](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/177)) [export] fix date range selection on filter and grouping "by status of the course at date", on accompanying periods
-
-### Résumé francophone des changements
-
-- Ajout d'un regroupement sur les parcours: par date de cloture et d'ouverture;
-- Ajouter d'un filtre et regroupement par tiers traitant sur les actions d'accompagnement;
-- ajout d'un filtre et regroupement par usager participant sur les échanges
-- ajout d'un regroupement: par type d'activité associé au parcours;
-- trie les filtre et regroupements par ordre alphabétique dans els exports
-- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
-- correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
-
-## v2.9.2 - 2023-10-17
-### Fixed
-* Fix possible null values in string's entities 
-
-## v2.9.1 - 2023-10-17
-### Fixed
-* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 
-
-## v2.9.0 - 2023-10-17
-### Feature
-* ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)) Add history to scopes and to jobs in administrator section. When user job or main scope of user is changed, automaticaly add a new row in history.
-* ([#146](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/146)) Allow closing motives to be identified as 'canceling the accompanying period' + don't take canceled accompanying periods into account
-* [export] add an aggregator for activities: group by job scope's creator aggregator
-* DX: prepare the code for the upgrade to symfony 5.4
-
-### Traductions francophones des principaux changements
-
-- ajout de l'historique des services et métiers pour les utilisateurs. Les exports, filtres et regroupements sont adaptés pour tenir compte du métier et du service
-  de l'utilisateur au moment de l'échange, de sa désignation comme agent traitant de l'échange ou du moment du rendez-vous ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)))
-- modification des motifs de cloture des parcours: ajout d'un chanmp "annule le parcours", qui permet d'indiquer que le motif "annule" le parcours. Les parcours annulés n'apparaissent
-  pas dans les statistiques
-- ajouter d'un regroupement pour les échanges: grouper par métier et service du créateur de l'échange
-
-
-### Possible BC break in configuration
-
-This release remove the use of deprecated package [symfony/templating](https://symfony.com/components/Templating).
-
-If you use this package in your own bundle (usually `src/` directory, or other dependencies), you should add this dependencies in your local composer.json (`composer require symfony/templating`).
-
-But if you do not need this any more, you must ensure that the configuration key `framework.templating` is removed. This is usually located into `config/packages/framework.yaml`. [See here an example](https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/commit/cc716beaecc239e6a189f3db62ea95f169a37505#diff-df607fe73ff82c569824a7392edf5e760e998efe)
-
-## v2.8.0 - 2023-10-05
-
-### Feature
-
-* ([#162](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/162)) Reassigning list: when reassigning courses to a new user, the job associated with the course become the one of the new user (if any)
-* Reassining list: the length of the list is increased to 100 courses
-
-### Fixed
-
-* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) Fix filter "accompanying course by social action" to avoid duplication in list
-* ([#164](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/164)) View a third party: avoid errors when a contact has a civility
-* ([#163](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/163)) Fix the filters and aggregators on exports "count peoples"
-* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) From the database, avoid the creation of location history for same period and at same dates
-
-### Traduction francophone des principaux changements
-
-- Fonctionnalité: Réassigner les parcours en lot: lorsque des parcours sont réassignés "en lot", les parcours sont maintenant associés au métier du nouveau référent;
-- Correction: certaines causes qui créaient des doublons dans les listes ont été corrigées;
-- Correction des associations entre l'export "nombre de personnes" et les filtres et regroupements associés
-
-## v2.7.0 - 2023-09-27
-### Feature
-* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
-### Fixed
-* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
-* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 
-
-## v2.6.3 - 2023-09-19
-### Fixed
-* Remove id property from document 
-mappedsuperclass 
-
-## v2.6.2 - 2023-09-18
-### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
-
-## v2.6.1 - 2023-09-14
-### Fixed
-* Filter out active centers in exports, which uses a different PickCenterType. 
-
-## v2.6.0 - 2023-09-14
-### Feature
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
-* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
-### Fixed
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
-* Missing translation in Work Actions exports 
-* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
-* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
-error when trying to reedit a saved export
-
- 
-* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
-* Add missing translation for comment field placeholder in repositionning household editor.
- 
-* Do not send an email to creator twice when adding a comment to a notification 
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
-### UX
-* Uniformize badge-person in household banner (background, size)
- 
-
-## v2.5.3 - 2023-07-20
-### Fixed
-* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 
-
-## v2.5.2 - 2023-07-15
-### Fixed
-* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead) 
-
-## v2.5.1 - 2023-07-14
-### Fixed
-* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 
-
-## v2.5.0 - 2023-07-14
-### Feature
-* Allow filtering on the basis of a user within general tasks lists
-* ([#120](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/120)) Adding OrderFilter to the list of social actions.
-* ([#125](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/125)) [export] Add a list for people with their associated course
-* [export] Add ordering by person's lastname or course opening date in list which concerns accompanying course or peoples
-* ([#128](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/128)) [Export] allow to group activities by localisation
-* ([#129](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/129)) [export] Add a filter "filter course having an activity between two dates"
-* ([#112](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/112)) [addresses] Add a cronjob to re-associate addresses with addresses reference every 6 hours
-* Improve filtering layout
-
-### Fixed
-* reimplement the visualization of all calculator results
-* ([#117](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/117)) Repair my unread notification list with actions and evaluations documents
-* ([#126](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/126)) Correct bug in thirdparty API search query: simplify address joins clause for child and parent kind
-
-### DX
-* Documentation for database principles
-* [cronjob] when a cronjob is executed, it may return an array of data that will be passed as argument on the next execution
-
-### UX
-* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Better integration of address details button: look, position, title tag
-* ([#93](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/93)) Show address detail button on person and household banners
-* Improve residential address position on show onthefly modale
-
-### Traduction francophone des principaux changements
-
-* Ajout d'un filtre "par utilisateur" aux pages de tâche
-* Filtre des actions d'accompagnement par date, type, intervenant
-* export: liste des usagers concernés avec détail de leurs parcours
-* export: ajout d'un regroupement des échanges par localisation
-* export: ajout d'un filtre "parcours ayant reçu un échange entre deux dates"
-* ajout d'une tâche cron pour associer les adresses à une adresse de référence
-* correction: réparation de la liste des notifications sur la page d'accueil, dans le cas où une notification concerne une action ou un document dans une évaluation
-* correction: réparation de la recherche des tiers ayant des codes postaux similaires entre les parents et enfants
-* meilleure intégration du bouton "détail d'une adresse": améliration de la taille et de la position
-* bouton permettant de visualiser les détails d'une adresse (modale avec carte) dans la bannière "Usager" et "Ménage"
-* amélioration de la modale permettant de voir les détails d'un usager: les adresses de résidence sont dans la continuité des autres adresses, et non plus dans une colonne séparée
-* améliore le design et l'expérience utilisateur des filtres
-
 ## v2.4.0 - 2023-07-07
 
 ### Feature

CONTRIBUTING.md

@@ -1,80 +0,0 @@
-# Contributing
-
-Chill is an open source, community-driven project.
-
-If you'd like to contribute, please read the following.
-
-## What can you do ?
-
-Chill is an open-source project driven by a community of developers, users and social workers. If you don't feel ready to contribute code or patches, reviewing issues and pull requests (PRs) can be a great start to get involved and give back. 
-
-If you don't have your own instance or don't want to use it, you can try to reproduce bugs using the instance https://demo.chill.social
-
-## Core team
-
-The core team is the group of developers that determine the direction and evolution of the Chill project. Their votes rule if the features and patches proposed by the community are approved or rejected.
-
-All the Chill Core members are long-time contributors with solid technical expertise and they have demonstrated a strong commitment to drive the project forward.
-
-The core team:
-
-- elects his own members;
-- merge pull requests;
-
-### members
-
-Project leader: [julienfastre](https://gitlab.com/julienfastre)
-
-Core members:
-
-- [tchama](https://gitlab.com/tchama)
-- [LenaertsJ](https://gitlab.com/LenaertsJ)
-- [nobohan](https://gitlab.com/nobohan)
-
-### Becoming a project member
-
-About once a year, the core team discusses the opportunity to invite new members. To become a core team member, you must:
-
-- take part on the development for at least 6 month: propose multiple merge requests and participate to the peer review process;
-- through this participation, demonstrate your technical skills and your knowledge of the software and any of their dependencies;
-
-### Core Membership Revocation
-
-A Chill Core membership can be revoked for any of the following reasons:
-
-- Refusal to follow the rules and policies stated in this document;
-- Lack of activity for the past six months;
-- Willful negligence or intent to harm the Chill project;
-
-The decision is taken by the majority of project members.
-
-## Code development rules
-
-### Merge requests
-
-Every merge request must contains:
-
-- one more entries suitable for generating a changelog. This is done using the [changie utility](https://changie.dev);
-- a comprehensible description of the changes;
-- if applicable, automated tests should be adapted or created;
-- the code style must pass the project's rules, and non phpstan errors must be raised nor rector refactoring suggestion.
-
-The pipelines must pass.
-
-In case of emergency, some rules may be temporarily ignored.
-
-### Merge Request Voting Policy
-
-- -1 votes must always be justified by technical and objective reasons;
-- +1 (technically: approbation on the merge request) votes do not require justification, unless there is at least one -1 vote;
-- Core members can change their votes as many times as they desire during the course of a merge request discussion;
-- Core members are not allowed to vote on their own merge requests.
-
-### Merge Request Merging Process
-
-All code must be committed to the repository through merge requests, except for minor changes which can be committed directly to the repository.
-
-### Release Policy
-
-The Core members are also the release manager for every Chill version.
-

MIGRATION.md

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

composer.json

@@ -8,17 +8,18 @@
         "social worker"
     ],
     "require": {
-        "php": "^8.2",
-        "ext-dom": "*",
+        "php": "^7.4|^8.2",
         "ext-json": "*",
         "ext-openssl": "*",
         "ext-redis": "*",
+        "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
         "champs-libres/wopi-bundle": "dev-master@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/doctrine-bundle": "^2.1",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.13.0",
         "erusev/parsedown": "^1.7",
+        "graylog2/gelf-php": "^1.5",
         "knplabs/knp-menu-bundle": "^3.0",
         "knplabs/knp-time-bundle": "^1.12",
         "knpuniversity/oauth2-client-bundle": "^2.10",
@@ -31,49 +32,29 @@
         "phpoffice/phpspreadsheet": "^1.16",
         "ramsey/uuid-doctrine": "^1.7",
         "sensio/framework-extra-bundle": "^5.5",
-        "smalot/pdfparser": "^2.10",
         "spomky-labs/base64url": "^2.0",
-        "symfony/asset": "^5.4",
-        "symfony/browser-kit": "^5.4",
-        "symfony/cache": "^5.4",
+        "symfony/browser-kit": "^4.4",
         "symfony/clock": "^6.2",
-        "symfony/config": "^5.4",
-        "symfony/console": "^5.4",
-        "symfony/css-selector": "^5.4",
-        "symfony/dom-crawler": "^5.4",
-        "symfony/error-handler": "^5.4",
-        "symfony/event-dispatcher": "^5.4",
-        "symfony/expression-language": "^5.4",
-        "symfony/filesystem": "^5.4",
-        "symfony/finder": "^5.4",
-        "symfony/form": "^5.4",
-        "symfony/framework-bundle": "^5.4",
-        "symfony/http-client": "^5.4",
-        "symfony/http-foundation": "^5.4",
-        "symfony/intl": "^5.4",
+        "symfony/css-selector": "^4.4",
+        "symfony/expression-language": "^4.4",
+        "symfony/form": "^4.4",
+        "symfony/framework-bundle": "^4.4",
+        "symfony/http-client": "^4.4 || ^5",
+        "symfony/http-foundation": "^4.4",
+        "symfony/intl": "^4.4",
         "symfony/mailer": "^5.4",
         "symfony/messenger": "^5.4",
         "symfony/mime": "^5.4",
         "symfony/monolog-bundle": "^3.5",
-        "symfony/options-resolver": "^5.4",
-        "symfony/process": "^5.4",
-        "symfony/property-access": "^5.4",
-        "symfony/property-info": "^5.4",
-        "symfony/routing": "^5.4",
-        "symfony/security-bundle": "^5.4",
-        "symfony/security-core": "^5.4",
-        "symfony/security-csrf": "^5.4",
-        "symfony/security-guard": "^5.4",
-        "symfony/security-http": "^5.4",
-        "symfony/serializer": "^5.4",
-        "symfony/string": "^5.4",
-        "symfony/templating": "^5.4",
-        "symfony/translation": "^5.4",
-        "symfony/twig-bundle": "^5.4",
-        "symfony/validator": "^5.4",
+        "symfony/security-bundle": "^4.4",
+        "symfony/serializer": "^5.3",
+        "symfony/templating": "^4.4",
+        "symfony/translation": "^4.4",
+        "symfony/twig-bundle": "^4.4",
+        "symfony/validator": "^4.4",
         "symfony/webpack-encore-bundle": "^1.11",
-        "symfony/workflow": "^5.4",
-        "symfony/yaml": "^5.4",
+        "symfony/workflow": "^4.4",
+        "symfony/yaml": "^4.4",
         "thenetworg/oauth2-azure": "^2.0",
         "twig/extra-bundle": "^3.0",
         "twig/intl-extra": "^3.0",
@@ -92,15 +73,17 @@
         "phpstan/phpstan": "^1.9",
         "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^10.5.24",
-        "rector/rector": "^1.1.0",
-        "symfony/debug-bundle": "^5.4",
-        "symfony/dotenv": "^5.4",
+        "phpunit/phpunit": ">= 7.5",
+        "psalm/plugin-phpunit": "^0.18.4",
+        "psalm/plugin-symfony": "^4.0.2",
+        "rector/rector": "^0.15.23",
+        "symfony/debug-bundle": "^5.1",
+        "symfony/dotenv": "^4.4",
         "symfony/maker-bundle": "^1.20",
-        "symfony/phpunit-bridge": "^7.1",
-        "symfony/runtime": "^5.4",
-        "symfony/stopwatch": "^5.4",
-        "symfony/var-dumper": "^5.4"
+        "symfony/phpunit-bridge": "^4.4",
+        "symfony/stopwatch": "^4.4",
+        "symfony/var-dumper": "^4.4",
+        "vimeo/psalm": "^4.30.0"
     },
     "conflict": {
         "symfony/symfony": "*"
@@ -115,6 +98,7 @@
             "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
             "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
+            "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle",
             "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
@@ -126,7 +110,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\": "tests/",
+            "App\\": "tests/app/src/",
             "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
             "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
             "Chill\\Utils\\Rector\\Tests\\": "utils/rector/tests"
@@ -139,17 +123,17 @@
             "ocramius/package-versions": true,
             "phpro/grumphp": true,
             "phpstan/extension-installer": true,
-            "roave/you-are-using-it-wrong": true,
-            "symfony/runtime": true
+            "roave/you-are-using-it-wrong": true
         },
         "bin-dir": "bin",
         "optimize-autoloader": true,
-        "sort-packages": true
+        "sort-packages": true,
+        "vendor-dir": "tests/app/vendor"
     },
     "scripts": {
         "auto-scripts": {
+            "assets:install %PUBLIC_DIR%": "symfony-cmd",
             "cache:clear": "symfony-cmd"
-        },
-        "php-cs-fixer": "php-cs-fixer fix --config=./.php-cs-fixer.dist.php --show-progress=none"
+        }
     }
 }

docs/README.md

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

docs/requirements.txt

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

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

@@ -54,9 +54,18 @@ class CountPerson implements ExportInterface
     public function getLabels($key, array $values, $data)
     {
         // the Closure which will be executed by the formatter.
-        return fn($value) => match ($value) {
-            '_header' => $this->getTitle(),
-            default => $value,
+        return function ($value) {
+            switch ($value) {
+                case '_header':
+                    // we have to process specifically the '_header' string,
+                    // which will be used by the formatter to show a column title
+                    return $this->getTitle();
+
+                default:
+                    // for all value, we do not process them and return them
+                    // immediatly
+                    return $value;
+            }
         };
     }
 
@@ -85,7 +94,7 @@ class CountPerson implements ExportInterface
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         // we gather all center the user choose.
-        $centers = array_map(static fn ($el) => $el['center'], $acl);
+        $centers = array_map(static fn($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 

docs/source/development/FAQ.rst

@@ -1,36 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled "GNU
-Free Documentation License".
-
-.. _faq:
-
-
-Frequently asked questions
-####################
-
-Continuous integration
-***********
-
-Pipeline fails, but php-cs-fixer doesn't alert me when running it locally ?
-========================================
-
-It is possible that you run php-cs-fixer on your local instance of chill and no fixes are made.
-Everything seems fine, so you push. However once the pipeline is run in gitlab, you're notified that it failed due to php
-cs errors.
-
-In this case it's likely that you have to update your version of php-cs-fixer.
-php-cs-fixer is installed when building the docker image: https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/src/branch/main/Dockerfile#L50
-
-Consequently, to update php-cs-fixer we have to update the image by building it again.
-
-For this the following commands can be used,
-
-.. code-block:: php
-
-    docker compose build --pull php
-    # replace existing containers
-    docker compose up -d --force-recreate php

docs/source/development/database-principles.rst

@@ -1,84 +0,0 @@
-
-.. database-principles:
-
-Principes de la base de données
-###############################
-
-Cette page donne une compréhension globale de la base de donnée de Chill, et explique quelques détails d'implémentations qui permettent d'accélérer les traitements à partir de la base de donnée, ou de l'exploiter plus aisément.
-
-Cette page est rédigée en français.
-
-.. note::
-
-    La stabilité du schéma de la base de donnée n'est pas garantie.
-
-    Toutefois, ce dernier évolue relativement peu. Il est rare que des tables ou des colonnes soient supprimées ou renommées. Mais il n'est pas garanti que cela puisse arriver.
-
-Généralités
-===========
-
-Une liste commentée de toutes les tables :download:`est disponible au format CSV <./database/table_list.csv`.
-
-Schéma et conventions de nommage
---------------------------------
-
-Au début de l'histoire de Chill, les schémas postgresql n'étaient pas exploités. Les données étaient stockées dans le schéma :code:`public`.
-
-Par la suite, des nouveaux bundles sont apparus, et les tables ont été classées dans des schémas dédiés.
-
-A l'heure actuelle:
-
-- pour les anciens bundle, ceux qui ont déjà des tables dans le schéma public, les nouvelles tables sont ajoutées à ce schéma. Elles sont préfixées par :code:`chill_<nom du bundle>_`;
-- pour les bundles plus récents, les tables sont créées dans le schéma dédié
-
-Données avec de l'historicité
------------------------------
-
-Certaines données sont historisées:
-
-- les référents d'un parcours;
-- les statuts d'un parcours;
-- la liaison entre les centres et les usagers;
-- etc.
-
-Dans ces cas-là, Chill crée généralement deux colonnes, qui sont habituellement nommées :code:`startDate` et :code:`endDate`. Lorsque la colonne :code:`endDate` est à :code:`NULL`, cela signifie que la période n'est pas "fermée". La colonne :code:`startDate` n'est pas nullable.
-
-Dans certains cas, la donnée actuelle (référent d'un parcours, par exemple) est également répétée au niveau de la table en elle-même. Par exemple, la table des parcours :code:`chill_person_accompanying_period` comporte une colonne :code:`step` (le statut du parcours) et :code:`user_id` (id du référent) en plus de l'historique. Bien que redondant, cela simplifie les traitements.
-
-Relations particulières
-=======================
-
-Usagers, ménages, adresses
---------------------------
-
-Les usagers ont une adresse au travers des ménages: dans l'interface, l'adresse est inscrite dans le dossier du ménage, et elle est "donnée" aux usagers membres du ménage, **et** qui partagent l'adresse de ce ménage. En effet, il est possible que des usagers "appartiennent" à un ménage sans y être domicilié: c'est le cas, par exemple, des enfants en garde alternée.
-
-L'historique de l'appartenance des usagers au ménage est conservée, de même que l'historique des adresses pour un même ménage.
-
-Les tables en jeu sont les suivantes:
-
-- la table :code:`chill_person_person` liste les usagers;
-- la table :code:`chill_person_household_members` liste les appartenances au ménage: il s'agit de la jointure entre les usagers et les ménages:
-  - les colonnes :code:`startDate` et :code:`endDate` indiquent la date de début et la date de fin de l'appartenance;
-  - la colonne :code:`shareHousehold` indique si l'utilisateur partage l'adresse du ménage (si oui, sa valeur est :code:`TRUE`)
-- la table :code:`chill_person_household` liste les ménages
-- la table :code:`chill_person_household_to_addresses` associe les ménages aux adresses;
-- la table :code:`chill_main_address` contient les adresses, en indiquant la date de début de validité (:code:`validFrom`) et la fin de validité (:code:`validTo`).
-
-Pour simplifier la résolution des adresses et des usagers, deux vues ont été mises en œuvre:
-
-- la vue :code:`view_chill_person_household_address` reprend, pour chaque usager, l'historique des appartenances au ménage découpée par l'historique des adresses d'un ménage.
-  Autrement dit, une ligne est créée à chaque fois qu'un usager change de ménage, ou qu'un ménage change d'adresse. Il est donc possible de retrouver l'historique complet des adresses pour un usager donné via cette table.
-- la vue :code:`view_chill_person_current_address` reprend l'adresse actuelle des usagers.
-
-Adresses et unités géographiques
---------------------------------
-
-Chill propose des statistiques sur la localisation des adresses par rapport à des zones géographiques (:code:`chill_main_geographical_unit`).
-
-Comme la résolution géographique des adresses est coûteuse en CPU et en temps de traitement, une vue matérialisée a été créée: :code:`view_chill_main_address_geographical_unit`. Elle est rafraichie quotidiennement dans la base de donnée de production.
-
-Liste des tables et commentaires
-================================
-
-Une liste commentée de toutes les tables :download:`est disponible au format CSV <./database/table_list.csv`.

docs/source/development/database/table_list.csv

@@ -1,155 +0,0 @@
-order,table_schema,table_name,commentaire
-1,chill_3party,party_category,Catégorie de tiers
-2,chill_3party,party_center,Association entre les tiers et les centres (déprécié)
-3,chill_3party,party_profession,Profession du tiers (déprécié)
-4,chill_3party,third_party,Tiers
-5,chill_3party,thirdparty_category,association tiers - catégories
-6,chill_asideactivity,asideactivity,Activités annexes
-7,chill_asideactivity,asideactivitycategory,Catégories d'activités annexes
-8,chill_budget,charge,Charges du budget
-9,chill_budget,charge_type,Types de charges
-10,chill_budget,resource,Ressources du budget
-11,chill_budget,resource_type,Types de ressources
-12,chill_calendar,calendar,Rendez-vous
-13,chill_calendar,calendar_doc,Document du rendez-vous
-14,chill_calendar,calendar_range,Plage de disponibilité
-15,chill_calendar,calendar_to_persons,association rendez-vous - usagers
-16,chill_calendar,calendar_to_thirdparties,association rendez-vous - tiers
-17,chill_calendar,cancel_reason,Motifs d'annulations
-18,chill_calendar,invite,Invitation aux rendez-vous
-19,chill_doc,accompanyingcourse_document,Documents associés aux parcours
-20,chill_doc,document_category,Catégories de documents
-21,chill_doc,person_document,Documents associés à l'usagers
-22,chill_doc,stored_object,Documents
-23,chill_task,recurring_task,Tâches récurrentes (non utilisé)
-24,chill_task,single_task,Tâches
-25,chill_task,single_task_place_event,Historique des transitions des tâches
-26,chill_vendee,adressederelais,
-27,chill_vendee,center_polygon
-28,chill_vendee,entourage,
-29,chill_vendee,geographical_unit
-30,chill_vendee,geographical_unit_association
-31,chill_vendee,mobilite
-32,chill_vendee,niveauetude
-33,chill_vendee,security_profile
-34,chill_vendee,security_profile_action
-35,chill_vendee,security_profile_jobs
-36,chill_vendee,situationprofessionelle
-37,chill_vendee,statutlogement
-38,chill_vendee,tempsdetravail
-39,chill_vendee,titredesejour
-40,chill_vendee,vendee_person
-41,chill_vendee,vendee_person_mineur
-42,chill_vendee,vendeeperson_entourage
-43,chill_vendee,vendeepersonmineur_adressederelais
-44,public,accompanying_periods_scopes,Services associés aux parcours
-45,public,activity,Échanges
-46,public,activity_activityreason,s
-47,public,activity_person,
-48,public,activity_storedobject,
-49,public,activity_thirdparty,
-50,public,activity_user,
-51,public,activityreason,Sujets d'échange
-52,public,activityreasoncategory,Catégories de sujets
-53,public,activitytpresence,Présence aux échanges
-54,public,activitytype,Types d'échanges
-55,public,activitytypecategory,Catégories de types d'échanges
-56,public,centers,"Centres (territoires, agences, etc.)"
-57,public,chill_activity_activity_chill_person_socialaction,
-58,public,chill_activity_activity_chill_person_socialissue
-59,public,chill_docgen_template,Gabarits de documents
-60,public,chill_main_address,Adresses
-61,public,chill_main_address_legacy,Anciennes adresses (dépréciés)
-62,public,chill_main_address_reference,Adresses de référence
-63,public,chill_main_civility,Civilités
-64,public,chill_main_cronjob_execution,Dernière exécution des tâche cron
-65,public,chill_main_geographical_unit,Unités géographiques
-66,public,chill_main_geographical_unit_layer,Couches d'unités géographiques
-67,public,chill_main_location,Localisations
-68,public,chill_main_location_type,Types de localisations
-69,public,chill_main_notification,Notifications
-70,public,chill_main_notification_addresses_unread
-71,public,chill_main_notification_addresses_user
-72,public,chill_main_notification_comment,
-73,public,chill_main_postal_code,Code postaux
-74,public,chill_main_saved_export,Exports enregistrés
-75,public,chill_main_user_job,Métiers
-76,public,chill_main_workflow_entity,Workflows
-77,public,chill_main_workflow_entity_comment
-78,public,chill_main_workflow_entity_step,Etapes du workflow
-79,public,chill_main_workflow_entity_step_cc_user,
-80,public,chill_main_workflow_entity_step_user
-81,public,chill_main_workflow_entity_step_user_by_accesskey,
-82,public,chill_main_workflow_entity_subscriber_to_final,
-83,public,chill_main_workflow_entity_subscriber_to_step
-84,public,chill_person_accompanying_period,Parcours d'accompagnement
-85,public,chill_person_accompanying_period_closingmotive,Motifs de cloture des parcours
-86,public,chill_person_accompanying_period_comment,Commentaires des parcours
-87,public,chill_person_accompanying_period_location_history,Historique de la localisatio ndes parcours
-88,public,chill_person_accompanying_period_origin,Origine des parcours
-89,public,chill_person_accompanying_period_participation,Appartenance des usagers au parcours
-90,public,chill_person_accompanying_period_resource,Personnes ressources d'un parcours
-91,public,chill_person_accompanying_period_social_issues,
-92,public,chill_person_accompanying_period_step_history
-93,public,chill_person_accompanying_period_user_history
-94,public,chill_person_accompanying_period_work,Actions d'accompagnements
-95,public,chill_person_accompanying_period_work_evaluation,Évaluations (dans les actions d'accompagnements)
-96,public,chill_person_accompanying_period_work_evaluation_document,Documents des évaluations
-97,public,chill_person_accompanying_period_work_goal,Objectifs d'une actions
-98,public,chill_person_accompanying_period_work_goal_result,Objectifs et résultats d'une action
-99,public,chill_person_accompanying_period_work_person,Usagers associés à une actions
-100,public,chill_person_accompanying_period_work_referrer,Référents d'une actions
-101,public,chill_person_accompanying_period_work_result,Résultats d'une action
-102,public,chill_person_accompanying_period_work_third_party,Tiers traitants d'une action
-103,public,chill_person_alt_name,"Noms supplémentaires d'un usager (nom marital, etc.)"
-104,public,chill_person_household,Ménages
-105,public,chill_person_household_composition,
-106,public,chill_person_household_composition_type,Types de composition de ménage
-107,public,chill_person_household_members,Membres du ménages
-108,public,chill_person_household_position,Positions dans le ménage
-109,public,chill_person_household_to_addresses,Association adresses - ménages
-110,public,chill_person_marital_status,Etats civils
-111,public,chill_person_not_duplicate,
-112,public,chill_person_person,Usagers
-113,public,chill_person_person_center_history,Historique des centres d'un usagers
-114,public,chill_person_persons_to_addresses,Déprécié
-115,public,chill_person_phone,Numéros d etéléphone supplémentaires d'un usager
-116,public,chill_person_relations,Types de relations de filiation
-117,public,chill_person_relationships,Relations de filiations
-118,public,chill_person_residential_address,Adresses de résidences
-119,public,chill_person_resource,Personnes ressources (pour les personnes)
-120,public,chill_person_resource_kind,Type de personnes ressources
-121,public,chill_person_social_action,Liste des actions d'accompagnement
-122,public,chill_person_social_action_goal,Objectifs associés à une action
-123,public,chill_person_social_action_result,Résultats associés à une action
-124,public,chill_person_social_issue,Problématiques sociales
-125,public,chill_person_social_work_evaluation,Evaluations disponibles
-126,public,chill_person_social_work_evaluation_action,Associations entre les évaluations et les actions
-127,public,chill_person_social_work_goal,Objectifs disponibles pour une actions
-128,public,chill_person_social_work_goal_result,Objectifs et résultats disponible pour une action
-129,public,chill_person_social_work_result,Résultats disponibles pour une action
-130,public,country,Pays
-131,public,custom_field_long_choice_options,
-132,public,customfield
-133,public,customfieldsdefaultgroup
-134,public,customfieldsgroup
-135,public,geography_columns,Table liée à postgis
-136,public,geometry_columns,Table liée à postgis
-137,public,group_centers,
-138,public,language,Langues
-139,public,messenger_messages,Table système
-140,public,migration_versions,Table système
-141,public,permission_groups
-142,public,permissionsgroup_rolescope
-143,public,persons_spoken_languages
-144,public,regroupment,Regroupement de centres
-145,public,regroupment_center,
-146,public,role_scopes,
-147,public,scopes,Services
-148,public,spatial_ref_sys,Table système (postgis)
-149,public,user_groupcenter,
-150,public,users,Utilisateurs
-151,public,view_chill_person_accompanying_period_info,
-152,public,view_chill_person_current_address
-153,public,view_chill_person_household_address
-154,public,view_chill_person_person_center_history_current

docs/source/development/exports.rst

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

docs/source/development/index.rst

@@ -9,7 +9,7 @@
 Development
 ###########
 
-As Chill relies on the `symfony <http://symfony.com>`_ framework, reading the framework's documentation should answer most of your questions. We are explaining here some tips to work with Chill, and help with things we've encountered.
+As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the framework's documentation should answer most of your questions. We are explaining here some tips to work with Chill, and things we provide to encounter our needs.
 
 .. toctree::
     :maxdepth: 2
@@ -36,8 +36,6 @@ As Chill relies on the `symfony <http://symfony.com>`_ framework, reading the fr
     Assets <assets.rst>
     Cron Jobs <cronjob.rst>
     Info about entities <entity-info.rst>
-    Info about database (in French) <database-principles.rst>
-    Developer FAQ <FAQ.rst>
 
 Layout and UI
 **************

docs/source/development/pagination/example.php

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

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

@@ -16,11 +16,8 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Security\Core\Role\Role;
 
-class ConsultationController extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
+class ConsultationController extends Controller
 {
-    public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry)
-    {
-    }
     /**
      * @param int $id personId
      *
@@ -46,12 +43,12 @@ class ConsultationController extends \Symfony\Bundle\FrameworkBundle\Controller\
 
         $circles = $authorizationHelper->getReachableCircles(
             $this->getUser(),
-            ConsultationVoter::SEE,
+            new Role(ConsultationVoter::SEE),
             $person->getCenter()
         );
 
         // create a query which take circles into account
-        $consultations = $this->managerRegistry->getManager()
+        $consultations = $this->getDoctrine()->getManager()
             ->createQuery('SELECT c FROM ChillHealthBundle:Consultation c '
                 . 'WHERE c.patient = :person AND c.circle IN(:circles) '
                 . 'ORDER BY c.date DESC')

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

@@ -23,18 +23,25 @@ class ChillMainConfiguration implements ConfigurationInterface
 {
     use AddWidgetConfigurationTrait;
 
+    /**
+     * @var ContainerBuilder
+     */
+    private $containerBuilder;
+
     public function __construct(
         array $widgetFactories,
-        private readonly ContainerBuilder $containerBuilder
+        ContainerBuilder $containerBuilder
     ) {
         // we register here widget factories (see below)
         $this->setWidgetFactories($widgetFactories);
+        // we will need the container builder later...
+        $this->containerBuilder = $containerBuilder;
     }
 
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder('chill_main');
-        $rootNode = $treeBuilder->getRootNode();
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('chill_main');
 
         $rootNode
             ->children()
@@ -49,7 +56,7 @@ class ChillMainConfiguration implements ConfigurationInterface
             ->end() // end of widgets
             ->end() // end of root/children
             ->end() // end of root
-        ;
+;
 
         return $treeBuilder;
     }

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

@@ -87,7 +87,7 @@ class ChillPersonAddAPersonWidget implements WidgetInterface
         // show only the person from the authorized centers
         $and = $qb->expr()->andX();
         $centers = $this->authorizationHelper
-            ->getReachableCenters($this->getUser(), PersonVoter::SEE);
+            ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
         $and->add($qb->expr()->in('person.center', ':centers'));
         $qb->setParameter('centers', $centers);
 

docs/source/installation/index.rst

@@ -14,358 +14,6 @@
 Installation & Usage
 ####################
 
-
-You will learn here how to install a new symfony project with chill, and configure it.
-
-Requirements
-============
-
-The installation is tested on a Debian-like linux distribution. The installation on other operating systems is not documented.
-
-You have to install the following tools on your computer:
-
-- `PHP <https://www.php.net/>`_, version 8.3+, with the following extensions: pdo_pgsql, intl, mbstring, zip, bcmath, exif, sockets, redis, ast, gd;
-- `composer <https://getcomposer.org/>`_;
-- `symfony cli <https://symfony.com/download>`_;
-- `node, we encourage you to use nvm to configure the correct version <https://github.com/nvm-sh/nvm>`_. The project contains an
-  :code:`.nvmrc` file which selects automatically the required version of node (if present).
-- `yarn <https://classic.yarnpkg.com/lang/en/docs/install/>`_. We use the version 1.22+ for now.
-- `docker and the plugin compose <https://docker.com>`_ to run the database
-
-Chill needs a redis server and a postgresql database, and a few other things like a "relatorio service" which will
-generate documents from templates. **All these things are available through docker using the plugin compose**. We do not provide
-information on how to run this without docker compose.
-
-
-Install a new project
-=====================
-
-Initialize project and dependencies
-***********************************
-
-.. code-block:: bash
-
-   symfony new --version=5.4 my_chill_project
-   cd my_chill_project
-
-We strongly encourage you to initialize a git repository at this step, to track further changes.
-
-.. code-block:: bash
-
-   # add the flex endpoints required for custom recipes
-   cat <<< "$(jq '.extra.symfony += {"endpoint": ["flex://defaults", "https://gitlab.com/api/v4/projects/57371968/repository/files/index.json/raw?ref=main"]}' composer.json)" > composer.json
-   # install chill and some dependencies
-   # TODO fix the suffix "alpha1" and replace by ^3.0.0 when version 3.0.0 will be released
-   symfony composer require chill-project/chill-bundles v3.0.0-alpha1 champs-libres/wopi-lib dev-master@dev champs-libres/wopi-bundle dev-master@dev
-
-We encourage you to accept the inclusion of the "Docker configuration from recipes": this is the documented way to run the database.
-You must also accept to configure recipes from the contrib repository, unless you want to configure the bundles manually).
-
-.. code-block:: bash
-
-   # fix some configuration
-   ./post-install-chill.sh
-   # install node dependencies
-   yarn install
-   # and compile assets
-   yarn run encore production
-
-.. note::
-
-   If you encounter this error during assets compilation (:code:`yarn run encore production`) (repeated multiple times):
-
-   .. code-block:: txt
-
-      [tsl] ERROR in /tmp/chill/v1/public/bundles/chillcalendar/types.ts(2,65)
-            TS2307: Cannot find module '../../../ChillMainBundle/Resources/public/types' or its corresponding type declarations.
-
-   run:
-
-   .. code-block:: bash
-
-      rm -rf public/bundles/*
-
-   Then restart the compilation of assets (:code:```yarn run encore production```)
-
-Configure your project
-**********************
-
-You should read the configuration files in :code:`chill/config/packages` carefully, especially if you have
-custom developments. But most of the time, this should be fine.
-
-You have to configure some local variables, which are described in the :code:`.env` file. The secrets should not be stored
-in this :code:`.env` file, but instead using the `secrets management tool <https://symfony.com/doc/current/configuration/secrets.html>`_
-or in the :code:`.env.local` file, which should not be committed to the git repository.
-
-You do not need to set variables for the smtp server, redis server and relatorio server, as they are generated automatically
-by the symfony server, from the docker compose services.
-
-The only required variable is the :code:`ADMIN_PASSWORD`. You can generate a hashed and salted admin password using the command
-:code:`symfony console security:hash-password <your password> 'Symfony\Component\Security\Core\User\User'`. Then,
-you can either:
-
-- add this password to the :code:`.env.local` file, you must escape the character :code:`$`: if the generated password
-  is :code:`$2y$13$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm`, your :code:`.env.local` file will be:
-
-  .. code-block:: env
-
-     ADMIN_PASSWORD=\$2y\$13\$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm
-
-- add the generated password to the secrets manager (**note**: you must add the generated hashed password to the secrets env,
-  not the password in clear text).
-
-- set up the jwt authentication bundle
-
-Some environment variables are available for the JWT authentication bundle in the :code:`.env` file. You must also run the command
-:code:`symfony console lexik:jwt:generate-keypair` to generate some keys that will be stored in the paths set up in the :code:`JWT_SECRET_KEY`
-and the :code:`JWT_PUBLIC_KEY` env variables. This is only required for using the stored documents in Chill.
-
-Prepare migrations and other tools
-**********************************
-
-To continue the installation process, you will have to run migrations:
-
-.. code-block:: bash
-
-   # start databases and other services
-   docker compose up -d
-   # the first start, it may last some seconds, you can check with docker compose ps
-   # run migrations
-   symfony console doctrine:migrations:migrate
-   # setup messenger
-   symfony console messenger:setup-transports
-   # prepare some views
-   symfony console chill:db:sync-views
-
-.. warning::
-
-   If you encounter an error while running :code:`symfony console messenger:setup-transports`, you can set up the messenger
-   transport to redis, by adding this in the :code:`.env.local` or :code:`.env` file:
-
-   .. code-block:: env
-
-      MESSENGER_TRANSPORT_DSN=redis://${REDIS_HOST}:${REDIS_PORT}/messages
-
-Start your web server locally
-*****************************
-
-At this step, Chill will be ready to be served locally, but without any configuration. You can run the project
-locally using the `local symfony server <https://symfony.com/doc/current/setup/symfony_server.html>`_:
-
-.. code-block:: bash
-
-   # see the whole possibilities at https://symfony.com/doc/current/setup/symfony_server.html
-   symfony server:start -d
-
-
-If you need to test the instance with accounts and some basic configuration, please install the fixtures (see below).
-
-
-Add capabilities for dev
-========================
-
-If you need to add custom bundles, you can develop them in the `src/` directory, like for any other symfony project. You
-can rely on the whole chill framework, meaning there is no need to add them to the original `chill-bundles`.
-
-You will require some bundles to have the following development tools:
-
-- add fixtures
-- add profiler and debug bundle
-
-Install fixtures
-****************
-
-.. code-block:: bash
-
-   # generate fixtures for chill
-   symfony composer require --dev doctrine/doctrine-fixtures-bundle nelmio/alice
-   # now, you can generate fixtures (this will reset your database)
-   symfony console doctrine:fixtures:load
-
-This will generate user accounts, centers, and some basic configuration.
-
-The accounts created are: :code:`center a_social`, :code:`center b_social`, :code:`center a_direction`, ...  The full list is
-visible in the "users" table: :code:`docker compose exec database psql -U app -c "SELECT username FROM users"`.
-
-The password is always :code:`password`.
-
-.. warning::
-
-   The fixtures are not fully functional. See the `corresponding issue <https://gitlab.com/Chill-Projet/chill-bundles/-/issues/280>`_.
-
-Add web profiler and debugger
-*****************************
-
-.. code-block:: bash
-
-   symfony composer require --dev symfony/web-profiler-bundle symfony/debug-bundle
-
-Working on chill bundles
-************************
-
-If you plan to improve the chill-bundles repository, that's great!
-
-You will have to download chill-bundles as a git repository (and not as an archive, which is barely editable).
-
-In your :code:`composer.json` file, add these lines:
-
-.. code-block:: diff
-
-    {
-        "config": {
-   +        "preferred-install": {
-   +            "chill-project/chill-bundles": "source",
-                "*": "dist"
-   +         }
-        }
-
-Then, run :code:`symfony composer reinstall chill-project/chill-bundles` to re-install the package from source.
-
-Code style, code quality and other tools
-****************************************
-
-For development, you will also have to install:
-
-- `php-cs-fixer <https://cs.symfony.com/>`_
-
-We also encourage you to use tools like `phpstan <https://phpstan.org>`_ and `rector <https://getrector.com>`_.
-
-Commit and share your project
-=============================
-
-If multiple developers work on a project, you can commit your symfony project and share it with other people.
-
-When another developer clones your project, they will have to:
-
-- run :code:`symfony composer install` and :code:`yarn install` to install the same dependencies as the initial developer;
-- run :code:`yarn run encore production` to compile assets;
-- copy any possible variables from the :code:`.env.local` files;
-- start the docker compose stack, using :code:`docker compose`, and run migrations, set up transports, and prepare chill db views
-  (see the corresponding command above)
-
-Update
-======
-
-In order to update your app, you must update dependencies:
-
-- for chill-bundles, you can `set the last version <https://gitlab.com/Chill-Projet/chill-bundles/-/releases>`_ manually
-  in the :code:`composer.json` file, or set the version to `^3.0.0` and run :code:`symfony composer update` regularly
-- run :code:`composer update` and :code:`yarn update` to maintain your dependencies up-to-date.
-
-After each update, you must update your database schema:
-
-.. code-block:: bash
-
-   symfony console doctrine:migrations:migrate
-   symfony console chill:db:sync-views
-
-Operations
-==========
-
-Build assets
-************
-
-run those commands:
-
-.. code-block:: bash
-
-   # for production (or in dev, when you don't need to work on your assets and need some speed)
-   yarn run encore production
-   # in dev, when you wan't to reload the assets on each changes
-   yarn run encore dev --watch
-
-How to execute the console ?
-****************************
-
-.. code-block:: bash
-
-   # start the console with all required variables
-   symfony console
-   # you can add your command after that:
-   symfony console list
-
-How to generate documents
-*************************
-
-Documents are generated asynchronously by `"consuming messages" <https://symfony.com/doc/current/messenger.html#consuming-messages-running-the-worker>`_.
-
-You must generate them using a dedicated process:
-
-.. code-block:: bash
-
-   symfony console messenger:consume async priority
-
-To avoid memory issues, we encourage you to also use the :code:`--limit` parameter of the command.
-
-How to read emails sent by the program ?
-*******************************************
-
-In development, there is a built-in "mail catcher". Open it with :code:`symfony open:local:webmail`
-
-How to run cron-jobs ?
-**********************
-
-Some commands must be executed in :ref:`cron jobs <cronjob>`. To execute them:
-
-.. code-block:: bash
-
-   symfony console chill:cron-job:execute
-
-What about materialized views ?
-*******************************
-
-There are some materialized views in chill, to speed up some complex computations in the database.
-
-In order to refresh them, run a cron job or refresh them manually in your database.
-
-How to run tests for chill-bundles
-**********************************
-
-Tests reside inside the installed bundles. You must `cd` into that directory, download the required packages, and execute them from this place.
-
-**Note**: some bundles require the fixtures to be executed. See the dedicated _how-tos_.
-
-Example, for running a unit test inside `main` bundle:
-
-.. code-block:: bash
-
-   # cd into main directory
-   cd vendor/chill-project/chill-bundles
-   composer install
-   # run tests
-   bin/phpunit src/Bundle/path/to/your/test
-
-Or for running tests to check code style and php conventions with csfixer and phpstan:
-
-Troubleshooting
-===============
-
-Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
-********************************************************************************************************************************************************************
-
-Build assets, see above.
-
-Running in production
-=====================
-
-Currently, to run this software in production, the *state of the art* is the following :
-
-1. Run the software locally and tweak the configuration to your needs ;
-2. Build the image and store it in a private container registry.
-
-.. warning::
-
-   In production, you **must** set these variables:
-
-   * ``APP_ENV`` to ``prod``
-   * ``APP_DEBUG`` to ``false``
-
-   There are security issues if you keep the same variables as for production.
-
-
-Going further
-=============
-
 .. toctree::
    :maxdepth: 2
 
@@ -373,3 +21,386 @@ Going further
    load-addresses.rst
    prod-calendar-sms-sending.rst
    msgraph-configure.rst
+
+
+Requirements
+************
+
+- This project use `docker  <https://docker.com>`_ to be run. As a developer, use `docker-compose <https://docs.docker.com/compose/overview/>`_ to bootstrap a dev environment in a glance. You do not need any other dependencies ;
+- Make is used to automate scripts.
+
+Installation
+************
+
+If you plan to run chill in production:
+
+1. install it locally first, and check if everything is ok on your local machine;
+2. once ready, build the image from your local machine, and deploy them.
+
+If you want to develop some bundles, the first step is sufficient (until you deploy on production).
+
+
+1. Get the code
+===============
+
+Clone or download the chill-skeleton project and `cd` into the main directory.
+
+
+.. code-block:: bash
+
+   git clone https://gitlab.com/Chill-Projet/chill-skeleton-basic.git
+   cd chill-app
+
+
+As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.
+
+2. Prepare composer to download the sources
+===========================================
+
+As you are running in dev, you must configure an auth token for getting the source code.
+
+.. warning
+
+   If you skip this part, the code will be downloaded from dist instead of source (with git repository). You will probably replace the source manually, but the next time you will run ```composer update```, your repository will be replaced and you might loose something.
+
+1. Create a personal access token from https://gitlab.com/-/profile/personal_access_tokens, with the `read_api` scope.
+2. add a file called ```.composer/auth.json``` with this content:
+
+   .. code-block:: json
+
+      {
+        "gitlab-token": {
+            "gitlab.com": "glXXX-XXXXXXXXXXXXXXXXXXXX"
+        }
+      }
+
+2. Prepare your variables and environment
+=========================================
+
+Copy ```docker-compose.override.dev.yml``` into ```docker-compose.override.yml```
+
+.. code-block:: bash
+
+   cp docker-compose.override.dev.template.yml docker-compose.override.yml
+
+2. Prepare your variables and docker-compose
+============================================
+
+Have a look at the variable in ``.env`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing:
+
+1. copy the file as ``.env.local``: ``cp .env .env.local``
+2. you may replace some variables inside ``.env``
+
+Prepare also you docker-compose installation, and adapt it to your needs:
+
+1. If you plan to deploy on dev, copy the file ``docker-compose.override.dev.template.yml`` to ``docker-compose.override.yml``.
+2. adapt to your needs.
+
+
+**Note**: If you intend to use the bundle ``Chill-Doc-Store``, you will need to configure and install an openstack object storage container with temporary url middleware. You will have to configure `secret keys <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html#secret-keys>`_.
+
+3. Run the bootstrap script
+===========================
+
+This script can be run using `make`
+
+.. code-block:: bash
+
+   make init
+
+This script will :
+
+1. force docker-compose to, eventually, pull the base images and build the image used by this project ;
+2. run an install script to download `composer <https://getcomposer.org>`_ ;
+3. install the php dependencies
+4. build assets
+
+.. warning::
+
+   The script will work only if the binary ``docker-compose`` is located into your ``PATH``. If you use ``compose`` as a docker plugin,
+   you can simulate this binary by creating this file at (for instance), ``/usr/local/bin/docker-compose`` (and run ``chmod +x /usr/local/bin/docker-compose``):
+
+   .. code-block:: bash
+
+      #!/bin/bash
+
+      /usr/bin/docker compose "$@"
+
+
+.. note::
+
+   In some cases it can happen that an old image (chill_base_php82 or chill_php82) stored in the docker cache will make the script fail. To solve this problem you have to delete the image and the container, before the make init :
+
+    .. code-block:: bash
+
+       docker-compose images php
+       docker rmi -f chill_php82:prod
+       docker-compose rm php
+
+
+4. Start the project
+====================
+
+.. code-block:: bash
+
+   docker-compose up
+
+**On the first run** (and after each upgrade), you must execute *post update commands* and run database migrations. With a container up and running, execute the following commands:
+
+.. code-block:: bash
+
+   # mount into to container
+   ./docker-php.sh
+   bin/console chill:db:sync-views
+   # and load fixtures
+   bin/console doctrine:migrations:migrate
+
+
+Chill will be available at ``http://localhost:8001.`` Currently, there isn't any user or data. To add fixtures, run
+
+.. code-block:: bash
+
+   # mount into to container
+   ./docker-php.sh
+   # and load fixtures (do not this for production)
+   bin/console doctrine:fixtures:load --purge-with-truncate
+
+There are several users available:
+
+- ``center a_social``
+- ``center b_social``
+
+The password is always ``password``.
+
+Now, read `Operations` below. For running in production, read `prod_`.
+
+
+Operations
+**********
+
+Build assets
+============
+
+run those commands:
+
+.. code-block:: bash
+
+   make build-assets
+
+How to execute the console ?
+============================
+
+.. code-block:: bash
+
+   # if a container is running
+   ./docker-php.sh
+   # if not
+   docker-compose run --user $(id -u) php bin/console
+
+How to create the database schema (= run migrations) ?
+======================================================
+
+.. code-block:: bash
+
+   # if a container is running
+   ./docker-php.sh
+   bin/console doctrine:migrations:migrate
+   bin/console chill:db:sync-views
+   # if not
+   docker-compose run --user $(id -u) php bin/console doctrine:migrations:migrate
+   docker-compose run --user $(id -u) php bin/console chill:db:sync-views
+
+
+How to read the email sent by the program ?
+===========================================
+
+Go at ``http://localhost:8005`` and you should have access to mailcatcher.
+
+In case of you should click on a link in the email, be aware that you should remove the "s" from https.
+
+How to load fixtures ? (development mode only)
+==============================================
+
+.. code-block:: bash
+
+   # if a container is running
+   ./docker-php.sh
+   bin/console doctrine:fixtures:load
+   # if not
+   docker-compose run --user $(id -u) php bin/console doctrine:fixtures:load
+
+How to open a terminal in the project
+=====================================
+
+.. code-block:: bash
+
+   # if a container is running
+   ./docker-php.sh
+   # if not
+   docker-compose run --user $(id -u) php /bin/bash
+
+How to run cron-jobs ?
+======================
+
+Some command must be executed in :ref:`cron jobs <cronjob>`. To execute them:
+
+.. code-block:: bash
+
+   # if a container is running
+   ./docker-php.sh
+   bin/console chill:cron-job:execute
+   # some of them are executed only during the night. So, we have to force the execution during the day:
+   bin/console chill:cron-job:execute 'name-of-the-cron'
+   # if not
+   docker-compose run --user $(id -u) php bin/console chill:cron-job:execute
+   # some of them are executed only during the night. So, we have to force the execution during the day:
+   docker-compose run --user $(id -u) php bin/console chill:cron-job:execute 'name-of-the-cron'
+
+How to run composer ?
+=====================
+
+.. code-block:: bash
+
+   # if a container is running
+   ./docker-php.sh
+   composer
+   # if not
+   docker-compose run --user $(id -u) php composer
+
+How to access to PGADMIN ?
+==========================
+
+Pgadmin is installed with docker-compose, and is available **only if you uncomment the appropriate lines into ``docker-compose.override.yml``.
+
+You can access it at ``http://localhost:8002``.
+
+Credentials:
+
+- login: from the variable you set into ``docker-composer.override.yml``
+- password: same :-)
+
+How to run tests ?
+==================
+
+Tests reside inside the installed bundles. You must `cd` into that directory, download the required packages, and execute them from this place.
+
+**Note**: some bundle require the fixture to be executed. See the dedicated _how-tos_.
+
+Exemple, for running unit test inside `main` bundle:
+
+.. code-block:: bash
+
+   # mount into the php image
+   ./docker-php.sh
+   # cd into main directory
+   cd vendor/chill-project/chill-bundles
+   # download deps
+   git submodule init
+   git submodule update
+   composer install
+   # run tests
+   bin/phpunit src/Bundle/path/to/your/test
+
+Or for running tests to check code style and php conventions with csfixer and phpstan:
+
+.. code-block:: bash
+
+    # run code style fixer
+    bin/grumphp run --tasks=phpcsfixer
+    # run phpstan
+    bin/grumphp run --tasks=phpstan
+
+
+.. note::
+
+    To avoid phpstan block your commits:
+
+    .. code-block:: bash
+
+        git commit -n ...
+
+    To avoid phpstan block your commits permanently:
+
+    .. code-block:: bash
+
+        ./bin/grumphp git:deinit
+
+How to run webpack interactively
+================================
+
+Executing :code:`bash docker-node.sh` will open a terminal in a node container, with volumes mounted.
+
+How to switch the branch for chill-bundles, and get new dependencies
+====================================================================
+
+During development, you will switch to new branches for chill-bundles. As long as the dependencies are equals, this does not cause any problem. But sometimes, a new branch introduces a new dependency, and you must download it.
+
+.. warning::
+
+   Ensure that you have gitlab-token ready before updating your branches. See above.
+
+In order to do that without pain, use those steps:
+
+0. Ensuire you have a token, set
+1. at the app's root, update the ``composer.json`` to your current branch:
+
+.. code-block:: json
+
+   {
+      "require": {
+          "chill-bundles": "dev-<my-branch>@dev"
+   }
+
+2. mount into the php container (``./docker-php.sh``), and run ``composer update``
+
+Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
+====================================================================================================================================================================
+
+Run :code:`make build-assets`
+
+Running in production
+*********************
+
+Currently, to run this software in production, the *state of the art* is the following :
+
+1. Run the software locally and tweak the configuration to your needs ;
+2. Build the image and store them into a private container registry. This can be done using :code:`make build-and-push-image`.
+
+   To be sure to target the correct container registry, you have to adapt the image names into your ``docker-compose.override.yml`` file.
+3. Push the image on your registry, or upload them to the destination machine using ``docker image save`` and ``docker image load``.
+3. Run the image on your production server, using docker-compose or eventually docker stack. You have to customize the variable set in docker-compose.
+
+   See also the :ref:`running-production-tips-and-tricks` below.
+
+.. warning::
+
+   In production, you **must** set those variables:
+
+   * ``APP_ENV`` to ``prod``
+   * ``APP_DEBUG`` to ``false``
+
+   There are security issues if you keep the same variable than for production.
+
+
+.. _running-production-tips-and-tricks:
+
+Tips and tricks
+===============
+
+Operation on database (backups, running custom sql, replication) are easier to set when run outside of a container. If you run into a container, take care of the volume where data are stored.
+
+The PHP sessions are stored inside redis. This is useful if you distribute the traffic amongst different php server: they will share same sessions if a request goes into a different instance of the container.
+
+When the PHP servers are shared across multiple instances, take care that some data is stored into redis: the same redis server should be reachable by all instances.
+
+It is worth having an eye on the configuration of logstash container.
+
+
+Design principles
+*****************
+
+Why the DB URL is also set in environment, and not in .env file ?
+=================================================================
+
+Because, at startup, a script does check the db is up and, if not, wait for a couple of seconds before running ``entrypoint.sh``. For avoiding double configuration, the configuration of the PHP app takes his configuration from environment also (and it will be standard in future releases, with symfony 4.0).
+

docs/source/installation/load-addresses.rst

@@ -8,16 +8,6 @@ Chill can store a list of geolocated address references, which are used to sugge
 
 Those addresses may be load from a dedicated source.
 
-Countries
-=========
-
-In order to load addresses into the chill application we first have to make sure that a list of countries is present.
-To import the countries run the following command.
-
-.. code-block:: bash
-
-    bin/console chill:main:countries:populate
-
 In France
 =========
 

docs/source/installation/msgraph-configure.rst

@@ -1,15 +1,13 @@
 
-Configure Chill for calendar and absence synchronisation and SSO with Microsoft Graph (Outlook)
-===============================================================================================
+Configure Chill for calendar sync and SSO with Microsoft Graph (Outlook)
+========================================================================
 
 Chill offers the possibility to:
 
 * authenticate users using Microsoft Graph, with relatively small adaptations;
 * synchronize calendar in both ways (`see the user manual for a large description of the feature <https://gitea.champs-libres.be/Chill-project/manuals>`_).
 
-Both can be configured separately (synchronising calendars without SSO, or SSO without calendar).
-
-Please note that the user's email address is the key to associate Chill's users with Microsoft's ones.
+Both can be configured separately (synchronising calendars without SSO, or SSO without calendar). When calendar sync is configured without SSL, the user's email address is the key to associate Chill's users with Microsoft's ones.
 
 Configure SSO
 -------------
@@ -48,7 +46,7 @@ Do not forget to provider user's accesses to your app, using the "Utilisateurs e
 
 You must know have gathered all the required variables for SSO:
 
-.. code-block::
+.. code-block:: 
 
    SAML_BASE_URL=https://test.chill.be # must be
    SAML_ENTITY_ID=https://test.chill.be # must match the one entered
@@ -188,27 +186,20 @@ Configure chill app
 
 
 
-Configure sync and calendar access
-----------------------------------
+Configure sync
+--------------
 
-The purpose of this configuration is the following:
+The sync processe might be configured in the same app, or into a different app.
 
-- let user read their calendar and shared calendar within Chill (with the same permissions as the one configured in Outlook / Azure);
-- allow chill instance to write appointment ("Rendez-vous") into their calendar, and invite other users to their appointment;
-- allow chill instance to be notified if an appoint is added or removed by the user within another interface than Chill: if the appointment match another one created in the Chill interface, the date and time are updated in Chill;
-- allow chill instance to read the absence of the user and, if set, mark the user as absent in Chill;
-
-The sync processe might be configured in the same app, or into a different app on the Azure side.
-
-The synchronization processes use Oauth 2.0 / OpenID Connect for authentication and authorization.
+The synchronization processes use Oauth2.0 for authentication and authorization.
 
 .. note::
 
    Two flows are in use:
 
-   * we authenticate "on behalf of a user", to allow users to see their own calendar or other user's calendar into the web interface.
+   * we authenticate "on behalf of a user", to allow users to see their own calendar or other user's calendar into the web interface. 
 
-     Typically, when the page is loaded, Chill first check that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification and a new token is grabbed (most of the times, this is transparent for users).
+     Typically, when the page is loaded, Chill first check that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification and a new token is grabbed (most of the times, this is transparent for users). 
 
    * Chill also acts "as a machine", to synchronize calendars with a daemon background.
 
@@ -238,9 +229,8 @@ Some explanation:
 The sync daemon must have write access:
 
 * the daemon must be allowed to read all users and their profile, to establish a link between them and the Chill's users: (:code:`Users.Read.All`);
-* it must also be allowed to read and write into the calendars (:code:`Calendars.ReadWrite.All`);
-* for sending invitation to other users, the permission (:code:`Mail.Send`) must be granted;
-* and, for reading the absence status of the user and sync it with chill, it must be able to read the mailboxSettings (:code:`MailboxSettings.Read`).
+* it must also be allowed to read and write into the calendars (:code:`Calendars.ReadWrite.All`)
+* for sending invitation to other users, the permission (:code:`Mail.Send`) must be granted.
 
 At this step, you might choose to accept those permissions for all users, or let them do it by yourself.
 
@@ -311,7 +301,7 @@ The calendar synchronization is processed using symfony messenger. It seems to b
 
 The association between chill's users and Microsoft's users is done by this cli command:
 
-.. code-block::
+.. code-block:: 
 
    bin/console chill:calendar:msgraph-user-map-subscribe
 

exports_alias_conventions.csv

@@ -0,0 +1,63 @@
+Entity,Join,Attribute,Alias
+AccompanyingPeriod::class,,,acp
+,AccompanyingPeriodWork::class,acp.works,acpw
+,AccompanyingPeriodParticipation::class,acp.participations,acppart
+,Location::class,acp.administrativeLocation,acploc
+,ClosingMotive::class,acp.closingMotive,acpmotive
+,UserJob::class,acp.job,acpjob
+,Origin::class,acp.origin,acporigin
+,Scope::class,acp.scopes,acpscope
+,SocialIssue::class,acp.socialIssues,acpsocialissue
+,User::class,acp.user,acpuser
+AccompanyingPeriodWork::class,,,acpw
+,AccompanyingPeriodWorkEvaluation::class,acpw.accompanyingPeriodWorkEvaluations,workeval
+,User::class,acpw.referrers,acpwuser
+,SocialAction::class,acpw.socialAction,acpwsocialaction
+,Goal::class,acpw.goals,goal
+,Result::class,acpw.results,result
+AccompanyingPeriodParticipation::class,,,acppart
+,Person::class,acppart.person,partperson
+AccompanyingPeriodWorkEvaluation::class,,,workeval
+,Evaluation::class,workeval.evaluation,eval
+Goal::class,,,goal
+,Result::class,goal.results,goalresult
+Person::class,,,person
+,Center::class,person.center,center
+,HouseholdMember::class,partperson.householdParticipations,householdmember
+,MaritalStatus::class,person.maritalStatus,personmarital
+,VendeePerson::class,,vp
+,VendeePersonMineur::class,,vpm
+ResidentialAddress::class,,,resaddr
+,ThirdParty::class,resaddr.hostThirdParty,tparty
+ThirdParty::class,,,tparty
+,ThirdPartyCategory::class,tparty.categories,tpartycat
+HouseholdMember::class,,,householdmember
+,Household::class,householdmember.household,household
+,Person::class,householdmember.person,memberperson
+,,memberperson.center,membercenter
+Household::class,,,household
+,HouseholdComposition::class,household.compositions,composition
+Activity::class,,,activity
+,Person::class,activity.person,actperson
+,AccompanyingPeriod::class,activity.accompanyingPeriod,acp
+,Person::class,activity_person_having_activity.person,person_person_having_activity
+,ActivityReason::class,activity_person_having_activity.reasons,reasons_person_having_activity
+,ActivityType::class,activity.activityType,acttype
+,Location::class,activity.location,actloc
+,SocialAction::class,activity.socialActions,actsocialaction
+,SocialIssue::class,activity.socialIssues,actsocialssue
+,ThirdParty::class,activity.thirdParties,acttparty
+,User::class,activity.user,actuser
+,User::class,activity.users,actusers
+,ActivityReason::class,activity.reasons,actreasons
+,Center::class,actperson.center,actcenter
+ActivityReason::class,,,actreasons
+,ActivityReasonCategory::class,actreason.category,actreasoncat
+Calendar::class,,,cal
+,CancelReason::class,cal.cancelReason,calcancel
+,Location::class,cal.location,calloc
+,User::class,cal.user,caluser
+VendeePerson::class,,,vp
+,SituationProfessionelle::class,vp.situationProfessionelle,vpprof
+,StatutLogement::class,vp.statutLogement,vplog
+,TempsDeTravail::class,vp.tempsDeTravail,vptt

exports_alias_conventions.md

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

package.json

@@ -6,24 +6,20 @@
     "@apidevtools/swagger-cli": "^4.0.4",
     "@babel/core": "^7.20.5",
     "@babel/preset-env": "^7.20.2",
-    "@ckeditor/ckeditor5-build-classic": "^41.4.2",
-    "@ckeditor/ckeditor5-dev-utils": "^40.2.0",
+    "@ckeditor/ckeditor5-build-classic": "^35.3.2",
+    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
     "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
-    "@ckeditor/ckeditor5-dev-translations": "^40.2.0",
-    "@ckeditor/ckeditor5-markdown-gfm": "^41.4.2",
-    "@ckeditor/ckeditor5-theme-lark": "^41.4.2",
-    "@ckeditor/ckeditor5-vue": "^5.1.0",
+    "@ckeditor/ckeditor5-markdown-gfm": "^35.3.2",
+    "@ckeditor/ckeditor5-theme-lark": "^35.3.2",
+    "@ckeditor/ckeditor5-vue": "^4.0.1",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node14": "^1.0.1",
-    "@types/dompurify": "^3.0.5",
     "bindings": "^1.5.0",
-    "bootstrap": "5.2.3",
+    "bootstrap": "^5.0.1",
     "chokidar": "^3.5.1",
-    "dompurify": "^3.1.0",
     "fork-awesome": "^1.1.7",
     "jquery": "^3.6.0",
     "node-sass": "^8.0.0",
-    "marked": "^12.0.1",
     "popper.js": "^1.16.1",
     "postcss-loader": "^7.0.2",
     "raw-loader": "^4.0.2",
@@ -32,7 +28,7 @@
     "select2-bootstrap-theme": "0.1.0-beta.10",
     "style-loader": "^3.3.1",
     "ts-loader": "^9.3.1",
-    "typescript": "^5.4.5",
+    "typescript": "^4.7.2",
     "vue-loader": "^17.0.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
@@ -46,13 +42,11 @@
     "@fullcalendar/vue3": "^6.1.4",
     "@popperjs/core": "^2.9.2",
     "@types/leaflet": "^1.9.3",
-    "@types/dompurify": "^3.0.5",
     "dropzone": "^5.7.6",
     "es6-promise": "^4.2.8",
     "leaflet": "^1.7.1",
-    "marked": "^12.0.2",
     "masonry-layout": "^4.2.2",
-    "mime": "^4.0.0",
+    "mime": "^3.0.0",
     "swagger-ui": "^4.15.5",
     "vis-network": "^9.1.0",
     "vue": "^3.2.37",

phpstan-baseline-2024-05.neon

@@ -1,14 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Parameter \\#1 \\$records of method League\\\\Csv\\\\Writer\\:\\:insertAll\\(\\) expects iterable\\<array\\<float\\|int\\|string\\|Stringable\\|null\\>\\>, iterable\\<array\\<string, bool\\|int\\|string\\>\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/UserExportController.php
-
-		-
-			message: """
-				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
-				use Order\\:\\:Ascending instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

phpstan-baseline-deprecations-doctrine-orm.neon

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

phpstan-baseline-level-5.neon

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

phpstan-baseline.neon

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

phpstan-deprecations-sf54.neon

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

phpstan-deprecations.neon

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

phpstan.neon.dist

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

phpunit.rector.xml

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

phpunit.xml.dist

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

rector.php

@@ -2,16 +2,8 @@
 
 declare(strict_types=1);
 
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
-use Rector\Php80\Rector\Class_\AnnotationToAttributeRector;
 use Rector\Set\ValueObject\LevelSetList;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -20,72 +12,52 @@ return static function (RectorConfig $rectorConfig): void {
         __DIR__ . '/src',
     ]);
 
-    $rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/test/App_KernelTestDebugContainer.xml  ');
-    $rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
-
     //$rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
     //$rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');
 
     // register a single rule
     $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
-
-    // part of the symfony 54 rules
-    $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
-    $rectorConfig->rule(\Rector\Symfony\Symfony60\Rector\MethodCall\GetHelperControllerToServiceRector::class);
     $rectorConfig->disableParallel();
 
     //define sets of rules
     $rectorConfig->sets([
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_50,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_50_TYPES,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_51,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_52,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_53,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_54,
-        \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
-        \Rector\Doctrine\Set\DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
+        LevelSetList::UP_TO_PHP_74
     ]);
 
-    $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class, [
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Symfony\Component\Serializer\Annotation\Context'),
-    ]);
-
-    // migrate for phpunit
-    $rectorConfig->rules([
-        \Rector\PHPUnit\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector::class,
-        \Rector\PHPUnit\PHPUnit100\Rector\Class_\PublicDataProviderClassMethodRector::class
-    ]);
-
-    // some routes are added twice if it remains activated
-    // $rectorConfig->rule(\Rector\Symfony\Configs\Rector\ClassMethod\AddRouteAnnotationRector::class);
-
     // chill rules
-    $rectorConfig->rules([
-        \Chill\Utils\Rector\Rector\ChillBundleMakeDataProviderStaticForAbstractExportTestRector::class,
-    ]);
+    $rectorConfig->rule(\Chill\Utils\Rector\Rector\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector::class);
 
     // skip some path...
     $rectorConfig->skip([
-        // we must adapt service definition
-        \Rector\Symfony\Symfony28\Rector\MethodCall\GetToConstructorInjectionRector::class,
-        \Rector\Symfony\Symfony34\Rector\Closure\ContainerGetNameToTypeInTestsRector::class,
-    ]);
+        // make rector stuck for some files
+        \Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector::class,
 
-    $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Household\MaxHolder'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ConfidentialCourseMustHaveReferrer'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\Birthdate'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicate'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\ActivityBundle\Validator\Constraints\ActivityValidity'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\DocStoreBundle\Validator\Constraints\AsyncFileExists'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validation\Constraint\PhonenumberConstraint'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency'),
-        new \Rector\Php80\ValueObject\AnnotationToAttribute('Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation'),
+        // we need to discuss this: are we going to have FALSE in tests instead of an error ?
+        \Rector\Php71\Rector\FuncCall\CountOnNullRector::class,
+
+        // must merge MR500 and review a typing of "ArrayCollection" in entities
+        \Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector::class,
+
+        // remove all PHP80 rules, in order to activate them one by one
+        \Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector::class,
+        \Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class,
+        \Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector::class,
+        \Rector\Php80\Rector\FuncCall\ClassOnObjectRector::class,
+        \Rector\Php80\Rector\ClassConstFetch\ClassOnThisVariableObjectRector::class,
+        \Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector::class,
+        \Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector::class,
+        \Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector::class,
+        \Rector\Php80\Rector\Ternary\GetDebugTypeRector::class,
+        \Rector\Php80\Rector\FunctionLike\MixedTypeRector::class,
+        \Rector\Php80\Rector\Property\NestedAnnotationToAttributeRector::class,
+        \Rector\Php80\Rector\FuncCall\Php8ResourceReturnToObjectRector::class,
+        \Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector::class,
+        \Rector\Php80\Rector\ClassMethod\SetStateToStaticRector::class,
+        \Rector\Php80\Rector\NotIdentical\StrContainsRector::class,
+        \Rector\Php80\Rector\Identical\StrEndsWithRector::class,
+        \Rector\Php80\Rector\Identical\StrStartsWithRector::class,
+        \Rector\Php80\Rector\Class_\StringableForToStringRector::class,
+        \Rector\Php80\Rector\FuncCall\TokenGetAllToObjectRector::class,
+        \Rector\Php80\Rector\FunctionLike\UnionTypesRector::class
     ]);
 };

src/Bundle/ChillActivityBundle/CHANGELOG.md

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

src/Bundle/ChillActivityBundle/ChillActivityBundle.php

@@ -13,4 +13,6 @@ namespace Chill\ActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class ChillActivityBundle extends Bundle {}
+class ChillActivityBundle extends Bundle
+{
+}

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -18,13 +18,13 @@ use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+use Chill\ActivityBundle\Repository\ActivityUserJobRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\LocationRepository;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
-use Chill\MainBundle\Security\ChillSecurity;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
@@ -35,8 +35,11 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
+use InvalidArgumentException;
 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;
@@ -46,6 +49,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_key_exists;
 
 final class ActivityController extends AbstractController
 {
@@ -68,14 +72,15 @@ final class ActivityController extends AbstractController
         private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
         private readonly PaginatorFactory $paginatorFactory,
-        private readonly ChillSecurity $security
-    ) {}
+    ) {
+    }
 
     /**
      * Deletes a Activity entity.
+     *
+     * @param mixed $id
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/delete', name: 'chill_activity_activity_delete', methods: ['GET', 'POST', 'DELETE'])]
-    public function deleteAction(Request $request, mixed $id)
+    public function deleteAction(Request $request, $id)
     {
         $view = null;
 
@@ -88,10 +93,10 @@ final class ActivityController extends AbstractController
         }
 
         if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/confirm_deleteAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
             $accompanyingPeriod = $activity->getAccompanyingPeriod();
         } else {
-            $view = '@ChillActivity/Activity/confirm_deletePerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
         }
 
         // TODO
@@ -99,7 +104,7 @@ final class ActivityController extends AbstractController
 
         $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
 
-        if (Request::METHOD_DELETE === $request->getMethod()) {
+        if ($request->getMethod() === Request::METHOD_DELETE) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -132,6 +137,10 @@ final class ActivityController extends AbstractController
             }
         }
 
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
         return $this->render($view, [
             'activity' => $activity,
             'delete_form' => $form->createView(),
@@ -143,7 +152,6 @@ final class ActivityController extends AbstractController
     /**
      * Displays a form to edit an existing Activity entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/edit', name: 'chill_activity_activity_edit', methods: ['GET', 'POST', 'PUT'])]
     public function editAction(int $id, Request $request): Response
     {
         $view = null;
@@ -158,10 +166,10 @@ final class ActivityController extends AbstractController
         $person = $entity->getPerson();
 
         if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/editAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
             $accompanyingPeriod = $entity->getAccompanyingPeriod();
         } else {
-            $view = '@ChillActivity/Activity/editPerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
         }
         // TODO
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
@@ -222,6 +230,10 @@ final class ActivityController extends AbstractController
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
          */
 
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
         $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
         return $this->render($view, [
@@ -237,7 +249,6 @@ final class ActivityController extends AbstractController
     /**
      * Lists all Activity entities.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/', name: 'chill_activity_activity_list')]
     public function listAction(Request $request): Response
     {
         $view = null;
@@ -248,8 +259,8 @@ final class ActivityController extends AbstractController
 
         $filterArgs = [
             'my_activities' => $filter->getSingleCheckboxData('my_activities'),
-            'types' => $filter->hasEntityChoice('activity_types') ? $filter->getEntityChoiceData('activity_types') : [],
-            'jobs' => $filter->hasEntityChoice('jobs') ? $filter->getEntityChoiceData('jobs') : [],
+            'types' => $filter->getEntityChoiceData('activity_types'),
+            'jobs' => $filter->getEntityChoiceData('jobs'),
             'before' => $filter->getDateRangeData('activity_date')['to'],
             'after' => $filter->getDateRangeData('activity_date')['from'],
         ];
@@ -272,9 +283,9 @@ final class ActivityController extends AbstractController
                 'element_class' => Activity::class,
                 'action' => 'list',
             ]);
-            $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
+            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-            $view = '@ChillActivity/Activity/listPerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
 
@@ -290,9 +301,9 @@ final class ActivityController extends AbstractController
                     $filterArgs
                 );
 
-            $view = '@ChillActivity/Activity/listAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         } else {
-            throw new \LogicException('Unsupported');
+            throw new \LogicException("Unsupported");
         }
 
         return $this->render(
@@ -309,39 +320,32 @@ final class ActivityController extends AbstractController
 
     private function buildFilterOrder(AccompanyingPeriod|Person $associated): FilterOrderHelper
     {
+
         $filterBuilder = $this->filterOrderHelperFactory->create(self::class);
         $types = $this->activityACLAwareRepository->findActivityTypeByAssociated($associated);
         $jobs = $this->activityACLAwareRepository->findUserJobByAssociated($associated);
 
         $filterBuilder
             ->addDateRange('activity_date', 'activity.date')
-            ->addSingleCheckbox('my_activities', 'activity_filter.My activities');
+            ->addSingleCheckbox('my_activities', 'activity_filter.My activities')
+            ->addEntityChoice('activity_types', 'activity_filter.Types', \Chill\ActivityBundle\Entity\ActivityType::class, $types, [
+                'choice_label' => function (\Chill\ActivityBundle\Entity\ActivityType $activityType) {
+                    $text = match ($activityType->hasCategory()) {
+                        true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()) . ' > ',
+                        false => '',
+                    };
 
-        if (1 < count($types)) {
-            $filterBuilder
-                ->addEntityChoice('activity_types', 'activity_filter.Types', \Chill\ActivityBundle\Entity\ActivityType::class, $types, [
-                    'choice_label' => function (\Chill\ActivityBundle\Entity\ActivityType $activityType) {
-                        $text = match ($activityType->hasCategory()) {
-                            true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()).' > ',
-                            false => '',
-                        };
-
-                        return $text.$this->translatableStringHelper->localize($activityType->getName());
-                    },
-                ]);
-        }
-
-        if (1 < count($jobs)) {
-            $filterBuilder
-                ->addEntityChoice('jobs', 'activity_filter.Jobs', UserJob::class, $jobs, [
-                    'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel()),
-                ]);
-        }
+                    return $text . $this->translatableStringHelper->localize($activityType->getName());
+                }
+            ])
+            ->addEntityChoice('jobs', 'activity_filter.Jobs', UserJob::class, $jobs, [
+                'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel())
+            ])
+        ;
 
         return $filterBuilder->build();
     }
 
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/new', name: 'chill_activity_activity_new', methods: ['POST', 'GET'])]
     public function newAction(Request $request): Response
     {
         $view = null;
@@ -349,16 +353,16 @@ final class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/newAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = '@ChillActivity/Activity/newPerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
         }
 
         $activityType_id = $request->get('activityType_id', 0);
         $activityType = $this->activityTypeRepository->find($activityType_id);
 
         if (isset($activityType) && !$activityType->isActive()) {
-            throw new \InvalidArgumentException('Activity type must be active');
+            throw new InvalidArgumentException('Activity type must be active');
         }
 
         $activityData = null;
@@ -381,7 +385,7 @@ final class ActivityController extends AbstractController
         }
 
         $entity = new Activity();
-        $entity->setUser($this->security->getUser());
+        $entity->setUser($this->getUser());
 
         if ($person instanceof Person) {
             $entity->setPerson($person);
@@ -393,45 +397,45 @@ final class ActivityController extends AbstractController
         }
 
         $entity->setActivityType($activityType);
-        $entity->setDate(new \DateTime('now'));
+        $entity->setDate(new DateTime('now'));
 
         if ($request->query->has('activityData')) {
-            $activityData = $request->query->all('activityData');
+            $activityData = $request->query->get('activityData');
 
-            if (\array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
+            if (array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
                 $durationTimeInMinutes = $activityData['durationTime'];
                 $hours = floor($durationTimeInMinutes / 60);
                 $minutes = $durationTimeInMinutes % 60;
-                $duration = \DateTime::createFromFormat('H:i', $hours.':'.$minutes);
+                $duration = DateTime::createFromFormat('H:i', $hours . ':' . $minutes);
 
                 if ($duration) {
                     $entity->setDurationTime($duration);
                 }
             }
 
-            if (\array_key_exists('date', $activityData)) {
-                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
+            if (array_key_exists('date', $activityData)) {
+                $date = DateTime::createFromFormat('Y-m-d', $activityData['date']);
 
                 if ($date) {
                     $entity->setDate($date);
                 }
             }
 
-            if (\array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
+            if (array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
                 foreach ($activityData['personsId'] as $personId) {
                     $concernedPerson = $this->personRepository->find($personId);
                     $entity->addPerson($concernedPerson);
                 }
             }
 
-            if (\array_key_exists('professionalsId', $activityData) && $activityType->getThirdPartiesVisible() > 0) {
+            if (array_key_exists('professionalsId', $activityData) && $activityType->getThirdPartiesVisible() > 0) {
                 foreach ($activityData['professionalsId'] as $professionalsId) {
                     $professional = $this->thirdPartyRepository->find($professionalsId);
                     $entity->addThirdParty($professional);
                 }
             }
 
-            if (\array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
+            if (array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
                 foreach ($activityData['usersId'] as $userId) {
                     $user = $this->userRepository->find($userId);
 
@@ -441,16 +445,16 @@ final class ActivityController extends AbstractController
                 }
             }
 
-            if (\array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
+            if (array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
                 $location = $this->locationRepository->find($activityData['location']);
                 $entity->setLocation($location);
             }
 
-            if (\array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
+            if (array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
                 $comment = new CommentEmbeddable();
                 $comment->setComment($activityData['comment']);
-                $comment->setUserId($this->security->getUser()->getId());
-                $comment->setDate(new \DateTime('now'));
+                $comment->setUserId($this->getUser()->getid());
+                $comment->setDate(new DateTime('now'));
                 $entity->setComment($comment);
             }
         }
@@ -510,7 +514,7 @@ final class ActivityController extends AbstractController
 
         $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
-        $defaultLocation = $this->security->getUser()->getCurrentLocation();
+        $defaultLocation = $this->getUser()->getCurrentLocation();
 
         return $this->render($view, [
             'person' => $person,
@@ -522,7 +526,6 @@ final class ActivityController extends AbstractController
         ]);
     }
 
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/select-type', name: 'chill_activity_activity_select_type')]
     public function selectTypeAction(Request $request): Response
     {
         $view = null;
@@ -530,9 +533,9 @@ final class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/selectTypeAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:selectTypeAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = '@ChillActivity/Activity/selectTypePerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:selectTypePerson.html.twig';
         }
 
         $data = [];
@@ -563,11 +566,10 @@ final class ActivityController extends AbstractController
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'data' => $data,
-            'activityData' => $request->query->all('activityData'),
+            'activityData' => $request->query->get('activityData', []),
         ]);
     }
 
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/activity/{id}/show', name: 'chill_activity_activity_show')]
     public function showAction(Request $request, int $id): Response
     {
         $entity = $this->activityRepository->find($id);
@@ -580,11 +582,11 @@ final class ActivityController extends AbstractController
         $person = $entity->getPerson();
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/showAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = '@ChillActivity/Activity/showPerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
         } else {
-            throw new \RuntimeException('the activity should be linked with a period or person');
+            throw new RuntimeException('the activity should be linked with a period or person');
         }
 
         if (null !== $accompanyingPeriod) {
@@ -607,6 +609,10 @@ final class ActivityController extends AbstractController
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
          */
 
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
         return $this->render($view, [
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -22,27 +22,24 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class ActivityReasonCategoryController extends AbstractController
 {
-    public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {}
-
     /**
      * Creates a new ActivityReasonCategory entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/create', name: 'chill_activity_activityreasoncategory_create', methods: ['POST'])]
     public function createAction(Request $request)
     {
         $entity = new ActivityReasonCategory();
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em = $this->managerRegistry->getManager();
+        if ($form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]);
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]));
         }
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -50,13 +47,14 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Displays a form to edit an existing ActivityReasonCategory entity.
+     *
+     * @param mixed $id
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/edit', name: 'chill_activity_activityreasoncategory_edit')]
-    public function editAction(mixed $id)
+    public function editAction($id)
     {
-        $em = $this->managerRegistry->getManager();
+        $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -64,7 +62,7 @@ class ActivityReasonCategoryController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -73,14 +71,13 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Lists all ActivityReasonCategory entities.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/', name: 'chill_activity_activityreasoncategory')]
     public function indexAction()
     {
-        $em = $this->managerRegistry->getManager();
+        $em = $this->getDoctrine()->getManager();
 
-        $entities = $em->getRepository(ActivityReasonCategory::class)->findAll();
+        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/index.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
             'entities' => $entities,
         ]);
     }
@@ -88,13 +85,12 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Displays a form to create a new ActivityReasonCategory entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/new', name: 'chill_activity_activityreasoncategory_new')]
     public function newAction()
     {
         $entity = new ActivityReasonCategory();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -102,32 +98,34 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Finds and displays a ActivityReasonCategory entity.
+     *
+     * @param mixed $id
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/show', name: 'chill_activity_activityreasoncategory_show')]
-    public function showAction(mixed $id)
+    public function showAction($id)
     {
-        $em = $this->managerRegistry->getManager();
+        $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
         }
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/show.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', [
             'entity' => $entity,
         ]);
     }
 
     /**
      * Edits an existing ActivityReasonCategory entity.
+     *
+     * @param mixed $id
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreasoncategory/{id}/update', name: 'chill_activity_activityreasoncategory_update', methods: ['POST', 'PUT'])]
-    public function updateAction(Request $request, mixed $id)
+    public function updateAction(Request $request, $id)
     {
-        $em = $this->managerRegistry->getManager();
+        $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -136,13 +134,13 @@ class ActivityReasonCategoryController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isSubmitted() && $editForm->isValid()) {
+        if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreasoncategory_edit', ['id' => $id]);
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', ['id' => $id]));
         }
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -24,27 +24,31 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  */
 class ActivityReasonController extends AbstractController
 {
-    public function __construct(private readonly ActivityReasonRepository $activityReasonRepository, private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {}
+    private ActivityReasonRepository $activityReasonRepository;
+
+    public function __construct(ActivityReasonRepository $activityReasonRepository)
+    {
+        $this->activityReasonRepository = $activityReasonRepository;
+    }
 
     /**
      * Creates a new ActivityReason entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/create', name: 'chill_activity_activityreason_create', methods: ['POST'])]
     public function createAction(Request $request)
     {
         $entity = new ActivityReason();
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em = $this->managerRegistry->getManager();
+        if ($form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreason', ['id' => $entity->getId()]);
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $entity->getId()]));
         }
 
-        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -52,13 +56,14 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Displays a form to edit an existing ActivityReason entity.
+     *
+     * @param mixed $id
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/edit', name: 'chill_activity_activityreason_edit')]
-    public function editAction(mixed $id)
+    public function editAction($id)
     {
-        $em = $this->managerRegistry->getManager();
+        $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository(ActivityReason::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
 
         if (null === $entity) {
             throw new NotFoundHttpException('Unable to find ActivityReason entity.');
@@ -66,7 +71,7 @@ class ActivityReasonController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -75,14 +80,13 @@ class ActivityReasonController extends AbstractController
     /**
      * Lists all ActivityReason entities.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/', name: 'chill_activity_activityreason')]
     public function indexAction()
     {
-        $em = $this->managerRegistry->getManager();
+        $em = $this->getDoctrine()->getManager();
 
         $entities = $this->activityReasonRepository->findAll();
 
-        return $this->render('@ChillActivity/ActivityReason/index.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
             'entities' => $entities,
         ]);
     }
@@ -90,13 +94,12 @@ class ActivityReasonController extends AbstractController
     /**
      * Displays a form to create a new ActivityReason entity.
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/new', name: 'chill_activity_activityreason_new')]
     public function newAction()
     {
         $entity = new ActivityReason();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -104,32 +107,34 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Finds and displays a ActivityReason entity.
+     *
+     * @param mixed $id
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/show', name: 'chill_activity_activityreason_show')]
-    public function showAction(mixed $id)
+    public function showAction($id)
     {
-        $em = $this->managerRegistry->getManager();
+        $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository(ActivityReason::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');
         }
 
-        return $this->render('@ChillActivity/ActivityReason/show.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', [
             'entity' => $entity,
         ]);
     }
 
     /**
      * Edits an existing ActivityReason entity.
+     *
+     * @param mixed $id
      */
-    #[\Symfony\Component\Routing\Annotation\Route(path: '/{_locale}/admin/activityreason/{id}/update', name: 'chill_activity_activityreason_update', methods: ['POST', 'PUT'])]
-    public function updateAction(Request $request, mixed $id)
+    public function updateAction(Request $request, $id)
     {
-        $em = $this->managerRegistry->getManager();
+        $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository(ActivityReason::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -138,13 +143,13 @@ class ActivityReasonController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isSubmitted() && $editForm->isValid()) {
+        if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreason', ['id' => $id]);
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $id]));
         }
 
-        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);

src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php

@@ -24,7 +24,7 @@ class AdminActivityPresenceController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /* @var \Doctrine\ORM\QueryBuilder $query */
+        /** @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.id', 'ASC');
     }
 }

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php

@@ -24,7 +24,7 @@ class AdminActivityTypeCategoryController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /* @var \Doctrine\ORM\QueryBuilder $query */
+        /** @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.ordering', 'ASC');
     }
 }