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/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 ;
 }

Spacing +1 added lines, -1 removed lines

@@ -63,5 +63,5 @@
 	 * @return bool Whether $hash is a valid hash of $message
 	 * @since 8.0.0
 	 */
-	public function verify(string $message, string $hash, &$newHash = null): bool ;
+	public function verify(string $message, string $hash, &$newHash = null): bool;
 }

lib/private/Memcache/Factory.php

Spacing +3 added lines, -3 removed lines

@@ -133,7 +133,7 @@ 
 	 * @return IMemcache
 	 */
 	public function createLocking(string $prefix = ''): IMemcache {
-		return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
+		return new $this->lockingCacheClass($this->globalPrefix.'/'.$prefix);
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 * @return ICache
 	 */
 	public function createDistributed(string $prefix = ''): ICache {
-		return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
+		return new $this->distributedCacheClass($this->globalPrefix.'/'.$prefix);
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	 * @return ICache
 	 */
 	public function createLocal(string $prefix = ''): ICache {
-		return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
+		return new $this->localCacheClass($this->globalPrefix.'/'.$prefix);
 	}
 
 	/**

Indentation +154 added lines, -154 removed lines

@@ -36,158 +36,158 @@
 use OCP\IMemcache;
 
 class Factory implements ICacheFactory {
-	public const NULL_CACHE = NullCache::class;
-
-	/**
-	 * @var string $globalPrefix
-	 */
-	private $globalPrefix;
-
-	/**
-	 * @var ILogger $logger
-	 */
-	private $logger;
-
-	/**
-	 * @var string $localCacheClass
-	 */
-	private $localCacheClass;
-
-	/**
-	 * @var string $distributedCacheClass
-	 */
-	private $distributedCacheClass;
-
-	/**
-	 * @var string $lockingCacheClass
-	 */
-	private $lockingCacheClass;
-
-	/**
-	 * @param string $globalPrefix
-	 * @param ILogger $logger
-	 * @param string|null $localCacheClass
-	 * @param string|null $distributedCacheClass
-	 * @param string|null $lockingCacheClass
-	 */
-	public function __construct(string $globalPrefix, ILogger $logger,
-		$localCacheClass = null, $distributedCacheClass = null, $lockingCacheClass = null) {
-		$this->logger = $logger;
-		$this->globalPrefix = $globalPrefix;
-
-		if (!$localCacheClass) {
-			$localCacheClass = self::NULL_CACHE;
-		}
-		if (!$distributedCacheClass) {
-			$distributedCacheClass = $localCacheClass;
-		}
-
-		$missingCacheMessage = 'Memcache {class} not available for {use} cache';
-		$missingCacheHint = 'Is the matching PHP module installed and enabled?';
-		if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) {
-			if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
-				// CLI should not hard-fail on broken memcache
-				$this->logger->info($missingCacheMessage, [
-					'class' => $localCacheClass,
-					'use' => 'local',
-					'app' => 'cli'
-				]);
-				$localCacheClass = self::NULL_CACHE;
-			} else {
-				throw new \OC\HintException(strtr($missingCacheMessage, [
-					'{class}' => $localCacheClass, '{use}' => 'local'
-				]), $missingCacheHint);
-			}
-		}
-		if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) {
-			if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
-				// CLI should not hard-fail on broken memcache
-				$this->logger->info($missingCacheMessage, [
-					'class' => $distributedCacheClass,
-					'use' => 'distributed',
-					'app' => 'cli'
-				]);
-				$distributedCacheClass = self::NULL_CACHE;
-			} else {
-				throw new \OC\HintException(strtr($missingCacheMessage, [
-					'{class}' => $distributedCacheClass, '{use}' => 'distributed'
-				]), $missingCacheHint);
-			}
-		}
-		if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) {
-			// don't fallback since the fallback might not be suitable for storing lock
-			$lockingCacheClass = self::NULL_CACHE;
-		}
-
-		$this->localCacheClass = $localCacheClass;
-		$this->distributedCacheClass = $distributedCacheClass;
-		$this->lockingCacheClass = $lockingCacheClass;
-	}
-
-	/**
-	 * create a cache instance for storing locks
-	 *
-	 * @param string $prefix
-	 * @return IMemcache
-	 */
-	public function createLocking(string $prefix = ''): IMemcache {
-		return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
-	}
-
-	/**
-	 * create a distributed cache instance
-	 *
-	 * @param string $prefix
-	 * @return ICache
-	 */
-	public function createDistributed(string $prefix = ''): ICache {
-		return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
-	}
-
-	/**
-	 * create a local cache instance
-	 *
-	 * @param string $prefix
-	 * @return ICache
-	 */
-	public function createLocal(string $prefix = ''): ICache {
-		return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
-	}
-
-	/**
-	 * @see \OC\Memcache\Factory::createDistributed()
-	 * @param string $prefix
-	 * @return ICache
-	 * @deprecated 13.0.0 Use either createLocking, createDistributed or createLocal
-	 */
-	public function create(string $prefix = ''): ICache {
-		return $this->createDistributed($prefix);
-	}
-
-	/**
-	 * check memcache availability
-	 *
-	 * @return bool
-	 */
-	public function isAvailable(): bool {
-		return ($this->distributedCacheClass !== self::NULL_CACHE);
-	}
-
-	/**
-	 * @see \OC\Memcache\Factory::createLocal()
-	 * @param string $prefix
-	 * @return ICache
-	 */
-	public function createLowLatency(string $prefix = ''): ICache {
-		return $this->createLocal($prefix);
-	}
-
-	/**
-	 * Check if a local memory cache backend is available
-	 *
-	 * @return bool
-	 */
-	public function isLocalCacheAvailable(): bool {
-		return ($this->localCacheClass !== self::NULL_CACHE);
-	}
+    public const NULL_CACHE = NullCache::class;
+
+    /**
+     * @var string $globalPrefix
+     */
+    private $globalPrefix;
+
+    /**
+     * @var ILogger $logger
+     */
+    private $logger;
+
+    /**
+     * @var string $localCacheClass
+     */
+    private $localCacheClass;
+
+    /**
+     * @var string $distributedCacheClass
+     */
+    private $distributedCacheClass;
+
+    /**
+     * @var string $lockingCacheClass
+     */
+    private $lockingCacheClass;
+
+    /**
+     * @param string $globalPrefix
+     * @param ILogger $logger
+     * @param string|null $localCacheClass
+     * @param string|null $distributedCacheClass
+     * @param string|null $lockingCacheClass
+     */
+    public function __construct(string $globalPrefix, ILogger $logger,
+        $localCacheClass = null, $distributedCacheClass = null, $lockingCacheClass = null) {
+        $this->logger = $logger;
+        $this->globalPrefix = $globalPrefix;
+
+        if (!$localCacheClass) {
+            $localCacheClass = self::NULL_CACHE;
+        }
+        if (!$distributedCacheClass) {
+            $distributedCacheClass = $localCacheClass;
+        }
+
+        $missingCacheMessage = 'Memcache {class} not available for {use} cache';
+        $missingCacheHint = 'Is the matching PHP module installed and enabled?';
+        if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) {
+            if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
+                // CLI should not hard-fail on broken memcache
+                $this->logger->info($missingCacheMessage, [
+                    'class' => $localCacheClass,
+                    'use' => 'local',
+                    'app' => 'cli'
+                ]);
+                $localCacheClass = self::NULL_CACHE;
+            } else {
+                throw new \OC\HintException(strtr($missingCacheMessage, [
+                    '{class}' => $localCacheClass, '{use}' => 'local'
+                ]), $missingCacheHint);
+            }
+        }
+        if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) {
+            if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
+                // CLI should not hard-fail on broken memcache
+                $this->logger->info($missingCacheMessage, [
+                    'class' => $distributedCacheClass,
+                    'use' => 'distributed',
+                    'app' => 'cli'
+                ]);
+                $distributedCacheClass = self::NULL_CACHE;
+            } else {
+                throw new \OC\HintException(strtr($missingCacheMessage, [
+                    '{class}' => $distributedCacheClass, '{use}' => 'distributed'
+                ]), $missingCacheHint);
+            }
+        }
+        if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) {
+            // don't fallback since the fallback might not be suitable for storing lock
+            $lockingCacheClass = self::NULL_CACHE;
+        }
+
+        $this->localCacheClass = $localCacheClass;
+        $this->distributedCacheClass = $distributedCacheClass;
+        $this->lockingCacheClass = $lockingCacheClass;
+    }
+
+    /**
+     * create a cache instance for storing locks
+     *
+     * @param string $prefix
+     * @return IMemcache
+     */
+    public function createLocking(string $prefix = ''): IMemcache {
+        return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
+    }
+
+    /**
+     * create a distributed cache instance
+     *
+     * @param string $prefix
+     * @return ICache
+     */
+    public function createDistributed(string $prefix = ''): ICache {
+        return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
+    }
+
+    /**
+     * create a local cache instance
+     *
+     * @param string $prefix
+     * @return ICache
+     */
+    public function createLocal(string $prefix = ''): ICache {
+        return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
+    }
+
+    /**
+     * @see \OC\Memcache\Factory::createDistributed()
+     * @param string $prefix
+     * @return ICache
+     * @deprecated 13.0.0 Use either createLocking, createDistributed or createLocal
+     */
+    public function create(string $prefix = ''): ICache {
+        return $this->createDistributed($prefix);
+    }
+
+    /**
+     * check memcache availability
+     *
+     * @return bool
+     */
+    public function isAvailable(): bool {
+        return ($this->distributedCacheClass !== self::NULL_CACHE);
+    }
+
+    /**
+     * @see \OC\Memcache\Factory::createLocal()
+     * @param string $prefix
+     * @return ICache
+     */
+    public function createLowLatency(string $prefix = ''): ICache {
+        return $this->createLocal($prefix);
+    }
+
+    /**
+     * Check if a local memory cache backend is available
+     *
+     * @return bool
+     */
+    public function isLocalCacheAvailable(): bool {
+        return ($this->localCacheClass !== self::NULL_CACHE);
+    }
 }

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

