From 587a140c8a75e9a3a0a98ccd37675f785d37f5ab Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Sun, 10 Feb 2019 10:31:46 +0100
Subject: [PATCH] Code style and comment fixes
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
---
lib/private/Settings/Personal/PersonalInfo.php | 4 +++-
lib/private/Settings/Theming/ServerInfo.php | 8 ++++----
settings/Controller/ServerInfoSettingsController.php | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/private/Settings/Personal/PersonalInfo.php b/lib/private/Settings/Personal/PersonalInfo.php
index c018ea80ded..0aed4a44848 100644
--- a/lib/private/Settings/Personal/PersonalInfo.php
+++ b/lib/private/Settings/Personal/PersonalInfo.php
@@ -65,8 +65,10 @@ class PersonalInfo implements ISettings {
* @param IUserManager $userManager
* @param IGroupManager $groupManager
* @param AccountManager $accountManager
+ * @param IAppManager $appManager
* @param IFactory $l10nFactory
* @param IL10N $l
+ * @param EncryptionManager $encryptionManager
*/
public function __construct(
IConfig $config,
@@ -151,7 +153,7 @@ class PersonalInfo implements ISettings {
*
* @return array
*/
- private function getWhereIsYourDataParams() {
+ private function getWhereIsYourDataParams(): array {
$adminContactConfigId = $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_ADMIN_CONTACT);
$adminContact = $this->userManager->get($adminContactConfigId);
diff --git a/lib/private/Settings/Theming/ServerInfo.php b/lib/private/Settings/Theming/ServerInfo.php
index a5cfdd41f52..ecd2fc418fc 100644
--- a/lib/private/Settings/Theming/ServerInfo.php
+++ b/lib/private/Settings/Theming/ServerInfo.php
@@ -63,7 +63,7 @@ class ServerInfo implements ISettings {
/**
* @return TemplateResponse
*/
- public function getForm() {
+ public function getForm(): TemplateResponse {
$parameters = [
'location' => $this->config->getSystemValue(self::SETTING_LOCATION),
'provider' => $this->config->getSystemValue(self::SETTING_PROVIDER),
@@ -80,7 +80,7 @@ class ServerInfo implements ISettings {
*
* @return array[] An array or arrays with the keys 'id' and 'displayName'
*/
- private function getAdminListValues() {
+ private function getAdminListValues(): array {
$adminGroup = $this->groupManager->get('admin');
$users = $adminGroup->getUsers();
@@ -103,7 +103,7 @@ class ServerInfo implements ISettings {
*
* @return string
*/
- public function getSection() {
+ public function getSection(): string {
return 'theming';
}
@@ -114,7 +114,7 @@ class ServerInfo implements ISettings {
* the admin section. The forms are arranged in ascending order of the
* priority values. It is required to return a value between 0 and 100.
*/
- public function getPriority() {
+ public function getPriority(): int {
return 10;
}
diff --git a/settings/Controller/ServerInfoSettingsController.php b/settings/Controller/ServerInfoSettingsController.php
index 29d36b2e196..a5c80211712 100644
--- a/settings/Controller/ServerInfoSettingsController.php
+++ b/settings/Controller/ServerInfoSettingsController.php
@@ -53,7 +53,7 @@ class ServerInfoSettingsController extends Controller {
string $providerWebsite,
string $providerPrivacyLink,
string $adminContact
- ) {
+ ): void {
$configs = [
ServerInfo::SETTING_LOCATION => $location,
ServerInfo::SETTING_PROVIDER => $provider,
--
GitLab