DX: fix cs

tools

.php-cs-fixer.dist.php

@@ -9,13 +9,24 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-$config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php73/php_cs_fixer.config.php';
+$finder = PhpCsFixer\Finder::create();
 
-$config
-    ->getFinder()
-    ->ignoreDotFiles(false)
+$finder
+    ->in(__DIR__.'/src')
+    ->append([__FILE__])
+    ->exclude(['docs/', 'tests/app'])
     ->notPath('tests/app')
-    ->name(['.php_cs.dist.php']);
+    ->ignoreDotFiles(true)
+    ->name('**.php')
+;
+
+$config = new PhpCsFixer\Config();
+$config
+    ->setFinder($finder)
+    ->setRiskyAllowed(true)
+    ->setCacheFile('.php_cs.cache')
+    ->setUsingCache(true)
+;
 
 $rules = $config->getRules();
 
@@ -68,9 +79,15 @@ $riskyRules = [
     //    'psr_autoloading' => false,
 ];
 
+$untilFullSwitchToPhp8 = [
+    'blank_line_between_import_groups' => false,
+    'declare_strict_types' => true,
+];
+
 $rules = array_merge(
     $rules,
-    $riskyRules
+    $riskyRules,
+    $untilFullSwitchToPhp8,
 );
 
 $rules['header_comment']['header'] = trim(file_get_contents(__DIR__ . '/resource/header.txt'));

composer.json

@@ -8,7 +8,7 @@
         "social worker"
     ],
     "require": {
-        "php": "^7.4",
+        "php": "^7.4|^8.2",
         "ext-json": "*",
         "ext-openssl": "*",
         "ext-redis": "*",
@@ -64,18 +64,24 @@
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "drupol/php-conventions": "^5",
         "fakerphp/faker": "^1.13",
+        "jangregor/phpstan-prophecy": "^1.0",
         "nelmio/alice": "^3.8",
         "phpspec/prophecy-phpunit": "^2.0",
+        "phpstan/extension-installer": "^1.2",
+        "phpstan/phpstan": "^1.9",
+        "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": ">= 7.5",
+        "psalm/plugin-phpunit": "^0.18.4",
+        "psalm/plugin-symfony": "^4.0.2",
         "symfony/debug-bundle": "^5.1",
         "symfony/dotenv": "^4.4",
         "symfony/maker-bundle": "^1.20",
         "symfony/phpunit-bridge": "^4.4",
         "symfony/stopwatch": "^4.4",
-        "symfony/var-dumper": "^4.4"
+        "symfony/var-dumper": "^4.4",
+        "vimeo/psalm": "^4.30.0"
     },
     "conflict": {
         "symfony/symfony": "*"

grumphp.yml

@@ -1,40 +0,0 @@
-imports:
-    - {
-          resource: tests/app/vendor/drupol/php-conventions/config/php73/grumphp.yml,
-      }
-
-parameters:
-    tasks.phpcsfixer.config: .php_cs.dist.php
-    tasks.license.name: AGPL-3.0
-    tasks.license.holder: Champs-Libres
-    tasks.license.date_from: 2001
-
-    tasks.phpcsfixer.allow_risky: true
-    tasks.phpcsfixer.diff: true
-    tasks.phpstan.level: 1
-    tasks.phpstan.blocking: true
-    tasks.phpstan.ignore_patterns:
-        - "/.github/"
-        - "/.idea/"
-        - "/build/"
-        - "/benchmarks/"
-        - "/docs/"
-        - "/node_modules/"
-        - "/resource/"
-        - "/spec/"
-        - "/var/"
-        - "/vendor/"
-        - "/tests/app"
-
-    # Psalm
-    tasks.psalm.blocking: true
-    tasks.psalm.ignore_patterns:
-        - "/.github/"
-        - "/.idea/"
-        - "/build/"
-        - "/benchmarks/"
-        - "/node_modules/"
-        - "/resource/"
-        - "/spec/"
-        - "/var/"
-        - "/vendor/"

phpstan-baseline-level-2.neon

@@ -0,0 +1,306 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\PersonBundle\\\\Entity\\\\Person\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, DateTime\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReasonCategory\\|null given\\.$#"
+			count: 3
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReason\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+
+		-
+			message: "#^Call to method DateTime\\:\\:setTimezone\\(\\) with incorrect case\\: setTimeZone$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
+		-
+			message: "#^Only booleans are allowed in &&, Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\|null given on the right side\\.$#"
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
+
+		-
+			message: "#^Call to method DateTimeImmutable\\:\\:setTimezone\\(\\) with incorrect case\\: setTimeZone$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\MainBundle\\\\Entity\\\\Location\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, Symfony\\\\Component\\\\Validator\\\\ConstraintViolationListInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\|null given\\.$#"
+			count: 3
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\|null given\\.$#"
+			count: 4
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getFirstName\\(\\) with incorrect case\\: getFirstname$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getLastName\\(\\) with incorrect case\\: getLastname$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getMobilenumber\\(\\) with incorrect case\\: getMobileNumber$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getPhonenumber\\(\\) with incorrect case\\: getPhoneNumber$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Event given\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Event\\|null given\\.$#"
+			count: 3
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, int given\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Only numeric types are allowed in pre\\-increment, string given\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\EventType\\|null given\\.$#"
+			count: 4
+			path: src/Bundle/ChillEventBundle/Controller/EventTypeController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Participation\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Role\\|null given\\.$#"
+			count: 4
+			path: src/Bundle/ChillEventBundle/Controller/RoleController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Status\\|null given\\.$#"
+			count: 4
+			path: src/Bundle/ChillEventBundle/Controller/StatusController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\Language\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, Chill\\\\MainBundle\\\\Entity\\\\Language\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\Center\\|null given\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/Controller/CenterController.php
+
+		-
+			message: "#^Call to method Redis\\:\\:setex\\(\\) with incorrect case\\: setEx$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\PermissionsGroup\\|null given\\.$#"
+			count: 5
+			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\RoleScope\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null given\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/Controller/ScopeController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\GroupCenter\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/UserController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\User\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/UserController.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+
+		-
+			message: "#^Only numeric types are allowed in pre\\-increment, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, int\\<0, max\\> given\\.$#"
+			count: 4
+			path: src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
+
+		-
+			message: "#^Call to method Chill\\\\MainBundle\\\\Entity\\\\Address\\:\\:getPostcode\\(\\) with incorrect case\\: getPostCode$#"
+			count: 6
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassDiscriminatorMapping\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
+
+		-
+			message: "#^Call to method Chill\\\\MainBundle\\\\Entity\\\\Address\\:\\:getPostcode\\(\\) with incorrect case\\: getPostCode$#"
+			count: 6
+			path: src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getFirstName\\(\\) with incorrect case\\: getFirstname$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getLastName\\(\\) with incorrect case\\: getLastname$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+
+		-
+			message: "#^Only booleans are allowed in &&, null given on the left side\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, array\\<Chill\\\\PersonBundle\\\\Entity\\\\Person\\\\ResidentialAddress\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getDeathdate\\(\\) with incorrect case\\: getDeathDate$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\PersonBundle\\\\Entity\\\\Person\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ReportBundle\\\\Entity\\\\Report given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Call to method Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:setFirstname\\(\\) with incorrect case\\: setFirstName$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
+
+		-
+			message: "#^Dynamic call to static method Chill\\\\ThirdPartyBundle\\\\ThirdPartyType\\\\ThirdPartyTypeProviderInterface\\:\\:getKey\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php

phpstan-baseline-level-5.neon

@@ -0,0 +1,721 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\ActivityBundle\\\\Timeline\\\\TimelineActivityProvider\\:\\:checkContext\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(Chill\\\\BudgetBundle\\\\Repository\\\\ChargeType\\)\\: mixed\\)\\|null, Closure\\(Chill\\\\BudgetBundle\\\\Entity\\\\ChargeKind\\)\\: int\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(Chill\\\\BudgetBundle\\\\Repository\\\\ResourceType\\)\\: mixed\\)\\|null, Closure\\(Chill\\\\BudgetBundle\\\\Entity\\\\ResourceKind\\)\\: int\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
+
+		-
+			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\InviteUpdateMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$name of method Chill\\\\MainBundle\\\\Entity\\\\Country\\:\\:setName\\(\\) expects string, array\\<string, string\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
+
+		-
+			message: "#^Parameter \\#1 \\$title of method Chill\\\\MainBundle\\\\Entity\\\\LocationType\\:\\:setTitle\\(\\) expects array, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
+
+		-
+			message: "#^Parameter \\#1 \\$status of method Chill\\\\CalendarBundle\\\\Entity\\\\Invite\\:\\:setStatus\\(\\) expects string, array\\<string, string\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
+
+		-
+			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRemovedMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+
+		-
+			message: "#^Parameter \\#3 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+
+		-
+			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRangeRemovedMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
+
+		-
+			message: "#^Parameter \\#3 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRangeMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
+
+		-
+			message: "#^Parameter \\#1 \\$token of method Chill\\\\CalendarBundle\\\\RemoteCalendar\\\\Connector\\\\MSGraph\\\\OnBehalfOfUserTokenStorage\\:\\:setToken\\(\\) expects TheNetworg\\\\OAuth2\\\\Client\\\\Token\\\\AccessToken, League\\\\OAuth2\\\\Client\\\\Token\\\\AccessTokenInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
+
+		-
+			message: "#^Parameter \\#2 \\$code of class Exception constructor expects int, array\\<string, int\\|string\\|null\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
+
+		-
+			message: "#^Parameter \\#4 \\$offset of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarRepository\\:\\:findBy\\(\\) expects int\\|null, array\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+
+		-
+			message: "#^Parameter \\#1 \\$prefix of function uniqid expects string, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
+
+		-
+			message: "#^Parameter \\#2 \\$callback of function array_filter expects callable\\(Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadataInterface\\)\\: mixed, Closure\\(Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadata\\)\\: bool given\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+
+		-
+			message: "#^Parameter \\#3 \\$metadata of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeNullData\\(\\) expects Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassMetadata, Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassMetadataInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+
+		-
+			message: "#^Parameter \\#4 \\$attributes of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeNullData\\(\\) expects array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadata\\>, array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadataInterface\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+
+		-
+			message: "#^Parameter \\#5 \\$metadata of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeObject\\(\\) expects Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassMetadata, Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassMetadataInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+
+		-
+			message: "#^Parameter \\#6 \\$attributes of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeObject\\(\\) expects array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadata\\>, array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadataInterface\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 4
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Parameter \\#1 \\$name of method Symfony\\\\Component\\\\Form\\\\FormFactoryInterface\\:\\:createNamedBuilder\\(\\) expects string, null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, Chill\\\\MainBundle\\\\Entity\\\\Center given\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Parameter \\#1 \\$participations of method Chill\\\\EventBundle\\\\Controller\\\\ParticipationController\\:\\:createEditFormMultiple\\(\\) expects ArrayIterator, Traversable given\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#2 \\$previous of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects Throwable\\|null, int given\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^Parameter \\#3 \\$code of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects int, Symfony\\\\Component\\\\Serializer\\\\Exception\\\\NotEncodableValueException given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^Parameter \\#3 \\$code of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects int, Symfony\\\\Component\\\\Serializer\\\\Exception\\\\UnexpectedValueException given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Parameter \\#3 \\$formClass of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:createFormFor\\(\\) expects string\\|null, Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Parameter \\#3 \\$scope of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null, Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\Scope\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Parameter \\#1 \\$name of method Chill\\\\MainBundle\\\\Entity\\\\Country\\:\\:setName\\(\\) expects string, array\\<int\\|string, string\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
+
+		-
+			message: "#^Parameter \\#4 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, Chill\\\\MainBundle\\\\Entity\\\\the given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$alias of method Chill\\\\MainBundle\\\\Export\\\\ExportManager\\:\\:getExport\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message: "#^Parameter \\#1 \\$name of method Symfony\\\\Component\\\\Form\\\\FormFactoryInterface\\:\\:createNamedBuilder\\(\\) expects string, null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message: "#^Parameter \\#3 \\$alias of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:exportFormStep\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message: "#^Parameter \\#3 \\$alias of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:formatterFormStep\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message: "#^Parameter \\#3 \\$alias of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:forwardToGenerate\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message: "#^Parameter \\#3 \\$alias of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:selectCentersStep\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countUnreadByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:findUnreadByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$addressee of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countAllForAttendee\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
+
+		-
+			message: "#^Parameter \\#1 \\$addressee of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:findAllForAttendee\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
+
+		-
+			message: "#^Parameter \\#1 \\$sender of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countAllForSender\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
+
+		-
+			message: "#^Parameter \\#1 \\$sender of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:findAllForSender\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countUnreadByUserWhereAddressee\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countUnreadByUserWhereSender\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 4
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
+		-
+			message: "#^Parameter \\#1 \\$token of class Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent constructor expects Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\type\\|null, string given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
+		-
+			message: "#^Parameter \\#3 \\$ip of class Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent constructor expects Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\type\\|null, string\\|null given\\.$#"
+			count: 4
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:countItems\\(\\) expects Chill\\\\MainBundle\\\\Timeline\\\\unknown, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:addSubscriberToFinal\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:addSubscriberToStep\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:isUserSubscribedToFinal\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:isUserSubscribedToStep\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:removeSubscriberToFinal\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:removeSubscriberToStep\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:filterWidgetByPlace\\(\\) expects string, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Parameter \\#1 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:getWidgetAliasesbyPlace\\(\\) expects Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Parameter \\#2 \\$array of function implode expects array\\|null, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Parameter \\#2 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) expects Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Parameter \\#3 \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) expects Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type, float given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Parameter \\#2 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:getServiceId\\(\\) expects string, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
+
+		-
+			message: "#^Parameter \\#3 \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:getServiceId\\(\\) expects float, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
+
+		-
+			message: "#^Parameter \\#1 \\$iterator of function iterator_to_array expects Traversable, array\\<Chill\\\\MainBundle\\\\Export\\\\AggregatorInterface\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
+
+		-
+			message: "#^Parameter \\#2 \\$nbAggregators of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVFormatter\\:\\:appendAggregatorForm\\(\\) expects string, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+
+		-
+			message: "#^Parameter \\#2 \\$array of function array_map expects array, Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Parameter \\#2 \\$nbAggregators of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:appendAggregatorForm\\(\\) expects string, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\PrivateCommentEmbeddable\\:\\:getCommentForUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
+
+		-
+			message: "#^Parameter \\#1 \\$em of class Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\ObjectToIdTransformer constructor expects Doctrine\\\\ORM\\\\EntityManagerInterface, Doctrine\\\\Persistence\\\\ObjectManager given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
+
+		-
+			message: "#^Parameter \\#1 \\$em of class Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\MultipleObjectsToIdTransformer constructor expects Doctrine\\\\ORM\\\\EntityManagerInterface, Doctrine\\\\Persistence\\\\ObjectManager given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
+
+		-
+			message: "#^Parameter \\#1 \\$translatableStrings of method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringHelper\\:\\:localize\\(\\) expects array, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
+
+		-
+			message: "#^Parameter \\#1 \\$datetime of class DateTime constructor expects string, Chill\\\\MainBundle\\\\Search\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/AbstractSearch.php
+
+		-
+			message: "#^Parameter \\#4 \\$paginator of method Chill\\\\MainBundle\\\\Search\\\\SearchApi\\:\\:fetchRawResult\\(\\) expects Chill\\\\MainBundle\\\\Pagination\\\\Paginator, Chill\\\\MainBundle\\\\Pagination\\\\PaginatorInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchApi.php
+
+		-
+			message: "#^Parameter \\#2 \\$callback of function uasort expects callable\\(Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm, Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm\\)\\: int, Closure\\(Chill\\\\MainBundle\\\\Search\\\\SearchInterface, Chill\\\\MainBundle\\\\Search\\\\SearchInterface\\)\\: \\-1\\|0\\|1 given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, Chill\\\\MainBundle\\\\Search\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
+
+		-
+			message: "#^Parameter \\#1 \\$object of function get_class expects object, array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Notification\\:\\:isReadBy\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\PrivateCommentEmbeddable\\:\\:setCommentForUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:buildUnionQuery\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\unknown given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Parameter \\#2 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\) expects Chill\\\\MainBundle\\\\Timeline\\\\type, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Parameter \\#1 \\$phoneNumber of method Chill\\\\MainBundle\\\\Phonenumber\\\\PhoneNumberHelperInterface\\:\\:format\\(\\) expects libphonenumber\\\\PhoneNumber\\|null, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+
+		-
+			message: "#^Parameter \\#1 \\$transitionBy of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep\\:\\:setTransitionBy\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$mobilenumber of method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:setMobilenumber\\(\\) expects libphonenumber\\\\PhoneNumber\\|null, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$phonenumber of method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:setPhonenumber\\(\\) expects libphonenumber\\\\PhoneNumber\\|null, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+
+		-
+			message: "#^Parameter \\#2 \\$callback of function usort expects callable\\(mixed, mixed\\)\\: int, Closure\\(mixed, mixed\\)\\: bool given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:countNearMaxDateByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:findNearMaxDateByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
+
+		-
+			message: "#^Parameter \\#2 \\$callback of function usort expects callable\\(mixed, mixed\\)\\: int, Closure\\(mixed, mixed\\)\\: bool given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+
+		-
+			message: "#^Parameter \\#2 \\$previous of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects Throwable\\|null, int given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+
+		-
+			message: "#^Parameter \\#3 \\$code of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects int, Symfony\\\\Component\\\\Serializer\\\\Exception\\\\InvalidArgumentException\\|Symfony\\\\Component\\\\Serializer\\\\Exception\\\\UnexpectedValueException given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: "#^Parameter \\#1 \\$form of method Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:isLastPostDataChanges\\(\\) expects Symfony\\\\Component\\\\Form\\\\Form, Symfony\\\\Component\\\\Form\\\\FormInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message: "#^Parameter \\#2 \\$precision of method Chill\\\\PersonBundle\\\\Search\\\\SimilarPersonMatcher\\:\\:matchPerson\\(\\) expects float, Chill\\\\PersonBundle\\\\Repository\\\\PersonNotDuplicateRepository given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message: "#^Parameter \\#3 \\$orderBy of method Chill\\\\PersonBundle\\\\Search\\\\SimilarPersonMatcher\\:\\:matchPerson\\(\\) expects string, float given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message: "#^Parameter \\#4 \\$addYearComparison of method Chill\\\\PersonBundle\\\\Search\\\\SimilarPersonMatcher\\:\\:matchPerson\\(\\) expects bool, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:countItems\\(\\) expects Chill\\\\MainBundle\\\\Timeline\\\\unknown, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
+
+		-
+			message: "#^Parameter \\#1 \\$period of method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodLocationHistory\\:\\:setPeriod\\(\\) expects Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod, null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Parameter \\#1 \\$now of method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getCurrentMembers\\(\\) expects DateTimeImmutable\\|null, DateTimeInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^Parameter \\#1 \\$now of method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getNonCurrentMembers\\(\\) expects DateTimeImmutable\\|null, DateTimeInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^Parameter \\#1 \\$key of method Doctrine\\\\Common\\\\Collections\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:remove\\(\\) expects \\(int\\|string\\), Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\SocialAction given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+
+		-
+			message: "#^Parameter \\#1 \\$translatableStrings of method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringHelper\\:\\:localize\\(\\) expects array, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#1 \\$entity of method Chill\\\\PersonBundle\\\\Templating\\\\Entity\\\\ClosingMotiveRender\\:\\:renderString\\(\\) expects Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\ClosingMotive, Chill\\\\MainBundle\\\\Templating\\\\Entity\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
+
+		-
+			message: "#^Parameter \\#1 \\$entityName of method Doctrine\\\\ORM\\\\EntityManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillPersonBundle\\:AccompanyingPeriod\\>, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:filterReachableCenters\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+
+		-
+			message: "#^Parameter \\#3 \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\AbstractTimelineAccompanyingPeriod\\:\\:getBasicEntityTemplate\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
+
+		-
+			message: "#^Parameter \\#3 \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\AbstractTimelineAccompanyingPeriod\\:\\:getBasicEntityTemplate\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
+
+		-
+			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelperInterface\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
+
+		-
+			message: "#^Parameter \\#1 \\$className of method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillReportBundle\\:Report\\>, string given\\.$#"
+			count: 4
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Parameter \\#1 \\$entity of method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createEditForm\\(\\) expects Chill\\\\ReportBundle\\\\Entity\\\\Report, ChillReportBundle\\:Report given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 4
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableScopes\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Parameter \\#1 \\$em of class Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\ScopeTransformer constructor expects Doctrine\\\\ORM\\\\EntityManagerInterface, Doctrine\\\\Persistence\\\\ObjectManager given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Form/ReportType.php
+
+		-
+			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableScopes\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Form/ReportType.php
+
+		-
+			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
+
+		-
+			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableScopes\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:checkContext\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: "#^Parameter \\#1 \\$entity of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:getFieldsToRender\\(\\) expects Chill\\\\ReportBundle\\\\Entity\\\\Report, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: "#^Parameter \\#1 \\$entityName of method Doctrine\\\\ORM\\\\EntityManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillReportBundle\\:Report\\>, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 6
+			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
+
+		-
+			message: "#^Parameter \\#1 \\$keys of function array_fill_keys expects array, Chill\\\\TaskBundle\\\\Entity\\\\json given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+
+		-
+			message: "#^Parameter \\#1 \\$task of method Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\SingleTaskPlaceEvent\\:\\:setTask\\(\\) expects Chill\\\\TaskBundle\\\\Entity\\\\SingleTask, Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
+
+		-
+			message: "#^Parameter \\#1 \\$repository of class Chill\\\\PersonBundle\\\\Form\\\\DataTransformer\\\\PersonToIdTransformer constructor expects Chill\\\\PersonBundle\\\\Repository\\\\PersonRepository, Doctrine\\\\ORM\\\\EntityManagerInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+
+		-
+			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
+			count: 4
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+
+		-
+			message: "#^Parameter \\#1 \\$extras of method Knp\\\\Menu\\\\MenuItem\\:\\:setExtras\\(\\) expects array\\<string, mixed\\>, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
+
+		-
+			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+
+		-
+			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
+
+		-
+			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Parameter \\#1 \\$storedObject of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getContent\\(\\) expects Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject, ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document given\\.$#"
+			count: 3
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$storedObject of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:setContent\\(\\) expects Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject, ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document given\\.$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$type of method Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\:\\:setType\\(\\) expects string\\|null, false given\\.$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php

