Merge pull request #60 from pug-php/fix/root-env

Search runtimes in root environments

Author: kylekatarnls

src/Pug/Twig/Environment.php

@@ -7,6 +7,7 @@
 use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Twig\Environment as TwigEnvironment;
+use Twig\Error\RuntimeError;
 use Twig\Extension\EscaperExtension;
 use Twig\Extension\OptimizerExtension;
 use Twig\Loader\LoaderInterface;
@@ -39,6 +40,11 @@ class Environment extends TwigEnvironment
      */
     public $extensions = [];
 
+    /**
+     * @var TwigEnvironment
+     */
+    public $rootEnv;
+
     public function __construct(LoaderInterface $loader, $options = [])
     {
         parent::__construct($loader, $options);
@@ -56,6 +62,23 @@ public function getRenderer()
         return $this->pugSymfonyEngine->getRenderer();
     }
 
+    public function getRuntime(string $class)
+    {
+        try {
+            return parent::getRuntime($class);
+        } catch (RuntimeError $error) {
+            if (!$this->rootEnv) {
+                throw $error;
+            }
+
+            try {
+                return $this->rootEnv->getRuntime($class);
+            } catch (RuntimeError $_) {
+                throw $error;
+            }
+        }
+    }
+
     public static function fromTwigEnvironment(TwigEnvironment $baseTwig, PugSymfonyEngine $pugSymfonyEngine, ContainerInterface $container)
     {
         $twig = new static($baseTwig->getLoader(), [
@@ -67,6 +90,7 @@ public static function fromTwigEnvironment(TwigEnvironment $baseTwig, PugSymfony
             'auto_reload'      => $baseTwig->isAutoReload(),
             'optimizations'    => static::getPrivateExtensionProperty($baseTwig, OptimizerExtension::class, 'optimizers'),
         ]);
+        $twig->rootEnv = $baseTwig;
 
         $twig->setPugSymfonyEngine($pugSymfonyEngine);
         $twig->setContainer($container);

tests/Pug/PugSymfonyEngineTest.php

@@ -210,7 +210,7 @@ public function testPreRenderCsrfToken()
 
         self::assertSame('<p>Hello</p>', $pugSymfony->renderString('p Hello'));
 
-        self::assertRegExp('/<p>[a-zA-Z0-9_-]{20,}<\/p>/', $pugSymfony->renderString('p=csrf_token("authentificate")'));
+        self::assertRegExp('/<p>[a-zA-Z0-9_-]{20,}<\/p>/', $pugSymfony->renderString('p=csrf_token("authenticate")'));
     }
 
     public function testGetEngine()