From 4f9acf31747e121ae566fbf34a79178bf55f9a48 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 18 Feb 2022 15:51:52 +0100 Subject: [PATCH] use correct translatorInterface instead of deprecated one --- CHANGELOG.md | 1 + src/Bundle/ChillBudgetBundle/config/services/menu.yaml | 2 +- .../ChillEventBundle/config/services/controller.yaml | 2 +- src/Bundle/ChillEventBundle/config/services/forms.yaml | 2 +- src/Bundle/ChillEventBundle/config/services/menu.yaml | 2 +- .../Resources/config/services/menu.yml | 2 +- src/Bundle/ChillMainBundle/config/services/export.yaml | 8 ++++---- src/Bundle/ChillMainBundle/config/services/form.yaml | 2 +- src/Bundle/ChillMainBundle/config/services/menu.yaml | 2 +- .../ChillMainBundle/config/services/notification.yaml | 2 +- src/Bundle/ChillMainBundle/config/services/routing.yaml | 2 +- .../Controller/AccompanyingCourseController.php | 1 + .../ChillPersonBundle/config/services/controller.yaml | 2 +- .../ChillPersonBundle/config/services/fixtures.yaml | 2 +- src/Bundle/ChillReportBundle/config/services/export.yaml | 2 +- src/Bundle/ChillTaskBundle/config/services/menu.yaml | 4 ++-- .../ChillThirdPartyBundle/config/services/menu.yaml | 2 +- 17 files changed, 21 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b341706db..1e3ab19ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to * [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465) * [Household]: Add end date in HouseholdMember form for 'enfant hors menage' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/434) * [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435) +* [parcours]: Order social activities and only display most recent three in parcours resumé (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/481) ## Test releases diff --git a/src/Bundle/ChillBudgetBundle/config/services/menu.yaml b/src/Bundle/ChillBudgetBundle/config/services/menu.yaml index 2bd895165..a0fdac61e 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' tags: - { name: 'chill.menu_builder' } diff --git a/src/Bundle/ChillEventBundle/config/services/controller.yaml b/src/Bundle/ChillEventBundle/config/services/controller.yaml index a0bdda92a..bb4cf7c46 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' $paginator: '@chill_main.paginator_factory' public: true tags: ['controller.service_arguments'] diff --git a/src/Bundle/ChillEventBundle/config/services/forms.yaml b/src/Bundle/ChillEventBundle/config/services/forms.yaml index 914b50072..6f61531ce 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' tags: - { name: form.type } diff --git a/src/Bundle/ChillEventBundle/config/services/menu.yaml b/src/Bundle/ChillEventBundle/config/services/menu.yaml index cd550cf9e..6f49c02f0 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' tags: - { name: 'chill.menu_builder' } \ No newline at end of file diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/menu.yml b/src/Bundle/ChillFamilyMembersBundle/Resources/config/services/menu.yml index 661570dcd..9deb3ec16 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' tags: - { name: 'chill.menu_builder' } diff --git a/src/Bundle/ChillMainBundle/config/services/export.yaml b/src/Bundle/ChillMainBundle/config/services/export.yaml index fccad9edb..d330f30f5 100644 --- 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\Contracts\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\Contracts\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\Contracts\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\Contracts\Translation\TranslatorInterface;' + $translatorInterface: '@Symfony\Contracts\Translation\TranslatorInterface' $exportManager: '@Chill\MainBundle\Export\ExportManager' tags: - { name: chill.export_formatter, alias: 'csv_pivoted_list' } diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml index 080eccfa8..f2dc7803a 100644 --- 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\Contracts\Translation\TranslatorInterface;' + - '@Symfony\Contracts\Translation\TranslatorInterface' tags: - { name: form.type } diff --git a/src/Bundle/ChillMainBundle/config/services/menu.yaml b/src/Bundle/ChillMainBundle/config/services/menu.yaml index a341cd894..03ed34a92 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' tags: - { name: 'chill.menu_builder' } diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml index 65b19d505..b972dced7 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' $routeParameters: '%chill_main.notifications%' Chill\MainBundle\Notification\NotificationHandlerManager: diff --git a/src/Bundle/ChillMainBundle/config/services/routing.yaml b/src/Bundle/ChillMainBundle/config/services/routing.yaml index 0254c3c3b..4363c068f 100644 --- 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\Contracts\Translation\TranslatorInterface;' + - '@Symfony\Contracts\Translation\TranslatorInterface' Chill\MainBundle\Routing\MenuComposer: '@chill.main.menu_composer' chill.main.routes_loader: diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php index fef95d2b4..aa3c5f512 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php @@ -32,6 +32,7 @@ use Symfony\Component\Workflow\Registry; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Contracts\Translation\TranslatorInterface; +use function array_slice; use function is_array; /** diff --git a/src/Bundle/ChillPersonBundle/config/services/controller.yaml b/src/Bundle/ChillPersonBundle/config/services/controller.yaml index dff7a7ac3..421e13e93 100644 --- a/src/Bundle/ChillPersonBundle/config/services/controller.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/controller.yaml @@ -25,7 +25,7 @@ services: Chill\PersonBundle\Controller\PersonDuplicateController: arguments: $similarPersonMatcher: '@Chill\PersonBundle\Search\SimilarPersonMatcher' - $translator: '@Symfony\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' $personRepository: '@Chill\PersonBundle\Repository\PersonRepository' $personMove: '@Chill\PersonBundle\Actions\Remove\PersonMove' $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface' diff --git a/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml b/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml index 924ddfaa8..d4cdcd957 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' tags: [ 'doctrine.fixture.orm' ] diff --git a/src/Bundle/ChillReportBundle/config/services/export.yaml b/src/Bundle/ChillReportBundle/config/services/export.yaml index 447d888a1..1ae624118 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' $customFieldProvider: '@Chill\CustomFieldsBundle\Service\CustomFieldProvider' tags: - { name: chill.export_elements_provider, prefix: 'report' } diff --git a/src/Bundle/ChillTaskBundle/config/services/menu.yaml b/src/Bundle/ChillTaskBundle/config/services/menu.yaml index dbcf35b1d..52322d553 100644 --- 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\Contracts\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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' tags: - { name: "chill.menu_builder" } diff --git a/src/Bundle/ChillThirdPartyBundle/config/services/menu.yaml b/src/Bundle/ChillThirdPartyBundle/config/services/menu.yaml index 7ca70af62..4b6ffd83f 100644 --- 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\Contracts\Translation\TranslatorInterface;' + $translator: '@Symfony\Contracts\Translation\TranslatorInterface' $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface' tags: - { name: 'chill.menu_builder' }