nextcloud / server

tests/lib/Encryption/UpdateTest.php

Spacing +4 added lines, -4 removed lines

@@ -87,7 +87,7 @@ 
 	public function testUpdate($path, $isDir, $allFiles, $numberOfFiles): void {
 		$updateMock = $this->getUpdateMock(['getOwnerPath']);
 		$updateMock->expects($this->once())->method('getOwnerPath')
-			->willReturnCallback(fn (OCPFile|Folder $node) => '/user/' . $node->getPath());
+			->willReturnCallback(fn (OCPFile | Folder $node) => '/user/'.$node->getPath());
 
 		$this->encryptionManager->expects($this->once())
 			->method('getEncryptionModule')
@@ -132,7 +132,7 @@ 
 	 * @param string $target
 	 */
 	public function testPostRename($source, $target): void {
-		$updateMock = $this->getUpdateMock(['update','getOwnerPath']);
+		$updateMock = $this->getUpdateMock(['update', 'getOwnerPath']);
 
 		$sourceNode = $this->getFileMock($source, 'user');
 		$targetNode = $this->getFileMock($target, 'user');
@@ -142,7 +142,7 @@ 
 			$updateMock->expects($this->never())->method('update');
 		} else {
 			$updateMock->expects($this->once())->method('update')
-				->willReturnCallback(fn (OCPFile|Folder $node) => $this->assertSame(
+				->willReturnCallback(fn (OCPFile | Folder $node) => $this->assertSame(
 					$target,
 					$node->getPath(),
 					'update needs to be executed for the target destination'
@@ -169,7 +169,7 @@ 
 		$updateMock = $this->getUpdateMock(['update']);
 
 		$updateMock->expects($this->once())->method('update')
-			->willReturnCallback(fn (OCPFile|Folder $node) => $this->assertSame(
+			->willReturnCallback(fn (OCPFile | Folder $node) => $this->assertSame(
 				'/folder/test.txt',
 				$node->getPath(),
 				'update needs to be executed for the target destination'

tests/lib/Files/ViewTest.php

Spacing +90 added lines, -90 removed lines

@@ -143,7 +143,7 @@ 
 		}
 
 		if ($this->tempStorage) {
-			system('rm -rf ' . escapeshellarg($this->tempStorage->getDataDir()));
+			system('rm -rf '.escapeshellarg($this->tempStorage->getDataDir()));
 		}
 
 		self::logout();
@@ -169,11 +169,11 @@ 
 		$storage2 = $this->getTestStorage();
 		$storage3 = $this->getTestStorage();
 		$root = self::getUniqueID('/');
-		Filesystem::mount($storage1, [], $root . '/');
-		Filesystem::mount($storage2, [], $root . '/substorage');
-		Filesystem::mount($storage3, [], $root . '/folder/anotherstorage');
+		Filesystem::mount($storage1, [], $root.'/');
+		Filesystem::mount($storage2, [], $root.'/substorage');
+		Filesystem::mount($storage3, [], $root.'/folder/anotherstorage');
 		$textSize = strlen("dummy file data\n");
-		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo/logo.png');
+		$imageSize = filesize(\OC::$SERVERROOT.'/core/img/logo/logo.png');
 		$storageSize = $textSize * 2 + $imageSize;
 
 		$storageInfo = $storage3->getCache()->get('');
@@ -230,7 +230,7 @@ 
 		$this->assertEquals('foo.png', $folderData[1]['name']);
 		$this->assertEquals('foo.txt', $folderData[2]['name']);
 
-		$folderView = new View($root . '/folder');
+		$folderView = new View($root.'/folder');
 		$this->assertEquals($rootView->getFileInfo('/folder'), $folderView->getFileInfo('/'));
 
 		$cachedData = $rootView->getFileInfo('/foo.txt');
@@ -519,10 +519,10 @@ 
 	}
 
 	public function moveBetweenStorages($storage1, $storage2) {
-		Filesystem::mount($storage1, [], '/' . $this->user . '/');
-		Filesystem::mount($storage2, [], '/' . $this->user . '/substorage');
+		Filesystem::mount($storage1, [], '/'.$this->user.'/');
+		Filesystem::mount($storage2, [], '/'.$this->user.'/substorage');
 
-		$rootView = new View('/' . $this->user);
+		$rootView = new View('/'.$this->user);
 		$rootView->rename('foo.txt', 'substorage/folder/foo.txt');
 		$this->assertFalse($rootView->file_exists('foo.txt'));
 		$this->assertTrue($rootView->file_exists('substorage/folder/foo.txt'));
@@ -646,11 +646,11 @@ 
 		$storage2 = $this->getTestStorage();
 		$defaultRoot = Filesystem::getRoot();
 		Filesystem::mount($storage1, [], '/');
-		Filesystem::mount($storage2, [], $defaultRoot . '/substorage');
+		Filesystem::mount($storage2, [], $defaultRoot.'/substorage');
 		\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
 
 		$rootView = new View('');
-		$subView = new View($defaultRoot . '/substorage');
+		$subView = new View($defaultRoot.'/substorage');
 		$this->hookPath = null;
 
 		$rootView->file_put_contents('/foo.txt', 'asd');
@@ -690,7 +690,7 @@ 
 		 */
 		$storage = new $class([]);
 		$textData = "dummy file data\n";
-		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png');
+		$imgData = file_get_contents(\OC::$SERVERROOT.'/core/img/logo/logo.png');
 		$storage->mkdir('folder');
 		$storage->file_put_contents('foo.txt', $textData);
 		$storage->file_put_contents('foo.png', $imgData);
@@ -712,10 +712,10 @@ 
 		$storage2 = $this->getTestStorage();
 		$defaultRoot = Filesystem::getRoot();
 		Filesystem::mount($storage1, [], '/');
-		Filesystem::mount($storage2, [], $defaultRoot . '_substorage');
+		Filesystem::mount($storage2, [], $defaultRoot.'_substorage');
 		\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
 
-		$subView = new View($defaultRoot . '_substorage');
+		$subView = new View($defaultRoot.'_substorage');
 		$this->hookPath = null;
 
 		$subView->file_put_contents('/foo.txt', 'asd');
@@ -810,7 +810,7 @@ 
 
 		$rootView = new View('');
 		foreach ($names as $name) {
-			$rootView->file_put_contents('/' . $name, 'dummy content');
+			$rootView->file_put_contents('/'.$name, 'dummy content');
 		}
 
 		$list = $rootView->getDirectoryContent('/');
@@ -852,15 +852,15 @@ 
 			$depth = ((4000 - $tmpdirLength) / 57);
 		}
 		foreach (range(0, $depth - 1) as $i) {
-			$longPath .= $ds . $folderName;
+			$longPath .= $ds.$folderName;
 			$result = $rootView->mkdir($longPath);
-			$this->assertTrue($result, "mkdir failed on $i - path length: " . strlen($longPath));
+			$this->assertTrue($result, "mkdir failed on $i - path length: ".strlen($longPath));
 
-			$result = $rootView->file_put_contents($longPath . "{$ds}test.txt", 'lorem');
+			$result = $rootView->file_put_contents($longPath."{$ds}test.txt", 'lorem');
 			$this->assertEquals(5, $result, "file_put_contents failed on $i");
 
 			$this->assertTrue($rootView->file_exists($longPath));
-			$this->assertTrue($rootView->file_exists($longPath . "{$ds}test.txt"));
+			$this->assertTrue($rootView->file_exists($longPath."{$ds}test.txt"));
 		}
 
 		$cache = $storage->getCache();
@@ -873,11 +873,11 @@ 
 			$this->assertTrue(is_array($cachedFolder), "No cache entry for folder at $i");
 			$this->assertEquals($folderName, $cachedFolder['name'], "Wrong cache entry for folder at $i");
 
-			$cachedFile = $cache->get($longPath . '/test.txt');
+			$cachedFile = $cache->get($longPath.'/test.txt');
 			$this->assertTrue(is_array($cachedFile), "No cache entry for file at $i");
 			$this->assertEquals('test.txt', $cachedFile['name'], "Wrong cache entry for file at $i");
 
-			$longPath .= $ds . $folderName;
+			$longPath .= $ds.$folderName;
 		}
 	}
 
@@ -1090,7 +1090,7 @@ 
 		$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
 		$depth = (4000 / 57);
 		foreach (range(0, $depth + 1) as $i) {
-			$longPath .= '/' . $folderName;
+			$longPath .= '/'.$folderName;
 		}
 
 		$storage = new Temporary([]);
@@ -1340,8 +1340,8 @@ 
 		$view = new View($rootPath);
 		$storage = new Temporary([]);
 		Filesystem::mount($storage, [], '/');
-		$this->assertTrue($view->lockFile($pathPrefix . '/foo/bar', ILockingProvider::LOCK_EXCLUSIVE));
-		$view->lockFile($pathPrefix . '/foo/bar/asd', ILockingProvider::LOCK_SHARED);
+		$this->assertTrue($view->lockFile($pathPrefix.'/foo/bar', ILockingProvider::LOCK_EXCLUSIVE));
+		$view->lockFile($pathPrefix.'/foo/bar/asd', ILockingProvider::LOCK_SHARED);
 	}
 
 	/**
@@ -1359,8 +1359,8 @@ 
 		$view = new View($rootPath);
 		$storage = new Temporary([]);
 		Filesystem::mount($storage, [], '/');
-		$this->assertFalse($view->lockFile($pathPrefix . '/foo/bar', ILockingProvider::LOCK_EXCLUSIVE));
-		$this->assertFalse($view->lockFile($pathPrefix . '/foo/bar/asd', ILockingProvider::LOCK_SHARED));
+		$this->assertFalse($view->lockFile($pathPrefix.'/foo/bar', ILockingProvider::LOCK_EXCLUSIVE));
+		$this->assertFalse($view->lockFile($pathPrefix.'/foo/bar/asd', ILockingProvider::LOCK_SHARED));
 	}
 
 	/**
@@ -1381,8 +1381,8 @@ 
 		$view = new View($rootPath);
 		$storage = new Temporary([]);
 		Filesystem::mount($storage, [], '/');
-		$this->assertTrue($view->lockFile($pathPrefix . '/foo/bar', ILockingProvider::LOCK_SHARED));
-		$view->lockFile($pathPrefix . '/foo/bar', ILockingProvider::LOCK_EXCLUSIVE);
+		$this->assertTrue($view->lockFile($pathPrefix.'/foo/bar', ILockingProvider::LOCK_SHARED));
+		$view->lockFile($pathPrefix.'/foo/bar', ILockingProvider::LOCK_EXCLUSIVE);
 	}
 
 	/**
@@ -1400,8 +1400,8 @@ 
 		$view = new View($rootPath);
 		$storage = new Temporary([]);
 		Filesystem::mount($storage, [], '/');
-		$this->assertFalse($view->lockFile($pathPrefix . '/foo/bar', ILockingProvider::LOCK_SHARED));
-		$this->assertFalse($view->lockFile($pathPrefix . '/foo/bar', ILockingProvider::LOCK_EXCLUSIVE));
+		$this->assertFalse($view->lockFile($pathPrefix.'/foo/bar', ILockingProvider::LOCK_SHARED));
+		$this->assertFalse($view->lockFile($pathPrefix.'/foo/bar', ILockingProvider::LOCK_EXCLUSIVE));
 	}
 
 	/**
@@ -1610,7 +1610,7 @@ 
 				->onlyMethods([])
 				->getMock();
 			$storage->method('getId')->willReturn('non-null-id');
-			$storage->method('getStorageCache')->willReturnCallback(function () use ($storage) {
+			$storage->method('getStorageCache')->willReturnCallback(function() use ($storage) {
 				return new \OC\Files\Cache\Storage($storage, true, \OC::$server->get(IDBConnection::class));
 			});
 
@@ -1639,8 +1639,8 @@ 
 		self::loginAsUser($this->user);
 
 		[$mount1, $mount2] = $this->createTestMovableMountPoints([
-			$this->user . '/files/mount1',
-			$this->user . '/files/mount2',
+			$this->user.'/files/mount1',
+			$this->user.'/files/mount2',
 		]);
 		$mount1->expects($this->once())
 			->method('moveMount')
@@ -1650,7 +1650,7 @@ 
 			->method('moveMount')
 			->willReturn(true);
 
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 		$view->mkdir('sub');
 
 		$this->assertTrue($view->rename('mount1', 'renamed_mount'), 'Can rename mount point');
@@ -1661,8 +1661,8 @@ 
 		self::loginAsUser($this->user);
 
 		[$mount1, $mount2] = $this->createTestMovableMountPoints([
-			$this->user . '/files/mount1',
-			$this->user . '/files/mount2',
+			$this->user.'/files/mount1',
+			$this->user.'/files/mount2',
 		]);
 
 		$mount1->expects($this->never())
@@ -1671,7 +1671,7 @@ 
 		$mount2->expects($this->never())
 			->method('moveMount');
 
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		$this->expectException(ForbiddenException::class);
 		$view->rename('mount1', 'mount2');
@@ -1681,8 +1681,8 @@ 
 		self::loginAsUser($this->user);
 
 		[$mount1, $mount2] = $this->createTestMovableMountPoints([
-			$this->user . '/files/mount1',
-			$this->user . '/files/mount2',
+			$this->user.'/files/mount1',
+			$this->user.'/files/mount2',
 		]);
 
 		$mount1->expects($this->never())
@@ -1691,7 +1691,7 @@ 
 		$mount2->expects($this->never())
 			->method('moveMount');
 
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		$this->expectException(ForbiddenException::class);
 		$view->rename('mount1', 'mount2/sub');
@@ -1704,8 +1704,8 @@ 
 		self::loginAsUser($this->user);
 
 		[$mount1, $mount2] = $this->createTestMovableMountPoints([
-			$this->user . '/files/mount1',
-			$this->user . '/files/mount2',
+			$this->user.'/files/mount1',
+			$this->user.'/files/mount2',
 		]);
 
 		$mount1->expects($this->never())
@@ -1715,7 +1715,7 @@ 
 			->method('moveMount')
 			->willReturn(true);
 
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 		$view->mkdir('shareddir');
 		$view->mkdir('shareddir/sub');
 		$view->mkdir('shareddir/sub2');
@@ -1941,7 +1941,7 @@ 
 		$expectedStrayLock = null,
 		$returnValue = true,
 	): void {
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		/** @var Temporary&MockObject $storage */
 		$storage = $this->getMockBuilder(Temporary::class)
@@ -1953,19 +1953,19 @@ 
 		/* Same thing with encryption wrapper */
 		Server::get(IStorageFactory::class)->removeStorageWrapper('oc_encryption');
 
-		Filesystem::mount($storage, [], $this->user . '/');
+		Filesystem::mount($storage, [], $this->user.'/');
 
 		// work directly on disk because mkdir might be mocked
 		$realPath = $storage->getSourcePath('');
-		mkdir($realPath . '/files');
-		mkdir($realPath . '/files/dir');
-		file_put_contents($realPath . '/files/test.txt', 'blah');
+		mkdir($realPath.'/files');
+		mkdir($realPath.'/files/dir');
+		file_put_contents($realPath.'/files/test.txt', 'blah');
 		$storage->getScanner()->scan('files');
 
 		$storage->expects($this->once())
 			->method($operation)
 			->willReturnCallback(
-				function () use ($view, $lockedPath, &$lockTypeDuring, $returnValue) {
+				function() use ($view, $lockedPath, &$lockTypeDuring, $returnValue) {
 					$lockTypeDuring = $this->getFileLockType($view, $lockedPath);
 
 					return $returnValue;
@@ -1998,7 +1998,7 @@ 
 	 * This code path uses $storage->fopen instead
 	 */
 	public function testLockFilePutContentWithStream(): void {
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		$path = 'test_file_put_contents.txt';
 		/** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */
@@ -2006,13 +2006,13 @@ 
 			->onlyMethods(['fopen'])
 			->getMock();
 
-		Filesystem::mount($storage, [], $this->user . '/');
+		Filesystem::mount($storage, [], $this->user.'/');
 		$storage->mkdir('files');
 
 		$storage->expects($this->once())
 			->method('fopen')
 			->willReturnCallback(
-				function () use ($view, $path, &$lockTypeDuring) {
+				function() use ($view, $path, &$lockTypeDuring) {
 					$lockTypeDuring = $this->getFileLockType($view, $path);
 
 					return fopen('php://temp', 'r+');
@@ -2037,7 +2037,7 @@ 
 	 * Test locks for fopen with fclose at the end
 	 */
 	public function testLockFopen(): void {
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		$path = 'test_file_put_contents.txt';
 		/** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */
@@ -2045,13 +2045,13 @@ 
 			->onlyMethods(['fopen'])
 			->getMock();
 
-		Filesystem::mount($storage, [], $this->user . '/');
+		Filesystem::mount($storage, [], $this->user.'/');
 		$storage->mkdir('files');
 
 		$storage->expects($this->once())
 			->method('fopen')
 			->willReturnCallback(
-				function () use ($view, $path, &$lockTypeDuring) {
+				function() use ($view, $path, &$lockTypeDuring) {
 					$lockTypeDuring = $this->getFileLockType($view, $path);
 
 					return fopen('php://temp', 'r+');
@@ -2093,7 +2093,7 @@ 
 		if ($operation === 'touch') {
 			$this->markTestSkipped('touch handles storage exceptions internally');
 		}
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		/** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */
 		$storage = $this->getMockBuilder(Temporary::class)
@@ -2105,19 +2105,19 @@ 
 		/* Same thing with encryption wrapper */
 		Server::get(IStorageFactory::class)->removeStorageWrapper('oc_encryption');
 
-		Filesystem::mount($storage, [], $this->user . '/');
+		Filesystem::mount($storage, [], $this->user.'/');
 
 		// work directly on disk because mkdir might be mocked
 		$realPath = $storage->getSourcePath('');
-		mkdir($realPath . '/files');
-		mkdir($realPath . '/files/dir');
-		file_put_contents($realPath . '/files/test.txt', 'blah');
+		mkdir($realPath.'/files');
+		mkdir($realPath.'/files/dir');
+		file_put_contents($realPath.'/files/test.txt', 'blah');
 		$storage->getScanner()->scan('files');
 
 		$storage->expects($this->once())
 			->method($operation)
 			->willReturnCallback(
-				function () {
+				function() {
 					throw new \Exception('Simulated exception');
 				}
 			);
@@ -2137,11 +2137,11 @@ 
 	}
 
 	public function testLockBasicOperationUnlocksAfterLockException(): void {
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		$storage = new Temporary([]);
 
-		Filesystem::mount($storage, [], $this->user . '/');
+		Filesystem::mount($storage, [], $this->user.'/');
 
 		$storage->mkdir('files');
 		$storage->mkdir('files/dir');
@@ -2183,14 +2183,14 @@ 
 		$path,
 		$hookType,
 	): void {
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		/** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */
 		$storage = $this->getMockBuilder(Temporary::class)
 			->onlyMethods([$operation])
 			->getMock();
 
-		Filesystem::mount($storage, [], $this->user . '/');
+		Filesystem::mount($storage, [], $this->user.'/');
 		$storage->mkdir('files');
 
 		Util::connectHook(
@@ -2222,7 +2222,7 @@ 
 	 *                                          the operation
 	 */
 	public function testLockFileRename($operation, $expectedLockTypeSourceDuring): void {
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		/** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */
 		$storage = $this->getMockBuilder(Temporary::class)
@@ -2248,14 +2248,14 @@ 
 		/* Disable encryption wrapper to avoid it intercepting mocked call */
 		Server::get(IStorageFactory::class)->removeStorageWrapper('oc_encryption');
 
-		Filesystem::mount($storage, [], $this->user . '/');
+		Filesystem::mount($storage, [], $this->user.'/');
 		$storage->mkdir('files');
 		$view->file_put_contents($sourcePath, 'meh');
 
 		$storage->expects($this->once())
 			->method($operation)
 			->willReturnCallback(
-				function () use ($view, $sourcePath, $targetPath, &$lockTypeSourceDuring, &$lockTypeTargetDuring) {
+				function() use ($view, $sourcePath, $targetPath, &$lockTypeSourceDuring, &$lockTypeTargetDuring) {
 					$lockTypeSourceDuring = $this->getFileLockType($view, $sourcePath);
 					$lockTypeTargetDuring = $this->getFileLockType($view, $targetPath);
 
@@ -2291,7 +2291,7 @@ 
 	public function testLockFileCopyException(): void {
 		$this->expectException(\Exception::class);
 
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		/** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */
 		$storage = $this->getMockBuilder(Temporary::class)
@@ -2304,14 +2304,14 @@ 
 		/* Disable encryption wrapper to avoid it intercepting mocked call */
 		Server::get(IStorageFactory::class)->removeStorageWrapper('oc_encryption');
 
-		Filesystem::mount($storage, [], $this->user . '/');
+		Filesystem::mount($storage, [], $this->user.'/');
 		$storage->mkdir('files');
 		$view->file_put_contents($sourcePath, 'meh');
 
 		$storage->expects($this->once())
 			->method('copy')
 			->willReturnCallback(
-				function () {
+				function() {
 					throw new \Exception();
 				}
 			);
@@ -2337,7 +2337,7 @@ 
 	public function testLockFileRenameUnlockOnException(): void {
 		self::loginAsUser('test');
 
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		$sourcePath = 'original.txt';
 		$targetPath = 'target.txt';
@@ -2378,7 +2378,7 @@ 
 		$this->assertEquals('test', $view->getFileInfo($path)->getOwner()->getUID());
 
 		$folderInfo = $view->getDirectoryContent('');
-		$folderInfo = array_values(array_filter($folderInfo, function (FileInfo $info) {
+		$folderInfo = array_values(array_filter($folderInfo, function(FileInfo $info) {
 			return $info->getName() === 'foo.txt';
 		}));
 
@@ -2388,7 +2388,7 @@ 
 		Filesystem::mount($subStorage, [], '/test/files/asd');
 
 		$folderInfo = $view->getDirectoryContent('');
-		$folderInfo = array_values(array_filter($folderInfo, function (FileInfo $info) {
+		$folderInfo = array_values(array_filter($folderInfo, function(FileInfo $info) {
 			return $info->getName() === 'asd';
 		}));
 
@@ -2413,7 +2413,7 @@ 
 	 *                                          the operation
 	 */
 	public function testLockFileRenameCrossStorage($viewOperation, $storageOperation, $expectedLockTypeSourceDuring): void {
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 
 		/** @var Temporary|\PHPUnit\Framework\MockObject\MockObject $storage */
 		$storage = $this->getMockBuilder(Temporary::class)
@@ -2443,8 +2443,8 @@ 
 		/* Disable encryption wrapper to avoid it intercepting mocked call */
 		Server::get(IStorageFactory::class)->removeStorageWrapper('oc_encryption');
 
-		Filesystem::mount($storage, [], $this->user . '/');
-		Filesystem::mount($storage2, [], $this->user . '/files/substorage');
+		Filesystem::mount($storage, [], $this->user.'/');
+		Filesystem::mount($storage2, [], $this->user.'/files/substorage');
 		$storage->mkdir('files');
 		$view->file_put_contents($sourcePath, 'meh');
 		$storage2->getUpdater()->update('');
@@ -2454,7 +2454,7 @@ 
 		$storage2->expects($this->once())
 			->method($storageOperation)
 			->willReturnCallback(
-				function () use ($view, $sourcePath, $targetPath, &$lockTypeSourceDuring, &$lockTypeTargetDuring) {
+				function() use ($view, $sourcePath, $targetPath, &$lockTypeSourceDuring, &$lockTypeTargetDuring) {
 					$lockTypeSourceDuring = $this->getFileLockType($view, $sourcePath);
 					$lockTypeTargetDuring = $this->getFileLockType($view, $targetPath);
 
@@ -2489,10 +2489,10 @@ 
 		self::loginAsUser('test');
 
 		[$mount] = $this->createTestMovableMountPoints([
-			$this->user . '/files/substorage',
+			$this->user.'/files/substorage',
 		]);
 
-		$view = new View('/' . $this->user . '/files/');
+		$view = new View('/'.$this->user.'/files/');
 		$view->mkdir('subdir');
 
 		$sourcePath = 'substorage';
@@ -2501,7 +2501,7 @@ 
 		$mount->expects($this->once())
 			->method('moveMount')
 			->willReturnCallback(
-				function ($target) use ($mount, $view, $sourcePath, $targetPath, &$lockTypeSourceDuring, &$lockTypeTargetDuring, &$lockTypeSharedRootDuring) {
+				function($target) use ($mount, $view, $sourcePath, $targetPath, &$lockTypeSourceDuring, &$lockTypeTargetDuring, &$lockTypeSharedRootDuring) {
 					$lockTypeSourceDuring = $this->getFileLockType($view, $sourcePath, true);
 					$lockTypeTargetDuring = $this->getFileLockType($view, $targetPath, true);
 
@@ -2566,14 +2566,14 @@ 
 		$eventHandler->expects($this->any())
 			->method('preCallback')
 			->willReturnCallback(
-				function () use ($view, $path, $onMountPoint, &$lockTypePre) {
+				function() use ($view, $path, $onMountPoint, &$lockTypePre) {
 					$lockTypePre = $this->getFileLockType($view, $path, $onMountPoint);
 				}
 			);
 		$eventHandler->expects($this->any())
 			->method('postCallback')
 			->willReturnCallback(
-				function () use ($view, $path, $onMountPoint, &$lockTypePost) {
+				function() use ($view, $path, $onMountPoint, &$lockTypePost) {
 					$lockTypePost = $this->getFileLockType($view, $path, $onMountPoint);
 				}
 			);
@@ -2587,7 +2587,7 @@ 
 			);
 			Util::connectHook(
 				Filesystem::CLASSNAME,
-				'post_' . $hookType,
+				'post_'.$hookType,
 				$eventHandler,
 				'postCallback'
 			);
@@ -2615,7 +2615,7 @@ 
 
 
 	public function testRemoveMoveableMountPoint(): void {
-		$mountPoint = '/' . $this->user . '/files/mount/';
+		$mountPoint = '/'.$this->user.'/files/mount/';
 
 		// Mock the mount point
 		/** @var TestMoveableMountPoint|\PHPUnit\Framework\MockObject\MockObject $mount */
@@ -2657,7 +2657,7 @@ 
 		);
 
 		//Delete the mountpoint
-		$view = new View('/' . $this->user . '/files');
+		$view = new View('/'.$this->user.'/files');
 		$this->assertEquals('foo', $view->rmdir('mount'));
 	}
 
@@ -2678,7 +2678,7 @@ 
 	public function testGetDirectoryContentMimeFilter($filter, $expected): void {
 		$storage1 = new Temporary();
 		$root = self::getUniqueID('/');
-		Filesystem::mount($storage1, [], $root . '/');
+		Filesystem::mount($storage1, [], $root.'/');
 		$view = new View($root);
 
 		$view->file_put_contents('test1.txt', 'asd');
@@ -2688,7 +2688,7 @@ 
 
 		$content = $view->getDirectoryContent('', $filter);
 
-		$files = array_map(function (FileInfo $info) {
+		$files = array_map(function(FileInfo $info) {
 			return $info->getName();
 		}, $content);
 		sort($files);
@@ -2794,7 +2794,7 @@ 
 		$calls = ['/new/folder', '/new/folder/structure'];
 		$view->expects($this->exactly(2))
 			->method('mkdir')
-			->willReturnCallback(function ($dir) use (&$calls) {
+			->willReturnCallback(function($dir) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, $dir);
 			});
@@ -2891,7 +2891,7 @@ 
 	}
 
 	public function testCopyPreservesContent() {
-		$viewUser1 = new View('/' . 'userId' . '/files');
+		$viewUser1 = new View('/'.'userId'.'/files');
 		$viewUser1->mkdir('');
 		$viewUser1->file_put_contents('foo.txt', 'foo');
 		$viewUser1->copy('foo.txt', 'bar.txt');

apps/files_trashbin/tests/TrashbinTest.php

Spacing +27 added lines, -27 removed lines

@@ -122,7 +122,7 @@ 
 			->getMock();
 		$mockConfig->expects($this->any())
 			->method('getSystemValue')
-			->willReturnCallback(static function ($key, $default) use ($config) {
+			->willReturnCallback(static function($key, $default) use ($config) {
 				if ($key === 'filesystem_check_changes') {
 					return Watcher::CHECK_ONCE;
 				} else {
@@ -131,8 +131,8 @@ 
 			});
 		$this->overwriteService(AllConfig::class, $mockConfig);
 
-		$this->trashRoot1 = '/' . self::TEST_TRASHBIN_USER1 . '/files_trashbin';
-		$this->trashRoot2 = '/' . self::TEST_TRASHBIN_USER2 . '/files_trashbin';
+		$this->trashRoot1 = '/'.self::TEST_TRASHBIN_USER1.'/files_trashbin';
+		$this->trashRoot2 = '/'.self::TEST_TRASHBIN_USER2.'/files_trashbin';
 		$this->rootView = new View();
 		self::loginHelper(self::TEST_TRASHBIN_USER1);
 	}
@@ -142,8 +142,8 @@ 
 		// disable trashbin to be able to properly clean up
 		Server::get(IAppManager::class)->disableApp('files_trashbin');
 
-		$this->rootView->deleteAll('/' . self::TEST_TRASHBIN_USER1 . '/files');
-		$this->rootView->deleteAll('/' . self::TEST_TRASHBIN_USER2 . '/files');
+		$this->rootView->deleteAll('/'.self::TEST_TRASHBIN_USER1.'/files');
+		$this->rootView->deleteAll('/'.self::TEST_TRASHBIN_USER2.'/files');
 		$this->rootView->deleteAll($this->trashRoot1);
 		$this->rootView->deleteAll($this->trashRoot2);
 
@@ -211,15 +211,15 @@ 
 	 */
 	public function testExpireOldFilesShared(): void {
 		$currentTime = time();
-		$folder = 'trashTest-' . $currentTime . '/';
+		$folder = 'trashTest-'.$currentTime.'/';
 		$expiredDate = $currentTime - 3 * 24 * 60 * 60;
 
 		// create some files
 		Filesystem::mkdir($folder);
-		Filesystem::file_put_contents($folder . 'user1-1.txt', 'file1');
-		Filesystem::file_put_contents($folder . 'user1-2.txt', 'file2');
-		Filesystem::file_put_contents($folder . 'user1-3.txt', 'file3');
-		Filesystem::file_put_contents($folder . 'user1-4.txt', 'file4');
+		Filesystem::file_put_contents($folder.'user1-1.txt', 'file1');
+		Filesystem::file_put_contents($folder.'user1-2.txt', 'file2');
+		Filesystem::file_put_contents($folder.'user1-3.txt', 'file3');
+		Filesystem::file_put_contents($folder.'user1-4.txt', 'file4');
 
 		//share user1-4.txt with user2
 		$node = \OC::$server->getUserFolder(self::TEST_TRASHBIN_USER1)->get($folder);
@@ -233,9 +233,9 @@ 
 		Server::get(\OCP\Share\IManager::class)->acceptShare($share, self::TEST_TRASHBIN_USER2);
 
 		// delete them so that they end up in the trash bin
-		Filesystem::unlink($folder . 'user1-1.txt');
-		Filesystem::unlink($folder . 'user1-2.txt');
-		Filesystem::unlink($folder . 'user1-3.txt');
+		Filesystem::unlink($folder.'user1-1.txt');
+		Filesystem::unlink($folder.'user1-2.txt');
+		Filesystem::unlink($folder.'user1-3.txt');
 
 		$filesInTrash = Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1, 'name');
 		$this->assertSame(3, count($filesInTrash));
@@ -246,7 +246,7 @@ 
 		// login as user2
 		self::loginHelper(self::TEST_TRASHBIN_USER2);
 
-		$this->assertTrue(Filesystem::file_exists($folder . 'user1-4.txt'));
+		$this->assertTrue(Filesystem::file_exists($folder.'user1-4.txt'));
 
 		// create some files
 		Filesystem::file_put_contents('user2-1.txt', 'file1');
@@ -262,7 +262,7 @@ 
 		// every second file will get a date in the past so that it will get expired
 		$this->manipulateDeleteTime($filesInTrashUser2, $this->trashRoot2, $expiredDate);
 
-		Filesystem::unlink($folder . 'user1-4.txt');
+		Filesystem::unlink($folder.'user1-4.txt');
 
 		$this->runCommands();
 
@@ -297,7 +297,7 @@ 
 			}
 			if (!$found) {
 				// if we didn't found the expected file, something went wrong
-				$this->assertTrue(false, "can't find expected file '" . $expectedFile . "' in trash bin");
+				$this->assertTrue(false, "can't find expected file '".$expectedFile."' in trash bin");
 			}
 		}
 	}
@@ -313,8 +313,8 @@ 
 			// modify every second file
 			$counter = ($counter + 1) % 2;
 			if ($counter === 1) {
-				$source = $trashRoot . '/files/' . $file['name'] . '.d' . $file['mtime'];
-				$target = Filesystem::normalizePath($trashRoot . '/files/' . $file['name'] . '.d' . $expireDate);
+				$source = $trashRoot.'/files/'.$file['name'].'.d'.$file['mtime'];
+				$target = Filesystem::normalizePath($trashRoot.'/files/'.$file['name'].'.d'.$expireDate);
 				$this->rootView->rename($source, $target);
 				$file['mtime'] = $expireDate;
 			}
@@ -379,7 +379,7 @@ 
 
 		$this->assertTrue(
 			Trashbin::restore(
-				'file1.txt.d' . $trashedFile->getMtime(),
+				'file1.txt.d'.$trashedFile->getMtime(),
 				$trashedFile->getName(),
 				$trashedFile->getMtime()
 			)
@@ -412,7 +412,7 @@ 
 
 		$this->assertTrue(
 			Trashbin::restore(
-				'file1.txt.d' . $trashedFile->getMtime(),
+				'file1.txt.d'.$trashedFile->getMtime(),
 				$trashedFile->getName(),
 				$trashedFile->getMtime()
 			)
@@ -445,7 +445,7 @@ 
 
 		$this->assertTrue(
 			Trashbin::restore(
-				'folder.d' . $trashedFolder->getMtime(),
+				'folder.d'.$trashedFolder->getMtime(),
 				$trashedFolder->getName(),
 				$trashedFolder->getMtime()
 			)
@@ -478,7 +478,7 @@ 
 
 		$this->assertTrue(
 			Trashbin::restore(
-				'folder.d' . $trashedFile->getMtime() . '/file1.txt',
+				'folder.d'.$trashedFile->getMtime().'/file1.txt',
 				'file1.txt',
 				$trashedFile->getMtime()
 			)
@@ -515,7 +515,7 @@ 
 
 		$this->assertTrue(
 			Trashbin::restore(
-				'file1.txt.d' . $trashedFile->getMtime(),
+				'file1.txt.d'.$trashedFile->getMtime(),
 				$trashedFile->getName(),
 				$trashedFile->getMtime()
 			)
@@ -552,7 +552,7 @@ 
 
 		$this->assertTrue(
 			Trashbin::restore(
-				'file1.txt.d' . $trashedFile->getMtime(),
+				'file1.txt.d'.$trashedFile->getMtime(),
 				$trashedFile->getName(),
 				$trashedFile->getMtime()
 			)
@@ -593,7 +593,7 @@ 
 
 		$this->assertTrue(
 			Trashbin::restore(
-				'file1.txt.d' . $trashedFile->getMtime(),
+				'file1.txt.d'.$trashedFile->getMtime(),
 				$trashedFile->getName(),
 				$trashedFile->getMtime()
 			)
@@ -642,7 +642,7 @@ 
 		$trashedFile = $filesInTrash[0];
 
 		// delete source folder
-		[$storage, $internalPath] = $this->rootView->resolvePath('/' . self::TEST_TRASHBIN_USER1 . '/files/folder');
+		[$storage, $internalPath] = $this->rootView->resolvePath('/'.self::TEST_TRASHBIN_USER1.'/files/folder');
 		if ($storage instanceof Local) {
 			$folderAbsPath = $storage->getSourcePath($internalPath);
 			// make folder read-only
@@ -650,7 +650,7 @@ 
 
 			$this->assertTrue(
 				Trashbin::restore(
-					'file1.txt.d' . $trashedFile->getMtime(),
+					'file1.txt.d'.$trashedFile->getMtime(),
 					$trashedFile->getName(),
 					$trashedFile->getMtime()
 				)

apps/admin_audit/lib/Actions/Files.php

Spacing +12 added lines, -12 removed lines

@@ -35,9 +35,9 @@ 
 				'id' => $node instanceof NonExistingFile ? null : $node->getId(),
 				'path' => $node->getPath(),
 			];
-		} catch (InvalidPathException|NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			Server::get(LoggerInterface::class)->error(
-				'Exception thrown in file read: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
+				'Exception thrown in file read: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
 			);
 			return;
 		}
@@ -60,9 +60,9 @@ 
 				'oldpath' => $source->getPath(),
 				'newpath' => $target->getPath(),
 			];
-		} catch (InvalidPathException|NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			Server::get(LoggerInterface::class)->error(
-				'Exception thrown in file rename: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
+				'Exception thrown in file rename: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
 			);
 			return;
 		}
@@ -84,9 +84,9 @@ 
 				'id' => $event->getNode()->getId(),
 				'path' => $event->getNode()->getPath(),
 			];
-		} catch (InvalidPathException|NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			Server::get(LoggerInterface::class)->error(
-				'Exception thrown in file create: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
+				'Exception thrown in file create: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
 			);
 			return;
 		}
@@ -111,9 +111,9 @@ 
 				'oldpath' => $event->getSource()->getPath(),
 				'newpath' => $event->getTarget()->getPath(),
 			];
-		} catch (InvalidPathException|NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			Server::get(LoggerInterface::class)->error(
-				'Exception thrown in file copy: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
+				'Exception thrown in file copy: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
 			);
 			return;
 		}
@@ -134,9 +134,9 @@ 
 				'id' => $node->getId(),
 				'path' => $node->getPath(),
 			];
-		} catch (InvalidPathException|NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			Server::get(LoggerInterface::class)->error(
-				'Exception thrown in file write: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
+				'Exception thrown in file write: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
 			);
 			return;
 		}
@@ -160,9 +160,9 @@ 
 				'id' => $event->getNode()->getId(),
 				'path' => $event->getNode()->getPath(),
 			];
-		} catch (InvalidPathException|NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			Server::get(LoggerInterface::class)->error(
-				'Exception thrown in file delete: ' . $e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
+				'Exception thrown in file delete: '.$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e]
 			);
 			return;
 		}

apps/admin_audit/lib/AppInfo/Application.php

Spacing +8 added lines, -8 removed lines

@@ -77,7 +77,7 @@ 
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerService(IAuditLogger::class, function (ContainerInterface $c) {
+		$context->registerService(IAuditLogger::class, function(ContainerInterface $c) {
 			return new AuditLogger($c->get(ILogFactory::class), $c->get(IConfig::class));
 		});
 
@@ -160,7 +160,7 @@ 
 
 	private function tagHooks(IAuditLogger $logger,
 		IEventDispatcher $eventDispatcher): void {
-		$eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, function (ManagerEvent $event) use ($logger): void {
+		$eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, function(ManagerEvent $event) use ($logger): void {
 			$tagActions = new TagManagement($logger);
 			$tagActions->createTag($event->getTag());
 		});
@@ -171,42 +171,42 @@ 
 
 		$eventDispatcher->addListener(
 			NodeRenamedEvent::class,
-			function (NodeRenamedEvent $event) use ($fileActions): void {
+			function(NodeRenamedEvent $event) use ($fileActions): void {
 				$fileActions->afterRename($event);
 			}
 		);
 
 		$eventDispatcher->addListener(
 			NodeCreatedEvent::class,
-			function (NodeCreatedEvent $event) use ($fileActions): void {
+			function(NodeCreatedEvent $event) use ($fileActions): void {
 				$fileActions->create($event);
 			}
 		);
 
 		$eventDispatcher->addListener(
 			NodeCopiedEvent::class,
-			function (NodeCopiedEvent $event) use ($fileActions): void {
+			function(NodeCopiedEvent $event) use ($fileActions): void {
 				$fileActions->copy($event);
 			}
 		);
 
 		$eventDispatcher->addListener(
 			NodeWrittenEvent::class,
-			function (NodeWrittenEvent $event) use ($fileActions): void {
+			function(NodeWrittenEvent $event) use ($fileActions): void {
 				$fileActions->write($event);
 			}
 		);
 
 		$eventDispatcher->addListener(
 			BeforeNodeReadEvent::class,
-			function (BeforeNodeReadEvent $event) use ($fileActions): void {
+			function(BeforeNodeReadEvent $event) use ($fileActions): void {
 				$fileActions->read($event);
 			}
 		);
 
 		$eventDispatcher->addListener(
 			BeforeNodeDeletedEvent::class,
-			function (BeforeNodeDeletedEvent $event) use ($fileActions): void {
+			function(BeforeNodeDeletedEvent $event) use ($fileActions): void {
 				$fileActions->delete($event);
 			}
 		);

apps/files_versions/tests/VersioningTest.php

Spacing +59 added lines, -59 removed lines

@@ -89,7 +89,7 @@ 
 			->getMock();
 		$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 {
@@ -124,10 +124,10 @@ 
 		$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();
@@ -295,10 +295,10 @@ 
 		$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');
@@ -325,12 +325,12 @@ 
 		// 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');
@@ -376,11 +376,11 @@ 
 		$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');
@@ -413,7 +413,7 @@ 
 		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();
@@ -423,8 +423,8 @@ 
 
 		$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');
@@ -438,10 +438,10 @@ 
 
 		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));
@@ -463,7 +463,7 @@ 
 		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');
 
@@ -473,10 +473,10 @@ 
 		$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');
@@ -489,10 +489,10 @@ 
 
 		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));
@@ -510,11 +510,11 @@ 
 
 		$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');
@@ -558,10 +558,10 @@ 
 		$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');
@@ -589,10 +589,10 @@ 
 		$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');
@@ -608,7 +608,7 @@ 
 		}
 
 		//cleanup
-		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
+		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT.'/subfolder');
 	}
 
 	/**
@@ -651,7 +651,7 @@ 
 
 	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();
 	}
@@ -750,7 +750,7 @@ 
 		$eventHandler->expects($this->any())
 			->method('callback')
 			->willReturnCallback(
-				function ($p) use (&$params): void {
+				function($p) use (&$params): void {
 					$params = $p;
 				}
 			);
@@ -764,7 +764,7 @@ 
 	}
 
 	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);
@@ -776,10 +776,10 @@ 
 		$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);
@@ -812,7 +812,7 @@ 
 
 		$eventDispatcher = Server::get(IEventDispatcher::class);
 		$eventFired = false;
-		$eventDispatcher->addListener(VersionRestoredEvent::class, function ($event) use (&$eventFired, $t2): void {
+		$eventDispatcher->addListener(VersionRestoredEvent::class, function($event) use (&$eventFired, $t2): void {
 			$eventFired = true;
 			$this->assertEquals('/sub/test.txt', $event->getVersion()->getVersionPath());
 			$this->assertTrue($event->getVersion()->getRevisionId() > 0);
@@ -820,7 +820,7 @@ 
 
 		$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)));
@@ -851,7 +851,7 @@ 
 		);
 
 		$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(
@@ -866,15 +866,15 @@ 
 		$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'
 		);
 	}
@@ -934,7 +934,7 @@ 
 		// 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'
@@ -953,11 +953,11 @@ 
 		$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

apps/files_sharing/tests/TestCase.php

Spacing +2 added lines, -2 removed lines

@@ -111,8 +111,8 @@
 		$this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
 		$this->data = 'foobar';
-		$this->view = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
-		$this->view2 = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
+		$this->view = new View('/'.self::TEST_FILES_SHARING_API_USER1.'/files');
+		$this->view2 = new View('/'.self::TEST_FILES_SHARING_API_USER2.'/files');
 
 		$this->shareManager = Server::get(\OCP\Share\IManager::class);
 		$this->rootFolder = Server::get(IRootFolder::class);

apps/files_sharing/tests/EncryptedSizePropagationTest.php

Spacing +2 added lines, -2 removed lines

@@ -25,10 +25,10 @@
 	protected function setupUser($name, $password = '') {
 		$this->createUser($name, $password);
 		$tmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
-		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+		$this->registerMount($name, '\OC\Files\Storage\Local', '/'.$name, ['datadir' => $tmpFolder]);
 		$this->setupForUser($name, $password);
 		$this->loginWithEncryption($name);
-		return new View('/' . $name . '/files');
+		return new View('/'.$name.'/files');
 	}
 
 	protected function loginHelper($user, $create = false, $password = false) {

lib/private/Encryption/Update.php

Spacing +11 added lines, -11 removed lines

@@ -34,14 +34,14 @@ 
 	/**
 	 * hook after file was shared
 	 */
-	public function postShared(OCPFile|Folder $node): void {
+	public function postShared(OCPFile | Folder $node): void {
 		$this->update($node);
 	}
 
 	/**
 	 * hook after file was unshared
 	 */
-	public function postUnshared(OCPFile|Folder $node): void {
+	public function postUnshared(OCPFile | Folder $node): void {
 		$this->update($node);
 	}
 
@@ -49,7 +49,7 @@ 
 	 * inform encryption module that a file was restored from the trash bin,
 	 * e.g. to update the encryption keys
 	 */
-	public function postRestore(OCPFile|Folder $node): void {
+	public function postRestore(OCPFile | Folder $node): void {
 		$this->update($node);
 	}
 
@@ -57,7 +57,7 @@ 
 	 * inform encryption module that a file was renamed,
 	 * e.g. to update the encryption keys
 	 */
-	public function postRename(OCPFile|Folder $source, OCPFile|Folder $target): void {
+	public function postRename(OCPFile | Folder $source, OCPFile | Folder $target): void {
 		if (dirname($source->getPath()) !== dirname($target->getPath())) {
 			$this->update($target);
 		}
@@ -68,18 +68,18 @@ 
 	 *
 	 * @throws \InvalidArgumentException
 	 */
-	protected function getOwnerPath(OCPFile|Folder $node): string {
+	protected function getOwnerPath(OCPFile | Folder $node): string {
 		$owner = $node->getOwner()?->getUID();
 		if ($owner === null) {
-			throw new InvalidArgumentException('No owner found for ' . $node->getId());
+			throw new InvalidArgumentException('No owner found for '.$node->getId());
 		}
-		$view = new View('/' . $owner . '/files');
+		$view = new View('/'.$owner.'/files');
 		try {
 			$path = $view->getPath($node->getId());
 		} catch (NotFoundException $e) {
-			throw new InvalidArgumentException('No file found for ' . $node->getId(), previous:$e);
+			throw new InvalidArgumentException('No file found for '.$node->getId(), previous:$e);
 		}
-		return '/' . $owner . '/files/' . $path;
+		return '/'.$owner.'/files/'.$path;
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 * @param string $path relative to data/
 	 * @throws Exceptions\ModuleDoesNotExistsException
 	 */
-	public function update(OCPFile|Folder $node): void {
+	public function update(OCPFile | Folder $node): void {
 		$encryptionModule = $this->encryptionManager->getEncryptionModule();
 
 		// if the encryption module doesn't encrypt the files on a per-user basis
@@ -111,7 +111,7 @@ 
 				$encryptionModule->update($file, $this->uid, $usersSharing);
 			} catch (GenericEncryptionException $e) {
 				// If the update of an individual file fails e.g. due to a corrupt key we should continue the operation and just log the failure
-				$this->logger->error('Failed to update encryption module for ' . $this->uid . ' ' . $file, [ 'exception' => $e ]);
+				$this->logger->error('Failed to update encryption module for '.$this->uid.' '.$file, ['exception' => $e]);
 			}
 		}
 	}