Merge branch '10.x'

Author: nunomaduro

src/Illuminate/Cache/RedisTaggedCache.php

@@ -19,16 +19,14 @@ public function add($key, $value, $ttl = null)
         if ($ttl !== null) {
             $seconds = $this->getSeconds($ttl);
 
-            if ($seconds <= 0) {
-                return false;
+            if ($seconds > 0) {
+                $this->tags->addEntry(
+                    $this->itemKey($key),
+                    $seconds
+                );
             }
         }
 
-        $this->tags->addEntry(
-            $this->itemKey($key),
-            $seconds
-        );
-
         return parent::add($key, $value, $ttl);
     }
 
@@ -48,15 +46,13 @@ public function put($key, $value, $ttl = null)
 
         $seconds = $this->getSeconds($ttl);
 
-        if ($seconds <= 0) {
-            return false;
+        if ($seconds > 0) {
+            $this->tags->addEntry(
+                $this->itemKey($key),
+                $seconds
+            );
         }
 
-        $this->tags->addEntry(
-            $this->itemKey($key),
-            $seconds
-        );
-
         return parent::put($key, $value, $ttl);
     }
 

tests/Integration/Cache/RedisStoreTest.php

@@ -76,6 +76,20 @@ public function testItCanStoreNan()
         $this->assertNan(Cache::store('redis')->get('foo'));
     }
 
+    public function testItCanExpireWithZeroTTL()
+    {
+        Cache::store('redis')->clear();
+
+        $result = Cache::store('redis')->put('foo', 10, 10);
+        $this->assertTrue($result);
+
+        $result = Cache::store('redis')->put('foo', 10, 0);
+        $this->assertTrue($result);
+
+        $value = Cache::store('redis')->get('foo');
+        $this->assertNull($value);
+    }
+
     public function testTagsCanBeAccessed()
     {
         Cache::store('redis')->clear();
@@ -146,6 +160,9 @@ public function testPastTtlTagEntriesAreNotAdded()
 
         Cache::store('redis')->tags(['votes'])->add('person-1', 0, new DateTime('yesterday'));
 
+        $value = Cache::store('redis')->tags(['votes'])->get('person-1');
+        $this->assertNull($value);
+
         $keyCount = Cache::store('redis')->connection()->keys('*');
         $this->assertEquals(0, count($keyCount));
     }