nextcloud / server

lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php

Spacing +2 added lines, -2 removed lines

@@ -211,9 +211,9 @@
 	public function afterException($controller, $methodName, \Exception $exception): Response {
 		if ($exception instanceof SecurityException) {
 			if ($exception instanceof StrictCookieMissingException) {
-				return new RedirectResponse(\OC::$WEBROOT . '/');
+				return new RedirectResponse(\OC::$WEBROOT.'/');
 			}
-			if (stripos($this->request->getHeader('Accept'),'html') === false) {
+			if (stripos($this->request->getHeader('Accept'), 'html') === false) {
 				$response = new JSONResponse(
 					['message' => $exception->getMessage()],
 					$exception->getCode()

lib/private/Files/Mount/MountPoint.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,7 @@ 
 		} else {
 			// Update old classes to new namespace
 			if (strpos($storage, 'OC_Filestorage_') !== false) {
-				$storage = '\OC\Files\Storage\\' . substr($storage, 15);
+				$storage = '\OC\Files\Storage\\'.substr($storage, 15);
 			}
 			$this->class = $storage;
 			$this->arguments = $arguments;
@@ -160,7 +160,7 @@ 
 				return;
 			}
 		} else {
-			\OCP\Util::writeLog('core', 'storage backend ' . $this->class . ' not found', ILogger::ERROR);
+			\OCP\Util::writeLog('core', 'storage backend '.$this->class.' not found', ILogger::ERROR);
 			$this->invalidStorage = true;
 			return;
 		}
@@ -210,13 +210,13 @@ 
 	 */
 	public function getInternalPath($path) {
 		$path = Filesystem::normalizePath($path, true, false, true);
-		if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
+		if ($this->mountPoint === $path or $this->mountPoint.'/' === $path) {
 			$internalPath = '';
 		} else {
 			$internalPath = substr($path, strlen($this->mountPoint));
 		}
 		// substr returns false instead of an empty string, we always want a string
-		return (string)$internalPath;
+		return (string) $internalPath;
 	}
 
 	/**
@@ -269,7 +269,7 @@ 
 	 */
 	public function getStorageRootId() {
 		if (is_null($this->rootId) || $this->rootId === -1) {
-			$this->rootId = (int)$this->getStorage()->getCache()->getId('');
+			$this->rootId = (int) $this->getStorage()->getCache()->getId('');
 		}
 		return $this->rootId;
 	}

lib/private/Files/Storage/Common.php

Spacing +19 added lines, -19 removed lines

@@ -224,7 +224,7 @@ 
 			$this->mkdir($path2);
 			while ($file = readdir($dir)) {
 				if (!Filesystem::isIgnoredDir($file)) {
-					if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
+					if (!$this->copy($path1.'/'.$file, $path2.'/'.$file)) {
 						return false;
 					}
 				}
@@ -278,12 +278,12 @@ 
 		if (is_resource($dh)) {
 			while (($file = readdir($dh)) !== false) {
 				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-					if ($this->is_dir($path . '/' . $file)) {
-						mkdir($target . '/' . $file);
-						$this->addLocalFolder($path . '/' . $file, $target . '/' . $file);
+					if ($this->is_dir($path.'/'.$file)) {
+						mkdir($target.'/'.$file);
+						$this->addLocalFolder($path.'/'.$file, $target.'/'.$file);
 					} else {
-						$tmp = $this->toTmpFile($path . '/' . $file);
-						rename($tmp, $target . '/' . $file);
+						$tmp = $this->toTmpFile($path.'/'.$file);
+						rename($tmp, $target.'/'.$file);
 					}
 				}
 			}
@@ -304,10 +304,10 @@ 
 					continue;
 				}
 				if (strstr(strtolower($item), strtolower($query)) !== false) {
-					$files[] = $dir . '/' . $item;
+					$files[] = $dir.'/'.$item;
 				}
-				if ($this->is_dir($dir . '/' . $item)) {
-					$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
+				if ($this->is_dir($dir.'/'.$item)) {
+					$files = array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
 				}
 			}
 		}
@@ -358,7 +358,7 @@ 
 		if (!isset($this->watcher)) {
 			$this->watcher = new Watcher($storage);
 			$globalPolicy = \OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_NEVER);
-			$this->watcher->setPolicy((int)$this->getMountOption('filesystem_check_changes', $globalPolicy));
+			$this->watcher->setPolicy((int) $this->getMountOption('filesystem_check_changes', $globalPolicy));
 		}
 		return $this->watcher;
 	}
@@ -375,7 +375,7 @@ 
 		}
 		if (!isset($storage->propagator)) {
 			$config = \OC::$server->getSystemConfig();
-			$storage->propagator = new Propagator($storage, \OC::$server->getDatabaseConnection(), ['appdata_' . $config->getValue('instanceid')]);
+			$storage->propagator = new Propagator($storage, \OC::$server->getDatabaseConnection(), ['appdata_'.$config->getValue('instanceid')]);
 		}
 		return $storage->propagator;
 	}
