OXDEV-10239 Fix template chain cache invalidation on cache clear

Author: moritzdemmer

CHANGELOG-2.x.md

@@ -13,6 +13,7 @@
 
 ### Fixed
 - Rendering template extensions for module templates
+- Invalidate template chain cache on shop cache clear
 
 ### Deprecated
 - Node `$tag` constructor parameter

src/Event/InvalidateTemplateChainCacheEventSubscriber.php

@@ -9,6 +9,7 @@
 
 namespace OxidEsales\Twig\Event;
 
+use OxidEsales\EshopCommunity\Internal\Framework\Cache\Event\ClearShopCacheEvent;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Event\ModuleConfigurationChangedEvent;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Event\FinalizingModuleActivationEvent;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Event\FinalizingModuleDeactivationEvent;
@@ -25,7 +26,7 @@ public function __construct(private readonly TemplateChainCacheInterface $templa
     }
 
     public function invalidateTemplateChainCache(
-        ModuleSetupEvent|ModuleConfigurationChangedEvent|ThemeSettingChangedEvent|ThemeActivatedEvent $event
+        ModuleSetupEvent|ModuleConfigurationChangedEvent|ThemeSettingChangedEvent|ThemeActivatedEvent|ClearShopCacheEvent $event
     ): void
     {
         $this->templateChainCache->invalidate($event->getShopId());
@@ -39,6 +40,7 @@ public static function getSubscribedEvents(): array
             ModuleConfigurationChangedEvent::class   => 'invalidateTemplateChainCache',
             ThemeSettingChangedEvent::class          => 'invalidateTemplateChainCache',
             ThemeActivatedEvent::class              => 'invalidateTemplateChainCache',
+            ClearShopCacheEvent::class              => 'invalidateTemplateChainCache',
         ];
     }
 }

tests/Integration/Event/InvalidateTemplateChainCacheEventSubscriberTest.php

@@ -9,6 +9,7 @@
 
 namespace OxidEsales\Twig\Tests\Integration\Event;
 
+use OxidEsales\EshopCommunity\Internal\Framework\Cache\Event\ClearShopCacheEvent;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleConfiguration;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Event\ModuleConfigurationChangedEvent;
 use OxidEsales\EshopCommunity\Internal\Framework\Theme\Event\ThemeSettingChangedEvent;
@@ -89,6 +90,19 @@ public function testThemeActivatedEventInvalidatesTemplateChainCache(): void
         $this->cache->get(self::TEMPLATE_NAME);
     }
 
+    public function testClearShopCacheEventInvalidatesTemplateChainCache(): void
+    {
+        $this->putCacheEntry();
+
+        $this->eventDispatcher->dispatch(
+            new ClearShopCacheEvent($this->shopId)
+        );
+
+        $this->expectException(TemplateChainCacheNotFoundException::class);
+
+        $this->cache->get(self::TEMPLATE_NAME);
+    }
+
     private function putCacheEntry(): void
     {
         $this->cache->put(