Merge pull request #11323 from ifsnow/2.0.x-fix-issue-11322

Fixed cache backends bug #11322
phalcon · Jan 21, 2016 · 02e0814 · 02e0814
2 parents e7e9c93 + 9320aad
commit 02e0814
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Fixed `Phalcon\Translate\Adapter\Gettext::setLocale` bug[#11311](https://github.com/phalcon/cphalcon/issues/11311) related to the incorrect setting locale
 - Added ability to persistent connection in `Phalcon\Queue\Beanstalk::connect`
 - Fixed `Phalcon\Http\Response::redirect` bug[#11324](https://github.com/phalcon/cphalcon/issues/11324). Incorrect initialization local array of status codes
+- Fixed cache backends bug[#11322](https://github.com/phalcon/cphalcon/issues/11322) related to saving number 0
 
 # [2.0.9](https://github.com/phalcon/cphalcon/releases/tag/phalcon-v2.0.9) (2015-11-24)
 - Fixed bug that double serializes data using Redis adapter

diff --git a/phalcon/cache/backend/file.zep b/phalcon/cache/backend/file.zep
@@ -176,7 +176,7 @@ class File extends Backend implements BackendInterface
 	{
 		var lastKey, frontend, cacheDir, isBuffering, cacheFile, cachedContent, preparedContent, status;
 
-		if !keyName {
+		if keyName === null {
 			let lastKey = this->_lastKey;
 		} else {
 			let lastKey = this->_prefix . this->getKey(keyName);
@@ -194,7 +194,7 @@ class File extends Backend implements BackendInterface
 
 		let cacheFile = cacheDir . lastKey;
 
-		if !content {
+		if content === null {
 			let cachedContent = frontend->getContent();
 		} else {
 			let cachedContent = content;

diff --git a/phalcon/cache/backend/libmemcached.zep b/phalcon/cache/backend/libmemcached.zep
@@ -167,7 +167,7 @@ class Libmemcached extends Backend implements BackendInterface
 		var lastKey, frontend, memcache, cachedContent, preparedContent, tmp, tt1, success, options,
 			specialKey, keys, isBuffering;
 
-		if !keyName {
+		if keyName === null {
 			let lastKey = this->_lastKey;
 		} else {
 			let lastKey = this->_prefix . keyName;
@@ -188,7 +188,7 @@ class Libmemcached extends Backend implements BackendInterface
 			let memcache = this->_memcache;
 		}
 
-		if !content {
+		if content === null {
 			let cachedContent = frontend->getContent();
 		} else {
 			let cachedContent = content;
@@ -201,7 +201,7 @@ class Libmemcached extends Backend implements BackendInterface
 			let preparedContent = frontend->beforeStore(cachedContent);
 		}
 
-		if !lifetime {
+		if lifetime === null {
 			let tmp = this->_lastLifetime;
 
 			if !tmp {

diff --git a/phalcon/cache/backend/memcache.zep b/phalcon/cache/backend/memcache.zep
@@ -162,7 +162,7 @@ class Memcache extends Backend implements BackendInterface
 		var lastKey, frontend, memcache, cachedContent, preparedContent, tmp, ttl, success, options,
 			specialKey, keys, isBuffering;
 
-		if !keyName {
+		if keyName === null {
 			let lastKey = this->_lastKey;
 		} else {
 			let lastKey = this->_prefix . keyName;
@@ -183,7 +183,7 @@ class Memcache extends Backend implements BackendInterface
 			let memcache = this->_memcache;
 		}
 
-		if typeof content == "null" {
+		if content === null {
 			let cachedContent = frontend->getContent();
 		} else {
 			let cachedContent = content;
@@ -194,7 +194,7 @@ class Memcache extends Backend implements BackendInterface
 		 */
 		let preparedContent = frontend->beforeStore(cachedContent);
 
-		if typeof lifetime == "null" {
+		if lifetime === null {
 			let tmp = this->_lastLifetime;
 
 			if !tmp {

diff --git a/phalcon/cache/backend/mongo.zep b/phalcon/cache/backend/mongo.zep
@@ -194,7 +194,7 @@ class Mongo extends Backend implements BackendInterface
 		let conditions = [];
 		let data = [];
 
-		if !keyName {
+		if keyName === null {
 			let lastkey = this->_lastKey;
 		} else {
 			let prefix = this->_prefix;
@@ -206,7 +206,7 @@ class Mongo extends Backend implements BackendInterface
 		}
 
 		let frontend = this->_frontend;
-		if !content {
+		if content === null {
 			let cachedContent = frontend->getContent();
 		} else {
 			let cachedContent = content;
@@ -216,7 +216,7 @@ class Mongo extends Backend implements BackendInterface
 			let preparedContent = frontend->beforeStore(cachedContent);
 		}
 
-		if !lifetime {
+		if lifetime === null {
 			let tmp = this->_lastLifetime;
 			if !tmp {
 				let ttl = frontend->getLifetime();

diff --git a/phalcon/cache/backend/redis.zep b/phalcon/cache/backend/redis.zep
@@ -184,7 +184,7 @@ class Redis extends Backend implements BackendInterface
 		var prefixedKey, lastKey, prefix, frontend, redis, cachedContent, preparedContent,
 			tmp, tt1, success, options, specialKey, isBuffering;
 
-		if !keyName {
+		if keyName === null {
 			let lastKey = this->_lastKey;
 			let prefixedKey = substr(lastKey, 5);
 		} else {
@@ -208,7 +208,7 @@ class Redis extends Backend implements BackendInterface
 			let redis = this->_redis;
 		}
 
-		if !content {
+		if content === null {
 			let cachedContent = frontend->getContent();
 		} else {
 			let cachedContent = content;
@@ -221,7 +221,7 @@ class Redis extends Backend implements BackendInterface
 			let preparedContent = frontend->beforeStore(cachedContent);
 		}
 
-		if !lifetime {
+		if lifetime === null {
 			let tmp = this->_lastLifetime;
 
 			if !tmp {

diff --git a/phalcon/cache/backend/xcache.zep b/phalcon/cache/backend/xcache.zep
@@ -109,7 +109,7 @@ class Xcache extends Backend implements BackendInterface
 		var lastKey, frontend, cachedContent, preparedContent, tmp, tt1, success, isBuffering,
 			options, keys, specialKey;
 
-		if !keyName {
+		if keyName === null {
 			let lastKey = this->_lastKey;
 		} else {
 			let lastKey = "_PHCX" . this->_prefix . keyName;
@@ -120,7 +120,7 @@ class Xcache extends Backend implements BackendInterface
 		}
 
 		let frontend = this->_frontend;
-		if !content {
+		if content === null {
 			let cachedContent = frontend->getContent();
 		} else {
 			let cachedContent = content;
@@ -133,7 +133,7 @@ class Xcache extends Backend implements BackendInterface
 		/**
 		 * Take the lifetime from the frontend or read it from the set in start()
 		 */
-		if !lifetime {
+		if lifetime === null {
 			let tmp = this->_lastLifetime;
 			if !tmp {
 				let tt1 = frontend->getLifetime();

diff --git a/unit-tests/CacheTest.php b/unit-tests/CacheTest.php
@@ -158,6 +158,20 @@ public function testDataFileCache()
 		//Delete
 		$this->assertTrue($cache->delete('test-data'));
 
+		// Save & Get : zero string, zero number, false
+		$testSets = array(
+			'test-zero-data' => '0',
+			'test-0-data' => 0,
+			'test-false-data' => false
+		);
+
+		foreach($testSets as $key => $value) {
+			$cache->save($key, $value);
+			$this->assertTrue(file_exists('unit-tests/cache/'.$cache->getKey($key)));
+
+			$cachedContent = $cache->get($key);
+			$this->assertEquals($cachedContent, $value);
+		}
 	}
 
 	public function testDataFileCacheIncrement()