nextcloud / server

lib/private/legacy/OC_Helper.php

Spacing +14 added lines, -14 removed lines

@@ -43,7 +43,7 @@ 
 	 *
 	 * Makes 2048 to 2 kB.
 	 */
-	public static function humanFileSize(int|float $bytes): string {
+	public static function humanFileSize(int | float $bytes): string {
 		return \OCP\Util::humanFileSize($bytes);
 	}
 
@@ -57,7 +57,7 @@ 
 	 *
 	 * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
 	 */
-	public static function computerFileSize(string $str): false|int|float {
+	public static function computerFileSize(string $str): false | int | float {
 		return \OCP\Util::computerFileSize($str);
 	}
 
@@ -132,7 +132,7 @@ 
 		$exts = [''];
 		$check_fn = 'is_executable';
 		// Default check will be done with $path directories :
-		$dirs = explode(PATH_SEPARATOR, (string)$path);
+		$dirs = explode(PATH_SEPARATOR, (string) $path);
 		// WARNING : We have to check if open_basedir is enabled :
 		$obd = OC::$server->get(IniGetWrapper::class)->getString('open_basedir');
 		if ($obd != 'none') {
@@ -145,7 +145,7 @@ 
 		}
 		foreach ($dirs as $dir) {
 			foreach ($exts as $ext) {
-				if ($check_fn("$dir/$name" . $ext)) {
+				if ($check_fn("$dir/$name".$ext)) {
 					return true;
 				}
 			}
@@ -217,7 +217,7 @@ 
 			$ext = '';
 		}
 
-		$newpath = $path . '/' . $filename;
+		$newpath = $path.'/'.$filename;
 		if ($view->file_exists($newpath)) {
 			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
 				//Replace the last "(number)" with "(number+1)"
@@ -233,11 +233,11 @@ 
 			do {
 				if ($offset) {
 					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+					$newname = substr_replace($name, '('.$counter.')', $offset, $match_length);
 				} else {
-					$newname = $name . ' (' . $counter . ')';
+					$newname = $name.' ('.$counter.')';
 				}
-				$newpath = $path . '/' . $newname . $ext;
+				$newpath = $path.'/'.$newname.$ext;
 				$counter++;
 			} while ($view->file_exists($newpath));
 		}
@@ -355,7 +355,7 @@ 
 		}
 		$fullPath = Filesystem::normalizePath($view->getAbsolutePath($path));
 
-		$cacheKey = $fullPath . '::' . ($includeMountPoints ? 'include' : 'exclude');
+		$cacheKey = $fullPath.'::'.($includeMountPoints ? 'include' : 'exclude');
 		if ($useCache) {
 			$cached = $memcache->get($cacheKey);
 			if ($cached) {
@@ -466,7 +466,7 @@ 
 
 		if ($isRemoteShare === false && $ownerId !== false && $path === '/') {
 			// If path is root, store this as last known quota usage for this user
-			\OCP\Server::get(\OCP\IConfig::class)->setUserValue($ownerId, 'files', 'lastSeenQuotaUsage', (string)$relative);
+			\OCP\Server::get(\OCP\IConfig::class)->setUserValue($ownerId, 'files', 'lastSeenQuotaUsage', (string) $relative);
 		}
 
 		$memcache->set($cacheKey, $info, 5 * 60);
@@ -480,7 +480,7 @@ 
 	 * @psalm-suppress LessSpecificReturnStatement Legacy code outputs weird types - manually validated that they are correct
 	 * @return StorageInfo
 	 */
-	private static function getGlobalStorageInfo(int|float $quota, IUser $user, IMountPoint $mount): array {
+	private static function getGlobalStorageInfo(int | float $quota, IUser $user, IMountPoint $mount): array {
 		$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
 		/** @var int|float $used */
 		$used = $rootInfo['size'];
@@ -525,9 +525,9 @@ 
 		/** @var ICacheFactory $cacheFactory */
 		$cacheFactory = \OC::$server->get(ICacheFactory::class);
 		$memcache = $cacheFactory->createLocal('storage_info');
-		$cacheKeyPrefix = Filesystem::normalizePath($absolutePath) . '::';
-		$memcache->remove($cacheKeyPrefix . 'include');
-		$memcache->remove($cacheKeyPrefix . 'exclude');
+		$cacheKeyPrefix = Filesystem::normalizePath($absolutePath).'::';
+		$memcache->remove($cacheKeyPrefix.'include');
+		$memcache->remove($cacheKeyPrefix.'exclude');
 	}
 
 	/**

lib/private/Installer.php

Spacing +29 added lines, -29 removed lines

@@ -60,14 +60,14 @@ 
 			throw new \Exception('App not found in any app directory');
 		}
 
-		$basedir = $app['path'] . '/' . $appId;
+		$basedir = $app['path'].'/'.$appId;
 
-		if (is_file($basedir . '/appinfo/database.xml')) {
-			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+		if (is_file($basedir.'/appinfo/database.xml')) {
+			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in '.$appId);
 		}
 
 		$l = \OCP\Util::getL10N('core');
-		$info = \OCP\Server::get(IAppManager::class)->getAppInfoByPath($basedir . '/appinfo/info.xml', $l->getLanguageCode());
+		$info = \OCP\Server::get(IAppManager::class)->getAppInfoByPath($basedir.'/appinfo/info.xml', $l->getLanguageCode());
 
 		if (!is_array($info)) {
 			throw new \Exception(
@@ -113,7 +113,7 @@ 
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
 		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
+		self::includeAppScript($basedir.'/appinfo/install.php');
 
 		OC_App::executeRepairSteps($appId, $info['repair-steps']['install']);
 
@@ -124,10 +124,10 @@ 
 
 		//set remote/public handlers
 		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_' . $name, $info['id'] . '/' . $path);
+			$config->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
 		}
 		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_' . $name, $info['id'] . '/' . $path);
+			$config->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
 		}
 
 		OC_App::setAppTypes($info['id']);
@@ -184,7 +184,7 @@ 
 			if ($app['id'] === $appId) {
 				// Load the certificate
 				$certificate = new X509();
-				$rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
+				$rootCrt = file_get_contents(__DIR__.'/../../resources/codesigning/root.crt');
 				$rootCrts = $this->splitCerts($rootCrt);
 				foreach ($rootCrts as $rootCrt) {
 					$certificate->loadCA($rootCrt);
@@ -196,7 +196,7 @@ 
 				foreach ($rootCrts as $rootCrt) {
 					$crl->loadCA($rootCrt);
 				}
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+				$crl->loadCRL(file_get_contents(__DIR__.'/../../resources/codesigning/root.crl'));
 				if ($crl->validateSignature() !== true) {
 					throw new \Exception('Could not validate CRL signature');
 				}
@@ -264,11 +264,11 @@ 
 
 					$archive = new TAR($tempFile);
 					if (!$archive->extract($extractDir)) {
-						$errorMessage = 'Could not extract app ' . $appId;
+						$errorMessage = 'Could not extract app '.$appId;
 
 						$archiveError = $archive->getError();
 						if ($archiveError instanceof \PEAR_Error) {
-							$errorMessage .= ': ' . $archiveError->getMessage();
+							$errorMessage .= ': '.$archiveError->getMessage();
 						}
 
 						throw new \Exception($errorMessage);
@@ -296,7 +296,7 @@ 
 					}
 
 					// Check if appinfo/info.xml has the same app ID as well
-					$xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));
+					$xml = simplexml_load_string(file_get_contents($extractDir.'/'.$folders[0].'/appinfo/info.xml'));
 
 					if ($xml === false) {
 						throw new \Exception(
@@ -307,19 +307,19 @@ 
 						);
 					}
 
-					if ((string)$xml->id !== $appId) {
+					if ((string) $xml->id !== $appId) {
 						throw new \Exception(
 							sprintf(
 								'App for id %s has a wrong app ID in info.xml: %s',
 								$appId,
-								(string)$xml->id
+								(string) $xml->id
 							)
 						);
 					}
 
 					// Check if the version is lower than before
 					$currentVersion = \OCP\Server::get(IAppManager::class)->getAppVersion($appId, true);
-					$newVersion = (string)$xml->version;
+					$newVersion = (string) $xml->version;
 					if (version_compare($currentVersion, $newVersion) === 1) {
 						throw new \Exception(
 							sprintf(
@@ -331,12 +331,12 @@ 
 						);
 					}
 
-					$baseDir = OC_App::getInstallPath() . '/' . $appId;
+					$baseDir = OC_App::getInstallPath().'/'.$appId;
 					// Remove old app with the ID if existent
 					Files::rmdirr($baseDir);
 					// Move to app folder
 					if (@mkdir($baseDir)) {
-						$extractDir .= '/' . $folders[0];
+						$extractDir .= '/'.$folders[0];
 					}
 					// otherwise we just copy the outer directory
 					$this->copyRecursive($extractDir, $baseDir);
@@ -368,7 +368,7 @@ 
 	 * @param bool $allowUnstable
 	 * @return string|false false or the version number of the update
 	 */
-	public function isUpdateAvailable($appId, $allowUnstable = false): string|false {
+	public function isUpdateAvailable($appId, $allowUnstable = false): string | false {
 		if ($this->isInstanceReadyForUpdates === null) {
 			$installPath = OC_App::getInstallPath();
 			if ($installPath === null) {
@@ -419,8 +419,8 @@ 
 		if ($app === false) {
 			return false;
 		}
-		$basedir = $app['path'] . '/' . $appId;
-		return file_exists($basedir . '/.git/');
+		$basedir = $app['path'].'/'.$appId;
+		return file_exists($basedir.'/.git/');
 	}
 
 	/**
@@ -458,11 +458,11 @@ 
 			if (\OCP\Server::get(IAppManager::class)->isShipped($appId)) {
 				return false;
 			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
+			$appDir = OC_App::getInstallPath().'/'.$appId;
 			Files::rmdirr($appDir);
 			return true;
 		} else {
-			$this->logger->error('can\'t remove app ' . $appId . '. It is not installed.');
+			$this->logger->error('can\'t remove app '.$appId.'. It is not installed.');
 
 			return false;
 		}
@@ -506,8 +506,8 @@ 
 		foreach (\OC::$APPSROOTS as $app_dir) {
 			if ($dir = opendir($app_dir['path'])) {
 				while (false !== ($filename = readdir($dir))) {
-					if ($filename[0] !== '.' and is_dir($app_dir['path'] . "/$filename")) {
-						if (file_exists($app_dir['path'] . "/$filename/appinfo/info.xml")) {
+					if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
+						if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
 							if ($config->getAppValue($filename, 'installed_version', null) === null) {
 								$enabled = $appManager->isDefaultEnabled($filename);
 								if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
@@ -541,9 +541,9 @@ 
 	/**
 	 * install an app already placed in the app folder
 	 */
-	public static function installShippedApp(string $app, ?IOutput $output = null): string|false {
+	public static function installShippedApp(string $app, ?IOutput $output = null): string | false {
 		if ($output instanceof IOutput) {
-			$output->debug('Installing ' . $app);
+			$output->debug('Installing '.$app);
 		}
 
 		$appManager = \OCP\Server::get(IAppManager::class);
@@ -567,7 +567,7 @@ 
 			return false;
 		}
 		if ($output instanceof IOutput) {
-			$output->debug('Registering tasks of ' . $app);
+			$output->debug('Registering tasks of '.$app);
 		}
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
@@ -580,10 +580,10 @@ 
 
 		//set remote/public handlers
 		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_' . $name, $app . '/' . $path);
+			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
 		}
 		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_' . $name, $app . '/' . $path);
+			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
 
 		OC_App::setAppTypes($info['id']);