Merge pull request #11136 from cakephp/redis-increment-3x

Fix redis increment/decrement with infinite timeout.

src/Cache/Engine/RedisEngine.php

@@ -177,7 +177,9 @@ public function increment($key, $offset = 1)
         $key = $this->_key($key);
 
         $value = (int)$this->_Redis->incrBy($key, $offset);
-        $this->_Redis->setTimeout($key, $duration);
+        if ($duration > 0) {
+            $this->_Redis->setTimeout($key, $duration);
+        }
 
         return $value;
     }
@@ -195,7 +197,9 @@ public function decrement($key, $offset = 1)
         $key = $this->_key($key);
 
         $value = (int)$this->_Redis->decrBy($key, $offset);
-        $this->_Redis->setTimeout($key, $duration);
+        if ($duration > 0) {
+            $this->_Redis->setTimeout($key, $duration);
+        }
 
         return $value;
     }

tests/TestCase/Cache/Engine/RedisEngineTest.php

@@ -339,6 +339,27 @@ public function testIncrement()
         $this->assertEquals(3, $result);
     }
 
+    /**
+     * Test that increment() and decrement() can live forever.
+     *
+     * @return void
+     */
+    public function testIncrementDecrementForvever()
+    {
+        $this->_configCache(['duration' => 0]);
+        Cache::delete('test_increment', 'redis');
+        Cache::delete('test_decrement', 'redis');
+
+        $result = Cache::increment('test_increment', 1, 'redis');
+        $this->assertEquals(1, $result);
+
+        $result = Cache::decrement('test_decrement', 1, 'redis');
+        $this->assertEquals(-1, $result);
+
+        $this->assertEquals(1, Cache::read('test_increment', 'redis'));
+        $this->assertEquals(-1, Cache::read('test_decrement', 'redis'));
+    }
+
     /**
      * Test that increment and decrement set ttls.
      *