Merge branch 'master' into testing

2025-06-14 14:24:24 +00:00 · 2022-07-11 20:03:37 +02:00 · 2022-07-11 20:03:37 +02:00 · 3782cf35ff
commit 3782cf35ff
parent 68c1833584 5f6c11bde9
31 changed files with 747 additions and 610 deletions
--- a/grumphp.yml
+++ b/grumphp.yml
@ -24,6 +24,7 @@ parameters:
        - "/spec/"
        - "/var/"
        - "/vendor/"
        - "/tests/app"
    # Psalm
    tasks.psalm.blocking: true
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
@ -1,8 +1,7 @@
 parameters:
 	ignoreErrors:
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -25,8 +24,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -34,8 +32,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityReasonAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -43,8 +40,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -52,8 +48,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityTypeAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -61,8 +56,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -70,8 +64,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityUserAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -79,8 +72,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -88,8 +80,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\CountActivity\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -97,8 +88,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -106,8 +96,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\ListActivity\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -115,8 +104,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -124,8 +112,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -133,8 +120,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -142,8 +128,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -151,8 +136,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityReasonFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -160,8 +144,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -169,8 +152,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityTypeFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -178,8 +160,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\PersonHavingActivityBetweenDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -187,8 +168,15 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
 		-
-			message:
+			message: """
 				#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
 		-
 			message: """
 				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
 				Use getReachableCircles$#
 			"""
@ -196,8 +184,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -205,8 +192,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -214,8 +200,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -223,8 +208,7 @@ parameters:
 			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bridge\\\\Twig\\\\TwigEngine\\:
 				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
 			"""
@ -237,8 +221,7 @@ parameters:
 			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
 				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
 			"""
@ -246,8 +229,7 @@ parameters:
 			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$twigEngine of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bridge\\\\Twig\\\\TwigEngine\\:
 				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
 			"""
@ -255,8 +237,7 @@ parameters:
 			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
 				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
 			"""
@ -264,8 +245,7 @@ parameters:
 			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
 				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
 			"""
@ -273,8 +253,7 @@ parameters:
 			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
 				since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
 			"""
@ -292,8 +271,7 @@ parameters:
 			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -301,8 +279,7 @@ parameters:
 			path: src/Bundle/ChillEventBundle/Controller/EventController.php
 		-
-			message:
+			message: """
 				"""
 				#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -310,8 +287,7 @@ parameters:
 			path: src/Bundle/ChillEventBundle/Form/EventType.php
 		-
-			message:
+			message: """
 				"""
 				#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -319,8 +295,7 @@ parameters:
 			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
 				Use getReachableCircles$#
 			"""
@ -328,8 +303,7 @@ parameters:
 			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -337,8 +311,7 @@ parameters:
 			path: src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$role of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getReachableCenters\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -346,8 +319,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getLanguageBundle\\(\\) of class Symfony\\\\Component\\\\Intl\\\\Intl\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use \\{@see Languages\\} or \\{@see Scripts\\} instead\\.$#
 			"""
@ -355,8 +327,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getRegionBundle\\(\\) of class Symfony\\\\Component\\\\Intl\\\\Intl\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use \\{@see Countries\\} instead\\.$#
 			"""
@ -364,8 +335,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -373,8 +343,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$role of anonymous function has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -382,8 +351,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getLanguageBundle\\(\\) of class Symfony\\\\Component\\\\Intl\\\\Intl\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use \\{@see Languages\\} or \\{@see Scripts\\} instead\\.$#
 			"""
@ -391,8 +359,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\MainBundle\\\\Entity\\\\User implements deprecated interface Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\AdvancedUserInterface\\:
 				since Symfony 4\\.1$#
 			"""
@ -400,8 +367,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Entity/User.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\MainBundle\\\\Entity\\\\User\\:\\:getRoles\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -409,8 +375,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Entity/User.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\MainBundle\\\\Export\\\\DirectExportInterface\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -418,8 +383,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\MainBundle\\\\Export\\\\ExportInterface\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -427,8 +391,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Export/ExportInterface.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
 				Use getReachableCircles$#
 			"""
@ -436,8 +399,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\MainBundle\\\\Export\\\\ModifierInterface\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -445,8 +407,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Export/ModifierInterface.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\MainBundle\\\\Form\\\\Event\\\\CustomizeFormEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -454,8 +415,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
 		-
-			message:
+			message: """
 				"""
 				#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -463,8 +423,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
 		-
-			message:
+			message: """
 				"""
 				#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -477,8 +436,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$attribute of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:userHasAccess\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -486,8 +444,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -495,8 +452,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCircles\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -504,8 +460,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelper\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -513,8 +468,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelperFactory\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -522,8 +476,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelperGenerator\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -531,8 +484,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -540,8 +492,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcher implements deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -554,8 +505,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\MainBundle\\\\Templating\\\\Events\\\\DelegatedBlockRenderingEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -563,8 +513,7 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\PersonBundle\\\\Actions\\\\ActionEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -572,8 +521,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getCurrentAccompanyingPeriod\\(\\) of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\:
 				since 1\\.1 use `getOpenedAccompanyingPeriod instead$#
 			"""
@ -581,8 +529,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -590,8 +537,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
 				since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
 			"""
@ -599,8 +545,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getCurrentAccompanyingPeriod\\(\\) of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\:
 				since 1\\.1 use `getOpenedAccompanyingPeriod instead$#
 			"""
@ -608,8 +553,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
 				since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
 			"""
@ -622,8 +566,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Entity/Person.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\AgeAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -631,8 +574,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\CountryOfBirthAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -640,8 +582,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\GenderAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -649,8 +590,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\NationalityAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -658,8 +598,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -667,8 +606,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\CountPerson\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -676,8 +614,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -685,8 +622,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPerson\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -694,8 +630,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method execute\\(\\) of class Doctrine\\\\DBAL\\\\Statement\\:
 				Statement\\:\\:execute\\(\\) is deprecated, use Statement\\:\\:executeQuery\\(\\) or executeStatement\\(\\) instead$#
 			"""
@ -703,8 +638,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -712,8 +646,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPersonDuplicate\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -721,8 +654,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodClosingFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -730,8 +662,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -739,8 +670,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodOpeningFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -748,8 +678,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\BirthdateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -757,8 +686,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\GenderFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -766,8 +694,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\NationalityFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -775,8 +702,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -789,8 +715,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
 		-
-			message:
+			message: """
 				"""
 				#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -798,8 +723,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\PersonBundle\\\\Privacy\\\\AccompanyingPeriodPrivacyEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -807,8 +731,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\PersonBundle\\\\Privacy\\\\PrivacyEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -816,8 +739,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriodACLAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -825,8 +747,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -834,8 +755,7 @@ parameters:
 			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
 				Use getReachableCircles$#
 			"""
@ -843,8 +763,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -852,8 +771,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -861,8 +779,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportList\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -870,8 +787,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
 		-
-			message:
+			message: """
 				"""
 				#^Return type of method Chill\\\\ReportBundle\\\\Export\\\\Filter\\\\ReportDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -879,8 +795,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
 				Use getReachableCircles$#
 			"""
@ -888,8 +803,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Form/ReportType.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$role of method Chill\\\\ReportBundle\\\\Form\\\\ReportType\\:\\:appendScopeChoices\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -897,8 +811,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Form/ReportType.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
 				Use getReachableCircles$#
 			"""
@ -906,8 +819,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -915,8 +827,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
 		-
-			message:
+			message: """
 				"""
 				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
 				Use getReachableCircles$#
 			"""
@ -924,8 +835,7 @@ parameters:
 			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -933,8 +843,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -942,8 +851,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$role of method Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:setCreateForm\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -951,8 +859,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\TaskBundle\\\\Event\\\\TaskEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -960,8 +867,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Event/TaskEvent.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\TaskBundle\\\\Event\\\\UI\\\\UIEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -969,8 +875,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -978,8 +883,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
 		-
-			message:
+			message: """
 				"""
 				#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -987,8 +891,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Form\\\\SingleTaskType\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -996,8 +899,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
 		-
-			message:
+			message: """
 				"""
 				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Repository\\\\SingleTaskAclAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
 				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
 			"""
@ -1005,8 +907,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -1014,8 +915,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
 		-
-			message:
+			message: """
 				"""
 				#^Class Chill\\\\TaskBundle\\\\Security\\\\Authorization\\\\AuthorizationEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
 				since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
 			"""
