nextcloud / server

lib/public/IRequestId.php

Indentation +8 added lines, -8 removed lines

@@ -28,12 +28,12 @@
  * @since 24.0.0
  */
 interface IRequestId {
-	/**
-	 * Returns an ID for the request, value is not guaranteed to be unique and is mostly meant for logging
-	 * If `mod_unique_id` is installed this value will be taken.
-	 *
-	 * @return string
-	 * @since 24.0.0
-	 */
-	public function getId(): string;
+    /**
+     * Returns an ID for the request, value is not guaranteed to be unique and is mostly meant for logging
+     * If `mod_unique_id` is installed this value will be taken.
+     *
+     * @return string
+     * @since 24.0.0
+     */
+    public function getId(): string;
 }

apps/settings/lib/Controller/AuthSettingsController.php

Spacing +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
 		}
 
 		if (mb_strlen($name) > 128) {
-			$name = mb_substr($name, 0, 120) . '…';
+			$name = mb_substr($name, 0, 120).'…';
 		}
 
 		$token = $this->generateRandomDeviceToken();
@@ -246,7 +246,7 @@ 
 		}
 
 		if (mb_strlen($name) > 128) {
-			$name = mb_substr($name, 0, 120) . '…';
+			$name = mb_substr($name, 0, 120).'…';
 		}
 
 		if ($token instanceof INamedToken && $name !== $currentName) {

Indentation +250 added lines, -250 removed lines

@@ -32,254 +32,254 @@
 use Psr\Log\LoggerInterface;
 
 class AuthSettingsController extends Controller {
-	/** @var IProvider */
-	private $tokenProvider;
-
-	/** @var RemoteWipe */
-	private $remoteWipe;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IProvider $tokenProvider
-	 * @param ISession $session
-	 * @param ISecureRandom $random
-	 * @param string|null $userId
-	 * @param IUserSession $userSession
-	 * @param IManager $activityManager
-	 * @param RemoteWipe $remoteWipe
-	 * @param LoggerInterface $logger
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IProvider $tokenProvider,
-		private ISession $session,
-		private ISecureRandom $random,
-		private ?string $userId,
-		private IUserSession $userSession,
-		private IManager $activityManager,
-		RemoteWipe $remoteWipe,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($appName, $request);
-		$this->tokenProvider = $tokenProvider;
-		$this->remoteWipe = $remoteWipe;
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * @param string $name
-	 * @return JSONResponse
-	 */
-	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
-	public function create($name) {
-		if ($this->checkAppToken()) {
-			return $this->getServiceNotAvailableResponse();
-		}
-
-		try {
-			$sessionId = $this->session->getId();
-		} catch (SessionNotAvailableException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
-		if ($this->userSession->getImpersonatingUserID() !== null) {
-			return $this->getServiceNotAvailableResponse();
-		}
-
-		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 $this->getServiceNotAvailableResponse();
-		}
-
-		if (mb_strlen($name) > 128) {
-			$name = mb_substr($name, 0, 120) . '…';
-		}
-
-		$token = $this->generateRandomDeviceToken();
-		$deviceToken = $this->tokenProvider->generateToken($token, $this->userId, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
-		$tokenData = $deviceToken->jsonSerialize();
-		$tokenData['canDelete'] = true;
-		$tokenData['canRename'] = true;
-
-		$this->publishActivity(Provider::APP_TOKEN_CREATED, $deviceToken->getId(), ['name' => $deviceToken->getName()]);
-
-		return new JSONResponse([
-			'token' => $token,
-			'loginName' => $loginName,
-			'deviceToken' => $tokenData,
-		]);
-	}
-
-	/**
-	 * @return JSONResponse
-	 */
-	private function getServiceNotAvailableResponse() {
-		$resp = new JSONResponse();
-		$resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
-		return $resp;
-	}
-
-	/**
-	 * Return a 25 digit device password
-	 *
-	 * Example: AbCdE-fGhJk-MnPqR-sTwXy-23456
-	 *
-	 * @return string
-	 */
-	private function generateRandomDeviceToken() {
-		$groups = [];
-		for ($i = 0; $i < 5; $i++) {
-			$groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
-		}
-		return implode('-', $groups);
-	}
-
-	private function checkAppToken(): bool {
-		return $this->session->exists('app_password');
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * @param int $id
-	 * @return array|JSONResponse
-	 */
-	#[NoAdminRequired]
-	public function destroy($id) {
-		if ($this->checkAppToken()) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$token = $this->findTokenByIdAndUser($id);
-		} catch (WipeTokenException $e) {
-			//continue as we can destroy tokens in wipe
-			$token = $e->getToken();
-		} catch (InvalidTokenException $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$this->tokenProvider->invalidateTokenById($this->userId, $token->getId());
-		$this->publishActivity(Provider::APP_TOKEN_DELETED, $token->getId(), ['name' => $token->getName()]);
-		return [];
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * @param int $id
-	 * @param array $scope
-	 * @param string $name
-	 * @return array|JSONResponse
-	 */
-	#[NoAdminRequired]
-	public function update($id, array $scope, string $name) {
-		if ($this->checkAppToken()) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$token = $this->findTokenByIdAndUser($id);
-		} catch (InvalidTokenException $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$currentName = $token->getName();
-
-		if ($scope !== $token->getScopeAsArray()) {
-			$token->setScope([IToken::SCOPE_FILESYSTEM => $scope[IToken::SCOPE_FILESYSTEM]]);
-			$this->publishActivity($scope[IToken::SCOPE_FILESYSTEM] ? Provider::APP_TOKEN_FILESYSTEM_GRANTED : Provider::APP_TOKEN_FILESYSTEM_REVOKED, $token->getId(), ['name' => $currentName]);
-		}
-
-		if (mb_strlen($name) > 128) {
-			$name = mb_substr($name, 0, 120) . '…';
-		}
-
-		if ($token instanceof INamedToken && $name !== $currentName) {
-			$token->setName($name);
-			$this->publishActivity(Provider::APP_TOKEN_RENAMED, $token->getId(), ['name' => $currentName, 'newName' => $name]);
-		}
-
-		$this->tokenProvider->updateToken($token);
-		return [];
-	}
-
-	/**
-	 * @param string $subject
-	 * @param int $id
-	 * @param array $parameters
-	 */
-	private function publishActivity(string $subject, int $id, array $parameters = []): void {
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('security')
-			->setAffectedUser($this->userId)
-			->setAuthor($this->userId)
-			->setSubject($subject, $parameters)
-			->setObject('app_token', $id, 'App Password');
-
-		try {
-			$this->activityManager->publish($event);
-		} catch (BadMethodCallException $e) {
-			$this->logger->warning('could not publish activity', ['exception' => $e]);
-		}
-	}
-
-	/**
-	 * Find a token by given id and check if uid for current session belongs to this token
-	 *
-	 * @param int $id
-	 * @return IToken
-	 * @throws InvalidTokenException
-	 */
-	private function findTokenByIdAndUser(int $id): IToken {
-		try {
-			$token = $this->tokenProvider->getTokenById($id);
-		} catch (ExpiredTokenException $e) {
-			$token = $e->getToken();
-		}
-		if ($token->getUID() !== $this->userId) {
-			/** @psalm-suppress DeprecatedClass We have to throw the OC version so both OC and OCP catches catch it */
-			throw new OcInvalidTokenException('This token does not belong to you!');
-		}
-		return $token;
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * @param int $id
-	 * @return JSONResponse
-	 * @throws InvalidTokenException
-	 * @throws ExpiredTokenException
-	 */
-	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
-	public function wipe(int $id): JSONResponse {
-		if ($this->checkAppToken()) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$token = $this->findTokenByIdAndUser($id);
-		} catch (InvalidTokenException $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if (!$this->remoteWipe->markTokenForWipe($token)) {
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		return new JSONResponse([]);
-	}
+    /** @var IProvider */
+    private $tokenProvider;
+
+    /** @var RemoteWipe */
+    private $remoteWipe;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IProvider $tokenProvider
+     * @param ISession $session
+     * @param ISecureRandom $random
+     * @param string|null $userId
+     * @param IUserSession $userSession
+     * @param IManager $activityManager
+     * @param RemoteWipe $remoteWipe
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IProvider $tokenProvider,
+        private ISession $session,
+        private ISecureRandom $random,
+        private ?string $userId,
+        private IUserSession $userSession,
+        private IManager $activityManager,
+        RemoteWipe $remoteWipe,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($appName, $request);
+        $this->tokenProvider = $tokenProvider;
+        $this->remoteWipe = $remoteWipe;
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * @param string $name
+     * @return JSONResponse
+     */
+    #[NoAdminRequired]
+    #[PasswordConfirmationRequired]
+    public function create($name) {
+        if ($this->checkAppToken()) {
+            return $this->getServiceNotAvailableResponse();
+        }
+
+        try {
+            $sessionId = $this->session->getId();
+        } catch (SessionNotAvailableException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
+        if ($this->userSession->getImpersonatingUserID() !== null) {
+            return $this->getServiceNotAvailableResponse();
+        }
+
+        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 $this->getServiceNotAvailableResponse();
+        }
+
+        if (mb_strlen($name) > 128) {
+            $name = mb_substr($name, 0, 120) . '…';
+        }
+
+        $token = $this->generateRandomDeviceToken();
+        $deviceToken = $this->tokenProvider->generateToken($token, $this->userId, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
+        $tokenData = $deviceToken->jsonSerialize();
+        $tokenData['canDelete'] = true;
+        $tokenData['canRename'] = true;
+
+        $this->publishActivity(Provider::APP_TOKEN_CREATED, $deviceToken->getId(), ['name' => $deviceToken->getName()]);
+
+        return new JSONResponse([
+            'token' => $token,
+            'loginName' => $loginName,
+            'deviceToken' => $tokenData,
+        ]);
+    }
+
+    /**
+     * @return JSONResponse
+     */
+    private function getServiceNotAvailableResponse() {
+        $resp = new JSONResponse();
+        $resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
+        return $resp;
+    }
+
+    /**
+     * Return a 25 digit device password
+     *
+     * Example: AbCdE-fGhJk-MnPqR-sTwXy-23456
+     *
+     * @return string
+     */
+    private function generateRandomDeviceToken() {
+        $groups = [];
+        for ($i = 0; $i < 5; $i++) {
+            $groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
+        }
+        return implode('-', $groups);
+    }
+
+    private function checkAppToken(): bool {
+        return $this->session->exists('app_password');
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * @param int $id
+     * @return array|JSONResponse
+     */
+    #[NoAdminRequired]
+    public function destroy($id) {
+        if ($this->checkAppToken()) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $token = $this->findTokenByIdAndUser($id);
+        } catch (WipeTokenException $e) {
+            //continue as we can destroy tokens in wipe
+            $token = $e->getToken();
+        } catch (InvalidTokenException $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $this->tokenProvider->invalidateTokenById($this->userId, $token->getId());
+        $this->publishActivity(Provider::APP_TOKEN_DELETED, $token->getId(), ['name' => $token->getName()]);
+        return [];
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * @param int $id
+     * @param array $scope
+     * @param string $name
+     * @return array|JSONResponse
+     */
+    #[NoAdminRequired]
+    public function update($id, array $scope, string $name) {
+        if ($this->checkAppToken()) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $token = $this->findTokenByIdAndUser($id);
+        } catch (InvalidTokenException $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $currentName = $token->getName();
+
+        if ($scope !== $token->getScopeAsArray()) {
+            $token->setScope([IToken::SCOPE_FILESYSTEM => $scope[IToken::SCOPE_FILESYSTEM]]);
+            $this->publishActivity($scope[IToken::SCOPE_FILESYSTEM] ? Provider::APP_TOKEN_FILESYSTEM_GRANTED : Provider::APP_TOKEN_FILESYSTEM_REVOKED, $token->getId(), ['name' => $currentName]);
+        }
+
+        if (mb_strlen($name) > 128) {
+            $name = mb_substr($name, 0, 120) . '…';
+        }
+
+        if ($token instanceof INamedToken && $name !== $currentName) {
+            $token->setName($name);
+            $this->publishActivity(Provider::APP_TOKEN_RENAMED, $token->getId(), ['name' => $currentName, 'newName' => $name]);
+        }
+
+        $this->tokenProvider->updateToken($token);
+        return [];
+    }
+
+    /**
+     * @param string $subject
+     * @param int $id
+     * @param array $parameters
+     */
+    private function publishActivity(string $subject, int $id, array $parameters = []): void {
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('security')
+            ->setAffectedUser($this->userId)
+            ->setAuthor($this->userId)
+            ->setSubject($subject, $parameters)
+            ->setObject('app_token', $id, 'App Password');
+
+        try {
+            $this->activityManager->publish($event);
+        } catch (BadMethodCallException $e) {
+            $this->logger->warning('could not publish activity', ['exception' => $e]);
+        }
+    }
+
+    /**
+     * Find a token by given id and check if uid for current session belongs to this token
+     *
+     * @param int $id
+     * @return IToken
+     * @throws InvalidTokenException
+     */
+    private function findTokenByIdAndUser(int $id): IToken {
+        try {
+            $token = $this->tokenProvider->getTokenById($id);
+        } catch (ExpiredTokenException $e) {
+            $token = $e->getToken();
+        }
+        if ($token->getUID() !== $this->userId) {
+            /** @psalm-suppress DeprecatedClass We have to throw the OC version so both OC and OCP catches catch it */
+            throw new OcInvalidTokenException('This token does not belong to you!');
+        }
+        return $token;
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * @param int $id
+     * @return JSONResponse
+     * @throws InvalidTokenException
+     * @throws ExpiredTokenException
+     */
+    #[NoAdminRequired]
+    #[PasswordConfirmationRequired]
+    public function wipe(int $id): JSONResponse {
+        if ($this->checkAppToken()) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $token = $this->findTokenByIdAndUser($id);
+        } catch (InvalidTokenException $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if (!$this->remoteWipe->markTokenForWipe($token)) {
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        return new JSONResponse([]);
+    }
 }

lib/public/Files/Events/InvalidateMountCacheEvent.php

Indentation +18 added lines, -18 removed lines

@@ -32,24 +32,24 @@
  * @since 24.0.0
  */
 class InvalidateMountCacheEvent extends Event {
-	private ?IUser $user;
+    private ?IUser $user;
 
-	/**
-	 * @param IUser|null $user user
-	 *
-	 * @since 24.0.0
-	 */
-	public function __construct(?IUser $user) {
-		parent::__construct();
-		$this->user = $user;
-	}
+    /**
+     * @param IUser|null $user user
+     *
+     * @since 24.0.0
+     */
+    public function __construct(?IUser $user) {
+        parent::__construct();
+        $this->user = $user;
+    }
 
-	/**
-	 * @return IUser|null user
-	 *
-	 * @since 24.0.0
-	 */
-	public function getUser(): ?IUser {
-		return $this->user;
-	}
+    /**
+     * @return IUser|null user
+     *
+     * @since 24.0.0
+     */
+    public function getUser(): ?IUser {
+        return $this->user;
+    }
 }

apps/oauth2/lib/Migration/Version010402Date20190107124745.php

Indentation +17 added lines, -17 removed lines

@@ -32,22 +32,22 @@
 
 class Version010402Date20190107124745 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	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
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		// During an ownCloud migration, the client_identifier column identifier might not exist yet.
-		if ($schema->getTable('oauth2_clients')->hasColumn('client_identifier')) {
-			$table = $schema->getTable('oauth2_clients');
-			$table->dropIndex('oauth2_client_id_idx');
-			$table->addUniqueIndex(['client_identifier'], 'oauth2_client_id_idx');
-			return $schema;
-		}
-	}
+        // During an ownCloud migration, the client_identifier column identifier might not exist yet.
+        if ($schema->getTable('oauth2_clients')->hasColumn('client_identifier')) {
+            $table = $schema->getTable('oauth2_clients');
+            $table->dropIndex('oauth2_client_id_idx');
+            $table->addUniqueIndex(['client_identifier'], 'oauth2_client_id_idx');
+            return $schema;
+        }
+    }
 }

lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php

Spacing +18 added lines, -18 removed lines

@@ -47,7 +47,7 @@ 
 	}
 
 	public function md5($input): IQueryFunction {
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
+		return new QueryFunction('MD5('.$this->helper->quoteColumnName($input).')');
 	}
 
 	public function concat($x, ...$expr): IQueryFunction {
@@ -61,64 +61,64 @@ 
 
 	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
 		$separator = $this->connection->quote($separator);
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ' SEPARATOR ' . $separator . ')');
+		return new QueryFunction('GROUP_CONCAT('.$this->helper->quoteColumnName($expr).' SEPARATOR '.$separator.')');
 	}
 
 	public function substring($input, $start, $length = null): IQueryFunction {
 		if ($length) {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).', '.$this->helper->quoteColumnName($length).')');
 		} else {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).')');
 		}
 	}
 
 	public function sum($field): IQueryFunction {
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('SUM('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function lower($field): IQueryFunction {
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('LOWER('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function add($x, $y): IQueryFunction {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
+		return new QueryFunction($this->helper->quoteColumnName($x).' + '.$this->helper->quoteColumnName($y));
 	}
 
 	public function subtract($x, $y): IQueryFunction {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
+		return new QueryFunction($this->helper->quoteColumnName($x).' - '.$this->helper->quoteColumnName($y));
 	}
 
 	public function count($count = '', $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
-		return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
+		return new QueryFunction('COUNT('.$quotedName.')'.$alias);
 	}
 
 	public function octetLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('OCTET_LENGTH(' . $quotedName . ')' . $alias);
+		return new QueryFunction('OCTET_LENGTH('.$quotedName.')'.$alias);
 	}
 
 	public function charLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);
+		return new QueryFunction('CHAR_LENGTH('.$quotedName.')'.$alias);
 	}
 
 	public function max($field): IQueryFunction {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('MAX('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function min($field): IQueryFunction {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('MIN('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function greatest($x, $y): IQueryFunction {
-		return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('GREATEST('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	public function least($x, $y): IQueryFunction {
-		return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('LEAST('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 }

Indentation +90 added lines, -90 removed lines

@@ -14,94 +14,94 @@
 use OCP\IDBConnection;
 
 class FunctionBuilder implements IFunctionBuilder {
-	/** @var IDBConnection|Connection */
-	protected $connection;
-
-	/** @var IQueryBuilder */
-	protected $queryBuilder;
-
-	/** @var QuoteHelper */
-	protected $helper;
-
-	public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder, QuoteHelper $helper) {
-		$this->connection = $connection;
-		$this->queryBuilder = $queryBuilder;
-		$this->helper = $helper;
-	}
-
-	public function md5($input): IQueryFunction {
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
-	}
-
-	public function concat($x, ...$expr): IQueryFunction {
-		$args = func_get_args();
-		$list = [];
-		foreach ($args as $item) {
-			$list[] = $this->helper->quoteColumnName($item);
-		}
-		return new QueryFunction(sprintf('CONCAT(%s)', implode(', ', $list)));
-	}
-
-	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
-		$separator = $this->connection->quote($separator);
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ' SEPARATOR ' . $separator . ')');
-	}
-
-	public function substring($input, $start, $length = null): IQueryFunction {
-		if ($length) {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
-		} else {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
-		}
-	}
-
-	public function sum($field): IQueryFunction {
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function lower($field): IQueryFunction {
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function add($x, $y): IQueryFunction {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
-	}
-
-	public function subtract($x, $y): IQueryFunction {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
-	}
-
-	public function count($count = '', $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
-		return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
-	}
-
-	public function octetLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('OCTET_LENGTH(' . $quotedName . ')' . $alias);
-	}
-
-	public function charLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);
-	}
-
-	public function max($field): IQueryFunction {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function min($field): IQueryFunction {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
-	}
-
-	public function greatest($x, $y): IQueryFunction {
-		return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
-
-	public function least($x, $y): IQueryFunction {
-		return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
+    /** @var IDBConnection|Connection */
+    protected $connection;
+
+    /** @var IQueryBuilder */
+    protected $queryBuilder;
+
+    /** @var QuoteHelper */
+    protected $helper;
+
+    public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder, QuoteHelper $helper) {
+        $this->connection = $connection;
+        $this->queryBuilder = $queryBuilder;
+        $this->helper = $helper;
+    }
+
+    public function md5($input): IQueryFunction {
+        return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
+    }
+
+    public function concat($x, ...$expr): IQueryFunction {
+        $args = func_get_args();
+        $list = [];
+        foreach ($args as $item) {
+            $list[] = $this->helper->quoteColumnName($item);
+        }
+        return new QueryFunction(sprintf('CONCAT(%s)', implode(', ', $list)));
+    }
+
+    public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
+        $separator = $this->connection->quote($separator);
+        return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ' SEPARATOR ' . $separator . ')');
+    }
+
+    public function substring($input, $start, $length = null): IQueryFunction {
+        if ($length) {
+            return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
+        } else {
+            return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
+        }
+    }
+
+    public function sum($field): IQueryFunction {
+        return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function lower($field): IQueryFunction {
+        return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function add($x, $y): IQueryFunction {
+        return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
+    }
+
+    public function subtract($x, $y): IQueryFunction {
+        return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
+    }
+
+    public function count($count = '', $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
+        return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
+    }
+
+    public function octetLength($field, $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $this->helper->quoteColumnName($field);
+        return new QueryFunction('OCTET_LENGTH(' . $quotedName . ')' . $alias);
+    }
+
+    public function charLength($field, $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $this->helper->quoteColumnName($field);
+        return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);
+    }
+
+    public function max($field): IQueryFunction {
+        return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function min($field): IQueryFunction {
+        return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
+    }
+
+    public function greatest($x, $y): IQueryFunction {
+        return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
+
+    public function least($x, $y): IQueryFunction {
+        return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
 }

lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -38,26 +38,26 @@
 
 	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
 		$separator = $this->connection->quote($separator);
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')');
+		return new QueryFunction('GROUP_CONCAT('.$this->helper->quoteColumnName($expr).', '.$separator.')');
 	}
 
 	public function greatest($x, $y): IQueryFunction {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('MAX('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	public function least($x, $y): IQueryFunction {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('MIN('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	public function octetLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
+		return new QueryFunction('LENGTH(CAST('.$quotedName.' as BLOB))'.$alias);
 	}
 
 	public function charLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
+		return new QueryFunction('LENGTH('.$quotedName.')'.$alias);
 	}
 }

Indentation +33 added lines, -33 removed lines

@@ -10,37 +10,37 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class SqliteFunctionBuilder extends FunctionBuilder {
-	public function concat($x, ...$expr): IQueryFunction {
-		$args = func_get_args();
-		$list = [];
-		foreach ($args as $item) {
-			$list[] = $this->helper->quoteColumnName($item);
-		}
-		return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
-	}
-
-	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
-		$separator = $this->connection->quote($separator);
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')');
-	}
-
-	public function greatest($x, $y): IQueryFunction {
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
-
-	public function least($x, $y): IQueryFunction {
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
-
-	public function octetLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
-	}
-
-	public function charLength($field, $alias = ''): IQueryFunction {
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
-		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
-	}
+    public function concat($x, ...$expr): IQueryFunction {
+        $args = func_get_args();
+        $list = [];
+        foreach ($args as $item) {
+            $list[] = $this->helper->quoteColumnName($item);
+        }
+        return new QueryFunction(sprintf('(%s)', implode(' || ', $list)));
+    }
+
+    public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
+        $separator = $this->connection->quote($separator);
+        return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')');
+    }
+
+    public function greatest($x, $y): IQueryFunction {
+        return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
+
+    public function least($x, $y): IQueryFunction {
+        return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
+
+    public function octetLength($field, $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $this->helper->quoteColumnName($field);
+        return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
+    }
+
+    public function charLength($field, $alias = ''): IQueryFunction {
+        $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+        $quotedName = $this->helper->quoteColumnName($field);
+        return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
+    }
 }

apps/user_ldap/lib/Migration/Version1120Date20210917155206.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 
 	protected function emitUnassign(string $oldId, bool $pre): void {
 		if ($this->userManager instanceof PublicEmitter) {
-			$this->userManager->emit('\OC\User', $pre ? 'pre' : 'post' . 'UnassignedUserId', [$oldId]);
+			$this->userManager->emit('\OC\User', $pre ? 'pre' : 'post'.'UnassignedUserId', [$oldId]);
 		}
 	}
 

Indentation +106 added lines, -106 removed lines

@@ -22,110 +22,110 @@
 
 class Version1120Date20210917155206 extends SimpleMigrationStep {
 
-	public function __construct(
-		private IDBConnection $dbc,
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function getName() {
-		return 'Adjust LDAP user and group id column lengths to match server lengths';
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		// ensure that there is no user or group id longer than 64char in LDAP table
-		$this->handleIDs('ldap_group_mapping', false);
-		$this->handleIDs('ldap_user_mapping', true);
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$changeSchema = false;
-		foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
-			$table = $schema->getTable($tableName);
-			$column = $table->getColumn('owncloud_name');
-			if ($column->getLength() > 64) {
-				$column->setLength(64);
-				$changeSchema = true;
-			}
-		}
-
-		return $changeSchema ? $schema : null;
-	}
-
-	protected function handleIDs(string $table, bool $emitHooks) {
-		$select = $this->getSelectQuery($table);
-		$update = $this->getUpdateQuery($table);
-
-		$result = $select->executeQuery();
-		while ($row = $result->fetch()) {
-			$newId = hash('sha256', $row['owncloud_name'], false);
-			if ($emitHooks) {
-				$this->emitUnassign($row['owncloud_name'], true);
-			}
-			$update->setParameter('uuid', $row['directory_uuid']);
-			$update->setParameter('newId', $newId);
-			try {
-				$update->executeStatement();
-				if ($emitHooks) {
-					$this->emitUnassign($row['owncloud_name'], false);
-					$this->emitAssign($newId);
-				}
-			} catch (Exception $e) {
-				$this->logger->error('Failed to shorten owncloud_name "{oldId}" to "{newId}" (UUID: "{uuid}" of {table})',
-					[
-						'app' => 'user_ldap',
-						'oldId' => $row['owncloud_name'],
-						'newId' => $newId,
-						'uuid' => $row['directory_uuid'],
-						'table' => $table,
-						'exception' => $e,
-					]
-				);
-			}
-		}
-		$result->closeCursor();
-	}
-
-	protected function getSelectQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select('owncloud_name', 'directory_uuid')
-			->from($table)
-			->where($qb->expr()->gt($qb->func()->octetLength('owncloud_name'), $qb->createNamedParameter('64'), IQueryBuilder::PARAM_INT));
-		return $qb;
-	}
-
-	protected function getUpdateQuery(string $table): IQueryBuilder {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->update($table)
-			->set('owncloud_name', $qb->createParameter('newId'))
-			->where($qb->expr()->eq('directory_uuid', $qb->createParameter('uuid')));
-		return $qb;
-	}
-
-	protected function emitUnassign(string $oldId, bool $pre): void {
-		if ($this->userManager instanceof PublicEmitter) {
-			$this->userManager->emit('\OC\User', $pre ? 'pre' : 'post' . 'UnassignedUserId', [$oldId]);
-		}
-	}
-
-	protected function emitAssign(string $newId): void {
-		if ($this->userManager instanceof PublicEmitter) {
-			$this->userManager->emit('\OC\User', 'assignedUserId', [$newId]);
-		}
-	}
+    public function __construct(
+        private IDBConnection $dbc,
+        private IUserManager $userManager,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function getName() {
+        return 'Adjust LDAP user and group id column lengths to match server lengths';
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+        // ensure that there is no user or group id longer than 64char in LDAP table
+        $this->handleIDs('ldap_group_mapping', false);
+        $this->handleIDs('ldap_user_mapping', true);
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $changeSchema = false;
+        foreach (['ldap_user_mapping', 'ldap_group_mapping'] as $tableName) {
+            $table = $schema->getTable($tableName);
+            $column = $table->getColumn('owncloud_name');
+            if ($column->getLength() > 64) {
+                $column->setLength(64);
+                $changeSchema = true;
+            }
+        }
+
+        return $changeSchema ? $schema : null;
+    }
+
+    protected function handleIDs(string $table, bool $emitHooks) {
+        $select = $this->getSelectQuery($table);
+        $update = $this->getUpdateQuery($table);
+
+        $result = $select->executeQuery();
+        while ($row = $result->fetch()) {
+            $newId = hash('sha256', $row['owncloud_name'], false);
+            if ($emitHooks) {
+                $this->emitUnassign($row['owncloud_name'], true);
+            }
+            $update->setParameter('uuid', $row['directory_uuid']);
+            $update->setParameter('newId', $newId);
+            try {
+                $update->executeStatement();
+                if ($emitHooks) {
+                    $this->emitUnassign($row['owncloud_name'], false);
+                    $this->emitAssign($newId);
+                }
+            } catch (Exception $e) {
+                $this->logger->error('Failed to shorten owncloud_name "{oldId}" to "{newId}" (UUID: "{uuid}" of {table})',
+                    [
+                        'app' => 'user_ldap',
+                        'oldId' => $row['owncloud_name'],
+                        'newId' => $newId,
+                        'uuid' => $row['directory_uuid'],
+                        'table' => $table,
+                        'exception' => $e,
+                    ]
+                );
+            }
+        }
+        $result->closeCursor();
+    }
+
+    protected function getSelectQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select('owncloud_name', 'directory_uuid')
+            ->from($table)
+            ->where($qb->expr()->gt($qb->func()->octetLength('owncloud_name'), $qb->createNamedParameter('64'), IQueryBuilder::PARAM_INT));
+        return $qb;
+    }
+
+    protected function getUpdateQuery(string $table): IQueryBuilder {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->update($table)
+            ->set('owncloud_name', $qb->createParameter('newId'))
+            ->where($qb->expr()->eq('directory_uuid', $qb->createParameter('uuid')));
+        return $qb;
+    }
+
+    protected function emitUnassign(string $oldId, bool $pre): void {
+        if ($this->userManager instanceof PublicEmitter) {
+            $this->userManager->emit('\OC\User', $pre ? 'pre' : 'post' . 'UnassignedUserId', [$oldId]);
+        }
+    }
+
+    protected function emitAssign(string $newId): void {
+        if ($this->userManager instanceof PublicEmitter) {
+            $this->userManager->emit('\OC\User', 'assignedUserId', [$newId]);
+        }
+    }
 }

lib/private/Files/ObjectStore/SwiftFactory.php

Spacing +5 added lines, -5 removed lines

@@ -91,7 +91,7 @@ 
 	}
 
 	private function getCachedToken(string $cacheKey) {
-		$cachedTokenString = $this->cache->get($cacheKey . '/token');
+		$cachedTokenString = $this->cache->get($cacheKey.'/token');
 		if ($cachedTokenString) {
 			return json_decode($cachedTokenString, true);
 		} else {
@@ -117,7 +117,7 @@ 
 		}
 
 		$this->params['cachedToken'] = $value;
-		$this->cache->set($cacheKey . '/token', json_encode($value));
+		$this->cache->set($cacheKey.'/token', json_encode($value));
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 		}
 		$this->params = array_merge(self::DEFAULT_OPTIONS, $this->params);
 
-		$cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container'];
+		$cacheKey = $userName.'@'.$this->params['url'].'/'.$this->params['container'];
 		$token = $this->getCachedToken($cacheKey);
 		$this->params['cachedToken'] = $token;
 
@@ -184,7 +184,7 @@ 
 			if ($authService instanceof IdentityV3Service) {
 				$token = $authService->generateTokenFromCache($cachedToken);
 				if (\is_null($token->catalog)) {
-					$this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken));
+					$this->logger->warning('Invalid cached token for swift, no catalog set: '.json_encode($cachedToken));
 				} elseif ($token->hasExpired()) {
 					$this->logger->debug('Cached token for swift expired');
 				} else {
@@ -278,7 +278,7 @@ 
 		} catch (ConnectException $e) {
 			/** @var RequestInterface $request */
 			$request = $e->getRequest();
-			$host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
+			$host = $request->getUri()->getHost().':'.$request->getUri()->getPort();
 			$this->logger->error("Can't connect to object storage server at $host", ['exception' => $e]);
 			throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
 		}

Indentation +208 added lines, -208 removed lines

@@ -28,235 +28,235 @@
 use Psr\Log\LoggerInterface;
 
 class SwiftFactory {
-	private $cache;
-	private $params;
-	/** @var Container|null */
-	private $container = null;
-	private LoggerInterface $logger;
+    private $cache;
+    private $params;
+    /** @var Container|null */
+    private $container = null;
+    private LoggerInterface $logger;
 
-	public const DEFAULT_OPTIONS = [
-		'autocreate' => false,
-		'urlType' => 'publicURL',
-		'catalogName' => 'swift',
-		'catalogType' => 'object-store'
-	];
+    public const DEFAULT_OPTIONS = [
+        'autocreate' => false,
+        'urlType' => 'publicURL',
+        'catalogName' => 'swift',
+        'catalogType' => 'object-store'
+    ];
 
-	public function __construct(ICache $cache, array $params, LoggerInterface $logger) {
-		$this->cache = $cache;
-		$this->params = $params;
-		$this->logger = $logger;
-	}
+    public function __construct(ICache $cache, array $params, LoggerInterface $logger) {
+        $this->cache = $cache;
+        $this->params = $params;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Gets currently cached token id
-	 *
-	 * @return string
-	 * @throws StorageAuthException
-	 */
-	public function getCachedTokenId() {
-		if (!isset($this->params['cachedToken'])) {
-			throw new StorageAuthException('Unauthenticated ObjectStore connection');
-		}
+    /**
+     * Gets currently cached token id
+     *
+     * @return string
+     * @throws StorageAuthException
+     */
+    public function getCachedTokenId() {
+        if (!isset($this->params['cachedToken'])) {
+            throw new StorageAuthException('Unauthenticated ObjectStore connection');
+        }
 
-		// Is it V2 token?
-		if (isset($this->params['cachedToken']['token'])) {
-			return $this->params['cachedToken']['token']['id'];
-		}
+        // Is it V2 token?
+        if (isset($this->params['cachedToken']['token'])) {
+            return $this->params['cachedToken']['token']['id'];
+        }
 
-		return $this->params['cachedToken']['id'];
-	}
+        return $this->params['cachedToken']['id'];
+    }
 
-	private function getCachedToken(string $cacheKey) {
-		$cachedTokenString = $this->cache->get($cacheKey . '/token');
-		if ($cachedTokenString) {
-			return json_decode($cachedTokenString, true);
-		} else {
-			return null;
-		}
-	}
+    private function getCachedToken(string $cacheKey) {
+        $cachedTokenString = $this->cache->get($cacheKey . '/token');
+        if ($cachedTokenString) {
+            return json_decode($cachedTokenString, true);
+        } else {
+            return null;
+        }
+    }
 
-	private function cacheToken(Token $token, string $serviceUrl, string $cacheKey) {
-		if ($token instanceof \OpenStack\Identity\v3\Models\Token) {
-			// for v3 the catalog is cached as part of the token, so no need to cache $serviceUrl separately
-			$value = $token->export();
-		} else {
-			/** @var \OpenStack\Identity\v2\Models\Token $token */
-			$value = [
-				'serviceUrl' => $serviceUrl,
-				'token' => [
-					'issued_at' => $token->issuedAt->format('c'),
-					'expires' => $token->expires->format('c'),
-					'id' => $token->id,
-					'tenant' => $token->tenant
-				]
-			];
-		}
+    private function cacheToken(Token $token, string $serviceUrl, string $cacheKey) {
+        if ($token instanceof \OpenStack\Identity\v3\Models\Token) {
+            // for v3 the catalog is cached as part of the token, so no need to cache $serviceUrl separately
+            $value = $token->export();
+        } else {
+            /** @var \OpenStack\Identity\v2\Models\Token $token */
+            $value = [
+                'serviceUrl' => $serviceUrl,
+                'token' => [
+                    'issued_at' => $token->issuedAt->format('c'),
+                    'expires' => $token->expires->format('c'),
+                    'id' => $token->id,
+                    'tenant' => $token->tenant
+                ]
+            ];
+        }
 
-		$this->params['cachedToken'] = $value;
-		$this->cache->set($cacheKey . '/token', json_encode($value));
-	}
+        $this->params['cachedToken'] = $value;
+        $this->cache->set($cacheKey . '/token', json_encode($value));
+    }
 
-	/**
-	 * @return OpenStack
-	 * @throws StorageAuthException
-	 */
-	private function getClient() {
-		if (isset($this->params['bucket'])) {
-			$this->params['container'] = $this->params['bucket'];
-		}
-		if (!isset($this->params['container'])) {
-			$this->params['container'] = 'nextcloud';
-		}
-		if (isset($this->params['user']) && is_array($this->params['user'])) {
-			$userName = $this->params['user']['name'];
-		} else {
-			if (!isset($this->params['username']) && isset($this->params['user'])) {
-				$this->params['username'] = $this->params['user'];
-			}
-			$userName = $this->params['username'];
-		}
-		if (!isset($this->params['tenantName']) && isset($this->params['tenant'])) {
-			$this->params['tenantName'] = $this->params['tenant'];
-		}
-		if (isset($this->params['domain'])) {
-			$this->params['scope']['project']['name'] = $this->params['tenant'];
-			$this->params['scope']['project']['domain']['name'] = $this->params['domain'];
-		}
-		$this->params = array_merge(self::DEFAULT_OPTIONS, $this->params);
+    /**
+     * @return OpenStack
+     * @throws StorageAuthException
+     */
+    private function getClient() {
+        if (isset($this->params['bucket'])) {
+            $this->params['container'] = $this->params['bucket'];
+        }
+        if (!isset($this->params['container'])) {
+            $this->params['container'] = 'nextcloud';
+        }
+        if (isset($this->params['user']) && is_array($this->params['user'])) {
+            $userName = $this->params['user']['name'];
+        } else {
+            if (!isset($this->params['username']) && isset($this->params['user'])) {
+                $this->params['username'] = $this->params['user'];
+            }
+            $userName = $this->params['username'];
+        }
+        if (!isset($this->params['tenantName']) && isset($this->params['tenant'])) {
+            $this->params['tenantName'] = $this->params['tenant'];
+        }
+        if (isset($this->params['domain'])) {
+            $this->params['scope']['project']['name'] = $this->params['tenant'];
+            $this->params['scope']['project']['domain']['name'] = $this->params['domain'];
+        }
+        $this->params = array_merge(self::DEFAULT_OPTIONS, $this->params);
 
-		$cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container'];
-		$token = $this->getCachedToken($cacheKey);
-		$this->params['cachedToken'] = $token;
+        $cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container'];
+        $token = $this->getCachedToken($cacheKey);
+        $this->params['cachedToken'] = $token;
 
-		$httpClient = new Client([
-			'base_uri' => TransportUtils::normalizeUrl($this->params['url']),
-			'handler' => HandlerStack::create()
-		]);
+        $httpClient = new Client([
+            'base_uri' => TransportUtils::normalizeUrl($this->params['url']),
+            'handler' => HandlerStack::create()
+        ]);
 
-		if (isset($this->params['user']) && is_array($this->params['user']) && isset($this->params['user']['name'])) {
-			if (!isset($this->params['scope'])) {
-				throw new StorageAuthException('Scope has to be defined for V3 requests');
-			}
+        if (isset($this->params['user']) && is_array($this->params['user']) && isset($this->params['user']['name'])) {
+            if (!isset($this->params['scope'])) {
+                throw new StorageAuthException('Scope has to be defined for V3 requests');
+            }
 
-			return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey);
-		} else {
-			return $this->auth(SwiftV2CachingAuthService::factory($httpClient), $cacheKey);
-		}
-	}
+            return $this->auth(IdentityV3Service::factory($httpClient), $cacheKey);
+        } else {
+            return $this->auth(SwiftV2CachingAuthService::factory($httpClient), $cacheKey);
+        }
+    }
 
-	/**
-	 * @param IdentityV2Service|IdentityV3Service $authService
-	 * @param string $cacheKey
-	 * @return OpenStack
-	 * @throws StorageAuthException
-	 */
-	private function auth($authService, string $cacheKey) {
-		$this->params['identityService'] = $authService;
-		$this->params['authUrl'] = $this->params['url'];
+    /**
+     * @param IdentityV2Service|IdentityV3Service $authService
+     * @param string $cacheKey
+     * @return OpenStack
+     * @throws StorageAuthException
+     */
+    private function auth($authService, string $cacheKey) {
+        $this->params['identityService'] = $authService;
+        $this->params['authUrl'] = $this->params['url'];
 
-		$cachedToken = $this->params['cachedToken'];
-		$hasValidCachedToken = false;
-		if (\is_array($cachedToken)) {
-			if ($authService instanceof IdentityV3Service) {
-				$token = $authService->generateTokenFromCache($cachedToken);
-				if (\is_null($token->catalog)) {
-					$this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken));
-				} elseif ($token->hasExpired()) {
-					$this->logger->debug('Cached token for swift expired');
-				} else {
-					$hasValidCachedToken = true;
-				}
-			} else {
-				try {
-					/** @var \OpenStack\Identity\v2\Models\Token $token */
-					$token = $authService->model(\OpenStack\Identity\v2\Models\Token::class, $cachedToken['token']);
-					$now = new \DateTimeImmutable('now');
-					if ($token->expires > $now) {
-						$hasValidCachedToken = true;
-						$this->params['v2cachedToken'] = $token;
-						$this->params['v2serviceUrl'] = $cachedToken['serviceUrl'];
-					} else {
-						$this->logger->debug('Cached token for swift expired');
-					}
-				} catch (\Exception $e) {
-					$this->logger->error($e->getMessage(), ['exception' => $e]);
-				}
-			}
-		}
+        $cachedToken = $this->params['cachedToken'];
+        $hasValidCachedToken = false;
+        if (\is_array($cachedToken)) {
+            if ($authService instanceof IdentityV3Service) {
+                $token = $authService->generateTokenFromCache($cachedToken);
+                if (\is_null($token->catalog)) {
+                    $this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken));
+                } elseif ($token->hasExpired()) {
+                    $this->logger->debug('Cached token for swift expired');
+                } else {
+                    $hasValidCachedToken = true;
+                }
+            } else {
+                try {
+                    /** @var \OpenStack\Identity\v2\Models\Token $token */
+                    $token = $authService->model(\OpenStack\Identity\v2\Models\Token::class, $cachedToken['token']);
+                    $now = new \DateTimeImmutable('now');
+                    if ($token->expires > $now) {
+                        $hasValidCachedToken = true;
+                        $this->params['v2cachedToken'] = $token;
+                        $this->params['v2serviceUrl'] = $cachedToken['serviceUrl'];
+                    } else {
+                        $this->logger->debug('Cached token for swift expired');
+                    }
+                } catch (\Exception $e) {
+                    $this->logger->error($e->getMessage(), ['exception' => $e]);
+                }
+            }
+        }
 
-		if (!$hasValidCachedToken) {
-			unset($this->params['cachedToken']);
-			try {
-				[$token, $serviceUrl] = $authService->authenticate($this->params);
-				$this->cacheToken($token, $serviceUrl, $cacheKey);
-			} catch (ConnectException $e) {
-				throw new StorageAuthException('Failed to connect to keystone, verify the keystone url', $e);
-			} catch (ClientException $e) {
-				$statusCode = $e->getResponse()->getStatusCode();
-				if ($statusCode === 404) {
-					throw new StorageAuthException('Keystone not found while connecting to object storage, verify the keystone url', $e);
-				} elseif ($statusCode === 412) {
-					throw new StorageAuthException('Precondition failed while connecting to object storage, verify the keystone url', $e);
-				} elseif ($statusCode === 401) {
-					throw new StorageAuthException('Authentication failed while connecting to object storage, verify the username, password and possibly tenant', $e);
-				} else {
-					throw new StorageAuthException('Unknown error while connecting to object storage', $e);
-				}
-			} catch (RequestException $e) {
-				throw new StorageAuthException('Connection reset while connecting to keystone, verify the keystone url', $e);
-			}
-		}
+        if (!$hasValidCachedToken) {
+            unset($this->params['cachedToken']);
+            try {
+                [$token, $serviceUrl] = $authService->authenticate($this->params);
+                $this->cacheToken($token, $serviceUrl, $cacheKey);
+            } catch (ConnectException $e) {
+                throw new StorageAuthException('Failed to connect to keystone, verify the keystone url', $e);
+            } catch (ClientException $e) {
+                $statusCode = $e->getResponse()->getStatusCode();
+                if ($statusCode === 404) {
+                    throw new StorageAuthException('Keystone not found while connecting to object storage, verify the keystone url', $e);
+                } elseif ($statusCode === 412) {
+                    throw new StorageAuthException('Precondition failed while connecting to object storage, verify the keystone url', $e);
+                } elseif ($statusCode === 401) {
+                    throw new StorageAuthException('Authentication failed while connecting to object storage, verify the username, password and possibly tenant', $e);
+                } else {
+                    throw new StorageAuthException('Unknown error while connecting to object storage', $e);
+                }
+            } catch (RequestException $e) {
+                throw new StorageAuthException('Connection reset while connecting to keystone, verify the keystone url', $e);
+            }
+        }
 
 
-		$client = new OpenStack($this->params);
+        $client = new OpenStack($this->params);
 
-		return $client;
-	}
+        return $client;
+    }
 
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws StorageNotAvailableException
-	 */
-	public function getContainer() {
-		if (is_null($this->container)) {
-			$this->container = $this->createContainer();
-		}
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws StorageNotAvailableException
+     */
+    public function getContainer() {
+        if (is_null($this->container)) {
+            $this->container = $this->createContainer();
+        }
 
-		return $this->container;
-	}
+        return $this->container;
+    }
 
-	/**
-	 * @return \OpenStack\ObjectStore\v1\Models\Container
-	 * @throws StorageAuthException
-	 * @throws StorageNotAvailableException
-	 */
-	private function createContainer() {
-		$client = $this->getClient();
-		$objectStoreService = $client->objectStoreV1();
+    /**
+     * @return \OpenStack\ObjectStore\v1\Models\Container
+     * @throws StorageAuthException
+     * @throws StorageNotAvailableException
+     */
+    private function createContainer() {
+        $client = $this->getClient();
+        $objectStoreService = $client->objectStoreV1();
 
-		$autoCreate = isset($this->params['autocreate']) && $this->params['autocreate'] === true;
-		try {
-			$container = $objectStoreService->getContainer($this->params['container']);
-			if ($autoCreate) {
-				$container->getMetadata();
-			}
-			return $container;
-		} catch (BadResponseError $ex) {
-			// if the container does not exist and autocreate is true try to create the container on the fly
-			if ($ex->getResponse()->getStatusCode() === 404 && $autoCreate) {
-				return $objectStoreService->createContainer([
-					'name' => $this->params['container']
-				]);
-			} else {
-				throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $ex);
-			}
-		} catch (ConnectException $e) {
-			/** @var RequestInterface $request */
-			$request = $e->getRequest();
-			$host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
-			$this->logger->error("Can't connect to object storage server at $host", ['exception' => $e]);
-			throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
-		}
-	}
+        $autoCreate = isset($this->params['autocreate']) && $this->params['autocreate'] === true;
+        try {
+            $container = $objectStoreService->getContainer($this->params['container']);
+            if ($autoCreate) {
+                $container->getMetadata();
+            }
+            return $container;
+        } catch (BadResponseError $ex) {
+            // if the container does not exist and autocreate is true try to create the container on the fly
+            if ($ex->getResponse()->getStatusCode() === 404 && $autoCreate) {
+                return $objectStoreService->createContainer([
+                    'name' => $this->params['container']
+                ]);
+            } else {
+                throw new StorageNotAvailableException('Invalid response while trying to get container info', StorageNotAvailableException::STATUS_ERROR, $ex);
+            }
+        } catch (ConnectException $e) {
+            /** @var RequestInterface $request */
+            $request = $e->getRequest();
+            $host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
+            $this->logger->error("Can't connect to object storage server at $host", ['exception' => $e]);
+            throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
+        }
+    }
 }

lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 			return;
 		}
 
-		$folders = array_filter($folders, function (ISimpleFolder $folder) {
+		$folders = array_filter($folders, function(ISimpleFolder $folder) {
 			return $folder->fileExists('photo.');
 		});
 
@@ -82,7 +82,7 @@ 
 			return;
 		}
 
-		$output->info('Delete ' . count($folders) . ' "photo." files');
+		$output->info('Delete '.count($folders).' "photo." files');
 
 		foreach ($folders as $folder) {
 			try {
@@ -90,7 +90,7 @@ 
 				$folder->getFile('photo.')->delete();
 			} catch (\Exception $e) {
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
-				$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
+				$output->warning('Could not delete file "dav-photocache/'.$folder->getName().'/photo."');
 			}
 		}
 	}

Indentation +48 added lines, -48 removed lines

@@ -28,61 +28,61 @@
  * photo could be returned for this vcard. These invalid files are removed by this migration step.
  */
 class CleanupCardDAVPhotoCache implements IRepairStep {
-	public function __construct(
-		private IConfig $config,
-		private IAppDataFactory $appDataFactory,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private IAppDataFactory $appDataFactory,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function getName(): string {
-		return 'Cleanup invalid photocache files for carddav';
-	}
+    public function getName(): string {
+        return 'Cleanup invalid photocache files for carddav';
+    }
 
-	private function repair(IOutput $output): void {
-		$photoCacheAppData = $this->appDataFactory->get('dav-photocache');
+    private function repair(IOutput $output): void {
+        $photoCacheAppData = $this->appDataFactory->get('dav-photocache');
 
-		try {
-			$folders = $photoCacheAppData->getDirectoryListing();
-		} catch (NotFoundException $e) {
-			return;
-		} catch (RuntimeException $e) {
-			$this->logger->error('Failed to fetch directory listing in CleanupCardDAVPhotoCache', ['exception' => $e]);
-			return;
-		}
+        try {
+            $folders = $photoCacheAppData->getDirectoryListing();
+        } catch (NotFoundException $e) {
+            return;
+        } catch (RuntimeException $e) {
+            $this->logger->error('Failed to fetch directory listing in CleanupCardDAVPhotoCache', ['exception' => $e]);
+            return;
+        }
 
-		$folders = array_filter($folders, function (ISimpleFolder $folder) {
-			return $folder->fileExists('photo.');
-		});
+        $folders = array_filter($folders, function (ISimpleFolder $folder) {
+            return $folder->fileExists('photo.');
+        });
 
-		if (empty($folders)) {
-			return;
-		}
+        if (empty($folders)) {
+            return;
+        }
 
-		$output->info('Delete ' . count($folders) . ' "photo." files');
+        $output->info('Delete ' . count($folders) . ' "photo." files');
 
-		foreach ($folders as $folder) {
-			try {
-				/** @var ISimpleFolder $folder */
-				$folder->getFile('photo.')->delete();
-			} catch (\Exception $e) {
-				$this->logger->error($e->getMessage(), ['exception' => $e]);
-				$output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
-			}
-		}
-	}
+        foreach ($folders as $folder) {
+            try {
+                /** @var ISimpleFolder $folder */
+                $folder->getFile('photo.')->delete();
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), ['exception' => $e]);
+                $output->warning('Could not delete file "dav-photocache/' . $folder->getName() . '/photo."');
+            }
+        }
+    }
 
-	private function shouldRun(): bool {
-		return version_compare(
-			$this->config->getSystemValueString('version', '0.0.0.0'),
-			'16.0.0.0',
-			'<='
-		);
-	}
+    private function shouldRun(): bool {
+        return version_compare(
+            $this->config->getSystemValueString('version', '0.0.0.0'),
+            '16.0.0.0',
+            '<='
+        );
+    }
 
-	public function run(IOutput $output): void {
-		if ($this->shouldRun()) {
-			$this->repair($output);
-		}
-	}
+    public function run(IOutput $output): void {
+        if ($this->shouldRun()) {
+            $this->repair($output);
+        }
+    }
 }