nextcloud / server

lib/public/Http/Client/IClient.php

Indentation +169 added lines, -169 removed lines

@@ -32,178 +32,178 @@
  */
 interface IClient {
 
-	/**
-	 * Sends a GET request
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'query' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 * @since 8.1.0
-	 */
-	public function get(string $uri, array $options = []): IResponse;
+    /**
+     * Sends a GET request
+     * @param string $uri
+     * @param array $options Array such as
+     *              'query' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     * @since 8.1.0
+     */
+    public function get(string $uri, array $options = []): IResponse;
 
-	/**
-	 * Sends a HEAD request
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 * @since 8.1.0
-	 */
-	public function head(string $uri, array $options = []): IResponse;
+    /**
+     * Sends a HEAD request
+     * @param string $uri
+     * @param array $options Array such as
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     * @since 8.1.0
+     */
+    public function head(string $uri, array $options = []): IResponse;
 
-	/**
-	 * Sends a POST request
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 * @since 8.1.0
-	 */
-	public function post(string $uri, array $options = []): IResponse;
+    /**
+     * Sends a POST request
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     * @since 8.1.0
+     */
+    public function post(string $uri, array $options = []): IResponse;
 
-	/**
-	 * Sends a PUT request
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 * @since 8.1.0
-	 */
-	public function put(string $uri, array $options = []): IResponse;
+    /**
+     * Sends a PUT request
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     * @since 8.1.0
+     */
+    public function put(string $uri, array $options = []): IResponse;
 
-	/**
-	 * Sends a DELETE request
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 * @since 8.1.0
-	 */
-	public function delete(string $uri, array $options = []): IResponse;
+    /**
+     * Sends a DELETE request
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     * @since 8.1.0
+     */
+    public function delete(string $uri, array $options = []): IResponse;
 
-	/**
-	 * Sends a options request
-	 * @param string $uri
-	 * @param array $options Array such as
-	 *              'body' => [
-	 *                  'field' => 'abc',
-	 *                  'other_field' => '123',
-	 *                  'file_name' => fopen('/path/to/file', 'r'),
-	 *              ],
-	 *              'headers' => [
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'cookies' => ['
-	 *                  'foo' => 'bar',
-	 *              ],
-	 *              'allow_redirects' => [
-	 *                   'max'       => 10,  // allow at most 10 redirects.
-	 *                   'strict'    => true,     // use "strict" RFC compliant redirects.
-	 *                   'referer'   => true,     // add a Referer header
-	 *                   'protocols' => ['https'] // only allow https URLs
-	 *              ],
-	 *              'save_to' => '/path/to/file', // save to a file or a stream
-	 *              'verify' => true, // bool or string to CA file
-	 *              'debug' => true,
-	 * @return IResponse
-	 * @throws \Exception If the request could not get completed
-	 * @since 8.1.0
-	 */
-	public function options(string $uri, array $options = []): IResponse;
+    /**
+     * Sends a options request
+     * @param string $uri
+     * @param array $options Array such as
+     *              'body' => [
+     *                  'field' => 'abc',
+     *                  'other_field' => '123',
+     *                  'file_name' => fopen('/path/to/file', 'r'),
+     *              ],
+     *              'headers' => [
+     *                  'foo' => 'bar',
+     *              ],
+     *              'cookies' => ['
+     *                  'foo' => 'bar',
+     *              ],
+     *              'allow_redirects' => [
+     *                   'max'       => 10,  // allow at most 10 redirects.
+     *                   'strict'    => true,     // use "strict" RFC compliant redirects.
+     *                   'referer'   => true,     // add a Referer header
+     *                   'protocols' => ['https'] // only allow https URLs
+     *              ],
+     *              'save_to' => '/path/to/file', // save to a file or a stream
+     *              'verify' => true, // bool or string to CA file
+     *              'debug' => true,
+     * @return IResponse
+     * @throws \Exception If the request could not get completed
+     * @since 8.1.0
+     */
+    public function options(string $uri, array $options = []): IResponse;
 }

lib/public/Http/Client/IClientService.php

Indentation +5 added lines, -5 removed lines

