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>

18 files changed, 51 insertions, 51 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;
 	}
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 1ae93dfb0e2..e9e9a97b900 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -12,8 +12,8 @@ style('encryption', 'settings-admin');
 		<p id="encryptHomeStorageSetting">
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
 				   value="1" <?php if ($_['encryptHomeStorage']) {
-	print_unescaped('checked="checked"');
-} ?> />
+				   	print_unescaped('checked="checked"');
+				   } ?> />
 			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
 			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
 		</p>
@@ -44,8 +44,8 @@ style('encryption', 'settings-admin');
 			<br/><br/>
 
 			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') {
-	print_unescaped('class="hidden"');
-}?>>
+				print_unescaped('class="hidden"');
+			}?>>
 				<?php p($l->t("Change recovery key password:")); ?>
 				<span class="msg"></span>
 				<br/>
diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index 899ba4a1747..d44b78b545b 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -1,6 +1,6 @@
 <?php
-	/** @var array $_ */
-	/** @var \OCP\IL10N $l */
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
 script('encryption', 'settings-personal');
 ?>
 <form id="ocDefaultEncryptionModule" class="section">
@@ -19,7 +19,7 @@ script('encryption', 'settings-personal');
 			<br />
 			<?php p($l->t("Set your old private key password to your current log-in password:")); ?>
 			<?php if ($_["recoveryEnabledForUser"]):
-					p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
+				p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
 			endif; ?>
 			<br />
 			<input
diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php
index 06caa5aba1a..f5a173cca83 100644
--- a/apps/encryption/tests/Crypto/CryptTest.php
+++ b/apps/encryption/tests/Crypto/CryptTest.php
@@ -29,8 +29,8 @@ namespace OCA\Encryption\Tests\Crypto;
 use OCA\Encryption\Crypto\Crypt;
 use OCP\IConfig;
 use OCP\IL10N;
-use Psr\Log\LoggerInterface;
 use OCP\IUserSession;
+use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class CryptTest extends TestCase {
diff --git a/apps/encryption/tests/Hooks/UserHooksTest.php b/apps/encryption/tests/Hooks/UserHooksTest.php
index add7e375f04..7faa6699e91 100644
--- a/apps/encryption/tests/Hooks/UserHooksTest.php
+++ b/apps/encryption/tests/Hooks/UserHooksTest.php
@@ -34,11 +34,11 @@ use OCA\Encryption\Recovery;
 use OCA\Encryption\Session;
 use OCA\Encryption\Users\Setup;
 use OCA\Encryption\Util;
-use Psr\Log\LoggerInterface;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IUserSession;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 /**
diff --git a/apps/encryption/tests/KeyManagerTest.php b/apps/encryption/tests/KeyManagerTest.php
index 89956b7558c..d51d4dde528 100644
--- a/apps/encryption/tests/KeyManagerTest.php
+++ b/apps/encryption/tests/KeyManagerTest.php
@@ -41,11 +41,11 @@ use OCP\Encryption\Keys\IStorage;
 use OCP\Files\Cache\ICache;
 use OCP\Files\Storage;
 use OCP\IConfig;
-use Psr\Log\LoggerInterface;
 use OCP\IUserSession;
 use OCP\Lock\ILockingProvider;
 use OCP\Lock\LockedException;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class KeyManagerTest extends TestCase {
diff --git a/apps/encryption/tests/Settings/AdminTest.php b/apps/encryption/tests/Settings/AdminTest.php
index 055b65e2e28..d675b3030a8 100644
--- a/apps/encryption/tests/Settings/AdminTest.php
+++ b/apps/encryption/tests/Settings/AdminTest.php
@@ -29,10 +29,10 @@ use OCA\Encryption\Settings\Admin;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\IL10N;
-use Psr\Log\LoggerInterface;
 use OCP\ISession;
 use OCP\IUserManager;
 use OCP\IUserSession;
+use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class AdminTest extends TestCase {