phpstan-critical.neon

@@ -1,76 +1,6 @@
 parameters:
     ignoreErrors:
-        -
-            message: "#^Implicit array creation is not allowed \\- variable \\$centers might not exist\\.$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-        -
-            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:\\$work\\.$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-        -
-            message: "#^Undefined variable\\: \\$person$#"
-            count: 1
-            path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-        -
-            message: "#^Variable variables are not allowed\\.$#"
-            count: 4
-            path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
-
-        -
-            message: "#^Function Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\·\\\\is_array not found\\.$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
-
-        -
-            message: "#^Undefined variable\\: \\$choiceSlug$#"
-            count: 1
-            path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
-        -
-            message: "#^Undefined variable\\: \\$type$#"
-            count: 1
-            path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
-
-        -
-            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:getRoleFor\\(\\)\\.$#"
-            count: 1
-            path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
-
         -
             message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Controller\\\\UserController\\:\\:createEditForm\\(\\)\\.$#"
             count: 1
             path: src/Bundle/ChillMainBundle/Controller/UserController.php
-
-        -
-            message: "#^Undefined variable\\: \\$current$#"
-            count: 1
-            path: src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
-
-        -
-            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AbstractChillVoter\\:\\:getSupportedAttributes\\(\\)\\.$#"
-            count: 1
-            path: src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
-
-        -
-            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AbstractChillVoter\\:\\:getSupportedClasses\\(\\)\\.$#"
-            count: 1
-            path: src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
-
-        -
-            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AbstractChillVoter\\:\\:isGranted\\(\\)\\.$#"
-            count: 1
-            path: src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
-
-        -
-            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:\\$security\\.$#"
-            count: 3
-            path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-        -
-            message: "#^Call to an undefined method Chill\\\\ThirdPartyBundle\\\\Form\\\\Type\\\\PickThirdPartyTypeCategoryType\\:\\:transform\\(\\)\\.$#"
-            count: 1
-            path: src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php

phpstan-types.neon

@@ -400,16 +400,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
 
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
-
 		-
 			message: "#^Method Chill\\\\ThirdPartyBundle\\\\Search\\\\ThirdPartySearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
 			count: 1

phpstan.neon.dist

@@ -1,7 +1,8 @@
 parameters:
-    level: 1
+    level: 5
     paths:
         - src/
+    reportUnmatchedIgnoredErrors: false
     excludePaths:
         - .php_cs*
         - docs/
@@ -24,4 +25,8 @@ includes:
     - phpstan-critical.neon
     - phpstan-deprecations.neon
     - phpstan-types.neon
+    - phpstan-baseline-level-2.neon
+    - phpstan-baseline-level-3.neon
+    - phpstan-baseline-level-4.neon
+    - phpstan-baseline-level-5.neon
 

psalm.xml

@@ -9,9 +9,10 @@
     cacheDirectory="./.psalm"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="src"/>
         <ignoreFiles>
-            <directory name="./tests/" />
+            <directory name="./tests/"/>
+            <directory name="./node_modules/"/>
         </ignoreFiles>
     </projectFiles>
 
@@ -20,9 +21,27 @@
     <issueHandlers>
         <UndefinedDocblockClass>
             <errorLevel type="suppress">
-                <referencedClass name="UnitEnum" />
+                <referencedClass name="UnitEnum"/>
             </errorLevel>
         </UndefinedDocblockClass>
     </issueHandlers>
 
+    <!--
+    <fileExtensions>
+        <extension name=".php"/>
+        <extension name=".twig" checker="tests/app/vendor/psalm/plugin-symfony/src/Twig/TemplateFileAnalyzer.php" />
+    </fileExtensions>
+    -->
+
+    <plugins>
+        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
+        <!--
+        <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin">
+            <containerXml>tests/app/var/cache/dev/srcApp_KernelDevDebugContainer.xml</containerXml>
+            <stubs>
+                <file name="vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php" />
+            </stubs>
+        </pluginClass>
+        -->
+    </plugins>
 </psalm>

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -651,8 +651,8 @@ final class ActivityController extends AbstractController
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
-            // TODO Add permission
-            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+        // TODO Add permission
+        // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
             throw $this->createNotFoundException('Person or Accompanying Period not found');
         }

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

@@ -58,7 +58,8 @@ class DateAggregator implements AggregatorInterface
                 break;
 
             case 'year':
-                $fmt = 'YYYY'; $order = 'DESC';
+                $fmt = 'YYYY';
+                $order = 'DESC';
 
                 break; // order DESC does not works !
 

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

@@ -73,7 +73,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                 };
 
             case 'scopesNames':
-               return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles');
+                return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles');
 
             default:
                 return $this->helper->getLabels($key, $values, $data);

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -225,10 +225,9 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         $personToCenter = $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'];
 
         // acls:
-        $role = new Role(ActivityVoter::SEE);
         $reachableCenters = $this->authorizationHelper->getReachableCenters(
             $this->tokenStorage->getToken()->getUser(),
-            $role
+            ActivityVoter::SEE
         );
 
         if (count($reachableCenters) === 0) {
@@ -239,7 +238,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         if ('person' === $context) {
             // we start with activities having the person_id linked to person
             $where .= sprintf('%s = ? AND ', $activityToPerson);
-            $parameters[] = $person->getId();
+            $parameters[] = $args['context']->getId();
         }
 
         // we add acl (reachable center and scopes)
@@ -252,7 +251,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
                 continue;
             }
             // we get all the reachable scopes for this center
