[Cache] cache improvements - decorate Pimcore CoreCacheHandler

coreshop · Oct 20, 2023 · 140d2c5 · 140d2c5
1 parent 5cf61f1
commit 140d2c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/CoreShop/Behat/Context/Domain/CacheContext.php b/src/CoreShop/Behat/Context/Domain/CacheContext.php
@@ -82,22 +82,22 @@ public function theCacheItemSerializedShouldLookLikeTheKnownOne(CacheItem $cache
             $itemData = serialize($itemData);
         }
 
-        $unserializedNull = unserialize($itemData, ['allowed_classes' => false]);
+        $serializedNull = unserialize($itemData, ['allowed_classes' => false]);
 
-        function convertToStdClass(\__PHP_Incomplete_Class $object)
+        $convertToStdClass = static function(\__PHP_Incomplete_Class $object)
         {
-            $fixKey = function ($matches) {
-                return ":".strlen($matches[1]).":\"".$matches[1]."\"";
-            };
-
             $dump = serialize($object);
             $dump = preg_replace('/^O:\d+:"[^"]++"/', 'O:8:"stdClass"', $dump);
-            $dump = preg_replace_callback('/:\d+:"\0.*?\0([^"]+)"/', $fixKey, $dump);
+            $dump = preg_replace_callback(
+                '/:\d+:"\0.*?\0([^"]+)"/',
+                static fn($matches) => ":".strlen($matches[1]).":\"".$matches[1]."\"",
+                $dump
+            );
 
             return unserialize($dump);
-        }
+        };
 
-        $stdClass = convertToStdClass($unserializedNull);
+        $stdClass = $convertToStdClass($serializedNull);
 
         $cacheValue = $stdClass->{$property};
 

diff --git a/src/CoreShop/Behat/Context/Setup/CacheContext.php b/src/CoreShop/Behat/Context/Setup/CacheContext.php
@@ -38,7 +38,8 @@ public function iCacheObjectWithKey(mixed $object, string $key): void
     {
         if ($object instanceof Concrete) {
             Cache::getHandler()->removeClearedTags(['object_'.$object->getId()]);
-            }
+            Cache::getHandler()->removeClearedTags(['cs_'.$object->getClassId()]);
+        }
 
         Assert::true(Cache::getHandler()->save($key, $object, ['behat'], null, 0, true));