nextcloud / server

core/Migrations/Version24000Date20211222112246.php

Indentation +59 added lines, -59 removed lines

@@ -33,66 +33,66 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version24000Date20211222112246 extends SimpleMigrationStep {
-	private const TABLE_NAME = 'reactions';
+    private const TABLE_NAME = 'reactions';
 
-	/**
-	 * @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();
+    /**
+     * @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();
 
-		$action = false;
-		$comments = $schema->getTable('comments');
-		if (!$comments->hasColumn('reactions')) {
-			$comments->addColumn('reactions', Types::STRING, [
-				'notnull' => false,
-				'length' => 4000,
-			]);
-			$action = true;
-		}
+        $action = false;
+        $comments = $schema->getTable('comments');
+        if (!$comments->hasColumn('reactions')) {
+            $comments->addColumn('reactions', Types::STRING, [
+                'notnull' => false,
+                'length' => 4000,
+            ]);
+            $action = true;
+        }
 
-		if (!$schema->hasTable(self::TABLE_NAME)) {
-			$table = $schema->createTable(self::TABLE_NAME);
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('parent_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('message_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('actor_type', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('actor_id', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('reaction', Types::STRING, [
-				'notnull' => true,
-				'length' => 32,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['reaction'], 'comment_reaction');
-			$table->addIndex(['parent_id'], 'comment_reaction_parent_id');
-			$table->addUniqueIndex(['parent_id', 'actor_type', 'actor_id', 'reaction'], 'comment_reaction_unique');
-			$action = true;
-		}
-		return $action ? $schema : null;
-	}
+        if (!$schema->hasTable(self::TABLE_NAME)) {
+            $table = $schema->createTable(self::TABLE_NAME);
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('parent_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('message_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('actor_type', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('actor_id', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('reaction', Types::STRING, [
+                'notnull' => true,
+                'length' => 32,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['reaction'], 'comment_reaction');
+            $table->addIndex(['parent_id'], 'comment_reaction_parent_id');
+            $table->addUniqueIndex(['parent_id', 'actor_type', 'actor_id', 'reaction'], 'comment_reaction_unique');
+            $action = true;
+        }
+        return $action ? $schema : null;
+    }
 }

lib/private/Profile/TProfileHelper.php

Indentation +7 added lines, -7 removed lines

@@ -29,11 +29,11 @@
 use OCP\IConfig;
 
 trait TProfileHelper {
-	protected function isProfileEnabledByDefault(IConfig $config): ?bool {
-		return filter_var(
-			$config->getAppValue('settings', 'profile_enabled_by_default', '1'),
-			FILTER_VALIDATE_BOOLEAN,
-			FILTER_NULL_ON_FAILURE,
-		);
-	}
+    protected function isProfileEnabledByDefault(IConfig $config): ?bool {
+        return filter_var(
+            $config->getAppValue('settings', 'profile_enabled_by_default', '1'),
+            FILTER_VALIDATE_BOOLEAN,
+            FILTER_NULL_ON_FAILURE,
+        );
+    }
 }

apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php

Spacing +2 added lines, -2 removed lines

@@ -89,11 +89,11 @@
 			return;
 		}
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function () {
+		$this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function() {
 			return $this->jsDataService;
 		});
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function () use ($user) {
+		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function() use ($user) {
 			return ['profileEnabled' => $this->profileManager->isProfileEnabled($user)];
 		});
 

Indentation +42 added lines, -42 removed lines

@@ -23,53 +23,53 @@
 /** @template-implements IEventListener<BeforeTemplateRenderedEvent> */
 class BeforeTemplateRenderedListener implements IEventListener {
 
-	/** @var ProfileManager */
-	private $profileManager;
+    /** @var ProfileManager */
+    private $profileManager;
 
-	/**
-	 * BeforeTemplateRenderedListener constructor.
-	 *
-	 * @param ProfileManager $profileManager
-	 * @param IUserSession $userSession
-	 * @param IInitialStateService $initialState
-	 * @param JSDataService $jsDataService
-	 */
-	public function __construct(
-		ProfileManager $profileManager,
-		private IUserSession $userSession,
-		private IInitialStateService $initialState,
-		private JSDataService $jsDataService,
-	) {
-		$this->profileManager = $profileManager;
-	}
+    /**
+     * BeforeTemplateRenderedListener constructor.
+     *
+     * @param ProfileManager $profileManager
+     * @param IUserSession $userSession
+     * @param IInitialStateService $initialState
+     * @param JSDataService $jsDataService
+     */
+    public function __construct(
+        ProfileManager $profileManager,
+        private IUserSession $userSession,
+        private IInitialStateService $initialState,
+        private JSDataService $jsDataService,
+    ) {
+        $this->profileManager = $profileManager;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function handle(Event $event): void {
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return;
-		}
+    /**
+     * @inheritDoc
+     */
+    public function handle(Event $event): void {
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            return;
+        }
 
-		if (!($event instanceof BeforeTemplateRenderedEvent)) {
-			// Unrelated
-			return;
-		}
+        if (!($event instanceof BeforeTemplateRenderedEvent)) {
+            // Unrelated
+            return;
+        }
 
-		if (!$event->isLoggedIn() || $event->getResponse()->getRenderAs() !== TemplateResponse::RENDER_AS_USER) {
-			return;
-		}
+        if (!$event->isLoggedIn() || $event->getResponse()->getRenderAs() !== TemplateResponse::RENDER_AS_USER) {
+            return;
+        }
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function () {
-			return $this->jsDataService;
-		});
+        $this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function () {
+            return $this->jsDataService;
+        });
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function () use ($user) {
-			return ['profileEnabled' => $this->profileManager->isProfileEnabled($user)];
-		});
+        $this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function () use ($user) {
+            return ['profileEnabled' => $this->profileManager->isProfileEnabled($user)];
+        });
 
