Merge branch 'hotline#142649' into 'master'

hotline #142649 upgrade cache key

See merge request !35

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;

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