-            $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
+            $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), ActivityVoter::SEE, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
                 static function (Scope $scope) {

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

@@ -168,7 +168,7 @@
                     {% if entity.documents|length > 0 %}
                         <ul>
                             {% for d in entity.documents %}
-                                <li>{{ d.title }}{{ m.download_button(d) }}</li>
+                                <li>{{ d.title }} {{ d|chill_document_button_group() }}</li>
                             {% endfor %}
                         </ul>
                     {% else %}

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

@@ -8,12 +8,14 @@
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
     {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
     {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}

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

@@ -7,13 +7,13 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}

src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php

@@ -11,12 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\AsideActivityBundle\Export\Export;
 
+use Chill\AsideActivityBundle\Export\Declarations;
 use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
 use Chill\AsideActivityBundle\Security\AsideActivityVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use ChillAsideActivityBundle\Export\Declarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;

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

@@ -183,4 +183,5 @@ export:
     Group by aside activity type: Grouper les activités annexes par type d'activité
     Aside activity type: Type d'activité annexe
 
-
+# ROLES
+CHILL_ASIDE_ACTIVITY_STATS: Statistiques pour les activités annexes

src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php

@@ -1,102 +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\BudgetBundle\Config;
-
-class ConfigRepository
-{
-    /**
-     * @var array
-     */
-    protected $charges;
-
-    /**
-     * @var array
-     */
-    protected $resources;
-
-    public function __construct($resources, $charges)
-    {
-        $this->resources = $resources;
-        $this->charges = $charges;
-    }
-
-    public function getChargesKeys(bool $onlyActive = false): array
-    {
-        return array_map(static function ($element) {
-            return $element['key'];
-        }, $this->getCharges($onlyActive));
-    }
-
-    /**
-     * @return array where keys are the resource'key and label the ressource label
-     */
-    public function getChargesLabels(bool $onlyActive = false)
-    {
-        $charges = [];
-
-        foreach ($this->getCharges($onlyActive) as $definition) {
-            $charges[$definition['key']] = $this->normalizeLabel($definition['labels']);
-        }
-
-        return $charges;
-    }
-
-    public function getResourcesKeys(bool $onlyActive = false): array
-    {
-        return array_map(static function ($element) {
-            return $element['key'];
-        }, $this->getResources($onlyActive));
-    }
-
-    /**
-     * @return array where keys are the resource'key and label the ressource label
-     */
-    public function getResourcesLabels(bool $onlyActive = false)
-    {
-        $resources = [];
-
-        foreach ($this->getResources($onlyActive) as $definition) {
-            $resources[$definition['key']] = $this->normalizeLabel($definition['labels']);
-        }
-
-        return $resources;
-    }
-
-    private function getCharges(bool $onlyActive = false): array
-    {
-        return $onlyActive ?
-            array_filter($this->charges, static function ($el) {
-                return $el['active'];
-            })
-            : $this->charges;
-    }
-
-    private function getResources(bool $onlyActive = false): array
-    {
-        return $onlyActive ?
-            array_filter($this->resources, static function ($el) {
-                return $el['active'];
-            })
-            : $this->resources;
-    }
-
-    private function normalizeLabel($labels)
-    {
-        $normalizedLabels = [];
-
-        foreach ($labels as $labelDefinition) {
-            $normalizedLabels[$labelDefinition['lang']] = $labelDefinition['label'];
-        }
-
-        return $normalizedLabels;
-    }
-}

src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php

@@ -35,7 +35,6 @@ class ChillBudgetExtension extends Extension implements PrependExtensionInterfac
         $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
-        $loader->load('services/config.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/repository.yaml');
         $loader->load('services/security.yaml');

src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php

@@ -75,7 +75,7 @@ abstract class AbstractElement
     /**
      * @ORM\Column(name="type", type="string", length=255)
      */
-    private string $type;
+    private string $type = '';
 
     /*Getters and Setters */
 

src/Bundle/ChillBudgetBundle/Form/ChargeType.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\BudgetBundle\Form;
 
-use Chill\BudgetBundle\Config\ConfigRepository;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Entity\ChargeKind;
 use Chill\BudgetBundle\Repository\ChargeKindRepository;
@@ -25,13 +24,9 @@ use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_flip;
-use function asort;
 
 class ChargeType extends AbstractType
 {
-    protected ConfigRepository $configRepository;
-
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
     private ChargeKindRepository $repository;
@@ -39,12 +34,10 @@ class ChargeType extends AbstractType
     private TranslatorInterface $translator;
 
     public function __construct(
-        ConfigRepository $configRepository,
         TranslatableStringHelperInterface $translatableStringHelper,
         ChargeKindRepository $repository,
         TranslatorInterface $translator
     ) {
-        $this->configRepository = $configRepository;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->repository = $repository;
         $this->translator = $translator;
@@ -116,19 +109,4 @@ class ChargeType extends AbstractType
     {
         return 'chill_budgetbundle_charge';
     }
-
-    private function getTypes()
-    {
-        $charges = $this->configRepository
-            ->getChargesLabels(true);
-
-        // rewrite labels to filter in language
-        foreach ($charges as $key => $labels) {
-            $charges[$key] = $this->translatableStringHelper->localize($labels);
-        }
-
-        asort($charges);
-
-        return array_flip($charges);
-    }
 }

src/Bundle/ChillBudgetBundle/Form/ResourceType.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\BudgetBundle\Form;
 
-use Chill\BudgetBundle\Config\ConfigRepository;
 use Chill\BudgetBundle\Entity\Resource;
 use Chill\BudgetBundle\Entity\ResourceKind;
 use Chill\BudgetBundle\Repository\ResourceKindRepository;
@@ -24,12 +23,9 @@ use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function array_flip;
 
 class ResourceType extends AbstractType
 {
-    protected ConfigRepository $configRepository;
-
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
     private ResourceKindRepository $repository;
@@ -37,12 +33,10 @@ class ResourceType extends AbstractType
     private TranslatorInterface $translator;
 
     public function __construct(
-        ConfigRepository $configRepository,
         TranslatableStringHelperInterface $translatableStringHelper,
         ResourceKindRepository $repository,
         TranslatorInterface $translator
     ) {
-        $this->configRepository = $configRepository;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->repository = $repository;
         $this->translator = $translator;
@@ -98,19 +92,4 @@ class ResourceType extends AbstractType
     {
         return 'chill_budgetbundle_resource';
     }
-
-    private function getTypes()
-    {
-        $resources = $this->configRepository
-            ->getResourcesLabels(true);
-
-        // rewrite labels to filter in language
-        foreach ($resources as $key => $labels) {
-            $resources[$key] = $this->translatableStringHelper->localize($labels);
-        }
-
-        asort($resources);
-
-        return array_flip($resources);
-    }
 }

src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php

@@ -53,6 +53,11 @@ class ResourceKindRepository implements ObjectRepository
             ->getResult();
     }
 
+    public function findOneByKind(string $kind): ?ResourceKind
+    {
+        return $this->repository->findOneBy(['kind' => $kind]) ;
+    }
+
     /**
      * @return ResourceType[]
      */

src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php

@@ -11,13 +11,17 @@ declare(strict_types=1);
 
 namespace Chill\BudgetBundle\Service\Summary;
 
-use Chill\BudgetBundle\Config\ConfigRepository;
+use Chill\BudgetBundle\Entity\ChargeKind;
+use Chill\BudgetBundle\Entity\ResourceKind;
+use Chill\BudgetBundle\Repository\ChargeKindRepository;
+use Chill\BudgetBundle\Repository\ResourceKindRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\ResultSetMapping;
 use LogicException;
+use RuntimeException;
 use function count;
 
 /**
@@ -25,31 +29,36 @@ use function count;
  */
 class SummaryBudget implements SummaryBudgetInterface
 {
-    private const QUERY_CHARGE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.charge WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+    private const QUERY_CHARGE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, charge_id AS kind_id FROM chill_budget.charge WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY charge_id';
 
-    private const QUERY_CHARGE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.charge WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+    private const QUERY_CHARGE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, charge_id AS kind_id FROM chill_budget.charge WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY charge_id';
 
-    private const QUERY_RESOURCE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.resource WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+    private const QUERY_RESOURCE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, resource_id AS kind_id FROM chill_budget.resource WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY resource_id';
 
-    private const QUERY_RESOURCE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.resource WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+    private const QUERY_RESOURCE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, resource_id AS kind_id FROM chill_budget.resource WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY resource_id';
+
+    private ChargeKindRepository $chargeKindRepository;
 
     private array $chargeLabels;
 
-    private ConfigRepository $configRepository;
-
     private EntityManagerInterface $em;
 
+    private ResourceKindRepository $resourceKindRepository;
+
     private array $resourcesLabels;
 
     private TranslatableStringHelperInterface $translatableStringHelper;
 
-    public function __construct(EntityManagerInterface $em, ConfigRepository $configRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
+    public function __construct(
+        EntityManagerInterface $em,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        ResourceKindRepository $resourceKindRepository,
+        ChargeKindRepository $chargeKindRepository
+    ) {
         $this->em = $em;
-        $this->configRepository = $configRepository;
-        $this->chargeLabels = $configRepository->getChargesLabels();
-        $this->resourcesLabels = $configRepository->getResourcesLabels();
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->resourceKindRepository = $resourceKindRepository;
+        $this->chargeKindRepository = $chargeKindRepository;
     }
 
     public function getSummaryForHousehold(?Household $household): array
@@ -112,7 +121,7 @@ class SummaryBudget implements SummaryBudgetInterface
         $rsm = new ResultSetMapping();
         $rsm
             ->addScalarResult('sum', 'sum')
-            ->addScalarResult('type', 'type')
+            ->addScalarResult('kind_id', 'kind_id')
             ->addScalarResult('comment', 'comment');
 
         return $rsm;
@@ -120,51 +129,62 @@ class SummaryBudget implements SummaryBudgetInterface
 
     private function getEmptyChargeArray(): array
     {
-        $keys = $this->configRepository->getChargesKeys();
-        $labels = $this->chargeLabels;
+        $keys = array_map(static fn (ChargeKind $kind) => $kind->getId(), $this->chargeKindRepository->findAll());
 
-        return array_combine($keys, array_map(function ($i) use ($labels) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i]), 'comment' => ''];
+        return array_combine($keys, array_map(function ($id) {
+            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->chargeKindRepository->find($id)->getName()), 'comment' => ''];
         }, $keys));
     }
 
     private function getEmptyResourceArray(): array
     {
-        $keys = $this->configRepository->getResourcesKeys();
-        $labels = $this->resourcesLabels;
+        $keys = array_map(static fn (ResourceKind $kind) => $kind->getId(), $this->resourceKindRepository->findAll());
 
-        return array_combine($keys, array_map(function ($i) use ($labels) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i]), 'comment' => ''];
+        return array_combine($keys, array_map(function ($id) {
+            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->resourceKindRepository->find($id)->getName()), 'comment' => ''];
         }, $keys));
     }
 
     private function rowToArray(array $rows, string $kind): array
     {
+        $result = [];
+
         switch ($kind) {
             case 'charge':
-                $label = $this->chargeLabels;
+                foreach ($rows as $row) {
+                    $chargeKind = $this->chargeKindRepository->find($row['kind_id']);
 
-                break;
+                    if (null === $chargeKind) {
+                        throw new RuntimeException('charge kind not found');
+                    }
+                    $result[$chargeKind->getKind()] = [
+                        'sum' => (float) $row['sum'],
+                        'label' => $this->translatableStringHelper->localize($chargeKind->getName()),
+                        'comment' => (string) $row['comment'],
+                    ];
+                }
+
+                return $result;
 
             case 'resource':
-                $label = $this->resourcesLabels;
+                foreach ($rows as $row) {
+                    $resourceKind = $this->resourceKindRepository->find($row['kind_id']);
 
-                break;
+                    if (null === $resourceKind) {
+                        throw new RuntimeException('charge kind not found');
+                    }
+
+                    $result[$resourceKind->getKind()] = [
+                        'sum' => (float) $row['sum'],
+                        'label' => $this->translatableStringHelper->localize($resourceKind->getName()),
+                        'comment' => (string) $row['comment'],
+                    ];
+                }
+
+                return $result;
 
             default:
                 throw new LogicException();
         }
-
-        $result = [];
-
-        foreach ($rows as $row) {
-            $result[$row['type']] = [
-                'sum' => (float) $row['sum'],
-                'label' => $this->translatableStringHelper->localize($label[$row['type']]),
-                'comment' => (string) $row['comment'],
-            ];
-        }
-
-        return $result;
     }
 }

src/Bundle/ChillBudgetBundle/Templating/Twig.php

@@ -1,65 +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\BudgetBundle\Templating;
-
-use Chill\BudgetBundle\Config\ConfigRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-use UnexpectedValueException;
-
-class Twig extends AbstractExtension
-{
-    /**
-     * @var ConfigRepository
-     */
-    protected $configRepository;
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    public function __construct(
-        ConfigRepository $configRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->configRepository = $configRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function displayLink($link, $family)
-    {
-        switch ($family) {
-            case 'resource':
-                return $this->translatableStringHelper->localize(
-                    $this->configRepository->getResourcesLabels()[$link]
-                );
-
-            case 'charge':
-                return $this->translatableStringHelper->localize(
-                    $this->configRepository->getChargesLabels()[$link]
-                );
-
-            default:
-                throw new UnexpectedValueException("This family of element: {$family} is not "
-                    . "supported. Supported families are 'resource', 'charge'");
-        }
-    }
-
-    public function getFilters()
-    {
-        return [
-            new TwigFilter('budget_element_type_display', [$this, 'displayLink'], ['is_safe' => ['html']]),
-        ];
-    }
-}

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

@@ -1,5 +0,0 @@
-services:
-    Chill\BudgetBundle\Config\ConfigRepository:
-        arguments:
-            $resources: '%chill_budget.resources%'
-            $charges: '%chill_budget.charges%'

src/Bundle/ChillBudgetBundle/migrations/Version20230201131008.php

@@ -0,0 +1,37 @@
+<?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\Migrations\Budget;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20230201131008 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        // this shouldn't be undone.
+    }
+
+    public function getDescription(): string
+    {
+        return 'Fix the comment on tags column in resource and charge type';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('COMMENT ON COLUMN chill_budget.resource_type.tags IS \'(DC2Type:json)\'');
+        $this->addSql('COMMENT ON COLUMN chill_budget.charge_type.tags IS \'(DC2Type:json)\'');
+    }
+}

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

@@ -77,6 +77,13 @@ The balance: Différence entre ressources et charges
 Valid since %startDate% until %endDate%: Valide depuis le %startDate% jusqu'au %endDate%
 Valid since %startDate%: Valide depuis le %startDate%
 
+# ROLES
+Budget elements: Budget
+CHILL_BUDGET_ELEMENT_CREATE: Créer une ressource/charge
+CHILL_BUDGET_ELEMENT_DELETE: Supprimer une ressource/charge
+CHILL_BUDGET_ELEMENT_SEE: Voir les ressources/charges
+CHILL_BUDGET_ELEMENT_UPDATE: Modifier une ressource/charge
+
 ## admin
 
 crud:

src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php

@@ -145,6 +145,9 @@ class CalendarDocController
                 $returnParams = ['id' => $calendarDoc->getCalendar()->getPerson()->getId()];
 
                 break;
+
+            default:
+                throw new \LogicException(sprintf("This context '%s' is not supported", $calendarDoc->getCalendar()->getContext()));
         }
 
         $form = $this->formFactory->createBuilder()

src/Bundle/ChillCalendarBundle/Entity/Calendar.php

@@ -512,7 +512,9 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
      */
     public function getUsers(): Collection
     {
-        return $this->getInvites()->map(static function (Invite $i) { return $i->getUser(); });
+        return $this->getInvites()->map(static function (Invite $i) {
+            return $i->getUser();
+        });
     }
 
     public function hasCalendarRange(): bool
@@ -597,7 +599,9 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         }
 
         $invite = $this->invites
-            ->filter(static function (Invite $invite) use ($user) { return $invite->getUser() === $user; })
+            ->filter(static function (Invite $invite) use ($user) {
+                return $invite->getUser() === $user;
+            })
             ->first();
         $this->removeInvite($invite);
 

src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php

@@ -89,10 +89,14 @@ class CalendarToRemoteHandler implements MessageHandlerInterface
 
         $newInvites = array_filter(
             array_map(
-                function ($id) { return $this->inviteRepository->find($id); },
+                function ($id) {
+                    return $this->inviteRepository->find($id);
+                },
                 $calendarMessage->getNewInvitesIds(),
             ),
-            static function (?Invite $invite) { return null !== $invite; }
+            static function (?Invite $invite) {
+                return null !== $invite;
+            }
         );
 
         $this->calendarConnector->syncCalendar(

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

@@ -167,7 +167,9 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface
                 ]
             )->toArray();
 
-            $ids = array_map(static function ($item) { return $item['id']; }, $bareEvents['value']);
+            $ids = array_map(static function ($item) {
+                return $item['id'];
+            }, $bareEvents['value']);
             $existingIdsInRange = $this->calendarRangeRepository->findRemoteIdsPresent($ids);
             $existingIdsInCalendar = $this->calendarRepository->findRemoteIdsPresent($ids);
 

src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php

