feat(view): cache Blade and Twig templates in internal storage (#1061)

innocenzi · web-flow · commit 1e33722b776b · 2025-03-23T18:55:47.000+01:00
diff --git a/src/Tempest/View/src/Renderers/BladeInitializer.php b/src/Tempest/View/src/Renderers/BladeInitializer.php
@@ -10,6 +10,8 @@
 use Tempest\Container\Singleton;
 use Tempest\Reflection\ClassReflector;
 
+use function Tempest\internal_storage_path;
+
 final readonly class BladeInitializer implements DynamicInitializer
 {
     public function canInitialize(ClassReflector $class): bool
@@ -28,7 +30,7 @@ public function initialize(ClassReflector $class, Container $container): object
 
         return new Blade(
             viewPaths: $bladeConfig->viewPaths,
-            cachePath: $bladeConfig->cachePath,
+            cachePath: internal_storage_path($bladeConfig->cachePath ?? 'cache/blade'),
         );
     }
 }
diff --git a/src/Tempest/View/src/Renderers/TwigConfig.php b/src/Tempest/View/src/Renderers/TwigConfig.php
@@ -4,14 +4,16 @@
 
 namespace Tempest\View\Renderers;
 
+use function Tempest\internal_storage_path;
+
 final readonly class TwigConfig
 {
     /**
      * @see \Twig\Environment::__construct()
      */
     public function __construct(
         public array $viewPaths = [],
-        public ?string $cachePath = null,
+        public null|false|string $cachePath = null,
         public bool $debug = false,
         public string $charset = 'utf-8',
         public bool $strictVariables = false,
@@ -28,7 +30,7 @@ public function toArray(): array
             'charset' => $this->charset,
             'strict_variables' => $this->strictVariables,
             'autoescape' => $this->autoescape,
-            'cache' => $this->cachePath ?: false,
+            'cache' => $this->cachePath === false ? false : internal_storage_path($this->cachePath ?? 'cache/twig'),
             'auto_reload' => $this->autoReload,
             'optimizations' => $this->optimizations,
         ];
diff --git a/tests/Integration/View/BladeViewRendererTest.php b/tests/Integration/View/BladeViewRendererTest.php
@@ -9,6 +9,7 @@
 use Tempest\View\ViewConfig;
 use Tempest\View\ViewRenderer;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+
 use function Tempest\view;
 
 /**
@@ -24,18 +25,17 @@ public function test_blade(): void
 
         $this->container->config(new BladeConfig(
             viewPaths: [__DIR__ . '/blade'],
-            cachePath: __DIR__ . '/../../../../.cache/tempest/blade/cache',
+            cachePath: 'blade-cache',
         ));
 
         $renderer = $this->container->get(ViewRenderer::class);
 
         $html = $renderer->render(view('index'));
 
         $this->assertSame(<<<HTML
-            <html>
-            Hi
-            </html>
-            HTML
-            , $html);
+        <html>
+        Hi
+        </html>
+        HTML, $html);
     }
 }
diff --git a/tests/Integration/View/TwigViewRendererTest.php b/tests/Integration/View/TwigViewRendererTest.php
@@ -9,6 +9,7 @@
 use Tempest\View\ViewConfig;
 use Tempest\View\ViewRenderer;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+
 use function Tempest\view;
 
 /**
@@ -24,18 +25,17 @@ public function test_twig(): void
 
         $this->container->config(new TwigConfig(
             viewPaths: [__DIR__ . '/twig'],
-            cachePath: __DIR__ . '/../../../.cache/tempest/twig/cache',
+            cachePath: 'twig-cache',
         ));
 
         $renderer = $this->container->get(ViewRenderer::class);
 
         $html = $renderer->render(view('index.twig', ...['foo' => 'bar']));
 
         $this->assertStringEqualsStringIgnoringLineEndings(<<<HTML
-            <html>
-            <span>bar</span>
-            </html>
-            HTML
-            , $html);
+        <html>
+        <span>bar</span>
+        </html>
+        HTML, $html);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`use Tempest\Container\Singleton;`
`11`	`11`	`use Tempest\Reflection\ClassReflector;`
`12`	`12`
	`13`	`+use function Tempest\internal_storage_path;`
	`14`	`+`
`13`	`15`	`final readonly class BladeInitializer implements DynamicInitializer`
`14`	`16`	`{`
`15`	`17`	`public function canInitialize(ClassReflector $class): bool`
`@@ -28,7 +30,7 @@ public function initialize(ClassReflector $class, Container $container): object`
`28`	`30`
`29`	`31`	`return new Blade(`
`30`	`32`	`viewPaths: $bladeConfig->viewPaths,`
`31`		`- cachePath: $bladeConfig->cachePath,`
	`33`	`+ cachePath: internal_storage_path($bladeConfig->cachePath ?? 'cache/blade'),`
`32`	`34`	`);`
`33`	`35`	`}`
`34`	`36`	`}`