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/Export/Filter/ACPFilters/LocationFilter.php

@@ -1,74 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserLocationType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class LocationFilter implements FilterInterface
-{
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $qb->andWhere(
-            $qb->expr()->in('activity.location', ':location')
-        );
-
-        $qb->setParameter('location', $data['accepted_location']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_location', PickUserLocationType::class, [
-            'multiple' => true,
-            'label' => 'pick location'
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $locations = [];
-
-        foreach ($data['accepted_location'] as $location) {
-            $locations[] = $location->getName();
-        }
-
-        return ['Filtered activity by location: only %locations%', [
-            '%locations%' => implode(', ', $locations),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by location';
-    }
-}

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/config/services/export.yaml

@@ -79,11 +79,6 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'accompanyingcourse_activitytype_filter' }
 
-    chill.activity.export.location_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_location_filter' }
-
     chill.activity.export.locationtype_filter:
         class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter
         tags:

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

@@ -77,7 +77,7 @@ Choose a type: Choisir un type
 4 hours: 4 heures
 4 hours 30: 4 heures 30
 5 hours: 5 heures
-Concerned groups: Parties concernées par l'échange
+Concerned groups: Parties concernées
 Persons in accompanying course: Usagers du parcours
 Third persons: Tiers non-pro.
 Others persons: Usagers
@@ -252,8 +252,6 @@ Activity reasons for those activities: Sujets de ces activités
 
 Filter by activity type: Filtrer les activités par type
 
-Filter activity by location: Filtrer les activités par localisation
-'Filtered activity by location: only %locations%': "Filtré par localisation: uniquement %locations%"
 Filter activity by locationtype: Filtrer les activités par type de localisation
 'Filtered activity by locationtype: only %types%': "Filtré par type de localisation: uniquement %types%"
 Accepted locationtype: Types de localisation

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

@@ -53,15 +53,19 @@ class ByActivityTypeAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, $data)
     {
+        $this->asideActivityCategoryRepository->findBy(['id' => $values]);
+
         return function ($value): string {
             if ('_header' === $value) {
                 return 'export.aggregator.Aside activity type';
             }
 
-            if (null === $value || null === $t = $this->asideActivityCategoryRepository->find($value)) {
+            if (null === $value) {
                 return '';
             }
 
+            $t = $this->asideActivityCategoryRepository->find($value);
+
             return $this->translatableStringHelper->localize($t->getTitle());
         };
     }

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

@@ -1,89 +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\AsideActivityBundle\Export\Aggregator;
-
-use Chill\AsideActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\UserJobRepositoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-use function in_array;
-
-class ByUserJobAggregator implements AggregatorInterface
-{
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private UserJobRepositoryInterface $userJobRepository;
-
-    public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->userJobRepository = $userJobRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('aside_user', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('aside.agent', 'aside_user');
-        }
-
-        $qb
-            ->addSelect('IDENTITY(aside_user.userJob) AS aside_activity_user_job_aggregator')
-            ->addGroupBy('aside_activity_user_job_aggregator');
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // nothing to add in the form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Users \'s job';
-            }
-
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
-            $j = $this->userJobRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $j->getLabel()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['aside_activity_user_job_aggregator'];
-    }
-
-    public function getTitle()
-    {
-        return 'export.aggregator.Aggregate by user job';
-    }
-}

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

@@ -1,89 +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\AsideActivityBundle\Export\Aggregator;
-
-use Chill\AsideActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-use function in_array;
-
-class ByUserScopeAggregator implements AggregatorInterface
-{
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('aside_user', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('aside.agent', 'aside_user');
-        }
-
-        $qb
-            ->addSelect('IDENTITY(aside_user.mainScope) AS aside_activity_user_scope_aggregator')
-            ->addGroupBy('aside_activity_user_scope_aggregator');
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // nothing to add in the form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Users \'s scope';
-            }
-
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
-            $s = $this->scopeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['aside_activity_user_scope_aggregator'];
-    }
-
-    public function getTitle()
-    {
-        return 'export.aggregator.Aggregate by user scope';
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Export/Export/AvgAsideActivityDuration.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\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 Doctrine\ORM\Query;
-use LogicException;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class AvgAsideActivityDuration implements ExportInterface, GroupedExportInterface
-{
-    private AsideActivityRepository $repository;
-
-    public function __construct(
-        AsideActivityRepository $repository
-    ) {
-        $this->repository = $repository;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'export.Average aside activities duration';
-    }
-
-    public function getGroup(): string
-    {
-        return 'export.Exports of aside activities';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_avg_aside_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Average duration aside activities' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_avg_aside_activity_duration'];
-    }
-
-    public function getResult($query, $data)
-    {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle(): string
-    {
-        return 'export.Average aside activities duration';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('aside');
-
-        $qb
-            ->select('AVG(aside.duration) as export_avg_aside_activity_duration')
-            ->andWhere($qb->expr()->isNotNull('aside.duration'));
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return AsideActivityVoter::STATS;
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [Declarations::ASIDE_ACTIVITY_TYPE];
-    }
-}

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

@@ -100,8 +100,6 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface
 
     public function supportsModifiers(): array
     {
-        return [
-            Declarations::ASIDE_ACTIVITY_TYPE,
-        ];
+        return [];
     }
 }

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

