nextcloud / server

public.php

Spacing +5 added lines, -5 removed lines

@@ -31,10 +31,10 @@ 
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 	if (\OCP\Util::needUpgrade()) {
 		// since the behavior of apps or remotes are unpredictable during
 		// an upgrade, return a 503 directly
@@ -55,7 +55,7 @@ 
 		$pathInfo = trim($pathInfo, '/');
 		[$service] = explode('/', $pathInfo);
 	}
-	$file = \OC::$server->getConfig()->getAppValue('core', 'public_' . strip_tags($service));
+	$file = \OC::$server->getConfig()->getAppValue('core', 'public_'.strip_tags($service));
 	if ($file === '') {
 		http_response_code(404);
 		exit;
@@ -76,9 +76,9 @@ 
 	OC_App::loadApp($app);
 	OC_User::setIncognitoMode(true);
 
-	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
+	$baseuri = OC::$WEBROOT.'/public.php/'.$service.'/';
 
-	require_once OC_App::getAppPath($app) . '/' . $parts[1];
+	require_once OC_App::getAppPath($app).'/'.$parts[1];
 } catch (Exception $ex) {
 	$status = 500;
 	if ($ex instanceof \OC\ServiceUnavailableException) {

lib/autoloader.php

Spacing +6 added lines, -6 removed lines

@@ -104,24 +104,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/"', ILogger::DEBUG);
+				\OCP\Util::writeLog('core', 'include path for class "'.$class.'" starts with "apps/"', ILogger::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) {
 			[, $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;
 	}
@@ -133,7 +133,7 @@ 
 	 */
 	protected function isValidPath(string $fullPath): bool {
 		foreach ($this->validRoots as $root => $true) {
-			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
+			if (substr($fullPath, 0, strlen($root) + 1) === $root.'/') {
 				return true;
 			}
 		}

lib/private/Files/Node/Node.php

Spacing +8 added lines, -8 removed lines

@@ -115,7 +115,7 @@ 
 		$dispatcher = \OC::$server->getEventDispatcher();
 		foreach ($hooks as $hook) {
 			$this->root->emit('\OC\Files', $hook, $args);
-			$dispatcher->dispatch('\OCP\Files::' . $hook, new GenericEvent($args));
+			$dispatcher->dispatch('\OCP\Files::'.$hook, new GenericEvent($args));
 		}
 	}
 
@@ -159,7 +159,7 @@ 
 	 * @throws \OCP\Files\NotFoundException
 	 */
 	public function getStorage() {
-		[$storage,] = $this->view->resolvePath($this->path);
+		[$storage, ] = $this->view->resolvePath($this->path);
 		return $storage;
 	}
 
@@ -306,7 +306,7 @@ 
 		$path = str_replace('\\', '/', $path);
 		//add leading slash
 		if ($path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 		//remove duplicate slashes
 		while (strpos($path, '//') !== false) {
@@ -326,7 +326,7 @@ 
 	 */
 	public function isValidPath($path) {
 		if (!$path || $path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 		if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
 			return false;
@@ -412,14 +412,14 @@ 
 			$this->sendHooks(['preCopy'], [$this, $nonExisting]);
 			$this->sendHooks(['preWrite'], [$nonExisting]);
 			if (!$this->view->copy($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not copy ' . $this->path . ' to ' . $targetPath);
+				throw new NotPermittedException('Could not copy '.$this->path.' to '.$targetPath);
 			}
 			$targetNode = $this->root->get($targetPath);
 			$this->sendHooks(['postCopy'], [$this, $targetNode]);
 			$this->sendHooks(['postWrite'], [$targetNode]);
 			return $targetNode;
 		} else {
-			throw new NotPermittedException('No permission to copy to path ' . $targetPath);
+			throw new NotPermittedException('No permission to copy to path '.$targetPath);
 		}
 	}
 
@@ -446,7 +446,7 @@ 
 			$this->sendHooks(['preRename'], [$this, $nonExisting]);
 			$this->sendHooks(['preWrite'], [$nonExisting]);
 			if (!$this->view->rename($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not move ' . $this->path . ' to ' . $targetPath);
+				throw new NotPermittedException('Could not move '.$this->path.' to '.$targetPath);
 			}
 			$targetNode = $this->root->get($targetPath);
 			$this->sendHooks(['postRename'], [$this, $targetNode]);
@@ -454,7 +454,7 @@ 
 			$this->path = $targetPath;
 			return $targetNode;
 		} else {
-			throw new NotPermittedException('No permission to move to path ' . $targetPath);
+			throw new NotPermittedException('No permission to move to path '.$targetPath);
 		}
 	}
 

lib/private/Route/Router.php

Spacing +9 added lines, -9 removed lines

@@ -100,7 +100,7 @@ 
 			foreach (\OC_APP::getEnabledApps() as $app) {
 				$appPath = \OC_App::getAppPath($app);
 				if ($appPath !== false) {
-					$file = $appPath . '/appinfo/routes.php';
+					$file = $appPath.'/appinfo/routes.php';
 					if (file_exists($file)) {
 						$this->routingFiles[$app] = $file;
 					}
@@ -131,14 +131,14 @@ 
 			if (isset($this->loadedApps[$app])) {
 				return;
 			}
-			$file = \OC_App::getAppPath($app) . '/appinfo/routes.php';
+			$file = \OC_App::getAppPath($app).'/appinfo/routes.php';
 			if ($file !== false && file_exists($file)) {
 				$routingFiles = [$app => $file];
 			} else {
 				$routingFiles = [];
 			}
 		}
-		\OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes');
+		\OC::$server->getEventLogger()->start('loadroutes'.$requestedApp, 'Loading Routes');
 		foreach ($routingFiles as $app => $file) {
 			if (!isset($this->loadedApps[$app])) {
 				if (!\OC_App::isAppLoaded($app)) {
@@ -162,7 +162,7 @@ 
 		if (!isset($this->loadedApps['core'])) {
 			$this->loadedApps['core'] = true;
 			$this->useCollection('root');
-			require_once __DIR__ . '/../../../core/routes.php';
+			require_once __DIR__.'/../../../core/routes.php';
 
 			// Also add the OCS collection
 			$collection = $this->getCollection('root.ocs');
@@ -174,7 +174,7 @@ 
 			$collection->addPrefix('/ocs');
 			$this->root->addCollection($collection);
 		}
-		\OC::$server->getEventLogger()->end('loadroutes' . $requestedApp);
+		\OC::$server->getEventLogger()->end('loadroutes'.$requestedApp);
 	}
 
 	/**
@@ -237,14 +237,14 @@ 
 	public function findMatchingRoute(string $url): array {
 		if (substr($url, 0, 6) === '/apps/') {
 			// empty string / 'apps' / $app / rest of the route
-			[, , $app,] = explode('/', $url, 4);
+			[,, $app, ] = explode('/', $url, 4);
 
 			$app = \OC_App::cleanAppId($app);
 			\OC::$REQUESTEDAPP = $app;
 			$this->loadRoutes($app);
 		} elseif (substr($url, 0, 13) === '/ocsapp/apps/') {
 			// empty string / 'ocsapp' / 'apps' / $app / rest of the route
-			[, , , $app,] = explode('/', $url, 5);
+			[,,, $app, ] = explode('/', $url, 5);
 
 			$app = \OC_App::cleanAppId($app);
 			\OC::$REQUESTEDAPP = $app;
@@ -270,7 +270,7 @@ 
 				// However, since Symfony does not allow empty route names, the route
 				// we need to match is '/', so we need to append the '/' here.
 				try {
-					$parameters = $matcher->match($url . '/');
+					$parameters = $matcher->match($url.'/');
 				} catch (ResourceNotFoundException $newException) {
 					// If we still didn't match a route, we throw the original exception
 					throw $e;
@@ -435,7 +435,7 @@ 
 	private function getApplicationClass(string $appName) {
 		$appNameSpace = App::buildAppNamespace($appName);
 
-		$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
+		$applicationClassName = $appNameSpace.'\\AppInfo\\Application';
 
 		if (class_exists($applicationClassName)) {
 			$application = \OC::$server->query($applicationClassName);

lib/private/AppFramework/App.php

Spacing +9 added lines, -9 removed lines

@@ -64,7 +64,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 = \OC_App::getAppInfo($appId);
@@ -86,7 +86,7 @@ 
 			}
 		}
 
-		return $topNamespace . self::$nameSpaceCache[$appId];
+		return $topNamespace.self::$nameSpaceCache[$appId];
 	}
 
 	public static function getAppIdForClass(string $className, string $topNamespace = 'OCA\\'): ?string {
@@ -95,7 +95,7 @@ 
 		}
 
 		foreach (self::$nameSpaceCache as $appId => $namespace) {
-			if (strpos($className, $topNamespace . $namespace . '\\') === 0) {
+			if (strpos($className, $topNamespace.$namespace.'\\') === 0) {
 				return $appId;
 			}
 		}
@@ -132,7 +132,7 @@ 
 			if (strpos($controllerName, '\\Controller\\') !== false) {
 				// 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') {
@@ -140,7 +140,7 @@ 
 			} else {
 				$appNameSpace = self::buildAppNamespace($appName);
 			}
-			$controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
+			$controllerName = $appNameSpace.'\\Controller\\'.$controllerName;
 			$controller = $container->query($controllerName);
 		}
 
@@ -163,7 +163,7 @@ 
 		}
 
 		foreach ($responseHeaders as $name => $value) {
-			$io->setHeader($name . ': ' . $value);
+			$io->setHeader($name.': '.$value);
 		}
 
 		foreach ($responseCookies as $name => $value) {
@@ -193,7 +193,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;
 			}
@@ -203,7 +203,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);
 			}
 		}
@@ -228,7 +228,7 @@ 
 
 		$dispatcher = $container['Dispatcher'];
 
-		[, , $output] = $dispatcher->dispatch($controller, $methodName);
+		[,, $output] = $dispatcher->dispatch($controller, $methodName);
 		return $output;
 	}
 }

lib/private/Collaboration/Collaborators/RemoteGroupPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
 			[$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
 			$result['exact'][] = [
-				'label' => $remoteGroup . " ($serverUrl)",
+				'label' => $remoteGroup." ($serverUrl)",
 				'guid' => $remoteGroup,
 				'name' => $remoteGroup,
 				'value' => [

lib/private/Template/IconsCacher.php

Spacing +15 added lines, -15 removed lines

@@ -121,24 +121,24 @@ 
 			$cachedVarsCssFile = $this->folder->newFile($this->fileName);
 		}
 
-		$icons = $this->getIconsFromCss($currentData . $css);
+		$icons = $this->getIconsFromCss($currentData.$css);
 
 		$data = '';
 		$list = '';
 		foreach ($icons as $icon => $url) {
 			$list .= "--$icon: url('$url');";
-			[$location,$color] = $this->parseUrl($url);
+			[$location, $color] = $this->parseUrl($url);
 			$svg = false;
 			if ($location !== '' && \file_exists($location)) {
 				$svg = \file_get_contents($location);
 			}
 			if ($svg === false) {
-				$this->logger->debug('Failed to get icon file ' . $location);
+				$this->logger->debug('Failed to get icon file '.$location);
 				$data .= "--$icon: url('$url');";
 				continue;
 			}
 			$encode = base64_encode($this->colorizeSvg($svg, $color));
-			$data .= '--' . $icon . ': url(data:image/svg+xml;base64,' . $encode . ');';
+			$data .= '--'.$icon.': url(data:image/svg+xml;base64,'.$encode.');';
 		}
 
 		if (\strlen($data) > 0 && \strlen($list) > 0) {
@@ -160,20 +160,20 @@ 
 	private function parseUrl($url): array {
 		$location = '';
 		$color = '';
-		$base = $this->getRoutePrefix() . '/svg/';
+		$base = $this->getRoutePrefix().'/svg/';
 		$cleanUrl = \substr($url, \strlen($base));
-		if (\strpos($url, $base . 'core') === 0) {
+		if (\strpos($url, $base.'core') === 0) {
 			$cleanUrl = \substr($cleanUrl, \strlen('core'));
 			if (\preg_match('/\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				[,$cleanUrl,$color] = $matches;
-				$location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
+				[,$cleanUrl, $color] = $matches;
+				$location = \OC::$SERVERROOT.'/core/img/'.$cleanUrl.'.svg';
 			}
 		} elseif (\strpos($url, $base) === 0) {
 			if (\preg_match('/([A-z0-9\_\-]+)\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				[,$app,$cleanUrl, $color] = $matches;
-				$location = \OC_App::getAppPath($app) . '/img/' . $cleanUrl . '.svg';
+				[,$app, $cleanUrl, $color] = $matches;
+				$location = \OC_App::getAppPath($app).'/img/'.$cleanUrl.'.svg';
 				if ($app === 'settings') {
-					$location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
+					$location = \OC::$SERVERROOT.'/settings/img/'.$cleanUrl.'.svg';
 				}
 			}
 		}
@@ -196,17 +196,17 @@ 
 
 		// add fill (fill is not present on black elements)
 		$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
-		$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
+		$svg = preg_replace($fillRe, '<$1 fill="#'.$color.'"/>', $svg);
 
 		// replace any fill or stroke colors
-		$svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#' . $color . '"', $svg);
-		$svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#' . $color . '"', $svg);
+		$svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#'.$color.'"', $svg);
+		$svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#'.$color.'"', $svg);
 		return $svg;
 	}
 
 	private function getRoutePrefix() {
 		$frontControllerActive = (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-		$prefix = \OC::$WEBROOT . '/index.php';
+		$prefix = \OC::$WEBROOT.'/index.php';
 		if ($frontControllerActive) {
 			$prefix = \OC::$WEBROOT;
 		}

lib/private/Preview/MarkDown.php

Spacing +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
 			return null;
 		}
 
-		$content = stream_get_contents($content,3000);
+		$content = stream_get_contents($content, 3000);
 
 		//don't create previews of empty text files
 		if (trim($content) === '') {
@@ -75,12 +75,12 @@ 
 		imagecolorallocate($image, 255, 255, 255);
 		$textColor = imagecolorallocate($image, 0, 0, 0);
 
-		$fontFile = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
-		$fontFileBold = __DIR__ . '/../../../core/fonts/NotoSans-Bold.ttf';
+		$fontFile = __DIR__.'/../../../core/fonts/NotoSans-Regular.ttf';
+		$fontFileBold = __DIR__.'/../../../core/fonts/NotoSans-Bold.ttf';
 
 		$canUseTTF = function_exists('imagettftext');
 
-		$textOffset = (int)min($maxX * 0.05, $maxY * 0.05);
+		$textOffset = (int) min($maxX * 0.05, $maxY * 0.05);
 		$nextLineStart = 0;
 		$y = $textOffset;
 		foreach ($lines as $line) {
@@ -106,22 +106,22 @@ 
 
 			// Add spacing before headlines
 			if ($actualFontSize !== $fontSize && $y !== $textOffset) {
-				$y += (int)($actualFontSize * 2);
+				$y += (int) ($actualFontSize * 2);
 			}
 
 			$x = $textOffset;
-			$y += (int)($nextLineStart + $actualFontSize);
+			$y += (int) ($nextLineStart + $actualFontSize);
 
 			if ($canUseTTF === true) {
-				$wordWrap = (int)((1 / $actualFontSize * 1.3) * $maxX);
+				$wordWrap = (int) ((1 / $actualFontSize * 1.3) * $maxX);
 
 				// Get rid of markdown symbols that we still needed for the font size
 				$line = preg_replace('/^#*\s/', '', $line);
 
-				$wrappedText = wordwrap($line, $wordWrap,"\n");
+				$wrappedText = wordwrap($line, $wordWrap, "\n");
 				$linesWrapped = count(explode("\n", $wrappedText));
 				imagettftext($image, $actualFontSize, 0, $x, $y, $textColor, $actualFontSize === $fontSize ? $fontFile : $fontFileBold, $wrappedText);
-				$nextLineStart = (int)($linesWrapped * ceil($actualFontSize * 2));
+				$nextLineStart = (int) ($linesWrapped * ceil($actualFontSize * 2));
 				if ($actualFontSize !== $fontSize && $y !== $textOffset) {
 					$nextLineStart -= $actualFontSize;
 				}

lib/private/Preview/Office.php

Spacing +5 added lines, -5 removed lines

@@ -49,20 +49,20 @@
 
 		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
+		$defaultParameters = ' -env:UserInstallation=file://'.escapeshellarg($tmpDir.'/owncloud-'.\OC_Util::getInstanceId().'/').' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
 		$clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
 
-		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+		$exec = $this->cmd.$clParameters.escapeshellarg($tmpDir).' '.escapeshellarg($absPath);
 
 		shell_exec($exec);
 
 		//create imagick object from png
 		$pngPreview = null;
 		try {
-			[$dirname, , , $filename] = array_values(pathinfo($absPath));
-			$pngPreview = $tmpDir . '/' . $filename . '.png';
+			[$dirname,,, $filename] = array_values(pathinfo($absPath));
+			$pngPreview = $tmpDir.'/'.$filename.'.png';
 
-			$png = new \imagick($pngPreview . '[0]');
+			$png = new \imagick($pngPreview.'[0]');
 			$png->setImageFormat('jpg');
 		} catch (\Exception $e) {
 			$this->cleanTmpFiles();