@@ -215,7 +215,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface
         $qb
             ->where(
                 $qb->expr()->orX(
-                // the calendar where the person is the main person:
+                    // the calendar where the person is the main person:
                     $qb->expr()->eq('c.person', ':person'),
                     // when the calendar is in a reachable period, and contains person
                     $qb->expr()->andX(

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

@@ -96,7 +96,7 @@ final class CalendarTypeTest extends TypeTestCase
         ];
 
         $calendar = new Calendar();
-        $calendar->setMainUser(new class() extends User {
+        $calendar->setMainUser(new class () extends User {
             public function getId()
             {
                 return '1';
@@ -114,8 +114,12 @@ final class CalendarTypeTest extends TypeTestCase
         $this->assertEquals(8, $calendar->getCalendarRange()->getId());
         $this->assertEquals(9, $calendar->getLocation()->getId());
         $this->assertEquals(true, $calendar->getSendSMS());
-        $this->assertContains(2, $calendar->getUsers()->map(static function (User $u) { return $u->getId(); }));
-        $this->assertContains(3, $calendar->getUsers()->map(static function (User $u) { return $u->getId(); }));
+        $this->assertContains(2, $calendar->getUsers()->map(static function (User $u) {
+            return $u->getId();
+        }));
+        $this->assertContains(3, $calendar->getUsers()->map(static function (User $u) {
+            return $u->getId();
+        }));
     }
 
     protected function getExtensions()
@@ -147,7 +151,9 @@ final class CalendarTypeTest extends TypeTestCase
             ->will(static function ($args) {
                 return implode(
                     ',',
-                    array_map(static function ($p) { return $p->getId(); }, $args[0])
+                    array_map(static function ($p) {
+                        return $p->getId();
+                    }, $args[0])
                 );
             });
         $transformer->transform(Argument::exact(null))
@@ -156,7 +162,9 @@ final class CalendarTypeTest extends TypeTestCase
             ->will(static function ($args) {
                 return implode(
                     ',',
-                    array_map(static function ($p) { return $p->getId(); }, $args[0]->toArray())
+                    array_map(static function ($p) {
+                        return $p->getId();
+                    }, $args[0]->toArray())
                 );
             });
         $transformer->reverseTransform(Argument::type('string'))

src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts

@@ -0,0 +1,35 @@
+import {_createI18n} from "../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
+import DocumentActionButtonsGroup from "../../vuejs/DocumentActionButtonsGroup.vue";
+import {createApp} from "vue";
+import {StoredObject} from "../../types";
+
+const i18n = _createI18n({});
+
+window.addEventListener('DOMContentLoaded', function (e) {
+  document.querySelectorAll<HTMLDivElement>('div[data-download-buttons]').forEach((el) => {
+     const app = createApp({
+       components: {DocumentActionButtonsGroup},
+       data() {
+
+         const datasets = el.dataset as {
+           filename: string,
+           canEdit: string,
+           storedObject: string,
+           small: string,
+         };
+
+         const
+           storedObject = JSON.parse(datasets.storedObject),
+           filename = datasets.filename,
+           canEdit = datasets.canEdit === '1',
+           small = datasets.small === '1'
+           ;
+
+         return { storedObject, filename, canEdit, small };
+       },
+       template: '<document-action-buttons-group :can-edit="canEdit" :filename="filename" :stored-object="storedObject" :small="small"></document-action-buttons-group>',
+     });
+
+     app.use(i18n).mount(el);
+  })
+});

src/Bundle/ChillDocStoreBundle/Resources/public/types.ts

@@ -0,0 +1,25 @@
+import {DateTime} from "../../../ChillMainBundle/Resources/public/types";
+
+export interface StoredObject {
+  id: number,
+
+  /**
+   * filename of the object in the object storage
+   */
+  filename: string,
+  creationDate: DateTime,
+  datas: object,
+  iv: number[],
+  keyInfos: object,
+  title: string,
+  type: string,
+  uuid: string
+}
+
+/**
+ * Function executed by the WopiEditButton component.
+ */
+export type WopiEditButtonExecutableBeforeLeaveFunction = {
+  (): Promise<void>
+}
+

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue

@@ -0,0 +1,63 @@
+<template>
+  <div class="dropdown">
+    <button :class="Object.assign({'btn': true, 'btn-outline-primary': true, 'dropdown-toggle': true, small: props.small})" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+      Actions
+    </button>
+    <ul class="dropdown-menu">
+      <li v-if="props.canEdit && is_extension_editable(props.storedObject.type)">
+        <wopi-edit-button :stored-object="props.storedObject" :classes="{'dropdown-item': true}" :execute-before-leave="props.executeBeforeLeave"></wopi-edit-button>
+      </li>
+      <li v-if="props.storedObject.type != 'application/pdf' && props.canConvertPdf">
+        <convert-button :stored-object="props.storedObject" :filename="filename" :classes="{'dropdown-item': true}"></convert-button>
+      </li>
+      <li v-if="props.canDownload">
+        <download-button :stored-object="props.storedObject" :filename="filename" :classes="{'dropdown-item': true}"></download-button>
+      </li>
+    </ul>
+  </div>
+
+</template>
+
+<script lang="ts" setup>
+
+import ConvertButton from "./StoredObjectButton/ConvertButton.vue";
+import DownloadButton from "./StoredObjectButton/DownloadButton.vue";
+import WopiEditButton from "./StoredObjectButton/WopiEditButton.vue";
+import {is_extension_editable} from "./StoredObjectButton/helpers";
+import {StoredObject, WopiEditButtonExecutableBeforeLeaveFunction} from "../types";
+
+interface DocumentActionButtonsGroupConfig {
+  storedObject: StoredObject,
+  small?: boolean,
+  canEdit?: boolean,
+  canDownload?: boolean,
+  canConvertPdf?: boolean,
+  returnPath?: string,
+
+  /**
+   * Will be the filename displayed to the user when he·she download the document
+   * (the document will be saved on his disk with this name)
+   *
+   * If not set, 'document' will be used.
+   */
+  filename?: string,
+
+  /**
+   * If set, will execute this function before leaving to the editor
+   */
+  executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction,
+}
+
+const props = withDefaults(defineProps<DocumentActionButtonsGroupConfig>(), {
+  small: false,
+  canEdit: true,
+  canDownload: true,
+  canConvertPdf: true,
+  returnPath: window.location.pathname + window.location.search + window.location.hash,
+});
+
+</script>
+
+<style scoped>
+
+</style>

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/README.md

@@ -0,0 +1,5 @@
+# About buttons and components available
+
+## DocumentActionButtonsGroup
+
+This is an component to use to render a group of button with actions linked to a document.

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue

@@ -0,0 +1,46 @@
+<template>
+  <a :class="props.classes" @click="download_and_open($event)">
+    <i class="fa fa-file-pdf-o"></i>
+    Télécharger en pdf
+  </a>
+</template>
+
+<script lang="ts" setup>
+
+import {build_convert_link, download_and_decrypt_doc, download_doc} from "./helpers";
+import mime from "mime";
+import {reactive} from "vue";
+import {StoredObject} from "../../types";
+
+interface ConvertButtonConfig {
+  storedObject: StoredObject,
+  classes: { [key: string]: boolean},
+  filename?: string,
+};
+
+interface DownloadButtonState {
+  content: null|string
+}
+
+const props = defineProps<ConvertButtonConfig>();
+const state: DownloadButtonState = reactive({content: null});
+
+async function download_and_open(event: Event): Promise<void> {
+  const button = event.target as HTMLAnchorElement;
+
+  if (null === state.content) {
+    event.preventDefault();
+
+    const raw = await download_doc(build_convert_link(props.storedObject.uuid));
+    state.content = window.URL.createObjectURL(raw);
+
+    button.href = window.URL.createObjectURL(raw);
+    button.type = 'application/pdf';
+
+    button.download = (props.filename + '.pdf') || 'document.pdf';
+  }
+
+  button.click();
+}
+
+</script>

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue

@@ -0,0 +1,53 @@
+<template>
+  <a :class="props.classes" @click="download_and_open($event)">
+    <i class="fa fa-download"></i>
+    Télécharger
+  </a>
+</template>
+
+<script lang="ts" setup>
+import {reactive} from "vue";
+import {build_download_info_link, download_and_decrypt_doc} from "./helpers";
+import mime from "mime";
+import {StoredObject} from "../../types";
+
+interface DownloadButtonConfig {
+  storedObject: StoredObject,
+  classes: {[k: string]: boolean},
+  filename?: string,
+}
+
+interface DownloadButtonState {
+  content: null|string
+}
+
+const props = defineProps<DownloadButtonConfig>();
+const state: DownloadButtonState = reactive({content: null});
+
+async function download_and_open(event: Event): Promise<void> {
+  const button = event.target as HTMLAnchorElement;
+
+  if (null === state.content) {
+    event.preventDefault();
+
+    const urlInfo = build_download_info_link(props.storedObject.filename);
+
+    const raw = await download_and_decrypt_doc(urlInfo, props.storedObject.keyInfos, new Uint8Array(props.storedObject.iv));
+    state.content = window.URL.createObjectURL(raw);
+
+    button.href = window.URL.createObjectURL(raw);
+    button.type = props.storedObject.type;
+
+    if (props.filename !== undefined) {
+      button.download = props.filename || 'document';
+
+      const ext = mime.getExtension(props.storedObject.type);
+      if (null !== ext) {
+        button.download = button.download + '.' + ext;
+      }
+    }
+  }
+
+  button.click();
+}
+</script>

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue

@@ -0,0 +1,44 @@
+<template>
+  <a :class="Object.assign(props.classes, {'btn': true})" @click="beforeLeave($event)" :href="build_wopi_editor_link(props.storedObject.uuid, props.returnPath)">
+    <i class="fa fa-paragraph"></i>
+    Editer en ligne
+  </a>
+</template>
+
+<script lang="ts" setup>
+import WopiEditButton from "./WopiEditButton.vue";
+import {build_wopi_editor_link} from "./helpers";
+import {StoredObject, WopiEditButtonExecutableBeforeLeaveFunction} from "../../types";
+
+interface WopiEditButtonConfig {
+  storedObject: StoredObject,
+  returnPath?: string,
+  classes: {[k: string] : boolean},
+  executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction,
+}
+
+const props = defineProps<WopiEditButtonConfig>();
+
+let executed = false;
+
+async function beforeLeave(event: Event): Promise<true> {
+  console.log(executed);
+  if (props.executeBeforeLeave === undefined || executed === true) {
+    return Promise.resolve(true);
+  }
+
+  event.preventDefault();
+
+  await props.executeBeforeLeave();
+  executed = true;
+
+  const link = event.target as HTMLAnchorElement;
+  link.click();
+
+  return Promise.resolve(true);
+}
+</script>
+
+<style scoped lang="sass">
+</style>
+

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts

@@ -0,0 +1,168 @@
+
+const SUPPORTED_MIMES = new Set([
+  'image/svg+xml',
+  'application/vnd.ms-powerpoint',
+  'application/vnd.ms-excel',
+  'application/vnd.sun.xml.writer',
+  'application/vnd.oasis.opendocument.text',
+  'application/vnd.oasis.opendocument.text-flat-xml',
+  'application/vnd.sun.xml.calc',
+  'application/vnd.oasis.opendocument.spreadsheet',
+  'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
+  'application/vnd.sun.xml.impress',
+  'application/vnd.oasis.opendocument.presentation',
+  'application/vnd.oasis.opendocument.presentation-flat-xml',
+  'application/vnd.sun.xml.draw',
+  'application/vnd.oasis.opendocument.graphics',
+  'application/vnd.oasis.opendocument.graphics-flat-xml',
+  'application/vnd.oasis.opendocument.chart',
+  'application/vnd.sun.xml.writer.global',
+  'application/vnd.oasis.opendocument.text-master',
+  'application/vnd.sun.xml.writer.template',
+  'application/vnd.oasis.opendocument.text-template',
+  'application/vnd.oasis.opendocument.text-master-template',
+  'application/vnd.sun.xml.calc.template',
+  'application/vnd.oasis.opendocument.spreadsheet-template',
+  'application/vnd.sun.xml.impress.template',
+  'application/vnd.oasis.opendocument.presentation-template',
+  'application/vnd.sun.xml.draw.template',
+  'application/vnd.oasis.opendocument.graphics-template',
+  'application/msword',
+  'application/msword',
+  'application/vnd.ms-excel',
+  'application/vnd.ms-powerpoint',
+  'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  'application/vnd.ms-word.document.macroEnabled.12',
+  'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+  'application/vnd.ms-word.template.macroEnabled.12',
+  'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+  'application/vnd.ms-excel.template.macroEnabled.12',
+  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+  'application/vnd.ms-excel.sheet.macroEnabled.12',
+  'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+  'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+  'application/vnd.openxmlformats-officedocument.presentationml.template',
+  'application/vnd.ms-powerpoint.template.macroEnabled.12',
+  'application/vnd.wordperfect',
+  'application/x-aportisdoc',
+  'application/x-hwp',
+  'application/vnd.ms-works',
+  'application/x-mswrite',
+  'application/x-dif-document',
+  'text/spreadsheet',
+  'text/csv',
+  'application/x-dbase',
+  'application/vnd.lotus-1-2-3',
+  'image/cgm',
+  'image/vnd.dxf',
+  'image/x-emf',
+  'image/x-wmf',
+  'application/coreldraw',
+  'application/vnd.visio2013',
+  'application/vnd.visio',
+  'application/vnd.ms-visio.drawing',
+  'application/x-mspublisher',
+  'application/x-sony-bbeb',
+  'application/x-gnumeric',
+  'application/macwriteii',
+  'application/x-iwork-numbers-sffnumbers',
+  'application/vnd.oasis.opendocument.text-web',
+  'application/x-pagemaker',
+  'text/rtf',
+  'text/plain',
+  'application/x-fictionbook+xml',
+  'application/clarisworks',
+  'image/x-wpg',
+  'application/x-iwork-pages-sffpages',
+  'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+  'application/x-iwork-keynote-sffkey',
+  'application/x-abiword',
+  'image/x-freehand',
+  'application/vnd.sun.xml.chart',
+  'application/x-t602',
+  'image/bmp',
+  'image/png',
+  'image/gif',
+  'image/tiff',
+  'image/jpg',
+  'image/jpeg',
+  'application/pdf',
+]);
+
+function is_extension_editable(mimeType: string): boolean {
+  return SUPPORTED_MIMES.has(mimeType);
+}
+
+function build_convert_link(uuid: string) {
+  return `/chill/wopi/convert/${uuid}`;
+}
+
+function build_download_info_link(object_name: string) {
+  return `/asyncupload/temp_url/generate/GET?object_name=${object_name}`;
+}
+
+function build_wopi_editor_link(uuid: string, returnPath?: string) {
+  if (returnPath === undefined) {
+    returnPath = window.location.pathname + window.location.search + window.location.hash;
+  }
+
+  return `/chill/wopi/edit/${uuid}?returnPath=` + encodeURIComponent(returnPath);
+}
+
+function download_doc(url: string): Promise<Blob> {
+  return window.fetch(url).then(r => {
+    if (r.ok) {
+      return r.blob()
+    }
+
+    throw new Error('Could not download document');
+  });
+}
+
+async function download_and_decrypt_doc(urlGenerator: string, keyData: JsonWebKey, iv: Uint8Array): Promise<Blob>
+{
+   const algo = 'AES-CBC';
+   // get an url to download the object
+   const downloadInfoResponse = await window.fetch(urlGenerator);
+
+   if (!downloadInfoResponse.ok) {
+     throw new Error("error while downloading url " + downloadInfoResponse.status + " " + downloadInfoResponse.statusText);
+   }
+
+   const downloadInfo = await downloadInfoResponse.json() as {url: string};
+   const rawResponse = await window.fetch(downloadInfo.url);
+
+   if (!rawResponse.ok) {
+     throw new Error("error while downloading raw file " + rawResponse.status + " " + rawResponse.statusText);
+   }
+
+   if (iv.length === 0) {
+     return rawResponse.blob();
+   }
+
+   const rawBuffer = await rawResponse.arrayBuffer();
+
+   try {
+     const key = await window.crypto.subtle
+       .importKey('jwk', keyData, { name: algo }, false, ['decrypt']);
+     const decrypted = await window.crypto.subtle
+       .decrypt({ name: algo, iv: iv }, key, rawBuffer);
+
+     return Promise.resolve(new Blob([decrypted]));
+   } catch (e) {
+     console.error('get error while keys and decrypt operations');
+     console.error(e);
+
+     throw e;
+   }
+}
+
+export {
+  build_convert_link,
+  build_download_info_link,
+  build_wopi_editor_link,
+  download_and_decrypt_doc,
+  download_doc,
+  is_extension_editable,
+};

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

@@ -46,21 +46,8 @@
                 </li>
             {% endif %}
             <li>
-                {{ m.download_button(document.object, document.title) }}
+                {{ document.object|chill_document_button_group(document.title, not freezed) }}
             </li>
-            {% if chill_document_is_editable(document.object) %}
-                {% if not freezed %}
-                <li>
-                    {{ document.object|chill_document_edit_button({'title': document.title|e('html') }) }}
-                </li>
-                {% else %}
-                    <li>
-                        <a class="btn btn-wopilink disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
-                            {{ 'Update document'|trans }}
-                        </a>
-                    </li>
-                {% endif %}
-            {% endif %}
             {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', document) and document.course != null %}
                 <li>
                     <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': document.course.id, 'id': document.id}) }}" class="btn btn-show"></a>

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

@@ -8,16 +8,16 @@
 
 {% block js %}
 	{{ parent() }}
-	{{ encore_entry_script_tags('mod_async_upload') }}
     {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
     {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
 	{{ parent() }}
-	{{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
     {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}

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

@@ -14,6 +14,7 @@
     {{ parent() }}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}
@@ -61,13 +62,8 @@
             </li>
         {% endif %}
         <li>
-            {{ m.download_button(document.object, document.title) }}
+            {{ document.object|chill_document_button_group(document.title) }}
         </li>
-        {% if chill_document_is_editable(document.object) %}
-            <li>
-                {{ document.object|chill_document_edit_button }}
-            </li>
-        {% endif %}
         {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}
         {% if workflows_frame is not empty %}
             <li>
@@ -86,4 +82,5 @@
     {{ parent() }}
     {{ encore_entry_script_tags('mod_async_upload') }}
     {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}

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

@@ -0,0 +1,7 @@
+{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
+<div
+    data-download-buttons
+    data-stored-object="{{ document_json|json_encode|escape('html_attr') }}"
+    data-can-edit="{{ can_edit ? '1' : '0' }}"
+    {% if options['small'] is defined %}data-button-small="{{ options['small'] ? '1' : '0' }}"{% endif %}
+    {% if title|default(document.title)|default(null) is not null %}data-filename="{{ title|default(document.title)|escape('html_attr') }}"{% endif %}></div>

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

@@ -53,15 +53,10 @@
                     <li>
                         <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
                     </li>
-                    {% if chill_document_is_editable(document.object) %}
-                        <li>
-                            {{ document.object|chill_document_edit_button }}
-                        </li>
-                    {% endif %}
                 {% endif %}
                 {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
                     <li>
-                        {{ m.download_button(document.object, document.title) }}
+                        {{ document.object|chill_document_button_group(document.title, is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document)) }}
                     </li>
                     <li>
                         <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
@@ -80,15 +75,10 @@
                     <li>
                         <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
                     </li>
-                    {% if chill_document_is_editable(document.object) %}
-                        <li>
-                            {{ document.object|chill_document_edit_button }}
-                        </li>
-                    {% endif %}
                 {% endif %}
                 {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
                     <li>
-                        {{ m.download_button(document.object, document.title) }}
+                        {{ document.object|chill_document_button_group(document.title, is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document)) }}
                     </li>
                     <li>
                         <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>

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

@@ -2,13 +2,13 @@
     {% if storedObject is null %}
         <!-- No document to download -->
     {% else %}
-        <a class="btn btn-download" 
-           data-label-preparing="{{ ('Preparing'|trans ~ '...')|escape('html_attr') }}" 
-           data-label-ready="{{ 'Ready to show'|trans|escape('html_attr') }}" 
-           data-download-button 
-           data-key="{{ storedObject.keyInfos|json_encode|escape('html_attr') }}" 
-           data-iv="{{ storedObject.iv|json_encode|escape('html_attr') }}" 
-           data-temp-url-get-generator="{{ storedObject|generate_url|escape('html_attr') }}" 
+        <a class="btn btn-download"
+           data-label-preparing="{{ ('Preparing'|trans ~ '...')|escape('html_attr') }}"
+           data-label-ready="{{ 'Ready to show'|trans|escape('html_attr') }}"
+           data-download-button
+           data-key="{{ storedObject.keyInfos|json_encode|escape('html_attr') }}"
+           data-iv="{{ storedObject.iv|json_encode|escape('html_attr') }}"
+           data-temp-url-get-generator="{{ storedObject|generate_url|escape('html_attr') }}"
            data-mime-type="{{ storedObject.type|escape('html_attr') }}" {% if filename is not null %}data-filename="{{ filename|escape('html_attr') }}"{% endif %}>
             {{ 'Download'|trans }}</a>
     {% endif %}
@@ -28,4 +28,21 @@
            data-mime-type="{{ storedObject.type|escape('html_attr') }}" {% if filename is not null %}data-filename="{{ filename|escape('html_attr') }}"{% endif %}>
             {{ 'Download'|trans }}</a>
     {% endif %}
-{% endmacro %}
+{% endmacro %}
+
+{% macro download_button_group(storedObject, canEdit = true, filename = null, options = {}) %}
+    {% if storedObject is null %}
+        <!-- No document to download -->
+    {% else %}
+        <div
+            data-download-buttons
+            data-uuid="{{ storedObject.uuid|escape('html_attr') }}"
+            data-key="{{ storedObject.keyInfos|json_encode|escape('html_attr') }}"
+            data-iv="{{ storedObject.iv|json_encode|escape('html_attr') }}"
+            data-temp-url-generator="{{ storedObject|generate_url|escape('html_attr') }}"
+            data-mime-type="{{ storedObject.type|escape('html_attr') }}"
+            data-can-edit="{{ canEdit ? '1' : '0' }}"
+            {% if options['small'] is defined %}data-button-small="{{ options['small'] ? '1' : '0' }}"{% endif %}
+            {% if filename|default(storedObject.title)|default(null) is not null %}data-filename="{{ filename|default(storedObject.title)|escape('html_attr') }}"{% endif %}></div>
+    {% endif %}
+{% endmacro %}

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

@@ -27,16 +27,16 @@
 
 {% block js %}
 	{{ parent() }}
-	{{ encore_entry_script_tags('mod_async_upload') }}
     {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
     {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
 	{{ parent() }}
-	{{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
     {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}

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

@@ -24,7 +24,11 @@
 {% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block js %}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}
@@ -70,6 +74,10 @@
             </li>
         {% endif %}
 
+        <li>
+            {{ document.object|chill_document_button_group(document.title, is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document)) }}
+        </li>
+
         {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
             <li>
                 <a href="{{ path('person_document_edit', {'id': document.id, 'person': person.id}) }}" class="btn btn-edit">
@@ -77,16 +85,4 @@
                 </a>
             </li>
         {% endif %}
-
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
-
-        {% if chill_document_is_editable(document.object) %}
-            <li>
-                {{ document.object|chill_document_edit_button }}
-            </li>
-        {% endif %}
-
-        {# {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }} #}
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtension.php

@@ -24,6 +24,10 @@ class WopiEditTwigExtension extends AbstractExtension
                 'needs_environment' => true,
                 'is_safe' => ['html'],
             ]),
+            new TwigFilter('chill_document_button_group', [WopiEditTwigExtensionRuntime::class, 'renderButtonGroup'], [
+                'needs_environment' => true,
+                'is_safe' => ['html'],
+            ]),
         ];
     }
 

src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php

@@ -13,6 +13,8 @@ namespace Chill\DocStoreBundle\Templating;
 
 use ChampsLibres\WopiLib\Contract\Service\Discovery\DiscoveryInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Twig\Environment;
 use Twig\Extension\RuntimeExtensionInterface;
 
@@ -112,20 +114,53 @@ final class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
         'application/pdf',
     ];
 
+    private const DEFAULT_OPTIONS_TEMPLATE_BUTTON_GROUP = [
+        'small' => false,
+    ];
+
     private const TEMPLATE = '@ChillDocStore/Button/wopi_edit_document.html.twig';
 
+    private const TEMPLATE_BUTTON_GROUP = '@ChillDocStore/Button/button_group.html.twig';
+
     private DiscoveryInterface $discovery;
 
-    public function __construct(DiscoveryInterface $discovery)
+    private NormalizerInterface $normalizer;
+
+    public function __construct(DiscoveryInterface $discovery, NormalizerInterface $normalizer)
     {
         $this->discovery = $discovery;
+        $this->normalizer = $normalizer;
     }
 
+    /**
+     * return true if the document is editable.
+     *
+     * **NOTE**: as the Vue button does have similar test, this is not required if in use with
+     * the dedicated Vue component (GroupDownloadButton.vue, WopiEditButton.vue)
+     */
     public function isEditable(StoredObject $document): bool
     {
         return in_array($document->getType(), self::SUPPORTED_MIMES, true);
     }
 
+    /**
+     * @param array{small: boolean} $options
+     *
+     * @throws \Twig\Error\LoaderError
+     * @throws \Twig\Error\RuntimeError
+     * @throws \Twig\Error\SyntaxError
+     */
+    public function renderButtonGroup(Environment $environment, StoredObject $document, ?string $title = null, bool $canEdit = true, array $options = []): string
+    {
+        return $environment->render(self::TEMPLATE_BUTTON_GROUP, [
+            'document' => $document,
+            'document_json' => $this->normalizer->normalize($document, 'json', [AbstractNormalizer::GROUPS => ['read']]),
+            'title' => $title,
+            'can_edit' => $canEdit,
+            'options' => array_merge($options, self::DEFAULT_OPTIONS_TEMPLATE_BUTTON_GROUP),
+        ]);
+    }
+
     public function renderEditButton(Environment $environment, StoredObject $document, ?array $options = null): string
     {
         return $environment->render(self::TEMPLATE, [

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

@@ -4,4 +4,5 @@ module.exports = function(encore)
         ChillDocStoreAssets: __dirname + '/Resources/public'
     });
     encore.addEntry('mod_async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
+    encore.addEntry('mod_document_action_buttons_group', __dirname + '/Resources/public/module/document_action_buttons_group/index');
 };

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

@@ -66,3 +66,11 @@ online_edit_document: Éditer en ligne
 
 workflow:
     Document deleted: Document supprimé
+
+# ROLES
+accompanyingCourseDocument: Documents dans les parcours d'accompagnement
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE: Créer un document
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE: Supprimer un document
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE: Voir les documents
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS: Voir les détails d'un document
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE: Modifier un document

src/Bundle/ChillEventBundle/Entity/Participation.php

@@ -197,7 +197,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
      *
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return in_array($offset, [
             'person', 'role', 'status', 'event',
@@ -207,30 +207,21 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * @param mixed $offset
      *
-     * @return Event|mixed|Person|Role|Status
+     * @return Event|Person|Role|Status
      */
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         switch ($offset) {
             case 'person':
                 return $this->getPerson();
-
-                break;
-
             case 'role':
                 return $this->getRole();
-
-                break;
-
             case 'status':
                 return $this->getStatus();
-
-                break;
-
             case 'event':
                 return $this->getEvent();
-
-                break;
+            default:
+                throw new \LogicException("this offset does not exists : " . $offset);
         }
     }
 
@@ -238,28 +229,28 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
      * @param mixed $offset
      * @param mixed $value
      *
-     * @return Participation|void
+     * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         switch ($offset) {
             case 'person':
-                return $this->setPerson($value);
+                $this->setPerson($value);
 
                 break;
 
             case 'role':
-                return $this->setRole($value);
+                $this->setRole($value);
 
                 break;
 
             case 'status':
-                return $this->setStatus($value);
+                $this->setStatus($value);
 
                 break;
 
             case 'event':
-                return $this->setEvent($value);
+                $this->setEvent($value);
 
                 break;
         }
@@ -268,7 +259,7 @@ class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterfac
     /**
      * @param mixed $offset
      */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         $this->offsetSet($offset, null);
     }

src/Bundle/ChillEventBundle/Search/EventSearch.php

@@ -174,8 +174,8 @@ class EventSearch extends AbstractSearch
         }
 
         if (
-                (isset($terms['name']) || isset($terms['_default']))
-                && (!empty($terms['name']) || !empty($terms['_default']))
+            (isset($terms['name']) || isset($terms['_default']))
+            && (!empty($terms['name']) || !empty($terms['_default']))
         ) {
             // the form with name:"xyz" has precedence
             $name = $terms['name'] ?? $terms['_default'];

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

@@ -34,6 +34,29 @@ abstract class AbstractCRUDController extends AbstractController
      */
     protected array $crudConfig = [];
 
+    /**
+     * get the role given from the config.
+     *
+     * @param mixed $entity
+     * @param mixed $_format
+     */
+    protected function getRoleFor(string $action, Request $request, $entity, $_format): string
+    {
+        $actionConfig = $this->getActionConfig($action);
+
+        if (null !== $actionConfig['roles'][$request->getMethod()]) {
+            return $actionConfig['roles'][$request->getMethod()];
+        }
+
+        if ($this->crudConfig['base_role']) {
+            return $this->crudConfig['base_role'];
+        }
+
+        throw new \RuntimeException(sprintf('the config does not have any role for the ' .
+            'method %s nor a global role for the whole action. Add those to your ' .
+            'configuration or override the required method', $request->getMethod()));
+    }
+
     public static function getSubscribedServices(): array
     {
         return array_merge(

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

@@ -499,28 +499,6 @@ class ApiController extends AbstractCRUDController
         return ['groups' => ['read']];
     }
 
-    /**
-     * get the role given from the config.
-     *
-     * @param mixed $entity
-     * @param mixed $_format
-     */
-    protected function getRoleFor(string $action, Request $request, $entity, $_format): string
-    {
-        $actionConfig = $this->getActionConfig($action);
-
-        if (null !== $actionConfig['roles'][$request->getMethod()]) {
-            return $actionConfig['roles'][$request->getMethod()];
-        }
-
-        if ($this->crudConfig['base_role']) {
-            return $this->crudConfig['base_role'];
-        }
-
-        throw new RuntimeException(sprintf('the config does not have any role for the ' .
-            'method %s nor a global role for the whole action. Add those to your ' .
-            'configuration or override the required method', $request->getMethod()));
-    }
 
     protected function getSerializer(): SerializerInterface
     {

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php

@@ -50,8 +50,8 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
 
         foreach (Intl::getLanguageBundle()->getLanguageNames() as $code => $language) {
             if (
-                    !in_array($code, $this->regionalVersionToInclude, true)
-                    && !in_array($code, $this->ancientToExclude, true)
+                !in_array($code, $this->regionalVersionToInclude, true)
+                && !in_array($code, $this->ancientToExclude, true)
             ) {
                 $lang = (new Language())
                     ->setId($code)

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -274,7 +274,7 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end() // end of root/children
             ->end() // end of root
-;
+        ;
 
         $rootNode->children()
             ->arrayNode('add_address')->addDefaultsIfNotSet()->children()

src/Bundle/ChillMainBundle/Entity/Country.php

@@ -80,7 +80,6 @@ class Country
     /**
      * Get name.
      *
-     * @return string
      */
     public function getName()
     {

src/Bundle/ChillMainBundle/Export/Helper/AggregateStringHelper.php

@@ -0,0 +1,36 @@
+<?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\MainBundle\Export\Helper;
+
+/**
+ * This class provides support to transform aggregates datas in correct format string into column of exports.
+ */
+class AggregateStringHelper
+{
+    public function getLabelMulti(string $key, array $values, string $header)
+    {
+        return static function ($value) use ($header) {
+            if ('_header' === $value) {
+                return $header;
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            return implode(
+                '|',
+                json_decode($value, true)
+            );
+        };
+    }
+}

src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php

@@ -45,9 +45,9 @@ class UserHelper
 
     public function getLabelMulti($key, array $values, string $header): callable
     {
-        return function ($value) {
+        return function ($value) use ($header) {
             if ('_header' === $value) {
-                return 'users name';
+                return $header;
             }
 
             if (null === $value) {

src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php

@@ -42,7 +42,9 @@ class IdToEntityDataTransformer implements DataTransformerInterface
     {
         $this->repository = $repository;
         $this->multiple = $multiple;
-        $this->getId = $getId ?? static function (object $o) { return $o->getId(); };
+        $this->getId = $getId ?? static function (object $o) {
+            return $o->getId();
+        };
     }
 
     /**

src/Bundle/ChillMainBundle/Form/WorkflowStepType.php

@@ -137,8 +137,8 @@ class WorkflowStepType extends AbstractType
                             $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
 
                             if (
-                                    !array_key_exists('isFinal', $meta) || false === $meta['isFinal']
-                                ) {
+                                !array_key_exists('isFinal', $meta) || false === $meta['isFinal']
+                            ) {
                                 $toFinal = false;
                             }
                         }

src/Bundle/ChillMainBundle/Pagination/Page.php

@@ -21,37 +21,36 @@ class Page implements PageInterface
     /**
      * the number of item per page.
      *
-     * @var int
      */
-    protected $itemPerPage;
+    protected int $itemPerPage;
 
     /**
      * the number of the current page.
      *
      * @var int
      */
-    protected $number;
+    protected int $number;
 
     /**
      * The route for the current page.
      *
      * @var string
      */
-    protected $route;
+    protected string $route;
 
     /**
      * Parameters for the route to the current page.
      *
      * @var array
      */
-    protected $routeParameters;
+    protected array $routeParameters;
 
     /**
      * The number of items in the whole iteration.
      *
      * @var int
      */
-    protected $totalItems;
+    protected int $totalItems;
 
     /**
      * @var UrlGeneratorInterface
@@ -59,12 +58,12 @@ class Page implements PageInterface
     protected $urlGenerator;
 
     public function __construct(
-        $number,
-        $itemPerPage,
+        int $number,
+        int $itemPerPage,
         UrlGeneratorInterface $urlGenerator,
-        $route,
+        string $route,
         array $routeParameters,
-        $totalItems
+        int $totalItems
     ) {
         $this->urlGenerator = $urlGenerator;
         $this->number = $number;
@@ -74,24 +73,24 @@ class Page implements PageInterface
         $this->totalItems = $totalItems;
     }
 
-    public function generateUrl()
+    public function generateUrl(): string
     {
         return $this->urlGenerator->generate($this->route, $this->routeParameters);
     }
 
-    public function getFirstItemNumber()
+    public function getFirstItemNumber(): int
     {
         return ($this->number - 1) * $this->itemPerPage;
     }
 
-    public function getLastItemNumber()
+    public function getLastItemNumber(): int
     {
         $last = $this->number * $this->itemPerPage - 1;
 
         return $last < $this->totalItems ? $last : $this->totalItems;
     }
 
-    public function getNumber()
+    public function getNumber(): int
     {
         return $this->number;
     }

src/Bundle/ChillMainBundle/Pagination/PageGenerator.php

@@ -27,27 +27,27 @@ class PageGenerator implements Iterator
         $this->paginator = $paginator;
     }
 
-    public function current()
+    public function current(): Page
     {
-        return $this->paginator->getPage($current);
+        return $this->paginator->getPage($this->current);
     }
 
-    public function key()
+    public function key(): int
     {
         return $this->current;
     }
 
-    public function next()
+    public function next(): void
     {
         ++$this->current;
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         $this->current = 1;
     }
 
-    public function valid()
+    public function valid(): bool
     {
         return 0 < $this->current
               && $this->paginator->countPages() >= $this->current;

src/Bundle/ChillMainBundle/Pagination/Paginator.php

@@ -26,21 +26,21 @@ class Paginator implements PaginatorInterface
      *
      * @var int
      */
-    protected $currentPageNumber;
+    protected int $currentPageNumber;
 
     /**
      * the number of items on a single page.
      *
      * @var int
      */
-    protected $itemPerPage;
+    protected int $itemPerPage;
 
     /**
      * the key in the GET parameter to indicate the number of item per page.
      *
      * @var string
      */
-    protected $itemPerPageKey;
+    protected string $itemPerPageKey;
 
     /**
      * the key in the GET parameter to indicate the page number in
@@ -48,45 +48,45 @@ class Paginator implements PaginatorInterface
      *
      * @var string
      */
-    protected $pageKey;
+    protected string $pageKey;
 
     /**
      * the route of the pages.
      *
      * @var string
      */
-    protected $route;
+    protected string $route;
 
     /**
      * the parameters of the route.
      *
      * @var string[]
      */
-    protected $routeParameters;
+    protected array $routeParameters;
 
     /**
      * The number of total items.
      *
      * @var int
      */
-    protected $totalItems;
+    protected int $totalItems;
 
     /**
      * the generator for url.
      *
      * @var UrlGeneratorInterface
      */
-    protected $urlGenerator;
+    protected UrlGeneratorInterface $urlGenerator;
 
     public function __construct(
-        $totalItems,
-        $itemPerPage,
-        $currentPageNumber,
-        $route,
+        int $totalItems,
+        int $itemPerPage,
+        int $currentPageNumber,
+        string $route,
         array $routeParameters,
         UrlGeneratorInterface $urlGenerator,
-        $pageKey,
-        $itemPerPageKey
+        string $pageKey,
+        string $itemPerPageKey
     ) {
         $this->totalItems = $totalItems;
         $this->itemPerPage = $itemPerPage;
@@ -98,12 +98,12 @@ class Paginator implements PaginatorInterface
         $this->itemPerPageKey = $itemPerPageKey;
     }
 
-    public function count()
+    public function count(): int
     {
         return $this->countPages();
     }
 
-    public function countPages()
+    public function countPages(): int
     {
         if (0 === $this->itemPerPage) {
             return 1;
@@ -122,20 +122,17 @@ class Paginator implements PaginatorInterface
         return 0 === $nb ? 1 : (int) $nb;
     }
 
-    /**
-     * @return \Chill\MainBundle\Pagination\Page
-     */
-    public function getCurrentPage()
+    public function getCurrentPage(): Page
     {
         return $this->getPage($this->currentPageNumber);
     }
 
-    public function getCurrentPageFirstItemNumber()
+    public function getCurrentPageFirstItemNumber(): int
     {
         return $this->getCurrentPage()->getFirstItemNumber();
     }
 
-    public function getItemsPerPage()
+    public function getItemsPerPage(): int
     {
         return $this->itemPerPage;
     }
@@ -145,7 +142,7 @@ class Paginator implements PaginatorInterface
      *
      * @return \Chill\MainBundle\Pagination\Page
      */
-    public function getNextPage()
+    public function getNextPage(): Page
     {
         if (!$this->hasNextPage()) {
             throw new RuntimeException('this page has no next page');
@@ -155,11 +152,10 @@ class Paginator implements PaginatorInterface
     }
 
     /**
-     * @param type $number
      *
      * @return \Chill\MainBundle\Pagination\Page
      */
-    public function getPage($number)
+    public function getPage(int $number): Page
     {
         if (!$this->hasPage($number)) {
             throw new RuntimeException("The page with number {$number} does not "
@@ -179,7 +175,7 @@ class Paginator implements PaginatorInterface
         );
     }
 
-    public function getPagesGenerator()
+    public function getPagesGenerator(): iterable
     {
         for ($i = 1; $this->countPages() >= $i; ++$i) {
             yield $this->getPage($i);
@@ -191,7 +187,7 @@ class Paginator implements PaginatorInterface
      *
      * @return \Chill\MainBundle\Pagination\Page
      */
-    public function getPreviousPage()
+    public function getPreviousPage(): PageInterface
     {
         if (!$this->hasPreviousPage()) {
             throw new RuntimeException('this page has no previous page');
@@ -200,7 +196,7 @@ class Paginator implements PaginatorInterface
         return $this->getPage($this->currentPageNumber - 1);
     }
 
-    public function getTotalItems()
+    public function getTotalItems(): int
     {
         return $this->totalItems;
     }
@@ -208,12 +204,12 @@ class Paginator implements PaginatorInterface
     /**
      * @return bool
      */
-    public function hasNextPage()
+    public function hasNextPage(): bool
     {
         return $this->hasPage($this->currentPageNumber + 1);
     }
 
-    public function hasPage($number)
+    public function hasPage($number): bool
     {
         if (0 === $this->totalItems) {
             return 1 === $number;
@@ -226,18 +222,18 @@ class Paginator implements PaginatorInterface
     /**
      * @return bool
      */
-    public function hasPreviousPage()
+    public function hasPreviousPage(): bool
     {
         return $this->hasPage($this->currentPageNumber - 1);
     }
 
-    public function isCurrentPage(PageInterface $page)
+    public function isCurrentPage(PageInterface $page): bool
     {
         return $page->getNumber() === $this->currentPageNumber;
     }
 
-    public function setItemsPerPage($itemPerPage)
+    public function setItemsPerPage(int $itemsPerPage)
     {
-        $this->itemPerPage = $itemPerPage;
+        $this->itemPerPage = $itemsPerPage;
     }
 }

src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php

@@ -124,12 +124,12 @@ class PaginatorFactory
         return array_merge(
             $this->router->getContext()->getParameters(),
             // get the route parameters
-              $this->requestStack
-                  ->getCurrentRequest()
-                  ->attributes->get('_route_params'),
+            $this->requestStack
+                ->getCurrentRequest()
+                ->attributes->get('_route_params'),
             // get the query parameters
-              $this->requestStack
-                  ->getCurrentRequest()->query->all()
+            $this->requestStack
+                ->getCurrentRequest()->query->all()
         );
     }
 }

src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php

@@ -32,26 +32,26 @@ interface PaginatorInterface extends Countable
      *
      * @return int
      */
-    public function countPages();
+    public function countPages(): int;
 
     /**
      * get the current page.
      *
      * @return PageInterface
      */
-    public function getCurrentPage();
+    public function getCurrentPage(): PageInterface;
 
     /**
      * get the first result for the current page.
      *
      * @return int
      */
-    public function getCurrentPageFirstItemNumber();
+    public function getCurrentPageFirstItemNumber(): int;
 
     /*
      * get the number of items per page
      */
-    public function getItemsPerPage();
+    public function getItemsPerPage(): int;
 
     /**
      * get the next page.
@@ -60,7 +60,7 @@ interface PaginatorInterface extends Countable
      *
      * @return PageInterface
      */
-    public function getNextPage();
+    public function getNextPage(): PageInterface;
 
     /**
      * get page by his number.
@@ -69,14 +69,14 @@ interface PaginatorInterface extends Countable
      *
      * @throws RuntimeException if the pagination has no page with specified number
      */
-    public function getPage($number);
+    public function getPage(int $number): PageInterface;
 
     /**
      * get a generator to generate pages.
      *
      * @return Generator which return PageInterface elements
      */
-    public function getPagesGenerator();
+    public function getPagesGenerator(): iterable;
 
     /**
      * get the previous page.
@@ -85,35 +85,34 @@ interface PaginatorInterface extends Countable
      *
      * @return PageInterface
      */
-    public function getPreviousPage();
+    public function getPreviousPage(): PageInterface;
 
     /**
      * get the number of results for this paginator.
      *
      * @return int
      */
-    public function getTotalItems();
+    public function getTotalItems(): int;
 
     /**
      * check if the current page has a next page.
      *
      * @return bool
      */
-    public function hasNextPage();
+    public function hasNextPage(): bool;
 
     /**
      * check if the page with the given number exists.
      *
-     * @param int $number
      */
-    public function hasPage($number);
+    public function hasPage($number): bool;
 
     /**
      * check if the current page has a page before.
      *
      * @return bool
      */
-    public function hasPreviousPage();
+    public function hasPreviousPage(): bool;
 
     /**
      * check if the given page is the current page.
@@ -122,10 +121,10 @@ interface PaginatorInterface extends Countable
      *
      * @return bool
      */
-    public function isCurrentPage(PageInterface $page);
+    public function isCurrentPage(PageInterface $page): bool;
 
     /*
      * set the number of items per page
      */
-    public function setItemsPerPage($itemsPerPage);
+    public function setItemsPerPage(int $itemsPerPage);
 }

src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php

@@ -183,7 +183,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
         }
 
         // filter only number
-        $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
+        $filtered = preg_replace('/[^0-9]/', '', (string) $phonenumber);
 
         $item = $this->cachePool->getItem('pnum_' . $filtered);
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue

@@ -98,11 +98,6 @@ export default {
          }
       },
    },
-   mounted() {
-      if (typeof this.value.point !== 'undefined') {
-         this.updateMapCenter(this.value.point);
-      }
-   },
    methods: {
       transName(value) {
          return value.streetNumber === undefined ? value.street : `${value.streetNumber}, ${value.street}`

src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig

@@ -260,11 +260,11 @@
 
 {% block pick_rolling_date_widget %}
     <div data-rolling-date="{{ form.vars['uniqid'] }}" class="row">
-        <div class="roll-wrapper col-sm-6">
+        <div class="roll-wrapper">
             {{ form_widget(form.roll, { 'attr': { 'data-roll-picker': 'data-roll-picker'}}) }}
             {{ form_errors(form.roll) }}
         </div>
-        <div class="fixed-wrapper col-sm-6">
+        <div class="fixed-wrapper">
             {{ form_widget(form.fixedDate) }}
             {{ form_errors(form.fixedDate) }}
         </div>

src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig

@@ -11,6 +11,7 @@
     {{ encore_entry_script_tags('mod_entity_workflow_subscribe') }}
     {{ encore_entry_script_tags('page_workflow_show') }}
     {{ encore_entry_script_tags('mod_wopi_link') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
@@ -19,6 +20,7 @@
     {{ encore_entry_link_tags('mod_entity_workflow_subscribe') }}
     {{ encore_entry_link_tags('page_workflow_show') }}
     {{ encore_entry_link_tags('mod_wopi_link') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as macro %}

src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php

@@ -26,28 +26,4 @@ use const E_USER_DEPRECATED;
  */
 abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
 {
-    protected function supports($attribute, $subject)
-    {
-        @trigger_error(
-            'This voter should implements the new `supports` '
-            . 'methods introduced by Symfony 3.0, and do not rely on '
-            . 'getSupportedAttributes and getSupportedClasses methods.',
-            E_USER_DEPRECATED
-        );
-
-        // @TODO: getSupportedAttributes() should be created in here and made abstract or in ChillVoterInterface.
-        // @TODO: getSupportedClasses() should be created in here and made abstract or in ChillVoterInterface.
-        return in_array($attribute, $this->getSupportedAttributes($attribute), true)
-            && in_array(get_class($subject), $this->getSupportedClasses(), true);
-    }
-
-    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
-    {
-        @trigger_error('This voter should implements the new `voteOnAttribute` '
-            . 'methods introduced by Symfony 3.0, and do not rely on '
-            . 'isGranted method', E_USER_DEPRECATED);
-
-        // @TODO: isGranted() should be created in here and made abstract or in ChillVoterInterface.
-        return $this->isGranted($attribute, $subject, $token->getUser());
-    }
 }

src/Bundle/ChillMainBundle/Serializer/Model/Counter.php

@@ -27,7 +27,7 @@ class Counter implements JsonSerializable
         return $this->counter;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return ['count' => $this->counter];
     }

src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php

@@ -45,7 +45,7 @@ interface ChillEntityRenderInterface
     /**
      * Return true if the class support this object for the given options.
      *
-     * @param type $entity
+     * @param object $entity
      */
     public function supports($entity, array $options): bool;
 }

src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php

@@ -70,23 +70,23 @@ class DelegatedBlockRenderingEvent extends Event implements ArrayAccess
         return $this->content;
     }
 
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->context[$offset]);
     }
 
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->context[$offset];
     }
 
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         throw new RuntimeException('The event context is read-only, you are not '
                 . 'allowed to update it.');
     }
 
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         throw new RuntimeException('The event context is read-only, you are not '
                 . 'allowed to update it.');

src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php

@@ -267,15 +267,15 @@ final class ExportManagerTest extends KernelTestCase
         )
             ->willReturn(static function ($value) {
                 switch ($value) {
-                        case 0:
-                        case 1:
-                            return $value;
+                    case 0:
+                    case 1:
+                        return $value;
 
-                        case '_header':
-                            return 'export';
+                    case '_header':
+                        return 'export';
 
-                        default: throw new RuntimeException(sprintf('The value %s is not valid', $value));
-                    }
+                    default: throw new RuntimeException(sprintf('The value %s is not valid', $value));
+                }
             });
 
         $export->getQueryKeys(Argument::Type('array'))->willReturn(['export']);
@@ -307,15 +307,15 @@ final class ExportManagerTest extends KernelTestCase
         )
             ->willReturn(static function ($value) {
                 switch ($value) {
-                        case '_header': return 'foo_header';
+                    case '_header': return 'foo_header';
 
-                        case 'cat a': return 'label cat a';
+                    case 'cat a': return 'label cat a';
 
-                        case 'cat b': return 'label cat b';
+                    case 'cat b': return 'label cat b';
 
-                        default:
-                            throw new RuntimeException(sprintf('This value (%s) is not valid', $value));
-                    }
+                    default:
+                        throw new RuntimeException(sprintf('This value (%s) is not valid', $value));
+                }
             });
         $aggregator->addRole()->willReturn(null);
         //$aggregator->addRole()->shouldBeCalled();

src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php

@@ -77,13 +77,13 @@ final class IdToEntityDataTransformerTest extends TestCase
 
     public function testTransformMulti()
     {
-        $o1 = new class() {
+        $o1 = new class () {
             public function getId()
             {
                 return 1;
             }
         };
-        $o2 = new class() {
+        $o2 = new class () {
             public function getId()
             {
                 return 2;
@@ -104,7 +104,7 @@ final class IdToEntityDataTransformerTest extends TestCase
 
     public function testTransformSingle()
     {
-        $o = new class() {
+        $o = new class () {
             public function getId()
             {
                 return 1;

src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php

@@ -33,7 +33,7 @@ final class DefaultScopeResolverTest extends TestCase
     public function testHasScopeInterface()
     {
         $scope = new Scope();
-        $entity = new class($scope) implements HasScopeInterface {
+        $entity = new class ($scope) implements HasScopeInterface {
             public function __construct(Scope $scope)
             {
                 $this->scope = $scope;
@@ -52,7 +52,7 @@ final class DefaultScopeResolverTest extends TestCase
 
     public function testHasScopesInterface()
     {
-        $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
+        $entity = new class ($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
             public function __construct(Scope $scopeA, Scope $scopeB)
             {
                 $this->scopes = [$scopeA, $scopeB];

src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php

@@ -34,7 +34,7 @@ final class ScopeResolverDispatcherTest extends TestCase
     public function testHasScopeInterface()
     {
         $scope = new Scope();
-        $entity = new class($scope) implements HasScopeInterface {
+        $entity = new class ($scope) implements HasScopeInterface {
             public function __construct(Scope $scope)
             {
                 $this->scope = $scope;
@@ -52,7 +52,7 @@ final class ScopeResolverDispatcherTest extends TestCase
 
     public function testHasScopesInterface()
     {
-        $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
+        $entity = new class ($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
             public function __construct(Scope $scopeA, Scope $scopeB)
             {
                 $this->scopes = [$scopeA, $scopeB];

src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php

@@ -63,18 +63,18 @@ class RoleScopeScopePresence extends ConstraintValidator
 
         //if the role scope should have a scope
         if (
-                !in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
-                && $value->getScope() === null
-                ) {
+            !in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
+            && $value->getScope() === null
+        ) {
             $this->context->buildViolation($constraint->messagePresenceRequired)
                 ->setParameter('%role%', $this->translator->trans($value->getRole()))
                 ->addViolation();
             $this->logger->debug('the role scope should have a scope, but scope is null. Violation build.');
         } elseif // if the scope should be null
-            (
-                in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
-                && null !== $value->getScope()
-            ) {
+        (
+            in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
+            && null !== $value->getScope()
+        ) {
             $this->context->buildViolation($constraint->messageNullRequired)
                 ->setParameter('%role%', $this->translator->trans($value->getRole()))
                 ->addViolation();

src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php

@@ -343,7 +343,7 @@ final class ImportPeopleFromCSVCommand extends Command
                     $person->setMobilenumber($value);
 
                     break;
-                // we just keep the column number for those data
+                    // we just keep the column number for those data
                 case 'postalcode':
                     $postalCodeValue = $value;
 

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -59,6 +59,8 @@ final class PersonController extends AbstractController
      */
     protected $personRepository;
 
+    private Security $security;
+
     /**
      * @var SimilarPersonMatcher
      */

src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php

@@ -129,7 +129,7 @@ class Configuration implements ConfigurationInterface
             ->defaultValue(false)
             ->end()
             ->end() // children of 'root', parent = root
-;
+        ;
 
         return $treeBuilder;
     }

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -1155,7 +1155,7 @@ class AccompanyingPeriod implements
 
     public function removeWork(AccompanyingPeriodWork $work): self
     {
-        $this->work->removeElement($work);
+        $this->works->removeElement($work);
         $work->setAccompanyingPeriod(null);
 
         return $this;

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -746,7 +746,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
             foreach ($this->getAccompanyingPeriodParticipations()
                 ->map(fn (AccompanyingPeriodParticipation $app) => $app->getAccompanyingPeriod())
                as $period
-           ) {
+            ) {
                 if (!$result->contains($period)) {
                     $result->add($period);
                 }

src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php

@@ -24,7 +24,7 @@ use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class CountSocialWorkActions implements ExportInterface, GroupedExportInterface
+class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInterface
 {
     protected EntityManagerInterface $em;
 

src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php

@@ -19,7 +19,8 @@ use Chill\MainBundle\Export\Helper\DateTimeHelper;
 use Chill\MainBundle\Export\Helper\ExportAddressHelper;
 use Chill\MainBundle\Export\Helper\UserHelper;
 use Chill\MainBundle\Export\ListInterface;
-use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
@@ -87,6 +88,8 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
 
     private PersonRepository $personRepository;
 
+    private RollingDateConverterInterface $rollingDateConverter;
+
     private SocialIssueRender $socialIssueRender;
 
     private SocialIssueRepository $socialIssueRepository;
@@ -110,6 +113,7 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
         SocialIssueRepository $socialIssueRepository,
         SocialIssueRender $socialIssueRender,
         TranslatableStringHelperInterface $translatableStringHelper,
+        RollingDateConverterInterface $rollingDateConverter,
         UserHelper $userHelper
     ) {
         $this->addressHelper = $addressHelper;
@@ -122,14 +126,14 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
         $this->thirdPartyRender = $thirdPartyRender;
         $this->thirdPartyRepository = $thirdPartyRepository;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->rollingDateConverter = $rollingDateConverter;
         $this->userHelper = $userHelper;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('calc_date', ChillDateType::class, [
-                'input' => 'datetime_immutable',
+            ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'export.list.acp.Date of calculation for associated elements',
                 'help' => 'export.list.acp.The associated referree, localisation, and other elements will be valid at this date',
                 'required' => true,
@@ -306,7 +310,7 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
             ->setParameter('list_acp_step', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('authorized_centers', $centers);
 
-        $this->addSelectClauses($qb, $data['calc_date']);
+        $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
 
         return $qb;
     }

src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php

@@ -0,0 +1,396 @@
+<?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\PersonBundle\Export\Export;
+
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\MainBundle\Export\Helper\AggregateStringHelper;
+use Chill\MainBundle\Export\Helper\DateTimeHelper;
+use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
+use Chill\MainBundle\Export\Helper\UserHelper;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\Result;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
+use DateTimeImmutable;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterface
+{
+    private const FIELDS = [
+        'id',
+        'socialActionId',
+        'socialAction',
+        'socialIssue',
+        'acp_id',
+        'acp_user',
+        'startDate',
+        'endDate',
+        'goalsId',
+        'goalsTitle',
+        'goalResultsId',
+        'goalResultsTitle',
+        'resultsId',
+        'resultsTitle',
+        'evaluationsId',
+        'evaluationsTitle',
+        'note',
+        'personsId',
+        'personsName',
+        'thirdParties',
+        'handlingThierParty',
+        'referrers',
+        'createdAt',
+        'createdBy',
+        'updatedAt',
+        'updatedBy',
+    ];
+
+    private AggregateStringHelper $aggregateStringHelper;
+
+    private DateTimeHelper $dateTimeHelper;
+
+    private EntityManagerInterface $entityManager;
+
+    private LabelPersonHelper $personHelper;
+
+    private RollingDateConverterInterface $rollingDateConverter;
+
+    private SocialActionRender $socialActionRender;
+
+    private SocialActionRepository $socialActionRepository;
+
+    private SocialIssueRender $socialIssueRender;
+
+    private SocialIssueRepository $socialIssueRepository;
+
+    private LabelThirdPartyHelper $thirdPartyHelper;
+
+    private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
+
+    private UserHelper $userHelper;
+
+    public function __construct(
+        EntityManagerInterface $entityManager,
+        DateTimeHelper $dateTimeHelper,
+        UserHelper $userHelper,
+        LabelPersonHelper $personHelper,
+        LabelThirdPartyHelper $thirdPartyHelper,
+        TranslatableStringExportLabelHelper $translatableStringExportLabelHelper,
+        SocialIssueRender $socialIssueRender,
+        SocialIssueRepository $socialIssueRepository,
+        SocialActionRender $socialActionRender,
+        RollingDateConverterInterface $rollingDateConverter,
+        AggregateStringHelper $aggregateStringHelper,
+        SocialActionRepository $socialActionRepository
+    ) {
+        $this->entityManager = $entityManager;
+        $this->dateTimeHelper = $dateTimeHelper;
+        $this->userHelper = $userHelper;
+        $this->personHelper = $personHelper;
+        $this->thirdPartyHelper = $thirdPartyHelper;
+        $this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
+        $this->socialIssueRender = $socialIssueRender;
+        $this->socialIssueRepository = $socialIssueRepository;
+        $this->socialActionRender = $socialActionRender;
+        $this->rollingDateConverter = $rollingDateConverter;
+        $this->aggregateStringHelper = $aggregateStringHelper;
+        $this->socialActionRepository = $socialActionRepository;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('calc_date', PickRollingDateType::class, [
+                'label' => 'export.list.acpw.Date of calculation for associated elements',
+                'help' => 'export.list.acpw.help_description',
+                'required' => true,
+                'data' => new RollingDate(RollingDate::T_TODAY),
+            ]);
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_LIST];
+    }
+
+    public function getDescription(): string
+    {
+        return 'export.list.acpw.List description';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of social work actions';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        switch ($key) {
+            case 'startDate':
+            case 'endDate':
+            case 'createdAt':
+            case 'updatedAt':
+                return $this->dateTimeHelper->getLabel('export.list.acpw.' . $key);
+
+            case 'socialAction':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.acpw.' . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $this->socialActionRender->renderString(
+                        $this->socialActionRepository->find($value),
+                        []
+                    );
+                };
+
+            case 'socialIssue':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.acpw.' . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $this->socialIssueRender->renderString(
+                        $this->socialIssueRepository->find($value),
+                        []
+                    );
+                };
+
+            case 'createdBy':
+            case 'updatedBy':
+            case 'acp_user':
+                return $this->userHelper->getLabel($key, $values, 'export.list.acpw.' . $key);
+
+            case 'referrers':
+                //$date = $this->rollDateConverter->convert($data['calc_date'])->format('d/m/Y');
+                return $this->userHelper->getLabel($key, $values, 'export.list.acpw.' . $key);
+
+            case 'personsName':
+                return $this->personHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key);
+
+            case 'handlingThierParty':
+                return $this->thirdPartyHelper->getLabel($key, $values, 'export.list.acpw.' . $key);
+
+            case 'thirdParties':
+                return $this->thirdPartyHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key);
+
+            case 'personsId':
+            case 'goalsId':
+            case 'goalResultsId':
+            case 'resultsId':
+            case 'evaluationsId':
+                return $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key);
+
+            case 'goalsTitle':
+            case 'goalResultsTitle':
+            case 'resultsTitle':
+            case 'evaluationsTitle':
+                return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, 'export.list.acpw.' . $key);
+
+            default:
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.acpw.' . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+        }
+    }
+
+    public function getQueryKeys($data)
+    {
+        return self::FIELDS;
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.list.acpw.List of accompanying period works';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->entityManager->createQueryBuilder();
+
+        $qb
+            ->from(AccompanyingPeriodWork::class, 'acpw')
+            ->distinct()
+            ->select('acpw.id AS id')
+            ->join('acpw.accompanyingPeriod', 'acp')
+            ->join('acp.participations', 'acppart')
+            ->join('acppart.person', 'person')
+            // ignore participation which didn't last one day, at least
+            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
+            // get participants at the given date
+            ->andWhere('acppart.startDate <= :calc_date AND (acppart.endDate > :calc_date OR acppart.endDate IS NULL)')
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers)
+            ->setParameter('calc_date', $this->rollingDateConverter->convert($data['calc_date']));
+
+        $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AccompanyingPeriodVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::SOCIAL_WORK_ACTION_TYPE,
+            Declarations::ACP_TYPE,
+            Declarations::PERSON_TYPE,
+        ];
+    }
+
+    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calcDate): void
+    {
+        // add regular fields
+        foreach ([
+            'startDate',
+            'endDate',
+            'note',
+            'createdAt',
+            'updatedAt',
+        ] as $field) {
+            $qb->addSelect(sprintf('acpw.%s AS %s', $field, $field));
+        }
+
+        // those with identity
+        foreach ([
+            'createdBy',
+            'updatedBy',
+            'handlingThierParty',
+        ] as $field) {
+            $qb->addSelect(sprintf('IDENTITY(acpw.%s) AS %s', $field, $field));
+        }
+
+        // join socialaction
+        $qb
+            ->join('acpw.socialAction', 'sa')
+            ->addSelect('sa.id AS socialActionId')
+            ->addSelect('sa.id AS socialAction')
+            ->addSelect('IDENTITY(sa.issue) AS socialIssue');
+
+        // join acp
+        $qb
+            ->addSelect('acp.id AS acp_id')
+            ->addSelect('IDENTITY(acp.user) AS acp_user');
+
+        // persons
+        $qb
+            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM ' . Person::class . ' person_acpw_member '
+                . 'WHERE person_acpw_member MEMBER OF acpw.persons) AS personsId')
+            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM ' . Person::class . ' person1_acpw_member '
+                . 'WHERE person1_acpw_member MEMBER OF acpw.persons) AS personsName');
+
+        // referrers => at date XXXX
+        $qb
+            ->addSelect('(SELECT IDENTITY(history.user) FROM ' . UserHistory::class . ' history ' .
+            'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calcDate AND (history.endDate IS NULL OR history.endDate > :calcDate)) AS referrers');
+
+        // thirdparties
+        $qb
+            ->addSelect('(SELECT AGGREGATE(tp.id) FROM ' . ThirdParty::class . ' tp '
+                . 'WHERE tp MEMBER OF acpw.thirdParties) AS thirdParties');
+
+        // goals
+        $qb
+            ->addSelect('(SELECT AGGREGATE(IDENTITY(goal.goal)) FROM ' . AccompanyingPeriodWorkGoal::class . ' goal '
+                . 'WHERE goal MEMBER OF acpw.goals) AS goalsId')
+            ->addSelect('(SELECT AGGREGATE(g.title) FROM ' . AccompanyingPeriodWorkGoal::class . ' goal1 '
+                . 'LEFT JOIN ' . Goal::class . ' g WITH goal1.goal = g.id WHERE goal1 MEMBER OF acpw.goals) AS goalsTitle');
+
+        // goals results
+        $qb
+            ->addSelect('(SELECT AGGREGATE(wr.id) FROM ' . Result::class . ' wr '
+                . 'JOIN ' . AccompanyingPeriodWorkGoal::class . ' wg WITH wr MEMBER OF wg.results '
+                . 'WHERE wg MEMBER OF acpw.goals) AS goalResultsId')
+            ->addSelect('(SELECT AGGREGATE(wr1.title) FROM ' . Result::class . ' wr1 '
+                . 'JOIN ' . AccompanyingPeriodWorkGoal::class . ' wg1 WITH wr1 MEMBER OF wg1.results '
+                . 'WHERE wg1 MEMBER OF acpw.goals) AS goalResultsTitle');
+
+        // results
+        $qb
+            ->addSelect('(SELECT AGGREGATE(result.id) FROM ' . Result::class . ' result '
+                . 'WHERE result MEMBER OF acpw.results ) AS resultsId ')
+            ->addSelect('(SELECT AGGREGATE (result1.title) FROM ' . Result::class . ' result1 '
+                . 'WHERE result1 MEMBER OF acpw.results ) AS resultsTitle ');
+
+        // evaluations
+        $qb
+            ->addSelect('(SELECT AGGREGATE(IDENTITY(we.evaluation)) FROM ' . AccompanyingPeriodWorkEvaluation::class . ' we '
+                . 'WHERE we MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsId ')
+            ->addSelect('(SELECT AGGREGATE(ev.title) FROM ' . AccompanyingPeriodWorkEvaluation::class . ' we1 '
+                . 'LEFT JOIN ' . Evaluation::class . ' ev WITH we1.evaluation = ev.id '
+                . 'WHERE we1 MEMBER OF acpw.accompanyingPeriodWorkEvaluations ) AS evaluationsTitle ');
+
+        $qb->setParameter('calcDate', $calcDate);
+    }
+}

src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php

@@ -0,0 +1,336 @@
+<?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\PersonBundle\Export\Export;
+
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\MainBundle\Export\Helper\AggregateStringHelper;
+use Chill\MainBundle\Export\Helper\DateTimeHelper;
+use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
+use Chill\MainBundle\Export\Helper\UserHelper;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+//use Chill\MainBundle\Service\RollingDate\RollingDateConverter;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use DateTimeImmutable;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ListEvaluation implements ListInterface, GroupedExportInterface
+{
+    private const FIELDS = [
+        'id',
+        'startDate',
+        'endDate',
+        'maxDate',
+        'warningInterval',
+        'acpw_id',
+        'acpw_startDate',
+        'acpw_endDate',
+        'acpw_socialaction_id',
+        'acpw_socialaction',
+        'acpw_socialissue',
+        'acpw_referrers',
+        'acpw_note',
+        'acpw_acp_id',
+        'acpw_acp_user',
+        'acpw_persons_id',
+        'acpw_persons',
+        'comment',
+        'eval_title',
+        'createdAt',
+        'updatedAt',
+        'createdBy',
+        'updatedBy',
+    ];
+
+    private AggregateStringHelper $aggregateStringHelper;
+
+    private DateTimeHelper $dateTimeHelper;
+
+    private EntityManagerInterface $entityManager;
+
+    private LabelPersonHelper $personHelper;
+
+    private RollingDateConverterInterface $rollingDateConverter;
+
+    private SocialActionRender $socialActionRender;
+
+    private SocialActionRepository $socialActionRepository;
+
+    private SocialIssueRender $socialIssueRender;
+
+    private SocialIssueRepository $socialIssueRepository;
+
+    private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
+
+    private UserHelper $userHelper;
+
+    public function __construct(
+        EntityManagerInterface $entityManager,
+        SocialIssueRender $socialIssueRender,
+        SocialIssueRepository $socialIssueRepository,
+        SocialActionRender $socialActionRender,
+        SocialActionRepository $socialActionRepository,
+        UserHelper $userHelper,
+        LabelPersonHelper $personHelper,
+        DateTimeHelper $dateTimeHelper,
+        TranslatableStringExportLabelHelper $translatableStringExportLabelHelper,
+        AggregateStringHelper $aggregateStringHelper,
+        RollingDateConverterInterface $rollingDateConverter
+    ) {
+        $this->entityManager = $entityManager;
+        $this->socialIssueRender = $socialIssueRender;
+        $this->socialIssueRepository = $socialIssueRepository;
+        $this->socialActionRender = $socialActionRender;
+        $this->socialActionRepository = $socialActionRepository;
+        $this->userHelper = $userHelper;
+        $this->personHelper = $personHelper;
+        $this->dateTimeHelper = $dateTimeHelper;
+        $this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
+        $this->aggregateStringHelper = $aggregateStringHelper;
+        $this->rollingDateConverter = $rollingDateConverter;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('calc_date', PickRollingDateType::class, [
+                'label' => 'export.list.eval.Date of calculation for associated elements',
+                'help' => 'export.list.eval.help_description',
+                'required' => true,
+                'data' => new RollingDate(RollingDate::T_TODAY),
+            ]);
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_LIST];
+    }
+
+    public function getDescription(): string
+    {
+        return 'export.list.eval.Generate a list of evaluations, filtered on different parameters';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of evaluations';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        switch ($key) {
+            case 'startDate':
+            case 'endDate':
+            case 'maxDate':
+            case 'acpw_startDate':
+            case 'acpw_endDate':
+            case 'createdAt':
+            case 'updatedAt':
+                return $this->dateTimeHelper->getLabel('export.list.eval.' . $key);
+
+            case 'acpw_socialaction':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.eval.' . $key;
+                    }
+
+                    if (null === $value || '' === $value) {
+                        return '';
+                    }
+
+                    return $this->socialActionRender->renderString(
+                        $this->socialActionRepository->find($value),
+                        []
+                    );
+                };
+
+            case 'acpw_socialissue':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.eval.' . $key;
+                    }
+
+                    if (null === $value || '' === $value) {
+                        return '';
+                    }
+
+                    return $this->socialIssueRender->renderString(
+                        $this->socialIssueRepository->find($value),
+                        []
+                    );
+                };
+
+            case 'createdBy':
+            case 'updatedBy':
+            case 'acpw_acp_user':
+                return $this->userHelper->getLabel($key, $values, 'export.list.eval.' . $key);
+
+            case 'acpw_referrers':
+                return $this->userHelper->getLabel($key, $values, 'export.list.eval.' . $key);
+
+            case 'acpw_persons_id':
+                return $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key);
+
+            case 'acpw_persons':
+                return $this->personHelper->getLabelMulti($key, $values, 'export.list.eval.' . $key);
+
+            case 'eval_title':
+                return $this->translatableStringExportLabelHelper
+                    ->getLabel($key, $values, 'export.list.eval.' . $key);
+
+            default:
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.eval.' . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+        }
+    }
+
+    public function getQueryKeys($data)
+    {
+        return self::FIELDS;
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.list.eval.List of evaluations';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::EVAL_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->entityManager->createQueryBuilder();
+
+        $qb
+            ->from(AccompanyingPeriodWorkEvaluation::class, 'workeval')
+            ->distinct()
+            ->select('workeval.id AS id')
+            ->join('workeval.accompanyingPeriodWork', 'acpw')
+            ->join('acpw.accompanyingPeriod', 'acp')
+            ->join('acp.participations', 'acppart')
+            ->join('acppart.person', 'person')
+            // ignore participation which didn't last one day, at least
+            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
+            // get participants at the given date
+            ->andWhere('acppart.startDate <= :calc_date AND (acppart.endDate > :calc_date OR acppart.endDate IS NULL)')
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                        AND acl_count_person_history.center IN (:authorized_centers)
+                        '
+                )
+            )
+            ->setParameter('authorized_centers', $centers)
+            ->setParameter('calc_date', $this->rollingDateConverter->convert($data['calc_date']));
+
+        $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AccompanyingPeriodVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::EVAL_TYPE,
+            Declarations::SOCIAL_WORK_ACTION_TYPE,
+            Declarations::ACP_TYPE,
+            Declarations::PERSON_TYPE,
+        ];
+    }
+
+    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calc_date): void
+    {
+        // add the regular fields
+        foreach (['startDate', 'endDate', 'maxDate', 'warningInterval', 'comment', 'createdAt', 'updatedAt'] as $field) {
+            $qb->addSelect(sprintf('workeval.%s AS %s', $field, $field));
+        }
+
+        // those with identity
+        foreach (['createdBy', 'updatedBy'] as $field) {
+            $qb->addSelect(sprintf('IDENTITY(workeval.%s) AS %s', $field, $field));
+        }
+
+        foreach (['id', 'startDate', 'endDate', 'note'] as $field) {
+            $qb->addSelect(sprintf('acpw.%s AS %s', $field, 'acpw_' . $field));
+        }
+
+        // join socialaction
+        $qb
+            ->leftJoin('acpw.socialAction', 'sa')
+            ->addSelect('sa.id AS acpw_socialaction_id')
+            ->addSelect('sa.id AS acpw_socialaction')
+            ->addSelect('IDENTITY(sa.issue) AS acpw_socialissue');
+
+        // join acp
+        $qb
+            ->addSelect('acp.id AS acpw_acp_id')
+            ->addSelect('IDENTITY(acp.user) AS acpw_acp_user');
+
+        // referrers => at date XXXX
+        $qb
+            ->addSelect('(SELECT IDENTITY(history.user) FROM ' . UserHistory::class . ' history ' .
+                'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calc_date AND (history.endDate IS NULL OR history.endDate > :calc_date)) AS acpw_referrers');
+
+        // persons
+        $qb
+            ->addSelect('(SELECT AGGREGATE(person_acpw_member.id) FROM ' . Person::class . ' person_acpw_member '
+                . 'WHERE person_acpw_member MEMBER OF acpw.persons) AS acpw_persons_id')
+            ->addSelect('(SELECT AGGREGATE(person1_acpw_member.id) FROM ' . Person::class . ' person1_acpw_member '
+                . 'WHERE person1_acpw_member MEMBER OF acpw.persons) AS acpw_persons');
+
+        // join evaluation
+        $qb
+            ->leftJoin('workeval.evaluation', 'eval')
+            ->addSelect('eval.title AS eval_title');
+    }
+}

src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php

@@ -0,0 +1,251 @@
+<?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\PersonBundle\Export\Export;
+
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\MainBundle\Export\Helper\AggregateStringHelper;
+use Chill\MainBundle\Export\Helper\ExportAddressHelper;
+use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdComposition;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
+use DateTimeImmutable;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function strlen;
+
+class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
+{
+    private const FIELDS = [
+        'id',
+        'membersCount',
+        'membersId',
+        'membersName',
+        'compositionNumberOfChildren',
+        'compositionComment',
+        'compositionType',
+    ];
+
+    private ExportAddressHelper $addressHelper;
+
+    private AggregateStringHelper $aggregateStringHelper;
+
+    private EntityManagerInterface $entityManager;
+
+    private RollingDateConverterInterface $rollingDateConverter;
+
+    private TranslatableStringExportLabelHelper $translatableStringHelper;
+
+    public function __construct(
+        ExportAddressHelper $addressHelper,
+        AggregateStringHelper $aggregateStringHelper,
+        EntityManagerInterface $entityManager,
+        RollingDateConverterInterface $rollingDateConverter,
+        TranslatableStringExportLabelHelper $translatableStringHelper
+    ) {
+        $this->addressHelper = $addressHelper;
+        $this->aggregateStringHelper = $aggregateStringHelper;
+        $this->entityManager = $entityManager;
+        $this->rollingDateConverter = $rollingDateConverter;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('calc_date', PickRollingDateType::class, [
+                'label' => 'export.list.household.Date of calculation for associated elements',
+                'help' => 'export.list.household.help_description',
+                'data' => new RollingDate(RollingDate::T_TODAY),
+                'required' => true,
+            ]);
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_LIST];
+    }
+
+    public function getDescription(): string
+    {
+        return 'export.list.household.List description';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of households';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if (substr($key, 0, strlen('address_fields')) === 'address_fields') {
+            return $this->addressHelper->getLabel($key, $values, $data, 'address_fields');
+        }
+
+        switch ($key) {
+            case 'membersId':
+            case 'membersName':
+                return $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.household.' . $key);
+
+            case 'compositionType':
+                //dump($values);
+                return $this->translatableStringHelper->getLabel($key, $values, 'export.list.household.' . $key);
+
+            default:
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.household.' . $key;
+                    }
+
+                    return (string) $value;
+                };
+        }
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return array_merge(
+            self::FIELDS,
+            $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields')
+        );
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.list.household.List household associated with accompanying period title';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::HOUSEHOLD_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->entityManager->createQueryBuilder();
+
+        $qb
+            ->from(Household::class, 'household')
+            ->distinct()
+            ->select('household.id AS id')
+            ->join('household.members', 'hmember')
+            ->join('hmember.person', 'person')
+            ->join('person.accompanyingPeriodParticipations', 'acppart')
+            ->join('acppart.accompanyingPeriod', 'acp')
+            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person
+                    AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->andWhere('hmember.startDate <= :count_household_at_date AND (hmember.endDate IS NULL OR hmember.endDate > :count_household_at_date)')
+            ->setParameter('authorized_centers', $centers)
+            ->setParameter('count_household_at_date', $this->rollingDateConverter->convert($data['calc_date']));
+
+        $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return HouseholdVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::HOUSEHOLD_TYPE,
+            Declarations::ACP_TYPE,
+            Declarations::PERSON_TYPE,
+        ];
+    }
+
+    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calcDate): void
+    {
+        // members at date
+        $qb
+            ->addSelect('(SELECT COUNT(members0) FROM ' . HouseholdMember::class . ' members0 '
+                . 'WHERE members0.startDate <= :calcDate AND (members0.endDate IS NULL OR members0.endDate > :calcDate) '
+                . 'AND members0 MEMBER OF household.members) AS membersCount')
+
+            ->addSelect('(SELECT AGGREGATE(IDENTITY(members1.person)) FROM ' . HouseholdMember::class . ' members1 '
+                . 'WHERE members1.startDate <= :calcDate AND (members1.endDate IS NULL OR members1.endDate > :calcDate) '
+                . 'AND members1 MEMBER OF household.members) AS membersId')
+
+            ->addSelect("(SELECT AGGREGATE(CONCAT(person2.firstName, ' ', person2.lastName)) FROM " . HouseholdMember::class . ' members2 '
+                . 'JOIN members2.person person2 '
+                . 'WHERE members2.startDate <= :calcDate AND (members2.endDate IS NULL OR members2.endDate > :calcDate) '
+                . 'AND members2 MEMBER OF household.members) AS membersName');
+
+        // composition at date
+        $qb
+            ->addSelect('(SELECT compo.numberOfChildren FROM ' . HouseholdComposition::class . ' compo '
+                . 'WHERE compo.startDate <= :calcDate AND (compo.endDate IS NULL OR compo.endDate > :calcDate) '
+                . 'AND compo MEMBER OF household.compositions) AS compositionNumberOfChildren')
+
+            ->addSelect('(SELECT compo1.comment.comment FROM ' . HouseholdComposition::class . ' compo1 '
+                . 'WHERE compo1.startDate <= :calcDate AND (compo1.endDate IS NULL OR compo1.endDate > :calcDate) '
+                . 'AND compo1 MEMBER OF household.compositions) AS compositionComment')
+
+            ->addSelect('(
+                SELECT type2.label
+                FROM ' . HouseholdComposition::class . ' compo2
+                JOIN compo2.householdCompositionType type2
+                WHERE compo2.startDate <= :calcDate AND (compo2.endDate IS NULL OR compo2.endDate > :calcDate)
+                AND compo2 MEMBER OF household.compositions
+            ) AS compositionType');
+
+        // address at date
+        $qb
+            ->leftJoin('household.addresses', 'addresses')
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte('addresses.validFrom', ':calcDate'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull('addresses.validTo'),
+                        $qb->expr()->gt('addresses.validTo', ':calcDate')
+                    )
+                )
+            );
+        $this->addressHelper->addSelectClauses(
+            ExportAddressHelper::F_ALL,
+            $qb,
+            'addresses',
+            'address_fields'
+        );
+
+        // inject date parameter
+        $qb->setParameter('calcDate', $calcDate);
+    }
+}

src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php

@@ -65,9 +65,9 @@ class AccompanyingPeriodType extends AbstractType
         $accompanyingPeriod = $options['data'];
 
         if (
-              ('close' === $options['period_action'])
-              || ('create' === $options['period_action'])
-              || ('update' === $options['period_action'] && !$accompanyingPeriod->isOpen())
+            ('close' === $options['period_action'])
+            || ('create' === $options['period_action'])
+            || ('update' === $options['period_action'] && !$accompanyingPeriod->isOpen())
         ) {
             $builder->add('closingDate', DateType::class, [
                 'required' => true,

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php

@@ -187,8 +187,12 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
         );
 
         foreach ($scopes as $key => $scope) {
-            $orx->add($qb->expr()->isMemberOf(':scope_' . $key, 'ap.scopes'));
+            $orx->add($qb->expr()->orX(
+                $qb->expr()->isMemberOf(':scope_' . $key, 'ap.scopes'),
+                $qb->expr()->eq('ap.user', ':user')
+            ));
             $qb->setParameter('scope_' . $key, $scope);
+            $qb->setParameter('user', $this->security->getUser());
         }
         $qb->andWhere($orx);
 

src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php

@@ -24,9 +24,9 @@ final class EvaluationRepository implements EvaluationRepositoryInterface
         $this->repository = $entityManager->getRepository(Evaluation::class);
     }
 
-    public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Evaluation
+    public function find($id): ?Evaluation
     {
-        return $this->repository->find($id, $lockMode, $lockVersion);
+        return $this->repository->find($id);
     }
 
     /**

src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php

@@ -16,7 +16,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 interface EvaluationRepositoryInterface extends ObjectRepository
 {
-    public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Evaluation;
+    public function find($id): ?Evaluation;
 
     /**
      * @return array<int, Evaluation>