From 01c8ba7e46869ea4a85f0ce4ab37d45aea125e1e Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Thu, 21 Oct 2021 11:23:28 +0200
Subject: [PATCH] hotline #142649 upgrade cache key
---
src/Storm/Cache.php | 11 +++++++++--
tests/Storm/CacheTest.php | 5 ++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/Storm/Cache.php b/src/Storm/Cache.php
index 2b3513f3..c49b8331 100644
--- a/src/Storm/Cache.php
+++ b/src/Storm/Cache.php
@@ -82,17 +82,18 @@ class Storm_Cache {
}
-
public function setEnabled($enabled) {
$this->_enabled = $enabled;
return $this;
}
+
public function setCache($zend_cache) {
$this->_zend_cache = $zend_cache;
return $this;
}
+
public function memoize($key, $callback) {
if(!$this->_enabled)
return $callback();
@@ -105,6 +106,7 @@ class Storm_Cache {
return $data;
}
+
public function getCache() {
if(!isset($this->_zend_cache))
$this->_zend_cache = static::getDefaultZendCache();
@@ -143,7 +145,7 @@ class Storm_Cache {
public function addSeedToKey($key) {
- return md5(json_encode([$this->_getRealSeed(), $key]));
+ return $this->_getRealSeed() . '_' . md5(json_encode([$key]));
}
@@ -166,6 +168,11 @@ class Storm_Cache {
}
+ public function getRealSeed() {
+ return $this->_getRealSeed();
+ }
+
+
public function clean(){
static::$_real_seed = $this->_generateRealSeed();
return $this;
diff --git a/tests/Storm/CacheTest.php b/tests/Storm/CacheTest.php
index bf5a1a6a..57dd810c 100644
--- a/tests/Storm/CacheTest.php
+++ b/tests/Storm/CacheTest.php
@@ -45,7 +45,7 @@ class Storm_CacheTest extends PHPUnit_Framework_TestCase {
$this->_cache->save('too much', 'minions');
$this->assertEquals('too much',
- $this->_backend->load(md5(json_encode(['kevin', 'minions']))));
+ $this->_backend->load('kevin_' . md5(json_encode(['minions']))));
}
@@ -58,7 +58,7 @@ class Storm_CacheTest extends PHPUnit_Framework_TestCase {
$this->_cache->save('groo', 'master');
$this->assertEquals('groo',
- $this->_backend->load(md5(json_encode([$generated_seed, 'master']))));
+ $this->_backend->load($generated_seed.'_'.md5(json_encode([ 'master']))));
}
@@ -84,5 +84,4 @@ class Storm_CacheTest extends PHPUnit_Framework_TestCase {
$generated_seed = $this->_backend->load('ban_ana');
$this->assertContains('ban_ana_', $generated_seed);
}
-
}
\ No newline at end of file
--
GitLab