chore(apps): Apply new rector configuration to autouse classes

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

6 files changed, 91 insertions, 74 deletions

diff --git a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
index 098e101fbc2..0df87d7d83b 100644
--- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
+++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
@@ -6,6 +6,7 @@
  */
 namespace OCA\Files_Versions\BackgroundJob;
 
+use OC\Files\View;
 use OCA\Files_Versions\Expiration;
 use OCA\Files_Versions\Storage;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -59,7 +60,7 @@ class ExpireVersions extends TimedJob {
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new View('/' . $user);
 		if (!$view->is_dir('/files_versions')) {
 			return false;
 		}
diff --git a/apps/files_versions/lib/Command/ExpireVersions.php b/apps/files_versions/lib/Command/ExpireVersions.php
index d37a6a40b70..fd0118549c6 100644
--- a/apps/files_versions/lib/Command/ExpireVersions.php
+++ b/apps/files_versions/lib/Command/ExpireVersions.php
@@ -6,6 +6,7 @@
  */
 namespace OCA\Files_Versions\Command;
 
+use OC\Files\View;
 use OCA\Files_Versions\Expiration;
 use OCA\Files_Versions\Storage;
 use OCP\IUser;
@@ -84,7 +85,7 @@ class ExpireVersions extends Command {
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a version directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new View('/' . $user);
 		if (!$view->is_dir('/files_versions')) {
 			return false;
 		}
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index af14f8e4b9f..e5849bf936d 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -12,6 +12,7 @@ use OC\Files\Search\SearchBinaryOperator;
 use OC\Files\Search\SearchComparison;
 use OC\Files\Search\SearchQuery;
 use OC\Files\View;
+use OC\User\NoUserException;
 use OC_User;
 use OCA\Files_Sharing\SharedMount;
 use OCA\Files_Versions\AppInfo\Application;
@@ -37,6 +38,8 @@ use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Lock\ILockingProvider;
+use OCP\Server;
+use OCP\Util;
 use Psr\Log\LoggerInterface;
 
 class Storage {
@@ -68,7 +71,7 @@ class Storage {
 		6 => ['intervalEndsAfter' => -1,      'step' => 604800],
 	];
 
-	/** @var \OCA\Files_Versions\AppInfo\Application */
+	/** @var Application */
 	private static $application;
 
 	/**
@@ -598,7 +601,7 @@ class Storage {
 				$version->delete();
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $internalPath, 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
 			} catch (NotPermittedException $e) {
-				\OCP\Server::get(LoggerInterface::class)->error("Missing permissions to delete version: {$internalPath}", ['app' => 'files_versions', 'exception' => $e]);
+				Server::get(LoggerInterface::class)->error("Missing permissions to delete version: {$internalPath}", ['app' => 'files_versions', 'exception' => $e]);
 			}
 		}
 	}
@@ -814,7 +817,7 @@ class Storage {
 			$user = \OC::$server->get(IUserManager::class)->get($uid);
 			if (is_null($user)) {
 				$logger->error('Backends provided no user object for ' . $uid, ['app' => 'files_versions']);
-				throw new \OC\User\NoUserException('Backends provided no user object for ' . $uid);
+				throw new NoUserException('Backends provided no user object for ' . $uid);
 			}
 
 			\OC_Util::setupFS($uid);
@@ -841,7 +844,7 @@ class Storage {
 				$quota = Filesystem::free_space('/');
 				$softQuota = false;
 			} else {
-				$quota = \OCP\Util::computerFileSize($quota);
+				$quota = Util::computerFileSize($quota);
 			}
 
 			// make sure that we have the current size of the version history
diff --git a/apps/files_versions/lib/Versions/LegacyVersionsBackend.php b/apps/files_versions/lib/Versions/LegacyVersionsBackend.php
index bc46da85752..92b326b6cd3 100644
--- a/apps/files_versions/lib/Versions/LegacyVersionsBackend.php
+++ b/apps/files_versions/lib/Versions/LegacyVersionsBackend.php
@@ -15,6 +15,7 @@ use OCA\DAV\Connector\Sabre\Exception\Forbidden;
 use OCA\Files_Versions\Db\VersionEntity;
 use OCA\Files_Versions\Db\VersionsMapper;
 use OCA\Files_Versions\Storage;
+use OCP\Constants;
 use OCP\Files\File;
 use OCP\Files\FileInfo;
 use OCP\Files\Folder;
@@ -162,7 +163,7 @@ class LegacyVersionsBackend implements IVersionBackend, IDeletableVersionBackend
 	}
 
 	public function rollback(IVersion $version) {
-		if (!$this->currentUserHasPermissions($version->getSourceFile(), \OCP\Constants::PERMISSION_UPDATE)) {
+		if (!$this->currentUserHasPermissions($version->getSourceFile(), Constants::PERMISSION_UPDATE)) {
 			throw new Forbidden('You cannot restore this version because you do not have update permissions on the source file.');
 		}
 
@@ -212,7 +213,7 @@ class LegacyVersionsBackend implements IVersionBackend, IDeletableVersionBackend
 	}
 
 	public function deleteVersion(IVersion $version): void {
-		if (!$this->currentUserHasPermissions($version->getSourceFile(), \OCP\Constants::PERMISSION_DELETE)) {
+		if (!$this->currentUserHasPermissions($version->getSourceFile(), Constants::PERMISSION_DELETE)) {
 			throw new Forbidden('You cannot delete this version because you do not have delete permissions on the source file.');
 		}
 
@@ -303,7 +304,7 @@ class LegacyVersionsBackend implements IVersionBackend, IDeletableVersionBackend
 	}
 
 	public function setMetadataValue(Node $node, int $revision, string $key, string $value): void {
-		if (!$this->currentUserHasPermissions($node, \OCP\Constants::PERMISSION_UPDATE)) {
+		if (!$this->currentUserHasPermissions($node, Constants::PERMISSION_UPDATE)) {
 			throw new Forbidden('You cannot update the version\'s metadata because you do not have update permissions on the source file.');
 		}
 
diff --git a/apps/files_versions/tests/Command/CleanupTest.php b/apps/files_versions/tests/Command/CleanupTest.php
index 8103c694879..62d9576e9c5 100644
--- a/apps/files_versions/tests/Command/CleanupTest.php
+++ b/apps/files_versions/tests/Command/CleanupTest.php
@@ -12,6 +12,7 @@ use OCP\Files\Cache\ICache;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\Files\Storage\IStorage;
+use OCP\UserInterface;
 use Test\TestCase;
 
 /**
@@ -142,7 +143,7 @@ class CleanupTest extends TestCase {
 			->setConstructorArgs([$this->rootFolder, $this->userManager, $this->versionMapper])
 			->getMock();
 
-		$backend = $this->getMockBuilder(\OCP\UserInterface::class)
+		$backend = $this->getMockBuilder(UserInterface::class)
 			->disableOriginalConstructor()->getMock();
 		$backend->expects($this->once())->method('getUsers')
 			->with('', 500, 0)
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index 5b3a29571da..e20fbc623dc 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -6,14 +6,24 @@
  */
 namespace OCA\Files_Versions\Tests;
 
+use OC\AllConfig;
+use OC\Files\Cache\Watcher;
+use OC\Files\Filesystem;
 use OC\Files\Storage\Temporary;
+use OC\Files\View;
+use OC\User\NoUserException;
+use OCA\Files_Sharing\AppInfo\Application;
 use OCA\Files_Versions\Db\VersionEntity;
 use OCA\Files_Versions\Db\VersionsMapper;
+use OCA\Files_Versions\Storage;
 use OCA\Files_Versions\Versions\IVersionManager;
+use OCP\Constants;
 use OCP\Files\IMimeTypeLoader;
 use OCP\IConfig;
 use OCP\IUser;
+use OCP\Server;
 use OCP\Share\IShare;
+use OCP\Util;
 
 /**
  * Class Test_Files_versions
@@ -44,7 +54,7 @@ class VersioningTest extends \Test\TestCase {
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
 
-		$application = new \OCA\Files_Sharing\AppInfo\Application();
+		$application = new Application();
 
 		// create test user
 		self::loginHelper(self::TEST_VERSIONS_USER2, true);
@@ -74,12 +84,12 @@ class VersioningTest extends \Test\TestCase {
 			->method('getSystemValue')
 			->willReturnCallback(function ($key, $default) use ($config) {
 				if ($key === 'filesystem_check_changes') {
-					return \OC\Files\Cache\Watcher::CHECK_ONCE;
+					return Watcher::CHECK_ONCE;
 				} else {
 					return $config->getSystemValue($key, $default);
 				}
 			});
-		$this->overwriteService(\OC\AllConfig::class, $mockConfig);
+		$this->overwriteService(AllConfig::class, $mockConfig);
 
 		// clear hooks
 		\OC_Hook::clear();
@@ -87,13 +97,13 @@ class VersioningTest extends \Test\TestCase {
 		\OC::$server->boot();
 
 		self::loginHelper(self::TEST_VERSIONS_USER);
-		$this->rootView = new \OC\Files\View();
+		$this->rootView = new View();
 		if (!$this->rootView->file_exists(self::USERS_VERSIONS_ROOT)) {
 			$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
 		}
 
-		$this->versionsMapper = \OCP\Server::get(VersionsMapper::class);
-		$this->mimeTypeLoader = \OCP\Server::get(IMimeTypeLoader::class);
+		$this->versionsMapper = Server::get(VersionsMapper::class);
+		$this->mimeTypeLoader = Server::get(IMimeTypeLoader::class);
 
 		$this->user1 = $this->createMock(IUser::class);
 		$this->user1->method('getUID')
@@ -104,7 +114,7 @@ class VersioningTest extends \Test\TestCase {
 	}
 
 	protected function tearDown(): void {
-		$this->restoreService(\OC\AllConfig::class);
+		$this->restoreService(AllConfig::class);
 
 		if ($this->rootView) {
 			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
@@ -270,7 +280,7 @@ class VersioningTest extends \Test\TestCase {
 	}
 
 	public function testRename(): void {
-		\OC\Files\Filesystem::file_put_contents('test.txt', 'test file');
+		Filesystem::file_put_contents('test.txt', 'test file');
 
 		$t1 = time();
 		// second version is two weeks older, this way we make sure that no
@@ -287,7 +297,7 @@ class VersioningTest extends \Test\TestCase {
 		$this->rootView->file_put_contents($v2, 'version2');
 
 		// execute rename hook of versions app
-		\OC\Files\Filesystem::rename('test.txt', 'test2.txt');
+		Filesystem::rename('test.txt', 'test2.txt');
 
 		$this->runCommands();
 
@@ -299,9 +309,9 @@ class VersioningTest extends \Test\TestCase {
 	}
 
 	public function testRenameInSharedFolder(): void {
-		\OC\Files\Filesystem::mkdir('folder1');
-		\OC\Files\Filesystem::mkdir('folder1/folder2');
-		\OC\Files\Filesystem::file_put_contents('folder1/test.txt', 'test file');
+		Filesystem::mkdir('folder1');
+		Filesystem::mkdir('folder1/folder2');
+		Filesystem::file_put_contents('folder1/test.txt', 'test file');
 
 		$t1 = time();
 		// second version is two weeks older, this way we make sure that no
@@ -324,16 +334,16 @@ class VersioningTest extends \Test\TestCase {
 			->setShareType(IShare::TYPE_USER)
 			->setSharedBy(self::TEST_VERSIONS_USER)
 			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(\OCP\Constants::PERMISSION_ALL);
+			->setPermissions(Constants::PERMISSION_ALL);
 		$share = \OC::$server->getShareManager()->createShare($share);
 		\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
 
-		$this->assertTrue(\OC\Files\Filesystem::file_exists('folder1/test.txt'));
+		$this->assertTrue(Filesystem::file_exists('folder1/test.txt'));
 
 		// execute rename hook of versions app
-		\OC\Files\Filesystem::rename('/folder1/test.txt', '/folder1/folder2/test.txt');
+		Filesystem::rename('/folder1/test.txt', '/folder1/folder2/test.txt');
 
 		$this->runCommands();
 
@@ -349,9 +359,9 @@ class VersioningTest extends \Test\TestCase {
 	}
 
 	public function testMoveFolder(): void {
-		\OC\Files\Filesystem::mkdir('folder1');
-		\OC\Files\Filesystem::mkdir('folder2');
-		\OC\Files\Filesystem::file_put_contents('folder1/test.txt', 'test file');
+		Filesystem::mkdir('folder1');
+		Filesystem::mkdir('folder2');
+		Filesystem::file_put_contents('folder1/test.txt', 'test file');
 
 		$t1 = time();
 		// second version is two weeks older, this way we make sure that no
@@ -369,7 +379,7 @@ class VersioningTest extends \Test\TestCase {
 		$this->rootView->file_put_contents($v2, 'version2');
 
 		// execute rename hook of versions app
-		\OC\Files\Filesystem::rename('folder1', 'folder2/folder1');
+		Filesystem::rename('folder1', 'folder2/folder1');
 
 		$this->runCommands();
 
@@ -382,8 +392,8 @@ class VersioningTest extends \Test\TestCase {
 
 
 	public function testMoveFileIntoSharedFolderAsRecipient(): void {
-		\OC\Files\Filesystem::mkdir('folder1');
-		$fileInfo = \OC\Files\Filesystem::getFileInfo('folder1');
+		Filesystem::mkdir('folder1');
+		$fileInfo = Filesystem::getFileInfo('folder1');
 
 		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
 		$share = \OC::$server->getShareManager()->newShare();
@@ -391,13 +401,13 @@ class VersioningTest extends \Test\TestCase {
 			->setShareType(IShare::TYPE_USER)
 			->setSharedBy(self::TEST_VERSIONS_USER)
 			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(\OCP\Constants::PERMISSION_ALL);
+			->setPermissions(Constants::PERMISSION_ALL);
 		$share = \OC::$server->getShareManager()->createShare($share);
 		\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
 		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
-		\OC\Files\Filesystem::file_put_contents('test.txt', 'test file');
+		Filesystem::file_put_contents('test.txt', 'test file');
 
 		$t1 = time();
 		// second version is two weeks older, this way we make sure that no
@@ -413,7 +423,7 @@ class VersioningTest extends \Test\TestCase {
 		$this->rootView->file_put_contents($v2, 'version2');
 
 		// move file into the shared folder as recipient
-		\OC\Files\Filesystem::rename('/test.txt', '/folder1/test.txt');
+		Filesystem::rename('/test.txt', '/folder1/test.txt');
 
 		$this->assertFalse($this->rootView->file_exists($v1));
 		$this->assertFalse($this->rootView->file_exists($v2));
@@ -432,7 +442,7 @@ class VersioningTest extends \Test\TestCase {
 	}
 
 	public function testMoveFolderIntoSharedFolderAsRecipient(): void {
-		\OC\Files\Filesystem::mkdir('folder1');
+		Filesystem::mkdir('folder1');
 
 		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder1');
 		$share = \OC::$server->getShareManager()->newShare();
@@ -440,14 +450,14 @@ class VersioningTest extends \Test\TestCase {
 			->setShareType(IShare::TYPE_USER)
 			->setSharedBy(self::TEST_VERSIONS_USER)
 			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(\OCP\Constants::PERMISSION_ALL);
+			->setPermissions(Constants::PERMISSION_ALL);
 		$share = \OC::$server->getShareManager()->createShare($share);
 		\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
 		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
-		\OC\Files\Filesystem::mkdir('folder2');
-		\OC\Files\Filesystem::file_put_contents('folder2/test.txt', 'test file');
+		Filesystem::mkdir('folder2');
+		Filesystem::file_put_contents('folder2/test.txt', 'test file');
 
 		$t1 = time();
 		// second version is two weeks older, this way we make sure that no
@@ -464,7 +474,7 @@ class VersioningTest extends \Test\TestCase {
 		$this->rootView->file_put_contents($v2, 'version2');
 
 		// move file into the shared folder as recipient
-		\OC\Files\Filesystem::rename('/folder2', '/folder1/folder2');
+		Filesystem::rename('/folder2', '/folder1/folder2');
 
 		$this->assertFalse($this->rootView->file_exists($v1));
 		$this->assertFalse($this->rootView->file_exists($v2));
@@ -483,7 +493,7 @@ class VersioningTest extends \Test\TestCase {
 	}
 
 	public function testRenameSharedFile(): void {
-		\OC\Files\Filesystem::file_put_contents('test.txt', 'test file');
+		Filesystem::file_put_contents('test.txt', 'test file');
 
 		$t1 = time();
 		// second version is two weeks older, this way we make sure that no
@@ -507,16 +517,16 @@ class VersioningTest extends \Test\TestCase {
 			->setShareType(IShare::TYPE_USER)
 			->setSharedBy(self::TEST_VERSIONS_USER)
 			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE);
+			->setPermissions(Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE | Constants::PERMISSION_SHARE);
 		$share = \OC::$server->getShareManager()->createShare($share);
 		\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
 
-		$this->assertTrue(\OC\Files\Filesystem::file_exists('test.txt'));
+		$this->assertTrue(Filesystem::file_exists('test.txt'));
 
 		// execute rename hook of versions app
-		\OC\Files\Filesystem::rename('test.txt', 'test2.txt');
+		Filesystem::rename('test.txt', 'test2.txt');
 
 		self::loginHelper(self::TEST_VERSIONS_USER);
 
@@ -532,7 +542,7 @@ class VersioningTest extends \Test\TestCase {
 	}
 
 	public function testCopy(): void {
-		\OC\Files\Filesystem::file_put_contents('test.txt', 'test file');
+		Filesystem::file_put_contents('test.txt', 'test file');
 
 		$t1 = time();
 		// second version is two weeks older, this way we make sure that no
@@ -549,7 +559,7 @@ class VersioningTest extends \Test\TestCase {
 		$this->rootView->file_put_contents($v2, 'version2');
 
 		// execute copy hook of versions app
-		\OC\Files\Filesystem::copy('test.txt', 'test2.txt');
+		Filesystem::copy('test.txt', 'test2.txt');
 
 		$this->runCommands();
 
@@ -580,7 +590,7 @@ class VersioningTest extends \Test\TestCase {
 		$this->rootView->file_put_contents($v2, 'version2');
 
 		// execute copy hook of versions app
-		$versions = \OCA\Files_Versions\Storage::getVersions(self::TEST_VERSIONS_USER, '/subfolder/test.txt');
+		$versions = Storage::getVersions(self::TEST_VERSIONS_USER, '/subfolder/test.txt');
 
 		$this->assertCount(2, $versions);
 
@@ -599,10 +609,10 @@ class VersioningTest extends \Test\TestCase {
 	 */
 	public function testGetVersionsEmptyFile(): void {
 		// execute copy hook of versions app
-		$versions = \OCA\Files_Versions\Storage::getVersions(self::TEST_VERSIONS_USER, '');
+		$versions = Storage::getVersions(self::TEST_VERSIONS_USER, '');
 		$this->assertCount(0, $versions);
 
-		$versions = \OCA\Files_Versions\Storage::getVersions(self::TEST_VERSIONS_USER, null);
+		$versions = Storage::getVersions(self::TEST_VERSIONS_USER, null);
 		$this->assertCount(0, $versions);
 	}
 
@@ -611,29 +621,29 @@ class VersioningTest extends \Test\TestCase {
 		// needed to have a FS setup (the background job does this)
 		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
 
-		$this->assertFalse(\OCA\Files_Versions\Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER));
+		$this->assertFalse(Storage::expire('/void/unexist.txt', self::TEST_VERSIONS_USER));
 	}
 
 
 	public function testExpireNonexistingUser(): void {
-		$this->expectException(\OC\User\NoUserException::class);
+		$this->expectException(NoUserException::class);
 
 		$this->logout();
 		// needed to have a FS setup (the background job does this)
 		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
-		\OC\Files\Filesystem::file_put_contents('test.txt', 'test file');
+		Filesystem::file_put_contents('test.txt', 'test file');
 
-		$this->assertFalse(\OCA\Files_Versions\Storage::expire('test.txt', 'unexist'));
+		$this->assertFalse(Storage::expire('test.txt', 'unexist'));
 	}
 
 	public function testRestoreSameStorage(): void {
-		\OC\Files\Filesystem::mkdir('sub');
+		Filesystem::mkdir('sub');
 		$this->doTestRestore();
 	}
 
 	public function testRestoreCrossStorage(): void {
 		$storage2 = new Temporary([]);
-		\OC\Files\Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
+		Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
 
 		$this->doTestRestore();
 	}
@@ -650,12 +660,12 @@ class VersioningTest extends \Test\TestCase {
 			->setShareType(IShare::TYPE_USER)
 			->setSharedBy(self::TEST_VERSIONS_USER)
 			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(\OCP\Constants::PERMISSION_READ);
+			->setPermissions(Constants::PERMISSION_READ);
 		$share = \OC::$server->getShareManager()->createShare($share);
 		\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		$versions = $this->createAndCheckVersions(
-			\OC\Files\Filesystem::getView(),
+			Filesystem::getView(),
 			'folder/test.txt'
 		);
 
@@ -665,7 +675,7 @@ class VersioningTest extends \Test\TestCase {
 
 		$firstVersion = current($versions);
 
-		$this->assertFalse(\OCA\Files_Versions\Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user2), 'Revert did not happen');
+		$this->assertFalse(Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user2), 'Revert did not happen');
 
 		$this->loginAsUser(self::TEST_VERSIONS_USER);
 
@@ -689,7 +699,7 @@ class VersioningTest extends \Test\TestCase {
 			->setShareType(IShare::TYPE_USER)
 			->setSharedBy(self::TEST_VERSIONS_USER)
 			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(\OCP\Constants::PERMISSION_ALL);
+			->setPermissions(Constants::PERMISSION_ALL);
 		$share = \OC::$server->getShareManager()->createShare($share);
 		$shareManager = \OC::$server->getShareManager();
 		$shareManager->acceptShare($share, self::TEST_VERSIONS_USER2);
@@ -698,7 +708,7 @@ class VersioningTest extends \Test\TestCase {
 		$shareManager->moveShare($share, self::TEST_VERSIONS_USER2);
 
 		$versions = $this->createAndCheckVersions(
-			\OC\Files\Filesystem::getView(),
+			Filesystem::getView(),
 			'folder/test.txt'
 		);
 
@@ -708,7 +718,7 @@ class VersioningTest extends \Test\TestCase {
 
 		$firstVersion = current($versions);
 
-		$this->assertTrue(\OCA\Files_Versions\Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user1));
+		$this->assertTrue(Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user1));
 
 		$this->loginAsUser(self::TEST_VERSIONS_USER);
 
@@ -737,7 +747,7 @@ class VersioningTest extends \Test\TestCase {
 				}
 			);
 
-		\OCP\Util::connectHook(
+		Util::connectHook(
 			'\OCP\Versions',
 			$hookName,
 			$eventHandler,
@@ -783,7 +793,7 @@ class VersioningTest extends \Test\TestCase {
 		$versionEntity->setMetadata([]);
 		$this->versionsMapper->insert($versionEntity);
 
-		$oldVersions = \OCA\Files_Versions\Storage::getVersions(
+		$oldVersions = Storage::getVersions(
 			self::TEST_VERSIONS_USER, '/sub/test.txt'
 		);
 
@@ -795,7 +805,7 @@ class VersioningTest extends \Test\TestCase {
 		$params = [];
 		$this->connectMockHooks('rollback', $params);
 
-		$versionManager = \OCP\Server::get(IVersionManager::class);
+		$versionManager = Server::get(IVersionManager::class);
 		$versions = $versionManager->getVersionsForFile($this->user1, $info1);
 		$version = array_filter($versions, function ($version) use ($t2) {
 			return $version->getRevisionId() === $t2;
@@ -828,7 +838,7 @@ class VersioningTest extends \Test\TestCase {
 			'Restored file has mtime from version'
 		);
 
-		$newVersions = \OCA\Files_Versions\Storage::getVersions(
+		$newVersions = Storage::getVersions(
 			self::TEST_VERSIONS_USER, '/sub/test.txt'
 		);
 
@@ -868,7 +878,7 @@ class VersioningTest extends \Test\TestCase {
 		$this->loginAsUser(self::TEST_VERSIONS_USER);
 
 		$this->createAndCheckVersions(
-			\OC\Files\Filesystem::getView(),
+			Filesystem::getView(),
 			'test.txt'
 		);
 	}
@@ -879,8 +889,8 @@ class VersioningTest extends \Test\TestCase {
 	public function testStoreVersionAsRecipient(): void {
 		$this->loginAsUser(self::TEST_VERSIONS_USER);
 
-		\OC\Files\Filesystem::mkdir('folder');
-		\OC\Files\Filesystem::file_put_contents('folder/test.txt', 'test file');
+		Filesystem::mkdir('folder');
+		Filesystem::file_put_contents('folder/test.txt', 'test file');
 
 		$node = \OC::$server->getUserFolder(self::TEST_VERSIONS_USER)->get('folder');
 		$share = \OC::$server->getShareManager()->newShare();
@@ -888,14 +898,14 @@ class VersioningTest extends \Test\TestCase {
 			->setShareType(IShare::TYPE_USER)
 			->setSharedBy(self::TEST_VERSIONS_USER)
 			->setSharedWith(self::TEST_VERSIONS_USER2)
-			->setPermissions(\OCP\Constants::PERMISSION_ALL);
+			->setPermissions(Constants::PERMISSION_ALL);
 		$share = \OC::$server->getShareManager()->createShare($share);
 		\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		$this->loginAsUser(self::TEST_VERSIONS_USER2);
 
 		$this->createAndCheckVersions(
-			\OC\Files\Filesystem::getView(),
+			Filesystem::getView(),
 			'folder/test.txt'
 		);
 
@@ -916,7 +926,7 @@ class VersioningTest extends \Test\TestCase {
 		// needed to make the hooks fire
 		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
 
-		$userView = new \OC\Files\View('/' . self::TEST_VERSIONS_USER . '/files');
+		$userView = new View('/' . self::TEST_VERSIONS_USER . '/files');
 		$this->createAndCheckVersions(
 			$userView,
 			'test.txt'
@@ -927,7 +937,7 @@ class VersioningTest extends \Test\TestCase {
 	 * @param \OC\Files\View $view
 	 * @param string $path
 	 */
-	private function createAndCheckVersions(\OC\Files\View $view, $path) {
+	private function createAndCheckVersions(View $view, $path) {
 		$view->file_put_contents($path, 'test file');
 		$view->file_put_contents($path, 'version 1');
 		$view->file_put_contents($path, 'version 2');
@@ -938,7 +948,7 @@ class VersioningTest extends \Test\TestCase {
 		[$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
 		$rootStorage->getScanner()->scan('files_versions');
 
-		$versions = \OCA\Files_Versions\Storage::getVersions(
+		$versions = Storage::getVersions(
 			self::TEST_VERSIONS_USER, '/' . $path
 		);
 
@@ -962,7 +972,7 @@ class VersioningTest extends \Test\TestCase {
 
 		\OC_Util::tearDownFS();
 		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
+		Filesystem::tearDown();
 		\OC_User::setUserId($user);
 		\OC_Util::setupFS($user);
 		\OC::$server->getUserFolder($user);
@@ -970,7 +980,7 @@ class VersioningTest extends \Test\TestCase {
 }
 
 // extend the original class to make it possible to test protected methods
-class VersionStorageToTest extends \OCA\Files_Versions\Storage {
+class VersionStorageToTest extends Storage {
 
 	/**
 	 * @param integer $time