core/Migrations/Version13000Date20170814074715.php

Indentation +41 added lines, -41 removed lines

@@ -29,50 +29,50 @@
 
 class Version13000Date20170814074715 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
 
-		if (!$schema->hasTable('accounts')) {
-			$table = $schema->createTable('accounts');
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['uid']);
-		}
+        if (!$schema->hasTable('accounts')) {
+            $table = $schema->createTable('accounts');
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['uid']);
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 }

core/Migrations/Version13000Date20170919121250.php

Indentation +89 added lines, -89 removed lines

@@ -32,93 +32,93 @@
  */
 class Version13000Date20170919121250 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$table = $schema->getTable('jobs');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('authtoken');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-		$column = $table->getColumn('type');
-		$column->setUnsigned(true);
-		$column = $table->getColumn('remember');
-		$column->setUnsigned(true);
-		$column = $table->getColumn('last_activity');
-		$column->setUnsigned(true);
-		$column = $table->getColumn('last_check');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('bruteforce_attempts');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-		$column = $table->getColumn('occurred');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('comments');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-		$column = $table->getColumn('parent_id');
-		$column->setUnsigned(true);
-		$column = $table->getColumn('topmost_parent_id');
-		$column->setUnsigned(true);
-		$column = $table->getColumn('children_count');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('file_locks');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('systemtag');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('systemtag_object_mapping');
-		$column = $table->getColumn('systemtagid');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('systemtag_group');
-		$column = $table->getColumn('systemtagid');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('vcategory');
-		$column = $table->getColumn('id');
-		$column->setUnsigned(true);
-
-		$table = $schema->getTable('vcategory_to_object');
-		$column = $table->getColumn('objid');
-		$column->setUnsigned(true);
-		$column = $table->getColumn('categoryid');
-		$column->setUnsigned(true);
-
-		return $schema;
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
+
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $table = $schema->getTable('jobs');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('authtoken');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+        $column = $table->getColumn('type');
+        $column->setUnsigned(true);
+        $column = $table->getColumn('remember');
+        $column->setUnsigned(true);
+        $column = $table->getColumn('last_activity');
+        $column->setUnsigned(true);
+        $column = $table->getColumn('last_check');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('bruteforce_attempts');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+        $column = $table->getColumn('occurred');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('comments');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+        $column = $table->getColumn('parent_id');
+        $column->setUnsigned(true);
+        $column = $table->getColumn('topmost_parent_id');
+        $column->setUnsigned(true);
+        $column = $table->getColumn('children_count');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('file_locks');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('systemtag');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('systemtag_object_mapping');
+        $column = $table->getColumn('systemtagid');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('systemtag_group');
+        $column = $table->getColumn('systemtagid');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('vcategory');
+        $column = $table->getColumn('id');
+        $column->setUnsigned(true);
+
+        $table = $schema->getTable('vcategory_to_object');
+        $column = $table->getColumn('objid');
+        $column->setUnsigned(true);
+        $column = $table->getColumn('categoryid');
+        $column->setUnsigned(true);
+
+        return $schema;
+    }
+
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 }

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php