@@ -1,236 +0,0 @@
-<?php
-
-namespace Chill\AsideActivityBundle\Export\Export;
-
-use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Chill\AsideActivityBundle\Export\Declarations;
-use Chill\AsideActivityBundle\Form\AsideActivityCategoryType;
-use Chill\AsideActivityBundle\Repository\AsideActivityCategoryRepository;
-use Chill\AsideActivityBundle\Security\AsideActivityVoter;
-use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\MainBundle\Export\Helper\DateTimeHelper;
-use Chill\MainBundle\Export\Helper\UserHelper;
-use Chill\MainBundle\Export\ListInterface;
-use Chill\MainBundle\Repository\CenterRepositoryInterface;
-use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Closure;
-use Doctrine\ORM\AbstractQuery;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-final class ListAsideActivity implements ListInterface, GroupedExportInterface
-{
-    private EntityManagerInterface $em;
-
-    private UserHelper $userHelper;
-
-    private DateTimeHelper $dateTimeHelper;
-
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private CenterRepositoryInterface $centerRepository;
-
-    private AsideActivityCategoryRepository $asideActivityCategoryRepository;
-
-    private CategoryRender $categoryRender;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        EntityManagerInterface $em,
-        DateTimeHelper $dateTimeHelper,
-        UserHelper $userHelper,
-        ScopeRepositoryInterface $scopeRepository,
-        CenterRepositoryInterface $centerRepository,
-        AsideActivityCategoryRepository $asideActivityCategoryRepository,
-        CategoryRender $categoryRender,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->em = $em;
-        $this->dateTimeHelper = $dateTimeHelper;
-        $this->userHelper = $userHelper;
-        $this->scopeRepository = $scopeRepository;
-        $this->centerRepository = $centerRepository;
-        $this->asideActivityCategoryRepository = $asideActivityCategoryRepository;
-        $this->categoryRender = $categoryRender;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_LIST];
-    }
-
-    public function getDescription()
-    {
-        return 'export.aside_activity.List of aside activities';
-    }
-
-    public function getTitle()
-    {
-        return 'export.aside_activity.List of aside activities';
-    }
-
-    public function getGroup(): string
-    {
-        return 'export.Exports of aside activities';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        switch ($key) {
-            case 'id':
-            case 'note':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.' . $key;
-                    }
-
-                    return $value ?? '';
-                };
-            case 'duration':
-                return function ($value) use ($key) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.' . $key;
-                    }
-
-                    if (null === $value) {
-                        return '';
-                    }
-
-                    if ($value instanceof \DateTimeInterface) {
-                        return $value->format('H:i:s');
-                    }
-
-                    return $value;
-                };
-
-            case 'createdAt':
-            case 'updatedAt':
-            case 'date':
-                return $this->dateTimeHelper->getLabel('export.aside_activity.'.$key);
-
-            case 'agent_id':
-            case 'creator_id':
-                return $this->userHelper->getLabel($key, $values, 'export.aside_activity.' . $key);
-
-            case 'aside_activity_type':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.aside_activity_type';
-                    }
-
-                    if (null === $value || '' === $value || null === $c = $this->asideActivityCategoryRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->categoryRender->renderString($c, []);
-                };
-
-            case 'main_scope':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.main_scope';
-                    }
-
-                    if (null === $value || '' === $value || null === $c = $this->scopeRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $this->translatableStringHelper->localize($c->getName());
-                };
-
-            case 'main_center':
-                return function ($value) {
-                    if ('_header' === $value) {
-                        return 'export.aside_activity.main_center';
-                    }
-
-                    /** @var Center $c */
-                    if (null === $value || '' === $value || null === $c = $this->centerRepository->find($value)) {
-                        return '';
-                    }
-
-                    return $c->getName();
-                };
-
-            default:
-                throw new \LogicException('this key is not supported : ' . $key);
-        }
-    }
-
-    public function getQueryKeys($data)
-    {
-        return [
-            'id',
-            'createdAt',
-            'updatedAt',
-            'agent_id',
-            'creator_id',
-            'main_scope',
-            'main_center',
-            'aside_activity_type',
-            'date',
-            'duration',
-            'note'
-        ];
-    }
-
-    /**
-     * @param QueryBuilder $query
-     * @param array $data
-     */
-    public function getResult($query, $data): array
-    {
-        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->em->createQueryBuilder()
-            ->from(AsideActivity::class, 'aside')
-            ->leftJoin('aside.agent', 'agent')
-        ;
-
-        $qb
-            ->addSelect('aside.id AS id')
-            ->addSelect('aside.createdAt AS createdAt')
-            ->addSelect('aside.updatedAt AS updatedAt')
-            ->addSelect('IDENTITY(aside.agent) AS agent_id')
-            ->addSelect('IDENTITY(aside.createdBy) AS creator_id')
-            ->addSelect('IDENTITY(agent.mainScope) AS main_scope')
-            ->addSelect('IDENTITY(agent.mainCenter) AS main_center')
-            ->addSelect('IDENTITY(aside.type) AS aside_activity_type')
-            ->addSelect('aside.date')
-            ->addSelect('aside.duration')
-            ->addSelect('aside.note')
-        ;
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return AsideActivityVoter::STATS;
-    }
-
-    public function supportsModifiers()
-    {
-        return [Declarations::ASIDE_ACTIVITY_TYPE];
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumAsideActivityDuration.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\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 Doctrine\ORM\Query;
-use LogicException;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class SumAsideActivityDuration implements ExportInterface, GroupedExportInterface
-{
-    private AsideActivityRepository $repository;
-
-    public function __construct(
-        AsideActivityRepository $repository
-    ) {
-        $this->repository = $repository;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'export.Sum aside activities duration';
-    }
-
-    public function getGroup(): string
-    {
-        return 'export.Exports of aside activities';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_sum_aside_activity_duration' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Sum duration aside activities' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_sum_aside_activity_duration'];
-    }
-
-    public function getResult($query, $data)
-    {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle(): string
-    {
-        return 'export.Sum aside activities duration';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository
-            ->createQueryBuilder('aside');
-
-        $qb->select('SUM(aside.duration) as export_sum_aside_activity_duration')
-            ->andWhere($qb->expr()->isNotNull('aside.duration'));
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return AsideActivityVoter::STATS;
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [Declarations::ASIDE_ACTIVITY_TYPE];
-    }
-}

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

@@ -80,8 +80,8 @@ class ByActivityTypeFilter implements FilterInterface
     public function describeAction($data, $format = 'string'): array
     {
         $types = array_map(
-            fn (AsideActivityCategory $t): string => $this->translatableStringHelper->localize($t->getTitle()),
-            $data['types']->toArray()
+            fn (AsideActivityCategory $t): string => $this->translatableStringHelper->localize($t->getName()),
+            $this->asideActivityTypeRepository->findBy(['id' => $data['types']->toArray()])
         );
 
         return ['export.filter.Filtered by aside activity type: only %type%', [

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

@@ -46,18 +46,25 @@ class ByDateFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->between(
             'aside.date',
             ':date_from',
             ':date_to'
         );
 
-        $qb->andWhere($clause);
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
 
+        $qb->add('where', $where);
         $qb->setParameter(
             'date_from',
             $this->rollingDateConverter->convert($data['date_from'])
-        )->setParameter(
+        );
+        $qb->setParameter(
             'date_to',
             $this->rollingDateConverter->convert($data['date_to'])
         );

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

@@ -1,75 +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\AsideActivityBundle\Export\Filter;
-
-use Chill\AsideActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
-use Chill\MainBundle\Templating\Entity\UserRender;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ByUserFilter implements FilterInterface
-{
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $clause = $qb->expr()->in('aside.agent', ':users');
-
-        $qb
-            ->andWhere($clause)
-            ->setParameter('users', $data['accepted_users']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_users', PickUserDynamicType::class, [
-            'multiple' => true,
-            'label' => 'Creators',
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $users = [];
-
-        foreach ($data['accepted_users'] as $u) {
-            $users[] = $this->userRender->renderString($u, []);
-        }
-
-        return ['export.filter.Filtered aside activity by user: only %users%', [
-            '%users%' => implode(', ', $users),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'export.filter.Filter aside activity by user';
-    }
-}

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

@@ -1,81 +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\AsideActivityBundle\Export\Filter;
-
-use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Chill\AsideActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\UserJob;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ByUserJobFilter implements FilterInterface
-{
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AsideActivity::class . ' aside_activity_user_job_filter_act
-                JOIN aside_activity_user_job_filter_act.agent aside_activity_user_job_filter_user WHERE aside_activity_user_job_filter_user.userJob IN (:aside_activity_user_job_filter_jobs) AND aside_activity_user_job_filter_act = aside'
-                )
-            )
-            ->setParameter('aside_activity_user_job_filter_jobs', $data['jobs']);
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('jobs', EntityType::class, [
-            'class' => UserJob::class,
-            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        return ['export.filter.Filtered aside activities by user jobs: only %jobs%', [
-            '%jobs%' => implode(
-                ', ',
-                array_map(
-                    fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()),
-                    $data['jobs']->toArray()
-                )
-            ),
-        ]];
-    }
-
-    public function getTitle()
-    {
-        return 'export.filter.Filter by user jobs';
-    }
-}

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

@@ -1,88 +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\AsideActivityBundle\Export\Filter;
-
-use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Chill\AsideActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ByUserScopeFilter implements FilterInterface
-{
-    private ScopeRepositoryInterface $scopeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        ScopeRepositoryInterface $scopeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM ' . AsideActivity::class . ' aside_activity_user_scope_filter_act
-                JOIN aside_activity_user_scope_filter_act.agent aside_activity_user_scope_filter_user WHERE aside_activity_user_scope_filter_user.mainScope IN (:aside_activity_user_scope_filter_scopes) AND  aside_activity_user_scope_filter_act = aside '
-                )
-            )
-            ->setParameter('aside_activity_user_scope_filter_scopes', $data['scopes']);
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('scopes', EntityType::class, [
-            'class' => Scope::class,
-            'choices' => $this->scopeRepository->findAllActive(),
-            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        return ['export.filter.Filtered aside activities by user scope: only %scopes%', [
-            '%scopes%' => implode(
-                ', ',
-                array_map(
-                    fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
-                    $data['scopes']->toArray()
-                )
-            ),
-        ]];
-    }
-
-    public function getTitle()
-    {
-        return 'export.filter.Filter by user scope';
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/config/services.yaml

@@ -20,3 +20,33 @@ services:
     resource: "../Controller"
     autowire: true
     autoconfigure: true
+
+
+  ## Exports
+
+  # indicators
+  Chill\AsideActivityBundle\Export\Export\CountAsideActivity:
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export, alias: count_asideactivity }
+
+  # filters
+  Chill\AsideActivityBundle\Export\Filter\ByDateFilter:
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_filter, alias: asideactivity_bydate_filter }
+
+  Chill\AsideActivityBundle\Export\Filter\ByActivityTypeFilter:
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_filter, alias: asideactivity_activitytype_filter }
+
+  # aggregators
+  Chill\AsideActivityBundle\Export\Aggregator\ByActivityTypeAggregator:
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_aggregator, alias: asideactivity_activitytype_aggregator }

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

@@ -3,23 +3,11 @@ services:
     autowire: true
     autoconfigure: true
 
-  Chill\AsideActivityBundle\Export\Export\ListAsideActivity:
-      tags:
-          - { name: chill.export, alias: 'list_aside_activity' }
-
   ## Indicators
   Chill\AsideActivityBundle\Export\Export\CountAsideActivity:
     tags:
       - { name: chill.export, alias: 'count_aside_activity' }
 
-  Chill\AsideActivityBundle\Export\Export\SumAsideActivityDuration:
-      tags:
-          - { name: chill.export, alias: 'sum_aside_activity_duration' }
-
-  Chill\AsideActivityBundle\Export\Export\AvgAsideActivityDuration:
-      tags:
-          - { name: chill.export, alias: 'avg_aside_activity_duration' }
-
   ## Filters
   chill.aside_activity.export.date_filter:
     class: Chill\AsideActivityBundle\Export\Filter\ByDateFilter
@@ -31,34 +19,9 @@ services:
     tags:
       - { name: chill.export_filter, alias: 'aside_activity_type_filter' }
 
-  chill.aside_activity.export.user_job_filter:
-      class: Chill\AsideActivityBundle\Export\Filter\ByUserJobFilter
-      tags:
-          - { name: chill.export_filter, alias: 'aside_activity_user_job_filter' }
-
-  chill.aside_activity.export.user_scope_filter:
-      class: Chill\AsideActivityBundle\Export\Filter\ByUserScopeFilter
-      tags:
-          - { name: chill.export_filter, alias: 'aside_activity_user_scope_filter' }
-
-  chill.aside_activity.export.user_filter:
-      class: Chill\AsideActivityBundle\Export\Filter\ByUserFilter
-      tags:
-          - { name: chill.export_filter, alias: 'aside_activity_user_filter' }
-
   ## Aggregators
 
   chill.aside_activity.export.type_aggregator:
     class: Chill\AsideActivityBundle\Export\Aggregator\ByActivityTypeAggregator
     tags:
       - { name: chill.export_aggregator, alias: activity_type_aggregator }
-
-  chill.aside_activity.export.user_job_aggregator:
-      class: Chill\AsideActivityBundle\Export\Aggregator\ByUserJobAggregator
-      tags:
-          - { name: chill.export_aggregator, alias: aside_activity_user_job_aggregator }
-
-  chill.aside_activity.export.user_scope_aggregator:
-      class: Chill\AsideActivityBundle\Export\Aggregator\ByUserScopeAggregator
-      tags:
-          - { name: chill.export_aggregator, alias: aside_activity_user_scope_aggregator }

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

@@ -29,16 +29,16 @@ location: Lieu
 
 # Crud
 crud:
-    aside_activity:
-        title_view: Détail de l'activité annexe
-        title_new: Nouvelle activité annexe
-        title_edit: Édition d'une activité annexe
-        title_delete: Supprimer une activité annexe
-        button_delete: Supprimer
-        confirm_message_delete: Êtes-vous sûr de vouloir supprimer cette activité annexe?
-    aside_activity_category:
-        title_new: Nouvelle catégorie d'activité annexe
-        title_edit: Édition d'une catégorie de type d'activité
+  aside_activity:
+    title_view: Détail de l'activité annexe
+    title_new: Nouvelle activité annexe
+    title_edit: Édition d'une activité annexe
+    title_delete: Supprimer une activité annexe
+    button_delete: Supprimer
+    confirm_message_delete: Êtes-vous sûr de vouloir supprimer cette activité annexe?
+  aside_activity_category:
+    title_new: Nouvelle catégorie d'activité annexe
+    title_edit: Édition d'une catégorie de type d'activité
 
 #forms
 Create a new aside activity type: Nouvelle categorie d'activité annexe
@@ -169,43 +169,19 @@ Aside activity configuration: Configuration des activités annexes
 
 # exports
 export:
-    aside_activity:
-        List of aside activities: Liste des activités annexes
-        createdAt: Création
-        updatedAt: Dernière mise à jour
-        agent_id: Utilisateur
-        creator_id: Créateur
-        main_scope: Service principal de l'utilisateur
-        main_center: Centre principal de l'utilisteur
-        aside_activity_type: Catégorie d'activité annexe
-        date: Date
-        duration: Durée
-        note: Note
-
-    Exports of aside activities: Exports des activités annexes
-    Count aside activities: Nombre d'activités annexes
-    Count aside activities by various parameters.: Compte le nombre d'activités annexes selon divers critères
-    Average aside activities duration: Durée moyenne des activités annexes
-    Sum aside activities duration: Durée des activités annexes
-    filter:
-        Filter by aside activity date: Filtrer les activités annexes par date
-        Filter by aside activity type: Filtrer les activités annexes par type d'activité
-        'Filtered by aside activity type: only %type%': "Filtré par type d'activité annexe: uniquement %type%"
-        Filtered by aside activities between %dateFrom% and %dateTo%: Filtré par date d'activité annexe, entre %dateFrom% et %dateTo%
-        This date should be after the date given in "Implied in an aside activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "activités annexes après cette date"
-        Aside activities after this date: Actvitités annexes après cette date
-        Aside activities before this date: Actvitités annexes avant cette date
-        'Filtered aside activity by user: only %users%': "Filtré par utilisateur: uniquement %users%"
-        Filter aside activity by user: Filtrer par utilisateur
-        'Filtered aside activities by user jobs: only %jobs%': "Filtré par métier des utilisateurs: uniquement %jobs%"
-        Filter by user jobs: Filtrer les activités annexes par métier des utilisateurs
-        'Filtered aside activities by user scope: only %scopes%': "Filtré par service des utilisateur: uniquement %scopes%"
-        Filter by user scope: Filtrer les activités annexes par service d'utilisateur
-    aggregator:
-        Group by aside activity type: Grouper les activités annexes par type d'activité
-        Aside activity type: Type d'activité annexe
-        Aggregate by user job: Grouper les activités annexes par métier des utilisateurs
-        Aggregate by user scope: Grouper les activités annexes par service des utilisateurs
+  Exports of aside activities: Exports des activités annexes
+  Count aside activities: Nombre d'activités annexes
+  Count aside activities by various parameters.: Compte le nombre d'activités annexes selon divers critères
+  filter:
+    Filter by aside activity date: Filtrer les activités annexes par date
+    Filter by aside activity type: Filtrer les activités annexes par type d'activité
+    'Filtered by aside activity type: only %type%': "Filtré par type d'activité annexe: uniquement %type%"
+    This date should be after the date given in "Implied in an aside activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "activités annexes après cette date"
+    Aside activities after this date: Actvitités annexes après cette date
+    Aside activities before this date: Actvitités annexes avant cette date
+  aggregator:
+    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/Entity/ChargeKind.php

@@ -12,17 +12,12 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Type of charge.
  *
- * @ORM\Table(name="chill_budget.charge_type",
- *     uniqueConstraints={@ORM\UniqueConstraint(name="charge_kind_unique_type_idx", fields={"kind"})}
- * )
+ * @ORM\Table(name="chill_budget.charge_type")
  * @ORM\Entity
- * @UniqueEntity(fields={"kind"})
  */
 class ChargeKind
 {
@@ -40,8 +35,6 @@ class ChargeKind
 
     /**
      * @ORM\Column(type="string", length=255, options={"default": ""}, nullable=false)
-     * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
-     * @Assert\Length(min=3)
      */
     private string $kind = '';
 

src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php

@@ -12,17 +12,12 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Type of resource.
  *
- * @ORM\Table(name="chill_budget.resource_type", uniqueConstraints={
- *     @ORM\UniqueConstraint(name="resource_kind_unique_type_idx", fields={"kind"})
- * })
+ * @ORM\Table(name="chill_budget.resource_type")
  * @ORM\Entity
- * @UniqueEntity(fields={"kind"})
  */
 class ResourceKind
 {
@@ -40,8 +35,6 @@ class ResourceKind
 
     /**
      * @ORM\Column(type="string", length=255, nullable=false, options={"default": ""})
-     * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
-     * @Assert\Length(min=3)
      */
     private string $kind = '';
 

src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php

@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -26,11 +25,7 @@ class ChargeKindType extends AbstractType
     {
         $builder
             ->add('name', TranslatableStringFormType::class, [
-                'label' => 'Title',
-            ])
-            ->add('kind', TextType::class, [
-                'label' => 'budget.admin.form.Charge_kind_key',
-                'help' => 'budget.admin.form.This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document'
+                'label' => 'Nom',
             ])
             ->add('ordering', NumberType::class)
             ->add('isActive', CheckboxType::class, [

src/Bundle/ChillBudgetBundle/Form/Admin/ResourceKindType.php

@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -26,11 +25,7 @@ class ResourceKindType extends AbstractType
     {
         $builder
             ->add('name', TranslatableStringFormType::class, [
-                'label' => 'Title',
-            ])
-            ->add('kind', TextType::class, [
-                'label' => 'budget.admin.form.Resource_kind_key',
-                'help' => 'budget.admin.form.This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document'
+                'label' => 'Nom',
             ])
             ->add('ordering', NumberType::class)
             ->add('isActive', CheckboxType::class, [

src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php

@@ -14,8 +14,9 @@ namespace Chill\BudgetBundle\Repository;
 use Chill\BudgetBundle\Entity\ChargeKind;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
 
-final class ChargeKindRepository implements ChargeKindRepositoryInterface
+class ChargeKindRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -49,8 +50,7 @@ final class ChargeKindRepository implements ChargeKindRepositoryInterface
             ->where($qb->expr()->eq('c.isActive', 'true'))
             ->orderBy('c.ordering', 'ASC')
             ->getQuery()
-            ->getResult()
-        ;
+            ->getResult();
     }
 
     /**
@@ -77,11 +77,6 @@ final class ChargeKindRepository implements ChargeKindRepositoryInterface
         return $this->repository->findOneBy($criteria);
     }
 
-    public function findOneByKind(string $kind): ?ChargeKind
-    {
-        return $this->repository->findOneBy(['kind' => $kind]);
-    }
-
     public function getClassName(): string
     {
         return ChargeKind::class;

src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepositoryInterface.php

@@ -1,49 +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\Repository;
-
-use Chill\BudgetBundle\Entity\ChargeKind;
-use Doctrine\Persistence\ObjectRepository;
-
-interface ChargeKindRepositoryInterface extends ObjectRepository
-{
-    public function find($id): ?ChargeKind;
-
-    /**
-     * @return ChargeType[]
-     */
-    public function findAll(): array;
-
-    /**
-     * @return ChargeType[]
-     */
-    public function findAllActive(): array;
-
-    public function findOneByKind(string $kind): ?ChargeKind;
-
-    /**
-     * @return ChargeType[]
-     */
-    public function findAllByType(string $type): array;
-
-    /**
-     * @param mixed|null $limit
-     * @param mixed|null $offset
-     *
-     * @return ChargeType[]
-     */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
-
-    public function findOneBy(array $criteria): ?ChargeKind;
-
-    public function getClassName(): string;
-}

src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php

@@ -14,8 +14,9 @@ namespace Chill\BudgetBundle\Repository;
 use Chill\BudgetBundle\Entity\ResourceKind;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
 
-final class ResourceKindRepository implements ResourceKindRepositoryInterface
+class ResourceKindRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -49,8 +50,12 @@ final class ResourceKindRepository implements ResourceKindRepositoryInterface
             ->where($qb->expr()->eq('r.isActive', 'true'))
             ->orderBy('r.ordering', 'ASC')
             ->getQuery()
-            ->getResult()
-        ;
+            ->getResult();
+    }
+
+    public function findOneByKind(string $kind): ?ResourceKind
+    {
+        return $this->repository->findOneBy(['kind' => $kind]) ;
     }
 
     /**
@@ -77,11 +82,6 @@ final class ResourceKindRepository implements ResourceKindRepositoryInterface
         return $this->repository->findOneBy($criteria);
     }
 
-    public function findOneByKind(string $kind): ?ResourceKind
-    {
-        return $this->repository->findOneBy(['kind' => $kind]);
-    }
-
     public function getClassName(): string
     {
         return ResourceKind::class;

src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepositoryInterface.php

@@ -1,49 +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\Repository;
-
-use Chill\BudgetBundle\Entity\ResourceKind;
-use Doctrine\Persistence\ObjectRepository;
-
-interface ResourceKindRepositoryInterface extends ObjectRepository
-{
-    public function find($id): ?ResourceKind;
-
-    /**
-     * @return ResourceType[]
-     */
-    public function findAll(): array;
-
-    /**
-     * @return ResourceType[]
-     */
-    public function findAllActive(): array;
-
-    /**
-     * @return ResourceType[]
-     */
-    public function findAllByType(string $type): array;
-
-    /**
-     * @param mixed|null $limit
-     * @param mixed|null $offset
-     *
-     * @return ResourceType[]
-     */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
-
-    public function findOneBy(array $criteria): ?ResourceKind;
-
-    public function findOneByKind(string $kind): ?ResourceKind;
-
-    public function getClassName(): string;
-}

src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php

@@ -34,7 +34,7 @@ class ResourceRepository extends EntityRepository
             //->andWhere('c.startDate < :date')
             // TODO: there is a misconception here, the end date must be lower or null. startDate are never null
             //->andWhere('c.startDate < :date OR c.startDate IS NULL');
-        ;
+;
 
         if (null !== $sort) {
             $qb->orderBy($sort);

src/Bundle/ChillBudgetBundle/Resources/views/Admin/Charge/index.html.twig

@@ -19,10 +19,7 @@
 			{% for entity in entities %}
 				<tr>
                     <td>{{ entity.ordering }}</td>
-					<td>
-                        {{ entity|chill_entity_render_box }}<br/>
-                        <strong>{{ 'budget.admin.form.Charge_kind_key'|trans }}&nbsp;:</strong> <code>{{ entity.kind }}</code>
-                    </td>
+					<td>{{ entity|chill_entity_render_box }}</td>
 					<td style="text-align:center;">
 						{%- if entity.isActive -%}
 							<i class="fa fa-check-square-o"></i>
@@ -42,8 +39,6 @@
 		</tbody>
 	</table>
 
-    {{ chill_pagination(paginator) }}
-
 	<ul class="record_actions sticky-form-buttons">
 		<li>
 			<a href="{{ path('chill_crud_charge_kind_new') }}" class="btn btn-create">

src/Bundle/ChillBudgetBundle/Resources/views/Admin/Resource/index.html.twig

@@ -19,10 +19,7 @@
 			{% for entity in entities %}
 				<tr>
                     <td>{{ entity.ordering }}</td>
-                    <td>
-                        {{ entity|chill_entity_render_box }}<br/>
-                        <strong>{{ 'budget.admin.form.Resource_kind_key'|trans }}&nbsp;:</strong> <code>{{ entity.kind }}</code>
-                    </td>
+					<td>{{ entity|chill_entity_render_box }}</td>
 					<td style="text-align:center;">
 						{%- if entity.isActive -%}
 							<i class="fa fa-check-square-o"></i>
@@ -42,8 +39,6 @@
 		</tbody>
 	</table>
 
-    {{ chill_pagination(paginator) }}
-
 	<ul class="record_actions sticky-form-buttons">
 		<li>
 			<a href="{{ path('chill_crud_resource_kind_new') }}" class="btn btn-create">

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

@@ -14,9 +14,7 @@ namespace Chill\BudgetBundle\Service\Summary;
 use Chill\BudgetBundle\Entity\ChargeKind;
 use Chill\BudgetBundle\Entity\ResourceKind;
 use Chill\BudgetBundle\Repository\ChargeKindRepository;
-use Chill\BudgetBundle\Repository\ChargeKindRepositoryInterface;
 use Chill\BudgetBundle\Repository\ResourceKindRepository;
-use Chill\BudgetBundle\Repository\ResourceKindRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
@@ -29,7 +27,7 @@ use function count;
 /**
  * Helps to find a summary of the budget: the sum of resources and charges.
  */
-final class SummaryBudget implements SummaryBudgetInterface
+class SummaryBudget implements SummaryBudgetInterface
 {
     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';
 
@@ -39,19 +37,23 @@ final class SummaryBudget implements SummaryBudgetInterface
 
     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 ChargeKindRepositoryInterface $chargeKindRepository;
+    private ChargeKindRepository $chargeKindRepository;
+
+    private array $chargeLabels;
 
     private EntityManagerInterface $em;
 
-    private ResourceKindRepositoryInterface $resourceKindRepository;
+    private ResourceKindRepository $resourceKindRepository;
+
+    private array $resourcesLabels;
 
     private TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
         EntityManagerInterface $em,
         TranslatableStringHelperInterface $translatableStringHelper,
-        ResourceKindRepositoryInterface $resourceKindRepository,
-        ChargeKindRepositoryInterface $chargeKindRepository
+        ResourceKindRepository $resourceKindRepository,
+        ChargeKindRepository $chargeKindRepository
     ) {
         $this->em = $em;
         $this->translatableStringHelper = $translatableStringHelper;
@@ -127,19 +129,19 @@ final class SummaryBudget implements SummaryBudgetInterface
 
     private function getEmptyChargeArray(): array
     {
-        $keys = array_map(static fn (ChargeKind $kind) => $kind->getKind(), $this->chargeKindRepository->findAll());
+        $keys = array_map(static fn (ChargeKind $kind) => $kind->getId(), $this->chargeKindRepository->findAll());
 
-        return array_combine($keys, array_map(function ($kind) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->chargeKindRepository->findOneByKind($kind)->getName()), '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 = array_map(static fn (ResourceKind $kind) => $kind->getKind(), $this->resourceKindRepository->findAll());
+        $keys = array_map(static fn (ResourceKind $kind) => $kind->getId(), $this->resourceKindRepository->findAll());
 
-        return array_combine($keys, array_map(function ($kind) {
-            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->resourceKindRepository->findOneByKind($kind)->getName()), 'comment' => ''];
+        return array_combine($keys, array_map(function ($id) {
+            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($this->resourceKindRepository->find($id)->getName()), 'comment' => ''];
         }, $keys));
     }
 
@@ -153,7 +155,7 @@ final class SummaryBudget implements SummaryBudgetInterface
                     $chargeKind = $this->chargeKindRepository->find($row['kind_id']);
 
                     if (null === $chargeKind) {
-                        throw new RuntimeException('charge kind not found: ' . $row['kind_id']);
+                        throw new RuntimeException('charge kind not found');
                     }
                     $result[$chargeKind->getKind()] = [
                         'sum' => (float) $row['sum'],
@@ -169,7 +171,7 @@ final class SummaryBudget implements SummaryBudgetInterface
                     $resourceKind = $this->resourceKindRepository->find($row['kind_id']);
 
                     if (null === $resourceKind) {
-                        throw new RuntimeException('charge kind not found: ' . $row['kind_id']);
+                        throw new RuntimeException('charge kind not found');
                     }
 
                     $result[$resourceKind->getKind()] = [

src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php

@@ -1,158 +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\Tests\Service\Summary;
-
-use Chill\BudgetBundle\Entity\ChargeKind;
-use Chill\BudgetBundle\Entity\ResourceKind;
-use Chill\BudgetBundle\Repository\ChargeKindRepositoryInterface;
-use Chill\BudgetBundle\Repository\ResourceKindRepositoryInterface;
-use Chill\BudgetBundle\Service\Summary\SummaryBudget;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Entity\Household\HouseholdMember;
-use Chill\PersonBundle\Entity\Person;
-use Doctrine\ORM\AbstractQuery;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query;
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-final class SummaryBudgetTest extends TestCase
-{
-    use ProphecyTrait;
-
-    public function testGenerateSummaryForPerson(): void
-    {
-        $queryCharges = $this->prophesize(AbstractQuery::class);
-        $queryCharges->getResult()->willReturn([
-            [
-                'sum' => 250.0,
-                'comment' => '',
-                'kind_id' => 1, // kind: rental
-            ],
-        ]);
-        $queryCharges->setParameters(Argument::type('array'))
-            ->will(function ($args, $query) {
-                return $query;
-            })
-        ;
-
-        $queryResources = $this->prophesize(AbstractQuery::class);
-        $queryResources->getResult()->willReturn([
-            [
-                'sum' => 1500.0,
-                'comment' => '',
-                'kind_id' => 2, // kind: 'salary',
-            ],
-        ]);
-        $queryResources->setParameters(Argument::type('array'))
-            ->will(function ($args, $query) {
-                return $query;
-            })
-        ;
-
-        $em = $this->prophesize(EntityManagerInterface::class);
-        $em->createNativeQuery(Argument::type('string'), Argument::type(Query\ResultSetMapping::class))
-            ->will(function ($args) use ($queryResources, $queryCharges) {
-                if (false !== strpos($args[0], 'chill_budget.resource')) {
-                    return $queryResources->reveal();
-                }
-                if (false !== strpos($args[0], 'chill_budget.charge')) {
-                    return $queryCharges->reveal();
-                }
-                throw new \RuntimeException('this query does not have a stub counterpart: '.$args[0]);
-            })
-        ;
-
-        $chargeRepository = $this->prophesize(ChargeKindRepositoryInterface::class);
-        $chargeRepository->findAll()->willReturn([
-            $rental = (new ChargeKind())->setKind('rental')->setName(['fr' => 'Rental']),
-            $other = (new ChargeKind())->setKind('other')->setName(['fr' => 'Other']),
-        ]);
-        $chargeRepository->find(1)->willReturn($rental);
-        $chargeRepository->findOneByKind('rental')->willReturn($rental);
-        $chargeRepository->findOneByKind('other')->willReturn($other);
-
-        $resourceRepository = $this->prophesize(ResourceKindRepositoryInterface::class);
-        $resourceRepository->findAll()->willReturn([
-            $salary = (new ResourceKind())->setKind('salary')->setName(['fr' => 'Salary']),
-            $misc = (new ResourceKind())->setKind('misc')->setName(['fr' => 'Misc']),
-        ]);
-        $resourceRepository->find(2)->willReturn($salary);
-        $resourceRepository->findOneByKind('salary')->willReturn($salary);
-        $resourceRepository->findOneByKind('misc')->willReturn($misc);
-
-        $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
-        $translatableStringHelper->localize(Argument::type('array'))->will(function ($arg) {
-            return $arg[0]['fr'];
-        });
-
-        $person = new Person();
-        $personReflection = new \ReflectionClass($person);
-        $personIdReflection = $personReflection->getProperty('id');
-        $personIdReflection->setAccessible(true);
-        $personIdReflection->setValue($person, 1);
-
-        $household = new Household();
-        $householdReflection = new \ReflectionClass($household);
-        $householdId = $householdReflection->getProperty('id');
-        $householdId->setAccessible(true);
-        $householdId->setValue($household, 1);
-        $householdMember = (new HouseholdMember())->setPerson($person)
-            ->setStartDate(new \DateTimeImmutable('1 month ago'))
-        ;
-        $household->addMember($householdMember);
-
-        $summaryBudget = new SummaryBudget(
-            $em->reveal(),
-            $translatableStringHelper->reveal(),
-            $resourceRepository->reveal(),
-            $chargeRepository->reveal()
-        );
-
-        $summary = $summaryBudget->getSummaryForPerson($person);
-        $summaryForHousehold = $summaryBudget->getSummaryForHousehold($household);
-
-        // we check the structure for the summary. The structure is the same for household
-        // and persons
-
-        $expected = [
-            'charges' => [
-                'rental' => ['sum' => 250.0, 'comment' => '', 'label' => 'Rental'],
-                'other' => ['sum' => 0.0, 'comment' => '', 'label' => 'Other'],
-            ],
-            'resources' => [
-                'salary' => ['sum' => 1500.0, 'comment' => '', 'label' => 'Salary'],
-                'misc' => ['sum' => 0.0, 'comment' => '', 'label' => 'Misc'],
-            ],
-        ];
-
-        foreach ([$summaryForHousehold, $summary] as $summary) {
-            $this->assertIsArray($summary);
-            $this->assertEqualsCanonicalizing(['charges', 'resources'], array_keys($summary));
-            $this->assertEqualsCanonicalizing(['rental', 'other'], array_keys($summary['charges']));
-            $this->assertEqualsCanonicalizing(['salary', 'misc'], array_keys($summary['resources']));
-
-            foreach ($expected as $resCha => $contains) {
-                foreach ($contains as $kind => $row) {
-                    $this->assertEqualsCanonicalizing($row, $summary[$resCha][$kind]);
-                }
-            }
-        }
-    }
-}

src/Bundle/ChillBudgetBundle/migrations/Version20230209161546.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Budget;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20230209161546 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Budget: add unique constraint on kind for charge_kind and resource_kind';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql("UPDATE chill_budget.resource_type SET kind=md5(random()::text) WHERE kind = ''");
-        $this->addSql("UPDATE chill_budget.charge_type SET kind=md5(random()::text) WHERE kind = ''");
-        $this->addSql('CREATE UNIQUE INDEX resource_kind_unique_type_idx ON chill_budget.resource_type (kind);');
-        $this->addSql('CREATE UNIQUE INDEX charge_kind_unique_type_idx ON chill_budget.charge_type (kind);');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP INDEX resource_kind_unique_type_idx');
-        $this->addSql('DROP INDEX charge_kind_unique_type_idx');
-    }
-}

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

@@ -77,13 +77,6 @@ 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%
 
-budget:
-    admin:
-        form:
-            Charge_kind_key: Clé d'identification
-            Resource_kind_key: Clé d'identification
-            This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document: Cette clé sert à identifier le type de charge ou de revenu lors de la génération de document. Seuls les caractères alpha-numériques sont autorisés. Modifier cette clé peut avoir un effet lors de la génération de nouveaux documents.
-
 # ROLES
 Budget elements: Budget
 CHILL_BUDGET_ELEMENT_CREATE: Créer une ressource/charge

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

@@ -1,8 +1,2 @@
 The amount cannot be empty: Le montant ne peut pas être vide ou égal à zéro
 The budget element's end date must be after the start date: La date de fin doit être après la date de début
-
-budget:
-    admin:
-        form:
-            kind:
-                only_alphanumeric

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/Resources/views/Calendar/edit.html.twig

@@ -7,7 +7,7 @@
 
 <div id="mainUser"></div> {# <=== vue component: mainUser #}
 
-<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
 
 {%- if form.persons is defined -%}
     {{ form_widget(form.persons) }}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig

@@ -7,7 +7,7 @@
 
 <div id="mainUser"></div> {# <=== vue component: mainUser #}
 
-<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
 
 {%- if form.mainUser is defined -%}
     {{ form_row(form.mainUser) }}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig

@@ -14,7 +14,7 @@
     <dd>{{ entity.mainUser }}</dd>
 </dl>
 
-<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
 {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': 'calendar_' ~ context, 'render': 'bloc' } %}
 
 

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/ChillCalendarBundle/translations/messages.fr.yml

@@ -4,7 +4,7 @@ My calendar list: Mes rendez-vous
 There is no calendar items.: Il n'y a pas de rendez-vous
 Remove calendar item: Supprimer le rendez-vous
 Are you sure you want to remove the calendar item?: Êtes-vous sûr de vouloir supprimer le rendez-vous?
-Concerned groups calendar: Parties concernées
+Concerned groups: Parties concernées
 Calendar data: Données du rendez-vous
 Update calendar: Modifier le rendez-vous
 main user concerned: Utilisateur concerné

src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php

@@ -272,9 +272,8 @@ final class DocGeneratorTemplateController extends AbstractController
         }
 
         if ($isTest && isset($form) && $form['show_data']->getData()) {
-            return $this->render('@ChillDocGenerator/Generator/debug_value.html.twig', [
-                'datas' => json_encode($context->getData($template, $entity, $contextGenerationData), JSON_PRETTY_PRINT)
-            ]);
+            // very ugly hack...
+            dd($context->getData($template, $entity, $contextGenerationData));
         }
 
         try {

src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/debug_value.html.twig

@@ -1,8 +0,0 @@
-<html>
-<head>
-    <title>{{ 'Doc generator debug'|trans }}</title>
-</head>
-<body>
-<pre>{{ datas }}</pre>
-</body>
-</html>

src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php

@@ -14,7 +14,6 @@ namespace Chill\DocStoreBundle\Menu;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
 use LogicException;
 use Symfony\Component\Security\Core\Security;
@@ -61,7 +60,7 @@ final class MenuBuilder implements LocalMenuBuilderInterface
     {
         $course = $parameters['accompanyingCourse'];
 
-        if ($this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $course) && !(AccompanyingPeriod::STEP_DRAFT === $course->getStep())) {
+        if ($this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $course)) {
             $menu->addChild($this->translator->trans('Documents'), [
                 'route' => 'accompanying_course_document_index',
                 'routeParameters' => [

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

@@ -7,7 +7,7 @@
       <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' && is_extension_viewable(props.storedObject.type) && props.canConvertPdf">
+      <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">
@@ -23,7 +23,7 @@
 import ConvertButton from "./StoredObjectButton/ConvertButton.vue";
 import DownloadButton from "./StoredObjectButton/DownloadButton.vue";
 import WopiEditButton from "./StoredObjectButton/WopiEditButton.vue";
-import {is_extension_editable, is_extension_viewable} from "./StoredObjectButton/helpers";
+import {is_extension_editable} from "./StoredObjectButton/helpers";
 import {StoredObject, WopiEditButtonExecutableBeforeLeaveFunction} from "../types";
 
 interface DocumentActionButtonsGroupConfig {

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

@@ -1,107 +1,97 @@
 
-const MIMES_EDIT = new Set([
+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',
 ]);
 
-
-
-const MIMES_VIEW = new Set([
-  ...MIMES_EDIT,
-  [
-    'image/svg+xml',
-    'application/vnd.sun.xml.writer',
-    'application/vnd.sun.xml.calc',
-    'application/vnd.sun.xml.impress',
-    'application/vnd.sun.xml.draw',
-    'application/vnd.sun.xml.writer.global',
-    'application/vnd.sun.xml.writer.template',
-    'application/vnd.sun.xml.calc.template',
-    'application/vnd.sun.xml.impress.template',
-    'application/vnd.sun.xml.draw.template',
-    'application/vnd.oasis.opendocument.text-master',
-    'application/vnd.oasis.opendocument.text-template',
-    'application/vnd.oasis.opendocument.text-master-template',
-    'application/vnd.oasis.opendocument.spreadsheet-template',
-    'application/vnd.oasis.opendocument.presentation-template',
-    'application/vnd.oasis.opendocument.graphics-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.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/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',
-    'application/x-fictionbook+xml',
-    'application/clarisworks',
-    'image/x-wpg',
-    'application/x-iwork-pages-sffpages',
-    '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 MIMES_EDIT.has(mimeType);
-}
-
-function is_extension_viewable(mimeType: string): boolean {
-  return MIMES_VIEW.has(mimeType);
+  return SUPPORTED_MIMES.has(mimeType);
 }
 
 function build_convert_link(uuid: string) {
@@ -175,5 +165,4 @@ export {
   download_and_decrypt_doc,
   download_doc,
   is_extension_editable,
-  is_extension_viewable,
 };

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

@@ -36,9 +36,9 @@
 
 	{{ chill_pagination(pagination) }}
 
-	{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE', accompanyingCourse) and not accompanyingCourse.getStep() is same as('DRAFT') %}
 	<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\AccompanyingPeriod" data-entity-id="{{ accompanyingCourse.id }}"></div>
 
+	{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE', accompanyingCourse) %}
 		<ul class="record_actions sticky-form-buttons">
 			<li class="create">
 				<a href="{{ path('accompanying_course_document_new', {'course': accompanyingCourse.id}) }}" class="btn btn-create">

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

@@ -56,9 +56,9 @@
 
 	{{ chill_pagination(pagination) }}
 
-	{% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
 	<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\Person" data-entity-id="{{ person.id }}"></div>
 
+	{% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
 		<ul class="record_actions sticky-form-buttons">
 			<li class="create">
 				<a href="{{ path('person_document_new', {'person': person.id}) }}" class="btn btn-create">

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/Controller/LocationController.php

@@ -28,7 +28,7 @@ class LocationController extends CRUDController
 
     protected function customizeQuery(string $action, Request $request, $query): void
     {
-        $query->where('e.availableForUsers = "TRUE"');
+        $query->where('e.availableForUsers = true'); //TODO not working
     }
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)

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/ExportInterface.php

@@ -83,9 +83,9 @@ interface ExportInterface extends ExportElementInterface
      *
      * @param string $key The column key, as added in the query
      * @param mixed[] $values The values from the result. if there are duplicates, those might be given twice. Example: array('FR', 'BE', 'CZ', 'FR', 'BE', 'FR')
-     * @param mixed $data The data from the export's form (as defined in `buildForm`)
+     * @param mixed $data The data from the export's form (as defined in `buildForm`
      *
-     * @return pure-callable(null|string|int|float|'_header' $value):string|int|\DateTimeInterface where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
+     * @return Closure where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
      */
     public function getLabels($key, array $values, $data);
 

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

@@ -35,10 +35,6 @@ class DateTimeHelper
                 return '';
             }
 
-            if ($value instanceof \DateTimeInterface) {
-                return $value;
-            }
-
             // warning: won't work with DateTimeImmutable as we reset time a few lines later
             $date = DateTime::createFromFormat('Y-m-d', $value);
             $hasTime = false;

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/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/ChillMainBundle/translations/messages.fr.yml

@@ -229,7 +229,6 @@ Create a new circle: Créer un nouveau cercle
 
 #admin section for location
 Location: Localisation
-pick location: Localisation
 Location type list: Liste des types de localisation
 Create a new location type: Créer un nouveau type de localisation
 Available for users: Disponible aux utilisateurs

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/AccompanyingCourseController.php

@@ -248,8 +248,6 @@ class AccompanyingCourseController extends Controller
      */
     public function newAction(Request $request): Response
     {
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::CREATE);
-
         $period = new AccompanyingPeriod();
         $em = $this->getDoctrine()->getManager();
 

src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php

@@ -133,7 +133,7 @@ class HouseholdCompositionController extends AbstractController
      */
     public function index(Household $household, Request $request): Response
     {
-        if (!$this->security->isGranted(HouseholdVoter::EDIT, $household)) {
+        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
             throw new AccessDeniedException('not allowed to edit a household');
         }
 

src/Bundle/ChillPersonBundle/Controller/HouseholdController.php

@@ -24,7 +24,6 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -124,9 +123,7 @@ class HouseholdController extends AbstractController
      */
     public function addressEdit(Request $request, Household $household)
     {
-        if (!$this->security->isGranted(HouseholdVoter::EDIT, $household)) {
-            throw new AccessDeniedException('You are not allowed to edit a household address');
-        }
+        // TODO ACL
 
         $address_id = $request->query->get('address_id');
         $address = $this->getDoctrine()->getManager()
@@ -152,9 +149,7 @@ class HouseholdController extends AbstractController
      */
     public function addresses(Request $request, Household $household)
     {
-        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
-            throw new AccessDeniedException('You have no access to this household\'s details');
-        }
+        // TODO ACL
 
         //TODO put these lines into a validator constraint on household->getAddress
         $addresses = $household->getAddresses();
@@ -184,9 +179,7 @@ class HouseholdController extends AbstractController
      */
     public function addressMove(Request $request, Household $household)
     {
-        if (!$this->security->isGranted(HouseholdVoter::EDIT, $household)) {
-            throw new AccessDeniedException('You are not allowed to edit this household');
-        }
+        // TODO ACL
 
         return $this->render(
             '@ChillPerson/Household/address_move.html.twig',
@@ -262,10 +255,7 @@ class HouseholdController extends AbstractController
      */
     public function editHouseholdMetadata(Request $request, Household $household)
     {
-        if (!$this->security->isGranted(HouseholdVoter::EDIT, $household)) {
-            throw new AccessDeniedException('not allowed to edit a household');
-        }
-
+        // TODO ACL
         $form = $this->createMetadataForm($household);
 
         $form->handleRequest($request);
@@ -321,9 +311,7 @@ class HouseholdController extends AbstractController
      */
     public function summary(Request $request, Household $household)
     {
-        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
-            throw new AccessDeniedException('not allowed to edit a household');
-        }
+        // TODO ACL
 
         $positions = $this->positionRepository
             ->findByActiveOrdered();

src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php

@@ -19,15 +19,12 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\HouseholdMemberType;
 use Chill\PersonBundle\Household\MembersEditor;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
-use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Exception;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -41,18 +38,14 @@ class HouseholdMemberController extends ApiController
 
     private TranslatorInterface $translator;
 
-    private Security $security;
-
     public function __construct(
         UrlGeneratorInterface $generator,
         TranslatorInterface $translator,
-        AccompanyingPeriodRepository $periodRepository,
-        Security $security
+        AccompanyingPeriodRepository $periodRepository
     ) {
         $this->generator = $generator;
         $this->translator = $translator;
         $this->periodRepository = $periodRepository;
-        $this->security = $security;
     }
 
     /**
@@ -63,9 +56,7 @@ class HouseholdMemberController extends ApiController
      */
     public function editMembership(Request $request, HouseholdMember $member): Response
     {
-        if (!$this->security->isGranted(HouseholdVoter::EDIT, $member->getHousehold())) {
-            throw new AccessDeniedException('You are not allowed to edit this household');
-        }
+        // TODO ACL
 
         $form = $this->createForm(HouseholdMemberType::class, $member, [
             'validation_groups' => ['household_memberships'],

src/Bundle/ChillPersonBundle/Controller/PersonController.php

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