nextcloud / server

lib/private/IntegrityCheck/Checker.php

Spacing +13 added lines, -13 removed lines

@@ -60,7 +60,7 @@ 
 	 * @return bool
 	 */
 	public function isCodeCheckEnforced(): bool {
-		$notSignedChannels = [ '', 'git'];
+		$notSignedChannels = ['', 'git'];
 		if (\in_array($this->serverVersion->getChannel(), $notSignedChannels, true)) {
 			return false;
 		}
@@ -138,7 +138,7 @@ 
 			// Thus we ignore everything below the first occurrence of
 			// "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" and have the
 			// hash generated based on this.
-			if ($filename === $this->environmentHelper->getServerRoot() . '/.htaccess') {
+			if ($filename === $this->environmentHelper->getServerRoot().'/.htaccess') {
 				$fileContent = file_get_contents($filename);
 				$explodedArray = explode('#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####', $fileContent);
 				if (\count($explodedArray) === 2) {
@@ -146,7 +146,7 @@ 
 					continue;
 				}
 			}
-			if ($filename === $this->environmentHelper->getServerRoot() . '/core/js/mimetypelist.js') {
+			if ($filename === $this->environmentHelper->getServerRoot().'/core/js/mimetypelist.js') {
 				$oldMimetypeList = new GenerateMimetypeFileBuilder();
 				$newFile = $oldMimetypeList->generateFile($this->mimeTypeDetector->getAllAliases(), $this->mimeTypeDetector->getAllNamings());
 				$oldFile = $this->fileAccessHelper->file_get_contents($filename);
@@ -199,7 +199,7 @@ 
 	public function writeAppSignature($path,
 		X509 $certificate,
 		RSA $privateKey) {
-		$appInfoDir = $path . '/appinfo';
+		$appInfoDir = $path.'/appinfo';
 		try {
 			$this->fileAccessHelper->assertDirectoryExists($appInfoDir);
 
@@ -207,12 +207,12 @@ 
 			$hashes = $this->generateHashes($iterator, $path);
 			$signature = $this->createSignatureData($hashes, $certificate, $privateKey);
 			$this->fileAccessHelper->file_put_contents(
-				$appInfoDir . '/signature.json',
+				$appInfoDir.'/signature.json',
 				json_encode($signature, JSON_PRETTY_PRINT)
 			);
 		} catch (\Exception $e) {
 			if (!$this->fileAccessHelper->is_writable($appInfoDir)) {
-				throw new \Exception($appInfoDir . ' is not writable');
+				throw new \Exception($appInfoDir.' is not writable');
 			}
 			throw $e;
 		}
@@ -229,19 +229,19 @@ 
 	public function writeCoreSignature(X509 $certificate,
 		RSA $rsa,
 		$path) {
-		$coreDir = $path . '/core';
+		$coreDir = $path.'/core';
 		try {
 			$this->fileAccessHelper->assertDirectoryExists($coreDir);
 			$iterator = $this->getFolderIterator($path, $path);
 			$hashes = $this->generateHashes($iterator, $path);
 			$signatureData = $this->createSignatureData($hashes, $certificate, $rsa);
 			$this->fileAccessHelper->file_put_contents(
-				$coreDir . '/signature.json',
+				$coreDir.'/signature.json',
 				json_encode($signatureData, JSON_PRETTY_PRINT)
 			);
 		} catch (\Exception $e) {
 			if (!$this->fileAccessHelper->is_writable($coreDir)) {
-				throw new \Exception($coreDir . ' is not writable');
+				throw new \Exception($coreDir.' is not writable');
 			}
 			throw $e;
 		}
@@ -292,7 +292,7 @@ 
 
 		// Check if certificate is signed by Nextcloud Root Authority
 		$x509 = new \phpseclib\File\X509();
-		$rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot() . '/resources/codesigning/root.crt');
+		$rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/root.crt');
 
 		$rootCerts = $this->splitCerts($rootCertificatePublicKey);
 		foreach ($rootCerts as $rootCert) {
@@ -463,7 +463,7 @@ 
 				$path = $this->appLocator->getAppPath($appId);
 			}
 			$result = $this->verify(
-				$path . '/appinfo/signature.json',
+				$path.'/appinfo/signature.json',
 				$path,
 				$appId,
 				$forceVerify
@@ -514,7 +514,7 @@ 
 	public function verifyCoreSignature(): array {
 		try {
 			$result = $this->verify(
-				$this->environmentHelper->getServerRoot() . '/core/signature.json',
+				$this->environmentHelper->getServerRoot().'/core/signature.json',
 				$this->environmentHelper->getServerRoot(),
 				'core'
 			);
@@ -545,7 +545,7 @@ 
 			$appNeedsToBeChecked = false;
 			if ($isShipped) {
 				$appNeedsToBeChecked = true;
-			} elseif ($this->fileAccessHelper->file_exists($this->appLocator->getAppPath($appId) . '/appinfo/signature.json')) {
+			} elseif ($this->fileAccessHelper->file_exists($this->appLocator->getAppPath($appId).'/appinfo/signature.json')) {
 				// Otherwise only if the application explicitly ships a signature.json file
 				$appNeedsToBeChecked = true;
 			}

lib/private/Files/Type/Detection.php

Spacing +11 added lines, -11 removed lines

@@ -76,12 +76,12 @@ 
 	public function registerTypeArray(array $types): void {
 		// Register the types,
 		foreach ($types as $extension => $mimeType) {
-			$this->registerType((string)$extension, $mimeType[0], $mimeType[1] ?? null);
+			$this->registerType((string) $extension, $mimeType[0], $mimeType[1] ?? null);
 		}
 
 		// Update the alternative mimeTypes to avoid having to look them up each time.
 		foreach ($this->mimeTypes as $extension => $mimeType) {
-			if (str_starts_with((string)$extension, '_comment')) {
+			if (str_starts_with((string) $extension, '_comment')) {
 				continue;
 			}
 
@@ -93,12 +93,12 @@ 
 	}
 
 	private function loadCustomDefinitions(string $fileName, array $definitions): array {
-		if (file_exists($this->customConfigDir . '/' . $fileName)) {
-			$custom = json_decode(file_get_contents($this->customConfigDir . '/' . $fileName), true);
+		if (file_exists($this->customConfigDir.'/'.$fileName)) {
+			$custom = json_decode(file_get_contents($this->customConfigDir.'/'.$fileName), true);
 			if (json_last_error() === JSON_ERROR_NONE) {
 				$definitions = array_merge($definitions, $custom);
 			} else {
-				$this->logger->warning('Failed to parse ' . $fileName . ': ' . json_last_error_msg());
+				$this->logger->warning('Failed to parse '.$fileName.': '.json_last_error_msg());
 			}
 		}
 		return $definitions;
@@ -112,7 +112,7 @@ 
 			return;
 		}
 
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypealiases.dist.json'), true);
 		$this->mimeTypeAlias = $this->loadCustomDefinitions(self::CUSTOM_MIMETYPEALIASES, $this->mimeTypeAlias);
 	}
 
@@ -126,7 +126,7 @@ 
 
 	public function getOnlyDefaultAliases(): array {
 		$this->loadMappings();
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypealiases.dist.json'), true);
 		return $this->mimeTypeAlias;
 	}
 
@@ -138,7 +138,7 @@ 
 			return;
 		}
 
-		$mimeTypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypemapping.dist.json'), true);
+		$mimeTypeMapping = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypemapping.dist.json'), true);
 		$mimeTypeMapping = $this->loadCustomDefinitions(self::CUSTOM_MIMETYPEMAPPING, $mimeTypeMapping);
 
 		$this->registerTypeArray($mimeTypeMapping);
@@ -157,7 +157,7 @@ 
 			return;
 		}
 
-		$mimeTypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypenames.dist.json'), true);
+		$mimeTypeMapping = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypenames.dist.json'), true);
 		$mimeTypeMapping = $this->loadCustomDefinitions(self::CUSTOM_MIMETYPENAMES, $mimeTypeMapping);
 
 		$this->mimeTypesNames = $mimeTypeMapping;
@@ -354,7 +354,7 @@ 
 
 		// Icon exists?
 		try {
-			$this->mimeTypeIcons[$mimeType] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.svg');
+			$this->mimeTypeIcons[$mimeType] = $this->urlGenerator->imagePath('core', 'filetypes/'.$icon.'.svg');
 			return $this->mimeTypeIcons[$mimeType];
 		} catch (\RuntimeException $e) {
 			// Specified image not found
@@ -364,7 +364,7 @@ 
 		if (strpos($icon, '-')) {
 			$mimePart = substr($icon, 0, strpos($icon, '-'));
 			try {
-				$this->mimeTypeIcons[$mimeType] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
+				$this->mimeTypeIcons[$mimeType] = $this->urlGenerator->imagePath('core', 'filetypes/'.$mimePart.'.svg');
 				return $this->mimeTypeIcons[$mimeType];
 			} catch (\RuntimeException $e) {
 				// Image for the first part of the MIME type not found

core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php

Spacing +10 added lines, -10 removed lines

@@ -17,16 +17,16 @@ 
 	 */
 	public function generateFile(array $aliases, array $names): string {
 		// Remove comments
-		$aliases = array_filter($aliases, static function ($key) {
+		$aliases = array_filter($aliases, static function($key) {
 			// Single digit extensions will be treated as integers
 			// Let's make sure they are strings
 			// https://github.com/nextcloud/server/issues/42902
-			$key = (string)$key;
+			$key = (string) $key;
 			return !($key === '' || $key[0] === '_');
 		}, ARRAY_FILTER_USE_KEY);
 
 		// Fetch all files
-		$dir = new \DirectoryIterator(\OC::$SERVERROOT . '/core/img/filetypes');
+		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
 
 		$files = [];
 		foreach ($dir as $fileInfo) {
@@ -42,7 +42,7 @@ 
 
 		// Fetch all themes!
 		$themes = [];
-		$dirs = new \DirectoryIterator(\OC::$SERVERROOT . '/themes/');
+		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
 		foreach ($dirs as $dir) {
 			//Valid theme dir
 			if ($dir->isFile() || $dir->isDot()) {
@@ -50,7 +50,7 @@ 
 			}
 
 			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+			$themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
 			// Check if this theme has its own filetype icons
 			if (!file_exists($themeDir)) {
 				continue;
@@ -77,7 +77,7 @@ 
 				// Skip internal names
 				continue;
 			}
-			$namesOutput .= "'$key': t('core', " . json_encode($name) . "),\n";
+			$namesOutput .= "'$key': t('core', ".json_encode($name)."),\n";
 		}
 
 		//Generate the JS
@@ -90,10 +90,10 @@ 
 * To regenerate this file run ./occ maintenance:mimetype:update-js
 */
 OC.MimeTypeList={
-	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . ',
-	files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
-	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . ',
-	names: {' . $namesOutput . '},
+	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).',
+	files: ' . json_encode($files, JSON_PRETTY_PRINT).',
+	themes: ' . json_encode($themes, JSON_PRETTY_PRINT).',
+	names: {' . $namesOutput.'},
 };
 ';
 	}

core/Command/Maintenance/Mimetype/UpdateJS.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		// Output the JS
 		$generatedMimetypeFile = new GenerateMimetypeFileBuilder();
 		$namings = $this->mimetypeDetector->getAllNamings();
-		file_put_contents(\OC::$SERVERROOT . '/core/js/mimetypelist.js', $generatedMimetypeFile->generateFile($aliases, $namings));
+		file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $generatedMimetypeFile->generateFile($aliases, $namings));
 
 		$output->writeln('<info>mimetypelist.js is updated');
 		return 0;

tests/lib/IntegrityCheck/CheckerTest.php

Spacing +86 added lines, -86 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,8 +712,8 @@ 
 	 * 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'));
-		$shippedMimetypeNames = (array)json_decode(file_get_contents(\OC::$SERVERROOT . '/resources/config/mimetypenames.dist.json'));
+		$shippedMimetypeAliases = (array) json_decode(file_get_contents(\OC::$SERVERROOT.'/resources/config/mimetypealiases.dist.json'));
+		$shippedMimetypeNames = (array) json_decode(file_get_contents(\OC::$SERVERROOT.'/resources/config/mimetypenames.dist.json'));
 		$allAliases = array_merge($shippedMimetypeAliases, ['my-custom/mimetype' => 'custom']);
 		$allMimetypeNames = array_merge($shippedMimetypeNames, ['my-custom/mimetype' => 'Custom Document']);
 
@@ -739,7 +739,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())
@@ -754,14 +754,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());
@@ -781,7 +781,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",
@@ -794,8 +794,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());
@@ -815,7 +815,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",
@@ -828,8 +828,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 = [
@@ -855,7 +855,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",
@@ -868,8 +868,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 = [
@@ -910,7 +910,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",
@@ -923,8 +923,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 = [
@@ -950,7 +950,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",
@@ -963,8 +963,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 = [
@@ -1025,7 +1025,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 [];