-		Util::addScript('user_status', 'menu');
-		Util::addStyle('user_status', 'user-status-menu');
-	}
+        Util::addScript('user_status', 'menu');
+        Util::addStyle('user_status', 'user-status-menu');
+    }
 }

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/public/DB/QueryBuilder/IFunctionBuilder.php

Indentation +144 added lines, -144 removed lines

@@ -30,162 +30,162 @@
  * @since 12.0.0
  */
 interface IFunctionBuilder {
-	/**
-	 * Calculates the MD5 hash of a given input
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $input The input to be hashed
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function md5($input): IQueryFunction;
+    /**
+     * Calculates the MD5 hash of a given input
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $input The input to be hashed
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function md5($input): IQueryFunction;
 
-	/**
-	 * Combines two input strings
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $x Expressions or literal strings
-	 * @param string|ILiteral|IParameter|IQueryFunction ...$exprs Expressions or literal strings
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function concat($x, ...$expr): IQueryFunction;
+    /**
+     * Combines two input strings
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $x Expressions or literal strings
+     * @param string|ILiteral|IParameter|IQueryFunction ...$exprs Expressions or literal strings
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function concat($x, ...$expr): IQueryFunction;
 
-	/**
-	 * Returns a string which is the concatenation of all non-NULL values of X
-	 *
-	 * Usage examples:
-	 *
-	 * groupConcat('column') -- with comma as separator (default separator)
-	 *
-	 * groupConcat('column', ';') -- with different separator
-	 *
-	 * @param string|IQueryFunction $expr The expression to group
-	 * @param string|null $separator The separator
-	 * @return IQueryFunction
-	 * @since 24.0.0
-	 */
-	public function groupConcat($expr, ?string $separator = ','): IQueryFunction;
+    /**
+     * Returns a string which is the concatenation of all non-NULL values of X
+     *
+     * Usage examples:
+     *
+     * groupConcat('column') -- with comma as separator (default separator)
+     *
+     * groupConcat('column', ';') -- with different separator
+     *
+     * @param string|IQueryFunction $expr The expression to group
+     * @param string|null $separator The separator
+     * @return IQueryFunction
+     * @since 24.0.0
+     */
+    public function groupConcat($expr, ?string $separator = ','): IQueryFunction;
 
-	/**
-	 * Takes a substring from the input string
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $input The input string
-	 * @param string|ILiteral|IParameter|IQueryFunction $start The start of the substring, note that counting starts at 1
-	 * @param null|ILiteral|IParameter|IQueryFunction $length The length of the substring
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function substring($input, $start, $length = null): IQueryFunction;
+    /**
+     * Takes a substring from the input string
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $input The input string
+     * @param string|ILiteral|IParameter|IQueryFunction $start The start of the substring, note that counting starts at 1
+     * @param null|ILiteral|IParameter|IQueryFunction $length The length of the substring
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function substring($input, $start, $length = null): IQueryFunction;
 
-	/**
-	 * Takes the sum of all rows in a column
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $field the column to sum
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function sum($field): IQueryFunction;
+    /**
+     * Takes the sum of all rows in a column
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $field the column to sum
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function sum($field): IQueryFunction;
 
-	/**
-	 * Transforms a string field or value to lower case
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $field
-	 * @return IQueryFunction
-	 * @since 14.0.0
-	 */
-	public function lower($field): IQueryFunction;
+    /**
+     * Transforms a string field or value to lower case
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $field
+     * @return IQueryFunction
+     * @since 14.0.0
+     */
+    public function lower($field): IQueryFunction;
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $x The first input field or number
-	 * @param string|ILiteral|IParameter|IQueryFunction $y The second input field or number
-	 * @return IQueryFunction
-	 * @since 14.0.0
-	 */
-	public function add($x, $y): IQueryFunction;
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $x The first input field or number
+     * @param string|ILiteral|IParameter|IQueryFunction $y The second input field or number
+     * @return IQueryFunction
+     * @since 14.0.0
+     */
+    public function add($x, $y): IQueryFunction;
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $x The first input field or number
-	 * @param string|ILiteral|IParameter|IQueryFunction $y The second input field or number
-	 * @return IQueryFunction
-	 * @since 14.0.0
-	 */
-	public function subtract($x, $y): IQueryFunction;
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $x The first input field or number
+     * @param string|ILiteral|IParameter|IQueryFunction $y The second input field or number
+     * @return IQueryFunction
+     * @since 14.0.0
+     */
+    public function subtract($x, $y): IQueryFunction;
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $count The input to be counted
-	 * @param string $alias Alias for the counter
-	 *
-	 * @return IQueryFunction
-	 * @since 14.0.0
-	 */
-	public function count($count = '', $alias = ''): IQueryFunction;
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $count The input to be counted
+     * @param string $alias Alias for the counter
+     *
+     * @return IQueryFunction
+     * @since 14.0.0
+     */
+    public function count($count = '', $alias = ''): IQueryFunction;
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
-	 * @param string $alias Alias for the length
-	 *
-	 * @return IQueryFunction
-	 * @since 24.0.0
-	 */
-	public function octetLength($field, $alias = ''): IQueryFunction;
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
+     * @param string $alias Alias for the length
+     *
+     * @return IQueryFunction
+     * @since 24.0.0
+     */
+    public function octetLength($field, $alias = ''): IQueryFunction;
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
-	 * @param string $alias Alias for the length
-	 *
-	 * @return IQueryFunction
-	 * @since 24.0.0
-	 */
-	public function charLength($field, $alias = ''): IQueryFunction;
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
+     * @param string $alias Alias for the length
+     *
+     * @return IQueryFunction
+     * @since 24.0.0
+     */
+    public function charLength($field, $alias = ''): IQueryFunction;
 
-	/**
-	 * Takes the maximum of all rows in a column
-	 *
-	 * If you want to get the maximum value of multiple columns in the same row, use `greatest` instead
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $field the column to maximum
-	 *
-	 * @return IQueryFunction
-	 * @since 18.0.0
-	 */
-	public function max($field): IQueryFunction;
+    /**
+     * Takes the maximum of all rows in a column
+     *
+     * If you want to get the maximum value of multiple columns in the same row, use `greatest` instead
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $field the column to maximum
+     *
+     * @return IQueryFunction
+     * @since 18.0.0
+     */
+    public function max($field): IQueryFunction;
 
-	/**
-	 * Takes the minimum of all rows in a column
-	 *
-	 * If you want to get the minimum value of multiple columns in the same row, use `least` instead
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $field the column to minimum
-	 *
-	 * @return IQueryFunction
-	 * @since 18.0.0
-	 */
-	public function min($field): IQueryFunction;
+    /**
+     * Takes the minimum of all rows in a column
+     *
+     * If you want to get the minimum value of multiple columns in the same row, use `least` instead
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $field the column to minimum
+     *
+     * @return IQueryFunction
+     * @since 18.0.0
+     */
+    public function min($field): IQueryFunction;
 
-	/**
-	 * Takes the maximum of multiple values
-	 *
-	 * If you want to get the maximum value of all rows in a column, use `max` instead
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 * @since 18.0.0
-	 */
-	public function greatest($x, $y): IQueryFunction;
+    /**
+     * Takes the maximum of multiple values
+     *
+     * If you want to get the maximum value of all rows in a column, use `max` instead
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     * @since 18.0.0
+     */
+    public function greatest($x, $y): IQueryFunction;
 
-	/**
-	 * Takes the minimum of multiple values
-	 *
-	 * If you want to get the minimum value of all rows in a column, use `min` instead
-	 *
-	 * @param string|ILiteral|IParameter|IQueryFunction $x
-	 * @param string|ILiteral|IParameter|IQueryFunction $y
-	 * @return IQueryFunction
-	 * @since 18.0.0
-	 */
-	public function least($x, $y): IQueryFunction;
+    /**
+     * Takes the minimum of multiple values
+     *
+     * If you want to get the minimum value of all rows in a column, use `min` instead
+     *
+     * @param string|ILiteral|IParameter|IQueryFunction $x
+     * @param string|ILiteral|IParameter|IQueryFunction $y
+     * @return IQueryFunction
+     * @since 18.0.0
+     */
+    public function least($x, $y): IQueryFunction;
 }

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