nextcloud / server

apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php

Spacing +2 added lines, -2 removed lines

@@ -57,9 +57,9 @@
 	 * @return false
 	 */
 	function httpGet(RequestInterface $request, ResponseInterface $response) {
-		$string = 'This is the WebDAV interface. It can only be accessed by ' .
+		$string = 'This is the WebDAV interface. It can only be accessed by '.
 			'WebDAV clients such as the Nextcloud desktop sync client.';
-		$stream = fopen('php://memory','r+');
+		$stream = fopen('php://memory', 'r+');
 		fwrite($stream, $string);
 		rewind($stream);
 

lib/private/Preview/Generator.php

Spacing +7 added lines, -7 removed lines

@@ -88,7 +88,7 @@ 
 	public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
 		$this->eventDispatcher->dispatch(
 			IPreview::EVENT,
-			new GenericEvent($file,[
+			new GenericEvent($file, [
 				'width' => $width,
 				'height' => $height,
 				'crop' => $crop,
@@ -155,8 +155,8 @@ 
 					continue;
 				}
 
-				$maxWidth = (int)$this->config->getSystemValue('preview_max_x', 2048);
-				$maxHeight = (int)$this->config->getSystemValue('preview_max_y', 2048);
+				$maxWidth = (int) $this->config->getSystemValue('preview_max_x', 2048);
+				$maxHeight = (int) $this->config->getSystemValue('preview_max_y', 2048);
 
 				$preview = $this->helper->getThumbnail($provider, $file, $maxWidth, $maxHeight);
 
@@ -164,7 +164,7 @@ 
 					continue;
 				}
 
-				$path = (string)$preview->width() . '-' . (string)$preview->height() . '-max.png';
+				$path = (string) $preview->width().'-'.(string) $preview->height().'-max.png';
 				try {
 					$file = $previewFolder->newFile($path);
 					$file->putContent($preview->data());
@@ -185,7 +185,7 @@ 
 	 */
 	private function getPreviewSize(ISimpleFile $file) {
 		$size = explode('-', $file->getName());
-		return [(int)$size[0], (int)$size[1]];
+		return [(int) $size[0], (int) $size[1]];
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 * @return string
 	 */
 	private function generatePath($width, $height, $crop) {
-		$path = (string)$width . '-' . (string)$height;
+		$path = (string) $width.'-'.(string) $height;
 		if ($crop) {
 			$path .= '-crop';
 		}
@@ -286,7 +286,7 @@ 
 			$height /= $ratio;
 		}
 
-		return [(int)round($width), (int)round($height)];
+		return [(int) round($width), (int) round($height)];
 	}
 
 	/**

lib/private/Repair/Collation.php

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
 		$tables = $this->getAllNonUTF8BinTables($this->connection);
 		foreach ($tables as $table) {
 			$output->info("Change row format for $table ...");
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT = DYNAMIC;');
+			$query = $this->connection->prepare('ALTER TABLE `'.$table.'` ROW_FORMAT = DYNAMIC;');
 			try {
 				$query->execute();
 			} catch (DriverException $e) {
@@ -90,10 +90,10 @@ 
 			$output->info("Change collation for $table ...");
 			if ($characterSet === 'utf8mb4') {
 				// need to set row compression first
-				$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT=COMPRESSED;');
+				$query = $this->connection->prepare('ALTER TABLE `'.$table.'` ROW_FORMAT=COMPRESSED;');
 				$query->execute();
 			}
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;');
+			$query = $this->connection->prepare('ALTER TABLE `'.$table.'` CONVERT TO CHARACTER SET '.$characterSet.' COLLATE '.$characterSet.'_bin;');
 			try {
 				$query->execute();
 			} catch (DriverException $e) {
@@ -119,10 +119,10 @@ 
 
 		// fetch tables by columns
 		$statement = $connection->executeQuery(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . COLUMNS" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND (COLLATION_NAME <> '" . $characterSet . "_bin' OR CHARACTER_SET_NAME <> '" . $characterSet . "')" .
+			"SELECT DISTINCT(TABLE_NAME) AS `table`".
+			"	FROM INFORMATION_SCHEMA . COLUMNS".
+			"	WHERE TABLE_SCHEMA = ?".
+			"	AND (COLLATION_NAME <> '".$characterSet."_bin' OR CHARACTER_SET_NAME <> '".$characterSet."')".
 			"	AND TABLE_NAME LIKE \"*PREFIX*%\"",
 			array($dbName)
 		);
@@ -134,10 +134,10 @@ 
 
 		// fetch tables by collation
 		$statement = $connection->executeQuery(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . TABLES" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND TABLE_COLLATION <> '" . $characterSet . "_bin'" .
+			"SELECT DISTINCT(TABLE_NAME) AS `table`".
+			"	FROM INFORMATION_SCHEMA . TABLES".
+			"	WHERE TABLE_SCHEMA = ?".
+			"	AND TABLE_COLLATION <> '".$characterSet."_bin'".
 			"	AND TABLE_NAME LIKE \"*PREFIX*%\"",
 			[$dbName]
 		);

lib/private/Authentication/Token/DefaultTokenProvider.php

Spacing +5 added lines, -5 removed lines

@@ -253,10 +253,10 @@ 
 	 */
 	public function invalidateOldTokens() {
 		$olderThan = $this->time->getTime() - (int) $this->config->getSystemValue('session_lifetime', 60 * 60 * 24);
-		$this->logger->debug('Invalidating session tokens older than ' . date('c', $olderThan), ['app' => 'cron']);
+		$this->logger->debug('Invalidating session tokens older than '.date('c', $olderThan), ['app' => 'cron']);
 		$this->mapper->invalidateOld($olderThan, IToken::DO_NOT_REMEMBER);
 		$rememberThreshold = $this->time->getTime() - (int) $this->config->getSystemValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
-		$this->logger->debug('Invalidating remembered session tokens older than ' . date('c', $rememberThreshold), ['app' => 'cron']);
+		$this->logger->debug('Invalidating remembered session tokens older than '.date('c', $rememberThreshold), ['app' => 'cron']);
 		$this->mapper->invalidateOld($rememberThreshold, IToken::REMEMBER);
 	}
 
@@ -266,7 +266,7 @@ 
 	 */
 	private function hashToken($token) {
 		$secret = $this->config->getSystemValue('secret');
-		return hash('sha512', $token . $secret);
+		return hash('sha512', $token.$secret);
 	}
 
 	/**
@@ -280,7 +280,7 @@ 
 	 */
 	private function encryptPassword($password, $token) {
 		$secret = $this->config->getSystemValue('secret');
-		return $this->crypto->encrypt($password, $token . $secret);
+		return $this->crypto->encrypt($password, $token.$secret);
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 	private function decryptPassword($password, $token) {
 		$secret = $this->config->getSystemValue('secret');
 		try {
-			return $this->crypto->decrypt($password, $token . $secret);
+			return $this->crypto->decrypt($password, $token.$secret);
 		} catch (Exception $ex) {
 			// Delete the invalid token
 			$this->invalidateToken($token);

lib/private/App/AppManager.php

Spacing +9 added lines, -9 removed lines

@@ -106,11 +106,11 @@ 
 			$values = $this->appConfig->getValues(false, 'enabled');
 
 			$alwaysEnabledApps = $this->getAlwaysEnabledApps();
-			foreach($alwaysEnabledApps as $appId) {
+			foreach ($alwaysEnabledApps as $appId) {
 				$values[$appId] = 'yes';
 			}
 
-			$this->installedAppsCache = array_filter($values, function ($value) {
+			$this->installedAppsCache = array_filter($values, function($value) {
 				return $value !== 'no';
 			});
 			ksort($this->installedAppsCache);
@@ -135,7 +135,7 @@ 
 	 */
 	public function getEnabledAppsForUser(IUser $user) {
 		$apps = $this->getInstalledAppsValues();
-		$appsForUser = array_filter($apps, function ($enabled) use ($user) {
+		$appsForUser = array_filter($apps, function($enabled) use ($user) {
 			return $this->checkAppForUser($enabled, $user);
 		});
 		return array_keys($appsForUser);
@@ -174,7 +174,7 @@ 
 		} elseif ($user === null) {
 			return false;
 		} else {
-			if(empty($enabled)){
+			if (empty($enabled)) {
 				return false;
 			}
 
@@ -182,7 +182,7 @@ 
 
 			if (!is_array($groupIds)) {
 				$jsonError = json_last_error();
-				\OC::$server->getLogger()->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']);
+				\OC::$server->getLogger()->warning('AppManger::checkAppForUser - can\'t decode group IDs: '.print_r($enabled, true).' - json error code: '.$jsonError, ['app' => 'lib']);
 				return false;
 			}
 
@@ -256,7 +256,7 @@ 
 			}
 		}
 
-		$groupIds = array_map(function ($group) {
+		$groupIds = array_map(function($group) {
 			/** @var \OCP\IGroup $group */
 			return $group->getGID();
 		}, $groups);
@@ -295,8 +295,8 @@ 
 	 */
 	public function getAppPath($appId) {
 		$appPath = \OC_App::getAppPath($appId);
-		if($appPath === false) {
-			throw new AppPathNotFoundException('Could not find path for ' . $appId);
+		if ($appPath === false) {
+			throw new AppPathNotFoundException('Could not find path for '.$appId);
 		}
 		return $appPath;
 	}
@@ -389,7 +389,7 @@ 
 
 	private function loadShippedJson() {
 		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+			$shippedJson = \OC::$SERVERROOT.'/core/shipped.json';
 			if (!file_exists($shippedJson)) {
 				throw new \Exception("File not found: $shippedJson");
 			}

apps/files_sharing/lib/MountProvider.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_CIRCLE, null, -1));
 
 		// filter out excluded shares and group shares that includes self
-		$shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
+		$shares = array_filter($shares, function(\OCP\Share\IShare $share) use ($user) {
 			return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
 		});
 
@@ -186,7 +186,7 @@ 
 						// null groups which usually appear with group backend
 						// caching inconsistencies
 						$this->logger->debug(
-							'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
+							'Could not adjust share target for share '.$share->getId().' to make it consistent: '.$e->getMessage(),
 							['app' => 'files_sharing']
 						);
 					}

lib/autoloader.php

Spacing +7 added lines, -7 removed lines

@@ -99,24 +99,24 @@ 
 			 * Remove "apps/" from inclusion path for smooth migration to multi app dir
 			 */
 			if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
-				\OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG);
+				\OCP\Util::writeLog('core', 'include path for class "'.$class.'" starts with "apps/"', \OCP\Util::DEBUG);
 				$paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
 			}
 		} elseif (strpos($class, 'OC_') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/lib/private/legacy/'.strtolower(str_replace('_', '/', substr($class, 3)).'.php');
 		} elseif (strpos($class, 'OCA\\') === 0) {
 			list(, $app, $rest) = explode('\\', $class, 3);
 			$app = strtolower($app);
 			$appPath = \OC_App::getAppPath($app);
 			if ($appPath && stream_resolve_include_path($appPath)) {
-				$paths[] = $appPath . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				$paths[] = $appPath.'/'.strtolower(str_replace('\\', '/', $rest).'.php');
 				// If not found in the root of the app directory, insert '/lib' after app id and try again.
-				$paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				$paths[] = $appPath.'/lib/'.strtolower(str_replace('\\', '/', $rest).'.php');
 			}
 		} elseif ($class === 'Test\\TestCase') {
 			// This File is considered public API, so we make sure that the class
 			// can still be loaded, although the PSR-4 paths have not been loaded.
-			$paths[] = \OC::$SERVERROOT . '/tests/lib/TestCase.php';
+			$paths[] = \OC::$SERVERROOT.'/tests/lib/TestCase.php';
 		}
 		return $paths;
 	}
@@ -127,7 +127,7 @@ 
 	 */
 	protected function isValidPath($fullPath) {
 		foreach ($this->validRoots as $root => $true) {
-			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
+			if (substr($fullPath, 0, strlen($root) + 1) === $root.'/') {
 				return true;
 			}
 		}
@@ -146,7 +146,7 @@ 
 			$pathsToRequire = $this->memoryCache->get($class);
 		}
 
-		if(class_exists($class, false)) {
+		if (class_exists($class, false)) {
 			return false;
 		}
 

lib/private/IntegrityCheck/Checker.php

Spacing +47 added lines, -47 removed lines

@@ -96,7 +96,7 @@ 
 	 * @return bool
 	 */
 	public function isCodeCheckEnforced() {
-		$notSignedChannels = [ '', 'git'];
+		$notSignedChannels = ['', 'git'];
 		if (in_array($this->environmentHelper->getChannel(), $notSignedChannels, true)) {
 			return false;
 		}
@@ -131,7 +131,7 @@ 
 			$folderToIterate,
 			\RecursiveDirectoryIterator::SKIP_DOTS
 		);
-		if($root === '') {
+		if ($root === '') {
 			$root = \OC::$SERVERROOT;
 		}
 		$root = rtrim($root, '/');
@@ -160,9 +160,9 @@ 
 		$tmpFolder = '';
 
 		$baseDirectoryLength = strlen($path);
-		foreach($iterator as $filename => $data) {
+		foreach ($iterator as $filename => $data) {
 			/** @var \DirectoryIterator $data */
-			if($data->isDir()) {
+			if ($data->isDir()) {
 				continue;
 			}
 
@@ -170,11 +170,11 @@ 
 			$relativeFileName = ltrim($relativeFileName, '/');
 
 			// Exclude signature.json files in the appinfo and root folder
-			if($relativeFileName === 'appinfo/signature.json') {
+			if ($relativeFileName === 'appinfo/signature.json') {
 				continue;
 			}
 			// Exclude signature.json files in the appinfo and core folder
-			if($relativeFileName === 'core/signature.json') {
+			if ($relativeFileName === 'core/signature.json') {
 				continue;
 			}
 
@@ -183,18 +183,18 @@ 
 			// to ensure that this will not lead to false positives this will
 			// copy the file to a temporary folder and reset it to the default
 			// values.
-			if($filename === $this->environmentHelper->getServerRoot() . '/.htaccess'
-				|| $filename === $this->environmentHelper->getServerRoot() . '/.user.ini') {
+			if ($filename === $this->environmentHelper->getServerRoot().'/.htaccess'
+				|| $filename === $this->environmentHelper->getServerRoot().'/.user.ini') {
 
-				if(!$copiedWebserverSettingFiles) {
+				if (!$copiedWebserverSettingFiles) {
 					$tmpFolder = rtrim($this->tempManager->getTemporaryFolder(), '/');
-					copy($this->environmentHelper->getServerRoot() . '/.htaccess', $tmpFolder . '/.htaccess');
-					copy($this->environmentHelper->getServerRoot() . '/.user.ini', $tmpFolder . '/.user.ini');
+					copy($this->environmentHelper->getServerRoot().'/.htaccess', $tmpFolder.'/.htaccess');
+					copy($this->environmentHelper->getServerRoot().'/.user.ini', $tmpFolder.'/.user.ini');
 					\OC_Files::setUploadLimit(
 						\OCP\Util::computerFileSize('511MB'),
 						[
-							'.htaccess' => $tmpFolder . '/.htaccess',
-							'.user.ini' => $tmpFolder . '/.user.ini',
+							'.htaccess' => $tmpFolder.'/.htaccess',
+							'.user.ini' => $tmpFolder.'/.user.ini',
 						]
 					);
 				}
@@ -202,8 +202,8 @@ 
 
 			// The .user.ini file can contain custom modifications to the file size
 			// as well.
-			if($filename === $this->environmentHelper->getServerRoot() . '/.user.ini') {
-				$fileContent = file_get_contents($tmpFolder . '/.user.ini');
+			if ($filename === $this->environmentHelper->getServerRoot().'/.user.ini') {
+				$fileContent = file_get_contents($tmpFolder.'/.user.ini');
 				$hashes[$relativeFileName] = hash('sha512', $fileContent);
 				continue;
 			}
@@ -215,10 +215,10 @@ 
 			// 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') {
-				$fileContent = file_get_contents($tmpFolder . '/.htaccess');
+			if ($filename === $this->environmentHelper->getServerRoot().'/.htaccess') {
+				$fileContent = file_get_contents($tmpFolder.'/.htaccess');
 				$explodedArray = explode('#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####', $fileContent);
-				if(count($explodedArray) === 2) {
+				if (count($explodedArray) === 2) {
 					$hashes[$relativeFileName] = hash('sha512', $explodedArray[0]);
 					continue;
 				}
@@ -267,7 +267,7 @@ 
 	public function writeAppSignature($path,
 									  X509 $certificate,
 									  RSA $privateKey) {
-		$appInfoDir = $path . '/appinfo';
+		$appInfoDir = $path.'/appinfo';
 		try {
 			$this->fileAccessHelper->assertDirectoryExists($appInfoDir);
 
@@ -275,12 +275,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){
+		} 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;
 		}
@@ -297,7 +297,7 @@ 
 	public function writeCoreSignature(X509 $certificate,
 									   RSA $rsa,
 									   $path) {
-		$coreDir = $path . '/core';
+		$coreDir = $path.'/core';
 		try {
 
 			$this->fileAccessHelper->assertDirectoryExists($coreDir);
@@ -305,12 +305,12 @@ 
 			$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){
+		} 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;
 		}
@@ -327,12 +327,12 @@ 
 	 * @throws \Exception
 	 */
 	private function verify($signaturePath, $basePath, $certificateCN) {
-		if(!$this->isCodeCheckEnforced()) {
+		if (!$this->isCodeCheckEnforced()) {
 			return [];
 		}
 
 		$signatureData = json_decode($this->fileAccessHelper->file_get_contents($signaturePath), true);
-		if(!is_array($signatureData)) {
+		if (!is_array($signatureData)) {
 			throw new InvalidSignatureException('Signature data not found.');
 		}
 
@@ -346,11 +346,11 @@ 
 		$rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/root.crt');
 		$x509->loadCA($rootCertificatePublicKey);
 		$x509->loadX509($certificate);
-		if(!$x509->validateSignature()) {
+		if (!$x509->validateSignature()) {
 			throw new InvalidSignatureException('Certificate is not valid.');
 		}
 		// Verify if certificate has proper CN. "core" CN is always trusted.
-		if($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') {
+		if ($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') {
 			throw new InvalidSignatureException(
 					sprintf('Certificate is not valid for required scope. (Requested: %s, current: CN=%s)', $certificateCN, $x509->getDN(true)['CN'])
 			);
@@ -363,7 +363,7 @@ 
 		$rsa->setMGFHash('sha512');
 		// See https://tools.ietf.org/html/rfc3447#page-38
 		$rsa->setSaltLength(0);
-		if(!$rsa->verify(json_encode($expectedHashes), $signature)) {
+		if (!$rsa->verify(json_encode($expectedHashes), $signature)) {
 			throw new InvalidSignatureException('Signature could not get verified.');
 		}
 
@@ -372,9 +372,9 @@ 
 		//
 		// Due to this reason we exclude the whole updater/ folder from the code
 		// integrity check.
-		if($basePath === $this->environmentHelper->getServerRoot()) {
-			foreach($expectedHashes as $fileName => $hash) {
-				if(strpos($fileName, 'updater/') === 0) {
+		if ($basePath === $this->environmentHelper->getServerRoot()) {
+			foreach ($expectedHashes as $fileName => $hash) {
+				if (strpos($fileName, 'updater/') === 0) {
 					unset($expectedHashes[$fileName]);
 				}
 			}
@@ -386,23 +386,23 @@ 
 		$differencesB = array_diff($currentInstanceHashes, $expectedHashes);
 		$differences = array_unique(array_merge($differencesA, $differencesB));
 		$differenceArray = [];
-		foreach($differences as $filename => $hash) {
+		foreach ($differences as $filename => $hash) {
 			// Check if file should not exist in the new signature table
-			if(!array_key_exists($filename, $expectedHashes)) {
+			if (!array_key_exists($filename, $expectedHashes)) {
 				$differenceArray['EXTRA_FILE'][$filename]['expected'] = '';
 				$differenceArray['EXTRA_FILE'][$filename]['current'] = $hash;
 				continue;
 			}
 
 			// Check if file is missing
-			if(!array_key_exists($filename, $currentInstanceHashes)) {
+			if (!array_key_exists($filename, $currentInstanceHashes)) {
 				$differenceArray['FILE_MISSING'][$filename]['expected'] = $expectedHashes[$filename];
 				$differenceArray['FILE_MISSING'][$filename]['current'] = '';
 				continue;
 			}
 
 			// Check if hash does mismatch
-			if($expectedHashes[$filename] !== $currentInstanceHashes[$filename]) {
+			if ($expectedHashes[$filename] !== $currentInstanceHashes[$filename]) {
 				$differenceArray['INVALID_HASH'][$filename]['expected'] = $expectedHashes[$filename];
 				$differenceArray['INVALID_HASH'][$filename]['current'] = $currentInstanceHashes[$filename];
 				continue;
@@ -422,7 +422,7 @@ 
 	 */
 	public function hasPassedCheck() {
 		$results = $this->getResults();
-		if(empty($results)) {
+		if (empty($results)) {
 			return true;
 		}
 
@@ -434,7 +434,7 @@ 
 	 */
 	public function getResults() {
 		$cachedResults = $this->cache->get(self::CACHE_KEY);
-		if(!is_null($cachedResults)) {
+		if (!is_null($cachedResults)) {
 			return json_decode($cachedResults, true);
 		}
 
@@ -453,7 +453,7 @@ 
 	private function storeResults($scope, array $result) {
 		$resultArray = $this->getResults();
 		unset($resultArray[$scope]);
-		if(!empty($result)) {
+		if (!empty($result)) {
 			$resultArray[$scope] = $result;
 		}
 		if ($this->config !== null) {
@@ -505,11 +505,11 @@ 
 	 */
 	public function verifyAppSignature($appId, $path = '') {
 		try {
-			if($path === '') {
+			if ($path === '') {
 				$path = $this->appLocator->getAppPath($appId);
 			}
 			$result = $this->verify(
-					$path . '/appinfo/signature.json',
+					$path.'/appinfo/signature.json',
 					$path,
 					$appId
 			);
@@ -559,7 +559,7 @@ 
 	public function verifyCoreSignature() {
 		try {
 			$result = $this->verify(
-					$this->environmentHelper->getServerRoot() . '/core/signature.json',
+					$this->environmentHelper->getServerRoot().'/core/signature.json',
 					$this->environmentHelper->getServerRoot(),
 					'core'
 			);
@@ -584,18 +584,18 @@ 
 		$this->cleanResults();
 		$this->verifyCoreSignature();
 		$appIds = $this->appLocator->getAllApps();
-		foreach($appIds as $appId) {
+		foreach ($appIds as $appId) {
 			// If an application is shipped a valid signature is required
 			$isShipped = $this->appManager->isShipped($appId);
 			$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;
 			}
 
-			if($appNeedsToBeChecked) {
+			if ($appNeedsToBeChecked) {
 				$this->verifyAppSignature($appId);
 			}
 		}

lib/private/AppFramework/App.php

Spacing +13 added lines, -13 removed lines

@@ -53,10 +53,10 @@ 
 	 * the transformed app id, defaults to OCA\
 	 * @return string the starting namespace for the app
 	 */
-	public static function buildAppNamespace($appId, $topNamespace='OCA\\') {
+	public static function buildAppNamespace($appId, $topNamespace = 'OCA\\') {
 		// Hit the cache!
 		if (isset(self::$nameSpaceCache[$appId])) {
-			return $topNamespace . self::$nameSpaceCache[$appId];
+			return $topNamespace.self::$nameSpaceCache[$appId];
 		}
 
 		$appInfo = \OC_App::getAppInfo($appId);
@@ -67,7 +67,7 @@ 
 			self::$nameSpaceCache[$appId] = ucfirst($appId);
 		}
 
-		return $topNamespace . self::$nameSpaceCache[$appId];
+		return $topNamespace.self::$nameSpaceCache[$appId];
 	}
 
 
@@ -90,7 +90,7 @@ 
 		// first try $controllerName then go for \OCA\AppName\Controller\$controllerName
 		try {
 			$controller = $container->query($controllerName);
-		} catch(QueryException $e) {
+		} catch (QueryException $e) {
 			if ($appName === 'core') {
 				$appNameSpace = 'OC\\Core';
 			} else if ($appName === 'settings') {
@@ -98,7 +98,7 @@ 
 			} else {
 				$appNameSpace = self::buildAppNamespace($appName);
 			}
-			$controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
+			$controllerName = $appNameSpace.'\\Controller\\'.$controllerName;
 			$controller = $container->query($controllerName);
 		}
 
@@ -116,17 +116,17 @@ 
 
 		$io = $container['OCP\\AppFramework\\Http\\IOutput'];
 
-		if(!is_null($httpHeaders)) {
+		if (!is_null($httpHeaders)) {
 			$io->setHeader($httpHeaders);
 		}
 
-		foreach($responseHeaders as $name => $value) {
-			$io->setHeader($name . ': ' . $value);
+		foreach ($responseHeaders as $name => $value) {
+			$io->setHeader($name.': '.$value);
 		}
 
-		foreach($responseCookies as $name => $value) {
+		foreach ($responseCookies as $name => $value) {
 			$expireDate = null;
-			if($value['expireDate'] instanceof \DateTime) {
+			if ($value['expireDate'] instanceof \DateTime) {
 				$expireDate = $value['expireDate']->getTimestamp();
 			}
 			$io->setCookie(
@@ -150,7 +150,7 @@ 
 			if ($response instanceof ICallbackResponse) {
 				$response->callback($io);
 			} else if (!is_null($output)) {
-				$io->setHeader('Content-Length: ' . strlen($output));
+				$io->setHeader('Content-Length: '.strlen($output));
 				$io->setOutput($output);
 			}
 		}
@@ -170,14 +170,14 @@ 
 	 * @param DIContainer $container an instance of a pimple container.
 	 */
 	public static function part($controllerName, $methodName, array $urlParams,
-								DIContainer $container){
+								DIContainer $container) {
 
 		$container['urlParams'] = $urlParams;
 		$controller = $container[$controllerName];
 
 		$dispatcher = $container['Dispatcher'];
 
-		list(, , $output) =  $dispatcher->dispatch($controller, $methodName);
+		list(,, $output) = $dispatcher->dispatch($controller, $methodName);
 		return $output;
 	}