Inspection of "Merge pull request #51355 from AIlkiv/refactor/rol..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 0c3ebb...258983 )

unknown

created 2025-04-25 09:42 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -29,11 +29,11 @@
 block discarded – undo
 	public function connectWatcher(): void {
 		// Do not connect if we are not setup yet!
 		if ($this->config->getValue('instanceid', null) !== null) {
-			$this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
+			$this->root->listen('\OC\Files', 'postWrite', function(Node $node) {
 				$this->getWatcher()->postWrite($node);
 			});
 
-			$this->dispatcher->addListener(VersionRestoredEvent::class, function (VersionRestoredEvent $event) {
+			$this->dispatcher->addListener(VersionRestoredEvent::class, function(VersionRestoredEvent $event) {
 				$this->getWatcher()->versionRollback(['node' => $event->getVersion()->getSourceFile()]);
 			});
 		}

Please login to merge, or discard this patch.

apps/files_versions/tests/VersioningTest.php 1 patch

Spacing +59 added lines, -59 removed lines patch added patch discarded remove patch

@@ -86,7 +86,7 @@  discard block
 block discarded – undo
 		$mockConfig = $this->createMock(IConfig::class);
 		$mockConfig->expects($this->any())
 			->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) use ($config) {
+			->willReturnCallback(function($key, $default) use ($config) {
 				if ($key === 'filesystem_check_changes') {
 					return Watcher::CHECK_ONCE;
 				} else {
@@ -121,10 +121,10 @@  discard block
 block discarded – undo
 		$this->restoreService(AllConfig::class);
 
 		if ($this->rootView) {
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files_versions/');
-			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files_versions/');
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER.'/files/');
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2.'/files/');
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER.'/files_versions/');
+			$this->rootView->deleteAll(self::TEST_VERSIONS_USER2.'/files_versions/');
 		}
 
 		\OC_Hook::clear();
@@ -292,10 +292,10 @@  discard block
 block discarded – undo
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -322,12 +322,12 @@  discard block
 block discarded – undo
 		// version will be expired
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/folder1');
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t2;
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/folder1/folder2/test.txt.v'.$t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/folder1/folder2/test.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -373,11 +373,11 @@  discard block
 block discarded – undo
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
-		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t2;
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/folder1');
+		$v1 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t2;
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/folder2/folder1/test.txt.v'.$t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/folder2/folder1/test.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
 		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
+		$versionsFolder2 = '/'.self::TEST_VERSIONS_USER2.'/files_versions';
 		Filesystem::file_put_contents('test.txt', 'test file');
 
 		$t1 = time();
@@ -420,8 +420,8 @@  discard block
 block discarded – undo
 
 		$this->rootView->mkdir($versionsFolder2);
 		// create some versions
-		$v1 = $versionsFolder2 . '/test.txt.v' . $t1;
-		$v2 = $versionsFolder2 . '/test.txt.v' . $t2;
+		$v1 = $versionsFolder2.'/test.txt.v'.$t1;
+		$v2 = $versionsFolder2.'/test.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -434,10 +434,10 @@  discard block
 block discarded – undo
 
 		self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
+		$versionsFolder1 = '/'.self::TEST_VERSIONS_USER.'/files_versions';
 
-		$v1Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t1;
-		$v2Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t2;
+		$v1Renamed = $versionsFolder1.'/folder1/test.txt.v'.$t1;
+		$v2Renamed = $versionsFolder1.'/folder1/test.txt.v'.$t2;
 
 		$this->assertTrue($this->rootView->file_exists($v1Renamed));
 		$this->assertTrue($this->rootView->file_exists($v2Renamed));
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
 		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
-		$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
+		$versionsFolder2 = '/'.self::TEST_VERSIONS_USER2.'/files_versions';
 		Filesystem::mkdir('folder2');
 		Filesystem::file_put_contents('folder2/test.txt', 'test file');
 
@@ -469,10 +469,10 @@  discard block
 block discarded – undo
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		$this->rootView->mkdir($versionsFolder2);
-		$this->rootView->mkdir($versionsFolder2 . '/folder2');
+		$this->rootView->mkdir($versionsFolder2.'/folder2');
 		// create some versions
-		$v1 = $versionsFolder2 . '/folder2/test.txt.v' . $t1;
-		$v2 = $versionsFolder2 . '/folder2/test.txt.v' . $t2;
+		$v1 = $versionsFolder2.'/folder2/test.txt.v'.$t1;
+		$v2 = $versionsFolder2.'/folder2/test.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -485,10 +485,10 @@  discard block
 block discarded – undo
 
 		self::loginHelper(self::TEST_VERSIONS_USER);
 
-		$versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
+		$versionsFolder1 = '/'.self::TEST_VERSIONS_USER.'/files_versions';
 
-		$v1Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t1;
-		$v2Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t2;
+		$v1Renamed = $versionsFolder1.'/folder1/folder2/test.txt.v'.$t1;
+		$v2Renamed = $versionsFolder1.'/folder1/folder2/test.txt.v'.$t2;
 
 		$this->assertTrue($this->rootView->file_exists($v1Renamed));
 		$this->assertTrue($this->rootView->file_exists($v2Renamed));
@@ -506,11 +506,11 @@  discard block
 block discarded – undo
 
 		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
 		// the renamed versions should not exist! Because we only moved the mount point!
-		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+		$v1Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -554,10 +554,10 @@  discard block
 block discarded – undo
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
-		$v1Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
-		$v2Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
+		$v1Copied = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
+		$v2Copied = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -585,10 +585,10 @@  discard block
 block discarded – undo
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/subfolder/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/subfolder/test.txt.v'.$t2;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/subfolder/');
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/subfolder/');
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
 		}
 
 		//cleanup
-		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
+		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT.'/subfolder');
 	}
 
 	/**
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
 
 	public function testRestoreCrossStorage(): void {
 		$storage2 = new Temporary([]);
-		Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
+		Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER.'/files/sub');
 
 		$this->doTestRestore();
 	}
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
 		$eventHandler->expects($this->any())
 			->method('callback')
 			->willReturnCallback(
-				function ($p) use (&$params): void {
+				function($p) use (&$params): void {
 					$params = $p;
 				}
 			);
@@ -760,7 +760,7 @@  discard block
 block discarded – undo
 	}
 
 	private function doTestRestore() {
-		$filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
+		$filePath = self::TEST_VERSIONS_USER.'/files/sub/test.txt';
 		$this->rootView->file_put_contents($filePath, 'test file');
 
 		$fileInfo = $this->rootView->getFileInfo($filePath);
@@ -772,10 +772,10 @@  discard block
 block discarded – undo
 		$t2 = $t1 - 60 * 60 * 24 * 14;
 
 		// create some versions
-		$v1 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t1;
-		$v2 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t2;
+		$v1 = self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t1;
+		$v2 = self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t2;
 
-		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/sub');
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/sub');
 
 		$this->rootView->file_put_contents($v1, 'version1');
 		$fileInfoV1 = $this->rootView->getFileInfo($v1);
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
 
 		$eventDispatcher = Server::get(IEventDispatcher::class);
 		$eventFired = false;
-		$eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2) {
+		$eventDispatcher->addListener(VersionRestoredEvent::class, function($event) use (&$eventFired, $t2) {
 			$eventFired = true;
 			$this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
 			$this->assertTrue($event->getVersion()->getRevisionId() > 0);
@@ -816,7 +816,7 @@  discard block
 block discarded – undo
 
 		$versionManager = Server::get(IVersionManager::class);
 		$versions = $versionManager->getVersionsForFile($this->user1, $info1);
-		$version = array_filter($versions, function ($version) use ($t2) {
+		$version = array_filter($versions, function($version) use ($t2) {
 			return $version->getRevisionId() === $t2;
 		});
 		$this->assertTrue($versionManager->rollback(current($version)));
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
 		);
 
 		$this->assertTrue(
-			$this->rootView->file_exists(self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t0),
+			$this->rootView->file_exists(self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t0),
 			'A version file was created for the file before restoration'
 		);
 		$this->assertTrue(
@@ -862,15 +862,15 @@  discard block
 block discarded – undo
 		$this->assertCount(2, $newVersions, 'Additional version created');
 
 		$this->assertTrue(
-			isset($newVersions[$t0 . '#' . 'test.txt']),
+			isset($newVersions[$t0.'#'.'test.txt']),
 			'A version was created for the file before restoration'
 		);
 		$this->assertTrue(
-			isset($newVersions[$t1 . '#' . 'test.txt']),
+			isset($newVersions[$t1.'#'.'test.txt']),
 			'Untouched version is still there'
 		);
 		$this->assertFalse(
-			isset($newVersions[$t2 . '#' . 'test.txt']),
+			isset($newVersions[$t2.'#'.'test.txt']),
 			'Restored version is not in the list any more'
 		);
 	}
@@ -930,7 +930,7 @@  discard block
 block discarded – undo
 		// needed to make the hooks fire
 		\OC_Util::setupFS(self::TEST_VERSIONS_USER);
 
-		$userView = new View('/' . self::TEST_VERSIONS_USER . '/files');
+		$userView = new View('/'.self::TEST_VERSIONS_USER.'/files');
 		$this->createAndCheckVersions(
 			$userView,
 			'test.txt'
@@ -949,11 +949,11 @@  discard block
 block discarded – undo
 		$this->loginAsUser(self::TEST_VERSIONS_USER);
 
 		// need to scan for the versions
-		[$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
+		[$rootStorage, ] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER.'/files_versions');
 		$rootStorage->getScanner()->scan('files_versions');
 
 		$versions = Storage::getVersions(
-			self::TEST_VERSIONS_USER, '/' . $path
+			self::TEST_VERSIONS_USER, '/'.$path
 		);
 
 		// note: we cannot predict how many versions are created due to

Please login to merge, or discard this patch.

		@@ -29,11 +29,11 @@
		block discarded – undo
29	29	public function connectWatcher(): void {
30	30	// Do not connect if we are not setup yet!
31	31	if ($this->config->getValue('instanceid', null) !== null) {
32		- $this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
	32	+ $this->root->listen('\OC\Files', 'postWrite', function(Node $node) {
33	33	$this->getWatcher()->postWrite($node);
34	34	});
35	35
36		- $this->dispatcher->addListener(VersionRestoredEvent::class, function (VersionRestoredEvent $event) {
	36	+ $this->dispatcher->addListener(VersionRestoredEvent::class, function(VersionRestoredEvent $event) {
37	37	$this->getWatcher()->versionRollback(['node' => $event->getVersion()->getSourceFile()]);
38	38	});
39	39	}

		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	$mockConfig = $this->createMock(IConfig::class);
87	87	$mockConfig->expects($this->any())
88	88	->method('getSystemValue')
89		- ->willReturnCallback(function ($key, $default) use ($config) {
	89	+ ->willReturnCallback(function($key, $default) use ($config) {
90	90	if ($key === 'filesystem_check_changes') {
91	91	return Watcher::CHECK_ONCE;
92	92	} else {
		@@ -121,10 +121,10 @@ discard block
		block discarded – undo
121	121	$this->restoreService(AllConfig::class);
122	122
123	123	if ($this->rootView) {
124		- $this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files/');
125		- $this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files/');
126		- $this->rootView->deleteAll(self::TEST_VERSIONS_USER . '/files_versions/');
127		- $this->rootView->deleteAll(self::TEST_VERSIONS_USER2 . '/files_versions/');
	124	+ $this->rootView->deleteAll(self::TEST_VERSIONS_USER.'/files/');
	125	+ $this->rootView->deleteAll(self::TEST_VERSIONS_USER2.'/files/');
	126	+ $this->rootView->deleteAll(self::TEST_VERSIONS_USER.'/files_versions/');
	127	+ $this->rootView->deleteAll(self::TEST_VERSIONS_USER2.'/files_versions/');
128	128	}
129	129
130	130	\OC_Hook::clear();
		@@ -292,10 +292,10 @@ discard block
		block discarded – undo
292	292	$t2 = $t1 - 60 * 60 * 24 * 14;
293	293
294	294	// create some versions
295		- $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
296		- $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
297		- $v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
298		- $v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
	295	+ $v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
	296	+ $v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
	297	+ $v1Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
	298	+ $v2Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
299	299
300	300	$this->rootView->file_put_contents($v1, 'version1');
301	301	$this->rootView->file_put_contents($v2, 'version2');
		@@ -322,12 +322,12 @@ discard block
		block discarded – undo
322	322	// version will be expired
323	323	$t2 = $t1 - 60 * 60 * 24 * 14;
324	324
325		- $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
	325	+ $this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/folder1');
326	326	// create some versions
327		- $v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
328		- $v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
329		- $v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1;
330		- $v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2;
	327	+ $v1 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t1;
	328	+ $v2 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t2;
	329	+ $v1Renamed = self::USERS_VERSIONS_ROOT.'/folder1/folder2/test.txt.v'.$t1;
	330	+ $v2Renamed = self::USERS_VERSIONS_ROOT.'/folder1/folder2/test.txt.v'.$t2;
331	331
332	332	$this->rootView->file_put_contents($v1, 'version1');
333	333	$this->rootView->file_put_contents($v2, 'version2');
		@@ -373,11 +373,11 @@ discard block
		block discarded – undo
373	373	$t2 = $t1 - 60 * 60 * 24 * 14;
374	374
375	375	// create some versions
376		- $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
377		- $v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
378		- $v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
379		- $v1Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t1;
380		- $v2Renamed = self::USERS_VERSIONS_ROOT . '/folder2/folder1/test.txt.v' . $t2;
	376	+ $this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/folder1');
	377	+ $v1 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t1;
	378	+ $v2 = self::USERS_VERSIONS_ROOT.'/folder1/test.txt.v'.$t2;
	379	+ $v1Renamed = self::USERS_VERSIONS_ROOT.'/folder2/folder1/test.txt.v'.$t1;
	380	+ $v2Renamed = self::USERS_VERSIONS_ROOT.'/folder2/folder1/test.txt.v'.$t2;
381	381
382	382	$this->rootView->file_put_contents($v1, 'version1');
383	383	$this->rootView->file_put_contents($v2, 'version2');
		@@ -410,7 +410,7 @@ discard block
		block discarded – undo
410	410	Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
411	411
412	412	self::loginHelper(self::TEST_VERSIONS_USER2);
413		- $versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
	413	+ $versionsFolder2 = '/'.self::TEST_VERSIONS_USER2.'/files_versions';
414	414	Filesystem::file_put_contents('test.txt', 'test file');
415	415
416	416	$t1 = time();
		@@ -420,8 +420,8 @@ discard block
		block discarded – undo
420	420
421	421	$this->rootView->mkdir($versionsFolder2);
422	422	// create some versions
423		- $v1 = $versionsFolder2 . '/test.txt.v' . $t1;
424		- $v2 = $versionsFolder2 . '/test.txt.v' . $t2;
	423	+ $v1 = $versionsFolder2.'/test.txt.v'.$t1;
	424	+ $v2 = $versionsFolder2.'/test.txt.v'.$t2;
425	425
426	426	$this->rootView->file_put_contents($v1, 'version1');
427	427	$this->rootView->file_put_contents($v2, 'version2');
		@@ -434,10 +434,10 @@ discard block
		block discarded – undo
434	434
435	435	self::loginHelper(self::TEST_VERSIONS_USER);
436	436
437		- $versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
	437	+ $versionsFolder1 = '/'.self::TEST_VERSIONS_USER.'/files_versions';
438	438
439		- $v1Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t1;
440		- $v2Renamed = $versionsFolder1 . '/folder1/test.txt.v' . $t2;
	439	+ $v1Renamed = $versionsFolder1.'/folder1/test.txt.v'.$t1;
	440	+ $v2Renamed = $versionsFolder1.'/folder1/test.txt.v'.$t2;
441	441
442	442	$this->assertTrue($this->rootView->file_exists($v1Renamed));
443	443	$this->assertTrue($this->rootView->file_exists($v2Renamed));
		@@ -459,7 +459,7 @@ discard block
		block discarded – undo
459	459	Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_VERSIONS_USER2);
460	460
461	461	self::loginHelper(self::TEST_VERSIONS_USER2);
462		- $versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
	462	+ $versionsFolder2 = '/'.self::TEST_VERSIONS_USER2.'/files_versions';
463	463	Filesystem::mkdir('folder2');
464	464	Filesystem::file_put_contents('folder2/test.txt', 'test file');
465	465
		@@ -469,10 +469,10 @@ discard block
		block discarded – undo
469	469	$t2 = $t1 - 60 * 60 * 24 * 14;
470	470
471	471	$this->rootView->mkdir($versionsFolder2);
472		- $this->rootView->mkdir($versionsFolder2 . '/folder2');
	472	+ $this->rootView->mkdir($versionsFolder2.'/folder2');
473	473	// create some versions
474		- $v1 = $versionsFolder2 . '/folder2/test.txt.v' . $t1;
475		- $v2 = $versionsFolder2 . '/folder2/test.txt.v' . $t2;
	474	+ $v1 = $versionsFolder2.'/folder2/test.txt.v'.$t1;
	475	+ $v2 = $versionsFolder2.'/folder2/test.txt.v'.$t2;
476	476
477	477	$this->rootView->file_put_contents($v1, 'version1');
478	478	$this->rootView->file_put_contents($v2, 'version2');
		@@ -485,10 +485,10 @@ discard block
		block discarded – undo
485	485
486	486	self::loginHelper(self::TEST_VERSIONS_USER);
487	487
488		- $versionsFolder1 = '/' . self::TEST_VERSIONS_USER . '/files_versions';
	488	+ $versionsFolder1 = '/'.self::TEST_VERSIONS_USER.'/files_versions';
489	489
490		- $v1Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t1;
491		- $v2Renamed = $versionsFolder1 . '/folder1/folder2/test.txt.v' . $t2;
	490	+ $v1Renamed = $versionsFolder1.'/folder1/folder2/test.txt.v'.$t1;
	491	+ $v2Renamed = $versionsFolder1.'/folder1/folder2/test.txt.v'.$t2;
492	492
493	493	$this->assertTrue($this->rootView->file_exists($v1Renamed));
494	494	$this->assertTrue($this->rootView->file_exists($v2Renamed));
		@@ -506,11 +506,11 @@ discard block
		block discarded – undo
506	506
507	507	$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
508	508	// create some versions
509		- $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
510		- $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
	509	+ $v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
	510	+ $v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
511	511	// the renamed versions should not exist! Because we only moved the mount point!
512		- $v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
513		- $v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
	512	+ $v1Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
	513	+ $v2Renamed = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
514	514
515	515	$this->rootView->file_put_contents($v1, 'version1');
516	516	$this->rootView->file_put_contents($v2, 'version2');
		@@ -554,10 +554,10 @@ discard block
		block discarded – undo
554	554	$t2 = $t1 - 60 * 60 * 24 * 14;
555	555
556	556	// create some versions
557		- $v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
558		- $v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
559		- $v1Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
560		- $v2Copied = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
	557	+ $v1 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t1;
	558	+ $v2 = self::USERS_VERSIONS_ROOT.'/test.txt.v'.$t2;
	559	+ $v1Copied = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t1;
	560	+ $v2Copied = self::USERS_VERSIONS_ROOT.'/test2.txt.v'.$t2;
561	561
562	562	$this->rootView->file_put_contents($v1, 'version1');
563	563	$this->rootView->file_put_contents($v2, 'version2');
		@@ -585,10 +585,10 @@ discard block
		block discarded – undo
585	585	$t2 = $t1 - 60 * 60 * 24 * 14;
586	586
587	587	// create some versions
588		- $v1 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t1;
589		- $v2 = self::USERS_VERSIONS_ROOT . '/subfolder/test.txt.v' . $t2;
	588	+ $v1 = self::USERS_VERSIONS_ROOT.'/subfolder/test.txt.v'.$t1;
	589	+ $v2 = self::USERS_VERSIONS_ROOT.'/subfolder/test.txt.v'.$t2;
590	590
591		- $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/subfolder/');
	591	+ $this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/subfolder/');
592	592
593	593	$this->rootView->file_put_contents($v1, 'version1');
594	594	$this->rootView->file_put_contents($v2, 'version2');
		@@ -604,7 +604,7 @@ discard block
		block discarded – undo
604	604	}
605	605
606	606	//cleanup
607		- $this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
	607	+ $this->rootView->deleteAll(self::USERS_VERSIONS_ROOT.'/subfolder');
608	608	}
609	609
610	610	/**
		@@ -647,7 +647,7 @@ discard block
		block discarded – undo
647	647
648	648	public function testRestoreCrossStorage(): void {
649	649	$storage2 = new Temporary([]);
650		- Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER . '/files/sub');
	650	+ Filesystem::mount($storage2, [], self::TEST_VERSIONS_USER.'/files/sub');
651	651
652	652	$this->doTestRestore();
653	653	}
		@@ -746,7 +746,7 @@ discard block
		block discarded – undo
746	746	$eventHandler->expects($this->any())
747	747	->method('callback')
748	748	->willReturnCallback(
749		- function ($p) use (&$params): void {
	749	+ function($p) use (&$params): void {
750	750	$params = $p;
751	751	}
752	752	);
		@@ -760,7 +760,7 @@ discard block
		block discarded – undo
760	760	}
761	761
762	762	private function doTestRestore() {
763		- $filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
	763	+ $filePath = self::TEST_VERSIONS_USER.'/files/sub/test.txt';
764	764	$this->rootView->file_put_contents($filePath, 'test file');
765	765
766	766	$fileInfo = $this->rootView->getFileInfo($filePath);
		@@ -772,10 +772,10 @@ discard block
		block discarded – undo
772	772	$t2 = $t1 - 60 * 60 * 24 * 14;
773	773
774	774	// create some versions
775		- $v1 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t1;
776		- $v2 = self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t2;
	775	+ $v1 = self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t1;
	776	+ $v2 = self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t2;
777	777
778		- $this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/sub');
	778	+ $this->rootView->mkdir(self::USERS_VERSIONS_ROOT.'/sub');
779	779
780	780	$this->rootView->file_put_contents($v1, 'version1');
781	781	$fileInfoV1 = $this->rootView->getFileInfo($v1);
		@@ -808,7 +808,7 @@ discard block
		block discarded – undo
808	808
809	809	$eventDispatcher = Server::get(IEventDispatcher::class);
810	810	$eventFired = false;
811		- $eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2) {
	811	+ $eventDispatcher->addListener(VersionRestoredEvent::class, function($event) use (&$eventFired, $t2) {
812	812	$eventFired = true;
813	813	$this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
814	814	$this->assertTrue($event->getVersion()->getRevisionId() > 0);
		@@ -816,7 +816,7 @@ discard block
		block discarded – undo
816	816
817	817	$versionManager = Server::get(IVersionManager::class);
818	818	$versions = $versionManager->getVersionsForFile($this->user1, $info1);
819		- $version = array_filter($versions, function ($version) use ($t2) {
	819	+ $version = array_filter($versions, function($version) use ($t2) {
820	820	return $version->getRevisionId() === $t2;
821	821	});
822	822	$this->assertTrue($versionManager->rollback(current($version)));
		@@ -847,7 +847,7 @@ discard block
		block discarded – undo
847	847	);
848	848
849	849	$this->assertTrue(
850		- $this->rootView->file_exists(self::USERS_VERSIONS_ROOT . '/sub/test.txt.v' . $t0),
	850	+ $this->rootView->file_exists(self::USERS_VERSIONS_ROOT.'/sub/test.txt.v'.$t0),
851	851	'A version file was created for the file before restoration'
852	852	);
853	853	$this->assertTrue(
		@@ -862,15 +862,15 @@ discard block
		block discarded – undo
862	862	$this->assertCount(2, $newVersions, 'Additional version created');
863	863
864	864	$this->assertTrue(
865		- isset($newVersions[$t0 . '#' . 'test.txt']),
	865	+ isset($newVersions[$t0.'#'.'test.txt']),
866	866	'A version was created for the file before restoration'
867	867	);
868	868	$this->assertTrue(
869		- isset($newVersions[$t1 . '#' . 'test.txt']),
	869	+ isset($newVersions[$t1.'#'.'test.txt']),
870	870	'Untouched version is still there'
871	871	);
872	872	$this->assertFalse(
873		- isset($newVersions[$t2 . '#' . 'test.txt']),
	873	+ isset($newVersions[$t2.'#'.'test.txt']),
874	874	'Restored version is not in the list any more'
875	875	);
876	876	}
		@@ -930,7 +930,7 @@ discard block
		block discarded – undo
930	930	// needed to make the hooks fire
931	931	\OC_Util::setupFS(self::TEST_VERSIONS_USER);
932	932
933		- $userView = new View('/' . self::TEST_VERSIONS_USER . '/files');
	933	+ $userView = new View('/'.self::TEST_VERSIONS_USER.'/files');
934	934	$this->createAndCheckVersions(
935	935	$userView,
936	936	'test.txt'
		@@ -949,11 +949,11 @@ discard block
		block discarded – undo
949	949	$this->loginAsUser(self::TEST_VERSIONS_USER);
950	950
951	951	// need to scan for the versions
952		- [$rootStorage,] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER . '/files_versions');
	952	+ [$rootStorage, ] = $this->rootView->resolvePath(self::TEST_VERSIONS_USER.'/files_versions');
953	953	$rootStorage->getScanner()->scan('files_versions');
954	954
955	955	$versions = Storage::getVersions(
956		- self::TEST_VERSIONS_USER, '/' . $path
	956	+ self::TEST_VERSIONS_USER, '/'.$path
957	957	);
958	958
959	959	// note: we cannot predict how many versions are created due to

nextcloud / server

Push — master ( 0c3ebb...258983 )

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +59 added lines, -59 removed lines patch added patch discarded remove patch