diff options
author | Joas Schilling <coding@schilljs.com> | 2023-11-23 10:22:34 +0100 |
---|---|---|
committer | Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com> | 2023-11-23 10:36:13 +0100 |
commit | aa5f037af71c915424c6dcfd5ad2dc82797dc0d6 (patch) | |
tree | 843203cd1346158aab3515687e37a90e78c929e9 /apps/encryption/lib | |
parent | 272719ed1cba6836ea0a597bb9767754eeb1e0d4 (diff) | |
download | nextcloud-server-aa5f037af71c915424c6dcfd5ad2dc82797dc0d6.tar.gz nextcloud-server-aa5f037af71c915424c6dcfd5ad2dc82797dc0d6.zip |
chore: apply changes from Nextcloud coding standards 1.1.1
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
Diffstat (limited to 'apps/encryption/lib')
-rw-r--r-- | apps/encryption/lib/Command/DisableMasterKey.php | 4 | ||||
-rw-r--r-- | apps/encryption/lib/Command/EnableMasterKey.php | 4 | ||||
-rw-r--r-- | apps/encryption/lib/Command/FixKeyLocation.php | 2 | ||||
-rw-r--r-- | apps/encryption/lib/Command/RecoverUser.php | 6 | ||||
-rw-r--r-- | apps/encryption/lib/Command/ScanLegacyFormat.php | 6 | ||||
-rw-r--r-- | apps/encryption/lib/Controller/RecoveryController.php | 8 | ||||
-rw-r--r-- | apps/encryption/lib/Controller/SettingsController.php | 20 | ||||
-rw-r--r-- | apps/encryption/lib/Controller/StatusController.php | 10 | ||||
-rw-r--r-- | apps/encryption/lib/Crypto/Crypt.php | 2 | ||||
-rw-r--r-- | apps/encryption/lib/Hooks/UserHooks.php | 6 | ||||
-rw-r--r-- | apps/encryption/lib/Recovery.php | 10 | ||||
-rw-r--r-- | apps/encryption/lib/Users/Setup.php | 2 |
12 files changed, 40 insertions, 40 deletions
diff --git a/apps/encryption/lib/Command/DisableMasterKey.php b/apps/encryption/lib/Command/DisableMasterKey.php index 6000d6021c8..5a07e294248 100644 --- a/apps/encryption/lib/Command/DisableMasterKey.php +++ b/apps/encryption/lib/Command/DisableMasterKey.php @@ -49,8 +49,8 @@ class DisableMasterKey extends Command { * @param QuestionHelper $questionHelper */ public function __construct(Util $util, - IConfig $config, - QuestionHelper $questionHelper) { + IConfig $config, + QuestionHelper $questionHelper) { $this->util = $util; $this->config = $config; $this->questionHelper = $questionHelper; diff --git a/apps/encryption/lib/Command/EnableMasterKey.php b/apps/encryption/lib/Command/EnableMasterKey.php index 031f6e3fa4e..7c49988c7fb 100644 --- a/apps/encryption/lib/Command/EnableMasterKey.php +++ b/apps/encryption/lib/Command/EnableMasterKey.php @@ -48,8 +48,8 @@ class EnableMasterKey extends Command { * @param QuestionHelper $questionHelper */ public function __construct(Util $util, - IConfig $config, - QuestionHelper $questionHelper) { + IConfig $config, + QuestionHelper $questionHelper) { $this->util = $util; $this->config = $config; $this->questionHelper = $questionHelper; diff --git a/apps/encryption/lib/Command/FixKeyLocation.php b/apps/encryption/lib/Command/FixKeyLocation.php index b961b40f572..5001da4bb92 100644 --- a/apps/encryption/lib/Command/FixKeyLocation.php +++ b/apps/encryption/lib/Command/FixKeyLocation.php @@ -30,8 +30,8 @@ use OC\Files\View; use OCP\Encryption\IManager; use OCP\Files\Config\ICachedMountInfo; use OCP\Files\Config\IUserMountCache; -use OCP\Files\Folder; use OCP\Files\File; +use OCP\Files\Folder; use OCP\Files\IRootFolder; use OCP\Files\Node; use OCP\IUser; diff --git a/apps/encryption/lib/Command/RecoverUser.php b/apps/encryption/lib/Command/RecoverUser.php index d3dd4a3612d..97a26b1d404 100644 --- a/apps/encryption/lib/Command/RecoverUser.php +++ b/apps/encryption/lib/Command/RecoverUser.php @@ -52,9 +52,9 @@ class RecoverUser extends Command { * @param QuestionHelper $questionHelper */ public function __construct(Util $util, - IConfig $config, - IUserManager $userManager, - QuestionHelper $questionHelper) { + IConfig $config, + IUserManager $userManager, + QuestionHelper $questionHelper) { $this->util = $util; $this->questionHelper = $questionHelper; $this->userManager = $userManager; diff --git a/apps/encryption/lib/Command/ScanLegacyFormat.php b/apps/encryption/lib/Command/ScanLegacyFormat.php index 85a99a17845..8e0178af486 100644 --- a/apps/encryption/lib/Command/ScanLegacyFormat.php +++ b/apps/encryption/lib/Command/ScanLegacyFormat.php @@ -57,9 +57,9 @@ class ScanLegacyFormat extends Command { * @param QuestionHelper $questionHelper */ public function __construct(Util $util, - IConfig $config, - QuestionHelper $questionHelper, - IUserManager $userManager) { + IConfig $config, + QuestionHelper $questionHelper, + IUserManager $userManager) { parent::__construct(); $this->util = $util; diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php index c5f8a7e8d72..743e17e5eff 100644 --- a/apps/encryption/lib/Controller/RecoveryController.php +++ b/apps/encryption/lib/Controller/RecoveryController.php @@ -56,10 +56,10 @@ class RecoveryController extends Controller { * @param Recovery $recovery */ public function __construct($AppName, - IRequest $request, - IConfig $config, - IL10N $l10n, - Recovery $recovery) { + IRequest $request, + IConfig $config, + IL10N $l10n, + Recovery $recovery) { parent::__construct($AppName, $request); $this->config = $config; $this->l = $l10n; diff --git a/apps/encryption/lib/Controller/SettingsController.php b/apps/encryption/lib/Controller/SettingsController.php index eedbaea9d9d..fa4c3d2ae2b 100644 --- a/apps/encryption/lib/Controller/SettingsController.php +++ b/apps/encryption/lib/Controller/SettingsController.php @@ -75,16 +75,16 @@ class SettingsController extends Controller { * @param Util $util */ public function __construct($AppName, - IRequest $request, - IL10N $l10n, - IUserManager $userManager, - IUserSession $userSession, - KeyManager $keyManager, - Crypt $crypt, - Session $session, - ISession $ocSession, - Util $util -) { + IRequest $request, + IL10N $l10n, + IUserManager $userManager, + IUserSession $userSession, + KeyManager $keyManager, + Crypt $crypt, + Session $session, + ISession $ocSession, + Util $util + ) { parent::__construct($AppName, $request); $this->l = $l10n; $this->userSession = $userSession; diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php index d07b4da794a..29582a66ad3 100644 --- a/apps/encryption/lib/Controller/StatusController.php +++ b/apps/encryption/lib/Controller/StatusController.php @@ -52,11 +52,11 @@ class StatusController extends Controller { * @param IManager $encryptionManager */ public function __construct($AppName, - IRequest $request, - IL10N $l10n, - Session $session, - IManager $encryptionManager - ) { + IRequest $request, + IL10N $l10n, + Session $session, + IManager $encryptionManager + ) { parent::__construct($AppName, $request); $this->l = $l10n; $this->session = $session; diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php index ee01d632be8..2d212c1f055 100644 --- a/apps/encryption/lib/Crypto/Crypt.php +++ b/apps/encryption/lib/Crypto/Crypt.php @@ -41,8 +41,8 @@ use OCP\Encryption\Exceptions\GenericEncryptionException; use OCP\IConfig; use OCP\IL10N; use OCP\IUserSession; -use Psr\Log\LoggerInterface; use phpseclib\Crypt\RC4; +use Psr\Log\LoggerInterface; /** * Class Crypt provides the encryption implementation of the default Nextcloud diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php index 27eba0ad781..487e1089495 100644 --- a/apps/encryption/lib/Hooks/UserHooks.php +++ b/apps/encryption/lib/Hooks/UserHooks.php @@ -210,9 +210,9 @@ class UserHooks implements IHook { $this->logger->error('Encryption could not update users encryption password'); } - // NOTE: Session does not need to be updated as the - // private key has not changed, only the passphrase - // used to decrypt it has changed + // NOTE: Session does not need to be updated as the + // private key has not changed, only the passphrase + // used to decrypt it has changed } else { // admin changed the password for a different user, create new keys and re-encrypt file keys $userId = $params['uid']; $this->initMountPoints($userId); diff --git a/apps/encryption/lib/Recovery.php b/apps/encryption/lib/Recovery.php index 25738dabf89..66ad59266a5 100644 --- a/apps/encryption/lib/Recovery.php +++ b/apps/encryption/lib/Recovery.php @@ -69,11 +69,11 @@ class Recovery { * @param View $view */ public function __construct(IUserSession $userSession, - Crypt $crypt, - KeyManager $keyManager, - IConfig $config, - IFile $file, - View $view) { + Crypt $crypt, + KeyManager $keyManager, + IConfig $config, + IFile $file, + View $view) { $this->user = ($userSession->isLoggedIn()) ? $userSession->getUser() : null; $this->crypt = $crypt; $this->keyManager = $keyManager; diff --git a/apps/encryption/lib/Users/Setup.php b/apps/encryption/lib/Users/Setup.php index c28a83d8115..8b0ddaa8cd0 100644 --- a/apps/encryption/lib/Users/Setup.php +++ b/apps/encryption/lib/Users/Setup.php @@ -37,7 +37,7 @@ class Setup { private $keyManager; public function __construct(Crypt $crypt, - KeyManager $keyManager) { + KeyManager $keyManager) { $this->crypt = $crypt; $this->keyManager = $keyManager; } |