Merge branch 'hotfix/allow_null_set_options' into develop

michael-grunder · michael-grunder · commit 11a9292d9660 · 2013-11-18T11:42:27.000-08:00
diff --git a/redis.c b/redis.c
@@ -836,7 +836,9 @@ PHP_METHOD(Redis, set) {
 
     /* Our optional argument can either be a long (to support legacy SETEX */
     /* redirection), or an array with Redis >= 2.6.12 set options */
-    if(z_opts && Z_TYPE_P(z_opts) != IS_LONG && Z_TYPE_P(z_opts) != IS_ARRAY) {
+    if(z_opts && Z_TYPE_P(z_opts) != IS_LONG && Z_TYPE_P(z_opts) != IS_ARRAY
+       && Z_TYPE_P(z_opts) != IS_NULL) 
+    {
         RETURN_FALSE;
     }
 
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -264,6 +264,12 @@ public function testExtendedSet() {
         $this->assertTrue($this->redis->set('foo','barbaz', Array('not-valid','nx','invalid','ex'=>200)));
         $this->assertEquals($this->redis->ttl('foo'), 200);
         $this->assertEquals($this->redis->get('foo'), 'barbaz');
+
+        /* Pass NULL as the optional arguments which should be ignored */
+        $this->redis->del('foo');
+        $this->redis->set('foo','bar', NULL);
+        $this->assertEquals($this->redis->get('foo'), 'bar');
+        $this->assertTrue($this->redis->ttl('foo')<0);
     }
 
     public function testGetSet() {

Original file line number	Diff line number	Diff line change
`@@ -836,7 +836,9 @@ PHP_METHOD(Redis, set) {`
`836`	`836`
`837`	`837`	`/* Our optional argument can either be a long (to support legacy SETEX */`
`838`	`838`	`/* redirection), or an array with Redis >= 2.6.12 set options */`
`839`		`- if(z_opts && Z_TYPE_P(z_opts) != IS_LONG && Z_TYPE_P(z_opts) != IS_ARRAY) {`
	`839`	`+ if(z_opts && Z_TYPE_P(z_opts) != IS_LONG && Z_TYPE_P(z_opts) != IS_ARRAY`
	`840`	`+ && Z_TYPE_P(z_opts) != IS_NULL)`
	`841`	`+ {`
`840`	`842`	`RETURN_FALSE;`
`841`	`843`	`}`
`842`	`844`