nextcloud / server

lib/public/Lock/ILockingProvider.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *

Indentation +42 added lines, -42 removed lines

@@ -31,51 +31,51 @@
  * @since 8.1.0
  */
 interface ILockingProvider {
-	/**
-	 * @since 8.1.0
-	 */
-	const LOCK_SHARED = 1;
-	/**
-	 * @since 8.1.0
-	 */
-	const LOCK_EXCLUSIVE = 2;
+    /**
+     * @since 8.1.0
+     */
+    const LOCK_SHARED = 1;
+    /**
+     * @since 8.1.0
+     */
+    const LOCK_EXCLUSIVE = 2;
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function isLocked(string $path, int $type): bool;
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @return bool
+     * @since 8.1.0
+     */
+    public function isLocked(string $path, int $type): bool;
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 * @since 8.1.0
-	 */
-	public function acquireLock(string $path, int $type);
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     * @since 8.1.0
+     */
+    public function acquireLock(string $path, int $type);
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @since 8.1.0
-	 */
-	public function releaseLock(string $path, int $type);
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @since 8.1.0
+     */
+    public function releaseLock(string $path, int $type);
 
-	/**
-	 * Change the type of an existing lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 * @since 8.1.0
-	 */
-	public function changeLock(string $path, int $targetType);
+    /**
+     * Change the type of an existing lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     * @since 8.1.0
+     */
+    public function changeLock(string $path, int $targetType);
 
-	/**
-	 * release all lock acquired by this instance
-	 * @since 8.1.0
-	 */
-	public function releaseAll();
+    /**
+     * release all lock acquired by this instance
+     * @since 8.1.0
+     */
+    public function releaseAll();
 }

lib/private/Lock/MemcacheLockingProvider.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *

Indentation +92 added lines, -92 removed lines

