nextcloud / server

core/Command/Maintenance/Mode.php

Indentation +47 added lines, -47 removed lines

@@ -32,54 +32,54 @@
 
 class Mode extends Command {
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-		parent::__construct();
-	}
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:mode')
-			->setDescription('set maintenance mode')
-			->addOption(
-				'on',
-				null,
-				InputOption::VALUE_NONE,
-				'enable maintenance mode'
-			)
-			->addOption(
-				'off',
-				null,
-				InputOption::VALUE_NONE,
-				'disable maintenance mode'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:mode')
+            ->setDescription('set maintenance mode')
+            ->addOption(
+                'on',
+                null,
+                InputOption::VALUE_NONE,
+                'enable maintenance mode'
+            )
+            ->addOption(
+                'off',
+                null,
+                InputOption::VALUE_NONE,
+                'disable maintenance mode'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$maintenanceMode = $this->config->getSystemValueBool('maintenance');
-		if ($input->getOption('on')) {
-			if ($maintenanceMode === false) {
-				$this->config->setSystemValue('maintenance', true);
-				$output->writeln('Maintenance mode enabled');
-			} else {
-				$output->writeln('Maintenance mode already enabled');
-			}
-		} elseif ($input->getOption('off')) {
-			if ($maintenanceMode === true) {
-				$this->config->setSystemValue('maintenance', false);
-				$output->writeln('Maintenance mode disabled');
-			} else {
-				$output->writeln('Maintenance mode already disabled');
-			}
-		} else {
-			if ($maintenanceMode) {
-				$output->writeln('Maintenance mode is currently enabled');
-			} else {
-				$output->writeln('Maintenance mode is currently disabled');
-			}
-		}
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $maintenanceMode = $this->config->getSystemValueBool('maintenance');
+        if ($input->getOption('on')) {
+            if ($maintenanceMode === false) {
+                $this->config->setSystemValue('maintenance', true);
+                $output->writeln('Maintenance mode enabled');
+            } else {
+                $output->writeln('Maintenance mode already enabled');
+            }
+        } elseif ($input->getOption('off')) {
+            if ($maintenanceMode === true) {
+                $this->config->setSystemValue('maintenance', false);
+                $output->writeln('Maintenance mode disabled');
+            } else {
+                $output->writeln('Maintenance mode already disabled');
+            }
+        } else {
+            if ($maintenanceMode) {
+                $output->writeln('Maintenance mode is currently enabled');
+            } else {
+                $output->writeln('Maintenance mode is currently disabled');
+            }
+        }
+    }
 }

lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php

Indentation +11 added lines, -11 removed lines

@@ -31,19 +31,19 @@
 
 class AddClenupLoginFlowV2BackgroundJob implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Add background job to cleanup login flow v2 tokens';
-	}
+    public function getName(): string {
+        return 'Add background job to cleanup login flow v2 tokens';
+    }
 
-	public function run(IOutput $output) {
-		$this->jobList->add(CleanupLoginFlowV2::class);
-	}
+    public function run(IOutput $output) {
+        $this->jobList->add(CleanupLoginFlowV2::class);
+    }
 
 }

core/Data/LoginFlowV2Credentials.php

Indentation +36 added lines, -36 removed lines

