fix cs

lib/AppInfo/Application.php

@@ -34,8 +34,8 @@
 use OCA\EndToEndEncryption\KeyStorage;
 use OCA\EndToEndEncryption\Listener\UserDeletedListener;
 use OCA\EndToEndEncryption\MetaDataStorage;
-use OCA\EndToEndEncryption\Middleware\UserAgentCheckMiddleware;
 use OCA\EndToEndEncryption\Middleware\CanUseAppMiddleware;
+use OCA\EndToEndEncryption\Middleware\UserAgentCheckMiddleware;
 use OCA\Files_Trashbin\Events\MoveToTrashEvent;
 use OCA\Files_Versions\Events\CreateVersionEvent;
 use OCP\AppFramework\App;

lib/BackgroundJob/RollbackBackgroundJob.php

@@ -38,8 +38,8 @@ class RollbackBackgroundJob extends TimedJob {
 	private RollbackService $rollbackService;
 
 	public function __construct(IConfig $config,
-								ITimeFactory $time,
-								RollbackService $rollbackService) {
+		ITimeFactory $time,
+		RollbackService $rollbackService) {
 		parent::__construct($time);
 		$this->config = $config;
 		$this->rollbackService = $rollbackService;

lib/Capabilities.php

@@ -24,9 +24,9 @@
 
 namespace OCA\EndToEndEncryption;
 
-use OCP\IUserSession;
-use OCP\IUser;
 use OCP\Capabilities\ICapability;
+use OCP\IUser;
+use OCP\IUserSession;
 
 class Capabilities implements ICapability {
 	private Config $config;

lib/Config.php

@@ -23,8 +23,8 @@
 namespace OCA\EndToEndEncryption;
 
 use OCP\IConfig;
-use OCP\IUser;
 use OCP\IGroupManager;
+use OCP\IUser;
 
 class Config {
 	private IConfig $config;

lib/Connector/Sabre/APlugin.php

@@ -22,6 +22,7 @@
  */
 namespace OCA\EndToEndEncryption\Connector\Sabre;
 
+use Exception;
 use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Connector\Sabre\File;
 use OCA\EndToEndEncryption\E2EEnabledPathCache;
@@ -33,7 +34,6 @@
 use Sabre\DAV\INode;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
-use Exception;
 
 abstract class APlugin extends ServerPlugin {
 	protected ?Server $server = null;

lib/Connector/Sabre/LockPlugin.php

@@ -24,32 +24,32 @@
 
 namespace OCA\EndToEndEncryption\Connector\Sabre;
 
-use OCP\AppFramework\Http;
 use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Connector\Sabre\Exception\FileLocked;
 use OCA\DAV\Connector\Sabre\Exception\Forbidden;
 use OCA\DAV\Connector\Sabre\File;
 use OCA\DAV\Upload\FutureFile;
+use OCA\EndToEndEncryption\E2EEnabledPathCache;
 use OCA\EndToEndEncryption\LockManager;
 use OCA\EndToEndEncryption\UserAgentManager;
+use OCP\AppFramework\Http;
 use OCP\Files\IRootFolder;
 use OCP\IUserSession;
 use Sabre\DAV\Exception\Conflict;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\INode;
 use Sabre\DAV\Server;
 use Sabre\HTTP\RequestInterface;
-use OCA\EndToEndEncryption\E2EEnabledPathCache;
 
 class LockPlugin extends APlugin {
 	private LockManager $lockManager;
 	private UserAgentManager $userAgentManager;
 
 	public function __construct(IRootFolder $rootFolder,
-								IUserSession $userSession,
-								LockManager $lockManager,
-								UserAgentManager $userAgentManager,
-								E2EEnabledPathCache $pathCache) {
+		IUserSession $userSession,
+		LockManager $lockManager,
+		UserAgentManager $userAgentManager,
+		E2EEnabledPathCache $pathCache) {
 		parent::__construct($rootFolder, $userSession, $pathCache);
 		$this->lockManager = $lockManager;
 		$this->userAgentManager = $userAgentManager;

lib/Connector/Sabre/PropFindPlugin.php

@@ -26,8 +26,8 @@
 
 use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Connector\Sabre\Exception\Forbidden;
-use OCA\EndToEndEncryption\UserAgentManager;
 use OCA\EndToEndEncryption\E2EEnabledPathCache;
+use OCA\EndToEndEncryption\UserAgentManager;
 use OCP\Files\IRootFolder;
 use OCP\IRequest;
 use OCP\IUserSession;
@@ -42,10 +42,10 @@ class PropFindPlugin extends APlugin {
 	protected ?Server $server = null;
 
 	public function __construct(IRootFolder $rootFolder,
-								IUserSession $userSession,
-								UserAgentManager $userAgentManager,
-								IRequest $request,
-								E2EEnabledPathCache $pathCache) {
+		IUserSession $userSession,
+		UserAgentManager $userAgentManager,
+		IRequest $request,
+		E2EEnabledPathCache $pathCache) {
 		parent::__construct($rootFolder, $userSession, $pathCache);
 		$this->userAgentManager = $userAgentManager;
 		$this->request = $request;

lib/Controller/EncryptionController.php

@@ -50,11 +50,11 @@ class EncryptionController extends OCSController {
 	private LoggerInterface $logger;
 
 	public function __construct(string $AppName,
-								IRequest $request,
-								?string $userId,
-								IMetaDataStorage $metaDataStorage,
-								EncryptionManager $manager,
-								LoggerInterface $logger) {
+		IRequest $request,
+		?string $userId,
+		IMetaDataStorage $metaDataStorage,
+		EncryptionManager $manager,
+		LoggerInterface $logger) {
 		parent::__construct($AppName, $request);
 		$this->userId = $userId;
 		$this->metaDataStorage = $metaDataStorage;

lib/Controller/KeyController.php

@@ -29,6 +29,8 @@
 
 namespace OCA\EndToEndEncryption\Controller;
 
+use BadMethodCallException;
+use Exception;
 use OCA\EndToEndEncryption\Exceptions\KeyExistsException;
 use OCA\EndToEndEncryption\IKeyStorage;
 use OCA\EndToEndEncryption\SignatureHandler;
@@ -43,8 +45,6 @@
 use OCP\Files\NotPermittedException;
 use OCP\IL10N;
 use OCP\IRequest;
-use Exception;
-use BadMethodCallException;
 use Psr\Log\LoggerInterface;
 
 class KeyController extends OCSController {
@@ -55,12 +55,12 @@ class KeyController extends OCSController {
 	private IL10N $l10n;
 
 	public function __construct(string $AppName,
-								IRequest $request,
-								?string $userId,
-								IKeyStorage $keyStorage,
-								SignatureHandler $signatureHandler,
-								LoggerInterface $logger,
-								IL10N $l10n
+		IRequest $request,
+		?string $userId,
+		IKeyStorage $keyStorage,
+		SignatureHandler $signatureHandler,
+		LoggerInterface $logger,
+		IL10N $l10n
 	) {
 		parent::__construct($AppName, $request);
 		$this->userId = $userId;

lib/Controller/LockingController.php

@@ -37,16 +37,16 @@
 use OCA\EndToEndEncryption\IMetaDataStorage;
 use OCA\EndToEndEncryption\LockManager;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSForbiddenException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\IL10N;
 use OCP\IRequest;
-use Psr\Log\LoggerInterface;
 use OCP\Share\IManager as ShareManager;
-use OCP\AppFramework\OCS\OCSBadRequestException;
+use Psr\Log\LoggerInterface;
 
 class LockingController extends OCSController {
 	private ?string $userId;

lib/Controller/MetaDataController.php

@@ -43,8 +43,8 @@
 use OCP\Files\NotPermittedException;
 use OCP\IL10N;
 use OCP\IRequest;
-use Psr\Log\LoggerInterface;
 use OCP\Share\IManager as ShareManager;
+use Psr\Log\LoggerInterface;
 
 class MetaDataController extends OCSController {
 	private ?string $userId;

lib/E2EEPublicShareTemplateProvider.php

@@ -6,15 +6,15 @@
 use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\Template\PublicTemplateResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\Defaults;
+use OCP\Files\FileInfo;
 use OCP\Files\NotFoundException;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
-use OCP\Share\IShare;
 use OCP\Share\IPublicShareTemplateProvider;
-use OCP\AppFramework\Services\IInitialState;
-use OCP\Files\FileInfo;
+use OCP\Share\IShare;
 use OCP\Util;
 use Psr\Log\LoggerInterface;
 

lib/E2EEnabledPathCache.php

@@ -24,12 +24,12 @@
 
 namespace OCA\EndToEndEncryption;
 
-use OCP\Files\Node;
-use OCP\Files\Storage\IStorage;
-use OCP\Files\IHomeStorage;
-use OCP\Files\Cache\ICache;
 use OCP\Cache\CappedMemoryCache;
+use OCP\Files\Cache\ICache;
+use OCP\Files\IHomeStorage;
+use OCP\Files\Node;
 use OCP\Files\NotFoundException;
+use OCP\Files\Storage\IStorage;
 
 class E2EEnabledPathCache {
 	/**

lib/EncryptionManager.php

@@ -24,15 +24,15 @@
 
 namespace OCA\EndToEndEncryption;
 
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
+use OCP\IDBConnection;
 use OCP\IUserSession;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
-use OCP\IDBConnection;
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -50,10 +50,10 @@ class EncryptionManager {
 	private LoggerInterface $logger;
 
 	public function __construct(IRootFolder $rootFolder,
-								IUserSession $userSession,
-								IManager $shareManager,
-								IDBConnection $dbConnection,
-								LoggerInterface $logger) {
+		IUserSession $userSession,
+		IManager $shareManager,
+		IDBConnection $dbConnection,
+		LoggerInterface $logger) {
 		$this->rootFolder = $rootFolder;
 		$this->userSession = $userSession;
 		$this->shareManager = $shareManager;

lib/KeyStorage.php

@@ -46,7 +46,7 @@ class KeyStorage implements IKeyStorage {
 	private string $publicKeysRoot = '/public-keys';
 
 	public function __construct(IAppData $appData,
-								IUserSession $userSession) {
+		IUserSession $userSession) {
 		$this->appData = $appData;
 		$this->userSession = $userSession;
 	}

lib/LockManager.php

@@ -50,10 +50,10 @@ class LockManager {
 	private ITimeFactory $timeFactory;
 
 	public function __construct(LockMapper $lockMapper,
-								ISecureRandom $secureRandom,
-								IRootFolder $rootFolder,
-								IUserSession $userSession,
-								ITimeFactory $timeFactory
+		ISecureRandom $secureRandom,
+		IRootFolder $rootFolder,
+		IUserSession $userSession,
+		ITimeFactory $timeFactory
 	) {
 		$this->lockMapper = $lockMapper;
 		$this->secureRandom = $secureRandom;

lib/MetaDataStorage.php

@@ -46,7 +46,7 @@ class MetaDataStorage implements IMetaDataStorage {
 	private string $intermediateMetaDataFileName = 'intermediate.meta.data';
 
 	public function __construct(IAppData $appData,
-								IRootFolder $rootFolder) {
+		IRootFolder $rootFolder) {
 		$this->appData = $appData;
 		$this->rootFolder = $rootFolder;
 	}

lib/Middleware/CanUseAppMiddleware.php

@@ -27,8 +27,8 @@
 use OCA\EndToEndEncryption\Middleware\Exceptions\CanNotUseAppException;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\RedirectToDefaultAppResponse;
+use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Middleware;
 use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCSController;
@@ -42,8 +42,8 @@ class CanUseAppMiddleware extends Middleware {
 	private Config $config;
 
 	public function __construct(IUserSession $userSession,
-								IControllerMethodReflector $reflector,
-								Config $config) {
+		IControllerMethodReflector $reflector,
+		Config $config) {
 		$this->userSession = $userSession;
 		$this->reflector = $reflector;
 		$this->config = $config;

lib/Middleware/UserAgentCheckMiddleware.php

@@ -44,8 +44,8 @@ class UserAgentCheckMiddleware extends Middleware {
 	private UserAgentManager $userAgentManager;
 
 	public function __construct(IControllerMethodReflector $reflector,
-								IRequest $request,
-								UserAgentManager $userAgentManager) {
+		IRequest $request,
+		UserAgentManager $userAgentManager) {
 		$this->reflector = $reflector;
 		$this->request = $request;
 		$this->userAgentManager = $userAgentManager;

lib/Migration/Version1005Date20200312102456.php

@@ -24,9 +24,9 @@
 
 use Closure;
 use OCP\DB\ISchemaWrapper;
+use OCP\DB\Types;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
-use OCP\DB\Types;
 
 /**
  * Class Version1005Date20200312102456

lib/Migration/Version1005Date20200312161123.php

@@ -52,9 +52,9 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			}
 
 			// deactivated. a newer migration set id as primary key. oci does not allow a primary key and index for the same column.
-//			if (!$table->hasIndex('e2e_unique_lock')) {
-//				$table->addUniqueIndex(['id'], 'e2e_unique_lock');
-//			}
+			//			if (!$table->hasIndex('e2e_unique_lock')) {
+			//				$table->addUniqueIndex(['id'], 'e2e_unique_lock');
+			//			}
 		}
 
 		return $schema;

lib/RollbackService.php

@@ -22,11 +22,11 @@
  */
 namespace OCA\EndToEndEncryption;
 
+use OCA\EndToEndEncryption\AppInfo\Application;
+use OCA\EndToEndEncryption\Db\LockMapper;
 use OCP\Files\Config\ICachedMountFileInfo;
 use OCP\Files\Config\IUserMountCache;
 use OCP\Files\Folder;
-use OCA\EndToEndEncryption\AppInfo\Application;
-use OCA\EndToEndEncryption\Db\LockMapper;
 use OCP\Files\IRootFolder;
 use Psr\Log\LoggerInterface;
 
@@ -55,11 +55,11 @@ class RollbackService {
 	private LoggerInterface $logger;
 
 	public function __construct(LockMapper $lockMapper,
-								IMetaDataStorage $metaDataStorage,
-								FileService $fileService,
-								IUserMountCache $userMountCache,
-								IRootFolder $rootFolder,
-								LoggerInterface $logger) {
+		IMetaDataStorage $metaDataStorage,
+		FileService $fileService,
+		IUserMountCache $userMountCache,
+		IRootFolder $rootFolder,
+		LoggerInterface $logger) {
 		$this->lockMapper = $lockMapper;
 		$this->metaDataStorage = $metaDataStorage;
 		$this->fileService = $fileService;