update changelog

.changes/v2.10.1.md

@@ -0,0 +1,3 @@
+## v2.10.1 - 2023-10-24
+### Fixed
+* Fix export controller when generating an export without any data in session 

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.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 
+
 ## v2.10.0 - 2023-10-24
 ### Feature
 * ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] Add a filter "grouping accompanying period by opening date" and "grouping accompanying period by closing date"

src/Bundle/ChillMainBundle/Controller/ExportController.php

@@ -281,7 +281,7 @@ class ExportController extends AbstractController
         $options = match ($step) {
             'export', 'generate_export' => [
                 'export_alias' => $alias,
-                'picked_centers' => $exportManager->getPickedCenters($data['centers']),
+                'picked_centers' => $exportManager->getPickedCenters($data['centers'] ?? []),
             ],
             'formatter', 'generate_formatter' => [
                 'export_alias' => $alias,
@@ -339,9 +339,9 @@ class ExportController extends AbstractController
         $exportManager = $this->exportManager;
 
         // check we have data from the previous step (export step)
-        $data = $this->session->get('centers_step', null);
+        $data = $this->session->get('centers_step', []);
 
-        if (null === $data) {
+        if (null === $data && true === $this->filterStatsByCenters) {
             return $this->redirectToRoute('chill_main_export_new', [
                 'step' => $this->getNextStep('export', $export, true),
                 'alias' => $alias,

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,
-        ValidatorInterface $validator
-    ) {
-        $this->eventDispatcher = $eventDispatcher;
-        $this->validator = $validator;
-    }
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly ValidatorInterface $validator,
+        private readonly TranslatorInterface $translator
+    ) {}
 
     /**
      * @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) {