nextcloud / server

lib/private/AppFramework/Routing/RouteConfig.php

Spacing +20 added lines, -20 removed lines

@@ -81,7 +81,7 @@ 
 		 * OCS routes go into a different collection
 		 */
 		$oldCollection = $this->router->getCurrentCollection();
-		$this->router->useCollection($oldCollection . '.ocs');
+		$this->router->useCollection($oldCollection.'.ocs');
 
 		// parse ocs simple routes
 		$this->processOCS($this->routes);
@@ -97,9 +97,9 @@ 
 		foreach ($ocsRoutes as $ocsRoute) {
 			$name = $ocsRoute['name'];
 			$postfix = $ocsRoute['postfix'] ?? '';
-			$root = $ocsRoute['root'] ?? '/apps/' . $this->appName;
+			$root = $ocsRoute['root'] ?? '/apps/'.$this->appName;
 
-			$url = $root . $ocsRoute['url'];
+			$url = $root.$ocsRoute['url'];
 			$verb = strtoupper($ocsRoute['verb'] ?? 'GET');
 
 			$split = explode('#', $name, 2);
@@ -111,7 +111,7 @@ 
 			$controllerName = $this->buildControllerName($controller);
 			$actionName = $this->buildActionName($action);
 
-			$routeName = 'ocs.' . $this->appName . '.' . $controller . '.' . $action . $postfix;
+			$routeName = 'ocs.'.$this->appName.'.'.$controller.'.'.$action.$postfix;
 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
@@ -122,13 +122,13 @@ 
 
 			// optionally register requirements for route. This is used to
 			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $ocsRoute)) {
+			if (array_key_exists('requirements', $ocsRoute)) {
 				$router->requirements($ocsRoute['requirements']);
 			}
 
 			// optionally register defaults for route. This is used to
 			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $ocsRoute)) {
+			if (array_key_exists('defaults', $ocsRoute)) {
 				$router->defaults($ocsRoute['defaults']);
 			}
 		}
@@ -167,10 +167,10 @@ 
 				} else if ($controllerName === 'RequesthandlerController') {
 					$controllerName = 'RequestHandlerController';
 				}
-				$controllerName = App::buildAppNamespace($appName) . '\\Controller\\' . $controllerName;
+				$controllerName = App::buildAppNamespace($appName).'\\Controller\\'.$controllerName;
 			}
 
-			$routeName = $appName . '.' . $controller . '.' . $action . $postfix;
+			$routeName = $appName.'.'.$controller.'.'.$action.$postfix;
 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
@@ -180,13 +180,13 @@ 
 
 			// optionally register requirements for route. This is used to
 			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $simpleRoute)) {
+			if (array_key_exists('requirements', $simpleRoute)) {
 				$router->requirements($simpleRoute['requirements']);
 			}
 
 			// optionally register defaults for route. This is used to
 			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $simpleRoute)) {
+			if (array_key_exists('defaults', $simpleRoute)) {
 				$router->defaults($simpleRoute['defaults']);
 			}
 		}
