Fix for deprecated session service in Symfony 6 (#468)

* Fix for deprecated session service in Symfony 6

* Keep Backward compatibility with optional service argument

* Fix code styling

Co-authored-by: Robbe De Geyndt <robbe.degeyndt@aware.be>

Author: robbedg

EditInPlace/Activator.php

@@ -12,6 +12,7 @@
 namespace Translation\Bundle\EditInPlace;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 
 /**
@@ -24,40 +25,66 @@ final class Activator implements ActivatorInterface
     const KEY = 'translation_bundle.edit_in_place.enabled';
 
     /**
-     * @var Session
+     * @var RequestStack
      */
-    private $session;
+    private $requestStack;
 
-    public function __construct(Session $session)
+    /**
+     * @var Session|null
+     */
+    private $session = null;
+
+    public function __construct(RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+    }
+
+    /**
+     * Set session if available.
+     */
+    public function setSession(Session $session): void
     {
         $this->session = $session;
     }
 
+    /**
+     * Get session based on availability.
+     */
+    private function getSession(): Session
+    {
+        $session = $this->session;
+        if (null === $session) {
+            $session = $this->requestStack->getSession();
+        }
+
+        return $session;
+    }
+
     /**
      * Enable the Edit In Place mode.
      */
     public function activate(): void
     {
-        $this->session->set(self::KEY, true);
+        $this->getSession()->set(self::KEY, true);
     }
 
     /**
      * Disable the Edit In Place mode.
      */
     public function deactivate(): void
     {
-        $this->session->remove(self::KEY);
+        $this->getSession()->remove(self::KEY);
     }
 
     /**
      * {@inheritdoc}
      */
     public function checkRequest(Request $request = null): bool
     {
-        if (!$this->session->has(self::KEY)) {
+        if (!$this->getSession()->has(self::KEY)) {
             return false;
         }
 
-        return $this->session->get(self::KEY, false);
+        return $this->getSession()->get(self::KEY, false);
     }
 }

Resources/config/edit_in_place.yaml

@@ -19,7 +19,9 @@ services:
             - ~
 
     Translation\Bundle\EditInPlace\Activator:
-        arguments: ['@session']
+        arguments: ['@request_stack']
+        calls:
+            - setSession: ['@?session']
         public: true
 
     Translation\Bundle\Translator\EditInPlaceTranslator: