sessions refactor to use request stack instead

Author: jmwill86

src/Controller/Action/Admin/ImportDataAction.php

@@ -46,14 +46,14 @@ final class ImportDataAction
     public function __construct(
         ImportProcessorInterface $importProcessor,
         FormFactoryInterface $formFactory,
-        FlashBagInterface $flashBag,
+        RequestStack $requestStack,
         FormErrorsFlashHelperInterface $formErrorsFlashHelper,
         TranslatorInterface $translator,
         Environment $twig
     ) {
         $this->importProcessor = $importProcessor;
         $this->formFactory = $formFactory;
-        $this->flashBag = $flashBag;
+        $this->requestStack = $requestStack;
         $this->formErrorsFlashHelper = $formErrorsFlashHelper;
         $this->translator = $translator;
         $this->twig = $twig;
@@ -71,13 +71,14 @@ public function __invoke(Request $request): Response
                 /** @var UploadedFile $file */
                 $file = $form->get('file')->getData();
                 $resourceName = $request->get('resourceName');
-
+                $session = $this->requestStack->getSession()->getFlashBag();
+                
                 try {
                     $this->importProcessor->process($resourceName, $file->getPathname());
 
-                    $this->flashBag->set('success', $this->translator->trans('bitbag_sylius_cms_plugin.ui.successfully_imported'));
+                    $session->set('success', $this->translator->trans('bitbag_sylius_cms_plugin.ui.successfully_imported'));
                 } catch (ImportFailedException $exception) {
-                    $this->flashBag->set('error', $exception->getMessage());
+                    $session->set('error', $exception->getMessage());
                 }
             } else {
                 $this->formErrorsFlashHelper->addFlashErrors($form);

src/Controller/Helper/FormErrorsFlashHelper.php

@@ -18,14 +18,14 @@
 final class FormErrorsFlashHelper implements FormErrorsFlashHelperInterface
 {
     /** @var FlashBagInterface */
-    private $flashBag;
+    private $requestStack;
 
     /** @var TranslatorInterface */
     private $translator;
 
-    public function __construct(FlashBagInterface $flashBag, TranslatorInterface $translator)
+    public function __construct(RequestStack $requestStack, TranslatorInterface $translator)
     {
-        $this->flashBag = $flashBag;
+        $this->requestStack = $requestStack;
         $this->translator = $translator;
     }
 
@@ -43,6 +43,7 @@ public function addFlashErrors(FormInterface $form): void
 
         $message = $this->translator->trans('bitbag_sylius_cms_plugin.ui.form_was_submitted_with_errors') . ' ' . rtrim(implode(' ', $errors));
 
-        $this->flashBag->set('error', $message);
+        $session = $this->requestStack->getSession()->getFlashBag();
+        $session->set('error', $message);
     }
 }

src/EventListener/ResourceDeleteSubscriber.php

@@ -15,24 +15,23 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 final class ResourceDeleteSubscriber implements EventSubscriberInterface
 {
     /** @var UrlGeneratorInterface */
     private $router;
 
     /** @var SessionInterface */
-    private $session;
+    private $requestStack;
 
-    public function __construct(UrlGeneratorInterface $router, SessionInterface $session)
+    public function __construct(UrlGeneratorInterface $router, RequestStack $requestStack)
     {
         $this->router = $router;
-        $this->session = $session;
+        $this->requestStack = $requestStack;
     }
 
     public static function getSubscribedEvents(): array
@@ -70,8 +69,8 @@ public function onResourceDelete(ExceptionEvent $event): void
             return;
         }
 
-        /** @var FlashBagInterface $flashBag */
-        $flashBag = $this->session->getBag('flashes');
+        $session = $this->requestStack->getSession();
+        $flashBag = $session->getBag('flashes');
         $flashBag->add('error', [
             'message' => 'sylius.resource.delete_error',
             'parameters' => ['%resource%' => $resourceName],

src/Resources/config/services/controller.yml

@@ -27,7 +27,7 @@ services:
         arguments:
             - "@bitbag_sylius_cms_plugin.processor.import"
             - "@form.factory"
-            - "@session.flash_bag"
+            - "@request_stack"
             - "@bitbag_sylius_cms_plugin.controller.helper.form_errors_flash"
             - "@translator"
             - "@twig"
@@ -44,7 +44,7 @@ services:
         class: BitBag\SyliusCmsPlugin\Controller\Helper\FormErrorsFlashHelper
         public: true
         arguments:
-            - "@session.flash_bag"
+            - "@request_stack"
             - "@translator"
 
     bitbag_sylius_cms_plugin.controller.media.overriden:

src/Resources/config/services/event_listener.yml

@@ -16,6 +16,7 @@ services:
         class: BitBag\SyliusCmsPlugin\EventListener\ResourceDeleteSubscriber
         arguments:
             - "@router"
-            - "@session"
+            - "@request_stack"
         tags:
             - { name: kernel.event_subscriber, event: kernel.exception }
+