update changelog

.changes/v2.10.2.md

@@ -0,0 +1,3 @@
+## v2.10.2 - 2023-10-26
+### Fixed
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 

.changes/v2.10.3.md

@@ -0,0 +1,3 @@
+## v2.10.3 - 2023-10-26
+### Fixed
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 

CHANGELOG.md

@@ -6,6 +6,14 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v2.10.3 - 2023-10-26
+### Fixed
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
+
+## v2.10.2 - 2023-10-26
+### Fixed
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
+
 ## v2.10.1 - 2023-10-24
 ### Fixed
 * Fix export controller when generating an export without any data in session 

src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php

@@ -18,12 +18,15 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class CustomFieldController.
  */
 class CustomFieldController extends AbstractController
 {
+    public function __construct(private readonly TranslatorInterface $translator) {}
+
     /**
      * Creates a new CustomField entity.
      *
@@ -40,13 +43,13 @@ class CustomFieldController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            $this->addFlash('success', $this->get('translator')
+            $this->addFlash('success', $this->translator
                 ->trans('The custom field has been created'));
 
             return $this->redirectToRoute('customfieldsgroup_show', ['id' => $entity->getCustomFieldsGroup()->getId()]);
         }
 
-        $this->addFlash('error', $this->get('translator')
+        $this->addFlash('error', $this->translator
             ->trans('The custom field form contains errors'));
 
         return $this->render('@ChillCustomFields/CustomField/new.html.twig', [
@@ -130,13 +133,13 @@ class CustomFieldController extends AbstractController
         if ($editForm->isSubmitted() && $editForm->isValid()) {
             $em->flush();
 
-            $this->addFlash('success', $this->get('translator')
+            $this->addFlash('success', $this->translator
                 ->trans('The custom field has been updated'));
 
             return $this->redirectToRoute('customfield_edit', ['id' => $id]);
         }
 
-        $this->addFlash('error', $this->get('translator')
+        $this->addFlash('error', $this->translator
             ->trans('The custom field form contains errors'));
 
         return $this->render('@ChillCustomFields/CustomField/edit.html.twig', [

src/Bundle/ChillEventBundle/Controller/EventController.php

@@ -118,7 +118,7 @@ class EventController extends AbstractController
 
                 $this->addFlash(
                     'success',
-                    $this->get('translator')
+                    $this->translator
                         ->trans('The event has been sucessfully removed')
                 );
 
@@ -249,7 +249,7 @@ class EventController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            $this->addFlash('success', $this->get('translator')
+            $this->addFlash('success', $this->translator
                 ->trans('The event was created'));
 
             return $this->redirectToRoute('chill_event__event_show', ['event_id' => $entity->getId()]);
@@ -364,7 +364,7 @@ class EventController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            $this->addFlash('success', $this->get('translator')
+            $this->addFlash('success', $this->translator
                 ->trans('The event was updated'));
 
             return $this->redirectToRoute('chill_event__event_edit', ['event_id' => $event_id]);

src/Bundle/ChillEventBundle/Controller/ParticipationController.php

@@ -23,6 +23,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class ParticipationController.
@@ -32,7 +33,7 @@ class ParticipationController extends AbstractController
     /**
      * ParticipationController constructor.
      */
-    public function __construct(private readonly LoggerInterface $logger) {}
+    public function __construct(private readonly LoggerInterface $logger, private readonly TranslatorInterface $translator) {}
 
     /**
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/event/participation/create", name="chill_event_participation_create")
@@ -177,7 +178,7 @@ class ParticipationController extends AbstractController
 
             $em->flush();
 
-            $this->addFlash('success', $this->get('translator')->trans(
+            $this->addFlash('success', $this->translator->trans(
                 'The participations were created'
             ));
 
@@ -211,7 +212,7 @@ class ParticipationController extends AbstractController
             $em->persist($participation);
             $em->flush();
 
-            $this->addFlash('success', $this->get('translator')->trans(
+            $this->addFlash('success', $this->translator->trans(
                 'The participation was created'
             ));
 
@@ -260,7 +261,7 @@ class ParticipationController extends AbstractController
 
                 $this->addFlash(
                     'success',
-                    $this->get('translator')
+                    $this->translator
                         ->trans('The participation has been sucessfully removed')
                 );
 
@@ -340,7 +341,7 @@ class ParticipationController extends AbstractController
         switch ($event->getParticipations()->count()) {
             case 0:
                 // if there aren't any participation, redirect to the 'show' view with an add flash
-                $this->addFlash('warning', $this->get('translator')
+                $this->addFlash('warning', $this->translator
                     ->trans('There are no participation to edit for this event'));
 
                 return $this->redirectToRoute(
@@ -434,7 +435,7 @@ class ParticipationController extends AbstractController
 
             $em->flush();
 
-            $this->addFlash('success', $this->get('translator')->trans(
+            $this->addFlash('success', $this->translator->trans(
                 'The participation was updated'
             ));
 
@@ -480,7 +481,7 @@ class ParticipationController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $this->getDoctrine()->getManager()->flush();
 
-            $this->addFlash('success', $this->get('translator')->trans('The participations '
+            $this->addFlash('success', $this->translator->trans('The participations '
                     .'have been successfully updated.'));
 
             return $this->redirectToRoute(
@@ -652,7 +653,7 @@ class ParticipationController extends AbstractController
 
         if ([] === $newParticipations) {
             // if we do not have nay participants, redirect to event view
-            $this->addFlash('error', $this->get('translator')->trans(
+            $this->addFlash('error', $this->translator->trans(
                 'None of the requested people may participate '
                     .'the event: they are maybe already participating.'
             ));

src/Bundle/ChillMainBundle/Controller/UserController.php

@@ -32,12 +32,13 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserController extends CRUDController
 {
     final public const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
 
-    public function __construct(private readonly LoggerInterface $logger, private readonly ValidatorInterface $validator, private readonly UserPasswordEncoderInterface $passwordEncoder, private readonly UserRepository $userRepository, protected ParameterBagInterface $parameterBag) {}
+    public function __construct(private readonly LoggerInterface $logger, private readonly ValidatorInterface $validator, private readonly UserPasswordEncoderInterface $passwordEncoder, private readonly UserRepository $userRepository, protected ParameterBagInterface $parameterBag, private readonly TranslatorInterface $translator) {}
 
     /**
      * @Route("/{_locale}/admin/main/user/{uid}/add_link_groupcenter",
@@ -65,7 +66,7 @@ class UserController extends CRUDController
             if (0 === $this->validator->validate($user)->count()) {
                 $em->flush();
 
-                $this->addFlash('success', $this->get('translator')->trans('The '
+                $this->addFlash('success', $this->translator->trans('The '
                     .'permissions have been successfully added to the user'));
 
                 $returnPathParams = $request->query->has('returnPath') ?
@@ -115,14 +116,14 @@ class UserController extends CRUDController
         try {
             $user->removeGroupCenter($groupCenter);
         } catch (\RuntimeException $ex) {
-            $this->addFlash('error', $this->get('translator')->trans($ex->getMessage()));
+            $this->addFlash('error', $this->translator->trans($ex->getMessage()));
 
             return $this->redirectToRoute('chill_crud_admin_user_edit', ['id' => $uid]);
         }
 
         $em->flush();
 
-        $this->addFlash('success', $this->get('translator')
+        $this->addFlash('success', $this->translator
             ->trans('The permissions where removed.'));
 
         return $this->redirectToRoute('chill_crud_admin_user_edit', ['id' => $uid]);
@@ -207,7 +208,7 @@ class UserController extends CRUDController
             $user->setCurrentLocation($currentLocation);
 
             $this->getDoctrine()->getManager()->flush();
-            $this->addFlash('success', $this->get('translator')->trans('Current location successfully updated'));
+            $this->addFlash('success', $this->translator->trans('Current location successfully updated'));
 
             return $this->redirect(
                 $request->query->has('returnPath') ? $request->query->get('returnPath') :
@@ -243,7 +244,7 @@ class UserController extends CRUDController
             $user->setPassword($this->passwordEncoder->encodePassword($user, $password));
 
             $this->getDoctrine()->getManager()->flush();
-            $this->addFlash('success', $this->get('translator')->trans('Password successfully updated!'));
+            $this->addFlash('success', $this->translator->trans('Password successfully updated!'));
 
             return $this->redirect(
                 $request->query->has('returnPath') ? $request->query->get('returnPath') :

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -113,7 +113,7 @@ class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle\Contr
                 $em->remove($accompanyingCourse);
                 $em->flush();
 
-                $this->addFlash('success', $this->get('translator')
+                $this->addFlash('success', $this->translator
                     ->trans('The accompanying course has been successfully removed.'));
 
                 if (null !== $person_id) {

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php

@@ -26,6 +26,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use function array_filter;
 
 /**
@@ -33,24 +34,12 @@ use function array_filter;
  */
 class AccompanyingPeriodController extends AbstractController
 {
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-
-    /**
-     * @var ValidatorInterface
-     */
-    protected $validator;
-
     public function __construct(
         protected AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
-        EventDispatcherInterface $eventDispatcher,
+        private readonly EventDispatcherInterface $eventDispatcher,
-        ValidatorInterface $validator
+        private readonly ValidatorInterface $validator,
-    ) {
+        private readonly TranslatorInterface $translator
-        $this->eventDispatcher = $eventDispatcher;
+    ) {}
-        $this->validator = $validator;
-    }
 
     /**
      * @throws \Exception
@@ -65,7 +54,7 @@ class AccompanyingPeriodController extends AbstractController
 
         if (false === $person->isOpen()) {
             $this->get('session')->getFlashBag()
-                ->add('error', $this->get('translator')
+                ->add('error', $this->translator
                     ->trans(
                         'Beware period is closed',
                         ['%name%' => $person->__toString()]
@@ -92,7 +81,7 @@ class AccompanyingPeriodController extends AbstractController
 
                 if (0 === \count($errors)) {
                     $this->get('session')->getFlashBag()
-                        ->add('success', $this->get('translator')
+                        ->add('success', $this->translator
                             ->trans('An accompanying period has been closed.', [
                                 '%name%' => $person->__toString(),
                             ]));
@@ -104,7 +93,7 @@ class AccompanyingPeriodController extends AbstractController
                     ]);
                 }
                 $this->get('session')->getFlashBag()
-                    ->add('error', $this->get('translator')
+                    ->add('error', $this->translator
                         ->trans('Error! Period not closed!'));
 
                 foreach ($errors as $error) {
@@ -115,7 +104,7 @@ class AccompanyingPeriodController extends AbstractController
                 $this->get('session')->getFlashBag()
                     ->add(
                         'error',
-                        $this->get('translator')
+                        $this->translator
                             ->trans('Pediod closing form is not valid')
                     );
 
@@ -175,7 +164,7 @@ class AccompanyingPeriodController extends AbstractController
                 $em->flush();
                 $flashBag->add(
                     'success',
-                    $this->get('translator')->trans(
+                    $this->translator->trans(
                         'A period has been created.'
                     )
                 );
@@ -184,7 +173,7 @@ class AccompanyingPeriodController extends AbstractController
                     'person_id' => $person->getId(),
                 ]);
             }
-            $flashBag->add('error', $this->get('translator')
+            $flashBag->add('error', $this->translator
                 ->trans('Error! Period not created!'));
 
             foreach ($errors as $error) {
@@ -244,7 +233,7 @@ class AccompanyingPeriodController extends AbstractController
         // in case the person is already open
         if ($person->isOpen()) {
             $this->get('session')->getFlashBag()
-                ->add('error', $this->get('translator')
+                ->add('error', $this->translator
                     ->trans(
                         'Error! Period %name% is not closed ; it can be open',
                         ['%name%' => $person->__toString()]
@@ -276,7 +265,7 @@ class AccompanyingPeriodController extends AbstractController
 
                 if (\count($errors) <= 0) {
                     $this->get('session')->getFlashBag()
-                        ->add('success', $this->get('translator')
+                        ->add('success', $this->translator
                             ->trans(
                                 'An accompanying period has been opened.',
                                 ['%name%' => $person->__toString()]
@@ -289,7 +278,7 @@ class AccompanyingPeriodController extends AbstractController
                     ]);
                 }
                 $this->get('session')->getFlashBag()
-                    ->add('error', $this->get('translator')
+                    ->add('error', $this->translator
                         ->trans('Period not opened'));
 
                 foreach ($errors as $error) {
@@ -300,7 +289,7 @@ class AccompanyingPeriodController extends AbstractController
                 $this->get('session')->getFlashBag()
                     ->add(
                         'error',
-                        $this->get('translator')
+                        $this->translator
                             ->trans('Period not opened : form is invalid')
                     );
             }
@@ -340,7 +329,7 @@ class AccompanyingPeriodController extends AbstractController
 
             $this->getDoctrine()->getManager()->flush();
 
-            $this->addFlash('success', $this->get('translator')->trans(
+            $this->addFlash('success', $this->translator->trans(
                 'The period has been re-opened'
             ));
 
@@ -413,7 +402,7 @@ class AccompanyingPeriodController extends AbstractController
 
                 $flashBag->add(
                     'success',
-                    $this->get('translator')->trans('An accompanying period has been updated.')
+                    $this->translator->trans('An accompanying period has been updated.')
                 );
 
                 return $this->redirectToRoute('chill_person_accompanying_period_list', [
@@ -421,7 +410,7 @@ class AccompanyingPeriodController extends AbstractController
                 ]);
             }
 
-            $flashBag->add('error', $this->get('translator')
+            $flashBag->add('error', $this->translator
                 ->trans('Error when updating the period'));
 
             foreach ($errors as $error) {

src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php

@@ -18,6 +18,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class PersonAddressController
@@ -25,18 +26,10 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
  */
 class PersonAddressController extends AbstractController
 {
-    /**
-     * @var ValidatorInterface
-     */
-    protected $validator;
-
     /**
      * PersonAddressController constructor.
      */
-    public function __construct(ValidatorInterface $validator)
+    public function __construct(private readonly ValidatorInterface $validator, private readonly TranslatorInterface $translator) {}
-    {
-        $this->validator = $validator;
-    }
 
     /**
      * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/person/{person_id}/address/create", name="chill_person_address_create", methods={"POST"})
@@ -77,14 +70,14 @@ class PersonAddressController extends AbstractController
 
                 $this->addFlash(
                     'success',
-                    $this->get('translator')->trans('The new address was created successfully')
+                    $this->translator->trans('The new address was created successfully')
                 );
 
                 return $this->redirectToRoute('chill_person_address_list', [
                     'person_id' => $person->getId(),
                 ]);
             } else {
-                $this->addFlash('error', $this->get('translator')
+                $this->addFlash('error', $this->translator
                     ->trans('Error! Address not created!'));
             }
         }
@@ -213,7 +206,7 @@ class PersonAddressController extends AbstractController
                 $this->getDoctrine()->getManager()
                     ->flush();
 
-                $this->addFlash('success', $this->get('translator')->trans(
+                $this->addFlash('success', $this->translator->trans(
                     'The address has been successfully updated'
                 ));
 
@@ -221,7 +214,7 @@ class PersonAddressController extends AbstractController
                     'person_id' => $person->getId(),
                 ]);
             } else {
-                $this->addFlash('error', $this->get('translator')
+                $this->addFlash('error', $this->translator
                     ->trans('Error when updating the period'));
             }
         }

src/Bundle/ChillReportBundle/Controller/ReportController.php

@@ -22,39 +22,22 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Class ReportController.
  */
 class ReportController extends AbstractController
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-
-    /**
-     * @var PaginatorFactory
-     */
-    protected $paginator;
-
     /**
      * ReportController constructor.
      */
     public function __construct(
-        EventDispatcherInterface $eventDispatcher,
+        private readonly EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper,
+        private readonly AuthorizationHelper $authorizationHelper,
-        PaginatorFactory $paginator
+        private readonly PaginatorFactory $paginator,
-    ) {
+        private readonly TranslatorInterface $translator
-        $this->eventDispatcher = $eventDispatcher;
+    ) {}
-        $this->authorizationHelper = $authorizationHelper;
-        $this->paginator = $paginator;
-    }
 
     /**
      * Create a new report for a given person and of a given type.
@@ -98,7 +81,7 @@ class ReportController extends AbstractController
                 ->getFlashBag()
                 ->add(
                     'success',
-                    $this->get('translator')
+                    $this->translator
                         ->trans('Success : report created!')
                 );
 
@@ -108,7 +91,7 @@ class ReportController extends AbstractController
         $this->get('session')
             ->getFlashBag()->add(
                 'error',
-                $this->get('translator')
+                $this->translator
                     ->trans('The form is not valid. The report has not been created !')
             );
 
@@ -135,11 +118,11 @@ class ReportController extends AbstractController
         $report = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$report) {
-            throw $this->createNotFoundException($this->get('translator')->trans('Unable to find this report.'));
+            throw $this->createNotFoundException($this->translator->trans('Unable to find this report.'));
         }
 
         if ((int) $person_id !== (int) $report->getPerson()->getId()) {
-            throw new \RuntimeException($this->get('translator')->trans('This is not the report of the person.'), 1);
+            throw new \RuntimeException($this->translator->trans('This is not the report of the person.'), 1);
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_UPDATE', $report);
@@ -418,7 +401,7 @@ class ReportController extends AbstractController
         $report = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$report) {
-            throw $this->createNotFoundException($this->get('translator')->trans('Unable to find this report.'));
+            throw $this->createNotFoundException($this->translator->trans('Unable to find this report.'));
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_UPDATE', $report);
@@ -433,7 +416,7 @@ class ReportController extends AbstractController
                 ->getFlashBag()
                 ->add(
                     'success',
-                    $this->get('translator')
+                    $this->translator
                         ->trans('Success : report updated!')
                 );
 
@@ -453,7 +436,7 @@ class ReportController extends AbstractController
             ->getFlashBag()
             ->add(
                 'error',
-                $this->get('translator')
+                $this->translator
                     ->trans('The form is not valid. The report has not been updated !')
             );
 
@@ -480,7 +463,7 @@ class ReportController extends AbstractController
         $entity = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$entity || !$person) {
-            throw $this->createNotFoundException($this->get('translator')->trans('Unable to find this report.'));
+            throw $this->createNotFoundException($this->translator->trans('Unable to find this report.'));
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_SEE', $entity);