Added SRANDMEMBER, reported by Virtuall on IRC.

Author: nicolasff

README.markdown

@@ -502,7 +502,23 @@ $redis->sAdd('key1' , 'set2');
 $redis->sAdd('key1' , 'set3'); /* 'key1' => {'set3', 'set1', 'set2'}*/
 $redis->sPop('key1'); /* 'set1', 'key1' => {'set3', 'set2'} */
 $redis->sPop('key1'); /* 'set3', 'key1' => {'set2'} */
+</pre>
 
+## sRandMember
+##### *Description*
+Returns a random element from the set value at Key, without removing it.
+##### *Parameters*
+*key*
+##### *Return value*
+*String* value from the set  
+*Bool* `FALSE` if set identified by key is empty or doesn't exist.
+##### *Example*
+<pre>
+$redis->sAdd('key1' , 'set1'); 
+$redis->sAdd('key1' , 'set2'); 
+$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set3', 'set1', 'set2'}*/
+$redis->sRandMember('key1'); /* 'set1', 'key1' => {'set3', 'set1', 'set2'} */
+$redis->sRandMember('key1'); /* 'set3', 'key1' => {'set3', 'set1', 'set2'} */
 </pre>
 
 ## sInter

php_redis.h

@@ -59,6 +59,7 @@ PHP_METHOD(Redis, sSize);
 PHP_METHOD(Redis, sRemove);
 PHP_METHOD(Redis, sMove);
 PHP_METHOD(Redis, sPop);
+PHP_METHOD(Redis, sRandMember);
 PHP_METHOD(Redis, sContains);
 PHP_METHOD(Redis, sMembers);
 PHP_METHOD(Redis, sInter);

redis.c

@@ -83,6 +83,7 @@ static zend_function_entry redis_functions[] = {
      PHP_ME(Redis, sRemove, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, sMove, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, sPop, NULL, ZEND_ACC_PUBLIC)
+     PHP_ME(Redis, sRandMember, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, sContains, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, sMembers, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, sInter, NULL, ZEND_ACC_PUBLIC)
@@ -1601,6 +1602,15 @@ PHP_METHOD(Redis, sPop)
 }
 /* }}} */
 
+/* }}} */
+/* {{{ proto string Redis::sRandMember(string key)
+ */
+PHP_METHOD(Redis, sRandMember)
+{
+    generic_pop_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "SRANDMEMBER", 11 TSRMLS_CC);
+}
+/* }}} */
+
 /* {{{ proto boolean Redis::sContains(string set, string value)
  */
 PHP_METHOD(Redis, sContains)

tests/TestRedis.php

@@ -760,13 +760,35 @@ public function testsPop()
         $this->redis->sAdd('set0', 'val2');
 
 	$v0 = $this->redis->sPop('set0');
+	$this->assertTrue(1 === $this->redis->sSize('set0'));
 	$this->assertTrue($v0 === 'val' || $v0 === 'val2');
 	$v1 = $this->redis->sPop('set0');
+	$this->assertTrue(0 === $this->redis->sSize('set0'));
 	$this->assertTrue(($v0 === 'val' && $v1 === 'val2') || ($v1 === 'val' && $v0 === 'val2'));
 
 	$this->assertTrue($this->redis->sPop('set0') === FALSE);
     }
 
+    public function testsRandMember() {
+	$this->redis->delete('set0');
+	$this->assertTrue($this->redis->sRandMember('set0') === FALSE);
+
+	$this->redis->sAdd('set0', 'val');
+	$this->redis->sAdd('set0', 'val2');
+
+	$got = array();
+	while(true) {
+	    $v = $this->redis->sRandMember('set0');
+	    $this->assertTrue(2 === $this->redis->sSize('set0')); // no change.
+	    $this->assertTrue($v === 'val' || $v === 'val2');
+
+	    $got[$v] = $v;
+	    if(count($got) == 2) {
+	        break;
+	    }
+	}
+    }
+
     public function testsContains()
     {
         $this->redis->delete('set');