Merge pull request #48693 from nextcloud/backport/48689/stable29

solracsf · web-flow · commit 58910fc13907 · 2024-10-14T16:42:05.000+02:00
[stable29] fix(locking): Accept mixed as value on setTTL
diff --git a/lib/private/Lock/MemcacheLockingProvider.php b/lib/private/Lock/MemcacheLockingProvider.php
@@ -44,7 +44,7 @@ public function __construct(
 		parent::__construct($ttl);
 	}
 
-	private function setTTL(string $path, ?int $ttl = null, ?int $compare = null): void {
+	private function setTTL(string $path, ?int $ttl = null, mixed $compare = null): void {
 		if (is_null($ttl)) {
 			$ttl = $this->ttl;
 		}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(`
`44`	`44`	`parent::__construct($ttl);`
`45`	`45`	`}`
`46`	`46`
`47`		`- private function setTTL(string $path, ?int $ttl = null, ?int $compare = null): void {`
	`47`	`+ private function setTTL(string $path, ?int $ttl = null, mixed $compare = null): void {`
`48`	`48`	`if (is_null($ttl)) {`
`49`	`49`	`$ttl = $this->ttl;`
`50`	`50`	`}`