[FrameworkBundle][TwigBridge] Fix BC break from strong dependency on CSRF token storage

Author: tgalopin

Extension/CsrfExtension.php

@@ -11,34 +11,22 @@
 
 namespace Symfony\Bridge\Twig\Extension;
 
-use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 /**
  * @author Christian Flothmann <[email protected]>
+ * @author Titouan Galopin <[email protected]>
  */
 class CsrfExtension extends AbstractExtension
 {
-    private $csrfTokenManager;
-
-    public function __construct(CsrfTokenManagerInterface $csrfTokenManager)
-    {
-        $this->csrfTokenManager = $csrfTokenManager;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function getFunctions(): array
     {
         return array(
-            new TwigFunction('csrf_token', array($this, 'getCsrfToken')),
+            new TwigFunction('csrf_token', array(CsrfRuntime::class, 'getCsrfToken')),
         );
     }
-
-    public function getCsrfToken(string $tokenId): string
-    {
-        return $this->csrfTokenManager->getToken($tokenId)->getValue();
-    }
 }

Extension/CsrfRuntime.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Extension;
+
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+/**
+ * @author Christian Flothmann <[email protected]>
+ * @author Titouan Galopin <[email protected]>
+ */
+class CsrfRuntime
+{
+    private $csrfTokenManager;
+
+    public function __construct(CsrfTokenManagerInterface $csrfTokenManager)
+    {
+        $this->csrfTokenManager = $csrfTokenManager;
+    }
+
+    public function getCsrfToken(string $tokenId): string
+    {
+        return $this->csrfTokenManager->getToken($tokenId)->getValue();
+    }
+}