csfixes

phpstan-deprecations.neon

@@ -105,6 +105,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\ListActivity\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+
 		-
 			message:
 				"""
@@ -132,6 +141,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityDateFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+
 		-
 			message:
 				"""
@@ -177,6 +195,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\PersonHavingActivityBetweenDateFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+
 		-
 			message:
 				"""
@@ -186,6 +213,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Menu\\\\PersonMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -222,6 +258,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AsideActivityBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -231,6 +276,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\AbstractElementController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+
 		-
 			message:
 				"""
@@ -240,6 +294,24 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\ElementController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -249,6 +321,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\CalendarBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -318,6 +399,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\CustomFieldsBundle\\\\Form\\\\CustomFieldsGroupType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
+
 		-
 			message:
 				"""
@@ -327,6 +417,15 @@ parameters:
 			count: 6
 			path: src/Bundle/ChillEventBundle/Controller/EventController.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Controller\\\\EventController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
 		-
 			message:
 				"""
@@ -345,6 +444,42 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickEventType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickRoleType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickStatusType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Menu\\\\PersonMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -354,6 +489,24 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Controller\\\\FamilyMemberController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -363,6 +516,24 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
 
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
 		-
 			message:
 				"""
@@ -372,6 +543,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
 
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getTranslator\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
 		-
 			message:
 				"""
@@ -390,6 +570,24 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Controller\\\\PasswordController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
 		-
 			message:
 				"""
@@ -462,6 +660,42 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVPivotedListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadsheetListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+
 		-
 			message:
 				"""
@@ -480,6 +714,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\PostalCodeType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
+
 		-
 			message:
 				"""
@@ -503,11 +746,38 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/UserType.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Notification\\\\Mailer\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Notification/Mailer.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 2
 			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Routing\\\\MenuBuilder\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Routing\\\\MenuComposer\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+
 		-
 			message:
 				"""
@@ -594,6 +864,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Validation\\\\Validator\\\\RoleScopeScopePresence\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
+
 		-
 			message:
 				"""
@@ -639,6 +918,33 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdMemberController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
 		-
 			message:
 				"""
@@ -648,6 +954,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
 		-
 			message: "#^Access to deprecated property \\$proxyAccompanyingPeriodOpenState of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\.$#"
 			count: 2
@@ -662,6 +977,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\CountryOfBirthAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+
 		-
 			message:
 				"""
@@ -671,6 +995,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\GenderAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
+
 		-
 			message:
 				"""
@@ -680,6 +1013,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\NationalityAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+
 		-
 			message:
 				"""
@@ -716,6 +1058,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPerson\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
 		-
 			message:
 				"""
@@ -743,6 +1094,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPersonDuplicate\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+
 		-
 			message:
 				"""
@@ -788,6 +1148,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\GenderFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
+
 		-
 			message:
 				"""
@@ -829,6 +1198,24 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Form\\\\Type\\\\PickPersonType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Menu\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -892,6 +1279,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportList\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
 		-
 			message:
 				"""
@@ -901,6 +1297,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportListProvider\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
+
 		-
 			message:
 				"""
@@ -982,6 +1387,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Controller\\\\TaskController\\:\\:applyTransitionAction\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
+
 		-
 			message:
 				"""
@@ -1027,6 +1441,33 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\MenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -1063,6 +1504,33 @@ parameters:
 			count: 3
 			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
 
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Controller\\\\ThirdPartyController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Form\\\\Type\\\\PickThirdPartyType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Menu\\\\MenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
+
 		-
 			message:
 				"""

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

@@ -24,9 +24,9 @@ use Doctrine\ORM\Query;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function count;

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