@@ -28,102 +28,102 @@
 use OCP\IMemcache;
 
 class MemcacheLockingProvider extends AbstractLockingProvider {
-	/**
-	 * @var \OCP\IMemcache
-	 */
-	private $memcache;
+    /**
+     * @var \OCP\IMemcache
+     */
+    private $memcache;
 
-	/**
-	 * @param \OCP\IMemcache $memcache
-	 * @param int $ttl
-	 */
-	public function __construct(IMemcache $memcache, int $ttl = 3600) {
-		$this->memcache = $memcache;
-		$this->ttl = $ttl;
-	}
+    /**
+     * @param \OCP\IMemcache $memcache
+     * @param int $ttl
+     */
+    public function __construct(IMemcache $memcache, int $ttl = 3600) {
+        $this->memcache = $memcache;
+        $this->ttl = $ttl;
+    }
 
-	private function setTTL(string $path) {
-		if ($this->memcache instanceof IMemcacheTTL) {
-			$this->memcache->setTTL($path, $this->ttl);
-		}
-	}
+    private function setTTL(string $path) {
+        if ($this->memcache instanceof IMemcacheTTL) {
+            $this->memcache->setTTL($path, $this->ttl);
+        }
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @return bool
-	 */
-	public function isLocked(string $path, int $type): bool {
-		$lockValue = $this->memcache->get($path);
-		if ($type === self::LOCK_SHARED) {
-			return $lockValue > 0;
-		} else if ($type === self::LOCK_EXCLUSIVE) {
-			return $lockValue === 'exclusive';
-		} else {
-			return false;
-		}
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @return bool
+     */
+    public function isLocked(string $path, int $type): bool {
+        $lockValue = $this->memcache->get($path);
+        if ($type === self::LOCK_SHARED) {
+            return $lockValue > 0;
+        } else if ($type === self::LOCK_EXCLUSIVE) {
+            return $lockValue === 'exclusive';
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function acquireLock(string $path, int $type) {
-		if ($type === self::LOCK_SHARED) {
-			if (!$this->memcache->inc($path)) {
-				throw new LockedException($path);
-			}
-		} else {
-			$this->memcache->add($path, 0);
-			if (!$this->memcache->cas($path, 0, 'exclusive')) {
-				throw new LockedException($path);
-			}
-		}
-		$this->setTTL($path);
-		$this->markAcquire($path, $type);
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function acquireLock(string $path, int $type) {
+        if ($type === self::LOCK_SHARED) {
+            if (!$this->memcache->inc($path)) {
+                throw new LockedException($path);
+            }
+        } else {
+            $this->memcache->add($path, 0);
+            if (!$this->memcache->cas($path, 0, 'exclusive')) {
+                throw new LockedException($path);
+            }
+        }
+        $this->setTTL($path);
+        $this->markAcquire($path, $type);
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	public function releaseLock(string $path, int $type) {
-		if ($type === self::LOCK_SHARED) {
-			if ($this->getOwnSharedLockCount($path) === 1) {
-				$removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
-				if (!$removed) { //someone else also has a shared lock, decrease only
-					$this->memcache->dec($path);
-				}
-			} else {
-				// if we own more than one lock ourselves just decrease
-				$this->memcache->dec($path);
-			}
-		} else if ($type === self::LOCK_EXCLUSIVE) {
-			$this->memcache->cad($path, 'exclusive');
-		}
-		$this->markRelease($path, $type);
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    public function releaseLock(string $path, int $type) {
+        if ($type === self::LOCK_SHARED) {
+            if ($this->getOwnSharedLockCount($path) === 1) {
+                $removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
+                if (!$removed) { //someone else also has a shared lock, decrease only
+                    $this->memcache->dec($path);
+                }
+            } else {
+                // if we own more than one lock ourselves just decrease
+                $this->memcache->dec($path);
+            }
+        } else if ($type === self::LOCK_EXCLUSIVE) {
+            $this->memcache->cad($path, 'exclusive');
+        }
+        $this->markRelease($path, $type);
+    }
 
-	/**
-	 * Change the type of an existing lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function changeLock(string $path, int $targetType) {
-		if ($targetType === self::LOCK_SHARED) {
-			if (!$this->memcache->cas($path, 'exclusive', 1)) {
-				throw new LockedException($path);
-			}
-		} else if ($targetType === self::LOCK_EXCLUSIVE) {
-			// we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
-			if (!$this->memcache->cas($path, 1, 'exclusive')) {
-				throw new LockedException($path);
-			}
-		}
-		$this->setTTL($path);
-		$this->markChange($path, $targetType);
-	}
+    /**
+     * Change the type of an existing lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function changeLock(string $path, int $targetType) {
+        if ($targetType === self::LOCK_SHARED) {
+            if (!$this->memcache->cas($path, 'exclusive', 1)) {
+                throw new LockedException($path);
+            }
+        } else if ($targetType === self::LOCK_EXCLUSIVE) {
+            // we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
+            if (!$this->memcache->cas($path, 1, 'exclusive')) {
+                throw new LockedException($path);
+            }
+        }
+        $this->setTTL($path);
+        $this->markChange($path, $targetType);
+    }
 }

lib/private/Lock/AbstractLockingProvider.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *

Indentation +88 added lines, -88 removed lines

@@ -30,100 +30,100 @@
  * to release any left over locks at the end of the request
  */
 abstract class AbstractLockingProvider implements ILockingProvider {
-	/** @var int $ttl */
-	protected $ttl; // how long until we clear stray locks in seconds
+    /** @var int $ttl */
+    protected $ttl; // how long until we clear stray locks in seconds
 
-	protected $acquiredLocks = [
-		'shared' => [],
-		'exclusive' => []
-	];
+    protected $acquiredLocks = [
+        'shared' => [],
+        'exclusive' => []
+    ];
 
-	/**
-	 * Check if we've locally acquired a lock
-	 *
-	 * @param string $path
-	 * @param int $type
-	 * @return bool
-	 */
-	protected function hasAcquiredLock(string $path, int $type): bool {
-		if ($type === self::LOCK_SHARED) {
-			return isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 0;
-		} else {
-			return isset($this->acquiredLocks['exclusive'][$path]) && $this->acquiredLocks['exclusive'][$path] === true;
-		}
-	}
+    /**
+     * Check if we've locally acquired a lock
+     *
+     * @param string $path
+     * @param int $type
+     * @return bool
+     */
+    protected function hasAcquiredLock(string $path, int $type): bool {
+        if ($type === self::LOCK_SHARED) {
+            return isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 0;
+        } else {
+            return isset($this->acquiredLocks['exclusive'][$path]) && $this->acquiredLocks['exclusive'][$path] === true;
+        }
+    }
 
-	/**
-	 * Mark a locally acquired lock
-	 *
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markAcquire(string $path, int $type) {
-		if ($type === self::LOCK_SHARED) {
-			if (!isset($this->acquiredLocks['shared'][$path])) {
-				$this->acquiredLocks['shared'][$path] = 0;
-			}
-			$this->acquiredLocks['shared'][$path]++;
-		} else {
-			$this->acquiredLocks['exclusive'][$path] = true;
-		}
-	}
+    /**
+     * Mark a locally acquired lock
+     *
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markAcquire(string $path, int $type) {
+        if ($type === self::LOCK_SHARED) {
+            if (!isset($this->acquiredLocks['shared'][$path])) {
+                $this->acquiredLocks['shared'][$path] = 0;
+            }
+            $this->acquiredLocks['shared'][$path]++;
+        } else {
+            $this->acquiredLocks['exclusive'][$path] = true;
+        }
+    }
 
-	/**
-	 * Mark a release of a locally acquired lock
-	 *
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markRelease(string $path, int $type) {
-		if ($type === self::LOCK_SHARED) {
-			if (isset($this->acquiredLocks['shared'][$path]) and $this->acquiredLocks['shared'][$path] > 0) {
-				$this->acquiredLocks['shared'][$path]--;
-				if ($this->acquiredLocks['shared'][$path] === 0) {
-					unset($this->acquiredLocks['shared'][$path]);
-				}
-			}
-		} else if ($type === self::LOCK_EXCLUSIVE) {
-			unset($this->acquiredLocks['exclusive'][$path]);
-		}
-	}
+    /**
+     * Mark a release of a locally acquired lock
+     *
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markRelease(string $path, int $type) {
+        if ($type === self::LOCK_SHARED) {
+            if (isset($this->acquiredLocks['shared'][$path]) and $this->acquiredLocks['shared'][$path] > 0) {
+                $this->acquiredLocks['shared'][$path]--;
+                if ($this->acquiredLocks['shared'][$path] === 0) {
+                    unset($this->acquiredLocks['shared'][$path]);
+                }
+            }
+        } else if ($type === self::LOCK_EXCLUSIVE) {
+            unset($this->acquiredLocks['exclusive'][$path]);
+        }
+    }
 
-	/**
-	 * Change the type of an existing tracked lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markChange(string $path, int $targetType) {
-		if ($targetType === self::LOCK_SHARED) {
-			unset($this->acquiredLocks['exclusive'][$path]);
-			if (!isset($this->acquiredLocks['shared'][$path])) {
-				$this->acquiredLocks['shared'][$path] = 0;
-			}
-			$this->acquiredLocks['shared'][$path]++;
-		} else if ($targetType === self::LOCK_EXCLUSIVE) {
-			$this->acquiredLocks['exclusive'][$path] = true;
-			$this->acquiredLocks['shared'][$path]--;
-		}
-	}
+    /**
+     * Change the type of an existing tracked lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markChange(string $path, int $targetType) {
+        if ($targetType === self::LOCK_SHARED) {
+            unset($this->acquiredLocks['exclusive'][$path]);
+            if (!isset($this->acquiredLocks['shared'][$path])) {
+                $this->acquiredLocks['shared'][$path] = 0;
+            }
+            $this->acquiredLocks['shared'][$path]++;
+        } else if ($targetType === self::LOCK_EXCLUSIVE) {
+            $this->acquiredLocks['exclusive'][$path] = true;
+            $this->acquiredLocks['shared'][$path]--;
+        }
+    }
 
-	/**
-	 * release all lock acquired by this instance which were marked using the mark* methods
-	 */
-	public function releaseAll() {
-		foreach ($this->acquiredLocks['shared'] as $path => $count) {
-			for ($i = 0; $i < $count; $i++) {
-				$this->releaseLock($path, self::LOCK_SHARED);
-			}
-		}
+    /**
+     * release all lock acquired by this instance which were marked using the mark* methods
+     */
+    public function releaseAll() {
+        foreach ($this->acquiredLocks['shared'] as $path => $count) {
+            for ($i = 0; $i < $count; $i++) {
+                $this->releaseLock($path, self::LOCK_SHARED);
+            }
+        }
 
-		foreach ($this->acquiredLocks['exclusive'] as $path => $hasLock) {
-			$this->releaseLock($path, self::LOCK_EXCLUSIVE);
-		}
-	}
+        foreach ($this->acquiredLocks['exclusive'] as $path => $hasLock) {
+            $this->releaseLock($path, self::LOCK_EXCLUSIVE);
+        }
+    }
 
-	protected function getOwnSharedLockCount(string $path) {
-		return isset($this->acquiredLocks['shared'][$path]) ? $this->acquiredLocks['shared'][$path] : 0;
-	}
+    protected function getOwnSharedLockCount(string $path) {
+        return isset($this->acquiredLocks['shared'][$path]) ? $this->acquiredLocks['shared'][$path] : 0;
+    }
 }

lib/private/Lock/NoopLockingProvider.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *

Indentation +28 added lines, -28 removed lines

@@ -33,38 +33,38 @@
  */
 class NoopLockingProvider implements ILockingProvider {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function isLocked(string $path, int $type): bool {
-		return false;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function isLocked(string $path, int $type): bool {
+        return false;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function acquireLock(string $path, int $type) {
-		// do nothing
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function acquireLock(string $path, int $type) {
+        // do nothing
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function releaseLock(string $path, int $type) {
-		// do nothing
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function releaseLock(string $path, int $type) {
+        // do nothing
+    }
 
-	/**1
+    /**1
 	 * {@inheritdoc}
 	 */
-	public function releaseAll() {
-		// do nothing
-	}
+    public function releaseAll() {
+        // do nothing
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function changeLock(string $path, int $targetType) {
-		// do nothing
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function changeLock(string $path, int $targetType) {
+        // do nothing
+    }
 }

lib/private/Lock/DBLockingProvider.php

Indentation +220 added lines, -220 removed lines

@@ -38,246 +38,246 @@
  * Locking provider that stores the locks in the database
  */
 class DBLockingProvider extends AbstractLockingProvider {
-	/**
-	 * @var \OCP\IDBConnection
-	 */
-	private $connection;
+    /**
+     * @var \OCP\IDBConnection
+     */
+    private $connection;
 
-	/**
-	 * @var \OCP\ILogger
-	 */
-	private $logger;
+    /**
+     * @var \OCP\ILogger
+     */
+    private $logger;
 
-	/**
-	 * @var \OCP\AppFramework\Utility\ITimeFactory
-	 */
-	private $timeFactory;
+    /**
+     * @var \OCP\AppFramework\Utility\ITimeFactory
+     */
+    private $timeFactory;
 
-	private $sharedLocks = [];
+    private $sharedLocks = [];
 
-	/**
-	 * Check if we have an open shared lock for a path
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	protected function isLocallyLocked(string $path): bool {
-		return isset($this->sharedLocks[$path]) && $this->sharedLocks[$path];
-	}
+    /**
+     * Check if we have an open shared lock for a path
+     *
+     * @param string $path
+     * @return bool
+     */
+    protected function isLocallyLocked(string $path): bool {
+        return isset($this->sharedLocks[$path]) && $this->sharedLocks[$path];
+    }
 
-	/**
-	 * Mark a locally acquired lock
-	 *
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markAcquire(string $path, int $type) {
-		parent::markAcquire($path, $type);
-		if ($type === self::LOCK_SHARED) {
-			$this->sharedLocks[$path] = true;
-		}
-	}
+    /**
+     * Mark a locally acquired lock
+     *
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markAcquire(string $path, int $type) {
+        parent::markAcquire($path, $type);
+        if ($type === self::LOCK_SHARED) {
+            $this->sharedLocks[$path] = true;
+        }
+    }
 
-	/**
-	 * Change the type of an existing tracked lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markChange(string $path, int $targetType) {
-		parent::markChange($path, $targetType);
-		if ($targetType === self::LOCK_SHARED) {
-			$this->sharedLocks[$path] = true;
-		} else if ($targetType === self::LOCK_EXCLUSIVE) {
-			$this->sharedLocks[$path] = false;
-		}
-	}
+    /**
+     * Change the type of an existing tracked lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markChange(string $path, int $targetType) {
+        parent::markChange($path, $targetType);
+        if ($targetType === self::LOCK_SHARED) {
+            $this->sharedLocks[$path] = true;
+        } else if ($targetType === self::LOCK_EXCLUSIVE) {
+            $this->sharedLocks[$path] = false;
+        }
+    }
 
-	/**
-	 * @param \OCP\IDBConnection $connection
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
-	 * @param int $ttl
-	 */
-	public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory, int $ttl = 3600) {
-		$this->connection = $connection;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-		$this->ttl = $ttl;
-	}
+    /**
+     * @param \OCP\IDBConnection $connection
+     * @param \OCP\ILogger $logger
+     * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
+     * @param int $ttl
+     */
+    public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory, int $ttl = 3600) {
+        $this->connection = $connection;
+        $this->logger = $logger;
+        $this->timeFactory = $timeFactory;
+        $this->ttl = $ttl;
+    }
 
-	/**
-	 * Insert a file locking row if it does not exists.
-	 *
-	 * @param string $path
-	 * @param int $lock
-	 * @return int number of inserted rows
-	 */
+    /**
+     * Insert a file locking row if it does not exists.
+     *
+     * @param string $path
+     * @param int $lock
+     * @return int number of inserted rows
+     */
 
-	protected function initLockField(string $path, int $lock = 0): int {
-		$expire = $this->getExpireTime();
-		return $this->connection->insertIfNotExist('*PREFIX*file_locks', ['key' => $path, 'lock' => $lock, 'ttl' => $expire], ['key']);
-	}
+    protected function initLockField(string $path, int $lock = 0): int {
+        $expire = $this->getExpireTime();
+        return $this->connection->insertIfNotExist('*PREFIX*file_locks', ['key' => $path, 'lock' => $lock, 'ttl' => $expire], ['key']);
+    }
 
-	/**
-	 * @return int
-	 */
-	protected function getExpireTime(): int {
-		return $this->timeFactory->getTime() + $this->ttl;
-	}
+    /**
+     * @return int
+     */
+    protected function getExpireTime(): int {
+        return $this->timeFactory->getTime() + $this->ttl;
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @return bool
-	 */
-	public function isLocked(string $path, int $type): bool {
-		if ($this->hasAcquiredLock($path, $type)) {
-			return true;
-		}
-		$query = $this->connection->prepare('SELECT `lock` from `*PREFIX*file_locks` WHERE `key` = ?');
-		$query->execute([$path]);
-		$lockValue = (int)$query->fetchColumn();
-		if ($type === self::LOCK_SHARED) {
-			if ($this->isLocallyLocked($path)) {
-				// if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
-				return $lockValue > 1;
-			} else {
-				return $lockValue > 0;
-			}
-		} else if ($type === self::LOCK_EXCLUSIVE) {
-			return $lockValue === -1;
-		} else {
-			return false;
-		}
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @return bool
+     */
+    public function isLocked(string $path, int $type): bool {
+        if ($this->hasAcquiredLock($path, $type)) {
+            return true;
+        }
+        $query = $this->connection->prepare('SELECT `lock` from `*PREFIX*file_locks` WHERE `key` = ?');
+        $query->execute([$path]);
+        $lockValue = (int)$query->fetchColumn();
+        if ($type === self::LOCK_SHARED) {
+            if ($this->isLocallyLocked($path)) {
+                // if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db
+                return $lockValue > 1;
+            } else {
+                return $lockValue > 0;
+            }
+        } else if ($type === self::LOCK_EXCLUSIVE) {
+            return $lockValue === -1;
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function acquireLock(string $path, int $type) {
-		$expire = $this->getExpireTime();
-		if ($type === self::LOCK_SHARED) {
-			if (!$this->isLocallyLocked($path)) {
-				$result = $this->initLockField($path, 1);
-				if ($result <= 0) {
-					$result = $this->connection->executeUpdate(
-						'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` + 1, `ttl` = ? WHERE `key` = ? AND `lock` >= 0',
-						[$expire, $path]
-					);
-				}
-			} else {
-				$result = 1;
-			}
-		} else {
-			$existing = 0;
-			if ($this->hasAcquiredLock($path, ILockingProvider::LOCK_SHARED) === false && $this->isLocallyLocked($path)) {
-				$existing = 1;
-			}
-			$result = $this->initLockField($path, -1);
-			if ($result <= 0) {
-				$result = $this->connection->executeUpdate(
-					'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = ?',
-					[$expire, $path, $existing]
-				);
-			}
-		}
-		if ($result !== 1) {
-			throw new LockedException($path);
-		}
-		$this->markAcquire($path, $type);
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function acquireLock(string $path, int $type) {
+        $expire = $this->getExpireTime();
+        if ($type === self::LOCK_SHARED) {
+            if (!$this->isLocallyLocked($path)) {
+                $result = $this->initLockField($path, 1);
+                if ($result <= 0) {
+                    $result = $this->connection->executeUpdate(
+                        'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` + 1, `ttl` = ? WHERE `key` = ? AND `lock` >= 0',
+                        [$expire, $path]
+                    );
+                }
+            } else {
+                $result = 1;
+            }
+        } else {
+            $existing = 0;
+            if ($this->hasAcquiredLock($path, ILockingProvider::LOCK_SHARED) === false && $this->isLocallyLocked($path)) {
+                $existing = 1;
+            }
+            $result = $this->initLockField($path, -1);
+            if ($result <= 0) {
+                $result = $this->connection->executeUpdate(
+                    'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = ?',
+                    [$expire, $path, $existing]
+                );
+            }
+        }
+        if ($result !== 1) {
+            throw new LockedException($path);
+        }
+        $this->markAcquire($path, $type);
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	public function releaseLock(string $path, int $type) {
-		$this->markRelease($path, $type);
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    public function releaseLock(string $path, int $type) {
+        $this->markRelease($path, $type);
 
-		// we keep shared locks till the end of the request so we can re-use them
-		if ($type === self::LOCK_EXCLUSIVE) {
-			$this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = -1',
-				[$path]
-			);
-		}
-	}
+        // we keep shared locks till the end of the request so we can re-use them
+        if ($type === self::LOCK_EXCLUSIVE) {
+            $this->connection->executeUpdate(
+                'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = -1',
+                [$path]
+            );
+        }
+    }
 
-	/**
-	 * Change the type of an existing lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function changeLock(string $path, int $targetType) {
-		$expire = $this->getExpireTime();
-		if ($targetType === self::LOCK_SHARED) {
-			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = 1, `ttl` = ? WHERE `key` = ? AND `lock` = -1',
-				[$expire, $path]
-			);
-		} else {
-			// since we only keep one shared lock in the db we need to check if we have more then one shared lock locally manually
-			if (isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 1) {
-				throw new LockedException($path);
-			}
-			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = 1',
-				[$expire, $path]
-			);
-		}
-		if ($result !== 1) {
-			throw new LockedException($path);
-		}
-		$this->markChange($path, $targetType);
-	}
+    /**
+     * Change the type of an existing lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function changeLock(string $path, int $targetType) {
+        $expire = $this->getExpireTime();
+        if ($targetType === self::LOCK_SHARED) {
+            $result = $this->connection->executeUpdate(
+                'UPDATE `*PREFIX*file_locks` SET `lock` = 1, `ttl` = ? WHERE `key` = ? AND `lock` = -1',
+                [$expire, $path]
+            );
+        } else {
+            // since we only keep one shared lock in the db we need to check if we have more then one shared lock locally manually
+            if (isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 1) {
+                throw new LockedException($path);
+            }
+            $result = $this->connection->executeUpdate(
+                'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = 1',
+                [$expire, $path]
+            );
+        }
+        if ($result !== 1) {
+            throw new LockedException($path);
+        }
+        $this->markChange($path, $targetType);
+    }
 
-	/**
-	 * cleanup empty locks
-	 */
-	public function cleanExpiredLocks() {
-		$expire = $this->timeFactory->getTime();
-		try {
-			$this->connection->executeUpdate(
-				'DELETE FROM `*PREFIX*file_locks` WHERE `ttl` < ?',
-				[$expire]
-			);
-		} catch (\Exception $e) {
-			// If the table is missing, the clean up was successful
-			if ($this->connection->tableExists('file_locks')) {
-				throw $e;
-			}
-		}
-	}
+    /**
+     * cleanup empty locks
+     */
+    public function cleanExpiredLocks() {
+        $expire = $this->timeFactory->getTime();
+        try {
+            $this->connection->executeUpdate(
+                'DELETE FROM `*PREFIX*file_locks` WHERE `ttl` < ?',
+                [$expire]
+            );
+        } catch (\Exception $e) {
+            // If the table is missing, the clean up was successful
+            if ($this->connection->tableExists('file_locks')) {
+                throw $e;
+            }
+        }
+    }
 
-	/**
-	 * release all lock acquired by this instance which were marked using the mark* methods
-	 * @suppress SqlInjectionChecker
-	 */
-	public function releaseAll() {
-		parent::releaseAll();
+    /**
+     * release all lock acquired by this instance which were marked using the mark* methods
+     * @suppress SqlInjectionChecker
+     */
+    public function releaseAll() {
+        parent::releaseAll();
 
-		// since we keep shared locks we need to manually clean those
-		$lockedPaths = array_keys($this->sharedLocks);
-		$lockedPaths = array_filter($lockedPaths, function ($path) {
-			return $this->sharedLocks[$path];
-		});
+        // since we keep shared locks we need to manually clean those
+        $lockedPaths = array_keys($this->sharedLocks);
+        $lockedPaths = array_filter($lockedPaths, function ($path) {
+            return $this->sharedLocks[$path];
+        });
 
-		$chunkedPaths = array_chunk($lockedPaths, 100);
+        $chunkedPaths = array_chunk($lockedPaths, 100);
 
-		foreach ($chunkedPaths as $chunk) {
-			$builder = $this->connection->getQueryBuilder();
+        foreach ($chunkedPaths as $chunk) {
+            $builder = $this->connection->getQueryBuilder();
 
-			$query = $builder->update('file_locks')
-				->set('lock', $builder->createFunction('`lock` -1'))
-				->where($builder->expr()->in('key', $builder->createNamedParameter($chunk, IQueryBuilder::PARAM_STR_ARRAY)))
-				->andWhere($builder->expr()->gt('lock', new Literal(0)));
+            $query = $builder->update('file_locks')
+                ->set('lock', $builder->createFunction('`lock` -1'))
+                ->where($builder->expr()->in('key', $builder->createNamedParameter($chunk, IQueryBuilder::PARAM_STR_ARRAY)))
+                ->andWhere($builder->expr()->gt('lock', new Literal(0)));
 
-			$query->execute();
-		}
-	}
+            $query->execute();
+        }
+    }
 }

lib/public/Lock/LockedException.php

Indentation +25 added lines, -25 removed lines

@@ -34,31 +34,31 @@
  */
 class LockedException extends \Exception {
 
-	/**
-	 * Locked path
-	 *
-	 * @var string
-	 */
-	private $path;
+    /**
+     * Locked path
+     *
+     * @var string
+     */
+    private $path;
 
-	/**
-	 * LockedException constructor.
-	 *
-	 * @param string $path locked path
-	 * @param \Exception|null $previous previous exception for cascading
-	 *
-	 * @since 8.1.0
-	 */
-	public function __construct(string $path, \Exception $previous = null) {
-		parent::__construct('"' . $path . '" is locked', 0, $previous);
-		$this->path = $path;
-	}
+    /**
+     * LockedException constructor.
+     *
+     * @param string $path locked path
+     * @param \Exception|null $previous previous exception for cascading
+     *
+     * @since 8.1.0
+     */
+    public function __construct(string $path, \Exception $previous = null) {
+        parent::__construct('"' . $path . '" is locked', 0, $previous);
+        $this->path = $path;
+    }
 
-	/**
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getPath(): string {
-		return $this->path;
-	}
+    /**
+     * @return string
+     * @since 8.1.0
+     */
+    public function getPath(): string {
+        return $this->path;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -50,7 +50,7 @@ 
 	 * @since 8.1.0
 	 */
 	public function __construct(string $path, \Exception $previous = null) {
-		parent::__construct('"' . $path . '" is locked', 0, $previous);
+		parent::__construct('"'.$path.'" is locked', 0, $previous);
 		$this->path = $path;
 	}
 

apps/testing/lib/Locking/FakeDBLockingProvider.php

Indentation +34 added lines, -34 removed lines

@@ -27,44 +27,44 @@
 use OCP\ILogger;
 
 class FakeDBLockingProvider extends \OC\Lock\DBLockingProvider {
-	// Lock for 10 hours just to be sure
-	const TTL = 36000;
+    // Lock for 10 hours just to be sure
+    const TTL = 36000;
 
-	/**
-	 * Need a new child, because parent::connection is private instead of protected...
-	 * @var IDBConnection
-	 */
-	protected $db;
+    /**
+     * Need a new child, because parent::connection is private instead of protected...
+     * @var IDBConnection
+     */
+    protected $db;
 
-	/**
-	 * @param \OCP\IDBConnection $connection
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory) {
-		parent::__construct($connection, $logger, $timeFactory);
-		$this->db = $connection;
-	}
+    /**
+     * @param \OCP\IDBConnection $connection
+     * @param \OCP\ILogger $logger
+     * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory) {
+        parent::__construct($connection, $logger, $timeFactory);
+        $this->db = $connection;
+    }
 
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	public function releaseLock(string $path, int $type) {
-		// we DONT keep shared locks till the end of the request
-		if ($type === self::LOCK_SHARED) {
-			$this->db->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = 1',
-				[$path]
-			);
-		}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    public function releaseLock(string $path, int $type) {
+        // we DONT keep shared locks till the end of the request
+        if ($type === self::LOCK_SHARED) {
+            $this->db->executeUpdate(
+                'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = 1',
+                [$path]
+            );
+        }
 
-		parent::releaseLock($path, $type);
-	}
+        parent::releaseLock($path, $type);
+    }
 
-	public function __destruct() {
-		// Prevent cleaning up at the end of the live time.
-		// parent::__destruct();
-	}
+    public function __destruct() {
+        // Prevent cleaning up at the end of the live time.
+        // parent::__destruct();
+    }
 }