@ -1023,8 +923,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
@ -1032,8 +931,7 @@ parameters:
 			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
 		-
-			message:
+			message: """
 				"""
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
 				since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
 			"""
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@ -25,16 +25,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
 		-
 			message: "#^Only booleans are allowed in &&, mixed given on the right side\\.$#"
 			count: 3
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 2
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 3
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@ -203,7 +203,7 @@ final class ActivityController extends AbstractController
        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
+            'center' => $entity->getCenters()[0] ?? null,
            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@ -61,8 +61,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
                ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
                ActivityVoter::FULL => [
                    ActivityVoter::CREATE_PERSON,
                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
                    ActivityVoter::DELETE,
                    ActivityVoter::UPDATE,
                ],
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@ -16,8 +16,8 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
-use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasCentersInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@ -55,7 +55,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 *     getUserFunction="getUser",
 * path="scope")
 */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
 {
    public const SENTRECEIVED_RECEIVED = 'received';
@ -306,13 +306,17 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     * get the center
     * center is extracted from person.
     */
-    public function getCenter(): ?Center
+    public function getCenters(): array
    {
        if ($this->person instanceof Person) {
-            return $this->person->getCenter();
+            return [$this->person->getCenter()];
        }
-        return null;
+        if ($this->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
            return $this->getAccompanyingPeriod()->getCenters();
        }
        return [];
    }
    public function getComment(): CommentEmbeddable
@ -422,6 +426,19 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->scope;
    }
    public function getScopes(): iterable
    {
        if (null !== $this->getAccompanyingPeriod()) {
            return $this->getAccompanyingPeriod()->getScopes();
        }
        if (null !== $this->getPerson()) {
            return [$this->scope];
        }
        return [];
    }
    public function getSentReceived(): string
    {
        return $this->sentReceived;
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@ -14,17 +14,20 @@ namespace Chill\ActivityBundle\Form;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\DocStoreBundle\Form\StoredObjectType;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@ -50,6 +53,7 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use function in_array;
 class ActivityType extends AbstractType
@ -109,19 +113,18 @@ class ActivityType extends AbstractType
        $activityType = $options['activityType'];
        // TODO revoir la gestion des center au niveau du form des activité.
-        if ($options['center']) {
+        if ($options['center'] instanceof Center && null !== $options['data']->getPerson()) {
            $builder->add('scope', ScopePickerType::class, [
                'center' => $options['center'],
-                'role' => $options['role'],
+                'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
-                // TODO make required again once scope and rights are fixed
+                'required' => true,
                'required' => false,
            ]);
        }
        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
        $accompanyingPeriod = null;
-        if ($options['accompanyingPeriod']) {
+        if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
            $accompanyingPeriod = $options['accompanyingPeriod'];
        }
@ -218,12 +221,10 @@ class ActivityType extends AbstractType
            ]);
        }
-        if ($activityType->isVisible('user') && $options['center']) {
+        if ($activityType->isVisible('user') && $options['center'] instanceof Center) {
-            $builder->add('user', UserPickerType::class, [
+            $builder->add('user', PickUserDynamicType::class, [
                'label' => $activityType->getLabel('user'),
                'required' => $activityType->isRequired('user'),
                'center' => $options['center'],
                'role' => $options['role'],
            ]);
        }
@ -442,8 +443,8 @@ class ActivityType extends AbstractType
        $resolver
            ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
-            ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
+            ->setAllowedTypes('center', ['null', Center::class])
-            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
+            ->setAllowedTypes('role', [Role::class, 'string'])
            ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
    }
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@ -120,3 +120,11 @@
 {{ form_end(edit_form) }}
 {# {{ form(delete_form) }} #}
 {% block js %}
    {{ encore_entry_script_tags('mod_pickentity_type') }}
 {% endblock %}
 {% block css %}
    {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@ -46,7 +46,7 @@
    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
-    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
    <ul class="record_actions sticky-form-buttons">
        <li>
            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@ -119,3 +119,11 @@
  </li>
 </ul>
 {{ form_end(form) }}
 {% block js %}
    {{ encore_entry_script_tags('mod_pickentity_type') }}
 {% endblock %}
 {% block css %}
    {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@ -133,7 +133,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                // change attribute CREATE
                if (self::CREATE === $attribute) {
-                    $attribute = self::CREATE_PERSON;
+                    return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject->getPerson(), $token);
                }
            } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
@ -144,7 +144,8 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                    if (AccompanyingPeriod::STEP_CLOSED === $subject->getAccompanyingPeriod()->getStep()) {
                        return false;
                    }
-                    $attribute = self::CREATE_ACCOMPANYING_COURSE;
+
                    return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject->getAccompanyingPeriod(), $token);
                }
            } else {
                throw new RuntimeException('Could not determine context of activity.');
@ -158,12 +159,12 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
            // transform the attribute
            if (self::CREATE === $attribute) {
-                $attribute = self::CREATE_ACCOMPANYING_COURSE;
+                return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject, $token);
            }
        } elseif ($subject instanceof Person) {
            // transform the attribute
            if (self::CREATE === $attribute) {
-                $attribute = self::CREATE_PERSON;
+                return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject, $token);
            }
        }
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@ -130,8 +130,10 @@ class ActivityContext implements
                        return $this->personRender->renderString($p, []);
                    },
                    'multiple' => false,
                    'required' => false,
                    'expanded' => true,
                    'label' => $options[$key . 'Label'],
                    'placeholder' => $this->translator->trans('Any person selected'),
                ]);
            }
        }
--- a/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
@ -126,7 +126,7 @@ class Version20160318111334 extends AbstractMigration
        $this->addSql('ALTER TABLE chill_event_participation '
                . 'ADD CONSTRAINT FK_4E7768AC217BBB47 '
                . 'FOREIGN KEY (person_id) '
-                . 'REFERENCES Person (id) '
+                . 'REFERENCES chill_person_person(id) '
                . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
        $this->addSql('ALTER TABLE chill_event_participation '
                . 'ADD CONSTRAINT FK_4E7768ACD60322AC '
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
@ -92,5 +92,8 @@ final class PostalCodeAPIController extends ApiController
            $qb->where('e.country = :country')
                ->setParameter('country', $request->query->get('country'));
        }
        $qb->andWhere('e.origin = :zero')
            ->setParameter('zero', 0);
    }
 }
--- a/src/Bundle/ChillMainBundle/Controller/UserApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 class UserApiController extends ApiController
@ -58,4 +60,14 @@ class UserApiController extends ApiController
            ['groups' => ['read']]
        );
    }
    /**
     * @param QueryBuilder $query
     */
    protected function customizeQuery(string $action, Request $request, $query): void
    {
        if ('_index' === $action) {
            $query->andWhere($query->expr()->eq('e.enabled', "'TRUE'"));
        }
    }
 }
--- a/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserJobApiController.php
@ -0,0 +1,25 @@
 <?php
 /**
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */
 declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Symfony\Component\HttpFoundation\Request;
 class UserJobApiController extends ApiController
 {
    protected function customizeQuery(string $action, Request $request, $query): void
    {
        if ('_index' === $action) {
            $query->andWhere($query->expr()->eq('e.active', "'TRUE'"));
        }
    }
 }
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@ -19,6 +19,7 @@ use Chill\MainBundle\Controller\LanguageController;
 use Chill\MainBundle\Controller\LocationController;
 use Chill\MainBundle\Controller\LocationTypeController;
 use Chill\MainBundle\Controller\UserController;
 use Chill\MainBundle\Controller\UserJobApiController;
 use Chill\MainBundle\Controller\UserJobController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Chill\MainBundle\Doctrine\DQL\GetJsonFieldByKey;
@ -504,6 +505,7 @@ class ChillMainExtension extends Extension implements
                    'name' => 'user_job',
                    'base_path' => '/api/1.0/main/user-job',
                    'base_role' => 'ROLE_USER',
                    'controller' => UserJobApiController::class,
                    'actions' => [
                        '_index' => [
                            'methods' => [
--- a/src/Bundle/ChillMainBundle/migrations/Version20220711150006.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220711150006.php
@ -0,0 +1,39 @@
 <?php
 /**
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */
 declare(strict_types=1);
 namespace Chill\Migrations\Main;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 final class Version20220711150006 extends AbstractMigration
 {
    public function down(Schema $schema): void
    {
        $this->addSql('ALTER TABLE chill_main_workflow_entity_step
            DROP CONSTRAINT chill_custom_only_one_step_opened');
    }
    public function getDescription(): string
    {
        return 'Add a constraint to ensure that only one step is available at a time';
    }
    public function up(Schema $schema): void
    {
        $this->addSql('ALTER TABLE chill_main_workflow_entity_step
            ADD CONSTRAINT chill_custom_only_one_step_opened
                EXCLUDE (
                    entityworkflow_id WITH =
                ) WHERE (transitionafter IS NULL)
                DEFERRABLE INITIALLY DEFERRED');
    }
 }
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@ -177,7 +177,7 @@ class AccompanyingCourseController extends Controller
     */
    public function editAction(AccompanyingPeriod $accompanyingCourse): Response
    {
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::EDIT, $accompanyingCourse);
        return $this->render('@ChillPerson/AccompanyingCourse/edit.html.twig', [
            'accompanyingCourse' => $accompanyingCourse,
@ -215,7 +215,7 @@ class AccompanyingCourseController extends Controller
        // get persons without household
        $withoutHousehold = [];
-        foreach ($accompanyingCourse->getParticipations() as $p) {
+        foreach ($accompanyingCourse->getCurrentParticipations() as $p) {
            if (false === $p->getPerson()->isSharingHousehold()) {
                $withoutHousehold[] = $p->getPerson();
            }
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
@ -40,7 +40,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
    /**
     * @ORM\Column(type="text")
-     * @Groups({"read", "write"})
+     * @Groups({"read", "write", "docgen:read"})
     * @Assert\NotBlank
     * @Assert\NotNull
     */
@ -48,14 +48,14 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
    /**
     * @ORM\Column(type="datetime")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
     */
    private $createdAt;
    /**
     * @ORM\ManyToOne(targetEntity=User::class)
     * @ORM\JoinColumn(nullable=false)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
     */
    private $creator;
@ -63,7 +63,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
     * @ORM\Id
     * @ORM\GeneratedValue
     * @ORM\Column(type="integer")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
     */
    private $id;
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Entity\Household;
 use ArrayIterator;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder;
 use DateTime;
 use DateTimeImmutable;
@ -354,7 +355,12 @@ class Household
        return $this->members;
    }
-    public function getMembersDuringMembership(HouseholdMember $membership)
+    /**
     * get all the members during a given membership.
     *
     * @return Collection|HouseholdMember[]
     */
    public function getMembersDuringMembership(HouseholdMember $membership): Collection
    {
        return $this->getMembersOnRange(
            $membership->getStartDate(),
@ -441,6 +447,28 @@ class Household
        return $this->getNonCurrentMembers($now)->matching($criteria);
    }
    /**
     * get all the unique persons during a given membership.
     *
     * same as @see(self::getMembersDuringMembership}, except that the collection is filtered to
     * return unique members.
     *
     * @return Collection|Person[]
     */
    public function getPersonsDuringMembership(HouseholdMember $member): Collection
    {
        // make list unique
        $membersByHash = [];
        foreach ($this->getMembersDuringMembership($member) as $m) {
            if (null !== $m && null !== $m->getPerson()) {
                $membersByHash[spl_object_hash($m->getPerson())] = $m->getPerson();
            }
        }
        return new ArrayCollection(array_values($membersByHash));
    }
    public function getPreviousAddressOf(Address $address): ?Address
    {
        $iterator = new ArrayIterator($this->getAddressesOrdered());
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
@ -1,7 +1,7 @@
 <div class="alert alert-warning alert-with-actions">
    <div class="float-button bottom">
        <div class="box">
-
+            {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', accompanyingCourse) %}
            <div class="action">
                <ul class="record_actions">
                    <li>
@ -13,6 +13,8 @@
                    </li>
                </ul>
            </div>
            {% endif %}
            <p>{{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}</p>
        </div>
    </div>
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
@ -3,6 +3,7 @@
 <div class="alert alert-danger {% if hasPersonLocation %}alert-with-actions{% endif %}">
    <div class="float-button bottom">
        <div class="box">
            {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', accompanyingCourse) %}
            <div class="action">
                <ul class="record_actions">
                    <li>
@ -14,6 +15,7 @@
                    </li>
                </ul>
            </div>
            {% endif %}
                <p>
            {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}</p>
            {% if not hasPersonLocation %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
@ -14,7 +14,7 @@
    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', period) %}
        <div class="item-col item-meta">
            {% set job_id = null %}
-            {% if period.job is defined %}
+            {% if period.job is not null %}
                {% set job_id = period.job.id %}
            {% endif %}
            <span
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@ -48,13 +48,57 @@
 {% endmacro %}
 {% block content %}
-    <div class="flex-table accompanyingcourse-list">
+    {%- set acps = [] %}
-        {% for period in accompanying_periods %}
+    {%- set acpsClosed = [] %}
    {% for acp in accompanying_periods %}
        {% if acp.step == 'CLOSED' or (acp.requestorPerson is not same as(person) and acp.openParticipationContainsPerson(person) is null ) %}
            {%- set acpsClosed = acpsClosed|merge([acp]) %}
        {% else %}
            {%- set acps = acps|merge([acp]) %}
        {% endif %}
    {% endfor %}
    <div class="flex-table accompanyingcourse-list">
        {% for period in acps %}
            {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
                'recordAction': _self.recordAction(period, contextEntity)
            } %}
-
+        {% else %}
            <p class="chill-no-data-statement">{{ 'Any accompanying periods are open'|trans }}</p>
        {% endfor %}
    </div>
    {% if acpsClosed|length > 0 %}
        <div class="accordion" id="member_{{ person.id }}">
            <div class="accordion-item">
                <h2 class="accordion-header" id="heading_{{ person.id }}">
                    <button
                        class="accordion-button collapsed"
                        type="button"
                        data-bs-toggle="collapse"
                        data-bs-target="#collapse_{{ person.id }}"
                        aria-expanded="false"
                        aria-controls="collapse_{{ person.id }}">
                        <span class="folded">{{ 'periods.show closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
                        <span class="unfolded text-secondary">{{ 'periods.hide closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
                    </button>
                </h2>
                <div id="collapse_{{ person.id }}"
                     class="accordion-collapse collapse"
                     aria-labelledby="heading_{{ person.id }}"
                     data-bs-parent="#nonCurrent">
                    <div class="flex-table accompanyingcourse-list">
                        {% for period in acpsClosed %}
                            {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
                                'recordAction': _self.recordAction(period, contextEntity)
                            } %}
                        {% endfor %}
                    </div>
                </div>
            </div>
        </div>
    {% endif %}
 {% endblock content %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
@ -65,18 +65,18 @@
                    <h3>{{ 'household.Members at same time'|trans }}</h3>
                </div>
                <div class="wl-col list">
-                    {% set simultaneous = p.household.getMembersDuringMembership(p) %}
+                    {% set simultaneous = p.household.getPersonsDuringMembership(p) %}
                    {% if simultaneous|length == 0 %}
                        <p class="chill-no-data-statement">
                            {{ 'household.Any simultaneous members'|trans }}
                        </p>
                    {% else %}
-                        {% for m in simultaneous -%}
+                        {% for person in simultaneous -%}
                            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
                                action: 'show', displayBadge: true,
-                                targetEntity: { name: 'person', id: m.person.id },
+                                targetEntity: { name: 'person', id: person.id },
-                                buttonText: m.person|chill_entity_render_string,
+                                buttonText: person|chill_entity_render_string,
-                                isDead: m.person.deathdate is not null
+                                isDead: person.deathdate is not null
                            } %}
                        {%- endfor -%}
                    {% endif %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@ -1,13 +1,15 @@
 {% macro button_person_after(person) %}
    {% set household = person.getCurrentHousehold %}
-    {% if household is not null %}
+    {% if household is not null and is_granted('CHILL_PERSON_HOUSEHOLD_SEE', household) %}
        <li>
            <a href="{{ path('chill_person_household_summary', { 'household_id': household.id }) }}" class="btn btn-sm btn-chill-beige"><i class="fa fa-home"></i></a>
        </li>
    {% endif %}
    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE', person) %}
        <li>
            <a href="{{ path('chill_person_accompanying_course_new', { 'person_id': [ person.id ]}) }}" class="btn btn-sm btn-create change-icon" title="{{ 'Create an accompanying period'|trans }}"><i class="fa fa-random"></i></a>
        </li>
    {% endif %}
 {% endmacro %}
 {% macro accompanying_period(acp, person) %}
@ -251,7 +253,8 @@
                    {%- set acpsClosed = [] %}
                    {%- for acp in person.accompanyingPeriodInvolved %}
                        {%- if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', acp) %}
-                            {% if acp.step == 'CLOSED' %}
+                            {# filter for "current" periods: either the person is a requestor, or is member of the period and not closed #}
                            {% if acp.step == 'CLOSED' or (acp.requestorPerson is not same as(person) and acp.openParticipationContainsPerson(person) is null ) %}
                                {%- set acpsClosed = acpsClosed|merge([acp]) %}
                            {% else %}
                                {%- set acps = acps|merge([acp]) %}
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@ -113,7 +113,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
            ->generate(self::class)
            ->addCheckFor(null, [self::CREATE, self::REASSIGN_BULK])
            ->addCheckFor(AccompanyingPeriod::class, [self::TOGGLE_CONFIDENTIAL, ...self::ALL])
-            ->addCheckFor(Person::class, [self::SEE])
+            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
            ->build();
    }
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
@ -71,6 +71,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
        'location' => Address::class,
        'locationPerson' => Person::class,
        'administrativeLocation' => Location::class,
        'pinnedComment' => AccompanyingPeriod\Comment::class,
    ];
    private ClosingMotiveRender $closingMotiveRender;
@ -164,6 +165,8 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                'location' => $this->normalizer->normalize($period->getLocation(), $format, $addressContext),
                'administrativeLocation' => $this->normalizer->normalize($period->getAdministrativeLocation(), $format, $administrativeLocationContext),
                'works' => $this->normalizer->normalize($period->getWorks(), $format, $workContext),
                'comments' => $this->normalizer->normalize($period->getComments(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\Comment::class])),
                'pinnedComment' => $this->normalizer->normalize($period->getPinnedComment(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\Comment::class])),
            ];
        }
@ -183,6 +186,7 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
                    'hasLocationPerson' => false,
                    'hasAdministrativeLocation' => false,
                    'works' => [],
                    'comments' => [],
                ]
            );
        }
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
@ -135,4 +135,51 @@ final class HouseholdTest extends TestCase
        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $second->getStartDate());
        $this->assertEquals(new DateTimeImmutable('2021-12-31'), $inside->getEndDate());
    }
    public function testHouseholdGetPersonsDuringMembership()
    {
        $household = new Household();
        $person1 = new Person();
        $person2 = new Person();
        $personOut = new Person();
        $household->addMember(
            $member1 = (new HouseholdMember())
                ->setStartDate(new DateTimeImmutable('2021-01-01'))
                ->setEndDate(new DateTimeImmutable('2021-12-01'))
                ->setPerson($person1)
        );
        $household->addMember(
            $member2a = (new HouseholdMember())
                ->setStartDate(new DateTimeImmutable('2021-01-01'))
                ->setEndDate(new DateTimeImmutable('2021-05-01'))
                ->setPerson($person2)
        );
        $household->addMember(
            $member2b = (new HouseholdMember())
                ->setStartDate(new DateTimeImmutable('2021-11-01'))
                ->setEndDate(new DateTimeImmutable('2022-06-01'))
                ->setPerson($person2)
        );
        $household->addMember(
            $memberOut = (new HouseholdMember())
                ->setStartDate(new DateTimeImmutable('2019-01-01'))
                ->setEndDate(new DateTimeImmutable('2019-12-01'))
                ->setPerson($personOut)
        );
        $this->assertCount(0, $household->getPersonsDuringMembership($memberOut));
        $this->assertCount(1, $household->getPersonsDuringMembership($member1));
        $this->assertContains($person2, $household->getPersonsDuringMembership($member1));
        $this->assertCount(1, $household->getPersonsDuringMembership($member2a));
        $this->assertContains($person1, $household->getPersonsDuringMembership($member2a));
        $this->assertCount(1, $household->getPersonsDuringMembership($member2b));
        $this->assertContains($person1, $household->getPersonsDuringMembership($member2b));
    }
 }
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
@ -68,6 +68,8 @@ final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase
            'closingMotive' => '@ignored',
            'confidential' => true,
            'confidentialText' => 'confidentiel',
            'comments' => '@ignored',
            'pinnedComment' => '@ignored',
            'createdAt' => '@ignored',
            'createdBy' => '@ignored',
            'emergency' => true,