Merge branch 'next-34478/force-cache-invalidation' into 'trunk'

NEXT-34478 - Remove force cache invalidation when changing snippets See merge request shopware/6/product/platform!13391
pweyck · Mar 20, 2024 · 4c47132 · 4c47132
2 parents f95236f + 6f50663
commit 4c47132
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/changelog/_unreleased/2024-03-20-snippet-cache-invalidation.md b/changelog/_unreleased/2024-03-20-snippet-cache-invalidation.md
@@ -0,0 +1,9 @@
+---
+title: Snippet cache invalidation
+issue: NEXT-34478
+author: oskroblin Skroblin
+author_email: [email protected]
+---
+
+# Core
+* Changed cache invalidation behavior when changing snippets. Invalidation now acts like all other cache invalidations, when delayed cached is configured.
diff --git a/src/Core/Framework/Adapter/Translation/TranslatorCacheInvalidate.php b/src/Core/Framework/Adapter/Translation/TranslatorCacheInvalidate.php
@@ -66,6 +66,6 @@ private function clearCache(array $snippetSetIds): void
 
         $snippetSetCacheKeys = array_map(fn (string $setId) => 'translation.catalog.' . $setId, $snippetSetIds);
 
-        $this->cacheInvalidator->invalidate($snippetSetCacheKeys, true);
+        $this->cacheInvalidator->invalidate($snippetSetCacheKeys);
     }
 }
diff --git a/src/Storefront/Theme/CachedResolvedConfigLoaderInvalidator.php b/src/Storefront/Theme/CachedResolvedConfigLoaderInvalidator.php
@@ -63,7 +63,7 @@ public function assigned(ThemeAssignedEvent $event): void
 
         $salesChannelId = $event->getSalesChannelId();
 
-        $this->cacheInvalidator->invalidate(['translation.catalog.' . $salesChannelId], true);
+        $this->cacheInvalidator->invalidate(['translation.catalog.' . $salesChannelId]);
     }
 
     public function reset(ThemeConfigResetEvent $event): void

diff --git a/tests/unit/Core/Framework/Adapter/Translation/TranslatorCacheInvalidateTest.php b/tests/unit/Core/Framework/Adapter/Translation/TranslatorCacheInvalidateTest.php
@@ -94,7 +94,7 @@ public function testInvalidateWithSnippetEvent(): void
         $this->cacheInvalidator->expects(static::once())->method('invalidate')->with([
             'translation.catalog.' . $ids->get('snippetSet1'),
             'translation.catalog.' . $ids->get('snippetSet2'),
-        ], true);
+        ], false);
 
         $this->translatorCacheInvalidate->invalidate($event);
     }
@@ -129,7 +129,7 @@ public function testInvalidateWithSnippetSetEvent(): void
         $this->cacheInvalidator->expects(static::once())->method('invalidate')->with([
             'translation.catalog.' . $ids->get('snippetSet1'),
             'translation.catalog.' . $ids->get('snippetSet2'),
-        ], true);
+        ], false);
 
         $this->translatorCacheInvalidate->invalidate($event);
     }