Merge pull request #39108 from fsamapoor/refactor_lib_private_lock

Refactors lib/private/Lock

lib/private/Lock/AbstractLockingProvider.php

@@ -33,14 +33,18 @@
  * to release any leftover locks at the end of the request
  */
 abstract class AbstractLockingProvider implements ILockingProvider {
-	/** how long until we clear stray locks in seconds */
-	protected int $ttl;
-
-	protected $acquiredLocks = [
+	protected array $acquiredLocks = [
 		'shared' => [],
 		'exclusive' => []
 	];
 
+	/**
+	 *
+	 * @param int $ttl how long until we clear stray locks in seconds
+	 */
+	public function __construct(protected int $ttl) {
+	}
+
 	/** @inheritDoc */
 	protected function hasAcquiredLock(string $path, int $type): bool {
 		if ($type === self::LOCK_SHARED) {

lib/private/Lock/DBLockingProvider.php

@@ -39,21 +39,15 @@
  * Locking provider that stores the locks in the database
  */
 class DBLockingProvider extends AbstractLockingProvider {
-	private IDBConnection $connection;
-	private ITimeFactory $timeFactory;
 	private array $sharedLocks = [];
-	private bool $cacheSharedLocks;
 
 	public function __construct(
-		IDBConnection $connection,
-		ITimeFactory $timeFactory,
+		private IDBConnection $connection,
+		private ITimeFactory $timeFactory,
 		int $ttl = 3600,
-		bool $cacheSharedLocks = true
+		private bool $cacheSharedLocks = true
 	) {
-		$this->connection = $connection;
-		$this->timeFactory = $timeFactory;
-		$this->ttl = $ttl;
-		$this->cacheSharedLocks = $cacheSharedLocks;
+		parent::__construct($ttl);
 	}
 
 	/**

lib/private/Lock/MemcacheLockingProvider.php

@@ -32,11 +32,11 @@
 use OCP\Lock\LockedException;
 
 class MemcacheLockingProvider extends AbstractLockingProvider {
-	private IMemcache $memcache;
-
-	public function __construct(IMemcache $memcache, int $ttl = 3600) {
-		$this->memcache = $memcache;
-		$this->ttl = $ttl;
+	public function __construct(
+		private IMemcache $memcache,
+		int $ttl = 3600,
+	) {
+		parent::__construct($ttl);
 	}
 
 	private function setTTL(string $path): void {