OXDEV-7768 Add shop identifier to template cache

OXID-eSales · Feb 12, 2024 · 40a01b3 · 40a01b3
1 parent c5dc25e
commit 40a01b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/TwigEngineConfiguration.php b/src/TwigEngineConfiguration.php
@@ -9,6 +9,7 @@
 
 namespace OxidEsales\Twig;
 
+use OxidEsales\EshopCommunity\Internal\Framework\Templating\Cache\ShopTemplateCacheServiceInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface;
 
 class TwigEngineConfiguration implements TwigEngineConfigurationInterface
@@ -17,6 +18,7 @@ public function __construct(
         private ContextInterface $context,
         private TwigContextInterface $twigContext,
         private bool $disableTemplateCaching,
+        private ShopTemplateCacheServiceInterface $shopTemplateCacheService
     ) {
     }
 
@@ -29,7 +31,9 @@ public function getParameters(): array
     {
         return [
             'debug' => $this->twigContext->getIsDebug(),
-            'cache' => $this->disableTemplateCaching ? false : $this->context->getTemplateCacheDirectory(),
+            'cache' => $this->disableTemplateCaching
+                ? false
+                : $this->shopTemplateCacheService->getShopTemplateCacheDirectory($this->context->getCurrentShopId()),
         ];
     }
 }
diff --git a/tests/Integration/TwigEngine/ControllerRender/ModuleControllerRenderTest.php b/tests/Integration/TwigEngine/ControllerRender/ModuleControllerRenderTest.php
@@ -31,6 +31,8 @@ final class ModuleControllerRenderTest extends TestCase
     ];
     private const THEME = 'testTheme';
 
+    private int $shopID = 1;
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -120,7 +122,7 @@ private function switchDebugMode(bool $enable): void
         $configFile = $this->prophesize(ConfigFile::class);
         $configFile->getVar('sCompileDir')
             ->willReturn(
-                $this->get(ContextInterface::class)->getTemplateCacheDirectory()
+                $this->get(ContextInterface::class)->getTemplateCacheDirectory($this->shopID)
             );
         $configFile->getVar('iDebug')->willReturn($enable);
         Registry::set(ConfigFile::class, $configFile->reveal());