@@ -433,7 +433,7 @@ 
 	 */
 	public function cleanPath($path) {
 		if (strlen($path) == 0 or $path[0] != '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 
 		$output = [];
@@ -461,7 +461,7 @@ 
 			\OC::$server->getLogger()->info("External storage not available: stat() failed");
 			return false;
 		} catch (\Exception $e) {
-			\OC::$server->getLogger()->warning("External storage not available: " . $e->getMessage());
+			\OC::$server->getLogger()->warning("External storage not available: ".$e->getMessage());
 			\OC::$server->getLogger()->logException($e, ['level' => ILogger::WARN]);
 			return false;
 		}
@@ -614,7 +614,7 @@ 
 			if (is_resource($dh)) {
 				while ($result and ($file = readdir($dh)) !== false) {
 					if (!Filesystem::isIgnoredDir($file)) {
-						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath . '/' . $file, $targetInternalPath . '/' . $file);
+						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath.'/'.$file, $targetInternalPath.'/'.$file);
 					}
 				}
 			}
@@ -640,7 +640,7 @@ 
 				$this->getCache()->remove($targetInternalPath);
 			}
 		}
-		return (bool)$result;
+		return (bool) $result;
 	}
 
 	/**
@@ -747,7 +747,7 @@ 
 			);
 		}
 		try {
-			$provider->acquireLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type, $this->getId() . '::' . $path);
+			$provider->acquireLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type, $this->getId().'::'.$path);
 		} catch (LockedException $e) {
 			if ($logger) {
 				$logger->logException($e, ['level' => ILogger::INFO]);
@@ -779,7 +779,7 @@ 
 			);
 		}
 		try {
-			$provider->releaseLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
+			$provider->releaseLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type);
 		} catch (LockedException $e) {
 			if ($logger) {
 				$logger->logException($e, ['level' => ILogger::INFO]);
@@ -811,7 +811,7 @@ 
 			);
 		}
 		try {
-			$provider->changeLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
+			$provider->changeLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type);
 		} catch (LockedException $e) {
 			\OC::$server->getLogger()->logException($e, ['level' => ILogger::INFO]);
 			throw $e;
@@ -875,7 +875,7 @@ 
 			$basePath = rtrim($directory, '/');
 			while (($file = readdir($dh)) !== false) {
 				if (!Filesystem::isIgnoredDir($file) && !Filesystem::isFileBlacklisted($file)) {
-					$childPath = $basePath . '/' . trim($file, '/');
+					$childPath = $basePath.'/'.trim($file, '/');
 					$metadata = $this->getMetaData($childPath);
 					if ($metadata !== null) {
 						yield $metadata;

apps/files_external/appinfo/app.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 
 use OCA\Files_External\Config\ConfigAdapter;
 
-require_once __DIR__ . '/../3rdparty/autoload.php';
+require_once __DIR__.'/../3rdparty/autoload.php';
 
 // register Application object singleton
 \OCA\Files_External\MountConfig::$app = \OC::$server->query(\OCA\Files_External\AppInfo\Application::class);
@@ -38,7 +38,7 @@ 
 
 $appContainer = \OCA\Files_External\MountConfig::$app->getContainer();
 
-\OCA\Files\App::getNavigationManager()->add(function () {
+\OCA\Files\App::getNavigationManager()->add(function() {
 	$l = \OC::$server->getL10N('files_external');
 	return [
 		'id' => 'extstoragemounts',

apps/dav/appinfo/v1/publicwebdav.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 $linkCheckPlugin = new \OCA\DAV\Files\Sharing\PublicLinkCheckPlugin();
 $filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
 
-$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
+$server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, function(\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
 	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
 	/** @var \OCA\FederatedFileSharing\FederatedShareProvider $shareProvider */
 	$federatedShareProvider = \OC::$server->query(\OCA\FederatedFileSharing\FederatedShareProvider::class);
@@ -80,17 +80,17 @@ 
 
 	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
 	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function($mountPoint, $storage) use ($share) {
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE]);
 	});
-	\OC\Files\Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
+	\OC\Files\Filesystem::addStorageWrapper('shareOwner', function($mountPoint, $storage) use ($share) {
 		return new \OCA\DAV\Storage\PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
 	});
 	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 
 	OC_Util::tearDownFS();
 	OC_Util::setupFS($owner);
