diff --git a/src/Storm/Cache.php b/src/Storm/Cache.php index 354bfe9547363de9b8d73ad0464d48c810396e2e..2b3513f36c5f2793df0edf074b2f594d048f338a 100644 --- a/src/Storm/Cache.php +++ b/src/Storm/Cache.php @@ -143,7 +143,7 @@ class Storm_Cache { public function addSeedToKey($key) { - return md5(serialize([$this->_getRealSeed(), $key])); + return md5(json_encode([$this->_getRealSeed(), $key])); } diff --git a/tests/Storm/CacheTest.php b/tests/Storm/CacheTest.php index 6aaa157cbab5ff84bd620b120fc234dd43bb3f38..bf5a1a6a80e7c751270ca4478f9c020d3cb9b737 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(serialize(['kevin', 'minions'])))); + $this->_backend->load(md5(json_encode(['kevin', 'minions'])))); } @@ -58,7 +58,7 @@ class Storm_CacheTest extends PHPUnit_Framework_TestCase { $this->_cache->save('groo', 'master'); $this->assertEquals('groo', - $this->_backend->load(md5(serialize([$generated_seed, 'master'])))); + $this->_backend->load(md5(json_encode([$generated_seed, 'master'])))); } diff --git a/tests/Storm/Model/TableReconnectTest.php b/tests/Storm/Model/TableReconnectTest.php index 05267e6245a1d50d05abef89268073d31d54dcef..ac0a4663a0f90c1131c774b6cb870781cf243003 100644 --- a/tests/Storm/Model/TableReconnectTest.php +++ b/tests/Storm/Model/TableReconnectTest.php @@ -163,7 +163,9 @@ class Storm_Model_TableReconnectTest extends Storm_Test_ModelTestCase { class Storm_Model_TableReconnectTest_Adapter extends Zend_Db_Adapter_Mysqli { protected $_mock; - public function __construct($config) {} + public function __construct($config) { + $this->setProfiler(false); + } public function setConnection($connection) { $this->_mock = $this->_connection = $connection; diff --git a/zf b/zf index e3db88c7dc7e18918e233959cec5e349639a6f58..87adcfb235fe76a155b926d0cbbe493ce28bcd80 160000 --- a/zf +++ b/zf @@ -1 +1 @@ -Subproject commit e3db88c7dc7e18918e233959cec5e349639a6f58 +Subproject commit 87adcfb235fe76a155b926d0cbbe493ce28bcd80