[Cache] Fixed incorrect usage of UNLINK with PHPRedis with Redis < 4.0

Wickex · nicolas-grekas · commit 4907be12c58f · 2020-12-08T12:01:44.000+01:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -408,7 +408,7 @@ protected function doDelete(array $ids)
 
             if ($unlink) {
                 try {
-                    $this->redis->unlink($ids);
+                    $unlink = false !== $this->redis->unlink($ids);
 
                     return true;
                 } catch (\Throwable $e) {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -93,7 +93,7 @@ protected function doDestroy(string $sessionId): bool
 
         if ($unlink) {
             try {
-                $this->redis->unlink($this->prefix.$sessionId);
+                $unlink = false !== $this->redis->unlink($this->prefix.$sessionId);
 
                 return true;
             } catch (\Throwable $e) {
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -485,17 +485,15 @@ public function cleanup(): void
 
         if ($unlink) {
             try {
-                $this->connection->unlink($this->stream);
-                $this->connection->unlink($this->queue);
+                $unlink = false !== $this->connection->unlink($this->stream, $this->queue);
 
                 return;
             } catch (\Throwable $e) {
                 $unlink = false;
             }
         }
 
-        $this->connection->del($this->stream);
-        $this->connection->del($this->queue);
+        $this->connection->del($this->stream, $this->queue);
     }
 }
 class_alias(Connection::class, \Symfony\Component\Messenger\Transport\RedisExt\Connection::class);

Original file line number	Diff line number	Diff line change
`@@ -485,17 +485,15 @@ public function cleanup(): void`
`485`	`485`
`486`	`486`	`if ($unlink) {`
`487`	`487`	`try {`
`488`		`- $this->connection->unlink($this->stream);`
`489`		`- $this->connection->unlink($this->queue);`
	`488`	`+ $unlink = false !== $this->connection->unlink($this->stream, $this->queue);`
`490`	`489`
`491`	`490`	`return;`
`492`	`491`	`} catch (\Throwable $e) {`
`493`	`492`	`$unlink = false;`
`494`	`493`	`}`
`495`	`494`	`}`
`496`	`495`
`497`		`- $this->connection->del($this->stream);`
`498`		`- $this->connection->del($this->queue);`
	`496`	`+ $this->connection->del($this->stream, $this->queue);`
`499`	`497`	`}`
`500`	`498`	`}`
`501`	`499`	`class_alias(Connection::class, \Symfony\Component\Messenger\Transport\RedisExt\Connection::class);`