-	$ownerView = new \OC\Files\View('/'. $owner . '/files');
+	$ownerView = new \OC\Files\View('/'.$owner.'/files');
 	$path = $ownerView->getPath($fileId);
 	$fileInfo = $ownerView->getFileInfo($path);
 	$linkCheckPlugin->setFileInfo($fileInfo);

lib/private/Files/Type/Detection.php

Spacing +8 added lines, -8 removed lines

@@ -126,12 +126,12 @@ 
 	}
 
 	private function loadCustomDefinitions(string $fileName, array $definitions): array {
-		if (file_exists($this->customConfigDir . '/' . $fileName)) {
-			$custom = json_decode(file_get_contents($this->customConfigDir . '/' . $fileName), true);
+		if (file_exists($this->customConfigDir.'/'.$fileName)) {
+			$custom = json_decode(file_get_contents($this->customConfigDir.'/'.$fileName), true);
 			if (json_last_error() === JSON_ERROR_NONE) {
 				$definitions = array_merge($definitions, $custom);
 			} else {
-				$this->logger->warning('Failed to parse ' . $fileName . ': ' . json_last_error_msg());
+				$this->logger->warning('Failed to parse '.$fileName.': '.json_last_error_msg());
 			}
 		}
 		return $definitions;
@@ -145,7 +145,7 @@ 
 			return;
 		}
 
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypealiases.dist.json'), true);
 		$this->mimeTypeAlias = $this->loadCustomDefinitions(self::CUSTOM_MIMETYPEALIASES, $this->mimeTypeAlias);
 	}
 
@@ -159,7 +159,7 @@ 
 
 	public function getOnlyDefaultAliases(): array {
 		$this->loadMappings();
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypealiases.dist.json'), true);
 		return $this->mimeTypeAlias;
 	}
 
@@ -171,7 +171,7 @@ 
 			return;
 		}
 
-		$mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypemapping.dist.json'), true);
+		$mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypemapping.dist.json'), true);
 		$mimetypeMapping = $this->loadCustomDefinitions(self::CUSTOM_MIMETYPEMAPPING, $mimetypeMapping);
 
 		$this->registerTypeArray($mimetypeMapping);
