Merge pull request #39 from sherlockode/feature/SF-6-migration

SF 6 compatibility

Author: BrownSim

composer.json

@@ -9,7 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.4 || ^8.1",
-        "sherlockode/advanced-content-bundle": "^0.9.2",
+        "sherlockode/advanced-content-bundle": "^0.9.8",
         "sylius/sylius": "^1.10"
     },
     "config": {

src/EventListener/AdminGridListener.php

@@ -5,15 +5,15 @@
 use Sherlockode\AdvancedContentBundle\Manager\ConfigurationManager;
 use Sherlockode\SyliusAdvancedContentPlugin\Scope\ScopeInitializer;
 use Symfony\Component\EventDispatcher\GenericEvent;
-use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AdminGridListener
 {
     /**
-     * @var Session
+     * @var RequestStack
      */
-    private $session;
+    private $requestStack;
 
     /**
      * @var TranslatorInterface
@@ -31,18 +31,18 @@ class AdminGridListener
     private $configurationManager;
 
     /**
-     * @param Session              $session
+     * @param RequestStack         $requestStack
      * @param TranslatorInterface  $translator
      * @param ScopeInitializer     $scopeInitializer
      * @param ConfigurationManager $configurationManager
      */
     public function __construct(
-        Session $session,
+        RequestStack $requestStack,
         TranslatorInterface $translator,
         ScopeInitializer $scopeInitializer,
         ConfigurationManager $configurationManager
     ) {
-        $this->session = $session;
+        $this->requestStack = $requestStack;
         $this->translator = $translator;
         $this->scopeInitializer = $scopeInitializer;
         $this->configurationManager = $configurationManager;
@@ -60,6 +60,8 @@ public function checkScopeInitialization(GenericEvent $event): void
             return;
         }
 
-        $this->session->getFlashBag()->add('info', $this->translator->trans('sherlockode_sylius_acb.scopes.missing_scopes'));
+        $this->requestStack->getSession()->getFlashBag()
+            ->add('info', $this->translator->trans('sherlockode_sylius_acb.scopes.missing_scopes'))
+        ;
     }
 }

src/EventListener/AdminVersionListener.php

@@ -5,17 +5,15 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Sherlockode\AdvancedContentBundle\Manager\ConfigurationManager;
 use Sherlockode\AdvancedContentBundle\Model\VersionInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AdminVersionListener
 {
     /**
-     * @var Session
+     * @var RequestStack
      */
-    private $session;
+    private $requestStack;
 
     /**
      * @var TranslatorInterface
@@ -27,34 +25,26 @@ class AdminVersionListener
      */
     private $configurationManager;
 
-    /**
-     * @var RequestStack
-     */
-    private $requestStack;
-
     /**
      * @var EntityManagerInterface
      */
     private $em;
 
     /**
-     * @param Session                $session
+     * @param RequestStack           $requestStack
      * @param TranslatorInterface    $translator
      * @param ConfigurationManager   $configurationManager
-     * @param RequestStack           $requestStack
      * @param EntityManagerInterface $em
      */
     public function __construct(
-        Session $session,
+        RequestStack $requestStack,
         TranslatorInterface $translator,
         ConfigurationManager $configurationManager,
-        RequestStack $requestStack,
         EntityManagerInterface $em
     ) {
-        $this->session = $session;
+        $this->requestStack = $requestStack;
         $this->translator = $translator;
         $this->configurationManager = $configurationManager;
-        $this->requestStack = $requestStack;
         $this->em = $em;
     }
 
@@ -73,7 +63,7 @@ public function editPageVersionMessage(): void
      */
     private function addVersionMessage(string $entityClass): void
     {
-        $request = $this->getRequest();
+        $request = $this->requestStack->getMainRequest();
         if ($request === null) {
             return;
         }
@@ -95,23 +85,11 @@ private function addVersionMessage(string $entityClass): void
             \IntlDateFormatter::MEDIUM
         );
 
-        $this->session->getFlashBag()->add('info', $this->translator->trans('sherlockode_sylius_acb.form.version_edit', [
-            '%version%' => $version->getId(),
-            '%date%' => $formatter->format($version->getCreatedAt()),
-        ]));
-    }
-
-    /**
-     * @return Request|null
-     */
-    private function getRequest(): ?Request
-    {
-        if (method_exists($this->requestStack, 'getMainRequest')) {
-            // SF >= 5.3
-            return $this->requestStack->getMainRequest();
-        }
-
-        // compat SF < 5.3
-        return $this->requestStack->getMasterRequest();
+        $this->requestStack->getSession()->getFlashBag()
+            ->add('info', $this->translator->trans('sherlockode_sylius_acb.form.version_edit', [
+                '%version%' => $version->getId(),
+                '%date%' => $formatter->format($version->getCreatedAt()),
+            ]))
+        ;
     }
 }

src/Resources/config/events.yaml

@@ -16,12 +16,12 @@ sylius_ui:
             blocks:
                 sylius_acb:
                     template: "@SherlockodeSyliusAdvancedContentPlugin/admin/stylesheets.html.twig"
-    
+
 services:
     sherlockode_sylius_acb.listener.grid:
         class: Sherlockode\SyliusAdvancedContentPlugin\EventListener\AdminGridListener
         arguments:
-            - '@session'
+            - '@request_stack'
             - '@translator'
             - '@sherlockode_sylius_acb.scope_initializer'
             - '@sherlockode_advanced_content.configuration_manager'
@@ -31,10 +31,9 @@ services:
     sherlockode_sylius_acb.listener.version:
         class: Sherlockode\SyliusAdvancedContentPlugin\EventListener\AdminVersionListener
         arguments:
-            - '@session'
+            - '@request_stack'
             - '@translator'
             - '@sherlockode_advanced_content.configuration_manager'
-            - '@request_stack'
             - '@doctrine.orm.entity_manager'
         tags:
             - { name: kernel.event_listener, event: sherlockode_sylius_acb.content.initialize_update, method: editContentVersionMessage }

src/SherlockodeSyliusAdvancedContentPlugin.php

@@ -14,7 +14,7 @@ final class SherlockodeSyliusAdvancedContentPlugin extends Bundle
 {
     use SyliusPluginTrait;
 
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new SyliusClassMappingCompilerPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 5);
     }