nextcloud / server

tests/lib/IntegrityCheck/CheckerTest.php

Spacing +85 added lines, -85 removed lines

@@ -94,8 +94,8 @@ 
 			->with('NotExistingApp/appinfo')
 			->willReturn(true);
 
-		$keyBundle = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.crt');
-		$rsaPrivateKey = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.key');
+		$keyBundle = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.crt');
+		$rsaPrivateKey = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.key');
 		$rsa = new RSA();
 		$rsa->loadKey($rsaPrivateKey);
 		$x509 = new X509();
@@ -113,13 +113,13 @@ 
 			->method('file_put_contents')
 			->will($this->throwException(new \Exception('Exception message')));
 
-		$keyBundle = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.crt');
-		$rsaPrivateKey = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.key');
+		$keyBundle = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.crt');
+		$rsaPrivateKey = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.key');
 		$rsa = new RSA();
 		$rsa->loadKey($rsaPrivateKey);
 		$x509 = new X509();
 		$x509->loadX509($keyBundle);
-		$this->checker->writeAppSignature(\OC::$SERVERROOT . '/tests/data/integritycheck/app/', $x509, $rsa);
+		$this->checker->writeAppSignature(\OC::$SERVERROOT.'/tests/data/integritycheck/app/', $x509, $rsa);
 	}
 
 	public function testWriteAppSignature(): void {
@@ -135,8 +135,8 @@ 
 			->expects($this->once())
 			->method('file_put_contents')
 			->with(
-				$this->equalTo(\OC::$SERVERROOT . '/tests/data/integritycheck/app//appinfo/signature.json'),
-				$this->callback(function ($signature) use ($expectedSignatureFileData) {
+				$this->equalTo(\OC::$SERVERROOT.'/tests/data/integritycheck/app//appinfo/signature.json'),
+				$this->callback(function($signature) use ($expectedSignatureFileData) {
 					$expectedArray = json_decode($expectedSignatureFileData, true);
 					$actualArray = json_decode($signature, true);
 					$this->assertEquals($expectedArray, $actualArray);
@@ -144,13 +144,13 @@ 
 				})
 			);
 
-		$keyBundle = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.crt');
-		$rsaPrivateKey = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.key');
+		$keyBundle = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.crt');
+		$rsaPrivateKey = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.key');
 		$rsa = new RSA();
 		$rsa->loadKey($rsaPrivateKey);
 		$x509 = new X509();
 		$x509->loadX509($keyBundle);
-		$this->checker->writeAppSignature(\OC::$SERVERROOT . '/tests/data/integritycheck/app/', $x509, $rsa);
+		$this->checker->writeAppSignature(\OC::$SERVERROOT.'/tests/data/integritycheck/app/', $x509, $rsa);
 	}
 
 	public function testVerifyAppSignatureWithoutSignatureData(): void {
@@ -188,7 +188,7 @@ 
 			->expects($this->once())
 			->method('getAppPath')
 			->with('SomeApp')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/app/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/app/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
@@ -201,8 +201,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//appinfo/signature.json', $signatureDataFile],
-				['/resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//appinfo/signature.json', $signatureDataFile],
+				['/resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$this->assertSame([], $this->checker->verifyAppSignature('SomeApp'));
@@ -223,7 +223,7 @@ 
 			->expects($this->once())
 			->method('getAppPath')
 			->with('SomeApp')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/app/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/app/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "tampered",
@@ -236,8 +236,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//appinfo/signature.json', $signatureDataFile],
-				['/resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//appinfo/signature.json', $signatureDataFile],
+				['/resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$expected = [
@@ -264,7 +264,7 @@ 
 			->expects($this->once())
 			->method('getAppPath')
 			->with('SomeApp')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
@@ -277,8 +277,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData//appinfo/signature.json', $signatureDataFile],
-				['/resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData//appinfo/signature.json', $signatureDataFile],
+				['/resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 
@@ -333,8 +333,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData//appinfo/signature.json', $signatureDataFile],
-				['/resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData//appinfo/signature.json', $signatureDataFile],
+				['/resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$expected = [
@@ -358,7 +358,7 @@ 
 			],
 
 		];
-		$this->assertSame($expected, $this->checker->verifyAppSignature('SomeApp', \OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData/'));
+		$this->assertSame($expected, $this->checker->verifyAppSignature('SomeApp', \OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData/'));
 	}
 
 	public function testVerifyAppWithDifferentScope(): void {
@@ -376,7 +376,7 @@ 
 			->expects($this->once())
 			->method('getAppPath')
 			->with('SomeApp')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
@@ -389,8 +389,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData//appinfo/signature.json', $signatureDataFile],
-				['/resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData//appinfo/signature.json', $signatureDataFile],
+				['/resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$expected = [
@@ -417,7 +417,7 @@ 
 			->expects($this->once())
 			->method('getAppPath')
 			->with('SomeApp')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/app/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/app/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
@@ -430,8 +430,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//appinfo/signature.json', $signatureDataFile],
-				['/resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//appinfo/signature.json', $signatureDataFile],
+				['/resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$this->assertSame([], $this->checker->verifyAppSignature('SomeApp'));
@@ -449,11 +449,11 @@ 
 		$this->fileAccessHelper
 			->expects($this->once())
 			->method('is_writable')
-			->with(__DIR__ . '/core')
+			->with(__DIR__.'/core')
 			->willReturn(true);
 
-		$keyBundle = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.crt');
-		$rsaPrivateKey = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.key');
+		$keyBundle = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.crt');
+		$rsaPrivateKey = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.key');
 		$rsa = new RSA();
 		$rsa->loadKey($rsaPrivateKey);
 		$x509 = new X509();
@@ -473,11 +473,11 @@ 
 		$this->fileAccessHelper
 			->expects($this->once())
 			->method('is_writable')
-			->with(__DIR__ . '/core')
+			->with(__DIR__.'/core')
 			->willReturn(false);
 
-		$keyBundle = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.crt');
-		$rsaPrivateKey = file_get_contents(__DIR__ . '/../../data/integritycheck/SomeApp.key');
+		$keyBundle = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.crt');
+		$rsaPrivateKey = file_get_contents(__DIR__.'/../../data/integritycheck/SomeApp.key');
 		$rsa = new RSA();
 		$rsa->loadKey($rsaPrivateKey);
 		$x509 = new X509();
@@ -497,13 +497,13 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/app/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/app/');
 		$this->fileAccessHelper
 			->expects($this->once())
 			->method('file_put_contents')
 			->with(
-				\OC::$SERVERROOT . '/tests/data/integritycheck/app//core/signature.json',
-				$this->callback(function ($signature) use ($expectedSignatureFileData) {
+				\OC::$SERVERROOT.'/tests/data/integritycheck/app//core/signature.json',
+				$this->callback(function($signature) use ($expectedSignatureFileData) {
 					$expectedArray = json_decode($expectedSignatureFileData, true);
 					$actualArray = json_decode($signature, true);
 					$this->assertEquals($expectedArray, $actualArray);
@@ -511,13 +511,13 @@ 
 				})
 			);
 
-		$keyBundle = file_get_contents(__DIR__ . '/../../data/integritycheck/core.crt');
-		$rsaPrivateKey = file_get_contents(__DIR__ . '/../../data/integritycheck/core.key');
+		$keyBundle = file_get_contents(__DIR__.'/../../data/integritycheck/core.crt');
+		$rsaPrivateKey = file_get_contents(__DIR__.'/../../data/integritycheck/core.key');
 		$rsa = new RSA();
 		$rsa->loadKey($rsaPrivateKey);
 		$x509 = new X509();
 		$x509->loadX509($keyBundle);
-		$this->checker->writeCoreSignature($x509, $rsa, \OC::$SERVERROOT . '/tests/data/integritycheck/app/');
+		$this->checker->writeCoreSignature($x509, $rsa, \OC::$SERVERROOT.'/tests/data/integritycheck/app/');
 	}
 
 	public function testWriteCoreSignatureWithUnmodifiedHtaccess(): void {
@@ -532,13 +532,13 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/htaccessUnmodified/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/htaccessUnmodified/');
 		$this->fileAccessHelper
 			->expects($this->once())
 			->method('file_put_contents')
 			->with(
-				\OC::$SERVERROOT . '/tests/data/integritycheck/htaccessUnmodified//core/signature.json',
-				$this->callback(function ($signature) use ($expectedSignatureFileData) {
+				\OC::$SERVERROOT.'/tests/data/integritycheck/htaccessUnmodified//core/signature.json',
+				$this->callback(function($signature) use ($expectedSignatureFileData) {
 					$expectedArray = json_decode($expectedSignatureFileData, true);
 					$actualArray = json_decode($signature, true);
 					$this->assertEquals($expectedArray, $actualArray);
@@ -546,13 +546,13 @@ 
 				})
 			);
 
-		$keyBundle = file_get_contents(__DIR__ . '/../../data/integritycheck/core.crt');
-		$rsaPrivateKey = file_get_contents(__DIR__ . '/../../data/integritycheck/core.key');
+		$keyBundle = file_get_contents(__DIR__.'/../../data/integritycheck/core.crt');
+		$rsaPrivateKey = file_get_contents(__DIR__.'/../../data/integritycheck/core.key');
 		$rsa = new RSA();
 		$rsa->loadKey($rsaPrivateKey);
 		$x509 = new X509();
 		$x509->loadX509($keyBundle);
-		$this->checker->writeCoreSignature($x509, $rsa, \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessUnmodified/');
+		$this->checker->writeCoreSignature($x509, $rsa, \OC::$SERVERROOT.'/tests/data/integritycheck/htaccessUnmodified/');
 	}
 
 	public function testWriteCoreSignatureWithInvalidModifiedHtaccess(): void {
@@ -567,8 +567,8 @@ 
 			->expects($this->once())
 			->method('file_put_contents')
 			->with(
-				\OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithInvalidModifiedContent//core/signature.json',
-				$this->callback(function ($signature) use ($expectedSignatureFileData) {
+				\OC::$SERVERROOT.'/tests/data/integritycheck/htaccessWithInvalidModifiedContent//core/signature.json',
+				$this->callback(function($signature) use ($expectedSignatureFileData) {
 					$expectedArray = json_decode($expectedSignatureFileData, true);
 					$actualArray = json_decode($signature, true);
 					$this->assertEquals($expectedArray, $actualArray);
@@ -576,13 +576,13 @@ 
 				})
 			);
 
-		$keyBundle = file_get_contents(__DIR__ . '/../../data/integritycheck/core.crt');
-		$rsaPrivateKey = file_get_contents(__DIR__ . '/../../data/integritycheck/core.key');
+		$keyBundle = file_get_contents(__DIR__.'/../../data/integritycheck/core.crt');
+		$rsaPrivateKey = file_get_contents(__DIR__.'/../../data/integritycheck/core.key');
 		$rsa = new RSA();
 		$rsa->loadKey($rsaPrivateKey);
 		$x509 = new X509();
 		$x509->loadX509($keyBundle);
-		$this->checker->writeCoreSignature($x509, $rsa, \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithInvalidModifiedContent/');
+		$this->checker->writeCoreSignature($x509, $rsa, \OC::$SERVERROOT.'/tests/data/integritycheck/htaccessWithInvalidModifiedContent/');
 	}
 
 	public function testWriteCoreSignatureWithValidModifiedHtaccess(): void {
@@ -597,13 +597,13 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/htaccessWithValidModifiedContent');
 		$this->fileAccessHelper
 			->expects($this->once())
 			->method('file_put_contents')
 			->with(
-				\OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json',
-				$this->callback(function ($signature) use ($expectedSignatureFileData) {
+				\OC::$SERVERROOT.'/tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json',
+				$this->callback(function($signature) use ($expectedSignatureFileData) {
 					$expectedArray = json_decode($expectedSignatureFileData, true);
 					$actualArray = json_decode($signature, true);
 					$this->assertEquals($expectedArray, $actualArray);
@@ -611,13 +611,13 @@ 
 				})
 			);
 
-		$keyBundle = file_get_contents(__DIR__ . '/../../data/integritycheck/core.crt');
-		$rsaPrivateKey = file_get_contents(__DIR__ . '/../../data/integritycheck/core.key');
+		$keyBundle = file_get_contents(__DIR__.'/../../data/integritycheck/core.crt');
+		$rsaPrivateKey = file_get_contents(__DIR__.'/../../data/integritycheck/core.key');
 		$rsa = new RSA();
 		$rsa->loadKey($rsaPrivateKey);
 		$x509 = new X509();
 		$x509->loadX509($keyBundle);
-		$this->checker->writeCoreSignature($x509, $rsa, \OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent');
+		$this->checker->writeCoreSignature($x509, $rsa, \OC::$SERVERROOT.'/tests/data/integritycheck/htaccessWithValidModifiedContent');
 	}
 
 	public function testVerifyCoreSignatureWithoutSignatureData(): void {
@@ -654,7 +654,7 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/app/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/app/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
@@ -667,8 +667,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//core/signature.json', $signatureDataFile],
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//core/signature.json', $signatureDataFile],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$this->assertSame([], $this->checker->verifyCoreSignature());
@@ -688,7 +688,7 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/htaccessWithValidModifiedContent');
 		$signatureDataFile = '{
     "hashes": {
         ".htaccess": "7e6a7a4d8ee4f3fbc45dd579407c643471575a9d127d1c75f6d0a49e80766c3c587104b2139ef76d2a4bffce3f45777900605aaa49519c9532909b71e5030227",
@@ -701,8 +701,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json', $signatureDataFile],
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/htaccessWithValidModifiedContent/resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/htaccessWithValidModifiedContent/core/signature.json', $signatureDataFile],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/htaccessWithValidModifiedContent/resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$this->assertSame([], $this->checker->verifyCoreSignature());
@@ -712,7 +712,7 @@ 
 	 * See inline instruction on how to update the test assets when changing mimetypealiases.dist.json
 	 */
 	public function testVerifyCoreSignatureWithModifiedMimetypelistSignatureData(): void {
-		$shippedMimetypeAliases = (array)json_decode(file_get_contents(\OC::$SERVERROOT . '/resources/config/mimetypealiases.dist.json'));
+		$shippedMimetypeAliases = (array) json_decode(file_get_contents(\OC::$SERVERROOT.'/resources/config/mimetypealiases.dist.json'));
 		$allAliases = array_merge($shippedMimetypeAliases, ['my-custom/mimetype' => 'custom']);
 
 		$this->mimeTypeDetector
@@ -732,7 +732,7 @@ 
 		// file_put_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js', $newFile);
 		// 2. Update signature.json using the following occ command:
 		// occ integrity:sign-core --privateKey=./tests/data/integritycheck/core.key --certificate=./tests/data/integritycheck/core.crt --path=./tests/data/integritycheck/mimetypeListModified
-		self::assertEquals($newFile, file_get_contents(\OC::$SERVERROOT . '/tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js'));
+		self::assertEquals($newFile, file_get_contents(\OC::$SERVERROOT.'/tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js'));
 
 		$this->serverVersion
 			->expects($this->once())
@@ -747,14 +747,14 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/mimetypeListModified');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/mimetypeListModified');
 
-		$signatureDataFile = file_get_contents(__DIR__ . '/../../data/integritycheck/mimetypeListModified/core/signature.json');
+		$signatureDataFile = file_get_contents(__DIR__.'/../../data/integritycheck/mimetypeListModified/core/signature.json');
 		$this->fileAccessHelper
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/mimetypeListModified/core/signature.json', $signatureDataFile],
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/mimetypeListModified/resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/mimetypeListModified/core/signature.json', $signatureDataFile],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/mimetypeListModified/resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$this->assertSame([], $this->checker->verifyCoreSignature());
@@ -774,7 +774,7 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/app/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/app/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
@@ -787,8 +787,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//core/signature.json', $signatureDataFile],
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//core/signature.json', $signatureDataFile],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$this->assertSame([], $this->checker->verifyCoreSignature());
@@ -808,7 +808,7 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "tampered",
@@ -821,8 +821,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData//core/signature.json', $signatureDataFile],
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData//resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData//core/signature.json', $signatureDataFile],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData//resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$expected = [
@@ -848,7 +848,7 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
@@ -861,8 +861,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData//core/signature.json', $signatureDataFile],
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/appWithInvalidData//resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData//core/signature.json', $signatureDataFile],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/appWithInvalidData//resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$expected = [
@@ -903,7 +903,7 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/app/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/app/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
@@ -916,8 +916,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//core/signature.json', $signatureDataFile],
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//core/signature.json', $signatureDataFile],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$expected = [
@@ -943,7 +943,7 @@ 
 		$this->environmentHelper
 			->expects($this->any())
 			->method('getServerRoot')
-			->willReturn(\OC::$SERVERROOT . '/tests/data/integritycheck/app/');
+			->willReturn(\OC::$SERVERROOT.'/tests/data/integritycheck/app/');
 		$signatureDataFile = '{
     "hashes": {
         "AnotherFile.txt": "1570ca9420e37629de4328f48c51da29840ddeaa03ae733da4bf1d854b8364f594aac560601270f9e1797ed4cd57c1aea87bf44cf4245295c94f2e935a2f0112",
@@ -956,8 +956,8 @@ 
 			->expects($this->exactly(2))
 			->method('file_get_contents')
 			->willReturnMap([
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//core/signature.json', $signatureDataFile],
-				[\OC::$SERVERROOT . '/tests/data/integritycheck/app//resources/codesigning/root.crt', file_get_contents(__DIR__ . '/../../data/integritycheck/root.crt')],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//core/signature.json', $signatureDataFile],
+				[\OC::$SERVERROOT.'/tests/data/integritycheck/app//resources/codesigning/root.crt', file_get_contents(__DIR__.'/../../data/integritycheck/root.crt')],
 			]);
 
 		$expected = [
@@ -1018,7 +1018,7 @@ 
 		$this->checker
 			->expects($this->exactly(3))
 			->method('verifyAppSignature')
-			->willReturnCallback(function ($app) use (&$calls) {
+			->willReturnCallback(function($app) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertSame($expected, $app);
 				return [];

tests/lib/Encryption/Keys/StorageTest.php

Spacing +15 added lines, -15 removed lines

@@ -48,11 +48,11 @@ 
 
 		$this->crypto = $this->createMock(ICrypto::class);
 		$this->crypto->method('encrypt')
-			->willReturnCallback(function ($data, $pass) {
+			->willReturnCallback(function($data, $pass) {
 				return $data;
 			});
 		$this->crypto->method('decrypt')
-			->willReturnCallback(function ($data, $pass) {
+			->willReturnCallback(function($data, $pass) {
 				return $data;
 			});
 
@@ -145,13 +145,13 @@ 
 		// existing key if it exists, otherwise versions will break
 		$this->util->expects($this->once())
 			->method('stripPartialFileExtension')
-			->willReturn('user1' . $strippedPartialName);
+			->willReturn('user1'.$strippedPartialName);
 		$this->util->expects($this->any())
 			->method('isSystemWideMountPoint')
 			->willReturn(false);
 
 		$this->crypto->method('decrypt')
-			->willReturnCallback(function ($data, $pass) {
+			->willReturnCallback(function($data, $pass) {
 				return $data;
 			});
 
@@ -159,28 +159,28 @@ 
 			$this->view->expects($this->exactly(2))
 				->method('file_exists')
 				->willReturnMap([
-					['/user1/files_encryption/keys' . $strippedPartialName . '/encModule/fileKey', $originalKeyExists],
-					['/user1/files_encryption/keys' . $path . '/encModule/fileKey', true],
+					['/user1/files_encryption/keys'.$strippedPartialName.'/encModule/fileKey', $originalKeyExists],
+					['/user1/files_encryption/keys'.$path.'/encModule/fileKey', true],
 				]);
 
 			$this->view->expects($this->once())
 				->method('file_get_contents')
-				->with($this->equalTo('/user1/files_encryption/keys' . $path . '/encModule/fileKey'))
+				->with($this->equalTo('/user1/files_encryption/keys'.$path.'/encModule/fileKey'))
 				->willReturn(json_encode(['key' => base64_encode('key2')]));
 		} else {
 			$this->view->expects($this->once())
 				->method('file_exists')
-				->with($this->equalTo('/user1/files_encryption/keys' . $strippedPartialName . '/encModule/fileKey'))
+				->with($this->equalTo('/user1/files_encryption/keys'.$strippedPartialName.'/encModule/fileKey'))
 				->willReturn($originalKeyExists);
 
 			$this->view->expects($this->once())
 				->method('file_get_contents')
-				->with($this->equalTo('/user1/files_encryption/keys' . $strippedPartialName . '/encModule/fileKey'))
+				->with($this->equalTo('/user1/files_encryption/keys'.$strippedPartialName.'/encModule/fileKey'))
 				->willReturn(json_encode(['key' => base64_encode('key')]));
 		}
 
 		$this->assertSame($expectedKeyContent,
-			$this->storage->getFileKey('user1' . $path, 'fileKey', 'encModule')
+			$this->storage->getFileKey('user1'.$path, 'fileKey', 'encModule')
 		);
 	}
 
@@ -200,7 +200,7 @@ 
 			->willReturnArgument(0);
 
 		$this->crypto->method('encrypt')
-			->willReturnCallback(function ($data, $pass) {
+			->willReturnCallback(function($data, $pass) {
 				return $data;
 			});
 
@@ -429,7 +429,7 @@ 
 			->willReturnCallback([$this, 'getUidAndFilenameCallback']);
 		$this->util->expects($this->any())
 			->method('isSystemWideMountPoint')
-			->willReturnCallback(function ($path, $owner) use ($systemWideMountSource, $systemWideMountTarget) {
+			->willReturnCallback(function($path, $owner) use ($systemWideMountSource, $systemWideMountTarget) {
 				if (strpos($path, 'source.txt') !== false) {
 					return $systemWideMountSource;
 				}
@@ -460,7 +460,7 @@ 
 			->willReturnCallback([$this, 'getUidAndFilenameCallback']);
 		$this->util->expects($this->any())
 			->method('isSystemWideMountPoint')
-			->willReturnCallback(function ($path, $owner) use ($systemWideMountSource, $systemWideMountTarget) {
+			->willReturnCallback(function($path, $owner) use ($systemWideMountSource, $systemWideMountTarget) {
 				if (strpos($path, 'source.txt') !== false) {
 					return $systemWideMountSource;
 				}
@@ -476,7 +476,7 @@ 
 		$path = $args[0];
 		$parts = explode('/', $path);
 
-		return [$parts[1], '/' . implode('/', array_slice($parts, 2))];
+		return [$parts[1], '/'.implode('/', array_slice($parts, 2))];
 	}
 
 	public static function dataProviderCopyRename() {
@@ -589,7 +589,7 @@ 
 				'user1/files_encryption/backup/test.encryptionModule.1234567',
 			];
 			$this->view->expects($this->exactly(2))->method('mkdir')
-				->willReturnCallback(function ($path) use (&$calls) {
+				->willReturnCallback(function($path) use (&$calls) {
 					$expected = array_shift($calls);
 					$this->assertEquals($expected, $path);
 				});

tests/lib/Encryption/DecryptAllTest.php

Spacing +10 added lines, -10 removed lines

@@ -167,7 +167,7 @@ 
 			->with($this->inputInterface, $this->outputInterface, $user)
 			->willReturn($success);
 
-		$callback = function () use ($dummyEncryptionModule) {
+		$callback = function() use ($dummyEncryptionModule) {
 			return $dummyEncryptionModule;
 		};
 		$moduleDescription = [
@@ -217,7 +217,7 @@ 
 			];
 			$instance->expects($this->exactly(2))
 				->method('decryptUsersFiles')
-				->willReturnCallback(function ($user) use (&$calls) {
+				->willReturnCallback(function($user) use (&$calls) {
 					$expected = array_shift($calls);
 					$this->assertEquals($expected, $user);
 				});
@@ -283,7 +283,7 @@ 
 
 		$this->view->expects($this->any())->method('is_dir')
 			->willReturnCallback(
-				function ($path) {
+				function($path) {
 					if ($path === '/user1/files/foo') {
 						return true;
 					}
@@ -297,7 +297,7 @@ 
 		];
 		$instance->expects($this->exactly(2))
 			->method('decryptFile')
-			->willReturnCallback(function ($path) use (&$calls) {
+			->willReturnCallback(function($path) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, $path);
 			});
@@ -346,10 +346,10 @@ 
 
 			$this->view->expects($this->once())
 				->method('copy')
-				->with($path, $path . '.decrypted.42');
+				->with($path, $path.'.decrypted.42');
 			$this->view->expects($this->once())
 				->method('rename')
-				->with($path . '.decrypted.42', $path);
+				->with($path.'.decrypted.42', $path);
 		} else {
 			$instance->expects($this->never())->method('getTimestamp');
 			$this->view->expects($this->never())->method('copy');
@@ -386,19 +386,19 @@ 
 
 		$this->view->expects($this->once())
 			->method('copy')
-			->with($path, $path . '.decrypted.42')
-			->willReturnCallback(function () {
+			->with($path, $path.'.decrypted.42')
+			->willReturnCallback(function() {
 				throw new DecryptionFailedException();
 			});
 
 		$this->view->expects($this->never())->method('rename');
 		$this->view->expects($this->once())
 			->method('file_exists')
-			->with($path . '.decrypted.42')
+			->with($path.'.decrypted.42')
 			->willReturn(true);
 		$this->view->expects($this->once())
 			->method('unlink')
-			->with($path . '.decrypted.42');
+			->with($path.'.decrypted.42');
 
 		$this->assertFalse(
 			$this->invokePrivate($instance, 'decryptFile', [$path])

tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
 
 class ContactsStoreTest extends TestCase {
 	private ContactsStore $contactsStore;
-	private StatusService|MockObject $statusService;
+	private StatusService | MockObject $statusService;
 	/** @var IManager|MockObject */
 	private $contactsManager;
 	/** @var ProfileManager */
@@ -263,7 +263,7 @@ 
 		];
 		$this->groupManager->expects($this->exactly(4))
 			->method('getUserGroupIds')
-			->willReturnCallback(function () use (&$calls): array {
+			->willReturnCallback(function() use (&$calls): array {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected[0], func_get_args());
 				return $expected[1];
@@ -336,7 +336,7 @@ 
 		];
 		$this->groupManager->expects($this->exactly(4))
 			->method('getUserGroupIds')
-			->willReturnCallback(function () use (&$calls): array {
+			->willReturnCallback(function() use (&$calls): array {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected[0], func_get_args());
 				return $expected[1];
@@ -467,7 +467,7 @@ 
 		];
 		$this->groupManager->expects($this->exactly(4))
 			->method('getUserGroupIds')
-			->willReturnCallback(function () use (&$calls): array {
+			->willReturnCallback(function() use (&$calls): array {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected[0], func_get_args());
 				return $expected[1];
@@ -542,7 +542,7 @@ 
 		];
 		$this->groupManager->expects($this->exactly(2))
 			->method('getUserGroupIds')
-			->willReturnCallback(function () use (&$calls): array {
+			->willReturnCallback(function() use (&$calls): array {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected[0], func_get_args());
 				return $expected[1];
@@ -620,7 +620,7 @@ 
 		];
 		$this->groupManager->expects($this->exactly(4))
 			->method('getUserGroupIds')
-			->willReturnCallback(function () use (&$calls): array {
+			->willReturnCallback(function() use (&$calls): array {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected[0], func_get_args());
 				return $expected[1];
@@ -970,7 +970,7 @@ 
 		$user2->method('getCloudId')->willReturn('user2@localcloud');
 		$this->userManager->expects(self::exactly(2))
 			->method('get')
-			->willReturnCallback(function ($uid) use ($user1, $user2) {
+			->willReturnCallback(function($uid) use ($user1, $user2) {
 				return match ($uid) {
 					'user1' => $user1,
 					'user2' => $user2,
@@ -979,7 +979,7 @@ 
 		$this->contactsManager
 			->expects(self::exactly(3))
 			->method('search')
-			->willReturnCallback(function ($uid, $searchProps, $options) {
+			->willReturnCallback(function($uid, $searchProps, $options) {
 				return match ([$uid, $options['limit'] ?? null]) {
 					['user1@localcloud', 1] => [
 						[
@@ -1027,7 +1027,7 @@ 
 		$this->contactsManager
 			->expects(self::exactly(2))
 			->method('search')
-			->willReturnCallback(function ($uid, $searchProps, $options) {
+			->willReturnCallback(function($uid, $searchProps, $options) {
 				return match ([$uid, $options['limit'] ?? null, $options['offset'] ?? null]) {
 					['', 2, 0] => [
 						[

tests/lib/Files/Type/DetectionTest.php

Spacing +9 added lines, -9 removed lines

@@ -20,8 +20,8 @@ 
 		$this->detection = new Detection(
 			\OC::$server->getURLGenerator(),
 			\OC::$server->get(LoggerInterface::class),
-			\OC::$SERVERROOT . '/config/',
-			\OC::$SERVERROOT . '/resources/config/'
+			\OC::$SERVERROOT.'/config/',
+			\OC::$SERVERROOT.'/resources/config/'
 		);
 	}
 
@@ -71,7 +71,7 @@ 
 	 * @param string $expected
 	 */
 	public function testDetectContent(string $path, string $expected): void {
-		$this->assertEquals($expected, $this->detection->detectContent(\OC::$SERVERROOT . '/tests/data' . $path));
+		$this->assertEquals($expected, $this->detection->detectContent(\OC::$SERVERROOT.'/tests/data'.$path));
 	}
 
 	public static function dataDetect(): array {
@@ -91,7 +91,7 @@ 
 	 * @param string $expected
 	 */
 	public function testDetect(string $path, string $expected): void {
-		$this->assertEquals($expected, $this->detection->detect(\OC::$SERVERROOT . '/tests/data' . $path));
+		$this->assertEquals($expected, $this->detection->detect(\OC::$SERVERROOT.'/tests/data'.$path));
 	}
 
 	public function testDetectString(): void {
@@ -116,7 +116,7 @@ 
 	 */
 	public function testDetectMimeTypeCustom(string $ext, string $mime): void {
 		$confDir = sys_get_temp_dir();
-		file_put_contents($confDir . '/mimetypemapping.dist.json', json_encode([]));
+		file_put_contents($confDir.'/mimetypemapping.dist.json', json_encode([]));
 
 		/** @var IURLGenerator $urlGenerator */
 		$urlGenerator = $this->getMockBuilder(IURLGenerator::class)
@@ -127,12 +127,12 @@ 
 		$logger = $this->createMock(LoggerInterface::class);
 
 		// Create new mapping file
-		file_put_contents($confDir . '/mimetypemapping.dist.json', json_encode([$ext => [$mime]]));
+		file_put_contents($confDir.'/mimetypemapping.dist.json', json_encode([$ext => [$mime]]));
 
 		$detection = new Detection($urlGenerator, $logger, $confDir, $confDir);
 		$mappings = $detection->getAllMappings();
 		$this->assertArrayHasKey($ext, $mappings);
-		$this->assertEquals($mime, $detection->detectPath('foo.' . $ext));
+		$this->assertEquals($mime, $detection->detectPath('foo.'.$ext));
 	}
 
 	public static function dataGetSecureMimeType(): array {
@@ -262,7 +262,7 @@ 
 		$urlGenerator->expects($this->exactly(2))
 			->method('imagePath')
 			->willReturnCallback(
-				function ($appName, $file) use (&$calls) {
+				function($appName, $file) use (&$calls) {
 					$expected = array_shift($calls);
 					$this->assertEquals($expected, [$appName, $file]);
 					if ($file === 'filetypes/my.png') {
@@ -295,7 +295,7 @@ 
 		$urlGenerator->expects($this->exactly(3))
 			->method('imagePath')
 			->willReturnCallback(
-				function ($appName, $file) use (&$calls) {
+				function($appName, $file) use (&$calls) {
 					$expected = array_shift($calls);
 					$this->assertEquals($expected, [$appName, $file]);
 					if ($file === 'filetypes/file.png') {

tests/lib/Files/Storage/Wrapper/AvailabilityTest.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 		];
 		$this->storage->expects($this->exactly(2))
 			->method('setAvailability')
-			->willReturnCallback(function ($value) use (&$calls) {
+			->willReturnCallback(function($value) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, $value);
 			});

tests/lib/Files/ViewTest.php

Spacing +87 added lines, -87 removed lines

@@ -142,7 +142,7 @@ 
 		}
 
 		if ($this->tempStorage) {
-			system('rm -rf ' . escapeshellarg($this->tempStorage->getDataDir()));
+			system('rm -rf '.escapeshellarg($this->tempStorage->getDataDir()));
 		}
 
 		self::logout();
@@ -168,11 +168,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('');
@@ -229,7 +229,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');
@@ -645,11 +645,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');
@@ -689,7 +689,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);
@@ -711,10 +711,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');
@@ -809,7 +809,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('/');
@@ -851,15 +851,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();
@@ -872,11 +872,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;
 		}
 	}
 
@@ -1087,7 +1087,7 @@ 
 		$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
 		$depth = (4000 / 57);
 		foreach (range(0, $depth + 1) as $i) {
-			$longPath .= '/' . $folderName;
+			$longPath .= '/'.$folderName;
 		}
 
 		$storage = new Temporary([]);
@@ -1337,8 +1337,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);
 	}
 
 	/**
@@ -1356,8 +1356,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));
 	}
 
 	/**
@@ -1378,8 +1378,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);
 	}
 
 	/**
@@ -1397,8 +1397,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));
 	}
 
 	/**
@@ -1607,7 +1607,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));
 			});
 
@@ -1636,8 +1636,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')
@@ -1647,7 +1647,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');
@@ -1658,8 +1658,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())
@@ -1668,7 +1668,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');
@@ -1678,8 +1678,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())
@@ -1688,7 +1688,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');
@@ -1701,8 +1701,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())
@@ -1712,7 +1712,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');
@@ -1938,7 +1938,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)
@@ -1948,19 +1948,19 @@ 
 		/* Pause trash to avoid the trashbin intercepting rmdir and unlink calls */
 		Server::get(ITrashManager::class)->pauseTrash();
 
-		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;
@@ -1993,7 +1993,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 */
@@ -2001,13 +2001,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+');
@@ -2032,7 +2032,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 */
@@ -2040,13 +2040,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+');
@@ -2088,7 +2088,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)
@@ -2098,19 +2098,19 @@ 
 		/* Pause trash to avoid the trashbin intercepting rmdir and unlink calls */
 		Server::get(ITrashManager::class)->pauseTrash();
 
-		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');
 				}
 			);
@@ -2130,11 +2130,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');
@@ -2176,14 +2176,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(
@@ -2215,7 +2215,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)
@@ -2238,14 +2238,14 @@ 
 		$sourcePath = 'original.txt';
 		$targetPath = 'target.txt';
 
-		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);
 
@@ -2281,7 +2281,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)
@@ -2291,14 +2291,14 @@ 
 		$sourcePath = 'original.txt';
 		$targetPath = 'target.txt';
 
-		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();
 				}
 			);
@@ -2324,7 +2324,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';
@@ -2365,7 +2365,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';
 		}));
 
@@ -2375,7 +2375,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';
 		}));
 
@@ -2400,7 +2400,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)
@@ -2427,8 +2427,8 @@ 
 		$sourcePath = 'original.txt';
 		$targetPath = 'substorage/target.txt';
 
-		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('');
@@ -2438,7 +2438,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);
 
@@ -2473,10 +2473,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';
@@ -2485,7 +2485,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);
 
@@ -2550,14 +2550,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);
 				}
 			);
@@ -2571,7 +2571,7 @@ 
 			);
 			Util::connectHook(
 				Filesystem::CLASSNAME,
-				'post_' . $hookType,
+				'post_'.$hookType,
 				$eventHandler,
 				'postCallback'
 			);
@@ -2599,7 +2599,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 */
@@ -2641,7 +2641,7 @@ 
 		);
 
 		//Delete the mountpoint
-		$view = new View('/' . $this->user . '/files');
+		$view = new View('/'.$this->user.'/files');
 		$this->assertEquals('foo', $view->rmdir('mount'));
 	}
 
@@ -2662,7 +2662,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');
@@ -2672,7 +2672,7 @@ 
 
 		$content = $view->getDirectoryContent('', $filter);
 
-		$files = array_map(function (FileInfo $info) {
+		$files = array_map(function(FileInfo $info) {
 			return $info->getName();
 		}, $content);
 		sort($files);
@@ -2778,7 +2778,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);
 			});
@@ -2875,7 +2875,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');

tests/lib/Share20/ManagerTest.php

Spacing +47 added lines, -47 removed lines

@@ -145,11 +145,11 @@ 
 		$this->l10nFactory = $this->createMock(IFactory::class);
 		$this->l = $this->createMock(IL10N::class);
 		$this->l->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
+			->willReturnCallback(function($text, $parameters = []) {
 				return vsprintf($text, $parameters);
 			});
 		$this->l->method('n')
-			->willReturnCallback(function ($singular, $plural, $count, $parameters = []) {
+			->willReturnCallback(function($singular, $plural, $count, $parameters = []) {
 				return vsprintf(str_replace('%n', $count, ($count === 1) ? $singular : $plural), $parameters);
 			});
 		$this->l10nFactory->method('get')->willReturn($this->l);
@@ -277,7 +277,7 @@ 
 		];
 		$this->dispatcher->expects($this->exactly(2))
 			->method('dispatchTyped')
-			->willReturnCallback(function ($event) use (&$calls, $share) {
+			->willReturnCallback(function($event) use (&$calls, $share) {
 				$expected = array_shift($calls);
 				$this->assertInstanceOf($expected, $event);
 				$this->assertEquals($share, $event->getShare());
@@ -320,7 +320,7 @@ 
 		];
 		$this->dispatcher->expects($this->exactly(2))
 			->method('dispatchTyped')
-			->willReturnCallback(function ($event) use (&$calls, $share) {
+			->willReturnCallback(function($event) use (&$calls, $share) {
 				$expected = array_shift($calls);
 				$this->assertInstanceOf($expected, $event);
 				$this->assertEquals($share, $event->getShare());
@@ -380,7 +380,7 @@ 
 		];
 		$this->defaultProvider->expects($this->exactly(3))
 			->method('delete')
-			->willReturnCallback(function ($share) use (&$deleteCalls) {
+			->willReturnCallback(function($share) use (&$deleteCalls) {
 				$expected = array_shift($deleteCalls);
 				$this->assertEquals($expected, $share);
 			});
@@ -395,7 +395,7 @@ 
 		];
 		$this->dispatcher->expects($this->exactly(6))
 			->method('dispatchTyped')
-			->willReturnCallback(function ($event) use (&$dispatchCalls) {
+			->willReturnCallback(function($event) use (&$dispatchCalls) {
 				$expected = array_shift($dispatchCalls);
 				$this->assertInstanceOf($expected[0], $event);
 				$this->assertEquals($expected[1]->getId(), $event->getShare()->getId());
@@ -429,7 +429,7 @@ 
 		$this->dispatcher->expects($this->once())
 			->method('dispatchTyped')
 			->with(
-				$this->callBack(function (ShareDeletedFromSelfEvent $e) use ($share) {
+				$this->callBack(function(ShareDeletedFromSelfEvent $e) use ($share) {
 					return $e->getShare() === $share;
 				})
 			);
@@ -461,7 +461,7 @@ 
 		$this->defaultProvider
 			->expects($this->exactly(4))
 			->method('getChildren')
-			->willReturnCallback(function ($_share) use ($share, $shares) {
+			->willReturnCallback(function($_share) use ($share, $shares) {
 				if ($_share === $share) {
 					return $shares;
 				}
@@ -475,7 +475,7 @@ 
 		];
 		$this->defaultProvider->expects($this->exactly(3))
 			->method('delete')
-			->willReturnCallback(function ($share) use (&$calls) {
+			->willReturnCallback(function($share) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, $share);
 			});
@@ -504,7 +504,7 @@ 
 		$reShare->method('getNode')->willReturn($file);
 
 		$this->defaultProvider->method('getSharesBy')
-			->willReturnCallback(function ($userId, $shareType, $node, $reshares, $limit, $offset) use ($reShare, $file) {
+			->willReturnCallback(function($userId, $shareType, $node, $reshares, $limit, $offset) use ($reShare, $file) {
 				$this->assertEquals($file, $node);
 				if ($shareType === IShare::TYPE_USER) {
 					return match($userId) {
@@ -555,10 +555,10 @@ 
 		$reShareInOtherFolder->method('getNode')->willReturn($otherFolder);
 
 		$this->defaultProvider->method('getSharesBy')
-			->willReturnCallback(function ($userId, $shareType, $node, $reshares, $limit, $offset) use ($reShare, $reShareInSubFolder, $reShareInOtherFolder) {
+			->willReturnCallback(function($userId, $shareType, $node, $reshares, $limit, $offset) use ($reShare, $reShareInSubFolder, $reShareInOtherFolder) {
 				if ($shareType === IShare::TYPE_USER) {
 					return match($userId) {
-						'userB' => [$reShare,$reShareInSubFolder,$reShareInOtherFolder],
+						'userB' => [$reShare, $reShareInSubFolder, $reShareInOtherFolder],
 					};
 				} else {
 					return [];
@@ -572,7 +572,7 @@ 
 		];
 		$manager->expects($this->exactly(2))
 			->method('updateShare')
-			->willReturnCallback(function ($share) use (&$calls) {
+			->willReturnCallback(function($share) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, $share);
 			});
@@ -646,7 +646,7 @@ 
 		$this->groupManager->method('get')->with('Group')->willReturn($group);
 
 		$this->defaultProvider->method('getSharesBy')
-			->willReturnCallback(function ($userId, $shareType, $node, $reshares, $limit, $offset) use ($reShare1, $reShare2) {
+			->willReturnCallback(function($userId, $shareType, $node, $reshares, $limit, $offset) use ($reShare1, $reShare2) {
 				if ($shareType === IShare::TYPE_USER) {
 					return match($userId) {
 						'userB' => [$reShare1],
@@ -666,7 +666,7 @@ 
 		];
 		$manager->expects($this->exactly(2))
 			->method('updateShare')
-			->willReturnCallback(function ($share) use (&$calls) {
+			->willReturnCallback(function($share) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, $share);
 			});
@@ -773,7 +773,7 @@ 
 		]);
 
 		$this->dispatcher->expects($this->once())->method('dispatchTyped')
-			->willReturnCallback(function (Event $event) {
+			->willReturnCallback(function(Event $event) {
 				$this->assertInstanceOf(ValidatePasswordPolicyEvent::class, $event);
 				/** @var ValidatePasswordPolicyEvent $event */
 				$this->assertSame('password', $event->getPassword());
@@ -795,7 +795,7 @@ 
 		]);
 
 		$this->dispatcher->expects($this->once())->method('dispatchTyped')
-			->willReturnCallback(function (Event $event) {
+			->willReturnCallback(function(Event $event) {
 				$this->assertInstanceOf(ValidatePasswordPolicyEvent::class, $event);
 				/** @var ValidatePasswordPolicyEvent $event */
 				$this->assertSame('password', $event->getPassword());
@@ -1278,7 +1278,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($future) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) use ($future) {
 			return $data['expirationDate'] == $future;
 		}));
 
@@ -1304,7 +1304,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) use ($expected) {
 			return $data['expirationDate'] == $expected && $data['passwordSet'] === false;
 		}));
 
@@ -1319,7 +1319,7 @@ 
 	public function testValidateExpirationDateInternalNoDateNoDefault($shareType): void {
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) {
 			return $data['expirationDate'] === null && $data['passwordSet'] === true;
 		}));
 
@@ -1362,7 +1362,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) use ($expected) {
 			return $data['expirationDate'] == $expected;
 		}));
 
@@ -1404,7 +1404,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) use ($expected) {
 			return $data['expirationDate'] == $expected;
 		}));
 
@@ -1425,7 +1425,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->willReturnCallback(function ($data) {
+		$hookListener->expects($this->once())->method('listener')->willReturnCallback(function($data) {
 			$data['expirationDate']->sub(new \DateInterval('P2D'));
 		});
 
@@ -1456,7 +1456,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->willReturnCallback(function ($data) {
+		$hookListener->expects($this->once())->method('listener')->willReturnCallback(function($data) {
 			$data['accepted'] = false;
 			$data['message'] = 'Invalid date!';
 		});
@@ -1617,7 +1617,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($future) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) use ($future) {
 			return $data['expirationDate'] == $future;
 		}));
 
@@ -1640,7 +1640,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) use ($expected) {
 			return $data['expirationDate'] == $expected && $data['passwordSet'] === false;
 		}));
 
@@ -1652,7 +1652,7 @@ 
 	public function testValidateExpirationDateNoDateNoDefault(): void {
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) {
 			return $data['expirationDate'] === null && $data['passwordSet'] === true;
 		}));
 
@@ -1681,7 +1681,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) use ($expected) {
 			return $data['expirationDate'] == $expected;
 		}));
 
@@ -1711,7 +1711,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) use ($expected) {
 			return $data['expirationDate'] == $expected;
 		}));
 
@@ -1742,7 +1742,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->with($this->callback(function ($data) use ($expected) {
+		$hookListener->expects($this->once())->method('listener')->with($this->callback(function($data) use ($expected) {
 			return $data['expirationDate'] == $expected;
 		}));
 
@@ -1762,7 +1762,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->willReturnCallback(function ($data) {
+		$hookListener->expects($this->once())->method('listener')->willReturnCallback(function($data) {
 			$data['expirationDate']->sub(new \DateInterval('P2D'));
 		});
 
@@ -1787,7 +1787,7 @@ 
 
 		$hookListener = $this->createMock(DummyShareManagerListener::class);
 		\OCP\Util::connectHook('\OC\Share', 'verifyExpirationDate', $hookListener, 'listener');
-		$hookListener->expects($this->once())->method('listener')->willReturnCallback(function ($data) {
+		$hookListener->expects($this->once())->method('listener')->willReturnCallback(function($data) {
 			$data['accepted'] = false;
 			$data['message'] = 'Invalid date!';
 		});
@@ -2619,7 +2619,7 @@ 
 			->expects($this->once())
 			->method('create')
 			->with($share)
-			->willReturnCallback(function (Share $share) {
+			->willReturnCallback(function(Share $share) {
 				return $share->setId(42);
 			});
 
@@ -2629,7 +2629,7 @@ 
 		];
 		$this->dispatcher->expects($this->exactly(2))
 			->method('dispatchTyped')
-			->willReturnCallback(function ($event) use (&$calls, $date, $path) {
+			->willReturnCallback(function($event) use (&$calls, $date, $path) {
 				$expected = array_shift($calls);
 				$this->assertInstanceOf($expected, $event);
 				$share = $event->getShare();
@@ -2716,7 +2716,7 @@ 
 			->expects($this->once())
 			->method('create')
 			->with($share)
-			->willReturnCallback(function (Share $share) {
+			->willReturnCallback(function(Share $share) {
 				return $share->setId(42);
 			});
 
@@ -2726,7 +2726,7 @@ 
 		];
 		$this->dispatcher->expects($this->exactly(2))
 			->method('dispatchTyped')
-			->willReturnCallback(function ($event) use (&$calls, $path) {
+			->willReturnCallback(function($event) use (&$calls, $path) {
 				$expected = array_shift($calls);
 				$this->assertInstanceOf($expected, $event);
 				$share = $event->getShare();
@@ -2813,7 +2813,7 @@ 
 			->method('dispatchTyped')
 			->with(
 				$this->isInstanceOf(BeforeShareCreatedEvent::class)
-			)->willReturnCallback(function (BeforeShareCreatedEvent $e) {
+			)->willReturnCallback(function(BeforeShareCreatedEvent $e) {
 				$e->setError('I won\'t let you share!');
 				$e->stopPropagation();
 			}
@@ -2992,7 +2992,7 @@ 
 		 */
 		$this->defaultProvider
 			->method('getSharesBy')
-			->willReturnCallback(function ($uid, $type, $node, $reshares, $limit, $offset) use (&$shares2) {
+			->willReturnCallback(function($uid, $type, $node, $reshares, $limit, $offset) use (&$shares2) {
 				return array_slice($shares2, $offset, $limit);
 			});
 
@@ -3000,7 +3000,7 @@ 
 		 * Simulate the deleteShare call.
 		 */
 		$manager->method('deleteShare')
-			->willReturnCallback(function ($share) use (&$shares2) {
+			->willReturnCallback(function($share) use (&$shares2) {
 				for ($i = 0; $i < count($shares2); $i++) {
 					if ($shares2[$i]->getId() === $share->getId()) {
 						array_splice($shares2, $i, 1);
@@ -3072,7 +3072,7 @@ 
 
 		$factory->expects($this->any())
 			->method('getProviderForType')
-			->willReturnCallback(function ($shareType) use ($roomShareProvider) {
+			->willReturnCallback(function($shareType) use ($roomShareProvider) {
 				if ($shareType !== IShare::TYPE_ROOM) {
 					throw new Exception\ProviderException();
 				}
@@ -3110,7 +3110,7 @@ 
 		];
 		$factory->expects($this->exactly(2))
 			->method('getProviderForType')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return $this->defaultProvider;
@@ -3324,7 +3324,7 @@ 
 			->setPassword('passwordHash');
 
 		$this->hasher->method('verify')->with('password', 'passwordHash', '')
-			->willReturnCallback(function ($pass, $hash, &$newHash) {
+			->willReturnCallback(function($pass, $hash, &$newHash) {
 				$newHash = 'newHash';
 
 				return true;
@@ -3332,7 +3332,7 @@ 
 
 		$this->defaultProvider->expects($this->once())
 			->method('update')
-			->with($this->callback(function (\OCP\Share\IShare $share) {
+			->with($this->callback(function(\OCP\Share\IShare $share) {
 				return $share->getPassword() === 'newHash';
 			}));
 
@@ -4478,7 +4478,7 @@ 
 	public function testShareProviderExists($shareType, $expected): void {
 		$factory = $this->getMockBuilder('OCP\Share\IProviderFactory')->getMock();
 		$factory->expects($this->any())->method('getProviderForType')
-			->willReturnCallback(function ($id) {
+			->willReturnCallback(function($id) {
 				if ($id === IShare::TYPE_USER) {
 					return true;
 				}
@@ -4675,7 +4675,7 @@ 
 			->willReturn($userFolder);
 
 		$expected = [
-			'users' => ['owner', 'user1', 'user2', 'user3', '123456','user4', 'user5', '234567'],
+			'users' => ['owner', 'user1', 'user2', 'user3', '123456', 'user4', 'user5', '234567'],
 			'remote' => true,
 			'public' => true,
 		];
@@ -4810,12 +4810,12 @@ 
 		$share4 = $this->createMock(IShare::class);
 
 		$this->defaultProvider->method('getAllShares')
-			->willReturnCallback(function () use ($share1, $share2) {
+			->willReturnCallback(function() use ($share1, $share2) {
 				yield $share1;
 				yield $share2;
 			});
 		$extraProvider->method('getAllShares')
-			->willReturnCallback(function () use ($share3, $share4) {
+			->willReturnCallback(function() use ($share3, $share4) {
 				yield $share3;
 				yield $share4;
 			});

tests/Core/Command/Encryption/SetDefaultModuleTest.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 		];
 		$this->consoleOutput->expects($this->exactly(2))
 			->method('writeln')
-			->willReturnCallback(function ($message) use (&$calls) {
+			->willReturnCallback(function($message) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertStringContainsString($expected, $message);
 			});