diff --git a/src/Storm/Cache.php b/src/Storm/Cache.php index 2b3513f36c5f2793df0edf074b2f594d048f338a..c49b8331cfd4426a9bed81cd5b54ad60c2d86076 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 bf5a1a6a80e7c751270ca4478f9c020d3cb9b737..57dd810c9c85d5f765bcb6032e9f674624a0d16d 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