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

Wickex · nicolas-grekas · commit 9363f3b9730b · 2020-12-08T12:04:54.000+01:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -408,15 +408,15 @@ protected function doDelete(array $ids)
 
             if ($unlink) {
                 try {
-                    $this->redis->unlink($ids);
-
-                    return true;
+                    $unlink = false !== $this->redis->unlink($ids);
                 } catch (\Throwable $e) {
                     $unlink = false;
                 }
             }
 
-            $this->redis->del($ids);
+            if (!$unlink) {
+                $this->redis->del($ids);
+            }
         }
 
         return true;
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php
@@ -93,15 +93,15 @@ protected function doDestroy(string $sessionId): bool
 
         if ($unlink) {
             try {
-                $this->redis->unlink($this->prefix.$sessionId);
-
-                return true;
+                $unlink = false !== $this->redis->unlink($this->prefix.$sessionId);
             } catch (\Throwable $e) {
                 $unlink = false;
             }
         }
 
-        $this->redis->del($this->prefix.$sessionId);
+        if (!$unlink) {
+            $this->redis->del($this->prefix.$sessionId);
+        }
 
         return true;
     }
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);
-
-                return;
+                $unlink = false !== $this->connection->unlink($this->stream, $this->queue);
             } catch (\Throwable $e) {
                 $unlink = false;
             }
         }
 
-        $this->connection->del($this->stream);
-        $this->connection->del($this->queue);
+        if (!$unlink) {
+            $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
`@@ -408,15 +408,15 @@ protected function doDelete(array $ids)`
`408`	`408`
`409`	`409`	`if ($unlink) {`
`410`	`410`	`try {`
`411`		`- $this->redis->unlink($ids);`
`412`		`-`
`413`		`- return true;`
	`411`	`+ $unlink = false !== $this->redis->unlink($ids);`
`414`	`412`	`} catch (\Throwable $e) {`
`415`	`413`	`$unlink = false;`
`416`	`414`	`}`
`417`	`415`	`}`
`418`	`416`
`419`		`- $this->redis->del($ids);`
	`417`	`+ if (!$unlink) {`
	`418`	`+ $this->redis->del($ids);`
	`419`	`+ }`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -93,15 +93,15 @@ protected function doDestroy(string $sessionId): bool`
`93`	`93`
`94`	`94`	`if ($unlink) {`
`95`	`95`	`try {`
`96`		`- $this->redis->unlink($this->prefix.$sessionId);`
`97`		`-`
`98`		`- return true;`
	`96`	`+ $unlink = false !== $this->redis->unlink($this->prefix.$sessionId);`
`99`	`97`	`} catch (\Throwable $e) {`
`100`	`98`	`$unlink = false;`
`101`	`99`	`}`
`102`	`100`	`}`
`103`	`101`
`104`		`- $this->redis->del($this->prefix.$sessionId);`
	`102`	`+ if (!$unlink) {`
	`103`	`+ $this->redis->del($this->prefix.$sessionId);`
	`104`	`+ }`
`105`	`105`
`106`	`106`	`return true;`
`107`	`107`	`}`
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);`
`490`		`-`
`491`		`- return;`
	`488`	`+ $unlink = false !== $this->connection->unlink($this->stream, $this->queue);`
`492`	`489`	`} catch (\Throwable $e) {`
`493`	`490`	`$unlink = false;`
`494`	`491`	`}`
`495`	`492`	`}`
`496`	`493`
`497`		`- $this->connection->del($this->stream);`
`498`		`- $this->connection->del($this->queue);`
	`494`	`+ if (!$unlink) {`
	`495`	`+ $this->connection->del($this->stream, $this->queue);`
	`496`	`+ }`
`499`	`497`	`}`
`500`	`498`	`}`
`501`	`499`	`class_alias(Connection::class, \Symfony\Component\Messenger\Transport\RedisExt\Connection::class);`