don't re-get fileinfo for versioned file if it's not shared

Signed-off-by: Robin Appelman <robin@icewind.nl>

apps/files_versions/lib/Versions/LegacyVersionsBackend.php

@@ -69,46 +69,46 @@ public function getVersionsForFile(IUser $user, FileInfo $file): array {
 		if ($storage->instanceOfStorage(SharedStorage::class)) {
 			$owner = $storage->getOwner('');
 			$user = $this->userManager->get($owner);
-		}
 
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$nodes = $userFolder->getById($file->getId());
-		$file2 = array_pop($nodes);
+			$userFolder = $this->rootFolder->getUserFolder($user->getUID());
+			$nodes = $userFolder->getById($file->getId());
+			$file = array_pop($nodes);
+		}
 
-		$versions = $this->getVersionsForFileFromDB($file2, $user);
+		$versions = $this->getVersionsForFileFromDB($file, $user);
 
 		if (count($versions) > 0) {
 			return $versions;
 		}
 
 		// Insert the entry in the DB for the current version.
 		$versionEntity = new VersionEntity();
-		$versionEntity->setFileId($file2->getId());
-		$versionEntity->setTimestamp($file2->getMTime());
-		$versionEntity->setSize($file2->getSize());
-		$versionEntity->setMimetype($this->mimeTypeLoader->getId($file2->getMimetype()));
+		$versionEntity->setFileId($file->getId());
+		$versionEntity->setTimestamp($file->getMTime());
+		$versionEntity->setSize($file->getSize());
+		$versionEntity->setMimetype($this->mimeTypeLoader->getId($file->getMimetype()));
 		$versionEntity->setMetadata([]);
 		$this->versionsMapper->insert($versionEntity);
 
 		// Insert entries in the DB for existing versions.
-		$versionsOnFS = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
+		$versionsOnFS = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file->getPath()));
 		foreach ($versionsOnFS as $version) {
 			$versionEntity = new VersionEntity();
-			$versionEntity->setFileId($file2->getId());
+			$versionEntity->setFileId($file->getId());
 			$versionEntity->setTimestamp((int)$version['version']);
 			$versionEntity->setSize((int)$version['size']);
 			$versionEntity->setMimetype($this->mimeTypeLoader->getId($version['mimetype']));
 			$versionEntity->setMetadata([]);
 			$this->versionsMapper->insert($versionEntity);
 		}
 
-		return $this->getVersionsForFileFromDB($file2, $user);
+		return $this->getVersionsForFileFromDB($file, $user);
 	}
 
 	/**
 	 * @return IVersion[]
 	 */
-	private function getVersionsForFileFromDB(Node $file, IUser $user): array {
+	private function getVersionsForFileFromDB(FileInfo $file, IUser $user): array {
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 
 		return array_map(

apps/files_versions/tests/VersioningTest.php

@@ -662,7 +662,6 @@ public function testRestoreSameStorage() {
 	public function testRestoreCrossStorage() {
 		$storage2 = new Temporary([]);
 		\OC\Files\Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
-		\OC\Files\Filesystem::tearDown();
 
 		$this->doTestRestore();
 	}