Merge branch 'v2.x' into vv-hash-field-expiration

vladvildanov · web-flow · commit 756efc7e7436 · 2024-07-17T16:00:13.000+03:00
diff --git a/src/Command/Redis/SET.php b/src/Command/Redis/SET.php
@@ -29,7 +29,16 @@ public function getId()
 
     public function setArguments(array $arguments)
     {
+        foreach ($arguments as $index => $value) {
+            if ($index < 2) {
+                continue;
+            }
+
+            if (false === $value || null === $value) {
+                unset($arguments[$index]);
+            }
+        }
+
         parent::setArguments($arguments);
-        $this->filterArguments();
     }
 }
diff --git a/tests/Predis/Command/Redis/SET_Test.php b/tests/Predis/Command/Redis/SET_Test.php
@@ -188,6 +188,32 @@ public function testSetStringDoesNotFailWithExplicitlySetNullArguments(): void
         );
     }
 
+    /**
+     * @group connected
+     * @requiresRedisVersion >= 2.6.12
+     */
+    public function testSetNull(): void
+    {
+        $redis = $this->getClient();
+
+        $this->assertEquals(
+            'OK', $redis->set('foo', null)
+        );
+    }
+
+    /**
+     * @group connected
+     * @requiresRedisVersion >= 2.6.12
+     */
+    public function testSetFalse(): void
+    {
+        $redis = $this->getClient();
+
+        $this->assertEquals(
+            'OK', $redis->set('foo', false)
+        );
+    }
+
     /**
      * @group connected
      * @group cluster

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,16 @@ public function getId()`
`29`	`29`
`30`	`30`	`public function setArguments(array $arguments)`
`31`	`31`	`{`
	`32`	`+ foreach ($arguments as $index => $value) {`
	`33`	`+ if ($index < 2) {`
	`34`	`+ continue;`
	`35`	`+ }`
	`36`	`+`
	`37`	`+ if (false === $value \|\| null === $value) {`
	`38`	`+ unset($arguments[$index]);`
	`39`	`+ }`
	`40`	`+ }`
	`41`	`+`
`32`	`42`	`parent::setArguments($arguments);`
`33`		`- $this->filterArguments();`
`34`	`43`	`}`
`35`	`44`	`}`