Merge pull request #18 from WyriHaximus/atomic-set-expire

Set expire atomicly

Author: WyriHaximus

src/Redis.php

@@ -68,9 +68,11 @@ public function set($key, $value, $ttl = null)
             });
         }
 
-        return $this->client->set($this->prefix . $key, $value)->then(function () use ($key, $ttl) {
-            return $this->client->expire($this->prefix . $key, $this->ttl > 0 ? $this->ttl : $ttl);
-        })->then(function () {
+        return $this->client->psetex(
+            $this->prefix . $key,
+            ($this->ttl > 0 ? $this->ttl : $ttl) * 1000,
+            $value
+        )->then(function () {
             return resolve(true);
         }, function () {
             return resolve(false);

tests/ClientStub.php

@@ -39,7 +39,7 @@ public function set(): PromiseInterface
         return resolve();
     }
 
-    public function expire(): PromiseInterface
+    public function psetex(): PromiseInterface
     {
         return resolve();
     }
@@ -48,4 +48,9 @@ public function del(): PromiseInterface
     {
         return resolve();
     }
+
+    public function isBusy()
+    {
+        return true;
+    }
 }

tests/RedisTest.php

@@ -62,8 +62,7 @@ public function testSetGlobalTtl(): void
         $key = 'key';
         $value = 'value';
         $ttl = 123;
-        $this->client->set($prefix . $key, $value)->shouldBeCalled()->willReturn(new FulfilledPromise());
-        $this->client->expire($prefix . $key, $ttl)->shouldBeCalled()->willReturn(new FulfilledPromise());
+        $this->client->psetex($prefix . $key, $ttl * 1000, $value)->shouldBeCalled()->willReturn(new FulfilledPromise());
         (new Redis($this->client->reveal(), $prefix, $ttl))->set($key, $value);
     }
 
@@ -73,8 +72,7 @@ public function testSetTtl(): void
         $key = 'key';
         $value = 'value';
         $ttl = 123;
-        $this->client->set($prefix . $key, $value)->shouldBeCalled()->willReturn(new FulfilledPromise());
-        $this->client->expire($prefix . $key, $ttl)->shouldBeCalled()->willReturn(new FulfilledPromise());
+        $this->client->psetex($prefix . $key, $ttl * 1000, $value)->shouldBeCalled()->willReturn(new FulfilledPromise());
         (new Redis($this->client->reveal(), $prefix))->set($key, $value, $ttl);
     }