Commit9363f3b

authored and

committed

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

1 parent2b36487 commit9363f3bCopy full SHA for 9363f3b

File tree

+12

-14

lines changed

+12

-14

lines changed

Lines changed: 4 additions & 4 deletions

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`		`-returntrue;`
	`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`	`returntrue;`

Lines changed: 4 additions & 4 deletions

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`		`-returntrue;`
	`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`	`returntrue;`
`107`	`107`	`}`

Lines changed: 4 additions & 6 deletions

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);`

Comments

(0)