@@ -214,11 +214,11 @@ 
 
 		$resources = $routes['ocs-resources'] ?? [];
 		foreach ($resources as $resource => $config) {
-			$root = $config['root'] ?? '/apps/' . $this->appName;
+			$root = $config['root'] ?? '/apps/'.$this->appName;
 
 			// the url parameter used as id to the resource
-			foreach($actions as $action) {
-				$url = $root . $config['url'];
+			foreach ($actions as $action) {
+				$url = $root.$config['url'];
 				$method = $action['name'];
 				$verb = strtoupper($action['verb'] ?? 'GET');
 				$collectionAction = $action['on-collection'] ?? false;
@@ -226,7 +226,7 @@ 
 					$url .= '/{id}';
 				}
 				if (isset($action['url-postfix'])) {
-					$url .= '/' . $action['url-postfix'];
+					$url .= '/'.$action['url-postfix'];
 				}
 
 				$controller = $resource;
@@ -234,7 +234,7 @@ 
 				$controllerName = $this->buildControllerName($controller);
 				$actionName = $this->buildActionName($method);
 
-				$routeName = 'ocs.' . $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+				$routeName = 'ocs.'.$this->appName.'.'.strtolower($resource).'.'.strtolower($method);
 
 				$this->router->create($routeName, $url)->method($verb)->action(
 					new RouteActionHandler($this->container, $controllerName, $actionName)
@@ -267,7 +267,7 @@ 
 		foreach ($resources as $resource => $config) {
 
 			// the url parameter used as id to the resource
-			foreach($actions as $action) {
+			foreach ($actions as $action) {
 				$url = $config['url'];
 				$method = $action['name'];
 				$verb = strtoupper($action['verb'] ?? 'GET');
@@ -276,7 +276,7 @@ 
 					$url .= '/{id}';
 				}
 				if (isset($action['url-postfix'])) {
-					$url .= '/' . $action['url-postfix'];
+					$url .= '/'.$action['url-postfix'];
 				}
 
 				$controller = $resource;
@@ -284,7 +284,7 @@ 
 				$controllerName = $this->buildControllerName($controller);
 				$actionName = $this->buildActionName($method);
 
-				$routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+				$routeName = $this->appName.'.'.strtolower($resource).'.'.strtolower($method);
 
 				$this->router->create($routeName, $url)->method($verb)->action(
 					new RouteActionHandler($this->container, $controllerName, $actionName)
@@ -300,7 +300,7 @@ 
 	 */
 	private function buildControllerName(string $controller): string {
 		if (!isset($this->controllerNameCache[$controller])) {
-			$this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
+			$this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)).'Controller';
 		}
 		return $this->controllerNameCache[$controller];
 	}
@@ -323,7 +323,7 @@ 
 		$pattern = '/_[a-z]?/';
 		return preg_replace_callback(
 			$pattern,
-			function ($matches) {
+			function($matches) {
 				return strtoupper(ltrim($matches[0], '_'));
 			},
 			$str);

lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
 	public function castColumn($column, $type) {
 		switch ($type) {
 			case IQueryBuilder::PARAM_INT:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS INT)');
+				return new QueryFunction('CAST('.$this->helper->quoteColumnName($column).' AS INT)');
 			case IQueryBuilder::PARAM_STR:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS TEXT)');
+				return new QueryFunction('CAST('.$this->helper->quoteColumnName($column).' AS TEXT)');
 			default:
 				return parent::castColumn($column, $type);
 		}

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

Spacing +8 added lines, -8 removed lines

@@ -136,10 +136,10 @@ 
 		// verify path of the target
 		$this->verifyPath();
 
-		$newPath = $parentPath . '/' . $newName;
+		$newPath = $parentPath.'/'.$newName;
 
 		if (!$this->fileView->rename($this->path, $newPath)) {
-			throw new \Sabre\DAV\Exception('Failed to rename '. $this->path . ' to ' . $newPath);
+			throw new \Sabre\DAV\Exception('Failed to rename '.$this->path.' to '.$newPath);
 		}
 
 		$this->path = $newPath;
@@ -159,7 +159,7 @@ 
 	public function getLastModified() {
 		$timestamp = $this->info->getMtime();
 		if (!empty($timestamp)) {
-			return (int)$timestamp;
+			return (int) $timestamp;
 		}
 		return $timestamp;
 	}
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	public function getETag() {
-		return '"' . $this->info->getEtag() . '"';
+		return '"'.$this->info->getEtag().'"';
 	}
 
 	/**
@@ -226,7 +226,7 @@ 
 		if ($this->info->getId()) {
 			$instanceId = \OC_Util::getInstanceId();
 			$id = sprintf('%08d', $this->info->getId());
-			return $id . $instanceId;
+			return $id.$instanceId;
 		}
 
 		return null;
@@ -263,7 +263,7 @@ 
 
 		if ($storage && $storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
 			/** @var \OCA\Files_Sharing\SharedStorage $storage */
-			$permissions = (int)$storage->getShare()->getPermissions();
+			$permissions = (int) $storage->getShare()->getPermissions();
 		} else {
 			$permissions = $this->info->getPermissions();
 		}
@@ -314,7 +314,7 @@ 
 			$shares = $this->shareManager->getSharedWith($user, $shareType, $this, -1);
 			foreach ($shares as $share) {
 				$note = $share->getNote();
-				if($share->getShareOwner() !== $user && !empty($note)) {
+				if ($share->getShareOwner() !== $user && !empty($note)) {
 					return $note;
 				}
 			}
@@ -405,7 +405,7 @@ 
 			throw new \InvalidArgumentException('X-OC-MTime header must be an integer (unix timestamp).');
 		}
 
-		return (int)$mtimeFromRequest;
+		return (int) $mtimeFromRequest;
 	}
 
 }

apps/dav/lib/Upload/AssemblyStream.php

Spacing +5 added lines, -5 removed lines

@@ -72,11 +72,11 @@ 
 
 		$nodes = $this->nodes;
 		// http://stackoverflow.com/a/10985500
-		@usort($nodes, function (IFile $a, IFile $b) {
+		@usort($nodes, function(IFile $a, IFile $b) {
 			return strnatcmp($a->getName(), $b->getName());
 		});
 		$this->nodes = array_values($nodes);
-		$this->size = array_reduce($this->nodes, function ($size, IFile $file) {
+		$this->size = array_reduce($this->nodes, function($size, IFile $file) {
 			return $size + $file->getSize();
 		}, 0);
 		return true;
@@ -114,7 +114,7 @@ 
 
 		$stream = $this->getStream($this->nodes[$nodeIndex]);
 		$nodeOffset = $offset - $nodeStart;
-		if(fseek($stream, $nodeOffset) === -1) {
+		if (fseek($stream, $nodeOffset) === -1) {
 			return false;
 		}
 		$this->currentNode = $nodeIndex;
@@ -154,7 +154,7 @@ 
 				fclose($this->currentStream);
 				$currentNodeSize = $this->nodes[$this->currentNode]->getSize();
 				if ($this->currentNodeRead < $currentNodeSize) {
-					throw new \Exception('Stream from assembly node shorter than expected, got ' . $this->currentNodeRead . ' bytes, expected ' . $currentNodeSize);
+					throw new \Exception('Stream from assembly node shorter than expected, got '.$this->currentNodeRead.' bytes, expected '.$currentNodeSize);
 				}
 				$this->currentNode++;
 				$this->currentNodeRead = 0;
@@ -251,7 +251,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['nodes']) and is_array($context['nodes'])) {
 			$this->nodes = $context['nodes'];

apps/files_external/lib/Command/Notify.php

Spacing +6 added lines, -6 removed lines

@@ -128,7 +128,7 @@ 
 			return 1;
 		}
 		if (!$storage instanceof INotifyStorage) {
-			$output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
+			$output->writeln('<error>Mount of type "'.$mount->getBackend()->getText().'" does not support active update notifications</error>');
 			return 1;
 		}
 
@@ -137,7 +137,7 @@ 
 		$path = trim($input->getOption('path'), '/');
 		$notifyHandler = $storage->notify($path);
 		$this->selfTest($storage, $notifyHandler, $verbose, $output);
-		$notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
+		$notifyHandler->listen(function(IChange $change) use ($mount, $verbose, $output) {
 			if ($verbose) {
 				$this->logUpdate($change, $output);
 			}
@@ -168,14 +168,14 @@ 
 			$storageIds = $this->getStorageIds($mountId);
 		}
 		if (count($storageIds) === 0) {
-			throw new StorageNotAvailableException('No storages found by mount ID ' . $mountId);
+			throw new StorageNotAvailableException('No storages found by mount ID '.$mountId);
 		}
 		$storageIds = array_map('intval', $storageIds);
 
 		$result = $this->updateParent($storageIds, $parent);
 		if ($result === 0) {
 			//TODO: Find existing parent further up the tree in the database and register that folder instead.
-			$this->logger->info('Failed updating parent for "' . $path . '" while trying to register change. It may not exist in the filecache.');
+			$this->logger->info('Failed updating parent for "'.$path.'" while trying to register change. It may not exist in the filecache.');
 		}
 	}
 
@@ -197,9 +197,9 @@ 
 				return;
 		}
 
-		$text .= ' ' . $change->getPath();
+		$text .= ' '.$change->getPath();
 		if ($change instanceof IRenameChange) {
-			$text .= ' to ' . $change->getTargetPath();
+			$text .= ' to '.$change->getTargetPath();
 		}
 
 		$output->writeln($text);

lib/private/Files/View.php

Spacing +43 added lines, -43 removed lines

@@ -128,9 +128,9 @@ 
 			$path = '/';
 		}
 		if ($path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
-		return $this->fakeRoot . $path;
+		return $this->fakeRoot.$path;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	public function chroot($fakeRoot) {
 		if (!$fakeRoot == '') {
 			if ($fakeRoot[0] !== '/') {
-				$fakeRoot = '/' . $fakeRoot;
+				$fakeRoot = '/'.$fakeRoot;
 			}
 		}
 		$this->fakeRoot = $fakeRoot;
@@ -174,7 +174,7 @@ 
 		}
 
 		// missing slashes can cause wrong matches!
-		$root = rtrim($this->fakeRoot, '/') . '/';
+		$root = rtrim($this->fakeRoot, '/').'/';
 
 		if (strpos($path, $root) !== 0) {
 			return null;
@@ -280,7 +280,7 @@ 
 		if ($mount instanceof MoveableMount) {
 			// cut of /user/files to get the relative path to data/user/files
 			$pathParts = explode('/', $path, 4);
-			$relPath = '/' . $pathParts[3];
+			$relPath = '/'.$pathParts[3];
 			$this->lockFile($relPath, ILockingProvider::LOCK_SHARED, true);
 			\OC_Hook::emit(
 				Filesystem::CLASSNAME, "umount",
@@ -700,7 +700,7 @@ 
 		}
 		$postFix = (substr($path, -1) === '/') ? '/' : '';
 		$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
-		$mount = Filesystem::getMountManager()->find($absolutePath . $postFix);
+		$mount = Filesystem::getMountManager()->find($absolutePath.$postFix);
 		if ($mount and $mount->getInternalPath($absolutePath) === '') {
 			return $this->removeMount($mount, $absolutePath);
 		}
@@ -821,7 +821,7 @@ 
 								$this->renameUpdate($storage1, $storage2, $internalPath1, $internalPath2);
 							}
 						}
-					} catch(\Exception $e) {
+					} catch (\Exception $e) {
 						throw $e;
 					} finally {
 						$this->changeLock($path1, ILockingProvider::LOCK_SHARED, true);
@@ -845,7 +845,7 @@ 
 						}
 					}
 				}