@@ -25,47 +25,47 @@
 namespace OC\Core\Data;
 
 class LoginFlowV2Credentials implements \JsonSerializable {
-	/** @var string */
-	private $server;
-	/** @var string */
-	private $loginName;
-	/** @var string */
-	private $appPassword;
+    /** @var string */
+    private $server;
+    /** @var string */
+    private $loginName;
+    /** @var string */
+    private $appPassword;
 
-	public function __construct(string $server, string $loginName, string $appPassword) {
-		$this->server = $server;
-		$this->loginName = $loginName;
-		$this->appPassword = $appPassword;
-	}
+    public function __construct(string $server, string $loginName, string $appPassword) {
+        $this->server = $server;
+        $this->loginName = $loginName;
+        $this->appPassword = $appPassword;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getServer(): string {
-		return $this->server;
-	}
+    /**
+     * @return string
+     */
+    public function getServer(): string {
+        return $this->server;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getLoginName(): string {
-		return $this->loginName;
-	}
+    /**
+     * @return string
+     */
+    public function getLoginName(): string {
+        return $this->loginName;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getAppPassword(): string {
-		return $this->appPassword;
-	}
+    /**
+     * @return string
+     */
+    public function getAppPassword(): string {
+        return $this->appPassword;
+    }
 
-	public function jsonSerialize(): array {
-		return [
-			'server' => $this->server,
-			'loginName' => $this->loginName,
-			'appPassword' => $this->appPassword,
-		];
-	}
+    public function jsonSerialize(): array {
+        return [
+            'server' => $this->server,
+            'loginName' => $this->loginName,
+            'appPassword' => $this->appPassword,
+        ];
+    }
 
 
 }

core/Service/LoginFlowV2Service.php

Spacing +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
 
 	private function hashToken(string $token): string {
 		$secret = $this->config->getSystemValue('secret');
-		return hash('sha512', $token . $secret);
+		return hash('sha512', $token.$secret);
 	}
 
 	private function getKeyPair(): array {
@@ -241,7 +241,7 @@ 
 		while ($error = openssl_error_string()) {
 			$errors[] = $error;
 		}
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
+		$this->logger->critical('Something is wrong with your openssl setup: '.implode(', ', $errors));
 	}
 
 	private function encryptPassword(string $password, string $publicKey): string {

Indentation +211 added lines, -211 removed lines

@@ -42,215 +42,215 @@
 
 class LoginFlowV2Service {
 
-	/** @var LoginFlowV2Mapper */
-	private $mapper;
-	/** @var ISecureRandom */
-	private $random;
-	/** @var ITimeFactory */
-	private $time;
-	/** @var IConfig */
-	private $config;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var ILogger */
-	private $logger;
-	/** @var IProvider */
-	private $tokenProvider;
-
-	public function __construct(LoginFlowV2Mapper $mapper,
-								ISecureRandom $random,
-								ITimeFactory $time,
-								IConfig $config,
-								ICrypto $crypto,
-								ILogger $logger,
-								IProvider $tokenProvider) {
-		$this->mapper = $mapper;
-		$this->random = $random;
-		$this->time = $time;
-		$this->config = $config;
-		$this->crypto = $crypto;
-		$this->logger = $logger;
-		$this->tokenProvider = $tokenProvider;
-	}
-
-	/**
-	 * @param string $pollToken
-	 * @return LoginFlowV2Credentials
-	 * @throws LoginFlowV2NotFoundException
-	 */
-	public function poll(string $pollToken): LoginFlowV2Credentials {
-		try {
-			$data = $this->mapper->getByPollToken($this->hashToken($pollToken));
-		} catch (DoesNotExistException $e) {
-			throw new LoginFlowV2NotFoundException('Invalid token');
-		}
-
-		$loginName = $data->getLoginName();
-		$server = $data->getServer();
-		$appPassword = $data->getAppPassword();
-
-		if ($loginName === null || $server === null || $appPassword === null) {
-			throw new LoginFlowV2NotFoundException('Token not yet ready');
-		}
-
-		// Remove the data from the DB
-		$this->mapper->delete($data);
-
-		try {
-			// Decrypt the apptoken
-			$privateKey = $this->crypto->decrypt($data->getPrivateKey(), $pollToken);
-			$appPassword = $this->decryptPassword($data->getAppPassword(), $privateKey);
-		} catch (\Exception $e) {
-			throw new LoginFlowV2NotFoundException('Apptoken could not be decrypted');
-		}
-
-		return new LoginFlowV2Credentials($server, $loginName, $appPassword);
-	}
-
-	/**
-	 * @param string $loginToken
-	 * @return LoginFlowV2
-	 * @throws LoginFlowV2NotFoundException
-	 */
-	public function getByLoginToken(string $loginToken): LoginFlowV2 {
-		try {
-			return $this->mapper->getByLoginToken($loginToken);
-		} catch (DoesNotExistException $e) {
-			throw new LoginFlowV2NotFoundException('Login token invalid');
-		}
-	}
-
-	/**
-	 * @param string $loginToken
-	 * @return bool returns true if the start was successfull. False if not.
-	 */
-	public function startLoginFlow(string $loginToken): bool {
-		try {
-			$data = $this->mapper->getByLoginToken($loginToken);
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-
-		$data->setStarted(1);
-		$this->mapper->update($data);
-
-		return true;
-	}
-
-	/**
-	 * @param string $loginToken
-	 * @param string $sessionId
-	 * @param string $server
-	 * @param string $userId
-	 * @return bool true if the flow was successfully completed false otherwise
-	 */
-	public function flowDone(string $loginToken, string $sessionId, string $server, string $userId): bool {
-		try {
-			$data = $this->mapper->getByLoginToken($loginToken);
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-
-		try {
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
-			$loginName = $sessionToken->getLoginName();
-			try {
-				$password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
-			} catch (PasswordlessTokenException $ex) {
-				$password = null;
-			}
-		} catch (InvalidTokenException $ex) {
-			return false;
-		}
-
-		$appPassword = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
-		$this->tokenProvider->generateToken(
-			$appPassword,
-			$userId,
-			$loginName,
-			$password,
-			$data->getClientName(),
-			IToken::PERMANENT_TOKEN,
-			IToken::DO_NOT_REMEMBER
-		);
-
-		$data->setLoginName($loginName);
-		$data->setServer($server);
-
-		// Properly encrypt
-		$data->setAppPassword($this->encryptPassword($appPassword, $data->getPublicKey()));
-
-		$this->mapper->update($data);
-		return true;
-	}
-
-	public function createTokens(string $userAgent): LoginFlowV2Tokens {
-		$flow = new LoginFlowV2();
-		$pollToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
-		$loginToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
-		$flow->setPollToken($this->hashToken($pollToken));
-		$flow->setLoginToken($loginToken);
-		$flow->setStarted(0);
-		$flow->setTimestamp($this->time->getTime());
-		$flow->setClientName($userAgent);
-
-		[$publicKey, $privateKey] = $this->getKeyPair();
-		$privateKey = $this->crypto->encrypt($privateKey, $pollToken);
-
-		$flow->setPublicKey($publicKey);
-		$flow->setPrivateKey($privateKey);
-
-		$this->mapper->insert($flow);
-
-		return new LoginFlowV2Tokens($loginToken, $pollToken);
-	}
-
-	private function hashToken(string $token): string {
-		$secret = $this->config->getSystemValue('secret');
-		return hash('sha512', $token . $secret);
-	}
-
-	private function getKeyPair(): array {
-		$config = array_merge([
-			'digest_alg' => 'sha512',
-			'private_key_bits' => 2048,
-		], $this->config->getSystemValue('openssl', []));
-
-		// Generate new key
-		$res = openssl_pkey_new($config);
-		if ($res === false) {
-			$this->logOpensslError();
-			throw new \RuntimeException('Could not initialize keys');
-		}
-
-		openssl_pkey_export($res, $privateKey);
-
-		// Extract the public key from $res to $pubKey
-		$publicKey = openssl_pkey_get_details($res);
-		$publicKey = $publicKey['key'];
-
-		return [$publicKey, $privateKey];
-	}
-
-	private function logOpensslError(): void {
-		$errors = [];
-		while ($error = openssl_error_string()) {
-			$errors[] = $error;
-		}
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
-	}
-
-	private function encryptPassword(string $password, string $publicKey): string {
-		openssl_public_encrypt($password, $encryptedPassword, $publicKey, OPENSSL_PKCS1_OAEP_PADDING);
-		$encryptedPassword = base64_encode($encryptedPassword);
-
-		return $encryptedPassword;
-	}
-
-	private function decryptPassword(string $encryptedPassword, string $privateKey): string {
-		$encryptedPassword = base64_decode($encryptedPassword);
-		openssl_private_decrypt($encryptedPassword, $password, $privateKey, OPENSSL_PKCS1_OAEP_PADDING);
-
-		return $password;
-	}
+    /** @var LoginFlowV2Mapper */
+    private $mapper;
+    /** @var ISecureRandom */
+    private $random;
+    /** @var ITimeFactory */
+    private $time;
+    /** @var IConfig */
+    private $config;
+    /** @var ICrypto */
+    private $crypto;
+    /** @var ILogger */
+    private $logger;
+    /** @var IProvider */
+    private $tokenProvider;
+
+    public function __construct(LoginFlowV2Mapper $mapper,
+                                ISecureRandom $random,
+                                ITimeFactory $time,
+                                IConfig $config,
+                                ICrypto $crypto,
+                                ILogger $logger,
+                                IProvider $tokenProvider) {
+        $this->mapper = $mapper;
+        $this->random = $random;
+        $this->time = $time;
+        $this->config = $config;
+        $this->crypto = $crypto;
+        $this->logger = $logger;
+        $this->tokenProvider = $tokenProvider;
+    }
+
+    /**
+     * @param string $pollToken
+     * @return LoginFlowV2Credentials
+     * @throws LoginFlowV2NotFoundException
+     */
+    public function poll(string $pollToken): LoginFlowV2Credentials {
+        try {
+            $data = $this->mapper->getByPollToken($this->hashToken($pollToken));
+        } catch (DoesNotExistException $e) {
+            throw new LoginFlowV2NotFoundException('Invalid token');
+        }
+
+        $loginName = $data->getLoginName();
+        $server = $data->getServer();
+        $appPassword = $data->getAppPassword();
+
+        if ($loginName === null || $server === null || $appPassword === null) {
+            throw new LoginFlowV2NotFoundException('Token not yet ready');
+        }
+
+        // Remove the data from the DB
+        $this->mapper->delete($data);
+
+        try {
+            // Decrypt the apptoken
+            $privateKey = $this->crypto->decrypt($data->getPrivateKey(), $pollToken);
+            $appPassword = $this->decryptPassword($data->getAppPassword(), $privateKey);
+        } catch (\Exception $e) {
+            throw new LoginFlowV2NotFoundException('Apptoken could not be decrypted');
+        }
+
+        return new LoginFlowV2Credentials($server, $loginName, $appPassword);
+    }
+
+    /**
+     * @param string $loginToken
+     * @return LoginFlowV2
+     * @throws LoginFlowV2NotFoundException
+     */
+    public function getByLoginToken(string $loginToken): LoginFlowV2 {
+        try {
+            return $this->mapper->getByLoginToken($loginToken);
+        } catch (DoesNotExistException $e) {
+            throw new LoginFlowV2NotFoundException('Login token invalid');
+        }
+    }
+
+    /**
+     * @param string $loginToken
+     * @return bool returns true if the start was successfull. False if not.
+     */
+    public function startLoginFlow(string $loginToken): bool {
+        try {
+            $data = $this->mapper->getByLoginToken($loginToken);
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+
+        $data->setStarted(1);
+        $this->mapper->update($data);
+
+        return true;
+    }
+
+    /**
+     * @param string $loginToken
+     * @param string $sessionId
+     * @param string $server
+     * @param string $userId
+     * @return bool true if the flow was successfully completed false otherwise
+     */
+    public function flowDone(string $loginToken, string $sessionId, string $server, string $userId): bool {
+        try {
+            $data = $this->mapper->getByLoginToken($loginToken);
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+
+        try {
+            $sessionToken = $this->tokenProvider->getToken($sessionId);
+            $loginName = $sessionToken->getLoginName();
+            try {
+                $password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
+            } catch (PasswordlessTokenException $ex) {
+                $password = null;
+            }
+        } catch (InvalidTokenException $ex) {
+            return false;
+        }
+
+        $appPassword = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
+        $this->tokenProvider->generateToken(
+            $appPassword,
+            $userId,
+            $loginName,
+            $password,
+            $data->getClientName(),
+            IToken::PERMANENT_TOKEN,
+            IToken::DO_NOT_REMEMBER
+        );
+
+        $data->setLoginName($loginName);
+        $data->setServer($server);
+
+        // Properly encrypt
+        $data->setAppPassword($this->encryptPassword($appPassword, $data->getPublicKey()));
+
+        $this->mapper->update($data);
+        return true;
+    }
+
+    public function createTokens(string $userAgent): LoginFlowV2Tokens {
+        $flow = new LoginFlowV2();
+        $pollToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
+        $loginToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
+        $flow->setPollToken($this->hashToken($pollToken));
+        $flow->setLoginToken($loginToken);
+        $flow->setStarted(0);
+        $flow->setTimestamp($this->time->getTime());
+        $flow->setClientName($userAgent);
+
+        [$publicKey, $privateKey] = $this->getKeyPair();
+        $privateKey = $this->crypto->encrypt($privateKey, $pollToken);
+
+        $flow->setPublicKey($publicKey);
+        $flow->setPrivateKey($privateKey);
+
+        $this->mapper->insert($flow);
+
+        return new LoginFlowV2Tokens($loginToken, $pollToken);
+    }
+
+    private function hashToken(string $token): string {
+        $secret = $this->config->getSystemValue('secret');
+        return hash('sha512', $token . $secret);
+    }
+
+    private function getKeyPair(): array {
+        $config = array_merge([
+            'digest_alg' => 'sha512',
+            'private_key_bits' => 2048,
+        ], $this->config->getSystemValue('openssl', []));
+
+        // Generate new key
+        $res = openssl_pkey_new($config);
+        if ($res === false) {
+            $this->logOpensslError();
+            throw new \RuntimeException('Could not initialize keys');
+        }
+
+        openssl_pkey_export($res, $privateKey);
+
+        // Extract the public key from $res to $pubKey
+        $publicKey = openssl_pkey_get_details($res);
+        $publicKey = $publicKey['key'];
+
+        return [$publicKey, $privateKey];
+    }
+
+    private function logOpensslError(): void {
+        $errors = [];
+        while ($error = openssl_error_string()) {
+            $errors[] = $error;
+        }
+        $this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
+    }
+
+    private function encryptPassword(string $password, string $publicKey): string {
+        openssl_public_encrypt($password, $encryptedPassword, $publicKey, OPENSSL_PKCS1_OAEP_PADDING);
+        $encryptedPassword = base64_encode($encryptedPassword);
+
+        return $encryptedPassword;
+    }
+
+    private function decryptPassword(string $encryptedPassword, string $privateKey): string {
+        $encryptedPassword = base64_decode($encryptedPassword);
+        openssl_private_decrypt($encryptedPassword, $password, $privateKey, OPENSSL_PKCS1_OAEP_PADDING);
+
+        return $password;
+    }
 }

core/BackgroundJobs/CleanupLoginFlowV2.php

Indentation +10 added lines, -10 removed lines

@@ -30,17 +30,17 @@
 
 class CleanupLoginFlowV2 extends TimedJob {
 
-	/** @var LoginFlowV2Mapper */
-	private $loginFlowV2Mapper;
+    /** @var LoginFlowV2Mapper */
+    private $loginFlowV2Mapper;
 
-	public function __construct(ITimeFactory $time, LoginFlowV2Mapper $loginFlowV2Mapper) {
-		parent::__construct($time);
-		$this->loginFlowV2Mapper = $loginFlowV2Mapper;
+    public function __construct(ITimeFactory $time, LoginFlowV2Mapper $loginFlowV2Mapper) {
+        parent::__construct($time);
+        $this->loginFlowV2Mapper = $loginFlowV2Mapper;
 
-		$this->setInterval(3600);
-	}
+        $this->setInterval(3600);
+    }
 
-	protected function run($argument) {
-		$this->loginFlowV2Mapper->cleanup();
-	}
+    protected function run($argument) {
+        $this->loginFlowV2Mapper->cleanup();
+    }
 }

core/Db/LoginFlowV2.php

Indentation +32 added lines, -32 removed lines

@@ -49,37 +49,37 @@
  * @method void setAppPassword(string $appPassword)
  */
 class LoginFlowV2 extends Entity {
-	/** @var int */
-	protected $timestamp;
-	/** @var int */
-	protected $started;
-	/** @var string */
-	protected $pollToken;
-	/** @var string */
-	protected $loginToken;
-	/** @var string */
-	protected $publicKey;
-	/** @var string */
-	protected $privateKey;
-	/** @var string */
-	protected $clientName;
-	/** @var string */
-	protected $loginName;
-	/** @var string */
-	protected $server;
-	/** @var string */
-	protected $appPassword;
+    /** @var int */
+    protected $timestamp;
+    /** @var int */
+    protected $started;
+    /** @var string */
+    protected $pollToken;
+    /** @var string */
+    protected $loginToken;
+    /** @var string */
+    protected $publicKey;
+    /** @var string */
+    protected $privateKey;
+    /** @var string */
+    protected $clientName;
+    /** @var string */
+    protected $loginName;
+    /** @var string */
+    protected $server;
+    /** @var string */
+    protected $appPassword;
 
-	public function __construct() {
-		$this->addType('timestamp', 'int');
-		$this->addType('started', 'int');
-		$this->addType('pollToken', 'string');
-		$this->addType('loginToken', 'string');
-		$this->addType('publicKey', 'string');
-		$this->addType('privateKey', 'string');
-		$this->addType('clientName', 'string');
-		$this->addType('loginName', 'string');
-		$this->addType('server', 'string');
-		$this->addType('appPassword', 'string');
-	}
+    public function __construct() {
+        $this->addType('timestamp', 'int');
+        $this->addType('started', 'int');
+        $this->addType('pollToken', 'string');
+        $this->addType('loginToken', 'string');
+        $this->addType('publicKey', 'string');
+        $this->addType('privateKey', 'string');
+        $this->addType('clientName', 'string');
+        $this->addType('loginName', 'string');
+        $this->addType('server', 'string');
+        $this->addType('appPassword', 'string');
+    }
 }

core/Db/LoginFlowV2Mapper.php

Indentation +57 added lines, -57 removed lines

@@ -30,71 +30,71 @@
 use OCP\IDBConnection;
 
 class LoginFlowV2Mapper extends QBMapper {
-	private const lifetime = 1200;
+    private const lifetime = 1200;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
-		parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
-		$this->timeFactory = $timeFactory;
-	}
+    public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
+        parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @param string $pollToken
-	 * @return LoginFlowV2
-	 * @throws DoesNotExistException
-	 */
-	public function getByPollToken(string $pollToken): LoginFlowV2 {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
-			);
+    /**
+     * @param string $pollToken
+     * @return LoginFlowV2
+     * @throws DoesNotExistException
+     */
+    public function getByPollToken(string $pollToken): LoginFlowV2 {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('poll_token', $qb->createNamedParameter($pollToken))
+            );
 
-		$entity = $this->findEntity($qb);
-		return $this->validateTimestamp($entity);
-	}
+        $entity = $this->findEntity($qb);
+        return $this->validateTimestamp($entity);
+    }
 
-	/**
-	 * @param string $loginToken
-	 * @return LoginFlowV2
-	 * @throws DoesNotExistException
-	 */
-	public function getByLoginToken(string $loginToken): LoginFlowV2 {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where(
-				$qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
-			);
+    /**
+     * @param string $loginToken
+     * @return LoginFlowV2
+     * @throws DoesNotExistException
+     */
+    public function getByLoginToken(string $loginToken): LoginFlowV2 {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where(
+                $qb->expr()->eq('login_token', $qb->createNamedParameter($loginToken))
+            );
 
-		$entity = $this->findEntity($qb);
-		return $this->validateTimestamp($entity);
-	}
+        $entity = $this->findEntity($qb);
+        return $this->validateTimestamp($entity);
+    }
 
-	public function cleanup(): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->getTableName())
-			->where(
-				$qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
-			);
+    public function cleanup(): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->getTableName())
+            ->where(
+                $qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
+            );
 
-		$qb->execute();
-	}
+        $qb->execute();
+    }
 
-	/**
-	 * @param LoginFlowV2 $flowV2
-	 * @return LoginFlowV2
-	 * @throws DoesNotExistException
-	 */
-	private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
-		if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
-			$this->delete($flowV2);
-			throw new DoesNotExistException('Token expired');
-		}
+    /**
+     * @param LoginFlowV2 $flowV2
+     * @return LoginFlowV2
+     * @throws DoesNotExistException
+     */
+    private function validateTimestamp(LoginFlowV2 $flowV2): LoginFlowV2 {
+        if ($flowV2->getTimestamp() < ($this->timeFactory->getTime() - self::lifetime)) {
+            $this->delete($flowV2);
+            throw new DoesNotExistException('Token expired');
+        }
 
-		return $flowV2;
-	}
+        return $flowV2;
+    }
 }

