Fixing Twig extension registering

phpstan.neon

@@ -1,5 +1,6 @@
-#parameters:
-#    ignoreErrors:
+parameters:
+    ignoreErrors:
+        - "#Call to an undefined method Twig_ExtensionInterface#"
 
 includes:
     - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon

src/Theme/Extensions/ThemeExtension.php

@@ -7,16 +7,28 @@
 class ThemeExtension extends \Twig_Extension
 {
     /**
-     * @var string
+     * A list of theme URLs (the active one is the last one)
+     *
+     * @var string[]
      */
-    private $themeUrl;
+    private $themeUrls = [];
 
-    public function __construct(string $themeUrl)
+    public function pushThemeUrl(?string $themeUrl): void
     {
+        $this->themeUrls[] = rtrim($themeUrl, '/').'/';
+    }
 
-        $this->themeUrl = rtrim($themeUrl, '/').'/';
+    public function popThemeUrl(): ?string
+    {
+        return array_pop($this->themeUrls);
     }
 
+    private function getThemeUrl(): ?string
+    {
+        return $this->themeUrls[count($this->themeUrls)-1];
+    }
+
+
     /**
      * Returns a list of functions to add to the existing list.
      *
@@ -25,12 +37,12 @@ public function __construct(string $themeUrl)
     public function getFunctions()
     {
         return [
-            new \Twig_Function('theme', [$this, 'getThemeUrl']),
+            new \Twig_Function('theme', [$this, 'getResourceUrl']),
         ];
     }
 
-    public function getThemeUrl(string $resource): string
+    public function getResourceUrl(string $resource): string
     {
-        return $this->themeUrl.$resource;
+        return $this->getThemeUrl().$resource;
     }
-}
+}

src/Theme/TwigTheme.php

@@ -8,6 +8,7 @@
 use TheCodingMachine\CMS\Block\BlockRendererInterface;
 use TheCodingMachine\CMS\CMSException;
 use TheCodingMachine\CMS\RenderableInterface;
+use TheCodingMachine\CMS\Theme\Extensions\ThemeExtension;
 use Zend\Diactoros\Stream;
 
 class TwigTheme implements RenderableInterface
@@ -25,12 +26,17 @@ class TwigTheme implements RenderableInterface
      * @var BlockRendererInterface
      */
     private $blockRenderer;
+    /**
+     * @var string
+     */
+    private $themeUrl;
 
-    public function __construct(\Twig_Environment $twig, string $template, BlockRendererInterface $blockRenderer)
+    public function __construct(\Twig_Environment $twig, string $template, BlockRendererInterface $blockRenderer, string $themeUrl = null)
     {
         $this->twig = $twig;
         $this->template = $template;
         $this->blockRenderer = $blockRenderer;
+        $this->themeUrl = $themeUrl;
     }
 
 
@@ -58,7 +64,18 @@ public function render(array $context): StreamInterface
             $context['page'] = $page;
         }
 
-        $text = $this->twig->render($this->template, $context);
+        if (!$this->twig->hasExtension(ThemeExtension::class)) {
+            $this->twig->addExtension(new ThemeExtension());
+        }
+        $themeExtension = $this->twig->getExtension(ThemeExtension::class);
+        /* @var $themeExtension ThemeExtension */
+
+        $themeExtension->pushThemeUrl($this->themeUrl);
+        try {
+            $text = $this->twig->render($this->template, $context);
+        } finally {
+            $themeExtension->popThemeUrl();
+        }
 
         $stream = new Stream('php://temp', 'wb+');
         $stream->write($text);

src/Theme/TwigThemeFactory.php

@@ -50,13 +50,14 @@ public function createTheme(ThemeDescriptorInterface $descriptor): RenderableInt
         $config = $descriptor->getConfig();
         if (isset($config['theme'])) {
             $twig = clone $this->twig;
-            $twig->addExtension(new ThemeExtension($this->themesUrl.ltrim($config['theme'], '/')));
             $twig->setLoader(new \Twig_Loader_Filesystem($this->themesPath.ltrim($config['theme'], '/')));
+            $themeUrl = $this->themesUrl.ltrim($config['theme'], '/');
         } else {
             $twig = $this->twig;
+            $themeUrl = null;
         }
 
-        return new TwigTheme($twig, $descriptor->getTemplate(), $this->blockRenderer);
+        return new TwigTheme($twig, $descriptor->getTemplate(), $this->blockRenderer, $themeUrl);
     }
 
     /**

tests/Theme/SubThemeTest.php

@@ -7,7 +7,7 @@ class SubThemeTest extends AbstractThemeTestCase
 {
     public function testSubTheme()
     {
-        $twigTheme = new TwigTheme($this->createTwigEnvironment(), 'index.html', $this->createBlockRenderer());
+        $twigTheme = new TwigTheme($this->createTwigEnvironment(), 'index.html', $this->createBlockRenderer(), 'theme');
 
         $subTheme = new SubTheme($twigTheme, ['name' => 'Foo']);
 

tests/Theme/TwigThemeFactoryTest.php

@@ -24,5 +24,12 @@ public function testThemeManagement()
         $result = (string) $twigTheme->render([]);
 
         $this->assertSame('/root_url/foo/bar.js', $result);
+
+        // Let's do it twice (to check if Twig clone works correctly)
+        $twigTheme = $twigThemeFactory->createTheme($descriptor);
+        $result = (string) $twigTheme->render([]);
+
+        $this->assertSame('/root_url/foo/bar.js', $result);
+
     }
 }

tests/Theme/TwigThemeTest.php

@@ -10,7 +10,7 @@ class TwigThemeTest extends AbstractThemeTestCase
 {
     public function testTwigTheme()
     {
-        $twigTheme = new TwigTheme($this->createTwigEnvironment(), 'index.html', $this->createBlockRenderer());
+        $twigTheme = new TwigTheme($this->createTwigEnvironment(), 'index.html', $this->createBlockRenderer(), 'theme_path');
 
         $stream = $twigTheme->render(['name' => 'Foo']);
 
@@ -19,7 +19,7 @@ public function testTwigTheme()
 
     public function testSubBlocks()
     {
-        $twigTheme = new TwigTheme($this->createTwigEnvironment(), 'index.html', $this->createBlockRenderer());
+        $twigTheme = new TwigTheme($this->createTwigEnvironment(), 'index.html', $this->createBlockRenderer(), 'theme_path');
 
         $header = new Block(
             new TwigThemeDescriptor('header.html', []),
@@ -41,7 +41,7 @@ public function testSubBlocks()
 
     public function testException()
     {
-        $twigTheme = new TwigTheme($this->createTwigEnvironment(), 'index.html', $this->createBlockRenderer());
+        $twigTheme = new TwigTheme($this->createTwigEnvironment(), 'index.html', $this->createBlockRenderer(), 'theme_path');
 
         $header = new Block(
             new TwigThemeDescriptor('header.html', []),