nextcloud / server

apps/encryption/tests/Crypto/EncryptAllTest.php

Spacing +4 added lines, -4 removed lines

@@ -196,7 +196,7 @@ 
 
 		$this->keyManager->expects($this->exactly(2))->method('userHasKeys')
 			->willReturnCallback(
-				function ($user) {
+				function($user) {
 					if ($user === 'user1') {
 						return false;
 					}
@@ -249,7 +249,7 @@ 
 		$encryptAllCalls = [];
 		$encryptAll->expects($this->exactly(2))
 			->method('encryptUsersFiles')
-			->willReturnCallback(function ($uid) use (&$encryptAllCalls) {
+			->willReturnCallback(function($uid) use (&$encryptAllCalls) {
 				$encryptAllCalls[] = $uid;
 			});
 
@@ -306,7 +306,7 @@ 
 
 		$this->view->expects($this->any())->method('is_dir')
 			->willReturnCallback(
-				function ($path) {
+				function($path) {
 					if ($path === '/user1/files/foo') {
 						return true;
 					}
@@ -317,7 +317,7 @@ 
 		$encryptAllCalls = [];
 		$encryptAll->expects($this->exactly(2))
 			->method('encryptFile')
-			->willReturnCallback(function (string $path) use (&$encryptAllCalls) {
+			->willReturnCallback(function(string $path) use (&$encryptAllCalls) {
 				$encryptAllCalls[] = $path;
 			});
 

apps/encryption/tests/KeyManagerTest.php

Spacing +10 added lines, -10 removed lines

@@ -116,7 +116,7 @@ 
 	public function testRecoveryKeyExists(): void {
 		$this->keyStorageMock->expects($this->any())
 			->method('getSystemUserKey')
-			->with($this->equalTo($this->systemKeyId . '.publicKey'))
+			->with($this->equalTo($this->systemKeyId.'.publicKey'))
 			->willReturn('recoveryKey');
 
 
@@ -126,7 +126,7 @@ 
 	public function testCheckRecoveryKeyPassword(): void {
 		$this->keyStorageMock->expects($this->any())
 			->method('getSystemUserKey')
-			->with($this->equalTo($this->systemKeyId . '.privateKey'))
+			->with($this->equalTo($this->systemKeyId.'.privateKey'))
 			->willReturn('recoveryKey');
 		$this->cryptMock->expects($this->any())
 			->method('decryptPrivateKey')
@@ -194,7 +194,7 @@ 
 
 		$this->keyStorageMock->expects($this->exactly(2))
 			->method('getUserKey')
-			->willReturnCallback(function ($uid, $keyID, $encryptionModuleId) {
+			->willReturnCallback(function($uid, $keyID, $encryptionModuleId) {
 				if ($keyID === 'privateKey') {
 					return '';
 				}
@@ -210,7 +210,7 @@ 
 
 		$this->keyStorageMock->expects($this->exactly(2))
 			->method('getUserKey')
-			->willReturnCallback(function ($uid, $keyID, $encryptionModuleId) {
+			->willReturnCallback(function($uid, $keyID, $encryptionModuleId) {
 				if ($keyID === 'publicKey') {
 					return '';
 				}
@@ -248,7 +248,7 @@ 
 		$sessionSetStatusCalls = [];
 		$this->sessionMock->expects($this->exactly(2))
 			->method('setStatus')
-			->willReturnCallback(function (string $status) use (&$sessionSetStatusCalls) {
+			->willReturnCallback(function(string $status) use (&$sessionSetStatusCalls) {
 				$sessionSetStatusCalls[] = $status;
 			});
 
@@ -382,7 +382,7 @@ 
 			->method('getFileKey')
 			->willReturnMap([
 				[$path, 'fileKey', 'OC_DEFAULT_MODULE', $encryptedFileKey],
-				[$path, $expectedUid . '.shareKey', 'OC_DEFAULT_MODULE', 'fileKey'],
+				[$path, $expectedUid.'.shareKey', 'OC_DEFAULT_MODULE', 'fileKey'],
 			]);
 
 		$this->utilMock->expects($this->any())->method('isMasterKeyEnabled')
@@ -465,13 +465,13 @@ 
 
 		$this->keyStorageMock->expects($this->any())
 			->method('getSystemUserKey')
-			->willReturnCallback(function ($keyId, $encryptionModuleId) {
+			->willReturnCallback(function($keyId, $encryptionModuleId) {
 				return $keyId;
 			});
 
 		$this->utilMock->expects($this->any())
 			->method('isRecoveryEnabledForUser')
-			->willReturnCallback(function ($uid) {
+			->willReturnCallback(function($uid) {
 				if ($uid === 'user1') {
 					return true;
 				}
@@ -498,9 +498,9 @@ 
 	 */
 	public static function dataTestAddSystemKeys(): array {
 		return [
-			[['public' => true],[], 'user1', ['publicShareKey', 'recoveryKey']],
+			[['public' => true], [], 'user1', ['publicShareKey', 'recoveryKey']],
 			[['public' => false], [], 'user1', ['recoveryKey']],
-			[['public' => true],[], 'user2', ['publicShareKey']],
+			[['public' => true], [], 'user2', ['publicShareKey']],
 			[['public' => false], [], 'user2', []],
 		];
 	}

tests/lib/App/AppManagerTest.php

Spacing +15 added lines, -15 removed lines

@@ -45,12 +45,12 @@ 
 
 		$config->expects($this->any())
 			->method('getValue')
-			->willReturnCallback(function ($app, $key, $default) use (&$appConfig) {
+			->willReturnCallback(function($app, $key, $default) use (&$appConfig) {
 				return (isset($appConfig[$app]) and isset($appConfig[$app][$key])) ? $appConfig[$app][$key] : $default;
 			});
 		$config->expects($this->any())
 			->method('setValue')
-			->willReturnCallback(function ($app, $key, $value) use (&$appConfig) {
+			->willReturnCallback(function($app, $key, $value) use (&$appConfig) {
 				if (!isset($appConfig[$app])) {
 					$appConfig[$app] = [];
 				}
@@ -58,7 +58,7 @@ 
 			});
 		$config->expects($this->any())
 			->method('getValues')
-			->willReturnCallback(function ($app, $key) use (&$appConfig) {
+			->willReturnCallback(function($app, $key) use (&$appConfig) {
 				if ($app) {
 					return $appConfig[$app];
 				} else {
@@ -160,16 +160,16 @@ 
 	}
 
 	public static function dataGetAppIcon(): array {
-		$nothing = function ($appId) {
+		$nothing = function($appId) {
 			self::assertEquals('test', $appId);
 			throw new \RuntimeException();
 		};
 
-		$createCallback = function ($workingIcons) {
-			return function ($appId, $icon) use ($workingIcons) {
+		$createCallback = function($workingIcons) {
+			return function($appId, $icon) use ($workingIcons) {
 				self::assertEquals('test', $appId);
 				if (in_array($icon, $workingIcons)) {
-					return '/path/' . $icon;
+					return '/path/'.$icon;
 				}
 				throw new \RuntimeException();
 			};
@@ -460,13 +460,13 @@ 
 	}
 
 	public function testGetAppPath(): void {
-		$this->assertEquals(\OC::$SERVERROOT . '/apps/files', $this->manager->getAppPath('files'));
+		$this->assertEquals(\OC::$SERVERROOT.'/apps/files', $this->manager->getAppPath('files'));
 	}
 
 	public function testGetAppPathSymlink(): void {
 		$fakeAppDirname = sha1(uniqid('test', true));
-		$fakeAppPath = sys_get_temp_dir() . '/' . $fakeAppDirname;
-		$fakeAppLink = \OC::$SERVERROOT . '/' . $fakeAppDirname;
+		$fakeAppPath = sys_get_temp_dir().'/'.$fakeAppDirname;
+		$fakeAppLink = \OC::$SERVERROOT.'/'.$fakeAppDirname;
 
 		mkdir($fakeAppPath);
 		if (symlink($fakeAppPath, $fakeAppLink) === false) {
@@ -476,11 +476,11 @@ 
 		// Use the symlink as the app path
 		\OC::$APPSROOTS[] = [
 			'path' => $fakeAppLink,
-			'url' => \OC::$WEBROOT . '/' . $fakeAppDirname,
+			'url' => \OC::$WEBROOT.'/'.$fakeAppDirname,
 			'writable' => false,
 		];
 
-		$fakeTestAppPath = $fakeAppPath . '/' . 'test-test-app';
+		$fakeTestAppPath = $fakeAppPath.'/'.'test-test-app';
 		mkdir($fakeTestAppPath);
 
 		$generatedAppPath = $this->manager->getAppPath('test-test-app');
@@ -489,7 +489,7 @@ 
 		unlink($fakeAppLink);
 		rmdir($fakeAppPath);
 
-		$this->assertEquals($fakeAppLink . '/test-test-app', $generatedAppPath);
+		$this->assertEquals($fakeAppLink.'/test-test-app', $generatedAppPath);
 	}
 
 	public function testGetAppPathFail(): void {
@@ -633,7 +633,7 @@ 
 		$manager->expects($this->any())
 			->method('getAppInfo')
 			->willReturnCallback(
-				function ($appId) use ($appInfos) {
+				function($appId) use ($appInfos) {
 					return $appInfos[$appId];
 				}
 			);
@@ -692,7 +692,7 @@ 
 		$manager->expects($this->any())
 			->method('getAppInfo')
 			->willReturnCallback(
-				function ($appId) use ($appInfos) {
+				function($appId) use ($appInfos) {
 					return $appInfos[$appId];
 				}
 			);