lib/public/Group/Backend/IHideFromCollaborationBackend.php

Indentation +8 added lines, -8 removed lines

@@ -27,12 +27,12 @@
  * Allow the backend to mark groups to be excluded from being shown in search dialogs
  */
 interface IHideFromCollaborationBackend {
-	/**
-	 * Check if a group should be hidden from search dialogs
-	 *
-	 * @param string $groupId
-	 * @return bool
-	 * @since 16.0.0
-	 */
-	public function hideGroup(string $groupId): bool;
+    /**
+     * Check if a group should be hidden from search dialogs
+     *
+     * @param string $groupId
+     * @return bool
+     * @since 16.0.0
+     */
+    public function hideGroup(string $groupId): bool;
 }

lib/public/Collaboration/AutoComplete/AutoCompleteEvent.php

Indentation +57 added lines, -57 removed lines

@@ -30,70 +30,70 @@
  */
 class AutoCompleteEvent extends GenericEvent {
 
-	/**
-	 * @param array $arguments
-	 * @since 16.0.0
-	 */
-	public function __construct(array $arguments) {
-		parent::__construct(null, $arguments);
-	}
+    /**
+     * @param array $arguments
+     * @since 16.0.0
+     */
+    public function __construct(array $arguments) {
+        parent::__construct(null, $arguments);
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getResults(): array {
-		return $this->getArgument('results');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getResults(): array {
+        return $this->getArgument('results');
+    }
 
-	/**
-	 * @param array $results
-	 * @since 16.0.0
-	 */
-	public function setResults(array $results): void {
-		$this->setArgument('results', $results);
-	}
+    /**
+     * @param array $results
+     * @since 16.0.0
+     */
+    public function setResults(array $results): void {
+        $this->setArgument('results', $results);
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getSearchTerm(): string {
-		return $this->getArgument('search');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getSearchTerm(): string {
+        return $this->getArgument('search');
+    }
 
-	/**
-	 * @return int[]
-	 * @since 16.0.0
-	 */
-	public function getShareTypes(): array {
-		return $this->getArgument('shareTypes');
-	}
+    /**
+     * @return int[]
+     * @since 16.0.0
+     */
+    public function getShareTypes(): array {
+        return $this->getArgument('shareTypes');
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getItemType(): string {
-		return $this->getArgument('itemType');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getItemType(): string {
+        return $this->getArgument('itemType');
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getItemId(): string {
-		return $this->getArgument('itemId');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getItemId(): string {
+        return $this->getArgument('itemId');
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getSorter(): string {
-		return $this->getArgument('sorter');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getSorter(): string {
+        return $this->getArgument('sorter');
+    }
 
-	/**
-	 * @since 16.0.0
-	 */
-	public function getLimit(): int {
-		return $this->getArgument('limit');
-	}
+    /**
+     * @since 16.0.0
+     */
+    public function getLimit(): int {
+        return $this->getArgument('limit');
+    }
 
 }