Rights added to links in twig templates

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

@@ -15,7 +15,7 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 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/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -109,9 +109,11 @@
             {{ 'Cancel'|trans }}
         </a>
     </li>
-    <li>
-        <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
-    </li>
+    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
+        <li>
+            <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+        </li>
+    {% endif %}
 </ul>
 
 {{ form_end(edit_form) }}

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

@@ -35,7 +35,7 @@
     <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}) }}"
-               class="btn btn-create">{{ 'Create'|trans }}
+            class="btn btn-create">{{ 'Create'|trans }}
             </a>
         </li>
     </ul>

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

@@ -47,13 +47,13 @@
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': '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}) }}"
-               class="btn btn-create" tabindex="-1" role="button" aria-disabled="true">{{ 'Create'|trans }}
-            </a>
-        </li>
-    </ul>
+        <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}) }}"
+                class="btn btn-create" tabindex="-1" role="button" aria-disabled="true">{{ 'Create'|trans }}
+                </a>
+            </li>
+        </ul>
     {% endif %}
 
 {% endblock %}

src/Bundle/ChillAsideActivityBundle/src/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/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/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/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig

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

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

@@ -25,9 +25,11 @@
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
-		<li class="edit">
-			<button class="btn btn-edit">{{ 'Edit'|trans }}</button>
-		</li>
+		{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+			<li class="edit">
+				<button class="btn btn-edit">{{ 'Edit'|trans }}</button>
+			</li>
+		{% endif %}
 	</ul>
 
 	{{ form_end(form) }}

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

@@ -60,7 +60,7 @@
         {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
             <li>
                 <a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}"
-                   class="btn btn-edit" title="{{ 'Edit attributes' | trans }}"></a>
+                class="btn btn-edit" title="{{ 'Edit attributes' | trans }}"></a>
             </li>
         {% endif %}
         {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}

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

@@ -42,9 +42,11 @@
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
-        <li class="edit">
-            <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
-        </li>
+        {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
+            <li class="edit">
+                <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
+            </li>
+        {% endif %}
         {# {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
             <li class="delete">
                 {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }}

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

@@ -46,9 +46,11 @@
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
-		<li class="create">
-			<button class="btn btn-create">{{ 'Create'|trans }}</button>
-		</li>
+		{% if is_granted ('CHILL_PERSON_DOCUMENT_CREATE', person) %}
+			<li class="create">
+				<button class="btn btn-create">{{ 'Create'|trans }}</button>
+			</li>
+		{% endif %}
 	</ul>
 	{{ form_end(form) }}
 {% endblock %}

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

@@ -15,7 +15,7 @@ use Chill\AMLI\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
 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/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/SectionMenuBuilder.php

@@ -15,7 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Class SectionMenuBuilder.

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

@@ -26,7 +26,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\Exception;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function count;
 

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

@@ -30,7 +30,7 @@ class UserAccompanyingPeriodController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/person/accompanying-periods/my", name="chill_person_accompanying_period_user")
+     * @Route("/{_locale}/accompanying-periods", name="chill_person_accompanying_period_user")
      */
     public function listAction(Request $request)
     {
@@ -50,7 +50,7 @@ class UserAccompanyingPeriodController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/person/accompanying-periods/my/drafts", name="chill_person_accompanying_period_draft_user")
+     * @Route("/{_locale}/accompanying-periods/drafts", name="chill_person_accompanying_period_draft_user")
      */
     public function listDraftsAction(Request $request)
     {

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

@@ -15,7 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 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.

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php

@@ -71,7 +71,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb = $this->buildQueryByRecentUserHistory($user, $since);
 
         return $qb->select('a')
-            ->addOrderBy('userHistory.startDate', 'DESC')
+            ->distinct(true)
             ->getQuery()
             ->setMaxResults($limit)
             ->setFirstResult($offset)
@@ -95,7 +95,6 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb
             ->join('a.userHistories', 'userHistory')
             ->where($qb->expr()->eq('a.user', ':user'))
-            ->andWhere($qb->expr()->neq('a.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
             ->andWhere($qb->expr()->gte('userHistory.startDate', ':since'))
             ->andWhere($qb->expr()->isNull('userHistory.endDate'))
             ->setParameter('user', $user)

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig

@@ -46,7 +46,9 @@
                 {% if type == 'new' %}
                     <button class="btn btn-create" type="submit">{{ 'Post a new comment'|trans }}</button>
                 {% elseif type == 'edit' %}
-                    <button class="btn btn-save" type="submit">{{ 'Save'|trans }}</button>
+                    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_COMMENT_EDIT', comment) %}
+                        <button class="btn btn-save" type="submit">{{ 'Save'|trans }}</button>
+                    {% endif %}
                 {% endif %}
                 </li>
             </ul>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig

@@ -4,13 +4,13 @@
             <ul class="record_actions">
                 <li>
                     <a class="btn btn-sm btn-update change-icon"
-                       href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-10' }) }}">
+                        href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-10' }) }}">
                         <i class="fa fa-fw fa-crosshairs"></i>
                         {{ 'fix it'|trans }}
                     </a>
                 </li>
             </ul>
         </div>
-        {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}
+        {{ 'Some people currently do not belong to any household. Add them to a household soon'|trans }}
     </div></div>
 </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig

@@ -7,7 +7,7 @@
                 <ul class="record_actions">
                     <li>
                         <a class="btn btn-sm btn-update change-icon"
-                           href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-20' }) }}">
+                            href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-20' }) }}">
                             <i class="fa fa-fw fa-crosshairs"></i>
                             {{ 'fix it'|trans }}
                         </a>
@@ -15,10 +15,10 @@
                 </ul>
             </div>
                 <p>
-            {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}</p>
+            {{ 'This course is located at a temporary address. You should link this course to a user'|trans }}</p>
             {% if not hasPersonLocation %}
                 <p>
-                {{ 'Associate at least one member with an household, and set an address to this household'|trans }}</p>
+                {{ 'Associate at least one member with a household, and set an address to this household'|trans }}</p>
             {% endif %}
         </div>
     </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/close.html.twig

@@ -21,9 +21,11 @@
                     {{ 'Return'|trans }}
                 </a>
             </li>
-            <li>
-                <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
-            </li>
+            {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', accompanyingCourse) %}
+                <li>
+                    <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+                </li>
+            {% endif %}
         </ul>
 
     {{ form_end(form) }}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/re_open.html.twig

@@ -20,6 +20,7 @@
                     {{ 'Return'|trans }}
                 </a>
             </li>
+            {# TODO: add a right here? Use 'CHILL_ACCOMPANYING_PERIOD_CREATE'? #}
             <li>
                 <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
             </li>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig

@@ -101,25 +101,27 @@
             {% if notif_counter.total > 0 %}
                 {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', w.id) }}
             {% endif %}
-            
+
             {% import '@ChillPerson/Macro/updatedBy.html.twig' as macro %}
             {{ macro.updatedBy(w) }}
         </div>
-            
+
         {% if displayAction is defined and displayAction == true %}
             <div class="item-col">
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
                 <ul class="record_actions">
-                    <li>
-                        <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
-                           href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
-                        ></a>
-                    </li>
+                        <li>
+                            <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
+                                href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
+                            ></a>
+                        </li>
                     <li>
                         <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
-                           href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
+                            href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
                         ></a>
                     </li>
                 </ul>
+                {% endif %}
             </div>
         {% endif %}
     </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig

@@ -9,10 +9,12 @@
 
         {% if works|length == 0 %}
             <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}
-                <a class="btn btn-sm btn-create"
-                    title="{{ 'accompanying_course_work.create'|trans }}"
-                    href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
-                ></a>
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE', accompanyingCourse) %}
+                    <a class="btn btn-sm btn-create"
+                        title="{{ 'accompanying_course_work.create'|trans }}"
+                        href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
+                    ></a>
+                {% endif %}
             </p>
 
         {% else %}
@@ -26,12 +28,14 @@
         {{ chill_pagination(paginator) }}
 
         <ul class="record_actions sticky-form-buttons">
-            <li>
-                <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
-                   class="btn btn-new">
-                    {{ 'accompanying_course_work.create'|trans }}
-                </a>
-            </li>
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE', accompanyingCourse) %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
+                        class="btn btn-new">
+                        {{ 'accompanying_course_work.create'|trans }}
+                    </a>
+                </li>
+            {% endif %}
         </ul>
 
     </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig

@@ -5,17 +5,21 @@
 
 {% macro recordAction(period, contextEntity) %}
     {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
-    <li>
-        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
-           class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
-    </li>
-    {% if period.step == 'DRAFT' and contextEntity.type == 'person' %}
-        {% set person = contextEntity.entity %}
+    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS', period) %}
         <li>
-            <a href="{{ path('chill_person_accompanying_course_delete', { 'accompanying_period_id': period.id, 'person_id' : person.id }) }}"
-               class="btn btn-delete" title="{{ 'Delete accompanying period'|trans }}">{# {{ 'Delete this period'|trans }} #}</a>
+            <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
+            class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
         </li>
     {% endif %}
+    {% if period.step == 'DRAFT' and contextEntity.type == 'person' %}
+        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE', period) %}
+            {% set person = contextEntity.entity %}
+            <li>
+                <a href="{{ path('chill_person_accompanying_course_delete', { 'accompanying_period_id': period.id, 'person_id' : person.id }) }}"
+                class="btn btn-delete" title="{{ 'Delete accompanying period'|trans }}">{# {{ 'Delete this period'|trans }} #}</a>
+            </li>
+        {% endif %}
+    {% endif %}
 
     {# DISABLED if new accompanying course, this is not necessary
     {% if person is defined %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig

@@ -50,7 +50,7 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-    <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id } ) }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+        <a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id } ) }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
     </li>
     <li>
     <button type="submit" class="btn btn-save">

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig

@@ -12,18 +12,22 @@
     {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
 
     <ul class="record_actions sticky-form-buttons">
-        <li class="cancel">
-            <a href="{{ path ('chill_person_view', {'person_id' : person.id } ) }}"
-               class="btn btn-cancel">{{ 'Person details'|trans }}
-            </a>
-        </li>
-        <li>
-            <a class="btn btn-create"
-               href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button">
-                {{ 'Create an accompanying period'|trans }}
-            </a>
-        </li>
+        {% if is_granted('CHILL_PERSON_SEE', person) %}
+            <li class="cancel">
+                <a href="{{ path ('chill_person_view', {'person_id' : person.id } ) }}"
+                class="btn btn-cancel">{{ 'Person details'|trans }}
+                </a>
+            </li>
+        {% endif %}
+        {# TODO: which right to add here? #}
+            <li>
+                <a class="btn btn-create"
+                href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button">
+                    {{ 'Create an accompanying period'|trans }}
+                </a>
+            </li>
 
+        {# TODO: should this commented section be deleted? #}
         {#  Disabled dropdown
         <li class="dropdown">
             <a class="btn btn-create change-icon dropdown-toggle"

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig

@@ -16,6 +16,7 @@
                 {{ 'Cancel'|trans }}
             </a>
         </li>
+        {# TODO: add a right here? Use 'CHILL_ACCOMPANYING_PERIOD_CREATE'? #}
         <li>
             <a href="{{ path('chill_person_accompanying_period_re_open', {'confirm' : true, 'person_id' : person.id, 'period_id' : period.id } ) }}" class="btn btn-create">
                 {{'Confirm'|trans }}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_draft_periods_list.html.twig

@@ -5,10 +5,12 @@
 {% block title %}{{ 'My accompanying periods in draft'|trans }}{% endblock title %}
 
 {% macro recordAction(period) %}
-    <li>
-        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
-        class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
-    </li>
+    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS', period) %}
+        <li>
+            <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
+            class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
+        </li>
+    {% endif %}
 {% endmacro %}
 
 

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig

@@ -5,10 +5,12 @@
 {% block title %}{{ 'My accompanying periods'|trans }}{% endblock title %}
 
 {% macro recordAction(period) %}
-    <li>
-        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
-        class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
-    </li>
+    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', period) %}
+        <li>
+            <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
+            class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
+        </li>
+    {% endif %}
 {% endmacro %}
 
 
@@ -20,8 +22,6 @@
         <div class="flex-table accompanyingcourse-list">
             {% for period in accompanyingPeriods %}
                 {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period, 'recordAction': _self.recordAction(period)} %}
-            {% else %}
-                <p class="chill-no-data-statement">{{ 'Any accompanying period'|trans }}</p>
             {% endfor %}
         </div>
 

src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig

@@ -29,13 +29,13 @@
                             {% if customButtons['before'] is defined %}
                                 {{ customButtons['before'] }}
                             {% endif %}
-
-                            <li>
-                                <a  class="btn btn-sm btn-edit"
-                                    title="{{ 'household.Edit member household'|trans }}"
-                                    href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': member.id }) }}"></a>
-                            </li>
-
+                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', member.household) %}
+                                <li>
+                                    <a  class="btn btn-sm btn-edit"
+                                        title="{{ 'household.Edit member household'|trans }}"
+                                        href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': member.id }) }}"></a>
+                                </li>
+                            {% endif %}
                             {% if customButtons['after'] is defined %}
                                 {{ customButtons['after'] }}
                             {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig

@@ -41,11 +41,13 @@
     {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
-        <li class="cancel">
-            <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
-                {{ 'Household summary'|trans }}
-            </a>
-        </li>
+        {% if is_granted('CHILL_PERSON_HOUSEHOLD_SEE', household) %}
+            <li class="cancel">
+                <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
+                    {{ 'Household summary'|trans }}
+                </a>
+            </li>
+        {% endif %}
         {#
         <li>
             <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">

src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig

@@ -63,11 +63,13 @@
                     'has_no_address': true
                 }) }}
                 <ul class="record_actions">
+                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                     <li>
                         <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
                            class="btn btn-edit"></a>
 
                     </li>
+                {% endif %}
                 </ul>
             </div>
 

src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig

@@ -26,11 +26,13 @@
       {{ 'Cancel'|trans }}
     </a>
   </li>
-  <li>
-    <button type="submit" class="btn btn-save">
-      {{ 'Save'|trans }}
-    </button>
-  </li>
+  {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+    <li>
+      <button type="submit" class="btn btn-save">
+        {{ 'Save'|trans }}
+      </button>
+    </li>
+  {% endif %}
 </ul>
 
 {{ form_end(form) }}

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -64,12 +64,14 @@
                                 {{ 'household_composition.Since'|trans({'startDate': currentComposition.startDate}) }}
                             </p>
                             <ul class="record_actions">
+                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                                 <li>
                                     <a class="btn btn-sm btn-update change-icon"
                                        href="{{ path('chill_person_household_composition_index', {'id': household.id}) }}">
                                         {{ 'household_composition.Update composition'|trans }}
                                     </a>
                                 </li>
+                            {% endif %}
                             </ul>
                         </div>
                     {% else %}
@@ -78,12 +80,14 @@
                                 {{ 'household_composition.Currently no composition'|trans }}
                             </p>
                                 <ul class="record_actions" style="margin-bottom: 0">
+                                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                                     <li>
                                         <a class="btn btn-sm btn-update change-icon"
                                            href="{{ path('chill_person_household_composition_index', {'id': household.id}) }}">
                                             {{ 'household_composition.Add a composition'|trans }}
                                         </a>
                                     </li>
+                                {% endif %}
                                 </ul>
                         </div>
                     {% endif %}
@@ -105,15 +109,19 @@
                     {% endif %}
 
                     {% if not household.commentMembers.isEmpty() %}
-                        <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
-                           class="btn btn-edit btn-block">
-                            {{ 'household.Edit comment and expecting birth'|trans }}
-                        </a>
+                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+                            <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
+                            class="btn btn-edit btn-block">
+                                {{ 'household.Edit comment and expecting birth'|trans }}
+                            </a>
+                        {% endif %}
                     {% else %}
-                        <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
-                           class="btn btn-create btn-block">
-                            {{ 'household.New comment and expecting birth'|trans }}
-                        </a>
+                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+                            <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
+                            class="btn btn-create btn-block">
+                                {{ 'household.New comment and expecting birth'|trans }}
+                            </a>
+                        {% endif %}
                     {% endif %}
 
                 {% else %}
@@ -129,11 +137,13 @@
                         {{ form_widget(form.commentMembers) }}
                     </div>
                     <ul class="record_actions">
-                        <li>
-                            <button type="submit" class="btn btn-save" id="form_household_comment_confirm">
-                                {{ 'Save'|trans }}
-                            </button>
-                        </li>
+                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+                            <li>
+                                <button type="submit" class="btn btn-save" id="form_household_comment_confirm">
+                                    {{ 'Save'|trans }}
+                                </button>
+                            </li>
+                        {% endif %}
                     </ul>
                     {{ form_end(form) }}
                 {% endif %}
@@ -245,12 +255,14 @@
 
 
     <ul class="record_actions">
-      <li>
-        <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
-          class="btn btn-create">
-          {{ 'household.Add a member'|trans }}
-        </a>
-      </li>
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+        <li>
+            <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
+            class="btn btn-create">
+            {{ 'household.Add a member'|trans }}
+            </a>
+        </li>
+      {% endif %}
     </ul>
 
 </div>

src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig

@@ -63,9 +63,11 @@
                         <li class="cancel" style="margin-right: auto;">
                             <a class="btn btn-cancel" href="{{ path('chill_person_household_composition_index', {'id': c.household.id}) }}">{{ 'Cancel'|trans }}</a>
                         </li>
-                        <li>
-                            <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-                        </li>
+                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', c.household) %}
+                            <li>
+                                <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+                            </li>
+                        {% endif %}
                     </ul>
                     {{ form_end(form) }}
                 {% endif %}
@@ -79,20 +81,24 @@
         {{ form_widget(form) }}
 
         <ul class="record_actions">
-           <li>
-               <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-           </li>
+            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+                <li>
+                    <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+                </li>
+            {% endif %}
         </ul>
         {{ form_end(form) }}
     </div>
 
     {% if editId == -1 %}
         <ul class="record_actions sticky-form-buttons">
+            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                 <li>
                     <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
                         {{ 'Create'|trans }}
                     </button>
                 </li>
+            {% endif %}
         </ul>
     {% endif %}
 </div>

src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig

@@ -107,21 +107,24 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="dropdown">
-            <a class="btn btn-create dropdown-toggle"
-            href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
-                {{ 'Add the person'|trans }}
-            </a>
-            <ul class="dropdown-menu" aria-labelledby="newPersonMore">
-                <li>
-                    {{ form_widget(form.editPerson, { 'attr': { 'class': 'dropdown-item' }}) }}
-                </li>
-                <li>
-                    {{ form_widget(form.createHousehold, { 'attr': { 'class': 'dropdown-item' }}) }}
-                </li>
-                <li>
-                    {{ form_widget(form.createPeriod, { 'attr': { 'class': 'dropdown-item' }}) }}
-                </li>
-            </ul>
+            {% if is_granted('CHILL_PERSON_CREATE') %}
+                <a class="btn btn-create dropdown-toggle"
+                href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
+                    {{ 'Add the person'|trans }}
+                </a>
+            {% endif %}
+                <ul class="dropdown-menu" aria-labelledby="newPersonMore">
+                    <li>
+                        {{ form_widget(form.editPerson, { 'attr': { 'class': 'dropdown-item' }}) }}
+                    </li>
+                    <li>
+                        {{ form_widget(form.createHousehold, { 'attr': { 'class': 'dropdown-item' }}) }}
+                    </li>
+                    <li>
+                        {{ form_widget(form.createPeriod, { 'attr': { 'class': 'dropdown-item' }}) }}
+                    </li>
+                </ul>
+            {# {% endif %} #}
         </li>
     </ul>
 

src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig

@@ -136,11 +136,13 @@
                 {{ 'Return'|trans }}
             </a>
         </li>
-        <li>
-            <button class="btn btn-save" type="submit">
-                {{ 'Save'|trans }}
-            </button>
-        </li>
+        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+            <li>
+                <button class="btn btn-save" type="submit">
+                    {{ 'Save'|trans }}
+                </button>
+            </li>
+        {% endif %}
     </ul>
     {{ form_end(form) }}
 

src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig

@@ -113,14 +113,18 @@
 
                         <div class="item-row separator">
                             <ul class="record_actions">
+                                {% if is_granted('CHILL_PERSON_HOUSEHOLD_SEE', p.household) %}
                                 <li>
                                     <a href="{{ chill_path_add_return_path('chill_person_household_summary',{ 'household_id': p.household.id }) }}"
                                     class="btn btn-show" title="{{ 'Show'|trans }}"></a>
                                 </li>
+                                {% endif %}
+                                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', p.household) %}
                                 <li>
                                     <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
-                                       class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
+                                    class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
                                 </li>
+                                {% endif %}
                                 {% if p.isCurrent() %}
                                     <li>
                                         <a class="btn btn-misc" href="{{ chill_path_add_return_path( 'chill_person_household_members_editor', { 'persons': [ person.id ], 'allow_leave_without_household': true }) }}">
@@ -164,10 +168,12 @@
 
                     <div class="item-row separator">
                         <ul class="record_actions">
-                            <li>
-                                <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
-                                   class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
-                            </li>
+                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', p.household) %}
+                                <li>
+                                    <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
+                                    class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
+                                </li>
+                            {% endif %}
                         </ul>
                     </div>
 

src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig

@@ -69,7 +69,9 @@
                         </td>
                         <td>
                             <ul class="record_actions">
-                                <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                                {% if is_granted('CHILL_PERSON_SEE', person) %}
+                                    <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                                {% endif %}
                                 {% if is_granted('CHILL_PERSON_UPDATE', person) %}
                                 <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
                                 {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig

@@ -74,9 +74,11 @@
                         </td>
                         <td>
                             <ul class="record_actions">
-                                <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                                {% if is_granted('CHILL_PERSON_SEE', person) %}
+                                    <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                                {% endif %}
                                 {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-                                <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
+                                    <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
                                 {% endif %}
                             </ul>
                         </td>

src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig

@@ -214,12 +214,14 @@
                                     {% endif %}
 
                                     <ul class="record_actions record_actions_column">
-                                        <li>
-                                            <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': acp.id }) }}"
-                                               class="btn btn-sm btn-outline-primary" title="{{ 'See accompanying period'|trans }}">
-                                                <i class="fa fa-random fa-fw"></i>
-                                            </a>
-                                        </li>
+                                        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', acp) %}
+                                            <li>
+                                                <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': acp.id }) }}"
+                                                class="btn btn-sm btn-outline-primary" title="{{ 'See accompanying period'|trans }}">
+                                                    <i class="fa fa-random fa-fw"></i>
+                                                </a>
+                                            </li>
+                                        {% endif %}
                                     </ul>
 
                                 </div>

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig

@@ -8,24 +8,26 @@
 
 {% block personcontent %}
 <div class="person-duplicate">
-            
-            <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>
-            
-            {{ form_start(form) }}
-            {{ form_rest(form) }}
 
-            <ul class="record_actions sticky-form-buttons">
-                <li class="cancel">
-                    <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="btn btn-cancel">
-                        {{ 'Return'|trans }}
-                    </a>
-                </li>
-                <li>
-                    <button class="btn btn-save" type="submit">{{ 'Next'|trans }}</button>
-                </li>
-            </ul>
+    <h1>{{ 'Désigner un dossier doublon'|trans }}</h1>
 
-            {{ form_end(form) }}
+    {{ form_start(form) }}
+    {{ form_rest(form) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="btn btn-cancel">
+                {{ 'Return'|trans }}
+            </a>
+        </li>
+        {% if is_granted('CHILL_PERSON_CREATE') %}
+            <li>
+                <button class="btn btn-save" type="submit">{{ 'Next'|trans }}</button>
+            </li>
+        {% endif %}
+    </ul>
+
+    {{ form_end(form) }}
 
 </div>
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig

@@ -56,9 +56,11 @@
                         </td>
                         <td>
                             <ul class="record_actions">
-                                <li>
-                                    <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : duplicatePerson.id }) }}"></a>
-                                </li>
+                                {% if is_granted('CHILL_PERSON_SEE', duplicatePerson) %}
+                                    <li>
+                                        <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : duplicatePerson.id }) }}"></a>
+                                    </li>
+                                {% endif %}
                                 <li>
                                     <a class="btn btn-action" href="{{ path('chill_person_duplicate_confirm', { person1_id : person.id, person2_id : duplicatePerson.id }) }}">
                                     <i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</a>
@@ -124,15 +126,17 @@
                             </td>
                             <td>
                                 <ul class="record_actions">
+                                {% if is_granted('CHILL_PERSON_SEE', notDuplicatePerson) %}
                                     <li>
                                         <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a>
                                     </li>
+                                {% endif %}
                                     <li>
                                         <a class="btn btn-misc" title="{{ 'Switch to duplicate'|trans }}"
-                                           href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
-                                           <i class="fa fa-toggle-off fa-fw"></i>
-                                           {{ 'not-duplicate'|trans }}
-                                       </a>
+                                            href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">
+                                            <i class="fa fa-toggle-off fa-fw"></i>
+                                            {{ 'not-duplicate'|trans }}
+                                        </a>
                                     </li>
                                 </ul>
                             </td>

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig

@@ -65,12 +65,14 @@
     </ul>
 {% else %}
     <ul class="record_actions">
-        <li>
-            <button class="btn btn-create"
-            type="submit" id="newPersonResource">
-                {{ 'Save'|trans }}
-            </button>
-        </li>
+        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+            <li>
+                <button class="btn btn-create"
+                type="submit" id="newPersonResource">
+                    {{ 'Save'|trans }}
+                </button>
+            </li>
+        {% endif %}
     </ul>
 {% endif %}
 

src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig

@@ -38,9 +38,11 @@
                     {{ 'Cancel'|trans|chill_return_path_label }}
                 </a>
             </li>
-            <li>
-                <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
-            </li>
+            {% if is_granted('CHILL_PERSON_UPDATE', person) %}
+                <li>
+                    <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+                </li>
+            {% endif %}
         </ul>
 
         {{ form_end(form) }}

src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig

@@ -104,12 +104,12 @@
             </a>
         </li>
         {% if is_granted('CHILL_PERSON_UPDATE', person) %}
-        <li>
-            <a class="btn btn-create"
-                href="{{ path('chill_person_residential_address_new', { 'id' : person.id } ) }}">
-                {{ 'Add a residential address'|trans }}
-            </a>
-        </li>
+            <li>
+                <a class="btn btn-create"
+                    href="{{ path('chill_person_residential_address_new', { 'id' : person.id } ) }}">
+                    {{ 'Add a residential address'|trans }}
+                </a>
+            </li>
         {% endif %}
     </ul>
 </div>

src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new_pick_kind.html.twig

@@ -8,16 +8,16 @@
 
     <div class="container" style="margin-top: 2rem;">
         <div class="row">
-           <div class="col-md-4 mb-4">
-               <a
-                   href="{{ chill_path_forward_return_path('chill_person_residential_address_new', {'id': person.id, 'kind': 'person'}) }}"
-                   class="btn btn-outline-chill-green-dark">
-                   {{ 'The address of another person'|trans }}
-               </a>
-           </div>
-           <div class="col-md-8">
-               <p>{{ 'residential_address_person_explanation'|trans  }}</p>
-           </div>
+            <div class="col-md-4 mb-4">
+                <a
+                    href="{{ chill_path_forward_return_path('chill_person_residential_address_new', {'id': person.id, 'kind': 'person'}) }}"
+                    class="btn btn-outline-chill-green-dark">
+                    {{ 'The address of another person'|trans }}
+                </a>
+            </div>
+            <div class="col-md-8">
+                <p>{{ 'residential_address_person_explanation'|trans  }}</p>
+            </div>
         </div>
         <div class="row">
             <div class="col-md-4 mb-4">

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
+                    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_evaluation_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
+                    {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
+                    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_goal_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
+                    {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_result_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
-                        </li>
-                    </ul>
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
+                <ul class="record_actions">
+                    <li>
+                        <a href="{{ chill_path_add_return_path('chill_crud_social_result_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                    </li>
+                </ul>
+                {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_action_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
+                {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_issue_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
+                {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/Timeline/closing_period.html.twig

@@ -14,11 +14,11 @@
     <dl class="chill_view_data">
       <dd>{{ 'Participants'|trans }}&nbsp;:</dd>
       <dt>
-      <ul>
-        {% for p in period.participations %}
-        <li>{{ p.person|chill_entity_render_box({ 'addLink': true }) }}: {{ 'since %date%'|trans({'%date%': p.startDate|format_date("long") } ) }}, {{ 'until %date%'|trans({'%date%': (p.endDate is not null ? p.endDate : period.closingDate)|format_date("long") }) }}</li>
-        {% endfor %}
-      </ul>
+        <ul>
+          {% for p in period.participations %}
+            <li>{{ p.person|chill_entity_render_box({ 'addLink': true }) }}: {{ 'since %date%'|trans({'%date%': p.startDate|format_date("long") } ) }}, {{ 'until %date%'|trans({'%date%': (p.endDate is not null ? p.endDate : period.closingDate)|format_date("long") }) }}</li>
+          {% endfor %}
+        </ul>
       </dt>
   </div>
 </div>