SRANDMEMBER can return any type because of serialization.

michael-grunder · michael-grunder · commit 6673b5b2bed7 · 2024-07-13T23:12:25.000-07:00
diff --git a/redis.stub.php b/redis.stub.php
@@ -2826,7 +2826,7 @@ public function sPop(string $key, int $count = 0): Redis|string|array|false;
      * @example $redis->sRandMember('myset', 10);
      * @example $redis->sRandMember('myset', -10);
      */
-    public function sRandMember(string $key, int $count = 0): Redis|string|array|false;
+    public function sRandMember(string $key, int $count = 0): mixed;
 
     /**
      * Returns the union of one or more Redis SET keys.
diff --git a/redis_arginfo.h b/redis_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 70b942571cb2e3ef0b2531492840d9207f693b00 */
+ * Stub hash: a888154a03dc0edbe479e0226f012a34c7cb4100 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
@@ -750,7 +750,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_sPop, 0, 1, Redi
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, count, IS_LONG, 0, "0")
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_Redis_sRandMember arginfo_class_Redis_sPop
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_sRandMember, 0, 1, IS_MIXED, 0)
+	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, count, IS_LONG, 0, "0")
+ZEND_END_ARG_INFO()
 
 #define arginfo_class_Redis_sUnion arginfo_class_Redis_sDiff
 
diff --git a/redis_legacy_arginfo.h b/redis_legacy_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 70b942571cb2e3ef0b2531492840d9207f693b00 */
+ * Stub hash: a888154a03dc0edbe479e0226f012a34c7cb4100 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, options)
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -1697,6 +1697,13 @@ public function testsRandMember() {
             $this->assertInArray($reply_mem, $mems);
         }
 
+        /* Ensure we can handle basically any return type */
+        foreach ([3.1415, new stdClass(), 42, 'hello', NULL] as $val) {
+            $this->assertEquals(1, $this->redis->del('set0'));
+            $this->assertEquals(1, $this->redis->sadd('set0', $val));
+            $this->assertSameType($val, $this->redis->srandmember('set0'));
+        }
+
         $this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);
     }
 
diff --git a/tests/TestSuite.php b/tests/TestSuite.php
@@ -237,6 +237,15 @@ protected function assertIsInt($v): bool {
         return false;
     }
 
+    protected function assertIsFloat($v): bool {
+        if (is_float($v))
+            return true;
+
+        self::$errors []= $this->assertionTrace("%s is not a float", $this->printArg($v));
+
+        return false;
+    }
+
     protected function assertIsObject($v, ?string $type = NULL): bool {
         if ( ! is_object($v)) {
             self::$errors []= $this->assertionTrace("%s is not an object", $this->printArg($v));
@@ -250,6 +259,17 @@ protected function assertIsObject($v, ?string $type = NULL): bool {
         return true;
     }
 
+    protected function assertSameType($expected, $actual): bool {
+        if (gettype($expected) === gettype($actual))
+            return true;
+
+        self::$errors []= $this->assertionTrace("%s is not the same type as %s",
+                                                $this->printArg($actual),
+                                                $this->printArg($expected));
+
+        return false;
+    }
+
     protected function assertIsArray($v, ?int $size = null): bool {
         if ( ! is_array($v)) {
             self::$errors []= $this->assertionTrace("%s is not an array", $this->printArg($v));

Original file line number	Diff line number	Diff line change
`@@ -1697,6 +1697,13 @@ public function testsRandMember() {`
`1697`	`1697`	`$this->assertInArray($reply_mem, $mems);`
`1698`	`1698`	`}`
`1699`	`1699`
	`1700`	`+ /* Ensure we can handle basically any return type */`
	`1701`	`+ foreach ([3.1415, new stdClass(), 42, 'hello', NULL] as $val) {`
	`1702`	`+ $this->assertEquals(1, $this->redis->del('set0'));`
	`1703`	`+ $this->assertEquals(1, $this->redis->sadd('set0', $val));`
	`1704`	`+ $this->assertSameType($val, $this->redis->srandmember('set0'));`
	`1705`	`+ }`
	`1706`	`+`
`1700`	`1707`	`$this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);`
`1701`	`1708`	`}`
`1702`	`1709`