[FEATURE] Populate and read cacheable state of template path providers

CPS-IT · Jan 15, 2025 · 4dbfbdb · 4dbfbdb
1 parent 518fa53
commit 4dbfbdb
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 7 deletions.
diff --git a/Classes/Renderer/Template/Path/GlobalPathProvider.php b/Classes/Renderer/Template/Path/GlobalPathProvider.php
@@ -70,6 +70,11 @@ public function getTemplateRootPaths(): array
         return $this->templateRootPaths;
     }
 
+    public function isCacheable(): bool
+    {
+        return true;
+    }
+
     public static function getPriority(): int
     {
         return 0;

diff --git a/Classes/Renderer/Template/Path/PathProvider.php b/Classes/Renderer/Template/Path/PathProvider.php
@@ -47,5 +47,7 @@ public function getPartialRootPaths(): array;
      */
     public function getTemplateRootPaths(): array;
 
+    public function isCacheable(): bool;
+
     public static function getPriority(): int;
 }
diff --git a/Classes/Renderer/Template/Path/TypoScriptPathProvider.php b/Classes/Renderer/Template/Path/TypoScriptPathProvider.php
@@ -53,6 +53,11 @@ public function getTemplateRootPaths(): array
         return $this->getViewConfiguration()[self::TEMPLATES] ?? [];
     }
 
+    public function isCacheable(): bool
+    {
+        return true;
+    }
+
     /**
      * @return array{partialRootPaths?: array<int, string>, templateRootPaths?: array<int, string>}
      */

diff --git a/Classes/Renderer/Template/TemplatePaths.php b/Classes/Renderer/Template/TemplatePaths.php
@@ -56,44 +56,63 @@ public function __construct(
      */
     public function getPartialRootPaths(): array
     {
-        if ($this->partialRootPaths === null) {
-            $this->partialRootPaths = $this->resolvePaths(
+        if ($this->partialRootPaths !== null) {
+            // Cached root paths
+            $partialRootPaths = $this->partialRootPaths;
+        } else {
+            // Uncached root paths or net yet resolved
+            $partialRootPaths = $this->resolvePaths(
                 static fn(Path\PathProvider $pathProvider) => $pathProvider->getPartialRootPaths(),
+                $this->partialRootPaths,
             );
         }
 
-        return $this->partialRootPaths;
+        return $partialRootPaths;
     }
 
     /**
      * @return array<int, string>
      */
     public function getTemplateRootPaths(): array
     {
-        if ($this->templateRootPaths === null) {
-            $this->templateRootPaths = $this->resolvePaths(
+        if ($this->templateRootPaths !== null) {
+            // Cached root paths
+            $templateRootPaths = $this->templateRootPaths;
+        } else {
+            // Uncached root paths or net yet resolved
+            $templateRootPaths = $this->resolvePaths(
                 static fn(Path\PathProvider $pathProvider) => $pathProvider->getTemplateRootPaths(),
+                $this->templateRootPaths,
             );
         }
 
-        return $this->templateRootPaths;
+        return $templateRootPaths;
     }
 
     /**
      * @param callable(Path\PathProvider): array<int, string> $mapFunction
      * @return array<int, string>
      */
-    private function resolvePaths(callable $mapFunction): array
+    private function resolvePaths(callable $mapFunction, null &$rootPaths): array
     {
+        $cacheable = true;
         $paths = [];
 
         foreach ($this->pathProviders as $pathProvider) {
             \array_unshift($paths, $mapFunction($pathProvider));
+
+            if (!$pathProvider->isCacheable()) {
+                $cacheable = false;
+            }
         }
 
         $mergedPaths = array_replace(...$paths);
         ksort($mergedPaths);
 
+        if ($cacheable) {
+            $rootPaths = $mergedPaths;
+        }
+
         return $mergedPaths;
     }
 }
diff --git a/Tests/Unit/Fixtures/Classes/Renderer/Template/Path/DummyPathProvider.php b/Tests/Unit/Fixtures/Classes/Renderer/Template/Path/DummyPathProvider.php
@@ -53,6 +53,11 @@ public function getTemplateRootPaths(): array
         return $this->templateRootPaths;
     }
 
+    public function isCacheable(): bool
+    {
+        return true;
+    }
+
     public static function getPriority(): int
     {
         return 10;