Merge branch 'json_encode_rather_than_serialize' into 'master'

json encode rather than serialize for cache keys

See merge request !32

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]));
   }
 
 

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']))));
   }
 
 

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;

zf @ 87adcfb2

-Subproject commit e3db88c7dc7e18918e233959cec5e349639a6f58
+Subproject commit 87adcfb235fe76a155b926d0cbbe493ce28bcd80