Merge remote-tracking branch 'nicchap/v1.0' into v1.0

src/Command/StringBitPos.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) Daniele Alessandri <suppakilla@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command;
+
+/**
+ * @link http://redis.io/commands/bitpos
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ */
+class StringBitPos extends Command
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'BITPOS';
+    }
+}

src/Profile/RedisVersion280.php

@@ -234,6 +234,9 @@ class RedisVersion280 extends RedisProfile
 
             /* commands operating on the key space */
             'SCAN'                      => 'Predis\Command\KeyScan',
+            
+            /* commands operating on string values */
+            'BITPOS'                    => 'Predis\Command\StringBitPos',
 
             /* commands operating on sets */
             'SSCAN'                     => 'Predis\Command\SetScan',

src/Profile/RedisVersion300.php

@@ -234,6 +234,9 @@ class RedisVersion300 extends RedisProfile
 
             /* commands operating on the key space */
             'SCAN'                      => 'Predis\Command\KeyScan',
+            
+            /* commands operating on string values */
+            'BITPOS'                    => 'Predis\Command\StringBitPos',
 
             /* commands operating on sets */
             'SSCAN'                     => 'Predis\Command\SetScan',

tests/Predis/Command/StringBitPosTest.php

@@ -0,0 +1,78 @@
+<?php
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) Daniele Alessandri <suppakilla@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace Predis\Command;
+/**
+ * @group commands
+ * @group realm-string
+ */
+class StringBitPosTest extends PredisCommandTestCase
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExpectedCommand()
+    {
+        return 'Predis\Command\StringBitPos';
+    }
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExpectedId()
+    {
+        return 'BITPOS';
+    }
+    /**
+     * @group disconnected
+     */
+    public function testFilterArguments()
+    {
+        $arguments = array('key', 0, 1, 10);
+        $expected = array('key', 0, 1, 10);
+        $command = $this->getCommand();
+        $command->setArguments($arguments);
+        $this->assertSame($expected, $command->getArguments());
+    }
+    /**
+     * @group disconnected
+     */
+    public function testParseResponse()
+    {
+        $raw = 10;
+        $expected = 10;
+        $command = $this->getCommand();
+        $this->assertSame($expected, $command->parseResponse($raw));
+    }
+    /**
+     * @group connected
+     */
+    public function testReturnsBitPosition()
+    {
+        $redis = $this->getClient();
+        $redis->setbit('key', 10, 0);
+        $this->assertSame(0, $redis->bitpos('key', 0), 'Get position of first bit set to 0 - full range');
+        $this->assertSame(-1, $redis->bitpos('key', 1), 'Get position of first bit set to 1 - full range');
+        $this->assertSame(-1, $redis->bitpos('key', 1, 5, 10), 'Get position of first bit set to 1 - specific range');
+        $redis->setbit('key', 5, 1);
+        $this->assertSame(0, $redis->bitpos('key', 0), 'Get position of first bit set to 0 - full range');
+        $this->assertSame(5, $redis->bitpos('key', 1), 'Get position of first bit set to 1 - full range');
+        $this->assertSame(-1, $redis->bitpos('key', 1, 5, 10), 'Get position of first bit set to 1 - specific range');          
+    }
+    /**
+     * @group connected
+     * @expectedException \Predis\Response\ServerException
+     * @expectedExceptionMessage Operation against a key holding the wrong kind of value
+     */
+    public function testThrowsExceptionOnWrongType()
+    {
+        $redis = $this->getClient();
+        $redis->lpush('key', 'list');
+        $redis->bitpos('key', 0);
+    }
+}

tests/Predis/Profile/RedisUnstableTest.php

@@ -175,17 +175,18 @@ class RedisUnstableTest extends PredisProfileTestCase
             134 => 'TIME',
             135 => 'SENTINEL',
             136 => 'SCAN',
-            137 => 'SSCAN',
-            138 => 'ZSCAN',
-            139 => 'ZLEXCOUNT',
-            140 => 'ZRANGEBYLEX',
-            141 => 'ZREMRANGEBYLEX',
-            142 => 'HSCAN',
-            143 => 'PUBSUB',
-            144 => 'PFADD',
-            145 => 'PFCOUNT',
-            146 => 'PFMERGE',
-            147 => 'COMMAND',
+            137 => 'BITPOS',
+            138 => 'SSCAN',
+            139 => 'ZSCAN',
+            140 => 'ZLEXCOUNT',
+            141 => 'ZRANGEBYLEX',
+            142 => 'ZREMRANGEBYLEX',
+            143 => 'HSCAN',
+            144 => 'PUBSUB',
+            145 => 'PFADD',
+            146 => 'PFCOUNT',
+            147 => 'PFMERGE',
+            148 => 'COMMAND',
         );
     }
 }

tests/Predis/Profile/RedisVersion280Test.php

@@ -175,17 +175,18 @@ class RedisVersion280Test extends PredisProfileTestCase
             134 => 'TIME',
             135 => 'SENTINEL',
             136 => 'SCAN',
-            137 => 'SSCAN',
-            138 => 'ZSCAN',
-            139 => 'ZLEXCOUNT',
-            140 => 'ZRANGEBYLEX',
-            141 => 'ZREMRANGEBYLEX',
-            142 => 'HSCAN',
-            143 => 'PUBSUB',
-            144 => 'PFADD',
-            145 => 'PFCOUNT',
-            146 => 'PFMERGE',
-            147 => 'COMMAND',
+            137 => 'BITPOS',
+            138 => 'SSCAN',
+            139 => 'ZSCAN',
+            140 => 'ZLEXCOUNT',
+            141 => 'ZRANGEBYLEX',
+            142 => 'ZREMRANGEBYLEX',
+            143 => 'HSCAN',
+            144 => 'PUBSUB',
+            145 => 'PFADD',
+            146 => 'PFCOUNT',
+            147 => 'PFMERGE',
+            148 => 'COMMAND',
         );
     }
 }

tests/Predis/Profile/RedisVersion300Test.php

@@ -175,17 +175,18 @@ class RedisVersion300Test extends PredisProfileTestCase
             134 => 'TIME',
             135 => 'SENTINEL',
             136 => 'SCAN',
-            137 => 'SSCAN',
-            138 => 'ZSCAN',
-            139 => 'ZLEXCOUNT',
-            140 => 'ZRANGEBYLEX',
-            141 => 'ZREMRANGEBYLEX',
-            142 => 'HSCAN',
-            143 => 'PUBSUB',
-            144 => 'PFADD',
-            145 => 'PFCOUNT',
-            146 => 'PFMERGE',
-            147 => 'COMMAND',
+            137 => 'BITPOS',
+            138 => 'SSCAN',
+            139 => 'ZSCAN',
+            140 => 'ZLEXCOUNT',
+            141 => 'ZRANGEBYLEX',
+            142 => 'ZREMRANGEBYLEX',
+            143 => 'HSCAN',
+            144 => 'PUBSUB',
+            145 => 'PFADD',
+            146 => 'PFCOUNT',
+            147 => 'PFMERGE',
+            148 => 'COMMAND',
         );
     }
 }