nextcloud / server

lib/private/Security/RateLimiting/Backend/IBackend.php

Indentation +21 added lines, -21 removed lines

@@ -33,26 +33,26 @@
  * @package OC\Security\RateLimiting\Backend
  */
 interface IBackend {
-	/**
-	 * Gets the amount of attempts within the last specified seconds
-	 *
-	 * @param string $methodIdentifier Identifier for the method
-	 * @param string $userIdentifier Identifier for the user
-	 * @param int $seconds Seconds to look back at
-	 * @return int
-	 */
-	public function getAttempts(string $methodIdentifier,
-								string $userIdentifier,
-								int $seconds): int;
+    /**
+     * Gets the amount of attempts within the last specified seconds
+     *
+     * @param string $methodIdentifier Identifier for the method
+     * @param string $userIdentifier Identifier for the user
+     * @param int $seconds Seconds to look back at
+     * @return int
+     */
+    public function getAttempts(string $methodIdentifier,
+                                string $userIdentifier,
+                                int $seconds): int;
 
-	/**
-	 * Registers an attempt
-	 *
-	 * @param string $methodIdentifier Identifier for the method
-	 * @param string $userIdentifier Identifier for the user
-	 * @param int $period Period in seconds how long this attempt should be stored
-	 */
-	public function registerAttempt(string $methodIdentifier,
-									string $userIdentifier,
-									int $period);
+    /**
+     * Registers an attempt
+     *
+     * @param string $methodIdentifier Identifier for the method
+     * @param string $userIdentifier Identifier for the user
+     * @param int $period Period in seconds how long this attempt should be stored
+     */
+    public function registerAttempt(string $methodIdentifier,
+                                    string $userIdentifier,
+                                    int $period);
 }

apps/systemtags/list.php

Indentation +10 added lines, -10 removed lines

@@ -23,19 +23,19 @@
 // WARNING: this should be moved to proper AppFramework handling
 // Check if we are a user
 if (!\OC::$server->getUserSession()->isLoggedIn()) {
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
-			'core.login.showLoginForm',
-			[
-				'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
-			]
-		)
-	);
-	exit();
+    header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+            'core.login.showLoginForm',
+            [
+                'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
+            ]
+        )
+    );
+    exit();
 }
 // Redirect to 2FA challenge selection if 2FA challenge was not solved yet
 if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-	exit();
+    header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+    exit();
 }
 
 $tmpl = new OCP\Template('systemtags', 'list', '');

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 // WARNING: this should be moved to proper AppFramework handling
 // Check if we are a user
 if (!\OC::$server->getUserSession()->isLoggedIn()) {
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+	header('Location: '.\OC::$server->getURLGenerator()->linkToRoute(
 			'core.login.showLoginForm',
 			[
 				'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
@@ -34,7 +34,7 @@ 
 }
 // Redirect to 2FA challenge selection if 2FA challenge was not solved yet
 if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+	header('Location: '.\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
 	exit();
 }
 

lib/public/Federation/ICloudId.php

Indentation +28 added lines, -28 removed lines

@@ -30,35 +30,35 @@
  * @since 12.0.0
  */
 interface ICloudId {
-	/**
-	 * The remote cloud id
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getId(): string;
+    /**
+     * The remote cloud id
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getId(): string;
 
-	/**
-	 * Get a clean representation of the cloud id for display
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getDisplayId(): string;
+    /**
+     * Get a clean representation of the cloud id for display
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getDisplayId(): string;
 
-	/**
-	 * The username on the remote server
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getUser(): string;
+    /**
+     * The username on the remote server
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getUser(): string;
 
-	/**
-	 * The base address of the remote server
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getRemote(): string;
+    /**
+     * The base address of the remote server
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getRemote(): string;
 }

lib/public/Federation/ICloudIdManager.php

Indentation +27 added lines, -27 removed lines

@@ -31,33 +31,33 @@
  * @since 12.0.0
  */
 interface ICloudIdManager {
-	/**
-	 * @param string $cloudId
-	 * @return ICloudId
-	 * @throws \InvalidArgumentException
-	 *
-	 * @since 12.0.0
-	 */
-	public function resolveCloudId(string $cloudId): ICloudId;
+    /**
+     * @param string $cloudId
+     * @return ICloudId
+     * @throws \InvalidArgumentException
+     *
+     * @since 12.0.0
+     */
+    public function resolveCloudId(string $cloudId): ICloudId;
 
-	/**
-	 * Get the cloud id for a remote user
-	 *
-	 * @param string $user
-	 * @param string $remote
-	 * @return ICloudId
-	 *
-	 * @since 12.0.0
-	 */
-	public function getCloudId(string $user, string $remote): ICloudId;
+    /**
+     * Get the cloud id for a remote user
+     *
+     * @param string $user
+     * @param string $remote
+     * @return ICloudId
+     *
+     * @since 12.0.0
+     */
+    public function getCloudId(string $user, string $remote): ICloudId;
 
-	/**
-	 * Check if the input is a correctly formatted cloud id
-	 *
-	 * @param string $cloudId
-	 * @return bool
-	 *
-	 * @since 12.0.0
-	 */
-	public function isValidCloudId(string $cloudId): bool;
+    /**
+     * Check if the input is a correctly formatted cloud id
+     *
+     * @param string $cloudId
+     * @return bool
+     *
+     * @since 12.0.0
+     */
+    public function isValidCloudId(string $cloudId): bool;
 }

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

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