fix syntax error

replace deprecated TranslatorInterface by new one
2025-09-23 07:04:58 +00:00 · 2022-02-18 15:01:33 +01:00 · 2022-02-17 17:20:47 +01:00
72 changed files with 123 additions and 679 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,7 @@ and this project adheres to
 ## Unreleased

 <!-- write down unreleased development here -->
-* [person] use the same rendering of person in similar person proposition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/348)
-* [person] move similar person matcher to PersonACLAwareRepository and replace the SimilarPersonMatcher uses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/451)
+
 ## Test releases

 ### test release 2022-02-14
@@ -23,7 +22,7 @@ and this project adheres to
 * [person] accompanying course work: fix on-the-fly update of thirdParty
 * fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
 * [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
-* [person] accompanying course work: fix on-the-fly update of thirdParty
+* [person] accompanying course work: fix on-the-fly update of thirdParty 
 * [on-the-fly] close modal only after validation
 * [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
 * change order for accompanying course work list
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
@@ -105,15 +105,6 @@ 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:
 				"""
@@ -141,15 +132,6 @@ 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:
 				"""
@@ -195,15 +177,6 @@ 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:
 				"""
@@ -213,15 +186,6 @@ 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:
 				"""
@@ -258,15 +222,6 @@ 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:
 				"""
@@ -276,15 +231,6 @@ 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:
 				"""
@@ -294,24 +240,6 @@ 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:
 				"""
@@ -321,15 +249,6 @@ 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:
 				"""
@@ -399,15 +318,6 @@ 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:
 				"""
@@ -417,15 +327,6 @@ 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:
 				"""
@@ -444,42 +345,6 @@ 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:
 				"""
@@ -489,24 +354,6 @@ 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:
 				"""
@@ -516,24 +363,6 @@ 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:
 				"""
@@ -543,15 +372,6 @@ 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:
 				"""
@@ -570,24 +390,6 @@ 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:
 				"""
@@ -660,42 +462,6 @@ 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:
 				"""
@@ -714,15 +480,6 @@ 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:
 				"""
@@ -746,38 +503,11 @@ 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:
 				"""
@@ -864,15 +594,6 @@ 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:
 				"""
@@ -918,33 +639,6 @@ 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:
 				"""
@@ -954,15 +648,6 @@ 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
@@ -977,15 +662,6 @@ 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:
 				"""
@@ -995,15 +671,6 @@ 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:
 				"""
@@ -1013,15 +680,6 @@ 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:
 				"""
@@ -1058,15 +716,6 @@ 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:
 				"""
@@ -1094,15 +743,6 @@ 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:
 				"""
@@ -1148,15 +788,6 @@ 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:
 				"""
@@ -1198,24 +829,6 @@ 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:
 				"""
@@ -1279,15 +892,6 @@ 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:
 				"""
@@ -1297,15 +901,6 @@ 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:
 				"""
@@ -1387,15 +982,6 @@ 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:
 				"""
@@ -1441,33 +1027,6 @@ 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:
 				"""
@@ -1504,33 +1063,6 @@ 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:
 				"""
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+++ b/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;
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class ActivityDateFilter implements FilterInterface
 {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+++ b/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;

--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function get_class;

--- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_merge;
 use function count;
--- a/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillBudgetBundle/config/services/menu.yaml
+++ b/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\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
        tags:
            - { name: 'chill.menu_builder' }
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function count;

--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function count;

--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function in_array;
 use function is_array;
--- a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 /**
 * Allow to pick a choice amongst different choices.
--- a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 /**
 * Allow to pick amongst type.
--- a/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillEventBundle/config/services/controller.yaml
+++ b/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\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
            $paginator: '@chill_main.paginator_factory'
        public: true
        tags: ['controller.service_arguments']
--- a/src/Bundle/ChillEventBundle/config/services/forms.yaml
+++ b/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\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
        tags:
            - { name: form.type }
--- a/src/Bundle/ChillEventBundle/config/services/menu.yaml
+++ b/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\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
        tags:
            - { name: 'chill.menu_builder' }
--- a/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class FamilyMemberController extends AbstractController
 {
--- a/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/menu.yml
+++ b/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\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
        tags:
            - { name: 'chill.menu_builder' }
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+++ b/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;

--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_key_exists;
 use function array_merge;
--- a/src/Bundle/ChillMainBundle/Controller/ExportController.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function count;
 use function serialize;
--- a/src/Bundle/ChillMainBundle/Controller/PasswordController.php
+++ b/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.
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_key_exists;
 use function array_keys;
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_map;
 use function count;
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_map;
 use function array_merge;
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_key_exists;
 use function array_keys;
--- a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 /**
 * A form to pick between PostalCode.
--- a/src/Bundle/ChillMainBundle/Notification/Mailer.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;

 use function call_user_func;
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 /**
 * Class SectionMenuBuilder.
--- a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_key_exists;
 use function array_merge;
--- a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
@@ -16,9 +16,10 @@ 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
--- a/src/Bundle/ChillMainBundle/config/services/export.yaml
+++ b/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\Component\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Contracts\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\Component\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Contracts\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\Component\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Contracts\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\Component\Translation\TranslatorInterface'
+            $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface'
            $exportManager: '@Chill\MainBundle\Export\ExportManager'
        tags:
            - { name: chill.export_formatter, alias: 'csv_pivoted_list' }
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/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\Component\Translation\TranslatorInterface'
+            - '@Symfony\Contracts\Translation\TranslatorInterface'
        tags:
            - { name: form.type }

--- a/src/Bundle/ChillMainBundle/config/services/menu.yaml
+++ b/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\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
        tags:
            - { name: 'chill.menu_builder' }

--- a/src/Bundle/ChillMainBundle/config/services/notification.yaml
+++ b/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\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
            $routeParameters: '%chill_main.notifications%'

    Chill\MainBundle\Notification\NotificationHandlerManager:
--- a/src/Bundle/ChillMainBundle/config/services/routing.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/routing.yaml
@@ -8,7 +8,7 @@ services:
        arguments:
            - '@Symfony\Component\Routing\RouterInterface'
            - '@Knp\Menu\FactoryInterface'
-            - '@Symfony\Component\Translation\TranslatorInterface'
+            - '@Symfony\Contracts\Translation\TranslatorInterface'
    Chill\MainBundle\Routing\MenuComposer: '@chill.main.menu_composer'

    chill.main.routes_loader:
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_key_exists;
 use function count;
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function count;

--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -16,8 +16,8 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\CreationPersonType;
 use Chill\PersonBundle\Form\PersonType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@@ -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;
@@ -56,6 +56,11 @@ final class PersonController extends AbstractController
     */
    protected $personRepository;

+    /**
+     * @var SimilarPersonMatcher
+     */
+    protected $similarPersonMatcher;
+
    /**
     * @var TranslatorInterface
     */
@@ -71,14 +76,13 @@ final class PersonController extends AbstractController
     */
    private $logger;

-    private PersonACLAwareRepositoryInterface $personACLAwareRepository;
-
    /**
     * @var ValidatorInterface
     */
    private $validator;

    public function __construct(
+        SimilarPersonMatcher $similarPersonMatcher,
        TranslatorInterface $translator,
        EventDispatcherInterface $eventDispatcher,
        PersonRepository $personRepository,
@@ -86,9 +90,9 @@ final class PersonController extends AbstractController
        LoggerInterface $logger,
        ValidatorInterface $validator,
        EntityManagerInterface $em,
-        Security $security,
-        PersonACLAwareRepositoryInterface $personACLAwareRepository
+        Security $security
    ) {
+        $this->similarPersonMatcher = $similarPersonMatcher;
        $this->translator = $translator;
        $this->eventDispatcher = $eventDispatcher;
        $this->configPersonAltNameHelper = $configPersonAltNameHelper;
@@ -97,7 +101,6 @@ final class PersonController extends AbstractController
        $this->validator = $validator;
        $this->em = $em;
        $this->security = $security;
-        $this->personACLAwareRepository = $personACLAwareRepository;
    }

    public function editAction($person_id, Request $request)
@@ -233,8 +236,8 @@ final class PersonController extends AbstractController
            $request->getMethod() === Request::METHOD_POST
            && $form->isValid()
        ) {
-            $alternatePersons = $this->personACLAwareRepository
-                ->findMatchingPersons($person);
+            $alternatePersons = $this->similarPersonMatcher
+                ->matchPerson($person);

            if (
                false === $this->isLastPostDataChanges($form, $request, true)
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -20,15 +20,15 @@ use Chill\PersonBundle\Entity\PersonNotDuplicate;
 use Chill\PersonBundle\Form\PersonConfimDuplicateType;
 use Chill\PersonBundle\Form\PersonFindManuallyDuplicateType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use Chill\TaskBundle\Entity\SingleTask;
 use http\Exception\InvalidArgumentException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function count;

@@ -39,11 +39,6 @@ class PersonDuplicateController extends Controller
     */
    private $eventDispatcher;

-    /**
-     * @var PersonACLAwareRepositoryInterface
-     */
-    private $personACLAwareRepository;
-
    /**
     * @var \Chill\PersonBundle\Actions\Remove\PersonMove
     */
@@ -54,19 +49,24 @@ class PersonDuplicateController extends Controller
     */
    private $personRepository;

+    /**
+     * @var \Chill\PersonBundle\Search\SimilarPersonMatcher
+     */
+    private $similarPersonMatcher;
+
    /**
     * @var \Symfony\Component\Translation\TranslatorInterface
     */
    private $translator;

    public function __construct(
-        PersonACLAwareRepositoryInterface $personACLAwareRepository,
+        SimilarPersonMatcher $similarPersonMatcher,
        TranslatorInterface $translator,
        PersonRepository $personRepository,
        PersonMove $personMove,
        EventDispatcherInterface $eventDispatcher
    ) {
-        $this->personACLAwareRepository = $personACLAwareRepository;
+        $this->similarPersonMatcher = $similarPersonMatcher;
        $this->translator = $translator;
        $this->personRepository = $personRepository;
        $this->personMove = $personMove;
@@ -246,11 +246,8 @@ class PersonDuplicateController extends Controller
            'You are not allowed to see this person.'
        );

-        $duplicatePersons = $this->personACLAwareRepository->findMatchingPersons(
-            $person,
-            0.5,
-            PersonACLAwareRepositoryInterface::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL
-        );
+        $duplicatePersons = $this->similarPersonMatcher->
+            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);

        $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);

--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+++ b/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
 {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 final class GenderAggregator implements AggregatorInterface
 {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+++ b/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
 {
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+++ b/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;
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+++ b/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)
--- a/src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
+++ b/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;
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function in_array;
 use function is_array;
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 /**
 * Class SectionMenuBuilder.
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -18,7 +18,6 @@ use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\PersonBundle\Templating\Entity\PersonRender;
 use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
@@ -41,26 +40,18 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac

    private EntityManagerInterface $em;

-    private PersonNotDuplicateRepository $personNotDuplicateRepository;
-
-    private PersonRender $personRender;
-
    private Security $security;

    public function __construct(
        Security $security,
        EntityManagerInterface $em,
        CountryRepository $countryRepository,
-        AuthorizationHelper $authorizationHelper,
-        PersonRender $personRender,
-        PersonNotDuplicateRepository $personNotDuplicateRepository
+        AuthorizationHelper $authorizationHelper
    ) {
        $this->security = $security;
        $this->em = $em;
        $this->countryRepository = $countryRepository;
        $this->authorizationHelper = $authorizationHelper;
-        $this->personRender = $personRender;
-        $this->personNotDuplicateRepository = $personNotDuplicateRepository;
    }

    public function buildAuthorizedQuery(
@@ -306,70 +297,6 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
        return $this->fetchQueryPerson($query);
    }

-    /**
-     * @throws NonUniqueResultException
-     * @throws ParsingException
-     *
-     * @return array|Person[]
-     */
-    public function findMatchingPersons(
-        Person $person,
-        float $precision = 0.15,
-        string $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY
-    ): array {
-        $query = $this->matchPerson($person, $precision, $orderBy);
-        $authorizedQuery = $this->addAuthorizations($query);
-
-        return $this->fetchQueryPerson($authorizedQuery);
-    }
-
-    public function matchPerson(
-        Person $person,
-        float $precision = 0.15,
-        string $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY
-    ): SearchApiQuery {
-        $fullName = $this->personRender->renderString($person, []);
-
-        $query = new SearchApiQuery();
-        $query->setFromClause('chill_person_person AS person');
-        $query->andWhereClause(
-            'SIMILARITY(person.fullnameCanonical, UNACCENT(LOWER(?))) >= ?',
-            [$fullName, $precision]
-        );
-
-        if (null !== $person->getId()) {
-            $query->andWhereClause(
-                'person.id != ?',
-                [$person->getId()]
-            );
-
-            $notDuplicatePersons = $this->personNotDuplicateRepository->findNotDuplicatePerson($person);
-
-            if (count($notDuplicatePersons)) {
-                $query->andWhereClause(
-                    'person.id NOT IN (?)',
-                    [$notDuplicatePersons]
-                );
-            }
-        }
-
-        switch ($orderBy) {
-            case self::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL:
-                $query->setSelectPertinence('person.fullnameCanonical');
-
-                break;
-
-            case self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY:
-            default:
-                $query->setSelectPertinence(
-                    'SIMILARITY(person.fullnameCanonical, UNACCENT(LOWER(?)))',
-                    [$fullName]
-                );
-        }
-
-        return $query;
-    }
-
    private function addAuthorizations(SearchApiQuery $query): SearchApiQuery
    {
        $authorizedCenters = $this->authorizationHelper
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
@@ -17,10 +17,6 @@ use DateTimeInterface;

 interface PersonACLAwareRepositoryInterface
 {
-    public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';
-
-    public const SIMILAR_SEARCH_ORDER_BY_SIMILARITY = 'similarity';
-
    public function buildAuthorizedQuery(
        ?string $default = null,
        ?string $firstname = null,
@@ -65,13 +61,4 @@ interface PersonACLAwareRepositoryInterface
        ?string $phonenumber = null,
        ?string $city = null
    ): array;
-
-    /**
-     * @return array|Person[]
-     */
-    public function findMatchingPersons(
-        Person $person,
-        float $precision = 0.15,
-        string $orderBy = self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY
-    ): array;
 }
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -17,15 +17,6 @@

 {% block title %}{{ 'Add a person'|trans }}{% endblock title %}

-{% macro button_person_after(person) %}
-    {% set household = person.getCurrentHousehold %}
-    {% if household is not null %}
-        <li>
-            <a href="{{ path('chill_person_household_summary', { 'household_id': household.id }) }}" class="btn btn-sm btn-chill-beige"><i class="fa fa-home"></i></a>
-        </li>
-    {% endif %}
-{% endmacro %}
-
 {% block content %}
 <div class="col-md-10 col-xxl person-new">

@@ -40,24 +31,34 @@
            </span>
        </div>

-        <div class="flex-table">
+        <table class="table table-bordered border-dark">
+            <thead>
+            <tr>
+                <th class="chill-red">{{ 'Name'|trans }}</th>
+                <th class="chill-green">{{ 'Date of birth'|trans }}</th>
+                <th class="chill-orange">{{ 'Nationality'|trans }}</th>
+            </tr>
+            </thead>
+            <tbody>
            {% for person in alternatePersons %}
-            <div class="item-bloc">
-
-                {{ person|chill_entity_render_box({
-                    'render': 'bloc',
-                    'addLink': true,
-                    'addInfo': true,
-                    'addAge': true,
-                    'addAltNames': true,
-                    'addCenter': true,
-                    'address_multiline': false,
-                    'customButtons': { 'after': _self.button_person_after(person) }
-                }) }}
-            </div>
+                <tr>
+                    <td>
+                        <a href="{{ path('chill_person_view', {'person_id': person.id } ) }}">
+                            {{ person|chill_entity_render_string }}{% apply spaceless %}
+                                {% if person.isOpen == false %}
+                                    <i class="icon-lock"></i>
+                                {% endif %}
+                            {% endapply %}
+                        </a>
+                    </td>
+                    <td>{% if person.birthdate is not null %}{{ person.birthdate|format_date('long') }}{% else %}&nbsp;{% endif %}</td>
+                    <td>
+                        {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{%  else  %}{{ 'Without nationality'|trans }}{% endif %}
+                    </td>
+                </tr>
            {% endfor %}
-        </div>
-
+            </tbody>
+        </table>
    {% endif %}

    {{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
--- a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
@@ -21,9 +21,6 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt

 use function count;

-/**
- * @deprecated
- */
 class SimilarPersonMatcher
 {
    public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';
--- a/src/Bundle/ChillPersonBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
@@ -24,8 +24,8 @@ services:

    Chill\PersonBundle\Controller\PersonDuplicateController:
        arguments:
-            $personACLAwareRepository: '@Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $similarPersonMatcher: '@Chill\PersonBundle\Search\SimilarPersonMatcher'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
            $personRepository: '@Chill\PersonBundle\Repository\PersonRepository'
            $personMove: '@Chill\PersonBundle\Actions\Remove\PersonMove'
            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
--- a/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml
@@ -8,5 +8,5 @@ services:
    Chill\PersonBundle\DataFixtures\ORM\LoadCustomFields:
        arguments:
            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
        tags: [ 'doctrine.fixture.orm' ]
--- a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+++ b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
@@ -34,9 +34,9 @@ use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_key_exists;
 use function array_keys;
--- a/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
+++ b/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
@@ -17,7 +17,7 @@ use Chill\MainBundle\Export\ExportElementsProviderInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ReportBundle\Entity\Report;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class ReportListProvider implements ExportElementsProviderInterface
 {
--- a/src/Bundle/ChillReportBundle/config/services/export.yaml
+++ b/src/Bundle/ChillReportBundle/config/services/export.yaml
@@ -3,7 +3,7 @@ services:
        arguments:
            $em: '@Doctrine\ORM\EntityManagerInterface'
            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
            $customFieldProvider: '@Chill\CustomFieldsBundle\Service\CustomFieldProvider'
        tags:
            - { name: chill.export_elements_provider, prefix: 'report' }
--- a/src/Bundle/ChillTaskBundle/Controller/TaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
@@ -22,9 +22,9 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_filter;
 use function array_values;
--- a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
@@ -16,7 +16,7 @@ use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Knp\Menu\MenuItem;
 use LogicException;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class MenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
@@ -15,7 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
@@ -17,7 +17,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\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillTaskBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillTaskBundle/config/services/menu.yaml
@@ -3,7 +3,7 @@ services:
    arguments:
      $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
      $counter: '@Chill\TaskBundle\Templating\UI\CountNotificationTask'
-      $translator: '@Symfony\Component\Translation\TranslatorInterface'
+      $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
      $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
    tags:
      - { name: "chill.menu_builder" }
@@ -17,6 +17,6 @@ services:
  Chill\TaskBundle\Menu\SectionMenuBuilder:
    arguments:
      $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-      $translator: '@Symfony\Component\Translation\TranslatorInterface'
+      $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
    tags:
      - { name: "chill.menu_builder" }
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
@@ -25,7 +25,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_merge;

--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
@@ -22,7 +22,7 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_diff;
 use function array_merge;
--- a/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
@@ -15,7 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 /**
 * Add an entry in section to go to third party index page.
--- a/src/Bundle/ChillThirdPartyBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/config/services/menu.yaml
@@ -1,7 +1,7 @@
 services:
    Chill\ThirdPartyBundle\Menu\MenuBuilder:
        arguments:
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
+            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
        tags:
            - { name: 'chill.menu_builder' }
Author	SHA1	Message	Date
Julie Lenaerts	ad5eae039c	fix syntax error	2022-02-18 15:01:33 +01:00
Julie Lenaerts	5ff47050ff	replace deprecated TranslatorInterface by new one	2022-02-17 17:20:47 +01:00