Use better namespacing for configuring workflow signature documents

Create entity workflow signature

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

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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,5 @@
+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

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

.changes/v2.22.0.md

@@ -1,6 +0,0 @@
-## v2.22.0 - 2024-06-25
-### Feature
-* ([#216](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/216)) [event bundle] exports  added for the event module
-
-### Traduction francophone
-* Exports sont ajoutés pour la module événement.

.changes/v2.22.1.md

@@ -1,5 +0,0 @@
-## v2.22.1 - 2024-07-01
-### Fixed
-* Remove debug word 
-### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 

.changes/v2.22.2.md

@@ -1,3 +0,0 @@
-## v2.22.2 - 2024-07-03
-### Fixed
-* Remove scope required for event participation stats 

.changes/v2.23.0.md

@@ -1,30 +0,0 @@
-## v2.23.0 - 2024-07-23 & 2024-07-19
-### Feature
-* ([#221](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/221)) [DX] move async-upload-bundle features into chill-bundles
-* Add job bundle (module emploi)
-* Upgrade import of address list to the last version of compiled addresses of belgian-best-address
-
-* Upgrade CKEditor and refactor configuration with use of typescript
-
-* ([#123](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/123)) Add a button to duplicate calendar ranges from a week to another one
-* [admin] filter users by active / inactive in the admin user's list
-* ([#273](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/273)) Add the possibility to mark all notifications as read
-
-
-* Handle duplicate reference id in the import of reference addresses
-* Do not update the "createdAt" column when importing postal code which does not change
-* Display filename on file upload within the UI interface
-### Fixed
-* Fix resolving of centers for an household, which will fix in turn the access control
-* Resolved type hinting error in activity list export
-* ([#271](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/271)) Take into account the acp closing date in the acp works date filter
-
-### Traduction française des principaux changements
-- Ajout d'un bouton pour dupliquer les périodes de disponibilités d'une semaine à une autre;
-- dans l'interface d'administration, filtre sur les utilisateurs actifs. Par défaut, seul les utilisateurs
-  actifs sont affichés;
-- Nouveau bouton pour indiquer toutes les notifications comme lues;
-- Améliorations sur l'import des adresses et des codes postaux;
-- Affiche le nom du fichier déposé quand on téléverse un fichier depuis le poste de travail local;
-- Agrandit l'icône du type de fichier dans l'interface de dépôt de fichier;
-- correction: tient compte de la date de fermeture du parcours dans les filtres sur les actions d'accompagnement.

.changes/v2.24.0.md

@@ -1,3 +0,0 @@
-## v2.24.0 - 2024-09-11
-### Feature
-* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 

.changes/v3.0.0.md

@@ -1,5 +0,0 @@
-## v3.0.0 - 2024-08-26
-### Fixed
-* Fix delete action for accompanying periods in draft state 
-* Fix connection to azure when making an calendar event in chill 
-* CollectionType js fixes for remove button and adding multiple entries 

.changes/v3.1.0.md

@@ -1,3 +0,0 @@
-## v3.1.0 - 2024-08-30
-### Feature
-* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 

.changes/v3.1.1.md

@@ -1,6 +0,0 @@
-## v3.1.1 - 2024-10-01
-### Fixed
-* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
-* ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
- 
-* Fixed typing of custom field long choice and custom field group 

.gitlab-ci.yml

@@ -138,4 +138,4 @@ release:
         - echo "running release_job"
     release:
         tag_name: '$CI_COMMIT_TAG'
-        description: "./.changes/$CI_COMMIT_TAG.md"
+        description: "./.changes/v$CI_COMMIT_TAG.md"

CHANGELOG.md

@@ -6,75 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## v3.1.1 - 2024-10-01
-### Fixed
-* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
-* ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
- 
-* Fixed typing of custom field long choice and custom field group 
-
-## v3.1.0 - 2024-08-30
-### Feature
-* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 
-
-## v3.0.0 - 2024-08-26
-### Fixed
-* Fix delete action for accompanying periods in draft state 
-* Fix connection to azure when making an calendar event in chill 
-* CollectionType js fixes for remove button and adding multiple entries 
-
-## v2.24.0 - 2024-09-11
-### Feature
-* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 
-
-## v2.23.0 - 2024-07-23 & 2024-07-19
-### Feature
-* ([#221](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/221)) [DX] move async-upload-bundle features into chill-bundles
-* Add job bundle (module emploi)
-* Upgrade import of address list to the last version of compiled addresses of belgian-best-address
-
-* Upgrade CKEditor and refactor configuration with use of typescript
-
-* ([#123](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/123)) Add a button to duplicate calendar ranges from a week to another one
-* [admin] filter users by active / inactive in the admin user's list
-* ([#273](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/273)) Add the possibility to mark all notifications as read
-
-
-* Handle duplicate reference id in the import of reference addresses
-* Do not update the "createdAt" column when importing postal code which does not change
-* Display filename on file upload within the UI interface
-### Fixed
-* Fix resolving of centers for an household, which will fix in turn the access control
-* Resolved type hinting error in activity list export
-* ([#271](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/271)) Take into account the acp closing date in the acp works date filter
-
-### Traduction française des principaux changements
-- Ajout d'un bouton pour dupliquer les périodes de disponibilités d'une semaine à une autre;
-- dans l'interface d'administration, filtre sur les utilisateurs actifs. Par défaut, seul les utilisateurs
-  actifs sont affichés;
-- Nouveau bouton pour indiquer toutes les notifications comme lues;
-- Améliorations sur l'import des adresses et des codes postaux;
-- Affiche le nom du fichier déposé quand on téléverse un fichier depuis le poste de travail local;
-- Agrandit l'icône du type de fichier dans l'interface de dépôt de fichier;
-- correction: tient compte de la date de fermeture du parcours dans les filtres sur les actions d'accompagnement.
-
-## v2.22.2 - 2024-07-03
-### Fixed
-* Remove scope required for event participation stats 
-
-## v2.22.1 - 2024-07-01
-### Fixed
-* Remove debug word 
-### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 
-
-## v2.22.0 - 2024-06-25
-### Feature
-* ([#216](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/216)) [event bundle] exports  added for the event module
-
-### Traduction francophone
-* Exports sont ajoutés pour la module événement.
-
 ## 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

composer.json

@@ -31,6 +31,7 @@
         "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",
@@ -42,7 +43,6 @@
         "symfony/dom-crawler": "^5.4",
         "symfony/error-handler": "^5.4",
         "symfony/event-dispatcher": "^5.4",
-        "symfony/event-dispatcher-contracts": "^2.4",
         "symfony/expression-language": "^5.4",
         "symfony/filesystem": "^5.4",
         "symfony/finder": "^5.4",
@@ -115,8 +115,6 @@
             "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
             "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
-            "Chill\\FranceTravailApiBundle\\": "src/Bundle/ChillFranceTravailApiBundle/src",
-            "Chill\\JobBundle\\": "src/Bundle/ChillJobBundle/src",
             "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",

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

@@ -21,7 +21,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
     // add specific role for this filter
-    public function addRole(): ?string
+    public function addRole()
     {
         // we do not need any new role for this filter, so we return null
         return null;

docs/source/development/cronjob.rst

@@ -39,12 +39,9 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
     use Chill\MainBundle\Entity\CronJobExecution;
     use DateInterval;
     use DateTimeImmutable;
-    use Symfony\Component\Clock\ClockInterface;
 
     class MyCronJob implements CronJobInterface
     {
-        function __construct(private ClockInterface $clock) {}
-
         public function canRun(?CronJobExecution $cronJobExecution): bool
         {
             // the parameter $cronJobExecution contains data about the last execution of the cronjob
@@ -59,7 +56,7 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
 
             // this cron job should be executed if the last execution is greater than one day, but only during the night
 
-            $now = $clock->now();
+            $now = new DateTimeImmutable('now');
 
             return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
                 && in_array($now->format('H'), self::ACCEPTED_HOURS, true)
@@ -72,15 +69,10 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
             return 'arbitrary-and-unique-key';
         }
 
-        public function run(array $lastExecutionData): void
+        public function run(): void
         {
             // here, we execute the command
-
-            // we return execution data, which will be served for next execution
-            // this data should be easily serializable in a json column: it should contains
-            // only int, string, etc. Avoid storing object
-            return ['last-execution-id' => 0];
-       }
+        }
     }
 
 How are cron job scheduled ?

docs/source/installation/index.rst

@@ -56,7 +56,7 @@ We strongly encourage you to initialize a git repository at this step, to track
    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-RC3 champs-libres/wopi-lib dev-master@dev champs-libres/wopi-bundle dev-master@dev
+   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).
@@ -110,14 +110,15 @@ you can either:
   .. code-block:: env
 
      ADMIN_PASSWORD=\$2y\$13\$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm
-     # note: if you copy-paste the line above, the password will be "admin".
 
 - 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. 
+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
 **********************************
@@ -135,8 +136,6 @@ To continue the installation process, you will have to run migrations:
    symfony console messenger:setup-transports
    # prepare some views
    symfony console chill:db:sync-views
-   # generate jwt token, required for some api features (webdav access, ...)
-   symfony console lexik:jwt:generate-keypair
 
 .. warning::
 

package.json

@@ -27,7 +27,7 @@
     "popper.js": "^1.16.1",
     "postcss-loader": "^7.0.2",
     "raw-loader": "^4.0.2",
-    "sass-loader": "^14.0.0",
+    "sass-loader": "^13.0.0",
     "select2": "^4.0.13",
     "select2-bootstrap-theme": "0.1.0-beta.10",
     "style-loader": "^3.3.1",
@@ -58,7 +58,7 @@
     "vue": "^3.2.37",
     "vue-i18n": "^9.1.6",
     "vue-multiselect": "3.0.0-alpha.2",
-    "vue-toast-notification": "^3.1.2",
+    "vue-toast-notification": "^2.0",
     "vuex": "^4.0.0"
   },
   "browserslist": [

phpstan-baseline.neon

@@ -1,29 +1,34 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
 
 		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\:\\:\\$required \\(false\\) does not accept bool\\.$#"
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
 
 		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
 
 		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			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/ChillDocStoreBundle/Controller/DocumentPersonController.php
+			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+
+		-
+			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
 
 		-
 			message: "#^Variable \\$participation might not be defined\\.$#"
@@ -35,106 +40,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
 
-		-
-			message: "#^Comparison operation \"\\>\" between \\(bool\\|int\\|Redis\\) and 0 results in an error\\.$#"
-			count: 1
-			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php
-
-		-
-			message: "#^Variable \\$response might not be defined\\.$#"
-			count: 1
-			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php
-
-		-
-			message: "#^Function GuzzleHttp\\\\Psr7\\\\get not found\\.$#"
-			count: 1
-			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
-
-		-
-			message: "#^Function GuzzleHttp\\\\Psr7\\\\str not found\\.$#"
-			count: 2
-			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
-
-		-
-			message: "#^Parameter \\#1 \\$seconds of function sleep expects int, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php
-
-		-
-			message: "#^Parameter \\#1 \\$interval of method DateTimeImmutable\\:\\:add\\(\\) expects DateInterval, string\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Entity/Immersion.php
-
-		-
-			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Entity/Immersion.php
-
-		-
-			message: "#^Property Chill\\\\JobBundle\\\\Entity\\\\Rome\\\\Metier\\:\\:\\$appellations is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php
-
-		-
-			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListCSPerson\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php
-
-		-
-			message: "#^Variable \\$f might not be defined\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php
-
-		-
-			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListFrein\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Export/ListFrein.php
-
-		-
-			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListProjetProfessionnel\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php
-
-		-
-			message: "#^Property Chill\\\\JobBundle\\\\Form\\\\ChoiceLoader\\\\RomeAppellationChoiceLoader\\:\\:\\$appellationRepository \\(Chill\\\\JobBundle\\\\Repository\\\\Rome\\\\AppellationRepository\\) does not accept Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\JobBundle\\\\Entity\\\\Rome\\\\Appellation\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
-
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between array\\{\\} and Symfony\\\\Component\\\\Validator\\\\ConstraintViolationListInterface will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
-
-		-
-			message: "#^Variable \\$metier might not be defined\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#1 \\$interval of method DateTimeImmutable\\:\\:add\\(\\) expects DateInterval, string\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php
-
-		-
-			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php
-
 		-
 			message: "#^Cannot unset offset '_token' on array\\{formatter\\: mixed, export\\: mixed, centers\\: mixed, alias\\: string\\}\\.$#"
 			count: 1
@@ -160,31 +65,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:userHasAccessForCenter\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
-
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
-
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1

rector.php

@@ -28,9 +28,6 @@ return static function (RectorConfig $rectorConfig): void {
 
     // register a single rule
     $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
-    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeFromPropertyTypeRector::class);
-    $rectorConfig->rule(Rector\TypeDeclaration\Rector\Class_\MergeDateTimePropertyTypeDeclarationRector::class);
-    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector::class);
 
     // part of the symfony 54 rules
     $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
@@ -39,14 +36,14 @@ return static function (RectorConfig $rectorConfig): void {
 
     //define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_82,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_40,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_41,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_42,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_43,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_44,
+        \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\PHPUnit\Set\PHPUnitSetList::PHPUNIT_90,
+        \Rector\Doctrine\Set\DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
     ]);
 
     $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class, [
@@ -69,8 +66,9 @@ return static function (RectorConfig $rectorConfig): void {
 
     // skip some path...
     $rectorConfig->skip([
-        // waiting for fixing this bug: https://github.com/rectorphp/rector-doctrine/issues/342
-        \Rector\Doctrine\CodeQuality\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector::class,
+        // we must adapt service definition
+        \Rector\Symfony\Symfony28\Rector\MethodCall\GetToConstructorInjectionRector::class,
+        \Rector\Symfony\Symfony34\Rector\Closure\ContainerGetNameToTypeInTestsRector::class,
     ]);
 
     $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -68,7 +68,7 @@ final class ActivityController extends AbstractController
         private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
         private readonly PaginatorFactory $paginatorFactory,
-        private readonly ChillSecurity $security,
+        private readonly ChillSecurity $security
     ) {}
 
     /**
@@ -99,10 +99,10 @@ final class ActivityController extends AbstractController
 
         $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
 
-        if (Request::METHOD_POST === $request->getMethod()) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
-            if ($form->isSubmitted() && $form->isValid()) {
+            if ($form->isValid()) {
                 $this->logger->notice('An activity has been removed', [
                     'by_user' => $this->getUser()->getUsername(),
                     'activity_id' => $activity->getId(),
@@ -640,6 +640,7 @@ final class ActivityController extends AbstractController
 
         return $this->createFormBuilder()
             ->setAction($this->generateUrl('chill_activity_activity_delete', $params))
+            ->setMethod('DELETE')
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
     }

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -80,7 +80,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private \DateTime $date;
 
     /**
-     * @var Collection<int, StoredObject>
+     * @var Collection<StoredObject>
      */
     #[Assert\Valid(traverse: true)]
     #[ORM\ManyToMany(targetEntity: StoredObject::class, cascade: ['persist'])]
@@ -107,7 +107,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private ?Person $person = null;
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\Person>
+     * @var Collection<Person>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: Person::class)]
@@ -117,7 +117,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private PrivateCommentEmbeddable $privateComment;
 
     /**
-     * @var Collection<int, ActivityReason>
+     * @var Collection<ActivityReason>
      */
     #[Groups(['docgen:read'])]
     #[ORM\ManyToMany(targetEntity: ActivityReason::class)]
@@ -132,7 +132,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private string $sentReceived = '';
 
     /**
-     * @var Collection<int, \Chill\PersonBundle\Entity\SocialWork\SocialAction>
+     * @var Collection<SocialAction>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: SocialAction::class)]
@@ -140,7 +140,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private Collection $socialActions;
 
     /**
-     * @var Collection<int, SocialIssue>
+     * @var Collection<SocialIssue>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: SocialIssue::class)]
@@ -148,7 +148,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private Collection $socialIssues;
 
     /**
-     * @var Collection<int, ThirdParty>
+     * @var Collection<ThirdParty>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: ThirdParty::class)]
@@ -162,7 +162,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private ?User $user = null;
 
     /**
-     * @var Collection<int, User>
+     * @var Collection<User>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: User::class)]

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -79,9 +79,11 @@ class ActivityReason
     /**
      * Set active.
      *
+     * @param bool $active
+     *
      * @return ActivityReason
      */
-    public function setActive(bool $active)
+    public function setActive($active)
     {
         $this->active = $active;
 
@@ -108,9 +110,11 @@ class ActivityReason
     /**
      * Set name.
      *
+     * @param array $name
+     *
      * @return ActivityReason
      */
-    public function setName(array $name)
+    public function setName($name)
     {
         $this->name = $name;
 

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -40,9 +40,9 @@ class ActivityReasonCategory implements \Stringable
     /**
      * Array of ActivityReason.
      *
-     * @var Collection<int, ActivityReason>
+     * @var Collection<ActivityReason>
      */
-    #[ORM\OneToMany(mappedBy: 'category', targetEntity: ActivityReason::class)]
+    #[ORM\OneToMany(targetEntity: ActivityReason::class, mappedBy: 'category')]
     private Collection $reasons;
 
     /**

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

@@ -28,7 +28,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
     public function __construct(
         protected ActivityReasonCategoryRepository $activityReasonCategoryRepository,
         protected ActivityReasonRepository $activityReasonRepository,
-        protected TranslatableStringHelper $translatableStringHelper,
+        protected TranslatableStringHelper $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

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

@@ -26,7 +26,7 @@ class ActivityUsersJobAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly UserJobRepositoryInterface $userJobRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

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

@@ -26,7 +26,7 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

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

@@ -26,7 +26,7 @@ class CreatorJobAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly UserJobRepositoryInterface $userJobRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly TranslatableStringHelper $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

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

@@ -26,7 +26,7 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly ScopeRepository $scopeRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly TranslatableStringHelper $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/HouseholdAggregator.php

@@ -1,99 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Entity\Household\HouseholdMember;
-use Chill\PersonBundle\Repository\Household\HouseholdRepository;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-final readonly class HouseholdAggregator implements AggregatorInterface
-{
-    public function __construct(private HouseholdRepository $householdRepository) {}
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // nothing to add here
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getLabels($key, array $values, mixed $data)
-    {
-        return function (int|string|null $value): string|int {
-            if ('_header' === $value) {
-                return 'export.aggregator.person.by_household.household';
-            }
-
-            if ('' === $value || null === $value || null === $household = $this->householdRepository->find($value)) {
-                return '';
-            }
-
-            return $household->getId();
-        };
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['activity_household_agg'];
-    }
-
-    public function getTitle()
-    {
-        return 'export.aggregator.person.by_household.title';
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $qb->join(
-            HouseholdMember::class,
-            'activity_household_agg_household_member',
-            Join::WITH,
-            $qb->expr()->andX(
-                $qb->expr()->eq('activity_household_agg_household_member.person', 'activity.person'),
-                $qb->expr()->lte('activity_household_agg_household_member.startDate', 'activity.date'),
-                $qb->expr()->orX(
-                    $qb->expr()->gte('activity_household_agg_household_member.endDate', 'activity.date'),
-                    $qb->expr()->isNull('activity_household_agg_household_member.endDate')
-                )
-            )
-        );
-
-        $qb->join(
-            Household::class,
-            'activity_household_agg_household',
-            Join::WITH,
-            $qb->expr()->eq('activity_household_agg_household_member.household', 'activity_household_agg_household')
-        );
-
-        $qb
-            ->addSelect('activity_household_agg_household.id AS activity_household_agg')
-            ->addGroupBy('activity_household_agg');
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ACTIVITY_PERSON;
-    }
-}

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

@@ -19,7 +19,6 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
@@ -45,7 +44,6 @@ class ListActivity implements ListInterface, GroupedExportInterface
         'person_firstname',
         'person_lastname',
         'person_id',
-        'household_id',
     ];
     private readonly bool $filterStatsByCenters;
 
@@ -191,26 +189,19 @@ class ListActivity implements ListInterface, GroupedExportInterface
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
-        // throw an error if no fields are present
+        // throw an error if any fields are present
         if (!\array_key_exists('fields', $data)) {
-            throw new InvalidArgumentException('No fields have been checked.');
+            throw new InvalidArgumentException('Any fields have been checked.');
         }
 
         $qb = $this->entityManager->createQueryBuilder();
 
         $qb
             ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'person')
-            ->join(
-                HouseholdMember::class,
-                'householdmember',
-                Query\Expr\Join::WITH,
-                'person = householdmember.person AND householdmember.startDate <= activity.date AND (householdmember.endDate IS NULL OR householdmember.endDate > activity.date)'
-            )
-            ->join('householdmember.household', 'household');
+            ->join('activity.person', 'actperson');
 
         if ($this->filterStatsByCenters) {
-            $qb->join('person.centerHistory', 'centerHistory');
+            $qb->join('actperson.centerHistory', 'centerHistory');
             $qb->where(
                 $qb->expr()->andX(
                     $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
@@ -233,22 +224,17 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         break;
 
                     case 'person_firstname':
-                        $qb->addSelect('person.firstName AS person_firstname');
+                        $qb->addSelect('actperson.firstName AS person_firstname');
 
                         break;
 
                     case 'person_lastname':
-                        $qb->addSelect('person.lastName AS person_lastname');
+                        $qb->addSelect('actperson.lastName AS person_lastname');
 
                         break;
 
                     case 'person_id':
-                        $qb->addSelect('person.id AS person_id');
-
-                        break;
-
-                    case 'household_id':
-                        $qb->addSelect('household.id AS household_id');
+                        $qb->addSelect('actperson.id AS person_id');
 
                         break;
 
@@ -298,7 +284,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return ActivityStatsVoter::LISTS;
     }
 
-    public function supportsModifiers(): array
+    public function supportsModifiers()
     {
         return [
             Declarations::ACTIVITY,

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

@@ -42,7 +42,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         /**
          * The action for this report.
          */
-        protected string $action = 'sum',
+        protected string $action = 'sum'
     ) {
         $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
     }

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

@@ -39,7 +39,7 @@ class ListActivityHelper
         private readonly TranslatorInterface $translator,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
         private readonly TranslatableStringExportLabelHelper $translatableStringLabelHelper,
-        private readonly UserHelper $userHelper,
+        private readonly UserHelper $userHelper
     ) {}
 
     public function addSelect(QueryBuilder $qb): void
@@ -152,7 +152,7 @@ class ListActivityHelper
                     return '';
                 }
 
-                return $this->translator->trans((string) $value);
+                return $this->translator->trans($value);
             },
         };
     }

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

@@ -25,7 +25,7 @@ final readonly class ActivityPresenceFilter implements FilterInterface
 {
     public function __construct(
         private TranslatableStringHelperInterface $translatableStringHelper,
-        private TranslatorInterface $translator,
+        private TranslatorInterface $translator
     ) {}
 
     public function getTitle()

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

@@ -26,7 +26,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
 {
     public function __construct(
         protected TranslatableStringHelperInterface $translatableStringHelper,
-        protected ActivityTypeRepositoryInterface $activityTypeRepository,
+        protected ActivityTypeRepositoryInterface $activityTypeRepository
     ) {}
 
     public function addRole(): ?string

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

@@ -39,7 +39,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         // create a subquery for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
@@ -121,7 +121,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         ];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, $format = 'string')
     {
         return [
             [] === $data['reasons'] ?
@@ -141,7 +141,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         ];
     }
 
-    public function getTitle(): string
+    public function getTitle()
     {
         return 'export.filter.activity.person_between_dates.title';
     }

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

@@ -29,7 +29,7 @@ class UsersJobFilter implements FilterInterface
 
     public function __construct(
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly UserJobRepositoryInterface $userJobRepository,
+        private readonly UserJobRepositoryInterface $userJobRepository
     ) {}
 
     public function addRole(): ?string

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

@@ -29,7 +29,7 @@ class UsersScopeFilter implements FilterInterface
 
     public function __construct(
         private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -59,7 +59,7 @@ class ActivityType extends AbstractType
         protected TranslatableStringHelper $translatableStringHelper,
         protected array $timeChoices,
         protected SocialIssueRender $socialIssueRender,
-        protected SocialActionRender $socialActionRender,
+        protected SocialActionRender $socialActionRender
     ) {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
             throw new \RuntimeException('you should have a valid user');

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

@@ -27,7 +27,7 @@ class PickActivityReasonType extends AbstractType
     public function __construct(
         private readonly ActivityReasonRepository $activityReasonRepository,
         private readonly ActivityReasonRender $reasonRender,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
     ) {}
 
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php

@@ -32,7 +32,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         private EntityManagerInterface $em,
         private CenterResolverManagerInterface $centerResolverManager,
         private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser,
-        private Security $security,
+        private Security $security
     ) {}
 
     public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface

src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php

@@ -25,7 +25,7 @@ class ActivityReasonRepository extends ServiceEntityRepository
 {
     public function __construct(
         ManagerRegistry $registry,
-        private readonly RequestStack $requestStack,
+        private readonly RequestStack $requestStack
     ) {
         parent::__construct($registry, ActivityReason::class);
     }

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php

@@ -15,9 +15,9 @@ use Chill\ActivityBundle\Entity\ActivityType;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final readonly class ActivityTypeRepository implements ActivityTypeRepositoryInterface
+final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {

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

@@ -87,6 +87,7 @@
                             <li>
                                 {% if bloc.type == 'user' %}
                                     <span class="badge-user">
+                                        hello
                                         {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
                                     </span>
                                 {% else %}

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php

@@ -75,7 +75,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
 
     public function __construct(
         protected Security $security,
-        VoterHelperFactoryInterface $voterHelperFactory,
+        VoterHelperFactoryInterface $voterHelperFactory
     ) {
         $this->voterHelper = $voterHelperFactory->generate(self::class)
             ->addCheckFor(Person::class, [self::SEE, self::CREATE])

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

@@ -50,7 +50,7 @@ class ActivityContext implements
         private readonly TranslatorInterface $translator,
         private readonly BaseContextData $baseContextData,
         private readonly ThirdPartyRender $thirdPartyRender,
-        private readonly ThirdPartyRepository $thirdPartyRepository,
+        private readonly ThirdPartyRepository $thirdPartyRepository
     ) {}
 
     public function adminFormReverseTransform(array $data): array

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

@@ -56,7 +56,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
         private readonly SocialIssueRepository $socialIssueRepository,
         private readonly ThirdPartyRepository $thirdPartyRepository,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly UserRepository $userRepository,
+        private readonly UserRepository $userRepository
     ) {}
 
     public function adminFormReverseTransform(array $data): array

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

@@ -76,7 +76,7 @@ final class TranslatableActivityReasonTest extends TypeTestCase
      */
     protected function getTranslatableStringHelper(
         $locale = 'en',
-        $fallbackLocale = 'en',
+        $fallbackLocale = 'en'
     ) {
         $prophet = new \Prophecy\Prophet();
         $requestStack = $prophet->prophesize();

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

@@ -138,7 +138,7 @@ final class ActivityVoterTest extends KernelTestCase
         Scope $scope,
         Center $center,
         $attribute,
-        $message,
+        $message
     ) {
         $token = $this->prepareToken($user);
         $activity = $this->prepareActivity($scope, $this->preparePerson($center));

src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php

@@ -32,7 +32,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
         protected EntityManagerInterface $em,
         protected AuthorizationHelperInterface $helper,
         TokenStorageInterface $storage,
-        protected ActivityACLAwareRepository $aclAwareRepository,
+        protected ActivityACLAwareRepository $aclAwareRepository
     ) {
         if (!$storage->getToken()->getUser() instanceof User) {
             throw new \RuntimeException('A user should be authenticated !');

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

@@ -243,7 +243,3 @@ services:
     Chill\ActivityBundle\Export\Aggregator\PersonAggregators\PersonAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_person_agg }
-
-    Chill\ActivityBundle\Export\Aggregator\PersonAggregators\HouseholdAggregator:
-        tags:
-            - { name: chill.export_aggregator, alias: activity_household_agg }

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

@@ -428,9 +428,6 @@ export:
             by_person:
                 title: Grouper les échanges par usager (dossier d'usager dans lequel l'échange est enregistré)
                 person: Usager
-            by_household:
-                title: Grouper les échanges par ménage
-                household: Identifiant ménage
         acp:
             by_activity_type:
                 title: Grouper les parcours par type d'échange

src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php

@@ -25,7 +25,7 @@ final class AsideActivityController extends CRUDController
 {
     public function __construct(
         private readonly AsideActivityCategoryRepository $categoryRepository,
-        private readonly Security $security,
+        private readonly Security $security
     ) {}
 
     public function createEntity(string $action, Request $request): object
@@ -76,7 +76,7 @@ final class AsideActivityController extends CRUDController
         string $action,
         $query,
         Request $request,
-        PaginatorInterface $paginator,
+        PaginatorInterface $paginator
     ) {
         if ('index' === $action) {
             return $query->orderBy('e.date', 'DESC');

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

@@ -22,9 +22,9 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 class AsideActivityCategory
 {
     /**
-     * @var Collection<int, AsideActivityCategory>
+     * @var Collection<AsideActivityCategory>
      */
-    #[ORM\OneToMany(mappedBy: 'parent', targetEntity: AsideActivityCategory::class)]
+    #[ORM\OneToMany(targetEntity: AsideActivityCategory::class, mappedBy: 'parent')]
     private Collection $children;
 
     #[ORM\Id]

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

@@ -22,7 +22,7 @@ class ByActivityTypeAggregator implements AggregatorInterface
 {
     public function __construct(
         private readonly AsideActivityCategoryRepository $asideActivityCategoryRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly TranslatableStringHelper $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

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

@@ -26,7 +26,7 @@ class ByUserJobAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly UserJobRepositoryInterface $userJobRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

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

@@ -26,7 +26,7 @@ class ByUserScopeAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

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

@@ -41,7 +41,7 @@ final readonly class ListAsideActivity implements ListInterface, GroupedExportIn
         private AsideActivityCategoryRepository $asideActivityCategoryRepository,
         private CategoryRender $categoryRender,
         private LocationRepository $locationRepository,
-        private TranslatableStringHelperInterface $translatableStringHelper,
+        private TranslatableStringHelperInterface $translatableStringHelper
     ) {}
 
     public function buildForm(FormBuilderInterface $builder) {}

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

@@ -27,7 +27,7 @@ class ByActivityTypeFilter implements FilterInterface
     public function __construct(
         private readonly CategoryRender $categoryRender,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly AsideActivityCategoryRepository $asideActivityTypeRepository,
+        private readonly AsideActivityCategoryRepository $asideActivityTypeRepository
     ) {}
 
     public function addRole(): ?string

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

@@ -24,7 +24,7 @@ use Symfony\Component\Security\Core\Security;
 final readonly class ByLocationFilter implements FilterInterface
 {
     public function __construct(
-        private Security $security,
+        private Security $security
     ) {}
 
     public function getTitle(): string

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

@@ -29,7 +29,7 @@ class ByUserJobFilter implements FilterInterface
 
     public function __construct(
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly UserJobRepositoryInterface $userJobRepository,
+        private readonly UserJobRepositoryInterface $userJobRepository
     ) {}
 
     public function addRole(): ?string

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

@@ -29,7 +29,7 @@ class ByUserScopeFilter implements FilterInterface
 
     public function __construct(
         private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

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

@@ -44,7 +44,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         CountNotificationTask $counter,
         TokenStorageInterface $tokenStorage,
         TranslatorInterface $translator,
-        AuthorizationCheckerInterface $authorizationChecker,
+        AuthorizationCheckerInterface $authorizationChecker
     ) {
         $this->counter = $counter;
         $this->tokenStorage = $tokenStorage;

src/Bundle/ChillAsideActivityBundle/src/Security/AsideActivityVoter.php

@@ -26,7 +26,7 @@ class AsideActivityVoter extends AbstractChillVoter implements ProvideRoleHierar
     private readonly VoterHelperInterface $voterHelper;
 
     public function __construct(
-        VoterHelperFactoryInterface $voterHelperFactory,
+        VoterHelperFactoryInterface $voterHelperFactory
     ) {
         $this->voterHelper = $voterHelperFactory
             ->generate(self::class)

src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php

@@ -54,7 +54,7 @@ abstract class AbstractElementController extends AbstractController
             $indexPage = 'chill_budget_elements_household_index';
         }
 
-        if (Request::METHOD_POST === $request->getMethod()) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isSubmitted() && $form->isValid()) {
@@ -198,9 +198,10 @@ abstract class AbstractElementController extends AbstractController
     /**
      * Creates a form to delete a help request entity by id.
      */
-    private function createDeleteForm(): \Symfony\Component\Form\FormInterface
+    private function createDeleteForm(): Form
     {
         return $this->createFormBuilder()
+            ->setMethod(Request::METHOD_DELETE)
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
     }

src/Bundle/ChillBudgetBundle/Entity/Charge.php

@@ -100,7 +100,7 @@ class Charge extends AbstractElement implements HasCentersInterface
         return $this;
     }
 
-    public function setHelp(?string $help)
+    public function setHelp($help)
     {
         $this->help = $help;
 

src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php

@@ -15,9 +15,9 @@ use Chill\BudgetBundle\Entity\ChargeKind;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final readonly class ChargeKindRepository implements ChargeKindRepositoryInterface
+final class ChargeKindRepository implements ChargeKindRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {

src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php

@@ -15,9 +15,9 @@ use Chill\BudgetBundle\Entity\ResourceKind;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final readonly class ResourceKindRepository implements ResourceKindRepositoryInterface
+final class ResourceKindRepository implements ResourceKindRepositoryInterface
 {
-    private EntityRepository $repository;
+    private readonly EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {

src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php

@@ -47,7 +47,7 @@ class SendTestShortMessageOnCalendarCommand extends Command
         private readonly PhoneNumberHelperInterface $phoneNumberHelper,
         private readonly ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder,
         private readonly ShortMessageTransporterInterface $transporter,
-        private readonly UserRepositoryInterface $userRepository,
+        private readonly UserRepositoryInterface $userRepository
     ) {
         parent::__construct('chill:calendar:test-send-short-message');
     }

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -59,7 +59,7 @@ class CalendarController extends AbstractController
         private readonly AccompanyingPeriodRepository $accompanyingPeriodRepository,
         private readonly UserRepositoryInterface $userRepository,
         private readonly TranslatorInterface $translator,
-        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
+        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry
     ) {}
 
     /**
@@ -84,7 +84,7 @@ class CalendarController extends AbstractController
 
         $form = $this->createDeleteForm($entity);
 
-        if (Request::METHOD_POST === $request->getMethod()) {
+        if (Request::METHOD_DELETE === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -512,6 +512,7 @@ class CalendarController extends AbstractController
     {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl('chill_calendar_calendar_delete', ['id' => $calendar->getId()]))
+            ->setMethod('DELETE')
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
     }

src/Bundle/ChillCalendarBundle/Entity/Calendar.php

@@ -103,7 +103,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private int $dateTimeVersion = 0;
 
     /**
-     * @var Collection<int, \Chill\CalendarBundle\Entity\CalendarDoc>
+     * @var Collection<CalendarDoc>
      */
     #[ORM\OneToMany(mappedBy: 'calendar', targetEntity: CalendarDoc::class, orphanRemoval: true)]
     private Collection $documents;
@@ -120,7 +120,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private ?int $id = null;
 
     /**
-     * @var \Doctrine\Common\Collections\Collection<int, \Chill\CalendarBundle\Entity\Invite>&Selectable
+     * @var Collection&Selectable<int, Invite>
      */
     #[Serializer\Groups(['read', 'docgen:read'])]
     #[ORM\OneToMany(mappedBy: 'calendar', targetEntity: Invite::class, cascade: ['persist', 'remove', 'merge', 'detach'], orphanRemoval: true)]
@@ -143,7 +143,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private ?Person $person = null;
 
     /**
-     * @var Collection<int, Person>
+     * @var Collection<Person>
      */
     #[Serializer\Groups(['calendar:read', 'read', 'calendar:light', 'docgen:read'])]
     #[Assert\Count(min: 1, minMessage: 'calendar.At least {{ limit }} person is required.')]
@@ -157,7 +157,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private PrivateCommentEmbeddable $privateComment;
 
     /**
-     * @var Collection<int, ThirdParty>
+     * @var Collection<ThirdParty>
      */
     #[Serializer\Groups(['calendar:read', 'read', 'calendar:light', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: ThirdParty::class)]

src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php

@@ -47,7 +47,7 @@ class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
         Calendar $calendar,
         #[ORM\ManyToOne(targetEntity: StoredObject::class, cascade: ['persist'])]
         #[ORM\JoinColumn(nullable: false)]
-        private ?StoredObject $storedObject,
+        private ?StoredObject $storedObject
     ) {
         $this->setCalendar($calendar);
         $this->datetimeVersion = $calendar->getDateTimeVersion();

src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php

@@ -26,7 +26,7 @@ final readonly class JobAggregator implements AggregatorInterface
 
     public function __construct(
         private UserJobRepository $jobRepository,
-        private TranslatableStringHelper $translatableStringHelper,
+        private TranslatableStringHelper $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php

@@ -26,7 +26,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
 
     public function __construct(
         private ScopeRepository $scopeRepository,
-        private TranslatableStringHelper $translatableStringHelper,
+        private TranslatableStringHelper $translatableStringHelper
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php

@@ -28,7 +28,7 @@ final readonly class JobFilter implements FilterInterface
 
     public function __construct(
         private TranslatableStringHelper $translatableStringHelper,
-        private UserJobRepositoryInterface $userJobRepository,
+        private UserJobRepositoryInterface $userJobRepository
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php

@@ -30,7 +30,7 @@ class ScopeFilter implements FilterInterface
     public function __construct(
         protected TranslatorInterface $translator,
         private readonly TranslatableStringHelper $translatableStringHelper,
-        private readonly ScopeRepositoryInterface $scopeRepository,
+        private readonly ScopeRepositoryInterface $scopeRepository
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillCalendarBundle/Form/CalendarType.php

@@ -37,7 +37,7 @@ class CalendarType extends AbstractType
         private readonly IdToUsersDataTransformer $idToUsersDataTransformer,
         private readonly IdToLocationDataTransformer $idToLocationDataTransformer,
         private readonly ThirdPartiesToIdDataTransformer $partiesToIdDataTransformer,
-        private readonly IdToCalendarRangeDataTransformer $calendarRangeDataTransformer,
+        private readonly IdToCalendarRangeDataTransformer $calendarRangeDataTransformer
     ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)

src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php

@@ -46,7 +46,7 @@ class CalendarMessage
     public function __construct(
         Calendar $calendar,
         private readonly string $action,
-        User $byUser,
+        User $byUser
     ) {
         $this->calendarId = $calendar->getId();
         $this->byUserId = $byUser->getId();

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSUserAbsenceReader.php

@@ -59,7 +59,7 @@ final readonly class MSUserAbsenceReader implements MSUserAbsenceReaderInterface
             'alwaysEnabled' => true,
             'scheduled' => RemoteEventConverter::convertStringDateWithoutTimezone($automaticRepliesSettings['scheduledStartDateTime']['dateTime']) < $this->clock->now()
                 && RemoteEventConverter::convertStringDateWithoutTimezone($automaticRepliesSettings['scheduledEndDateTime']['dateTime']) > $this->clock->now(),
-            default => throw new UserAbsenceSyncException('this status is not documented by Microsoft'),
+            default => throw new UserAbsenceSyncException('this status is not documented by Microsoft')
         };
     }
 }

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MapCalendarToUser.php

@@ -177,7 +177,7 @@ class MapCalendarToUser
         User $user,
         int $expiration,
         ?string $id = null,
-        ?string $secret = null,
+        ?string $secret = null
     ): void {
         $user->setAttributeByDomain(self::METADATA_KEY, self::EXPIRATION_SUBSCRIPTION_EVENT, $expiration);
 

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php

@@ -57,7 +57,7 @@ class RemoteEventConverter
         private readonly LocationConverter $locationConverter,
         private readonly LoggerInterface $logger,
         private readonly PersonRenderInterface $personRender,
-        private readonly TranslatorInterface $translator,
+        private readonly TranslatorInterface $translator
     ) {
         $this->defaultDateTimeZone = (new \DateTimeImmutable())->getTimezone();
         $this->remoteDateTimeZone = self::getRemoteTimeZone();

src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php

@@ -351,7 +351,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         [
             'id' => $id,
             'lastModifiedDateTime' => $lastModified,
-            'changeKey' => $changeKey,
+            'changeKey' => $changeKey
         ] = $this->createOnRemote($eventData, $calendar->getMainUser(), 'calendar_'.$calendar->getId());
 
         if (null === $id) {
@@ -427,7 +427,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
         [
             'id' => $id,
             'lastModifiedDateTime' => $lastModified,
-            'changeKey' => $changeKey,
+            'changeKey' => $changeKey
         ] = $this->createOnRemote(
             $eventData,
             $calendarRange->getUser(),
@@ -564,7 +564,7 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
             [
                 'id' => $id,
                 'lastModifiedDateTime' => $lastModified,
-                'changeKey' => $changeKey,
+                'changeKey' => $changeKey
             ] = $this->patchOnRemote(
                 $calendar->getRemoteId(),
                 $eventData,

src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php

@@ -33,6 +33,6 @@ class RemoteEvent
         #[Serializer\Groups(['read'])]
         public \DateTimeImmutable $endDate,
         #[Serializer\Groups(['read'])]
-        public bool $isAllDay = false,
+        public bool $isAllDay = false
     ) {}
 }

src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php

@@ -65,7 +65,7 @@ class CalendarRangeRepository implements ObjectRepository
         \DateTimeImmutable $from,
         \DateTimeImmutable $to,
         ?int $limit = null,
-        ?int $offset = null,
+        ?int $offset = null
     ): array {
         $qb = $this->buildQueryAvailableRangesForUser($user, $from, $to);
 

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="row">
     <div class="col-sm">
-      <label class="form-label">{{ $t("created_availabilities") }}</label>
+      <label class="form-label">{{ $t('created_availabilities') }}</label>
       <vue-multiselect
         v-model="pickedLocation"
         :options="locations"
@@ -14,15 +14,10 @@
       ></vue-multiselect>
     </div>
   </div>
-  <div
-    class="display-options row justify-content-between"
-    style="margin-top: 1rem"
-  >
+  <div class="display-options row justify-content-between" style="margin-top: 1rem;">
     <div class="col-sm-9 col-xs-12">
       <div class="input-group mb-3">
-        <label class="input-group-text" for="slotDuration"
-          >Durée des créneaux</label
-        >
+        <label class="input-group-text" for="slotDuration">Durée des créneaux</label>
         <select v-model="slotDuration" id="slotDuration" class="form-select">
           <option value="00:05:00">5 minutes</option>
           <option value="00:10:00">10 minutes</option>
@@ -63,20 +58,13 @@
         </select>
       </div>
     </div>
-    <div class="col-xs-12 col-sm-3">
+    <div class="col-sm-3 col-xs-12">
       <div class="float-end">
         <div class="form-check input-group">
           <span class="input-group-text">
-            <input
-              id="showHideWE"
-              class="mt-0"
-              type="checkbox"
-              v-model="showWeekends"
-            />
+            <input id="showHideWE" class="mt-0" type="checkbox" v-model="showWeekends">
           </span>
-          <label for="showHideWE" class="form-check-label input-group-text"
-            >Week-ends</label
-          >
+          <label for="showHideWE" class="form-check-label input-group-text">Week-ends</label>
         </div>
       </div>
     </div>
@@ -84,86 +72,39 @@
   <FullCalendar :options="calendarOptions" ref="calendarRef">
     <template v-slot:eventContent="arg: EventApi">
       <span :class="eventClasses(arg.event)">
-        <b v-if="arg.event.extendedProps.is === 'remote'">{{
-          arg.event.title
-        }}</b>
-        <b v-else-if="arg.event.extendedProps.is === 'range'"
-          >{{ arg.timeText }} - {{ arg.event.extendedProps.locationName }}</b
-        >
-        <b v-else-if="arg.event.extendedProps.is === 'local'">{{
-          arg.event.title
-        }}</b>
-        <b v-else>no 'is'</b>
-        <a
-          v-if="arg.event.extendedProps.is === 'range'"
-          class="fa fa-fw fa-times delete"
-          @click.prevent="onClickDelete(arg.event)"
-        >
-        </a>
-      </span>
+          <b v-if="arg.event.extendedProps.is === 'remote'">{{ arg.event.title}}</b>
+          <b v-else-if="arg.event.extendedProps.is === 'range'">{{ arg.timeText }} - {{ arg.event.extendedProps.locationName }}</b>
+          <b v-else-if="arg.event.extendedProps.is === 'local'">{{ arg.event.title}}</b>
+          <b v-else >no 'is'</b>
+          <a v-if="arg.event.extendedProps.is === 'range'" class="fa fa-fw fa-times delete"
+             @click.prevent="onClickDelete(arg.event)">
+          </a>
+        </span>
     </template>
   </FullCalendar>
 
   <div id="copy-widget">
-    <div class="container mt-2 mb-2">
-
-        <div class="row justify-content-between align-items-center mb-4">
-          <div class="col-xs-12 col-sm-3 col-md-2">
-            <h6 class="chill-red">{{ $t("copy_range_from_to") }}</h6>
-          </div>
-          <div class="col-xs-12 col-sm-9 col-md-2">
-            <select v-model="dayOrWeek" id="dayOrWeek" class="form-select">
-              <option value="day">{{ $t("from_day_to_day") }}</option>
-              <option value="week">{{ $t("from_week_to_week") }}</option>
-            </select>
-          </div>
-          <template v-if="dayOrWeek === 'day'">
-            <div class="col-xs-12 col-sm-3 col-md-3">
-              <input class="form-control" type="date" v-model="copyFrom" />
-            </div>
-            <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
-              <i class="fa fa-angle-double-right"></i>
-            </div>
-            <div class="col-xs-12 col-sm-3 col-md-3">
-              <input class="form-control" type="date" v-model="copyTo" />
-            </div>
-            <div class="col-xs-12 col-sm-5 col-md-1">
-              <button class="btn btn-action float-end" @click="copyDay">
-                {{ $t("copy_range") }}
-              </button>
-            </div>
-          </template>
-          <template v-else>
-            <div class="col-xs-12 col-sm-3 col-md-3">
-              <select
-                v-model="copyFromWeek"
-                id="copyFromWeek"
-                class="form-select"
-              >
-                <option v-for="w in lastWeeks" :value="w.value" :key="w.value">
-                  {{ w.text }}
-                </option>
-              </select>
-            </div>
-            <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
-              <i class="fa fa-angle-double-right"></i>
-            </div>
-            <div class="col-xs-12 col-sm-3 col-md-3">
-              <select v-model="copyToWeek" id="copyToWeek" class="form-select">
-                <option v-for="w in nextWeeks" :value="w.value" :key="w.value">
-                  {{ w.text }}
-                </option>
-              </select>
-            </div>
-            <div class="col-xs-12 col-sm-5 col-md-1">
-              <button class="btn btn-action float-end" @click="copyWeek">
-                {{ $t("copy_range") }}
-              </button>
-            </div>
-          </template>
+    <div class="container">
+      <div class="row align-items-center">
+        <div class="col-sm-4 col-xs-12">
+          <h6 class="chill-red">{{ $t('copy_range_from_to') }}</h6>
+        </div>
+        <div class="col-sm-3 col-xs-12">
+          <input class="form-control" type="date" v-model="copyFrom" />
+        </div>
+        <div class="col-sm-1 col-xs-12" style="text-align: center; font-size: x-large;">
+          <i class="fa fa-angle-double-right"></i>
+        </div>
+        <div class="col-sm-3 col-xs-12" >
+          <input class="form-control" type="date" v-model="copyTo" />
+        </div>
+        <div class="col-sm-1">
+          <button class="btn btn-action" @click="copyDay">
+            {{ $t('copy_range') }}
+          </button>
         </div>
       </div>
-
+    </div>
   </div>
 
   <!-- not directly seen, but include in a modal -->
@@ -171,95 +112,42 @@
 </template>
 
 <script setup lang="ts">
+
 import type {
   CalendarOptions,
   DatesSetArg,
-  EventInput,
-} from "@fullcalendar/core";
-import { reactive, computed, ref, onMounted } from "vue";
-import { useStore } from "vuex";
-import { key } from "./store";
-import FullCalendar from "@fullcalendar/vue3";
-import frLocale from "@fullcalendar/core/locales/fr";
-import interactionPlugin, {
-  DropArg,
-  EventResizeDoneArg,
-} from "@fullcalendar/interaction";
+  EventInput
+} from '@fullcalendar/core';
+import {reactive, computed, ref} from "vue";
+import {useStore} from "vuex";
+import {key} from './store';
+import FullCalendar from '@fullcalendar/vue3';
+import frLocale from '@fullcalendar/core/locales/fr';
+import interactionPlugin, {DropArg, EventResizeDoneArg} from "@fullcalendar/interaction";
 import timeGridPlugin from "@fullcalendar/timegrid";
-import {
-  EventApi,
-  DateSelectArg,
-  EventDropArg,
-  EventClickArg,
-} from "@fullcalendar/core";
-import {
-  dateToISO,
-  ISOToDate,
-} from "../../../../../ChillMainBundle/Resources/public/chill/js/date";
+import {EventApi, DateSelectArg, EventDropArg, EventClickArg} from "@fullcalendar/core";
+import {ISOToDate} from "../../../../../ChillMainBundle/Resources/public/chill/js/date";
 import VueMultiselect from "vue-multiselect";
-import { Location } from "../../../../../ChillMainBundle/Resources/public/types";
+import {Location} from "../../../../../ChillMainBundle/Resources/public/types";
 import EditLocation from "./Components/EditLocation.vue";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
 
 const store = useStore(key);
 
-const { t } = useI18n();
+const {t} = useI18n();
 
 const showWeekends = ref(false);
-const slotDuration = ref("00:15:00");
-const slotMinTime = ref("09:00:00");
-const slotMaxTime = ref("18:00:00");
+const slotDuration = ref('00:05:00');
+const slotMinTime = ref('09:00:00');
+const slotMaxTime = ref('18:00:00');
 const copyFrom = ref<string | null>(null);
 const copyTo = ref<string | null>(null);
-const editLocation = ref<InstanceType<typeof EditLocation> | null>(null);
-const dayOrWeek = ref("day");
-const copyFromWeek = ref<string | null>(null);
-const copyToWeek = ref<string | null>(null);
-
-interface Weeks {
-  value: string | null;
-  text: string;
-}
-
-const getMonday = (week: number): Date => {
-  const lastMonday = new Date();
-  lastMonday.setDate(
-    lastMonday.getDate() - ((lastMonday.getDay() + 6) % 7) + week * 7
-  );
-  return lastMonday;
-};
-
-const dateOptions: Intl.DateTimeFormatOptions = {
-  weekday: "long",
-  year: "numeric",
-  month: "long",
-  day: "numeric",
-};
-
-const lastWeeks = computed((): Weeks[] =>
-  Array.from(Array(30).keys()).map((w) => {
-    const lastMonday = getMonday(15-w);
-    return {
-      value: dateToISO(lastMonday),
-      text: `Semaine du ${lastMonday.toLocaleDateString("fr-FR", dateOptions)}`,
-    };
-  })
-);
-
-const nextWeeks = computed((): Weeks[] =>
-  Array.from(Array(52).keys()).map((w) => {
-    const nextMonday = getMonday(w + 1);
-    return {
-      value: dateToISO(nextMonday),
-      text: `Semaine du ${nextMonday.toLocaleDateString("fr-FR", dateOptions)}`,
-    };
-  })
-);
+const editLocation = ref<InstanceType<typeof EditLocation> | null>(null)
 
 const baseOptions = ref<CalendarOptions>({
   locale: frLocale,
   plugins: [interactionPlugin, timeGridPlugin],
-  initialView: "timeGridWeek",
+  initialView: 'timeGridWeek',
   initialDate: new Date(),
   scrollTimeReset: false,
   selectable: true,
@@ -276,9 +164,9 @@ const baseOptions = ref<CalendarOptions>({
   selectMirror: false,
   editable: true,
   headerToolbar: {
-    left: "prev,next today",
-    center: "title",
-    right: "timeGridWeek,timeGridDay",
+    left: 'prev,next today',
+    center: 'title',
+    right: 'timeGridWeek,timeGridDay'
   },
 });
 
@@ -292,23 +180,20 @@ const locations = computed<Location[]>(() => {
 
 const pickedLocation = computed<Location | null>({
   get(): Location | null {
-    return (
-      store.state.locations.locationPicked ||
-      store.state.locations.currentLocation
-    );
+    return store.state.locations.locationPicked || store.state.locations.currentLocation;
   },
   set(newLocation: Location | null): void {
-    store.commit("locations/setLocationPicked", newLocation, { root: true });
-  },
-});
+    store.commit('locations/setLocationPicked', newLocation, {root: true});
+  }
+})
 
 /**
  * return the show classes for the event
  * @param arg
  */
-const eventClasses = function (arg: EventApi): object {
-  return { calendarRangeItems: true };
-};
+const eventClasses = function(arg: EventApi): object {
+  return {'calendarRangeItems': true};
+}
 
 /*
 // currently, all events are stored into calendarRanges, due to reactivity bug
@@ -345,60 +230,51 @@ const calendarOptions = computed((): CalendarOptions => {
  * launched when the calendar range date change
  */
 function onDatesSet(event: DatesSetArg): void {
-  store.dispatch("fullCalendar/setCurrentDatesView", {
-    start: event.start,
-    end: event.end,
-  });
+  store.dispatch('fullCalendar/setCurrentDatesView', {start: event.start, end: event.end});
 }
 
 function onDateSelect(event: DateSelectArg): void {
+
   if (null === pickedLocation.value) {
-    window.alert(
-      "Indiquez une localisation avant de créer une période de disponibilité."
-    );
+    window.alert("Indiquez une localisation avant de créer une période de disponibilité.");
     return;
   }
 
-  store.dispatch("calendarRanges/createRange", {
-    start: event.start,
-    end: event.end,
-    location: pickedLocation.value,
-  });
+  store.dispatch('calendarRanges/createRange', {start: event.start, end: event.end, location: pickedLocation.value});
 }
 
 /**
  * When a calendar range is deleted
  */
 function onClickDelete(event: EventApi): void {
-  if (event.extendedProps.is !== "range") {
+  console.log('onClickDelete', event);
+
+  if (event.extendedProps.is !== 'range') {
     return;
   }
 
-  store.dispatch(
-    "calendarRanges/deleteRange",
-    event.extendedProps.calendarRangeId
-  );
+  store.dispatch('calendarRanges/deleteRange', event.extendedProps.calendarRangeId);
 }
 
 function onEventDropOrResize(payload: EventDropArg | EventResizeDoneArg) {
-  if (payload.event.extendedProps.is !== "range") {
+  if (payload.event.extendedProps.is !== 'range') {
     return;
   }
   const changedEvent = payload.event;
 
-  store.dispatch("calendarRanges/patchRangeTime", {
+  store.dispatch('calendarRanges/patchRangeTime', {
     calendarRangeId: payload.event.extendedProps.calendarRangeId,
     start: payload.event.start,
     end: payload.event.end,
   });
-}
+};
 
 function onEventClick(payload: EventClickArg): void {
   // @ts-ignore TS does not recognize the target. But it does exists.
-  if (payload.jsEvent.target.classList.contains("delete")) {
+  if (payload.jsEvent.target.classList.contains('delete')) {
     return;
   }
-  if (payload.event.extendedProps.is !== "range") {
+  if (payload.event.extendedProps.is !== 'range') {
     return;
   }
 
@@ -409,26 +285,10 @@ function copyDay() {
   if (null === copyFrom.value || null === copyTo.value) {
     return;
   }
-  store.dispatch("calendarRanges/copyFromDayToAnotherDay", {
-    from: ISOToDate(copyFrom.value),
-    to: ISOToDate(copyTo.value),
-  });
+
+  store.dispatch('calendarRanges/copyFromDayToAnotherDay', {from: ISOToDate(copyFrom.value), to: ISOToDate(copyTo.value)})
 }
 
-function copyWeek() {
-  if (null === copyFromWeek.value || null === copyToWeek.value) {
-    return;
-  }
-  store.dispatch("calendarRanges/copyFromWeekToAnotherWeek", {
-    fromMonday: ISOToDate(copyFromWeek.value),
-    toMonday: ISOToDate(copyToWeek.value),
-  });
-}
-
-onMounted(() => {
-  copyFromWeek.value = dateToISO(getMonday(0));
-  copyToWeek.value = dateToISO(getMonday(1));
-});
 </script>
 
 <style scoped>
@@ -439,9 +299,4 @@ onMounted(() => {
   z-index: 9999999999;
   padding: 0.25rem 0 0.25rem;
 }
-div.copy-chevron {
-  text-align: center;
-  font-size: x-large;
-  width: 2rem;
-}
 </style>

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.ts

@@ -5,9 +5,11 @@ const appMessages = {
       show_my_calendar: "Afficher mon calendrier",
       show_weekends: "Afficher les week-ends",
       copy_range: "Copier",
-      copy_range_from_to: "Copier les plages",
-      from_day_to_day: "d'un jour à l'autre",
-      from_week_to_week: "d'une semaine à l'autre",
+      copy_range_from_to: "Copier les plages d'un jour à l'autre",
+      copy_range_to_next_day: "Copier les plages du jour au jour suivant",
+      copy_range_from_day: "Copier les plages du ",
+      to_the_next_day: " au jour suivant",
+      copy_range_to_next_week: "Copier les plages de la semaine à la semaine suivante",
       copy_range_how_to: "Créez les plages de disponibilités durant une journée et copiez-les facilement au jour suivant avec ce bouton. Si les week-ends sont cachés, le jour suivant un vendredi sera le lundi.",
       new_range_to_save: "Nouvelles plages à enregistrer",
       update_range_to_save: "Plages à modifier",

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts

@@ -52,23 +52,6 @@ export default <Module<CalendarRangesState, State>>{
         }
       }
 
-      return founds;
-    },
-    getRangesOnWeek: (state: CalendarRangesState) => (mondayDate: Date): EventInputCalendarRange[] => {
-      const founds = [];
-      for (let d of Array.from(Array(7).keys())) {
-        const dateOfWeek = new Date(mondayDate);
-        dateOfWeek.setDate(mondayDate.getDate() + d);
-        const dateStr = <string>dateToISO(dateOfWeek);
-        for (let range of state.ranges) {
-          if (isEventInputCalendarRange(range)
-            && range.start.startsWith(dateStr)
-          ) {
-            founds.push(range);
-          }
-        }
-      }
-
       return founds;
     },
   },
@@ -255,7 +238,7 @@ export default <Module<CalendarRangesState, State>>{
 
       for (let r of rangesToCopy) {
         let start = new Date(<Date>ISOToDatetime(r.start));
-        start.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
+        start.setFullYear(to.getFullYear(), to.getMonth(), to.getDate())
         let end = new Date(<Date>ISOToDatetime(r.end));
         end.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
         let location = ctx.rootGetters['locations/getLocationById'](r.locationId);
@@ -263,23 +246,6 @@ export default <Module<CalendarRangesState, State>>{
         promises.push(ctx.dispatch('createRange', {start, end, location}));
       }
 
-      return Promise.all(promises).then(_ => Promise.resolve(null));
-    },
-    copyFromWeekToAnotherWeek(ctx, {fromMonday, toMonday}: {fromMonday: Date, toMonday: Date}): Promise<null> {
-
-      const rangesToCopy: EventInputCalendarRange[] = ctx.getters['getRangesOnWeek'](fromMonday);
-      const promises = [];
-      const diffTime = toMonday.getTime() - fromMonday.getTime();
-      for (let r of rangesToCopy) {
-        let start = new Date(<Date>ISOToDatetime(r.start));
-        let end = new Date(<Date>ISOToDatetime(r.end));
-        start.setTime(start.getTime() + diffTime);
-        end.setTime(end.getTime() + diffTime);
-        let location = ctx.rootGetters['locations/getLocationById'](r.locationId);
-
-        promises.push(ctx.dispatch('createRange', {start, end, location}));
-      }
-
       return Promise.all(promises).then(_ => Promise.resolve(null));
     }
   }

src/Bundle/ChillCalendarBundle/Service/DocGenerator/CalendarContext.php

@@ -40,7 +40,7 @@ final readonly class CalendarContext implements CalendarContextInterface
         private PersonRepository $personRepository,
         private ThirdPartyRender $thirdPartyRender,
         private ThirdPartyRepository $thirdPartyRepository,
-        private TranslatableStringHelperInterface $translatableStringHelper,
+        private TranslatableStringHelperInterface $translatableStringHelper
     ) {}
 
     public function adminFormReverseTransform(array $data): array

src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php

@@ -37,7 +37,7 @@ final readonly class AccompanyingPeriodCalendarGenericDocProvider implements Gen
 
     public function __construct(
         private Security $security,
-        private EntityManagerInterface $em,
+        private EntityManagerInterface $em
     ) {}
 
     /**

src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/PersonCalendarGenericDocProvider.php

@@ -36,7 +36,7 @@ final readonly class PersonCalendarGenericDocProvider implements GenericDocForPe
 
     public function __construct(
         private Security $security,
-        private EntityManagerInterface $em,
+        private EntityManagerInterface $em
     ) {}
 
     private function addWhereClausesToQuery(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery

src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php

@@ -156,7 +156,7 @@ final class CalendarTypeTest extends TypeTestCase
 
     private function buildMultiToIdDataTransformer(
         string $classTransformer,
-        string $objClass,
+        string $objClass
     ) {
         $transformer = $this->prophesize($classTransformer);
         $transformer->transform(Argument::type('array'))
@@ -195,7 +195,7 @@ final class CalendarTypeTest extends TypeTestCase
 
     private function buildSingleToIdDataTransformer(
         string $classTransformer,
-        string $class,
+        string $class
     ) {
         $transformer = $this->prophesize($classTransformer);
         $transformer->transform(Argument::type('object'))

src/Bundle/ChillCalendarBundle/Tests/Service/DocGenerator/CalendarContextTest.php

@@ -47,7 +47,7 @@ final class CalendarContextTest extends TestCase
     {
         $expected =
             [
-                'trackDatetime' => true,
+                'track_datetime' => true,
                 'askMainPerson' => true,
                 'mainPersonLabel' => 'docgen.calendar.Destinee',
                 'askThirdParty' => false,
@@ -61,7 +61,7 @@ final class CalendarContextTest extends TestCase
     {
         $expected =
             [
-                'trackDatetime' => true,
+                'track_datetime' => true,
                 'askMainPerson' => true,
                 'mainPersonLabel' => 'docgen.calendar.Destinee',
                 'askThirdParty' => false,
@@ -203,7 +203,7 @@ final class CalendarContextTest extends TestCase
 
     private function buildCalendarContext(
         ?EntityManagerInterface $entityManager = null,
-        ?NormalizerInterface $normalizer = null,
+        ?NormalizerInterface $normalizer = null
     ): CalendarContext {
         $baseContext = $this->prophesize(BaseContextData::class);
         $baseContext->getData(null)->willReturn(['base_context' => 'data']);

src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php

@@ -44,7 +44,7 @@ class CreateFieldsOnGroupCommand extends Command
         private readonly EntityManager $entityManager,
         private readonly ValidatorInterface $validator,
         private $availableLanguages,
-        private $customizablesEntities,
+        private $customizablesEntities
     ) {
         parent::__construct();
     }

src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php

@@ -39,7 +39,7 @@ class CustomFieldsGroupController extends AbstractController
     public function __construct(
         private readonly CustomFieldProvider $customFieldProvider,
         private readonly TranslatorInterface $translator,
-        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
+        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry
     ) {}
 
     /**

src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php

@@ -42,7 +42,7 @@ class CustomFieldChoice extends AbstractCustomField
         /**
          * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation
          */
-        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly TranslatableStringHelper $translatableStringHelper
     ) {}
 
     public function allowOtherChoice(CustomField $cf)

src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php

@@ -44,7 +44,7 @@ class CustomFieldDate extends AbstractCustomField
 
     public function __construct(
         private readonly Environment $templating,
-        private readonly TranslatableStringHelper $translatableStringHelper,
+        private readonly TranslatableStringHelper $translatableStringHelper
     ) {}
 
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)

src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php

@@ -42,8 +42,8 @@ class CustomFieldLongChoice extends AbstractCustomField
         $translatableStringHelper = $this->translatableStringHelper;
         $builder->add($customField->getSlug(), Select2ChoiceType::class, [
             'choices' => $entries,
-            'choice_label' => static fn (?Option $option) => $translatableStringHelper->localize($option->getText()),
-            'choice_value' => static fn (?Option $key): ?int => $key?->getId(),
+            'choice_label' => static fn (Option $option) => $translatableStringHelper->localize($option->getText()),
+            'choice_value' => static fn (Option $key): ?int => null === $key ? null : $key->getId(),
             'multiple' => false,
             'expanded' => false,
             'required' => $customField->isRequired(),