@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class ActivityDateFilter implements FilterInterface
 {

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

@@ -29,8 +29,8 @@ use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -19,15 +19,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,

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

@@ -20,25 +20,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    public $authorizationChecker;
+    public AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var CountNotificationTask
-     */
-    public $counter;
+    public CountNotificationTask $counter;
 
-    /**
-     * @var TokenStorageInterface
-     */
-    public $tokenStorage;
+    public TokenStorageInterface $tokenStorage;
 
-    /**
-     * @var TranslatorInterface
-     */
-    public $translator;
+    public TranslatorInterface $translator;
 
     public function __construct(
         CountNotificationTask $counter,

src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php

@@ -20,7 +20,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function get_class;
 

src/Bundle/ChillBudgetBundle/Controller/ElementController.php

@@ -21,7 +21,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_merge;
 use function count;

src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php

@@ -15,7 +15,7 @@ use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {

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

@@ -2,6 +2,6 @@ services:
     Chill\AMLI\BudgetBundle\Menu\UserMenuBuilder:
         arguments:
             $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
         tags:
             - { name: 'chill.menu_builder' }

src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -14,14 +14,18 @@ namespace Chill\CalendarBundle\Menu;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
     protected AuthorizationHelper $authorizationHelper;
 
+    protected Security $security;
+
     protected TokenStorageInterface $tokenStorage;
 
     protected TranslatorInterface $translator;
@@ -29,11 +33,13 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
     public function __construct(
         TokenStorageInterface $tokenStorage,
         AuthorizationHelper $authorizationHelper,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
+        Security $security
     ) {
         $this->translator = $translator;
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
@@ -41,12 +47,14 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         $period = $parameters['accompanyingCourse'];
 
         if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) {
-            $menu->addChild($this->translator->trans('Calendar'), [
-                'route' => 'chill_calendar_calendar_list',
-                'routeParameters' => [
-                    'accompanying_period_id' => $period->getId(),
-                ], ])
-                ->setExtras(['order' => 35]);
+            if ($this->security->isGranted(AccompanyingPeriodVoter::SEE, $period)) {
+                $menu->addChild($this->translator->trans('Calendar'), [
+                    'route' => 'chill_calendar_calendar_list',
+                    'routeParameters' => [
+                        'accompanying_period_id' => $period->getId(),
+                    ], ])
+                    ->setExtras(['order' => 35]);
+            }
         }
     }
 

src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php

@@ -16,7 +16,7 @@ use Chill\TaskBundle\Templating\UI\CountNotificationTask;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {

src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php

@@ -19,7 +19,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function count;
 

src/Bundle/ChillEventBundle/Controller/EventController.php

@@ -38,7 +38,7 @@ use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function count;
 

src/Bundle/ChillEventBundle/Form/Type/PickEventType.php

@@ -28,7 +28,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function in_array;
 use function is_array;

src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php

@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Allow to pick a choice amongst different choices.

src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php

@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Allow to pick amongst type.

src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php

@@ -15,7 +15,7 @@ use Chill\EventBundle\Security\Authorization\EventVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {

src/Bundle/ChillEventBundle/config/services/controller.yaml

@@ -5,7 +5,7 @@ services:
             $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
             $formFactoryInterface: '@Symfony\Component\Form\FormFactoryInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $paginator: '@chill_main.paginator_factory'
         public: true
         tags: ['controller.service_arguments']

src/Bundle/ChillEventBundle/config/services/forms.yaml

@@ -44,6 +44,6 @@ services:
             $tokenStorage: "@security.token_storage"
             $authorizationHelper: "@chill.main.security.authorization.helper"
             $urlGenerator: '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
         tags:
             - { name: form.type }

src/Bundle/ChillEventBundle/config/services/menu.yaml

@@ -2,6 +2,6 @@ services:
     Chill\EventBundle\Menu\PersonMenuBuilder:
         arguments:
             $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
         tags:
             - { name: 'chill.menu_builder' }

src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php

@@ -24,7 +24,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class FamilyMemberController extends AbstractController
 {

src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php

@@ -19,15 +19,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,

src/Bundle/ChillFamilyMembersBundle/Resources/config/services/menu.yml

@@ -2,6 +2,6 @@ services:
     Chill\AMLI\FamilyMembersBundle\Menu\UserMenuBuilder:
         arguments:
             $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
         tags:
             - { name: 'chill.menu_builder' }

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

@@ -20,8 +20,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_merge;
 

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

@@ -27,7 +27,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_merge;

src/Bundle/ChillMainBundle/Controller/ExportController.php

@@ -24,7 +24,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function count;
 use function serialize;

src/Bundle/ChillMainBundle/Controller/PasswordController.php

@@ -27,9 +27,9 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class PasswordController.

src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php

@@ -18,7 +18,7 @@ use OutOfBoundsException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_keys;

src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php

@@ -17,7 +17,7 @@ use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_map;
 use function count;

src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php

@@ -19,7 +19,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_map;
 use function array_merge;

src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php

@@ -23,7 +23,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_keys;

src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php

@@ -20,7 +20,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * A form to pick between PostalCode.

src/Bundle/ChillMainBundle/Notification/Mailer.php

@@ -16,7 +16,7 @@ use Psr\Log\LoggerInterface;
 use Swift_Mailer;
 use Swift_Message;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 use Twig\Environment;
 
 use function call_user_func;

src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php

@@ -12,11 +12,23 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Routing\MenuBuilder;
 
 use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 class LocationMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
+    private AuthorizationCheckerInterface $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
         $menu->addChild('Location type list', [
             'route' => 'chill_crud_main_location_type_index',
         ])->setExtras(['order' => 205]);

src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php

@@ -12,11 +12,23 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Routing\MenuBuilder;
 
 use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 class PermissionMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
+    private AuthorizationCheckerInterface $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
         $menu->addChild('Permissions group list', [
             'route' => 'admin_permissionsgroup',
         ])->setExtras([

src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php

@@ -22,15 +22,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     /**
      * SectionMenuBuilder constructor.
@@ -46,22 +40,24 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        $menu->addChild($this->translator->trans('Homepage'), [
-            'route' => 'chill_main_homepage',
-        ])
-            ->setExtras([
-                'icons' => ['home'],
-                'order' => 0,
-            ]);
+        if (!$this->authorizationChecker->isGranted('ROLE_USER')) {
+            $menu->addChild($this->translator->trans('Homepage'), [
+                'route' => 'chill_main_homepage',
+            ])
+                ->setExtras([
+                    'icons' => ['home'],
+                    'order' => 0,
+                ]);
 
-        $menu->addChild($this->translator->trans('Global timeline'), [
-            'route' => 'chill_center_timeline',
-        ])
-            ->setExtras(
-                [
-                    'order' => 10,
-                ]
-            );
+            $menu->addChild($this->translator->trans('Global timeline'), [
+                'route' => 'chill_center_timeline',
+            ])
+                ->setExtras(
+                    [
+                        'order' => 10,
+                    ]
+                );
+        }
 
         if ($this->authorizationChecker->isGranted(ChillExportVoter::EXPORT)) {
             $menu->addChild($this->translator->trans('Export Menu'), [

src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php

@@ -15,11 +15,14 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Notification\Counter\NotificationByUserCounter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Workflow\Counter\WorkflowByUserCounter;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
+    private AuthorizationCheckerInterface $authorizationChecker;
+
     private NotificationByUserCounter $notificationByUserCounter;
 
     private Security $security;
@@ -32,16 +35,22 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         NotificationByUserCounter $notificationByUserCounter,
         WorkflowByUserCounter $workflowByUserCounter,
         Security $security,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
+        AuthorizationCheckerInterface $authorizationChecker
     ) {
         $this->notificationByUserCounter = $notificationByUserCounter;
         $this->workflowByUserCounter = $workflowByUserCounter;
         $this->security = $security;
         $this->translator = $translator;
+        $this->authorizationChecker = $authorizationChecker;
     }
 
     public function buildMenu($menuId, \Knp\Menu\MenuItem $menu, array $parameters)
     {
+        if (!$this->authorizationChecker->isGranted('ROLE_USER')) {
+            return;
+        }
+
         $user = $this->security->getUser();
 
         if ($user instanceof User) {

src/Bundle/ChillMainBundle/Routing/MenuComposer.php

@@ -15,7 +15,7 @@ use Knp\Menu\FactoryInterface;
 use Knp\Menu\ItemInterface;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_merge;

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

@@ -16,10 +16,9 @@ use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Validation\Constraint\RoleScopeScopePresenceConstraint;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
 use function in_array;
 
 class RoleScopeScopePresence extends ConstraintValidator

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

@@ -19,7 +19,7 @@ services:
     chill.main.export.spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadSheetFormatter
         arguments:
-            $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Component\Translation\TranslatorInterface'
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadsheet' }
@@ -27,7 +27,7 @@ services:
     chill.main.export.list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVListFormatter
         arguments:
-            $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Component\Translation\TranslatorInterface'
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csvlist' }
@@ -35,7 +35,7 @@ services:
     chill.main.export.list_spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadsheetListFormatter
         arguments:
-            $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Component\Translation\TranslatorInterface'
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadlist' }
@@ -43,7 +43,7 @@ services:
     chill.main.export.pivoted_list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVPivotedListFormatter
         arguments:
-            $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Component\Translation\TranslatorInterface'
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csv_pivoted_list' }

src/Bundle/ChillMainBundle/config/services/form.yaml

@@ -59,7 +59,7 @@ services:
             - "@chill.main.helper.translatable_string"
             - '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
             - '@Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader'
-            - '@Symfony\Contracts\Translation\TranslatorInterface'
+            - '@Symfony\Component\Translation\TranslatorInterface'
         tags:
             - { name: form.type }
 

src/Bundle/ChillMainBundle/config/services/menu.yaml

@@ -15,7 +15,7 @@ services:
     Chill\MainBundle\Routing\MenuBuilder\SectionMenuBuilder:
         arguments:
             $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
         tags:
             - { name: 'chill.menu_builder' }
 

src/Bundle/ChillMainBundle/config/services/notification.yaml

@@ -10,7 +10,7 @@ services:
             $mailer: '@swiftmailer.mailer.default'
             # $mailerTransporter: '@swiftmailer.transport'
             $router: '@Symfony\Component\Routing\RouterInterface'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $routeParameters: '%chill_main.notifications%'
 
     Chill\MainBundle\Notification\NotificationHandlerManager:

src/Bundle/ChillMainBundle/config/services/routing.yaml

@@ -8,7 +8,7 @@ services:
         arguments:
             - '@Symfony\Component\Routing\RouterInterface'
             - '@Knp\Menu\FactoryInterface'
-            - '@Symfony\Contracts\Translation\TranslatorInterface'
+            - '@Symfony\Component\Translation\TranslatorInterface'
     Chill\MainBundle\Routing\MenuComposer: '@chill.main.menu_composer'
 
     chill.main.routes_loader:

src/Bundle/ChillPersonBundle/Controller/HouseholdController.php

@@ -24,7 +24,7 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function count;

src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php

@@ -19,6 +19,7 @@ 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\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
@@ -56,7 +57,7 @@ class HouseholdMemberController extends ApiController
      */
     public function editMembership(Request $request, HouseholdMember $member): Response
     {
-        // TODO ACL
+        $this->denyAccessUnlessGranted(HouseholdVoter::EDIT, $member);
 
         $form = $this->createForm(HouseholdMemberType::class, $member, [
             'validation_groups' => ['household_memberships'],

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -30,8 +30,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 use function hash;

src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php

@@ -28,7 +28,7 @@ use http\Exception\InvalidArgumentException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function count;
 

src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php

@@ -20,8 +20,8 @@ use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class CountryOfBirthAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {

src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php

@@ -17,7 +17,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 final class GenderAggregator implements AggregatorInterface
 {

src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php

@@ -20,8 +20,8 @@ use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class NationalityAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {

src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php

@@ -29,9 +29,9 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function addcslashes;
 use function array_key_exists;

src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php

@@ -24,8 +24,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Render a list of duplicate peoples.
@@ -67,7 +67,7 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
         $this->translator = $translator;
         $this->router = $router;
         $this->baseUrl = $routeParameters['scheme'] .
-            '://' . $routeParameters['host'];
+          '://' . $routeParameters['host'];
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php

@@ -18,8 +18,8 @@ use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_filter;
 use function count;

src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php

@@ -27,7 +27,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function in_array;
 use function is_array;

src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -29,10 +29,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 
     protected Security $security;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     public function __construct(TranslatorInterface $translator, Registry $registry, Security $security)
     {
@@ -46,12 +43,14 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         /** @var AccompanyingPeriod $period */
         $period = $parameters['accompanyingCourse'];
 
-        $menu->addChild($this->translator->trans('Resume Accompanying Course'), [
-            'route' => 'chill_person_accompanying_course_index',
-            'routeParameters' => [
-                'accompanying_period_id' => $period->getId(),
-            ], ])
-            ->setExtras(['order' => 10]);
+        if ($this->security->isGranted(AccompanyingPeriodVoter::SEE, $period)) {
+            $menu->addChild($this->translator->trans('Resume Accompanying Course'), [
+                'route' => 'chill_person_accompanying_course_index',
+                'routeParameters' => [
+                    'accompanying_period_id' => $period->getId(),
+                ], ])
+                ->setExtras(['order' => 10]);
+        }
 
         if ($this->security->isGranted(AccompanyingPeriodVoter::EDIT, $period)) {
             $menu->addChild($this->translator->trans('Edit Accompanying Course'), [
@@ -94,22 +93,24 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 
         $workflow = $this->registry->get($period, 'accompanying_period_lifecycle');
 
-        if (null !== $period->getClosingDate()) {
-            $menu->addChild($this->translator->trans('Re-open accompanying course'), [
-                'route' => 'chill_person_accompanying_course_reopen',
-                'routeParameters' => [
-                    'accompanying_period_id' => $period->getId(),
-                ], ])
-                ->setExtras(['order' => 99998]);
-        }
+        if ($this->security->isGranted(AccompanyingPeriodVoter::EDIT, $period)) {
+            if (null !== $period->getClosingDate()) {
+                $menu->addChild($this->translator->trans('Re-open accompanying course'), [
+                    'route' => 'chill_person_accompanying_course_reopen',
+                    'routeParameters' => [
+                        'accompanying_period_id' => $period->getId(),
+                    ], ])
+                    ->setExtras(['order' => 99998]);
+            }
 
-        if ($workflow->can($period, 'close')) {
-            $menu->addChild($this->translator->trans('Close Accompanying Course'), [
-                'route' => 'chill_person_accompanying_course_close',
-                'routeParameters' => [
-                    'accompanying_period_id' => $period->getId(),
-                ], ])
-                ->setExtras(['order' => 99999]);
+            if ($workflow->can($period, 'close')) {
+                $menu->addChild($this->translator->trans('Close Accompanying Course'), [
+                    'route' => 'chill_person_accompanying_course_close',
+                    'routeParameters' => [
+                        'accompanying_period_id' => $period->getId(),
+                    ], ])
+                    ->setExtras(['order' => 99999]);
+            }
         }
     }
 

src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php

@@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HouseholdMenuBuilder implements LocalMenuBuilderInterface
@@ -22,9 +24,12 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $translator;
 
-    public function __construct(TranslatorInterface $translator)
+    private $security;
+
+    public function __construct(TranslatorInterface $translator, Security $security)
     {
         $this->translator = $translator;
+        $this->security = $security;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
@@ -32,40 +37,46 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
         /** @var \Chill\PersonBundle\Entity\Household\Household $household */
         $household = $parameters['household'];
 
-        $menu->addChild($this->translator->trans('household.Household summary'), [
-            'route' => 'chill_person_household_summary',
-            'routeParameters' => [
-                'household_id' => $household->getId(),
-            ], ])
-            ->setExtras(['order' => 10]);
+        if ($this->security->isGranted(HouseholdVoter::SEE, $household)) {
+            $menu->addChild($this->translator->trans('household.Household summary'), [
+                'route' => 'chill_person_household_summary',
+                'routeParameters' => [
+                    'household_id' => $household->getId(),
+                ], ])
+                ->setExtras(['order' => 10]);
 
-        $menu->addChild($this->translator->trans('household.Relationship'), [
-            'route' => 'chill_person_household_relationship',
-            'routeParameters' => [
-                'household_id' => $household->getId(),
-            ], ])
-            ->setExtras(['order' => 15]);
+            $menu->addChild($this->translator->trans('household.Relationship'), [
+                'route' => 'chill_person_household_relationship',
+                'routeParameters' => [
+                    'household_id' => $household->getId(),
+                ], ])
+                ->setExtras(['order' => 15]);
+        }
 
-        $menu->addChild($this->translator->trans('household_composition.Compositions'), [
-            'route' => 'chill_person_household_composition_index',
-            'routeParameters' => [
-                'id' => $household->getId(),
-            ], ])
-            ->setExtras(['order' => 17]);
+        if ($this->security->isGranted(HouseholdVoter::EDIT, $household)) {
+            $menu->addChild($this->translator->trans('household_composition.Compositions'), [
+                'route' => 'chill_person_household_composition_index',
+                'routeParameters' => [
+                    'id' => $household->getId(),
+                ], ])
+                ->setExtras(['order' => 17]);
+        }
 
-        $menu->addChild($this->translator->trans('household.Accompanying period'), [
-            'route' => 'chill_person_household_accompanying_period',
-            'routeParameters' => [
-                'household_id' => $household->getId(),
-            ], ])
-            ->setExtras(['order' => 20]);
+        if ($this->security->isGranted(HouseholdVoter::SEE, $household)) {
+            $menu->addChild($this->translator->trans('household.Accompanying period'), [
+                'route' => 'chill_person_household_accompanying_period',
+                'routeParameters' => [
+                    'household_id' => $household->getId(),
+                ], ])
+                ->setExtras(['order' => 20]);
 
-        $menu->addChild($this->translator->trans('household.Addresses'), [
-            'route' => 'chill_person_household_addresses',
-            'routeParameters' => [
-                'household_id' => $household->getId(),
-            ], ])
-            ->setExtras(['order' => 30]);
+            $menu->addChild($this->translator->trans('household.Addresses'), [
+                'route' => 'chill_person_household_addresses',
+                'routeParameters' => [
+                    'household_id' => $household->getId(),
+                ], ])
+                ->setExtras(['order' => 30]);
+        }
     }
 
     public static function getMenuIds(): array

src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
@@ -33,10 +34,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $showAccompanyingPeriod;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     private Security $security;
 
@@ -52,45 +50,46 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        $menu->addChild($this->translator->trans('Person details'), [
-            'route' => 'chill_person_view',
-            'routeParameters' => [
-                'person_id' => $parameters['person']->getId(),
-            ],
-        ])
-            ->setExtras([
-                'order' => 50,
-            ]);
+        if ($this->security->isGranted(PersonVoter::SEE, $parameters['person'])) {
+            $menu->addChild($this->translator->trans('Person details'), [
+                'route' => 'chill_person_view',
+                'routeParameters' => [
+                    'person_id' => $parameters['person']->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 50,
+                ]);
+            $menu->addChild($this->translator->trans('Residential addresses'), [
+                'route' => 'chill_person_residential_address_list',
+                'routeParameters' => [
+                    'id' => $parameters['person']->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 60,
+                ]);
 
-        $menu->addChild($this->translator->trans('Residential addresses'), [
-            'route' => 'chill_person_residential_address_list',
-            'routeParameters' => [
-                'id' => $parameters['person']->getId(),
-            ],
-        ])
-            ->setExtras([
-                'order' => 60,
-            ]);
+            $menu->addChild($this->translator->trans('household.person history'), [
+                'route' => 'chill_person_household_person_history',
+                'routeParameters' => [
+                    'person_id' => $parameters['person']->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 99999,
+                ]);
 
-        $menu->addChild($this->translator->trans('household.person history'), [
-            'route' => 'chill_person_household_person_history',
-            'routeParameters' => [
-                'person_id' => $parameters['person']->getId(),
-            ],
-        ])
-            ->setExtras([
-                'order' => 99999,
-            ]);
-
-        $menu->addChild($this->translator->trans('Person duplicate'), [
-            'route' => 'chill_person_duplicate_view',
-            'routeParameters' => [
-                'person_id' => $parameters['person']->getId(),
-            ],
-        ])
-            ->setExtras([
-                'order' => 99999,
-            ]);
+            $menu->addChild($this->translator->trans('Person duplicate'), [
+                'route' => 'chill_person_duplicate_view',
+                'routeParameters' => [
+                    'person_id' => $parameters['person']->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 99999,
+                ]);
+        }
 
         if (
             'visible' === $this->showAccompanyingPeriod
@@ -107,15 +106,17 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
                 ]);
         }
 
-        $menu->addChild($this->translator->trans('person_resources_menu'), [
-            'route' => 'chill_person_resource_list',
-            'routeParameters' => [
-                'person_id' => $parameters['person']->getId(),
-            ],
-        ])
-            ->setExtras([
-                'order' => 99999,
-            ]);
+        if ($this->security->isGranted(PersonVoter::SEE, $parameters['person'])) {
+            $menu->addChild($this->translator->trans('person_resources_menu'), [
+                'route' => 'chill_person_resource_list',
+                'routeParameters' => [
+                    'person_id' => $parameters['person']->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 99999,
+                ]);
+        }
     }
 
     public static function getMenuIds(): array

src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php

@@ -12,10 +12,11 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Class SectionMenuBuilder.
@@ -56,13 +57,15 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 ]);
         }
 
-        $menu->addChild($this->translator->trans('Create an accompanying course'), [
-            'route' => 'chill_person_accompanying_course_new',
-        ])
-            ->setExtras([
-                'order' => 11,
-                'icons' => ['plus'],
-            ]);
+        if ($this->authorizationChecker->isGranted(AccompanyingPeriodVoter::CREATE)) {
+            $menu->addChild($this->translator->trans('Create an accompanying course'), [
+                'route' => 'chill_person_accompanying_course_new',
+            ])
+                ->setExtras([
+                    'order' => 11,
+                    'icons' => ['plus'],
+                ]);
+        }
     }
 
     public static function getMenuIds(): array

src/Bundle/ChillPersonBundle/config/services/controller.yaml

@@ -25,7 +25,7 @@ services:
     Chill\PersonBundle\Controller\PersonDuplicateController:
         arguments:
             $similarPersonMatcher: '@Chill\PersonBundle\Search\SimilarPersonMatcher'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $personRepository: '@Chill\PersonBundle\Repository\PersonRepository'
             $personMove: '@Chill\PersonBundle\Actions\Remove\PersonMove'
             $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'

src/Bundle/ChillPersonBundle/config/services/fixtures.yaml

@@ -8,5 +8,5 @@ services:
     Chill\PersonBundle\DataFixtures\ORM\LoadCustomFields:
         arguments:
             $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
         tags: [ 'doctrine.fixture.orm' ]

src/Bundle/ChillReportBundle/Export/Export/ReportList.php

@@ -34,9 +34,9 @@ use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_key_exists;
 use function array_keys;

src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php

@@ -17,7 +17,7 @@ use Chill\MainBundle\Export\ExportElementsProviderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ReportBundle\Entity\Report;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class ReportListProvider implements ExportElementsProviderInterface
 {

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

@@ -3,7 +3,7 @@ services:
         arguments:
             $em: '@Doctrine\ORM\EntityManagerInterface'
             $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $customFieldProvider: '@Chill\CustomFieldsBundle\Service\CustomFieldProvider'
         tags:
             - { name: chill.export_elements_provider, prefix: 'report' }

src/Bundle/ChillTaskBundle/Controller/TaskController.php

@@ -22,9 +22,9 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function array_filter;
 use function array_values;

src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php

@@ -20,15 +20,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class MenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,

src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php

@@ -19,15 +19,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    public $authorizationChecker;
+    public AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    public $translator;
+    public TranslatorInterface $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,

src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php

@@ -21,25 +21,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    public $authorizationChecker;
+    public AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var CountNotificationTask
-     */
-    public $counter;
+    public CountNotificationTask $counter;
 
-    /**
-     * @var TokenStorageInterface
-     */
-    public $tokenStorage;
+    public TokenStorageInterface $tokenStorage;
 
-    /**
-     * @var TranslatorInterface
-     */
-    public $translator;
+    public TranslatorInterface $translator;
 
     public function __construct(
         CountNotificationTask $counter,

src/Bundle/ChillTaskBundle/config/services/menu.yaml

@@ -3,7 +3,7 @@ services:
     arguments:
       $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
       $counter: '@Chill\TaskBundle\Templating\UI\CountNotificationTask'
-      $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+      $translator: '@Symfony\Component\Translation\TranslatorInterface'
       $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
     tags:
       - { name: "chill.menu_builder" }
@@ -17,6 +17,6 @@ services:
   Chill\TaskBundle\Menu\SectionMenuBuilder:
     arguments:
       $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-      $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+      $translator: '@Symfony\Component\Translation\TranslatorInterface'
     tags:
       - { name: "chill.menu_builder" }

src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php

@@ -25,7 +25,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_merge;
 

src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php

@@ -22,7 +22,7 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function array_diff;
 use function array_merge;

src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php

@@ -22,15 +22,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class MenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;
 
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,

src/Bundle/ChillThirdPartyBundle/config/services/menu.yaml

@@ -1,7 +1,7 @@
 services:
     Chill\ThirdPartyBundle\Menu\MenuBuilder:
         arguments:
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+            $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
         tags:
             - { name: 'chill.menu_builder' }