Explorar el Código

Do not parse response to EXPIRE into boolean value.

Daniele Alessandri hace 9 años
padre
commit
b02e3f4911

+ 0 - 8
src/Command/KeyExpire.php

@@ -24,12 +24,4 @@ class KeyExpire extends Command
     {
         return 'EXPIRE';
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
 }

+ 6 - 6
tests/Predis/Command/KeyExpireTest.php

@@ -54,8 +54,8 @@ class KeyExpireTest extends PredisCommandTestCase
     {
         $command = $this->getCommand();
 
-        $this->assertTrue($command->parseResponse(1));
-        $this->assertFalse($command->parseResponse(0));
+        $this->assertSame(0, $command->parseResponse(0));
+        $this->assertSame(1, $command->parseResponse(1));
     }
 
     /**
@@ -65,7 +65,7 @@ class KeyExpireTest extends PredisCommandTestCase
     {
         $redis = $this->getClient();
 
-        $this->assertFalse($redis->expire('foo', 2));
+        $this->assertSame(0, $redis->expire('foo', 2));
     }
 
     /**
@@ -79,7 +79,7 @@ class KeyExpireTest extends PredisCommandTestCase
 
         $redis->set('foo', 'bar');
 
-        $this->assertTrue($redis->expire('foo', 1));
+        $this->assertSame(1, $redis->expire('foo', 1));
         $this->assertSame(1, $redis->ttl('foo'));
 
         $this->sleep(2.0);
@@ -98,7 +98,7 @@ class KeyExpireTest extends PredisCommandTestCase
 
         $redis->set('foo', 'bar');
 
-        $this->assertTrue($redis->expire('foo', 10));
+        $this->assertSame(1, $redis->expire('foo', 10));
         $this->sleep(1.5);
         $this->assertLessThan(10, $redis->ttl('foo'));
     }
@@ -112,7 +112,7 @@ class KeyExpireTest extends PredisCommandTestCase
 
         $redis->set('foo', 'bar');
 
-        $this->assertTrue($redis->expire('foo', -10));
+        $this->assertSame(1, $redis->expire('foo', -10));
         $this->assertSame(0, $redis->exists('foo'));
     }
 }

+ 6 - 6
tests/Predis/Command/KeyPreciseExpireTest.php

@@ -54,8 +54,8 @@ class KeyPreciseExpireTest extends PredisCommandTestCase
     {
         $command = $this->getCommand();
 
-        $this->assertTrue($command->parseResponse(1));
-        $this->assertFalse($command->parseResponse(0));
+        $this->assertSame(0, $command->parseResponse(0));
+        $this->assertSame(1, $command->parseResponse(1));
     }
 
     /**
@@ -65,7 +65,7 @@ class KeyPreciseExpireTest extends PredisCommandTestCase
     {
         $redis = $this->getClient();
 
-        $this->assertFalse($redis->pexpire('foo', 20000));
+        $this->assertSame(0, $redis->pexpire('foo', 20000));
     }
 
     /**
@@ -80,7 +80,7 @@ class KeyPreciseExpireTest extends PredisCommandTestCase
 
         $redis->set('foo', 'bar');
 
-        $this->assertTrue($redis->pexpire('foo', $ttl));
+        $this->assertSame(1, $redis->pexpire('foo', $ttl));
 
         $this->sleep(1.2);
         $this->assertSame(0, $redis->exists('foo'));
@@ -97,7 +97,7 @@ class KeyPreciseExpireTest extends PredisCommandTestCase
 
         $redis->set('foo', 'bar');
 
-        $this->assertTrue($redis->pexpire('foo', $ttl));
+        $this->assertSame(1, $redis->pexpire('foo', $ttl));
 
         $this->sleep(0.5);
         $this->assertLessThanOrEqual($ttl, $redis->pttl('foo'));
@@ -113,7 +113,7 @@ class KeyPreciseExpireTest extends PredisCommandTestCase
 
         $redis->set('foo', 'bar');
 
-        $this->assertTrue($redis->pexpire('foo', -10000));
+        $this->assertSame(1, $redis->pexpire('foo', -10000));
         $this->assertSame(0, $redis->exists('foo'));
     }
 }