apply rules rector

src/Bundle/ChillMainBundle/Controller/ExportController.php

@@ -52,57 +52,18 @@ use function unserialize;
  */
 class ExportController extends AbstractController
 {
-    private EntityManagerInterface $entityManager;
-
-    /**
-     * @var ExportManager
-     */
-    private $exportManager;
-
-    /**
-     * @var FormFactoryInterface
-     */
-    private $formFactory;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var ChillRedis
-     */
-    private $redis;
-
-    /**
-     * @var SessionInterface
-     */
-    private $session;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
     public function __construct(
-        ChillRedis $chillRedis,
-        ExportManager $exportManager,
-        FormFactoryInterface $formFactory,
-        LoggerInterface $logger,
-        SessionInterface $session,
-        TranslatorInterface $translator,
-        EntityManagerInterface $entityManager,
+        private ChillRedis $redis,
+        private ExportManager $exportManager,
+        private FormFactoryInterface $formFactory,
+        private LoggerInterface $logger,
+        private SessionInterface $session,
+        private TranslatorInterface $translator,
+        private EntityManagerInterface $entityManager,
         private readonly ExportFormHelper $exportFormHelper,
         private readonly SavedExportRepositoryInterface $savedExportRepository,
-        private readonly Security $security,
+        private readonly Security $security
     ) {
-        $this->entityManager = $entityManager;
-        $this->redis = $chillRedis;
-        $this->exportManager = $exportManager;
-        $this->formFactory = $formFactory;
-        $this->logger = $logger;
-        $this->session = $session;
-        $this->translator = $translator;
     }
 
     public function downloadResultAction(Request $request, $alias)
@@ -228,22 +189,13 @@ class ExportController extends AbstractController
 
         $step = $request->query->getAlpha('step', 'centers');
 
-        switch ($step) {
-            case 'centers':
-                return $this->selectCentersStep($request, $export, $alias, $savedExport);
-
-            case 'export':
-                return $this->exportFormStep($request, $export, $alias, $savedExport);
-
-            case 'formatter':
-                return $this->formatterFormStep($request, $export, $alias, $savedExport);
-
-            case 'generate':
-                return $this->forwardToGenerate($request, $export, $alias, $savedExport);
-
-            default:
-                throw $this->createNotFoundException("The given step '{$step}' is invalid");
-        }
+        return match ($step) {
+            'centers' => $this->selectCentersStep($request, $export, $alias, $savedExport),
+            'export' => $this->exportFormStep($request, $export, $alias, $savedExport),
+            'formatter' => $this->formatterFormStep($request, $export, $alias, $savedExport),
+            'generate' => $this->forwardToGenerate($request, $export, $alias, $savedExport),
+            default => throw $this->createNotFoundException("The given step '{$step}' is invalid"),
+        };
     }
 
     /**
@@ -317,7 +269,7 @@ class ExportController extends AbstractController
     {
         /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
-        $isGenerate = strpos($step, 'generate_') === 0;
+        $isGenerate = str_starts_with($step, 'generate_');
 
         $options = match ($step) {
             'export', 'generate_export' => [
@@ -493,7 +445,7 @@ class ExportController extends AbstractController
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
-    private function forwardToGenerate(Request $request, $export, $alias, ?SavedExport $savedExport)
+    private function forwardToGenerate(Request $request, \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export, $alias, ?SavedExport $savedExport)
     {
         $dataCenters = $this->session->get('centers_step_raw', null);
         $dataFormatter = $this->session->get('formatter_step_raw', null);
@@ -560,12 +512,10 @@ class ExportController extends AbstractController
     }
 
     /**
-     * @param \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
      * @param string $alias
-     *
      * @return Response
      */
-    private function selectCentersStep(Request $request, $export, $alias, ?SavedExport $savedExport = null)
+    private function selectCentersStep(Request $request, \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export, $alias, ?SavedExport $savedExport = null)
     {
         /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
@@ -647,7 +597,7 @@ class ExportController extends AbstractController
      *
      * @return string the next/current step
      */
-    private function getNextStep($step, $export, $reverse = false)
+    private function getNextStep($step, \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export, $reverse = false)
     {
         switch ($step) {
             case 'centers':

src/Bundle/ChillMainBundle/Controller/UserExportController.php

@@ -92,11 +92,9 @@ final readonly class UserExportController
     }
 
     /**
-     * @return StreamedResponse
      * @throws \League\Csv\CannotInsertRecord
      * @throws \League\Csv\Exception
      * @throws \League\Csv\UnavailableStream
-     *
      * @Route("/{_locale}/admin/main/users/export/permissions.{_format}", requirements={"_format": "csv"}, name="chill_main_users_export_permissions")
      */
     public function userPermissionsList(string $_format = 'csv'): StreamedResponse