Fix injection for stack and context

pug-php · Jan 22, 2023 · b0aefcd · b0aefcd
1 parent 74d872e
commit b0aefcd
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 92 deletions.
diff --git a/src/Pug/PugSymfonyEngine.php b/src/Pug/PugSymfonyEngine.php
@@ -21,8 +21,10 @@
 use Pug\Symfony\Traits\Options;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\Templating\TemplateReferenceInterface;
 use Twig\Environment as TwigEnvironment;
@@ -50,11 +52,12 @@ class PugSymfonyEngine implements EngineInterface, InstallerInterface
     protected $defaultTemplateDirectory;
 
     public function __construct(
-        KernelInterface $kernel,
+        protected readonly KernelInterface $kernel,
         TwigEnvironment $twig,
+        private readonly ?RequestStack $stack = null,
+        private readonly ?RequestContext $context = null,
     ) {
         $container = $kernel->getContainer();
-        $this->kernel = $kernel;
         $this->container = $container;
         $this->userOptions = ($this->container->hasParameter('pug') ? $this->container->getParameter('pug') : null) ?: [];
         $this->enhanceTwig($twig);

diff --git a/src/Pug/Symfony/Traits/HelpersHandler.php b/src/Pug/Symfony/Traits/HelpersHandler.php
@@ -21,8 +21,6 @@
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\UrlHelper;
-use Symfony\Component\HttpKernel\Kernel;
-use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\RequestContext;
 use Twig\Environment as TwigEnvironment;
 use Twig\Extension\ExtensionInterface;
@@ -40,8 +38,6 @@ trait HelpersHandler
 
     protected Environment $twig;
 
-    protected Kernel|KernelInterface $kernel;
-
     protected ?Pug $pug = null;
 
     protected array $userOptions = [];
@@ -353,12 +349,13 @@ protected function copyTwigFunctions(): void
     protected function getHttpFoundationExtension(): HttpFoundationExtension
     {
         /* @var RequestStack $stack */
-        $stack = $this->container->get('request_stack');
+        $stack = $this->stack ?? $this->container->get('request_stack');
 
         /* @var RequestContext $context */
-        $context = $this->container->has('router.request_context')
+        $context = $this->context ?? ($this->container->has('router.request_context')
             ? $this->container->get('router.request_context')
-            : $this->container->get('router')->getContext();
+            : $this->container->get('router')->getContext()
+        );
 
         return new HttpFoundationExtension(new UrlHelper($stack, $context));
     }

diff --git a/src/Pug/Twig/Environment.php b/src/Pug/Twig/Environment.php
@@ -59,7 +59,7 @@ public function getRuntime(string $class)
         try {
             return parent::getRuntime($class);
         } catch (RuntimeError $error) {
-            if (!$this->rootEnv) {
+            if (!($this->rootEnv ?? null)) {
                 throw $error;
             }
 

diff --git a/tests/Pug/AbstractController.php b/tests/Pug/AbstractController.php
diff --git a/tests/Pug/AbstractTestCase.php b/tests/Pug/AbstractTestCase.php
@@ -5,35 +5,53 @@
 use Psr\Container\ContainerInterface;
 use Pug\PugSymfonyEngine;
 use Pug\Twig\Environment;
+use Symfony\Bridge\Twig\Extension\CsrfExtension;
+use Symfony\Bridge\Twig\Extension\CsrfRuntime;
 use Symfony\Bridge\Twig\Form\TwigRendererEngine;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Routing\RequestContext;
 use Twig\Loader\FilesystemLoader;
+use Twig\RuntimeLoader\ContainerRuntimeLoader;
 use Twig\RuntimeLoader\FactoryRuntimeLoader;
 
 abstract class AbstractTestCase extends KernelTestCase
 {
-    protected static $originalFiles = [];
+    protected static array $originalFiles = [];
 
-    protected static $cachePath = __DIR__.'/../project-s5/var/cache/test';
+    protected static string $cachePath = __DIR__.'/../project-s5/var/cache/test';
 
     protected ?Environment $twig = null;
 
     protected ?PugSymfonyEngine $pugSymfony = null;
 
     protected function getTwigEnvironment(): Environment
     {
-        return $this->twig ??= new Environment(new FilesystemLoader(
-            __DIR__.'/../project-s5/templates/',
-        ));
+        if (!isset($this->twig)) {
+            $this->twig = new Environment(new FilesystemLoader(
+                __DIR__.'/../project-s5/templates/',
+            ));
+            $this->twig->addExtension(new CsrfExtension());
+            $this->twig->addRuntimeLoader(new FactoryRuntimeLoader([
+                CsrfRuntime::class => static fn () => new CsrfRuntime(new TestCsrfTokenManager()),
+            ]));
+        }
+
+        return $this->twig;
     }
 
     protected function getPugSymfonyEngine(?KernelInterface $kernel = null): PugSymfonyEngine
     {
         $twig = $this->getTwigEnvironment();
-        $this->pugSymfony ??= new PugSymfonyEngine($kernel ?? self::$kernel, $twig);
+        $this->pugSymfony ??= new PugSymfonyEngine(
+            $kernel ?? self::$kernel,
+            $twig,
+            new RequestStack(),
+            new RequestContext(),
+        );
         $twig->setPugSymfonyEngine($this->pugSymfony);
 
         return $this->pugSymfony;
@@ -100,19 +118,16 @@ public function setUp(): void
         $this->addFormRenderer();
     }
 
-    protected function addFormRenderer(?ContainerInterface $container = null)
+    protected function addFormRenderer()
     {
         require_once __DIR__.'/TestCsrfTokenManager.php';
 
-        /** @var Environment $twig */
-        $twig = ($container ?? self::getContainer())->get('twig');
+        $twig = $this->getTwigEnvironment();
         $csrfManager = new TestCsrfTokenManager();
         $formEngine = new TwigRendererEngine(['form_div_layout.html.twig'], $twig);
 
         $twig->addRuntimeLoader(new FactoryRuntimeLoader([
-            FormRenderer::class => static function () use ($formEngine, $csrfManager) {
-                return new FormRenderer($formEngine, $csrfManager);
-            },
+            FormRenderer::class => static fn () => new FormRenderer($formEngine, $csrfManager),
         ]));
     }
 }