nextcloud / server

lib/private/Log.php

Spacing +3 added lines, -3 removed lines

@@ -310,7 +310,7 @@ 
 		try {
 			$serializer = $this->getSerializer();
 		} catch (Throwable $e) {
-			$this->error("Failed to load ExceptionSerializer serializer while trying to log " . $exception->getMessage());
+			$this->error("Failed to load ExceptionSerializer serializer while trying to log ".$exception->getMessage());
 			return;
 		}
 		$data = $context;
@@ -359,7 +359,7 @@ 
 			$context['level'] = $level;
 		} catch (Throwable $e) {
 			// make sure we dont hard crash if logging fails
-			error_log('Error when trying to log exception: ' . $e->getMessage() . ' ' . $e->getTraceAsString());
+			error_log('Error when trying to log exception: '.$e->getMessage().' '.$e->getTraceAsString());
 		}
 	}
 
@@ -390,7 +390,7 @@ 
 		$replace = [];
 		$usedContextKeys = [];
 		foreach ($context as $key => $val) {
-			$fullKey = '{' . $key . '}';
+			$fullKey = '{'.$key.'}';
 			$replace[$fullKey] = $val;
 			if (str_contains($message, $fullKey)) {
 				$usedContextKeys[$key] = true;

lib/private/TemplateLayout.php

Spacing +11 added lines, -11 removed lines

@@ -98,7 +98,7 @@ 
 			$this->navigationManager = \OC::$server->get(INavigationManager::class);
 
 			parent::__construct('core', 'layout.user');
-			if (in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+			if (in_array(\OC_App::getCurrentApp(), ['settings', 'admin', 'help']) !== false) {
 				$this->assign('bodyid', 'body-settings');
 			} else {
 				$this->assign('bodyid', 'body-user');
@@ -106,8 +106,8 @@ 
 
 			$this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
 			$this->initialState->provideInitialState('core', 'apps', $this->navigationManager->getAll());
-			$this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT));
-			$this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
+			$this->initialState->provideInitialState('unified-search', 'limit-default', (int) $this->config->getAppValue('core', 'unified-search.limit-default', (string) SearchQuery::LIMIT_DEFAULT));
+			$this->initialState->provideInitialState('unified-search', 'min-search-length', (int) $this->config->getAppValue('core', 'unified-search.min-search-length', (string) 1));
 			$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
 			Util::addScript('core', 'unified-search', 'core');
 
@@ -247,7 +247,7 @@ 
 		foreach ($jsFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
-			$this->append('jsfiles', $web.'/'.$file . $this->getVersionHashSuffix());
+			$this->append('jsfiles', $web.'/'.$file.$this->getVersionHashSuffix());
 		}
 
 		try {
@@ -280,14 +280,14 @@ 
 			$file = $info[2];
 
 			if (substr($file, -strlen('print.css')) === 'print.css') {
-				$this->append('printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix());
+				$this->append('printcssfiles', $web.'/'.$file.$this->getVersionHashSuffix());
 			} else {
 				$suffix = $this->getVersionHashSuffix($web, $file);
 
 				if (!str_contains($file, '?v=')) {
-					$this->append('cssfiles', $web.'/'.$file . $suffix);
+					$this->append('cssfiles', $web.'/'.$file.$suffix);
 				} else {
-					$this->append('cssfiles', $web.'/'.$file . '-' . substr($suffix, 3));
+					$this->append('cssfiles', $web.'/'.$file.'-'.substr($suffix, 3));
 				}
 			}
 		}
@@ -313,7 +313,7 @@ 
 
 		if ($this->config->getSystemValueBool('installed', false)) {
 			if (\OC::$server->getAppManager()->isInstalled('theming')) {
-				$themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
+				$themingSuffix = '-'.$this->config->getAppValue('theming', 'cachebuster', '0');
 			}
 			$v = \OC_App::getAppVersions();
 		}
@@ -323,7 +323,7 @@ 
 			$appName = $this->getAppNamefromPath($path);
 			if (array_key_exists($appName, $v)) {
 				$appVersion = $v[$appName];
-				return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
+				return '?v='.substr(md5($appVersion), 0, 8).$themingSuffix;
 			}
 		}
 		// fallback to the file path instead
@@ -331,11 +331,11 @@ 
 			$appName = $this->getAppNamefromPath($file);
 			if (array_key_exists($appName, $v)) {
 				$appVersion = $v[$appName];
-				return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
+				return '?v='.substr(md5($appVersion), 0, 8).$themingSuffix;
 			}
 		}
 
-		return '?v=' . self::$versionHash . $themingSuffix;
+		return '?v='.self::$versionHash.$themingSuffix;
 	}
 
 	/**

lib/private/App/DependencyAnalyzer.php

Spacing +5 added lines, -5 removed lines

@@ -186,7 +186,7 @@ 
 		if (!is_array($supportedArchitectures)) {
 			$supportedArchitectures = [$supportedArchitectures];
 		}
-		$supportedArchitectures = array_map(function ($architecture) {
+		$supportedArchitectures = array_map(function($architecture) {
 			return $this->getValue($architecture);
 		}, $supportedArchitectures);
 		$currentArchitecture = $this->platform->getArchitecture();
@@ -213,7 +213,7 @@ 
 		if (!is_array($supportedDatabases)) {
 			$supportedDatabases = [$supportedDatabases];
 		}
-		$supportedDatabases = array_map(function ($db) {
+		$supportedDatabases = array_map(function($db) {
 			return $this->getValue($db);
 		}, $supportedDatabases);
 		$currentDatabase = $this->platform->getDatabase();
@@ -313,7 +313,7 @@ 
 			return $missing;
 		}
 		if (is_array($oss)) {
-			$oss = array_map(function ($os) {
+			$oss = array_map(function($os) {
 				return $this->getValue($os);
 			}, $oss);
 		} else {
@@ -384,7 +384,7 @@ 
 				return '10';
 			default:
 				if (str_starts_with($version, '9.1.')) {
-					$version = '10.0.' . substr($version, 4);
+					$version = '10.0.'.substr($version, 4);
 				}
 				return $version;
 		}
@@ -398,6 +398,6 @@ 
 		if (isset($element['@value'])) {
 			return $element['@value'];
 		}
-		return (string)$element;
+		return (string) $element;
 	}
 }

lib/private/DB/SchemaWrapper.php

Spacing +5 added lines, -5 removed lines

@@ -61,7 +61,7 @@ 
 	 */
 	public function getTableNamesWithoutPrefix() {
 		$tableNames = $this->schema->getTableNames();
-		return array_map(function ($tableName) {
+		return array_map(function($tableName) {
 			if (str_starts_with($tableName, $this->connection->getPrefix())) {
 				return substr($tableName, strlen($this->connection->getPrefix()));
 			}
@@ -86,7 +86,7 @@ 
 	 * @throws \Doctrine\DBAL\Schema\SchemaException
 	 */
 	public function getTable($tableName) {
-		return $this->schema->getTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->getTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 	 * @return boolean
 	 */
 	public function hasTable($tableName) {
-		return $this->schema->hasTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->hasTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 */
 	public function createTable($tableName) {
 		unset($this->tablesToDelete[$tableName]);
-		return $this->schema->createTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->createTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function dropTable($tableName) {
 		$this->tablesToDelete[$tableName] = true;
-		return $this->schema->dropTable($this->connection->getPrefix() . $tableName);
+		return $this->schema->dropTable($this->connection->getPrefix().$tableName);
 	}
 
 	/**

lib/private/URLGenerator.php

Spacing +49 added lines, -49 removed lines

@@ -124,7 +124,7 @@ 
 		}
 
 		$route = substr($route, 7);
-		$route = '/ocs/v2.php' . $route;
+		$route = '/ocs/v2.php'.$route;
 
 		return $this->getAbsoluteURL($route);
 	}
@@ -146,33 +146,33 @@ 
 		if ($appName !== '') {
 			$app_path = $this->getAppManager()->getAppPath($appName);
 			// Check if the app is in the app folder
-			if (file_exists($app_path . '/' . $file)) {
+			if (file_exists($app_path.'/'.$file)) {
 				if (substr($file, -3) === 'php') {
-					$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $appName;
+					$urlLinkTo = \OC::$WEBROOT.'/index.php/apps/'.$appName;
 					if ($frontControllerActive) {
-						$urlLinkTo = \OC::$WEBROOT . '/apps/' . $appName;
+						$urlLinkTo = \OC::$WEBROOT.'/apps/'.$appName;
 					}
-					$urlLinkTo .= ($file !== 'index.php') ? '/' . $file : '';
+					$urlLinkTo .= ($file !== 'index.php') ? '/'.$file : '';
 				} else {
-					$urlLinkTo = $this->getAppManager()->getAppWebPath($appName) . '/' . $file;
+					$urlLinkTo = $this->getAppManager()->getAppWebPath($appName).'/'.$file;
 				}
 			} else {
-				$urlLinkTo = \OC::$WEBROOT . '/' . $appName . '/' . $file;
+				$urlLinkTo = \OC::$WEBROOT.'/'.$appName.'/'.$file;
 			}
 		} else {
-			if (file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
-				$urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
+			if (file_exists(\OC::$SERVERROOT.'/core/'.$file)) {
+				$urlLinkTo = \OC::$WEBROOT.'/core/'.$file;
 			} else {
 				if ($frontControllerActive && $file === 'index.php') {
-					$urlLinkTo = \OC::$WEBROOT . '/';
+					$urlLinkTo = \OC::$WEBROOT.'/';
 				} else {
-					$urlLinkTo = \OC::$WEBROOT . '/' . $file;
+					$urlLinkTo = \OC::$WEBROOT.'/'.$file;
 				}
 			}
 		}
 
 		if ($args && $query = http_build_query($args, '', '&')) {
-			$urlLinkTo .= '?' . $query;
+			$urlLinkTo .= '?'.$query;
 		}
 
 		return $urlLinkTo;
@@ -208,7 +208,7 @@ 
 				$appName = 'core';
 				$appPath = false;
 			} else {
-				throw new RuntimeException('image not found: image: ' . $file . ' webroot: ' . \OC::$WEBROOT . ' serverroot: ' . \OC::$SERVERROOT);
+				throw new RuntimeException('image not found: image: '.$file.' webroot: '.\OC::$WEBROOT.' serverroot: '.\OC::$SERVERROOT);
 			}
 		}
 
@@ -223,38 +223,38 @@ 
 			}
 		}
 
-		if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$appName/img/$basename.png")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/apps/$appName/img/$basename.png";
-		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/$appName/img/$file";
-		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/$appName/img/$basename.png"))) {
-			$path = \OC::$WEBROOT . "/themes/$theme/$appName/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$file")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/core/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+		if (file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$appName/img/$file")) {
+			$path = \OC::$WEBROOT."/themes/$theme/apps/$appName/img/$file";
+		} elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$appName/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/apps/$appName/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/apps/$appName/img/$basename.png";
+		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT."/themes/$theme/$appName/img/$file")) {
+			$path = \OC::$WEBROOT."/themes/$theme/$appName/img/$file";
+		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT."/themes/$theme/$appName/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/$appName/img/$basename.png"))) {
+			$path = \OC::$WEBROOT."/themes/$theme/$appName/img/$basename.png";
+		} elseif (file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$file")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$file";
+		} elseif (!file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/themes/$theme/core/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
 		} elseif ($themingEnabled && $themingImagePath) {
 			$path = $themingImagePath;
-		} elseif ($appPath && file_exists($appPath . "/img/$file")) {
-			$path = $this->getAppManager()->getAppWebPath($appName) . "/img/$file";
-		} elseif ($appPath && !file_exists($appPath . "/img/$basename.svg")
-			&& file_exists($appPath . "/img/$basename.png")) {
-			$path = $this->getAppManager()->getAppWebPath($appName) . "/img/$basename.png";
-		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT . "/$appName/img/$file")) {
-			$path = \OC::$WEBROOT . "/$appName/img/$file";
-		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.svg")
-				&& file_exists(\OC::$SERVERROOT . "/$appName/img/$basename.png"))) {
-			$path = \OC::$WEBROOT . "/$appName/img/$basename.png";
-		} elseif (file_exists(\OC::$SERVERROOT . "/core/img/$file")) {
-			$path = \OC::$WEBROOT . "/core/img/$file";
-		} elseif (!file_exists(\OC::$SERVERROOT . "/core/img/$basename.svg")
-			&& file_exists(\OC::$SERVERROOT . "/core/img/$basename.png")) {
-			$path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png";
+		} elseif ($appPath && file_exists($appPath."/img/$file")) {
+			$path = $this->getAppManager()->getAppWebPath($appName)."/img/$file";
+		} elseif ($appPath && !file_exists($appPath."/img/$basename.svg")
+			&& file_exists($appPath."/img/$basename.png")) {
+			$path = $this->getAppManager()->getAppWebPath($appName)."/img/$basename.png";
+		} elseif (!empty($appName) and file_exists(\OC::$SERVERROOT."/$appName/img/$file")) {
+			$path = \OC::$WEBROOT."/$appName/img/$file";
+		} elseif (!empty($appName) and (!file_exists(\OC::$SERVERROOT."/$appName/img/$basename.svg")
+				&& file_exists(\OC::$SERVERROOT."/$appName/img/$basename.png"))) {
+			$path = \OC::$WEBROOT."/$appName/img/$basename.png";
+		} elseif (file_exists(\OC::$SERVERROOT."/core/img/$file")) {
+			$path = \OC::$WEBROOT."/core/img/$file";
+		} elseif (!file_exists(\OC::$SERVERROOT."/core/img/$basename.svg")
+			&& file_exists(\OC::$SERVERROOT."/core/img/$basename.png")) {
+			$path = \OC::$WEBROOT."/themes/$theme/core/img/$basename.png";
 		}
 
 		if ($path !== '') {
@@ -262,7 +262,7 @@ 
 			return $path;
 		}
 
-		throw new RuntimeException('image not found: image:' . $file . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
+		throw new RuntimeException('image not found: image:'.$file.' webroot:'.\OC::$WEBROOT.' serverroot:'.\OC::$SERVERROOT);
 	}
 
 
@@ -275,14 +275,14 @@ 
 		$separator = str_starts_with($url, '/') ? '' : '/';
 
 		if (\OC::$CLI && !\defined('PHPUNIT_RUN')) {
-			return rtrim($this->config->getSystemValueString('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
+			return rtrim($this->config->getSystemValueString('overwrite.cli.url'), '/').'/'.ltrim($url, '/');
 		}
 		// The ownCloud web root can already be prepended.
 		if (\OC::$WEBROOT !== '' && str_starts_with($url, \OC::$WEBROOT)) {
 			$url = substr($url, \strlen(\OC::$WEBROOT));
 		}
 
-		return $this->getBaseUrl() . $separator . $url;
+		return $this->getBaseUrl().$separator.$url;
 	}
 
 	/**
@@ -315,10 +315,10 @@ 
 
 		if ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false)
 			|| getenv('front_controller_active') === 'true') {
-			return $this->getAbsoluteURL('/apps/' . $appId . '/');
+			return $this->getAbsoluteURL('/apps/'.$appId.'/');
 		}
 
-		return $this->getAbsoluteURL('/index.php/apps/' . $appId . '/');
+		return $this->getAbsoluteURL('/index.php/apps/'.$appId.'/');
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	public function getBaseUrl(): string {
 		// BaseUrl can be equal to 'http(s)://' during the first steps of the initial setup.
 		if ($this->baseUrl === null || $this->baseUrl === "http://" || $this->baseUrl === "https://") {
-			$this->baseUrl = $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT;
+			$this->baseUrl = $this->request->getServerProtocol().'://'.$this->request->getServerHost().\OC::$WEBROOT;
 		}
 		return $this->baseUrl;
 	}

lib/private/AppFramework/App.php

Spacing +11 added lines, -11 removed lines

@@ -66,7 +66,7 @@ 
 	public static function buildAppNamespace(string $appId, string $topNamespace = 'OCA\\'): string {
 		// Hit the cache!
 		if (isset(self::$nameSpaceCache[$appId])) {
-			return $topNamespace . self::$nameSpaceCache[$appId];
+			return $topNamespace.self::$nameSpaceCache[$appId];
 		}
 
 		$appInfo = \OCP\Server::get(IAppManager::class)->getAppInfo($appId);
@@ -88,7 +88,7 @@ 
 			}
 		}
 
-		return $topNamespace . self::$nameSpaceCache[$appId];
+		return $topNamespace.self::$nameSpaceCache[$appId];
 	}
 
 	public static function getAppIdForClass(string $className, string $topNamespace = 'OCA\\'): ?string {
@@ -97,7 +97,7 @@ 
 		}
 
 		foreach (self::$nameSpaceCache as $appId => $namespace) {
-			if (str_starts_with($className, $topNamespace . $namespace . '\\')) {
+			if (str_starts_with($className, $topNamespace.$namespace.'\\')) {
 				return $appId;
 			}
 		}
@@ -151,7 +151,7 @@ 
 			if (str_contains($controllerName, '\\Controller\\')) {
 				// This is from a global registered app route that is not enabled.
 				[/*OC(A)*/, $app, /* Controller/Name*/] = explode('\\', $controllerName, 3);
-				throw new HintException('App ' . strtolower($app) . ' is not enabled');
+				throw new HintException('App '.strtolower($app).' is not enabled');
 			}
 
 			if ($appName === 'core') {
@@ -159,7 +159,7 @@ 
 			} else {
 				$appNameSpace = self::buildAppNamespace($appName);
 			}
-			$controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
+			$controllerName = $appNameSpace.'\\Controller\\'.$controllerName;
 			$controller = $container->query($controllerName);
 		}
 
@@ -191,8 +191,8 @@ 
 			$eventLogger->end('runtime');
 			$profile = $profiler->collect($container->get(IRequest::class), $response);
 			$profiler->saveProfile($profile);
-			$io->setHeader('X-Debug-Token:' . $profile->getToken());
-			$io->setHeader('Server-Timing: token;desc="' . $profile->getToken() . '"');
+			$io->setHeader('X-Debug-Token:'.$profile->getToken());
+			$io->setHeader('Server-Timing: token;desc="'.$profile->getToken().'"');
 		}
 
 		if (!is_null($httpHeaders)) {
@@ -200,7 +200,7 @@ 
 		}
 
 		foreach ($responseHeaders as $name => $value) {
-			$io->setHeader($name . ': ' . $value);
+			$io->setHeader($name.': '.$value);
 		}
 
 		foreach ($responseCookies as $name => $value) {
@@ -230,7 +230,7 @@ 
 		 */
 		$emptyResponse = false;
 		if (preg_match('/^HTTP\/\d\.\d (\d{3}) .*$/', $httpHeaders, $matches)) {
-			$status = (int)$matches[1];
+			$status = (int) $matches[1];
 			if ($status === Http::STATUS_NO_CONTENT || $status === Http::STATUS_NOT_MODIFIED) {
 				$emptyResponse = true;
 			}
@@ -240,7 +240,7 @@ 
 			if ($response instanceof ICallbackResponse) {
 				$response->callback($io);
 			} elseif (!is_null($output)) {
-				$io->setHeader('Content-Length: ' . strlen($output));
+				$io->setHeader('Content-Length: '.strlen($output));
 				$io->setOutput($output);
 			}
 		}
@@ -263,7 +263,7 @@ 
 
 		$dispatcher = $container['Dispatcher'];
 
-		[, , $output] = $dispatcher->dispatch($controller, $methodName);
+		[,, $output] = $dispatcher->dispatch($controller, $methodName);
 		return $output;
 	}
 }

lib/private/AppFramework/Http/Request.php

Spacing +8 added lines, -8 removed lines

@@ -299,8 +299,8 @@ 
 	 */
 	public function getHeader(string $name): string {
 		$name = strtoupper(str_replace('-', '_', $name));
-		if (isset($this->server['HTTP_' . $name])) {
-			return $this->server['HTTP_' . $name];
+		if (isset($this->server['HTTP_'.$name])) {
+			return $this->server['HTTP_'.$name];
 		}
 
 		// There's a few headers that seem to end up in the top-level
@@ -624,7 +624,7 @@ 
 	 * @return bool
 	 */
 	private function isOverwriteCondition(string $type = ''): bool {
-		$regex = '/' . $this->config->getSystemValueString('overwritecondaddr', '')  . '/';
+		$regex = '/'.$this->config->getSystemValueString('overwritecondaddr', '').'/';
 		$remoteAddr = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '';
 		return $regex === '//' || preg_match($regex, $remoteAddr) === 1
 		|| $type !== 'protocol';
@@ -697,7 +697,7 @@ 
 	public function getRequestUri(): string {
 		$uri = isset($this->server['REQUEST_URI']) ? $this->server['REQUEST_URI'] : '';
 		if ($this->config->getSystemValueString('overwritewebroot') !== '' && $this->isOverwriteCondition()) {
-			$uri = $this->getScriptName() . substr($uri, \strlen($this->server['SCRIPT_NAME']));
+			$uri = $this->getScriptName().substr($uri, \strlen($this->server['SCRIPT_NAME']));
 		}
 		return $uri;
 	}
@@ -724,7 +724,7 @@ 
 		// FIXME: Sabre does not really belong here
 		[$path, $name] = \Sabre\Uri\split($scriptName);
 		if (!empty($path)) {
-			if ($path === $pathInfo || str_starts_with($pathInfo, $path . '/')) {
+			if ($path === $pathInfo || str_starts_with($pathInfo, $path.'/')) {
 				$pathInfo = substr($pathInfo, \strlen($path));
 			} else {
 				throw new \Exception("The requested uri($requestUri) cannot be processed by the script '$scriptName')");
@@ -734,7 +734,7 @@ 
 			$name = '';
 		}
 
-		if (str_starts_with($pathInfo, '/' . $name)) {
+		if (str_starts_with($pathInfo, '/'.$name)) {
 			$pathInfo = substr($pathInfo, \strlen($name) + 1);
 		}
 		if ($name !== '' && str_starts_with($pathInfo, $name)) {
@@ -769,7 +769,7 @@ 
 			// FIXME: This code is untestable due to __DIR__, also that hardcoded path is really dangerous
 			$serverRoot = str_replace('\\', '/', substr(__DIR__, 0, -\strlen('lib/private/appframework/http/')));
 			$suburi = str_replace('\\', '/', substr(realpath($this->server['SCRIPT_FILENAME']), \strlen($serverRoot)));
-			$name = '/' . ltrim($overwriteWebRoot . $suburi, '/');
+			$name = '/'.ltrim($overwriteWebRoot.$suburi, '/');
 		}
 		return $name;
 	}
@@ -844,7 +844,7 @@ 
 			return $host;
 		}
 
-		$trustedList = (array)$this->config->getSystemValue('trusted_domains', []);
+		$trustedList = (array) $this->config->getSystemValue('trusted_domains', []);
 		if (count($trustedList) > 0) {
 			return reset($trustedList);
 		}

lib/private/legacy/OC_Files.php

Spacing +22 added lines, -22 removed lines

@@ -63,7 +63,7 @@ 
 
 	private static function getBoundary(): string {
 		if (empty(self::$multipartBoundary)) {
-			self::$multipartBoundary = md5((string)mt_rand());
+			self::$multipartBoundary = md5((string) mt_rand());
 		}
 		return self::$multipartBoundary;
 	}
@@ -76,7 +76,7 @@ 
 	private static function sendHeaders($filename, $name, array $rangeArray): void {
 		OC_Response::setContentDispositionHeader($name, 'attachment');
 		header('Content-Transfer-Encoding: binary', true);
-		header('Pragma: public');// enable caching in IE
+		header('Pragma: public'); // enable caching in IE
 		header('Expires: 0');
 		header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 		$fileSize = \OC\Files\Filesystem::filesize($filename);
@@ -118,7 +118,7 @@ 
 			}
 
 			if (!is_array($files)) {
-				$filename = $dir . '/' . $files;
+				$filename = $dir.'/'.$files;
 				if (!$view->is_dir($filename)) {
 					self::getSingleFile($view, $dir, $files, is_null($params) ? [] : $params);
 					return;
@@ -133,9 +133,9 @@ 
 					$name = $basename;
 				}
 
-				$filename = $dir . '/' . $name;
+				$filename = $dir.'/'.$name;
 			} else {
-				$filename = $dir . '/' . $files;
+				$filename = $dir.'/'.$files;
 				$getType = self::ZIP_DIR;
 				// downloading root ?
 				if ($files !== '') {
@@ -151,7 +151,7 @@ 
 			if ($getType === self::ZIP_FILES) {
 				$fileInfos = [];
 				foreach ($files as $file) {
-					$fileInfo = \OC\Files\Filesystem::getFileInfo($dir . '/' . $file);
+					$fileInfo = \OC\Files\Filesystem::getFileInfo($dir.'/'.$file);
 					if ($fileInfo) {
 						$fileSize += $fileInfo->getSize();
 						$fileInfos[] = $fileInfo;
@@ -159,7 +159,7 @@ 
 				}
 				$numberOfFiles = self::getNumberOfFiles($fileInfos);
 			} elseif ($getType === self::ZIP_DIR) {
-				$fileInfo = \OC\Files\Filesystem::getFileInfo($dir . '/' . $files);
+				$fileInfo = \OC\Files\Filesystem::getFileInfo($dir.'/'.$files);
 				if ($fileInfo) {
 					$fileSize = $fileInfo->getSize();
 					$numberOfFiles = self::getNumberOfFiles([$fileInfo]);
@@ -178,7 +178,7 @@ 
 			OC_Util::obEnd();
 
 			$streamer->sendHeaders($name);
-			$executionTime = (int)OC::$server->get(IniGetWrapper::class)->getNumeric('max_execution_time');
+			$executionTime = (int) OC::$server->get(IniGetWrapper::class)->getNumeric('max_execution_time');
 			if (!str_contains(@ini_get('disable_functions'), 'set_time_limit')) {
 				@set_time_limit(0);
 			}
@@ -186,7 +186,7 @@ 
 
 			if ($getType === self::ZIP_FILES) {
 				foreach ($files as $file) {
-					$file = $dir . '/' . $file;
+					$file = $dir.'/'.$file;
 					if (\OC\Files\Filesystem::is_file($file)) {
 						$userFolder = \OC::$server->getRootFolder()->get(\OC\Files\Filesystem::getRoot());
 						$file = $userFolder->get($file);
@@ -202,7 +202,7 @@ 
 							// File is not a file? …
 							\OC::$server->getLogger()->debug(
 								'File given, but no Node available. Name {file}',
-								[ 'app' => 'files', 'file' => $file ]
+								['app' => 'files', 'file' => $file]
 							);
 							continue;
 						}
@@ -213,7 +213,7 @@ 
 					}
 				}
 			} elseif ($getType === self::ZIP_DIR) {
-				$file = $dir . '/' . $files;
+				$file = $dir.'/'.$files;
 				$streamer->addDirRecursive($file);
 			}
 			$streamer->finalize();
@@ -236,7 +236,7 @@ 
 			$l = \OC::$server->getL10N('lib');
 			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
 			if ($event && $event->getErrorMessage() !== null) {
-				$hint .= ' ' . $event->getErrorMessage();
+				$hint .= ' '.$event->getErrorMessage();
 			}
 			\OC_Template::printErrorPage($l->t('Cannot download file'), $hint, 200);
 		}
@@ -271,21 +271,21 @@ 
 				if ($ranges[1] >= $fileSize) {
 					$ranges[1] = $fileSize - 1;
 				}
-				$rangeArray[$ind++] = [ 'from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize ];
+				$rangeArray[$ind++] = ['from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize];
 				$minOffset = $ranges[1] + 1;
 				if ($minOffset >= $fileSize) {
 					break;
 				}
 			} elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) {
 				// case: x-
-				$rangeArray[$ind++] = [ 'from' => $ranges[0], 'to' => $fileSize - 1, 'size' => $fileSize ];
+				$rangeArray[$ind++] = ['from' => $ranges[0], 'to' => $fileSize - 1, 'size' => $fileSize];
 				break;
 			} elseif (is_numeric($ranges[1])) {
 				// case: -x
 				if ($ranges[1] > $fileSize) {
 					$ranges[1] = $fileSize;
 				}
-				$rangeArray[$ind++] = [ 'from' => $fileSize - $ranges[1], 'to' => $fileSize - 1, 'size' => $fileSize ];
+				$rangeArray[$ind++] = ['from' => $fileSize - $ranges[1], 'to' => $fileSize - 1, 'size' => $fileSize];
 				break;
 			}
 		}
@@ -300,7 +300,7 @@ 
 	 * @throws \OC\ForbiddenException
 	 */
 	private static function getSingleFile($view, $dir, $name, $params) {
-		$filename = $dir . '/' . $name;
+		$filename = $dir.'/'.$name;
 		$file = null;
 
 		try {
@@ -414,17 +414,17 @@ 
 	 */
 	public static function lockFiles($view, $dir, $files) {
 		if (!is_array($files)) {
-			$file = $dir . '/' . $files;
+			$file = $dir.'/'.$files;
 			$files = [$file];
 		}
 		foreach ($files as $file) {
-			$file = $dir . '/' . $file;
+			$file = $dir.'/'.$file;
 			$view->lockFile($file, ILockingProvider::LOCK_SHARED);
 			if ($view->is_dir($file)) {
 				$contents = $view->getDirectoryContent($file);
-				$contents = array_map(function ($fileInfo) use ($file) {
+				$contents = array_map(function($fileInfo) use ($file) {
 					/** @var \OCP\Files\FileInfo $fileInfo */
-					return $file . '/' . $fileInfo->getName();
+					return $file.'/'.$fileInfo->getName();
 				}, $contents);
 				self::lockFiles($view, $dir, $contents);
 			}
@@ -444,12 +444,12 @@ 
 		}
 		if ($getType === self::ZIP_FILES) {
 			foreach ($files as $file) {
-				$file = $dir . '/' . $file;
+				$file = $dir.'/'.$file;
 				$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
 			}
 		}
 		if ($getType === self::ZIP_DIR) {
-			$file = $dir . '/' . $files;
+			$file = $dir.'/'.$files;
 			$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
 		}
 	}

lib/private/legacy/OC_Util.php

Spacing +34 added lines, -34 removed lines

@@ -184,7 +184,7 @@ 
 		/** @var LoggerInterface $logger */
 		$logger = \OC::$server->get(LoggerInterface::class);
 
-		$plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValueString('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
+		$plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValueString('skeletondirectory', \OC::$SERVERROOT.'/core/skeleton');
 		$userLang = \OC::$server->getL10NFactory()->findLanguage();
 		$skeletonDirectory = str_replace('{lang}', $userLang, $plainSkeletonDirectory);
 
@@ -206,9 +206,9 @@ 
 		if ($instanceId === null) {
 			throw new \RuntimeException('no instance id!');
 		}
-		$appdata = 'appdata_' . $instanceId;
+		$appdata = 'appdata_'.$instanceId;
 		if ($userId === $appdata) {
-			throw new \RuntimeException('username is reserved name: ' . $appdata);
+			throw new \RuntimeException('username is reserved name: '.$appdata);
 		}
 
 		if (!empty($skeletonDirectory)) {
@@ -243,14 +243,14 @@ 
 		// Copy the files
 		while (false !== ($file = readdir($dir))) {
 			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-				if (is_dir($source . '/' . $file)) {
+				if (is_dir($source.'/'.$file)) {
 					$child = $target->newFolder($file);
-					self::copyr($source . '/' . $file, $child);
+					self::copyr($source.'/'.$file, $child);
 				} else {
 					$child = $target->newFile($file);
-					$sourceStream = fopen($source . '/' . $file, 'r');
+					$sourceStream = fopen($source.'/'.$file, 'r');
 					if ($sourceStream === false) {
-						$logger->error(sprintf('Could not fopen "%s"', $source . '/' . $file), ['app' => 'core']);
+						$logger->error(sprintf('Could not fopen "%s"', $source.'/'.$file), ['app' => 'core']);
 						closedir($dir);
 						return;
 					}
@@ -326,7 +326,7 @@ 
 			return;
 		}
 
-		require OC::$SERVERROOT . '/version.php';
+		require OC::$SERVERROOT.'/version.php';
 		/** @var int $timestamp */
 		self::$versionCache['OC_Version_Timestamp'] = \OC::$VERSION_MTIME;
 		/** @var string $OC_Version */
@@ -500,7 +500,7 @@ 
 	public static function checkServer(\OC\SystemConfig $config) {
 		$l = \OC::$server->getL10N('lib');
 		$errors = [];
-		$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');
+		$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT.'/data');
 
 		if (!self::needUpgrade($config) && $config->getValue('installed', false)) {
 			// this check needs to be done every time
@@ -540,9 +540,9 @@ 
 				$errors[] = [
 					'error' => $l->t('Cannot write into "config" directory.'),
 					'hint' => $l->t('This can usually be fixed by giving the web server write access to the config directory. See %s',
-						[ $urlGenerator->linkToDocs('admin-dir_permissions') ]) . '. '
+						[$urlGenerator->linkToDocs('admin-dir_permissions')]).'. '
 						. $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s',
-							[ $urlGenerator->linkToDocs('admin-config') ])
+							[$urlGenerator->linkToDocs('admin-config')])
 				];
 			}
 		}
@@ -803,10 +803,10 @@ 
 				'hint' => $l->t('Check the value of "datadirectory" in your configuration.')
 			];
 		}
-		if (!file_exists($dataDirectory . '/.ocdata')) {
+		if (!file_exists($dataDirectory.'/.ocdata')) {
 			$errors[] = [
 				'error' => $l->t('Your data directory is invalid.'),
-				'hint' => $l->t('Ensure there is a file called ".ocdata"' .
+				'hint' => $l->t('Ensure there is a file called ".ocdata"'.
 					' in the root of the data directory.')
 			];
 		}
@@ -822,7 +822,7 @@ 
 	public static function checkLoggedIn() {
 		// Check if we are a user
 		if (!\OC::$server->getUserSession()->isLoggedIn()) {
-			header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+			header('Location: '.\OC::$server->getURLGenerator()->linkToRoute(
 				'core.login.showLoginForm',
 				[
 					'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
@@ -833,7 +833,7 @@ 
 		}
 		// Redirect to 2FA challenge selection if 2FA challenge was not solved yet
 		if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-			header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+			header('Location: '.\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
 			exit();
 		}
 	}
@@ -846,7 +846,7 @@ 
 	public static function checkAdminUser() {
 		OC_Util::checkLoggedIn();
 		if (!OC_User::isAdminUser(OC_User::getUser())) {
-			header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
+			header('Location: '.\OCP\Util::linkToAbsolute('', 'index.php'));
 			exit();
 		}
 	}
@@ -872,7 +872,7 @@ 
 	 */
 	public static function redirectToDefaultPage() {
 		$location = self::getDefaultPageUrl();
-		header('Location: ' . $location);
+		header('Location: '.$location);
 		exit();
 	}
 
@@ -885,7 +885,7 @@ 
 		$id = \OC::$server->getSystemConfig()->getValue('instanceid', null);
 		if (is_null($id)) {
 			// We need to guarantee at least one letter in instanceid so it can be used as the session_name
-			$id = 'oc' . \OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
+			$id = 'oc'.\OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 			\OC::$server->getSystemConfig()->setValue('instanceid', $id);
 		}
 		return $id;
@@ -903,12 +903,12 @@ 
 	public static function sanitizeHTML($value) {
 		if (is_array($value)) {
 			/** @var string[] $value */
-			$value = array_map(function ($value) {
+			$value = array_map(function($value) {
 				return self::sanitizeHTML($value);
 			}, $value);
 		} else {
 			// Specify encoding for PHP<5.4
-			$value = htmlspecialchars((string)$value, ENT_QUOTES, 'UTF-8');
+			$value = htmlspecialchars((string) $value, ENT_QUOTES, 'UTF-8');
 		}
 		return $value;
 	}
@@ -941,7 +941,7 @@ 
 		$testContent = 'This is used for testing whether htaccess is properly enabled to disallow access from the outside. This file can be safely removed.';
 
 		// creating a test file
-		$testFile = $config->getSystemValueString('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+		$testFile = $config->getSystemValueString('datadirectory', OC::$SERVERROOT.'/data').'/'.$fileName;
 
 		if (file_exists($testFile)) {// already running this test, possible recursive call
 			return false;
@@ -950,7 +950,7 @@ 
 		$fp = @fopen($testFile, 'w');
 		if (!$fp) {
 			throw new \OCP\HintException('Can\'t create test file to check for working .htaccess file.',
-				'Make sure it is possible for the web server to write to ' . $testFile);
+				'Make sure it is possible for the web server to write to '.$testFile);
 		}
 		fwrite($fp, $testContent);
 		fclose($fp);
@@ -977,10 +977,10 @@ 
 		}
 
 		$fileName = '/htaccesstest.txt';
-		$testFile = $config->getSystemValueString('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+		$testFile = $config->getSystemValueString('datadirectory', OC::$SERVERROOT.'/data').'/'.$fileName;
 
 		// accessing the file via http
-		$url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT.'/data'.$fileName);
 		try {
 			$content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
 		} catch (\Exception $e) {
@@ -988,9 +988,9 @@ 
 		}
 
 		if (str_starts_with($url, 'https:')) {
-			$url = 'http:' . substr($url, 6);
+			$url = 'http:'.substr($url, 6);
 		} else {
-			$url = 'https:' . substr($url, 5);
+			$url = 'https:'.substr($url, 5);
 		}
 
 		try {
@@ -1096,7 +1096,7 @@ 
 		$theme = \OC::$server->getSystemConfig()->getValue("theme", '');
 
 		if ($theme === '') {
-			if (is_dir(OC::$SERVERROOT . '/themes/default')) {
+			if (is_dir(OC::$SERVERROOT.'/themes/default')) {
 				$theme = 'default';
 			}
 		}
@@ -1117,7 +1117,7 @@ 
 
 		$normalizedValue = Normalizer::normalize($value);
 		if ($normalizedValue === null || $normalizedValue === false) {
-			\OC::$server->getLogger()->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
+			\OC::$server->getLogger()->warning('normalizing failed for "'.$value.'"', ['app' => 'core']);
 			return $value;
 		}
 
@@ -1133,7 +1133,7 @@ 
 		$version = OC_Util::getVersionString();
 		$build = OC_Util::getBuild();
 		if (!empty($build) and OC_Util::getChannel() === 'daily') {
-			$version .= ' Build:' . $build;
+			$version .= ' Build:'.$build;
 		}
 		return $version;
 	}
@@ -1155,7 +1155,7 @@ 
 		}
 
 		// detect part files
-		if (preg_match('/' . \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX . '/', $trimmed) !== 0) {
+		if (preg_match('/'.\OCP\Files\FileInfo::BLACKLIST_FILES_REGEX.'/', $trimmed) !== 0) {
 			return false;
 		}
 
@@ -1186,19 +1186,19 @@ 
 			} elseif ($config->getValue('debug', false) && $versionDiff < 0) {
 				// downgrade with debug
 				$installedMajor = explode('.', $installedVersion);
-				$installedMajor = $installedMajor[0] . '.' . $installedMajor[1];
+				$installedMajor = $installedMajor[0].'.'.$installedMajor[1];
 				$currentMajor = explode('.', $currentVersion);
-				$currentMajor = $currentMajor[0] . '.' . $currentMajor[1];
+				$currentMajor = $currentMajor[0].'.'.$currentMajor[1];
 				if ($installedMajor === $currentMajor) {
 					// Same major, allow downgrade for developers
 					return true;
 				} else {
 					// downgrade attempt, throw exception
-					throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+					throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from '.$installedVersion.' to '.$currentVersion.')');
 				}
 			} elseif ($versionDiff < 0) {
 				// downgrade attempt, throw exception
-				throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+				throw new \OCP\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from '.$installedVersion.' to '.$currentVersion.')');
 			}
 
 			// also check for upgrades for apps (independently from the user)