Merge pull request #68 from kjnsn/master

Return an integer reply for EXISTS
BedrockStreaming · Jun 4, 2018 · 3c73d01 · 3c73d01
2 parents bd2af73 + e921119
commit 3c73d01
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/src/M6Web/Component/RedisMock/RedisMock.php b/src/M6Web/Component/RedisMock/RedisMock.php
@@ -213,10 +213,10 @@ public function type($key)
     public function exists($key)
     {
         if ($this->deleteOnTtlExpired($key)) {
-            return $this->returnPipedInfo(false);
+            return $this->returnPipedInfo(0);
         }
 
-        return $this->returnPipedInfo(array_key_exists($key, self::$dataValues[$this->storage]));
+        return $this->returnPipedInfo(array_key_exists($key, self::$dataValues[$this->storage]) ? 1 : 0);
     }
 
     public function del($key)

diff --git a/tests/units/RedisMock.php b/tests/units/RedisMock.php
@@ -15,8 +15,8 @@ public function testSetGetDelExists()
         $redisMock = new Redis();
 
         $this->assert
-            ->boolean($redisMock->exists('test'))
-                ->isFalse()
+            ->integer($redisMock->exists('test'))
+                ->isIdenticalTo(0)
             ->variable($redisMock->get('test'))
                 ->isNull()
             ->integer($redisMock->del('test'))
@@ -26,8 +26,8 @@ public function testSetGetDelExists()
                 ->isEqualTo('OK')
             ->string($redisMock->type('test'))
                 ->isEqualTo('string')
-            ->boolean($redisMock->exists('test'))
-                ->isTrue()
+            ->integer($redisMock->exists('test'))
+                ->isEqualTo(1)
             ->string($redisMock->get('test'))
                 ->isEqualTo('something')
             ->integer($redisMock->del('test'))
@@ -36,15 +36,15 @@ public function testSetGetDelExists()
                 ->isNull()
             ->string($redisMock->type('test'))
                 ->isEqualTo('none')
-            ->boolean($redisMock->exists('test'))
-                ->isFalse()
+            ->integer($redisMock->exists('test'))
+                ->isEqualTo(0)
 
             ->string($redisMock->setex('test1', 5, 'something'))
                 ->isEqualTo('OK')
             ->string($redisMock->type('test1'))
                 ->isEqualTo('string')
-            ->boolean($redisMock->exists('test1'))
-                ->isTrue()
+            ->integer($redisMock->exists('test1'))
+                ->isEqualTo(1)
             ->string($redisMock->get('test1'))
                 ->isEqualTo('something')
             ->integer($redisMock->del('test1'))
@@ -53,8 +53,8 @@ public function testSetGetDelExists()
                 ->isNull()
             ->string($redisMock->type('test1'))
                 ->isEqualTo('none')
-            ->boolean($redisMock->exists('test1'))
-                ->isFalse()
+            ->integer($redisMock->exists('test1'))
+                ->isEqualTo(0)
 
             ->string($redisMock->set('test1', 'something'))
                 ->isEqualTo('OK')
@@ -98,12 +98,12 @@ public function testSetGetDelExists()
                 ->isEqualTo('none')
             ->string($redisMock->set('test', 'something', 1))
                 ->isEqualTo('OK')
-            ->boolean($redisMock->exists('test'))
-                ->isTrue();
+            ->integer($redisMock->exists('test'))
+                ->isEqualTo(1);
         sleep(2);
         $this->assert
-            ->boolean($redisMock->exists('test'))
-                ->isFalse();
+            ->integer($redisMock->exists('test'))
+                ->isEqualTo(0);
 
         //setnx
         $this->assert
@@ -1352,8 +1352,8 @@ public function testLPushRPushLRemLTrim()
                 ->isEqualTo(array('test' => array('raoul', 'something')))
             ->string($redisMock->ltrim('test', -1, 0))
                 ->isIdenticalTo('OK')
-            ->boolean($redisMock->exists('test'))
-                ->isIdenticalTo(false)
+            ->integer($redisMock->exists('test'))
+                ->isIdenticalTo(0)
             ->integer($redisMock->lpush('test', 'raoul'))
                 ->isIdenticalTo(1)
             ->array($redisMock->getData())
@@ -1415,12 +1415,12 @@ public function testFlushDb()
         $this->assert
             ->string($redisMock->set('test', 'a'))
                 ->isEqualTo('OK')
-            ->boolean($redisMock->exists('test'))
-                ->isTrue()
+            ->integer($redisMock->exists('test'))
+                ->isEqualTo(1)
             ->string($redisMock->flushdb())
                 ->isEqualTo('OK')
-            ->boolean($redisMock->exists('test'))
-                ->isFalse();
+            ->integer($redisMock->exists('test'))
+                ->isEqualTo(0);
     }
 
     public function testPipeline()
@@ -1646,10 +1646,10 @@ public function testTwoSeparateStorage()
         $redisMock2->selectStorage('alternateStorage');
 
         $this->assert
-            ->boolean($redisMock1->exists('key1'))
-            ->isTrue()
-            ->boolean($redisMock2->exists('key1'))
-            ->isFalse()
+            ->integer($redisMock1->exists('key1'))
+            ->isEqualTo(1)
+            ->integer($redisMock2->exists('key1'))
+            ->isEqualTo(0)
         ;
 
         $redisMock2->set('key1', 'value2');