Indentation +62 added lines, -62 removed lines

@@ -31,75 +31,75 @@
 
 class Version1002Date20170607113030 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	protected $connection;
+    /** @var IDBConnection */
+    protected $connection;
 
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('twofactor_backup_codes')) {
-			// Legacy table does not exist
-			return;
-		}
+        if (!$schema->hasTable('twofactor_backup_codes')) {
+            // Legacy table does not exist
+            return;
+        }
 
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('twofactor_backupcodes')
-			->values([
-				// Inserting with id might fail: 'id' => $insert->createParameter('id'),
-				'user_id' => $insert->createParameter('user_id'),
-				'code' => $insert->createParameter('code'),
-				'used' => $insert->createParameter('used'),
-			]);
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('twofactor_backupcodes')
+            ->values([
+                // Inserting with id might fail: 'id' => $insert->createParameter('id'),
+                'user_id' => $insert->createParameter('user_id'),
+                'code' => $insert->createParameter('code'),
+                'used' => $insert->createParameter('used'),
+            ]);
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('twofactor_backup_codes')
-			->orderBy('id', 'ASC');
-		$result = $query->execute();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('twofactor_backup_codes')
+            ->orderBy('id', 'ASC');
+        $result = $query->execute();
 
-		$output->startProgress();
-		while ($row = $result->fetch()) {
-			$output->advance();
+        $output->startProgress();
+        while ($row = $result->fetch()) {
+            $output->advance();
 
-			$insert
-				// Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
-				->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
-				->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
-				->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
-				->execute();
-		}
-		$output->finishProgress();
-	}
+            $insert
+                // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
+                ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
+                ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
+                ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
+                ->execute();
+        }
+        $output->finishProgress();
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('twofactor_backup_codes')) {
-			$schema->dropTable('twofactor_backup_codes');
-			return $schema;
-		}
-		return null;
-	}
+        if ($schema->hasTable('twofactor_backup_codes')) {
+            $schema->dropTable('twofactor_backup_codes');
+            return $schema;
+        }
+        return null;
+    }
 }