-			} catch(\Exception $e) {
+			} catch (\Exception $e) {
 				throw $e;
 			} finally {
 				$this->unlockFile($path1, ILockingProvider::LOCK_SHARED, true);
@@ -978,7 +978,7 @@ 
 				$hooks[] = 'write';
 				break;
 			default:
-				\OCP\Util::writeLog('core', 'invalid mode (' . $mode . ') for ' . $path, ILogger::ERROR);
+				\OCP\Util::writeLog('core', 'invalid mode ('.$mode.') for '.$path, ILogger::ERROR);
 		}
 
 		if ($mode !== 'r' && $mode !== 'w') {
@@ -1082,7 +1082,7 @@ 
 					array(Filesystem::signal_param_path => $this->getHookPath($path))
 				);
 			}
-			list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix);
+			list($storage, $internalPath) = Filesystem::resolvePath($absolutePath.$postFix);
 			if ($storage) {
 				return $storage->hash($type, $internalPath, $raw);
 			}
@@ -1136,7 +1136,7 @@ 
 
 			$run = $this->runHooks($hooks, $path);
 			/** @var \OC\Files\Storage\Storage $storage */
-			list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix);
+			list($storage, $internalPath) = Filesystem::resolvePath($absolutePath.$postFix);
 			if ($run and $storage) {
 				if (in_array('write', $hooks) || in_array('delete', $hooks)) {
 					try {
@@ -1165,7 +1165,7 @@ 
 				if ($result && in_array('delete', $hooks) and $result) {
 					$this->removeUpdate($storage, $internalPath);
 				}
-				if ($result && in_array('write', $hooks,  true) && $operation !== 'fopen' && $operation !== 'touch') {
+				if ($result && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') {
 					$this->writeUpdate($storage, $internalPath);
 				}
 				if ($result && in_array('touch', $hooks)) {
@@ -1181,7 +1181,7 @@ 
 					$unlockLater = true;
 					// make sure our unlocking callback will still be called if connection is aborted
 					ignore_user_abort(true);
-					$result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) {
+					$result = CallbackWrapper::wrap($result, null, null, function() use ($hooks, $path) {
 						if (in_array('write', $hooks)) {
 							$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
 						} else if (in_array('read', $hooks)) {
@@ -1242,7 +1242,7 @@ 
 			return true;
 		}
 
-		return (strlen($fullPath) > strlen($defaultRoot)) && (substr($fullPath, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/');
+		return (strlen($fullPath) > strlen($defaultRoot)) && (substr($fullPath, 0, strlen($defaultRoot) + 1) === $defaultRoot.'/');
 	}
 
 	/**
@@ -1261,7 +1261,7 @@ 
 				if ($hook != 'read') {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
-						$prefix . $hook,
+						$prefix.$hook,
 						array(
 							Filesystem::signal_param_run => &$run,
 							Filesystem::signal_param_path => $path
@@ -1270,7 +1270,7 @@ 
 				} elseif (!$post) {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
-						$prefix . $hook,
+						$prefix.$hook,
 						array(
 							Filesystem::signal_param_path => $path
 						)
@@ -1363,11 +1363,11 @@ 
 			return $this->getPartFileInfo($path);
 		}
 		$relativePath = $path;
-		$path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
+		$path = Filesystem::normalizePath($this->fakeRoot.'/'.$path);
 
 		$mount = Filesystem::getMountManager()->find($path);
 		if (!$mount) {
-			\OC::$server->getLogger()->warning('Mountpoint not found for path: ' . $path);
+			\OC::$server->getLogger()->warning('Mountpoint not found for path: '.$path);
 			return false;
 		}
 		$storage = $mount->getStorage();
@@ -1395,7 +1395,7 @@ 
 					//add the sizes of other mount points to the folder
 					$extOnly = ($includeMountPoints === 'ext');
 					$mounts = Filesystem::getMountManager()->findIn($path);
-					$info->setSubMounts(array_filter($mounts, function (IMountPoint $mount) use ($extOnly) {
+					$info->setSubMounts(array_filter($mounts, function(IMountPoint $mount) use ($extOnly) {
 						$subStorage = $mount->getStorage();
 						return !($extOnly && $subStorage instanceof \OCA\Files_Sharing\SharedStorage);
 					}));
@@ -1404,7 +1404,7 @@ 
 
 			return $info;
 		} else {
-			\OC::$server->getLogger()->warning('Storage not valid for mountpoint: ' . $mount->getMountPoint());
+			\OC::$server->getLogger()->warning('Storage not valid for mountpoint: '.$mount->getMountPoint());
 		}
 
 		return false;
@@ -1451,12 +1451,12 @@ 
 			/**
 			 * @var \OC\Files\FileInfo[] $fileInfos
 			 */
-			$fileInfos = array_map(function (ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) {
+			$fileInfos = array_map(function(ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) {
 				if ($sharingDisabled) {
 					$content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
 				}
 				$owner = $this->getUserObjectForOwner($storage->getOwner($content['path']));
-				return new FileInfo($path . '/' . $content['name'], $storage, $content['path'], $content, $mount, $owner);
+				return new FileInfo($path.'/'.$content['name'], $storage, $content['path'], $content, $mount, $owner);
 			}, $contents);
 			$files = array_combine($fileNames, $fileInfos);
 
@@ -1481,7 +1481,7 @@ 
 						} catch (\Exception $e) {
 							// sometimes when the storage is not available it can be any exception
 							\OC::$server->getLogger()->logException($e, [
-								'message' => 'Exception while scanning storage "' . $subStorage->getId() . '"',
+								'message' => 'Exception while scanning storage "'.$subStorage->getId().'"',
 								'level' => ILogger::ERROR,
 								'app' => 'lib',
 							]);
@@ -1512,7 +1512,7 @@ 
 								$rootEntry['permissions'] = $permissions & (\OCP\Constants::PERMISSION_ALL - (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE));
 							}
 
-							$rootEntry['path'] = substr(Filesystem::normalizePath($path . '/' . $rootEntry['name']), strlen($user) + 2); // full path without /$user/
+							$rootEntry['path'] = substr(Filesystem::normalizePath($path.'/'.$rootEntry['name']), strlen($user) + 2); // full path without /$user/
 
 							// if sharing was disabled for the user we remove the share permissions
 							if (\OCP\Util::isSharingDisabledForUser()) {
@@ -1520,14 +1520,14 @@ 
 							}
 
 							$owner = $this->getUserObjectForOwner($subStorage->getOwner(''));
-							$files[$rootEntry->getName()] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner);
+							$files[$rootEntry->getName()] = new FileInfo($path.'/'.$rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner);
 						}
 					}
 				}
 			}
 
 			if ($mimetype_filter) {
-				$files = array_filter($files, function (FileInfo $file) use ($mimetype_filter) {
+				$files = array_filter($files, function(FileInfo $file) use ($mimetype_filter) {
 					if (strpos($mimetype_filter, '/')) {
 						return $file->getMimetype() === $mimetype_filter;
 					} else {
@@ -1556,7 +1556,7 @@ 
 		if ($data instanceof FileInfo) {
 			$data = $data->getData();
 		}
-		$path = Filesystem::normalizePath($this->fakeRoot . '/' . $path);
+		$path = Filesystem::normalizePath($this->fakeRoot.'/'.$path);
 		/**
 		 * @var \OC\Files\Storage\Storage $storage
 		 * @var string $internalPath
@@ -1583,7 +1583,7 @@ 
 	 * @return FileInfo[]
 	 */
 	public function search($query) {
-		return $this->searchCommon('search', array('%' . $query . '%'));
+		return $this->searchCommon('search', array('%'.$query.'%'));
 	}
 
 	/**
@@ -1634,10 +1634,10 @@ 
 
 			$results = call_user_func_array(array($cache, $method), $args);
 			foreach ($results as $result) {
-				if (substr($mountPoint . $result['path'], 0, $rootLength + 1) === $this->fakeRoot . '/') {
+				if (substr($mountPoint.$result['path'], 0, $rootLength + 1) === $this->fakeRoot.'/') {
 					$internalPath = $result['path'];
-					$path = $mountPoint . $result['path'];
-					$result['path'] = substr($mountPoint . $result['path'], $rootLength);
+					$path = $mountPoint.$result['path'];
+					$result['path'] = substr($mountPoint.$result['path'], $rootLength);
 					$owner = \OC::$server->getUserManager()->get($storage->getOwner($internalPath));
 					$files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner);
 				}
@@ -1655,8 +1655,8 @@ 
 					if ($results) {
 						foreach ($results as $result) {
 							$internalPath = $result['path'];
-							$result['path'] = rtrim($relativeMountPoint . $result['path'], '/');
-							$path = rtrim($mountPoint . $internalPath, '/');
+							$result['path'] = rtrim($relativeMountPoint.$result['path'], '/');
+							$path = rtrim($mountPoint.$internalPath, '/');
 							$owner = \OC::$server->getUserManager()->get($storage->getOwner($internalPath));
 							$files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner);
 						}
@@ -1677,7 +1677,7 @@ 
 	public function getOwner($path) {
 		$info = $this->getFileInfo($path);
 		if (!$info) {
-			throw new NotFoundException($path . ' not found while trying to get owner');
+			throw new NotFoundException($path.' not found while trying to get owner');
 		}
 		return $info->getOwner()->getUID();
 	}
@@ -1711,7 +1711,7 @@ 
 	 * @return string
 	 */
 	public function getPath($id) {
-		$id = (int)$id;
+		$id = (int) $id;
 		$manager = Filesystem::getMountManager();
 		$mounts = $manager->findIn($this->fakeRoot);
 		$mounts[] = $manager->find($this->fakeRoot);
@@ -1726,7 +1726,7 @@ 
 				$cache = $mount->getStorage()->getCache();
 				$internalPath = $cache->getPathById($id);
 				if (is_string($internalPath)) {
-					$fullPath = $mount->getMountPoint() . $internalPath;
+					$fullPath = $mount->getMountPoint().$internalPath;
 					if (!is_null($path = $this->getRelativePath($fullPath))) {
 						return $path;
 					}
@@ -1762,10 +1762,10 @@ 
 	private function targetIsNotShared(IStorage $targetStorage, string $targetInternalPath) {
 
 		// note: cannot use the view because the target is already locked
-		$fileId = (int)$targetStorage->getCache()->getId($targetInternalPath);
+		$fileId = (int) $targetStorage->getCache()->getId($targetInternalPath);
 		if ($fileId === -1) {
 			// target might not exist, need to check parent instead
-			$fileId = (int)$targetStorage->getCache()->getId(dirname($targetInternalPath));
+			$fileId = (int) $targetStorage->getCache()->getId(dirname($targetInternalPath));
 		}
 
 		// check if any of the parents were shared by the current owner (include collections)
@@ -1865,7 +1865,7 @@ 
 		$resultPath = '';
 		foreach ($parts as $part) {
 			if ($part) {
-				$resultPath .= '/' . $part;
+				$resultPath .= '/'.$part;
 				$result[] = $resultPath;
 			}
 		}
@@ -2128,16 +2128,16 @@ 
 	public function getUidAndFilename($filename) {
 		$info = $this->getFileInfo($filename);
 		if (!$info instanceof \OCP\Files\FileInfo) {
-			throw new NotFoundException($this->getAbsolutePath($filename) . ' not found');
+			throw new NotFoundException($this->getAbsolutePath($filename).' not found');
 		}
 		$uid = $info->getOwner()->getUID();
 		if ($uid != \OCP\User::getUser()) {
 			Filesystem::initMountPoints($uid);
-			$ownerView = new View('/' . $uid . '/files');
+			$ownerView = new View('/'.$uid.'/files');
 			try {
 				$filename = $ownerView->getPath($info['fileid']);
 			} catch (NotFoundException $e) {
-				throw new NotFoundException('File with id ' . $info['fileid'] . ' not found for user ' . $uid);
+				throw new NotFoundException('File with id '.$info['fileid'].' not found for user '.$uid);
 			}
 		}
 		return [$uid, $filename];
@@ -2154,7 +2154,7 @@ 
 		$directoryParts = array_filter($directoryParts);
 		foreach ($directoryParts as $key => $part) {
 			$currentPathElements = array_slice($directoryParts, 0, $key);
-			$currentPath = '/' . implode('/', $currentPathElements);
+			$currentPath = '/'.implode('/', $currentPathElements);
 			if ($this->is_file($currentPath)) {
 				return false;
 			}

lib/private/App/DependencyAnalyzer.php

Spacing +13 added lines, -13 removed lines

@@ -155,19 +155,19 @@ 
 		if (isset($dependencies['php']['@attributes']['min-version'])) {
 			$minVersion = $dependencies['php']['@attributes']['min-version'];
 			if ($this->compareSmaller($this->platform->getPhpVersion(), $minVersion)) {
-				$missing[] = (string)$this->l->t('PHP %s or higher is required.', [$minVersion]);
+				$missing[] = (string) $this->l->t('PHP %s or higher is required.', [$minVersion]);
 			}
 		}
 		if (isset($dependencies['php']['@attributes']['max-version'])) {
 			$maxVersion = $dependencies['php']['@attributes']['max-version'];
 			if ($this->compareBigger($this->platform->getPhpVersion(), $maxVersion)) {
-				$missing[] = (string)$this->l->t('PHP with a version lower than %s is required.', [$maxVersion]);
+				$missing[] = (string) $this->l->t('PHP with a version lower than %s is required.', [$maxVersion]);
 			}
 		}
 		if (isset($dependencies['php']['@attributes']['min-int-size'])) {
 			$intSize = $dependencies['php']['@attributes']['min-int-size'];
-			if ($intSize > $this->platform->getIntSize()*8) {
-				$missing[] = (string)$this->l->t('%sbit or higher PHP required.', [$intSize]);
+			if ($intSize > $this->platform->getIntSize() * 8) {
+				$missing[] = (string) $this->l->t('%sbit or higher PHP required.', [$intSize]);
 			}
 		}
 		return $missing;
@@ -190,12 +190,12 @@ 
 		if (!is_array($supportedDatabases)) {
 			$supportedDatabases = array($supportedDatabases);
 		}
-		$supportedDatabases = array_map(function ($db) {
+		$supportedDatabases = array_map(function($db) {
 			return $this->getValue($db);
 		}, $supportedDatabases);
 		$currentDatabase = $this->platform->getDatabase();
 		if (!in_array($currentDatabase, $supportedDatabases)) {
-			$missing[] = (string)$this->l->t('Following databases are supported: %s', [implode(', ', $supportedDatabases)]);
+			$missing[] = (string) $this->l->t('Following databases are supported: %s', [implode(', ', $supportedDatabases)]);
 		}
 		return $missing;
 	}
@@ -224,7 +224,7 @@ 
 			}
 			$commandName = $this->getValue($command);
 			if (!$this->platform->isCommandKnown($commandName)) {
-				$missing[] = (string)$this->l->t('The command line tool %s could not be found', [$commandName]);
+				$missing[] = (string) $this->l->t('The command line tool %s could not be found', [$commandName]);
 			}
 		}
 		return $missing;
@@ -290,7 +290,7 @@ 
 			return $missing;
 		}
 		if (is_array($oss)) {
-			$oss = array_map(function ($os) {
+			$oss = array_map(function($os) {
 				return $this->getValue($os);
 			}, $oss);
 		} else {
@@ -298,7 +298,7 @@ 
 		}
 		$currentOS = $this->platform->getOS();
 		if (!in_array($currentOS, $oss)) {
-			$missing[] = (string)$this->l->t('Following platforms are supported: %s', [implode(', ', $oss)]);
+			$missing[] = (string) $this->l->t('Following platforms are supported: %s', [implode(', ', $oss)]);
 		}
 		return $missing;
 	}
@@ -324,12 +324,12 @@ 
 
 		if (!is_null($minVersion)) {
 			if ($this->compareSmaller($this->platform->getOcVersion(), $minVersion)) {
-				$missing[] = (string)$this->l->t('Server version %s or higher is required.', [$this->toVisibleVersion($minVersion)]);
+				$missing[] = (string) $this->l->t('Server version %s or higher is required.', [$this->toVisibleVersion($minVersion)]);
 			}
 		}
 		if (!$ignoreMax && !is_null($maxVersion)) {
 			if ($this->compareBigger($this->platform->getOcVersion(), $maxVersion)) {
-				$missing[] = (string)$this->l->t('Server version %s or lower is required.', [$this->toVisibleVersion($maxVersion)]);
+				$missing[] = (string) $this->l->t('Server version %s or lower is required.', [$this->toVisibleVersion($maxVersion)]);
 			}
 		}
 		return $missing;
@@ -361,7 +361,7 @@ 
 				return '10';
 			default:
 				if (strpos($version, '9.1.') === 0) {
-					$version = '10.0.' . substr($version, 4);
+					$version = '10.0.'.substr($version, 4);
 				}
 				return $version;
 		}
@@ -375,6 +375,6 @@ 
 		if (isset($element['@value'])) {
 			return $element['@value'];
 		}
-		return (string)$element;
+		return (string) $element;
 	}
 }

lib/public/IDBConnection.php

Spacing +4 added lines, -4 removed lines

@@ -46,8 +46,8 @@ 
  */
 interface IDBConnection {
 
-	const ADD_MISSING_INDEXES_EVENT = self::class . '::ADD_MISSING_INDEXES';
-	const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES';
+	const ADD_MISSING_INDEXES_EVENT = self::class.'::ADD_MISSING_INDEXES';
+	const CHECK_MISSING_INDEXES_EVENT = self::class.'::CHECK_MISSING_INDEXES';
 
 	/**
 	 * Gets the QueryBuilder for the connection.
@@ -65,7 +65,7 @@ 
 	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
 	 * @since 6.0.0
 	 */
-	public function prepare($sql, $limit=null, $offset=null);
+	public function prepare($sql, $limit = null, $offset = null);
 
 	/**
 	 * Executes an, optionally parameterized, SQL query.
@@ -132,7 +132,7 @@ 
 	 * @return int number of inserted rows
 	 * @since 16.0.0
 	 */
-	public function insertIgnoreConflict(string $table,array $values) : int;
+	public function insertIgnoreConflict(string $table, array $values) : int;
 
 	/**
 	 * Insert or update a row value

lib/private/DB/Adapter.php

Spacing +10 added lines, -10 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function lockTable($tableName) {
 		$this->conn->beginTransaction();
-		$this->conn->executeUpdate('LOCK TABLE `' .$tableName . '` IN EXCLUSIVE MODE');
+		$this->conn->executeUpdate('LOCK TABLE `'.$tableName.'` IN EXCLUSIVE MODE');
 	}
 
 	/**
@@ -98,14 +98,14 @@ 
 		if (empty($compare)) {
 			$compare = array_keys($input);
 		}
-		$query = 'INSERT INTO `' .$table . '` (`'
-			. implode('`,`', array_keys($input)) . '`) SELECT '
-			. str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
-			. 'FROM `' . $table . '` WHERE ';
+		$query = 'INSERT INTO `'.$table.'` (`'
+			. implode('`,`', array_keys($input)).'`) SELECT '
+			. str_repeat('?,', count($input) - 1).'? ' // Is there a prettier alternative?
+			. 'FROM `'.$table.'` WHERE ';
 
 		$inserts = array_values($input);
-		foreach($compare as $key) {
-			$query .= '`' . $key . '`';
+		foreach ($compare as $key) {
+			$query .= '`'.$key.'`';
 			if (is_null($input[$key])) {
 				$query .= ' IS NULL AND ';
 			} else {
@@ -130,15 +130,15 @@ 
 	/**
 	 * @suppress SqlInjectionChecker
 	 */
-	public function insertIgnoreConflict(string $table,array $values) : int {
+	public function insertIgnoreConflict(string $table, array $values) : int {
 		try {
 			$builder = $this->conn->getQueryBuilder();
 			$builder->insert($table);
-			foreach($values as $key => $value) {
+			foreach ($values as $key => $value) {
 				$builder->setValue($key, $builder->createNamedParameter($value));
 			}
 			return $builder->execute();
-		} catch(UniqueConstraintViolationException $e) {
+		} catch (UniqueConstraintViolationException $e) {
 			return 0;
 		}
 	}