@@ -31,9 +31,9 @@
  * @since 8.1.0
  */
 interface IClientService {
-	/**
-	 * @return IClient
-	 * @since 8.1.0
-	 */
-	public function newClient(): IClient;
+    /**
+     * @return IClient
+     * @since 8.1.0
+     */
+    public function newClient(): IClient;
 }

lib/public/Http/Client/IResponse.php

Indentation +21 added lines, -21 removed lines

@@ -32,28 +32,28 @@
  * @since 8.1.0
  */
 interface IResponse {
-	/**
-	 * @return string|resource
-	 * @since 8.1.0
-	 */
-	public function getBody();
+    /**
+     * @return string|resource
+     * @since 8.1.0
+     */
+    public function getBody();
 
-	/**
-	 * @return int
-	 * @since 8.1.0
-	 */
-	public function getStatusCode(): int;
+    /**
+     * @return int
+     * @since 8.1.0
+     */
+    public function getStatusCode(): int;
 
-	/**
-	 * @param string $key
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getHeader(string $key): string;
+    /**
+     * @param string $key
+     * @return string
+     * @since 8.1.0
+     */
+    public function getHeader(string $key): string;
 
-	/**
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getHeaders(): array;
+    /**
+     * @return array
+     * @since 8.1.0
+     */
+    public function getHeaders(): array;
 }

lib/private/Http/Client/ClientService.php

Indentation +19 added lines, -19 removed lines

@@ -35,25 +35,25 @@
  * @package OC\Http
  */
 class ClientService implements IClientService {
-	/** @var IConfig */
-	private $config;
-	/** @var ICertificateManager */
-	private $certificateManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ICertificateManager */
+    private $certificateManager;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICertificateManager $certificateManager
-	 */
-	public function __construct(IConfig $config,
-								ICertificateManager $certificateManager) {
-		$this->config = $config;
-		$this->certificateManager = $certificateManager;
-	}
+    /**
+     * @param IConfig $config
+     * @param ICertificateManager $certificateManager
+     */
+    public function __construct(IConfig $config,
+                                ICertificateManager $certificateManager) {
+        $this->config = $config;
+        $this->certificateManager = $certificateManager;
+    }
 
-	/**
-	 * @return Client
-	 */
-	public function newClient(): IClient {
-		return new Client($this->config, $this->certificateManager, new GuzzleClient());
-	}
+    /**
+     * @return Client
+     */
+    public function newClient(): IClient {
+        return new Client($this->config, $this->certificateManager, new GuzzleClient());
+    }
 }

lib/private/Lock/AbstractLockingProvider.php

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/public/Lock/ILockingProvider.php

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();
 }

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();
+    }
 }

lib/public/Security/IHasher.php

Indentation +18 added lines, -18 removed lines

@@ -45,23 +45,23 @@
  * @since 8.0.0
  */
 interface IHasher {
-	/**
-	 * Hashes a message using PHP's `password_hash` functionality.
-	 * Please note that the size of the returned string is not guaranteed
-	 * and can be up to 255 characters.
-	 *
-	 * @param string $message Message to generate hash from
-	 * @return string Hash of the message with appended version parameter
-	 * @since 8.0.0
-	 */
-	public function hash(string $message): string;
+    /**
+     * Hashes a message using PHP's `password_hash` functionality.
+     * Please note that the size of the returned string is not guaranteed
+     * and can be up to 255 characters.
+     *
+     * @param string $message Message to generate hash from
+     * @return string Hash of the message with appended version parameter
+     * @since 8.0.0
+     */
+    public function hash(string $message): string;
 
-	/**
-	 * @param string $message Message to verify
-	 * @param string $hash Assumed hash of the message
-	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
-	 * @return bool Whether $hash is a valid hash of $message
-	 * @since 8.0.0
-	 */
-	public function verify(string $message, string $hash, &$newHash = null): bool ;
+    /**
+     * @param string $message Message to verify
+     * @param string $hash Assumed hash of the message
+     * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+     * @return bool Whether $hash is a valid hash of $message
+     * @since 8.0.0
+     */
+    public function verify(string $message, string $hash, &$newHash = null): bool ;
 }

lib/private/Lock/NoopLockingProvider.php

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
+    }
 }