@@ -366,7 +366,7 @@ 
 
 		// Icon exists?
 		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.svg');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/'.$icon.'.svg');
 			return $this->mimetypeIcons[$mimetype];
 		} catch (\RuntimeException $e) {
 			// Specified image not found
@@ -377,7 +377,7 @@ 
 		if (strpos($icon, '-')) {
 			$mimePart = substr($icon, 0, strpos($icon, '-'));
 			try {
-				$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
+				$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/'.$mimePart.'.svg');
 				return $this->mimetypeIcons[$mimetype];
 			} catch (\RuntimeException $e) {
 				// Image for the first part of the mimetype not found

apps/files_sharing/lib/Listener/LegacyBeforeTemplateRenderedListener.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 		$eventName = 'OCA\Files_Sharing::loadAdditionalScripts';
 
 		if ($event->getScope() !== null) {
-			$eventName .= '::' . $event->getScope();
+			$eventName .= '::'.$event->getScope();
 		}
 
 		$legacyEvent = new GenericEvent(null, ['share' => $event->getShare()]);

lib/private/ServerContainer.php

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
 
 		if (isset($this->namespaces[$namespace])) {
 			if (!isset($this->hasNoAppContainer[$namespace])) {
-				$applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
+				$applicationClassName = 'OCA\\'.$sensitiveNamespace.'\\AppInfo\\Application';
 				if (class_exists($applicationClassName)) {
 					$app = new $applicationClassName();
 					if (isset($this->appContainers[$namespace])) {
@@ -159,7 +159,7 @@ 
 		}
 
 		try {
-			[,$namespace,] = explode('\\', $id);
+			[,$namespace, ] = explode('\\', $id);
 			return $this->getAppContainer(strtolower($namespace), $namespace);
 		} catch (QueryException $e) {
 			return null;

lib/private/AppFramework/DependencyInjection/DIContainer.php

Spacing +20 added lines, -20 removed lines

@@ -115,68 +115,68 @@ 
 		/**
 		 * Core services
 		 */
-		$this->registerService(IOutput::class, function () {
+		$this->registerService(IOutput::class, function() {
 			return new Output($this->getServer()->getWebRoot());
 		});
 
-		$this->registerService(Folder::class, function () {
+		$this->registerService(Folder::class, function() {
 			return $this->getServer()->getUserFolder();
 		});
 
-		$this->registerService(IAppData::class, function (ContainerInterface $c) {
+		$this->registerService(IAppData::class, function(ContainerInterface $c) {
 			return $this->getServer()->getAppDataDir($c->get('AppName'));
 		});
 
-		$this->registerService(IL10N::class, function (ContainerInterface $c) {
+		$this->registerService(IL10N::class, function(ContainerInterface $c) {
 			return $this->getServer()->getL10N($c->get('AppName'));
 		});
 
 		// Log wrappers
-		$this->registerService(LoggerInterface::class, function (ContainerInterface $c) {
+		$this->registerService(LoggerInterface::class, function(ContainerInterface $c) {
 			return new ScopedPsrLogger(
 				$c->get(PsrLoggerAdapter::class),
 				$c->get('AppName')
 			);
 		});
-		$this->registerService(ILogger::class, function (ContainerInterface $c) {
+		$this->registerService(ILogger::class, function(ContainerInterface $c) {
 			return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->get('AppName'));
 		});
 
-		$this->registerService(IServerContainer::class, function () {
+		$this->registerService(IServerContainer::class, function() {
 			return $this->getServer();
 		});
 		$this->registerAlias('ServerContainer', IServerContainer::class);
 
-		$this->registerService(\OCP\WorkflowEngine\IManager::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\WorkflowEngine\IManager::class, function(ContainerInterface $c) {
 			return $c->get(Manager::class);
 		});
 
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+		$this->registerService(ContainerInterface::class, function(ContainerInterface $c) {
 			return $c;
 		});
 		$this->registerAlias(IAppContainer::class, ContainerInterface::class);
 
 		// commonly used attributes
-		$this->registerService('UserId', function (ContainerInterface $c) {
+		$this->registerService('UserId', function(ContainerInterface $c) {
 			return $c->get(IUserSession::class)->getSession()->get('user_id');
 		});
 
-		$this->registerService('WebRoot', function (ContainerInterface $c) {
+		$this->registerService('WebRoot', function(ContainerInterface $c) {
 			return $c->get(IServerContainer::class)->getWebRoot();
 		});
 
-		$this->registerService('OC_Defaults', function (ContainerInterface $c) {
+		$this->registerService('OC_Defaults', function(ContainerInterface $c) {
 			return $c->get(IServerContainer::class)->getThemingDefaults();
 		});
 
-		$this->registerService('Protocol', function (ContainerInterface $c) {
+		$this->registerService('Protocol', function(ContainerInterface $c) {
 			/** @var \OC\Server $server */
 			$server = $c->get(IServerContainer::class);
 			$protocol = $server->getRequest()->getHttpProtocol();
 			return new Http($_SERVER, $protocol);
 		});
 
-		$this->registerService('Dispatcher', function (ContainerInterface $c) {
+		$this->registerService('Dispatcher', function(ContainerInterface $c) {
 			return new Dispatcher(
 				$c->get('Protocol'),
 				$c->get(MiddlewareDispatcher::class),
@@ -196,7 +196,7 @@ 
 		 * Middleware
 		 */
 		$this->registerAlias('MiddlewareDispatcher', MiddlewareDispatcher::class);
-		$this->registerService(MiddlewareDispatcher::class, function (ContainerInterface $c) {
+		$this->registerService(MiddlewareDispatcher::class, function(ContainerInterface $c) {
 			$server = $this->getServer();
 
 			$dispatcher = new MiddlewareDispatcher();
@@ -312,13 +312,13 @@ 
 			return $dispatcher;
 		});
 
-		$this->registerService(IAppConfig::class, function (ContainerInterface $c) {
+		$this->registerService(IAppConfig::class, function(ContainerInterface $c) {
 			return new OC\AppFramework\Services\AppConfig(
 				$c->get(IConfig::class),
 				$c->get('AppName')
 			);
 		});
-		$this->registerService(IInitialState::class, function (ContainerInterface $c) {
+		$this->registerService(IInitialState::class, function(ContainerInterface $c) {
 			return new OC\AppFramework\Services\InitialState(
 				$c->get(IInitialStateService::class),
 				$c->get('AppName')
@@ -406,7 +406,7 @@ 
 	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
 	 */
 	public function registerCapability($serviceName) {
-		$this->query('OC\CapabilitiesManager')->registerCapability(function () use ($serviceName) {
+		$this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
 			return $this->query($serviceName);
 		});
 	}
@@ -452,11 +452,11 @@ 
 			return parent::query($name);
 		} elseif ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) {
 			return parent::query($name);
-		} elseif (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) {
+		} elseif (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']).'\\') === 0) {
 			return parent::query($name);
 		}
 
-		throw new QueryException('Could not resolve ' . $name . '!' .
+		throw new QueryException('Could not resolve '.$name.'!'.
 			' Class can not be instantiated', 1);
 	}
 }