aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_external/lib/Settings
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_external/lib/Settings')
-rw-r--r--apps/files_external/lib/Settings/Admin.php32
-rw-r--r--apps/files_external/lib/Settings/Personal.php38
-rw-r--r--apps/files_external/lib/Settings/PersonalSection.php19
-rw-r--r--apps/files_external/lib/Settings/Section.php17
4 files changed, 30 insertions, 76 deletions
diff --git a/apps/files_external/lib/Settings/Admin.php b/apps/files_external/lib/Settings/Admin.php
index f8235778b7c..9af0f3c61c1 100644
--- a/apps/files_external/lib/Settings/Admin.php
+++ b/apps/files_external/lib/Settings/Admin.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -6,6 +7,7 @@
namespace OCA\Files_External\Settings;
use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
+use OCA\Files_External\MountConfig;
use OCA\Files_External\Service\BackendService;
use OCA\Files_External\Service\GlobalStoragesService;
use OCP\AppFramework\Http\TemplateResponse;
@@ -14,28 +16,12 @@ use OCP\Settings\ISettings;
class Admin implements ISettings {
- /** @var IManager */
- private $encryptionManager;
-
- /** @var GlobalStoragesService */
- private $globalStoragesService;
-
- /** @var BackendService */
- private $backendService;
-
- /** @var GlobalAuth */
- private $globalAuth;
-
public function __construct(
- IManager $encryptionManager,
- GlobalStoragesService $globalStoragesService,
- BackendService $backendService,
- GlobalAuth $globalAuth
+ private IManager $encryptionManager,
+ private GlobalStoragesService $globalStoragesService,
+ private BackendService $backendService,
+ private GlobalAuth $globalAuth,
) {
- $this->encryptionManager = $encryptionManager;
- $this->globalStoragesService = $globalStoragesService;
- $this->backendService = $backendService;
- $this->globalAuth = $globalAuth;
}
/**
@@ -48,7 +34,7 @@ class Admin implements ISettings {
'storages' => $this->globalStoragesService->getStorages(),
'backends' => $this->backendService->getAvailableBackends(),
'authMechanisms' => $this->backendService->getAuthMechanisms(),
- 'dependencies' => \OCA\Files_External\MountConfig::dependencyMessage($this->backendService->getBackends()),
+ 'dependencies' => MountConfig::dependencyMessage($this->backendService->getBackends()),
'allowUserMounting' => $this->backendService->isUserMountingAllowed(),
'globalCredentials' => $this->globalAuth->getAuth(''),
'globalCredentialsUid' => '',
@@ -66,8 +52,8 @@ class Admin implements ISettings {
/**
* @return int whether the form should be rather on the top or bottom of
- * 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.
+ * 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.
*
* E.g.: 70
*/
diff --git a/apps/files_external/lib/Settings/Personal.php b/apps/files_external/lib/Settings/Personal.php
index 4efa7af6060..8478badb842 100644
--- a/apps/files_external/lib/Settings/Personal.php
+++ b/apps/files_external/lib/Settings/Personal.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -6,6 +7,7 @@
namespace OCA\Files_External\Settings;
use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
+use OCA\Files_External\MountConfig;
use OCA\Files_External\Service\BackendService;
use OCA\Files_External\Service\UserGlobalStoragesService;
use OCP\AppFramework\Http\TemplateResponse;
@@ -15,33 +17,13 @@ use OCP\Settings\ISettings;
class Personal implements ISettings {
- /** @var IManager */
- private $encryptionManager;
-
- /** @var UserGlobalStoragesService */
- private $userGlobalStoragesService;
-
- /** @var BackendService */
- private $backendService;
-
- /** @var GlobalAuth */
- private $globalAuth;
-
- /** @var IUserSession */
- private $userSession;
-
public function __construct(
- IManager $encryptionManager,
- UserGlobalStoragesService $userGlobalStoragesService,
- BackendService $backendService,
- GlobalAuth $globalAuth,
- IUserSession $userSession
+ private IManager $encryptionManager,
+ private UserGlobalStoragesService $userGlobalStoragesService,
+ private BackendService $backendService,
+ private GlobalAuth $globalAuth,
+ private IUserSession $userSession,
) {
- $this->encryptionManager = $encryptionManager;
- $this->userGlobalStoragesService = $userGlobalStoragesService;
- $this->backendService = $backendService;
- $this->globalAuth = $globalAuth;
- $this->userSession = $userSession;
}
/**
@@ -56,7 +38,7 @@ class Personal implements ISettings {
'storages' => $this->userGlobalStoragesService->getStorages(),
'backends' => $this->backendService->getAvailableBackends(),
'authMechanisms' => $this->backendService->getAuthMechanisms(),
- 'dependencies' => \OCA\Files_External\MountConfig::dependencyMessage($this->backendService->getBackends()),
+ 'dependencies' => MountConfig::dependencyMessage($this->backendService->getBackends()),
'allowUserMounting' => $this->backendService->isUserMountingAllowed(),
'globalCredentials' => $this->globalAuth->getAuth($uid),
'globalCredentialsUid' => $uid,
@@ -74,8 +56,8 @@ class Personal implements ISettings {
/**
* @return int whether the form should be rather on the top or bottom of
- * 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.
+ * 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.
*
* E.g.: 70
*/
diff --git a/apps/files_external/lib/Settings/PersonalSection.php b/apps/files_external/lib/Settings/PersonalSection.php
index 41db1fcd906..c6eb1c6b889 100644
--- a/apps/files_external/lib/Settings/PersonalSection.php
+++ b/apps/files_external/lib/Settings/PersonalSection.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,25 +13,13 @@ use OCP\IURLGenerator;
use OCP\IUserSession;
class PersonalSection extends Section {
- /** @var IUserSession */
- private $userSession;
-
- /** @var UserGlobalStoragesService */
- private $userGlobalStoragesService;
-
- /** @var BackendService */
- private $backendService;
-
public function __construct(
IURLGenerator $url,
IL10N $l,
- IUserSession $userSession,
- UserGlobalStoragesService $userGlobalStoragesService,
- BackendService $backendService
+ private IUserSession $userSession,
+ private UserGlobalStoragesService $userGlobalStoragesService,
+ private BackendService $backendService,
) {
parent::__construct($url, $l);
- $this->userSession = $userSession;
- $this->userGlobalStoragesService = $userGlobalStoragesService;
- $this->backendService = $backendService;
}
}
diff --git a/apps/files_external/lib/Settings/Section.php b/apps/files_external/lib/Settings/Section.php
index eae46471e94..cf3b73472d7 100644
--- a/apps/files_external/lib/Settings/Section.php
+++ b/apps/files_external/lib/Settings/Section.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -10,18 +11,14 @@ use OCP\IURLGenerator;
use OCP\Settings\IIconSection;
class Section implements IIconSection {
- /** @var IL10N */
- private $l;
- /** @var IURLGenerator */
- private $url;
-
/**
* @param IURLGenerator $url
* @param IL10N $l
*/
- public function __construct(IURLGenerator $url, IL10N $l) {
- $this->url = $url;
- $this->l = $l;
+ public function __construct(
+ private IURLGenerator $url,
+ private IL10N $l,
+ ) {
}
/**
@@ -46,8 +43,8 @@ class Section implements IIconSection {
/**
* @return int whether the form should be rather on the top or bottom of
- * the settings navigation. The sections are arranged in ascending order of
- * the priority values. It is required to return a value between 0 and 99.
+ * the settings navigation. The sections are arranged in ascending order of
+ * the priority values. It is required to return a value between 0 and 99.
*
* E.g.: 70
*/
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 08:05:23 +0000