Merge pull request #8366 from cakephp/issue-8364-3x

3.x - Handle negative numbers in Redis correctly.
cakephp · Feb 27, 2016 · b615cb1 · b615cb1
2 parents d378f11 + 056e99e
commit b615cb1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Cache/Engine/RedisEngine.php b/src/Cache/Engine/RedisEngine.php
@@ -153,11 +153,11 @@ public function read($key)
         $key = $this->_key($key);
 
         $value = $this->_Redis->get($key);
-        if (ctype_digit($value)) {
-            $value = (int)$value;
+        if (preg_match('/^[-]?\d+$/', $value)) {
+            return (int)$value;
         }
         if ($value !== false && is_string($value)) {
-            $value = unserialize($value);
+            return unserialize($value);
         }
         return $value;
     }

diff --git a/tests/TestCase/Cache/Engine/RedisEngineTest.php b/tests/TestCase/Cache/Engine/RedisEngineTest.php
@@ -192,6 +192,23 @@ public function testMultiDatabaseOperations()
         Cache::drop('redisdb1');
     }
 
+    /**
+     * test write numbers method
+     *
+     * @return void
+     */
+    public function testWriteNumbers()
+    {
+        $result = Cache::write('test-counter', 1, 'redis');
+        $this->assertSame(1, Cache::read('test-counter', 'redis'));
+
+        $result = Cache::write('test-counter', 0, 'redis');
+        $this->assertSame(0, Cache::read('test-counter', 'redis'));
+
+        $result = Cache::write('test-counter', -1, 'redis');
+        $this->assertSame(-1, Cache::read('test-counter', 'redis'));
+    }
+
     /**
      * testReadAndWriteCache method
      *