nextcloud / server

apps/files_external/lib/Command/Create.php

Spacing +9 added lines, -9 removed lines

@@ -128,32 +128,32 @@ 
 		$authBackend = $this->backendService->getAuthMechanism($authIdentifier);
 
 		if (!Filesystem::isValidPath($mountPoint)) {
-			$output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>');
+			$output->writeln('<error>Invalid mountpoint "'.$mountPoint.'"</error>');
 			return 1;
 		}
 		if (is_null($storageBackend)) {
-			$output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+			$output->writeln('<error>Storage backend with identifier "'.$storageIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>');
 			return 404;
 		}
 		if (is_null($authBackend)) {
-			$output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+			$output->writeln('<error>Authentication backend with identifier "'.$authIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>');
 			return 404;
 		}
 		$supportedSchemes = array_keys($storageBackend->getAuthSchemes());
 		if (!in_array($authBackend->getScheme(), $supportedSchemes)) {
-			$output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>');
+			$output->writeln('<error>Authentication backend "'.$authIdentifier.'" not valid for storage backend "'.$storageIdentifier.'" (see `occ files_external:backends storage '.$storageIdentifier.'` for possible values)</error>');
 			return 1;
 		}
 
 		$config = [];
 		foreach ($configInput as $configOption) {
 			if (!strpos($configOption, '=')) {
-				$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+				$output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>');
 				return 1;
 			}
 			list($key, $value) = explode('=', $configOption, 2);
 			if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
-				$output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
+				$output->writeln('<error>Unknown configuration for backends "'.$key.'"</error>');
 				return 1;
 			}
 			$config[$key] = $value;
@@ -167,7 +167,7 @@ 
 
 		if ($user) {
 			if (!$this->userManager->userExists($user)) {
-				$output->writeln('<error>User "' . $user . '" not found</error>');
+				$output->writeln('<error>User "'.$user.'" not found</error>');
 				return 1;
 			}
 			$mount->setApplicableUsers([$user]);
@@ -178,9 +178,9 @@ 
 		} else {
 			$this->getStorageService($user)->addStorage($mount);
 			if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-				$output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
+				$output->writeln('<info>Storage created with id '.$mount->getId().'</info>');
 			} else {
-				$output->writeln((string)$mount->getId());
+				$output->writeln((string) $mount->getId());
 			}
 		}
 		return 0;

lib/private/AllConfig.php

Spacing +14 added lines, -14 removed lines

@@ -87,7 +87,7 @@ 
 	 * because the database connection was created with an uninitialized config
 	 */
 	private function fixDIInit() {
-		if($this->connection === null) {
+		if ($this->connection === null) {
 			$this->connection = \OC::$server->getDatabaseConnection();
 		}
 	}
@@ -218,9 +218,9 @@ 
 		$prevValue = $this->getUserValue($userId, $appName, $key, null);
 
 		if ($prevValue !== null) {
-			if ($prevValue === (string)$value) {
+			if ($prevValue === (string) $value) {
 				return;
-			} else if ($preCondition !== null && $prevValue !== (string)$preCondition) {
+			} else if ($preCondition !== null && $prevValue !== (string) $preCondition) {
 				throw new PreConditionNotMetException();
 			} else {
 				$qb = $this->connection->getQueryBuilder();
@@ -305,7 +305,7 @@ 
 		// TODO - FIXME
 		$this->fixDIInit();
 
-		$sql  = 'DELETE FROM `*PREFIX*preferences` '.
+		$sql = 'DELETE FROM `*PREFIX*preferences` '.
 				'WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?';
 		$this->connection->executeUpdate($sql, array($userId, $appName, $key));
 
@@ -323,7 +323,7 @@ 
 		// TODO - FIXME
 		$this->fixDIInit();
 
-		$sql  = 'DELETE FROM `*PREFIX*preferences` '.
+		$sql = 'DELETE FROM `*PREFIX*preferences` '.
 			'WHERE `userid` = ?';
 		$this->connection->executeUpdate($sql, array($userId));
 
@@ -339,7 +339,7 @@ 
 		// TODO - FIXME
 		$this->fixDIInit();
 
-		$sql  = 'DELETE FROM `*PREFIX*preferences` '.
+		$sql = 'DELETE FROM `*PREFIX*preferences` '.
 				'WHERE `appid` = ?';
 		$this->connection->executeUpdate($sql, array($appName));
 
@@ -362,7 +362,7 @@ 
 			return $this->userCache[$userId];
 		}
 		if ($userId === null || $userId === '') {
-			$this->userCache[$userId]=array();
+			$this->userCache[$userId] = array();
 			return $this->userCache[$userId];
 		}
 
@@ -409,12 +409,12 @@ 
 			array_unshift($queryParams, $key);
 			array_unshift($queryParams, $appName);
 
-			$placeholders = (count($chunk) === 50) ? $placeholders50 :  implode(',', array_fill(0, count($chunk), '?'));
+			$placeholders = (count($chunk) === 50) ? $placeholders50 : implode(',', array_fill(0, count($chunk), '?'));
 
-			$query    = 'SELECT `userid`, `configvalue` ' .
-						'FROM `*PREFIX*preferences` ' .
-						'WHERE `appid` = ? AND `configkey` = ? ' .
-						'AND `userid` IN (' . $placeholders . ')';
+			$query = 'SELECT `userid`, `configvalue` '.
+						'FROM `*PREFIX*preferences` '.
+						'WHERE `appid` = ? AND `configkey` = ? '.
+						'AND `userid` IN ('.$placeholders.')';
 			$result = $this->connection->executeQuery($query, $queryParams);
 
 			while ($row = $result->fetch()) {
@@ -437,10 +437,10 @@ 
 		// TODO - FIXME
 		$this->fixDIInit();
 
-		$sql  = 'SELECT `userid` FROM `*PREFIX*preferences` ' .
+		$sql = 'SELECT `userid` FROM `*PREFIX*preferences` '.
 				'WHERE `appid` = ? AND `configkey` = ? ';
 
-		if($this->getSystemValue('dbtype', 'sqlite') === 'oci') {
+		if ($this->getSystemValue('dbtype', 'sqlite') === 'oci') {
 			//oracle hack: need to explicitly cast CLOB to CHAR for comparison
 			$sql .= 'AND to_char(`configvalue`) = ?';
 		} else {

settings/ajax/togglesubadmins.php

Spacing +5 added lines, -5 removed lines

@@ -27,24 +27,24 @@
 $lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
 if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay
 	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Password confirmation is required'))));
+	OC_JSON::error(array('data' => array('message' => $l->t('Password confirmation is required'))));
 	exit();
 }
 
-$username = (string)$_POST['username'];
-$group = (string)$_POST['group'];
+$username = (string) $_POST['username'];
+$group = (string) $_POST['group'];
 
 $subAdminManager = \OC::$server->getGroupManager()->getSubAdmin();
 $targetUserObject = \OC::$server->getUserManager()->get($username);
 $targetGroupObject = \OC::$server->getGroupManager()->get($group);
 
 $isSubAdminOfGroup = false;
-if($targetUserObject !== null && $targetGroupObject !== null) {
+if ($targetUserObject !== null && $targetGroupObject !== null) {
 	$isSubAdminOfGroup = $subAdminManager->isSubAdminOfGroup($targetUserObject, $targetGroupObject);
 }
 
 // Toggle group
-if($isSubAdminOfGroup) {
+if ($isSubAdminOfGroup) {
 	$subAdminManager->deleteSubAdmin($targetUserObject, $targetGroupObject);
 } else {
 	$subAdminManager->createSubAdmin($targetUserObject, $targetGroupObject);

lib/private/App/DependencyAnalyzer.php

Spacing +16 added lines, -16 removed lines

@@ -139,19 +139,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;
@@ -174,12 +174,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;
 	}
@@ -208,7 +208,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;
@@ -235,7 +235,7 @@ 
 			$libName = $this->getValue($lib);
 			$libVersion = $this->platform->getLibraryVersion($libName);
 			if (is_null($libVersion)) {
-				$missing[] = (string)$this->l->t('The library %s is not available.', $libName);
+				$missing[] = (string) $this->l->t('The library %s is not available.', $libName);
 				continue;
 			}
 
@@ -243,14 +243,14 @@ 
 				if (isset($lib['@attributes']['min-version'])) {
 					$minVersion = $lib['@attributes']['min-version'];
 					if ($this->compareSmaller($libVersion, $minVersion)) {
-						$missing[] = (string)$this->l->t('Library %s with a version higher than %s is required - available version %s.',
+						$missing[] = (string) $this->l->t('Library %s with a version higher than %s is required - available version %s.',
 							array($libName, $minVersion, $libVersion));
 					}
 				}
 				if (isset($lib['@attributes']['max-version'])) {
 					$maxVersion = $lib['@attributes']['max-version'];
 					if ($this->compareBigger($libVersion, $maxVersion)) {
-						$missing[] = (string)$this->l->t('Library %s with a version lower than %s is required - available version %s.',
+						$missing[] = (string) $this->l->t('Library %s with a version lower than %s is required - available version %s.',
 							array($libName, $maxVersion, $libVersion));
 					}
 				}
@@ -274,7 +274,7 @@ 
 			return $missing;
 		}
 		if (is_array($oss)) {
-			$oss = array_map(function ($os) {
+			$oss = array_map(function($os) {
 				return $this->getValue($os);
 			}, $oss);
 		} else {
@@ -282,7 +282,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;
 	}
@@ -315,12 +315,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 (!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;
@@ -338,7 +338,7 @@ 
 				return '10';
 			default:
 				if (strpos($version, '9.1.') === 0) {
-					$version = '10.0.' . substr($version, 4);
+					$version = '10.0.'.substr($version, 4);
 				}
 				return $version;
 		}
@@ -352,6 +352,6 @@ 
 		if (isset($element['@value'])) {
 			return $element['@value'];
 		}
-		return (string)$element;
+		return (string) $element;
 	}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -147,7 +147,7 @@ 
 	public function castColumn($column, $type) {
 		if ($type === IQueryBuilder::PARAM_STR) {
 			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
+			return new QueryFunction('to_char('.$column.')');
 		}
 
 		return parent::castColumn($column, $type);
@@ -157,7 +157,7 @@ 
 	 * @inheritdoc
 	 */
 	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
 	}
 
 	/**
@@ -166,6 +166,6 @@ 
 	public function iLike($x, $y, $type = null) {
 		$x = $this->helper->quoteColumnName($x);
 		$y = $this->helper->quoteColumnName($y);
-		return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' || REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
+		return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE(REPLACE('.$y.', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
 	}
 }

core/Command/Db/ConvertType.php

Spacing +8 added lines, -8 removed lines

@@ -233,7 +233,7 @@ 
 
 		$schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
 		$apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
 				$schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
 			} else {
@@ -269,13 +269,13 @@ 
 		if (!empty($toTables)) {
 			$output->writeln('<info>Clearing schema in new database</info>');
 		}
-		foreach($toTables as $table) {
+		foreach ($toTables as $table) {
 			$db->getSchemaManager()->dropTable($table);
 		}
 	}
 
 	protected function getTables(Connection $db) {
-		$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+		$filterExpression = '/^'.preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')).'/';
 		$db->getConfiguration()->
 			setFilterSchemaAssetsExpression($filterExpression);
 		return $db->getSchemaManager()->listTableNames();
@@ -290,7 +290,7 @@ 
 	 * @suppress SqlInjectionChecker
 	 */
 	protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
-		if ($table->getName() === $toDB->getPrefix() . 'migrations') {
+		if ($table->getName() === $toDB->getPrefix().'migrations') {
 			$output->writeln('<comment>Skipping migrations table because it was already filled by running the migrations</comment>');
 			return;
 		}
@@ -305,9 +305,9 @@ 
 		$count = $result->fetchColumn();
 		$result->closeCursor();
 
-		$numChunks = ceil($count/$chunkSize);
+		$numChunks = ceil($count / $chunkSize);
 		if ($numChunks > 1) {
-			$output->writeln('chunked query, ' . $numChunks . ' chunks');
+			$output->writeln('chunked query, '.$numChunks.' chunks');
 		}
 
 		$progress = new ProgressBar($output, $count);
@@ -394,7 +394,7 @@ 
 
 		try {
 			// copy table rows
-			foreach($tables as $table) {
+			foreach ($tables as $table) {
 				$output->writeln($table);
 				$this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
 			}
@@ -404,7 +404,7 @@ 
 			}
 			// save new database config
 			$this->saveDBInfo($input);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->config->setSystemValue('maintenance', false);
 			throw $e;
 		}

lib/private/L10N/L10NString.php

Spacing +4 added lines, -4 removed lines

@@ -56,19 +56,19 @@
 		$translations = $this->l10n->getTranslations();
 
 		$text = $this->text;
-		if(array_key_exists($this->text, $translations)) {
-			if(is_array($translations[$this->text])) {
+		if (array_key_exists($this->text, $translations)) {
+			if (is_array($translations[$this->text])) {
 				$fn = $this->l10n->getPluralFormFunction();
 				$id = $fn($this->count);
 				$text = $translations[$this->text][$id];
 			}
-			else{
+			else {
 				$text = $translations[$this->text];
 			}
 		}
 
 		// Replace %n first (won't interfere with vsprintf)
-		$text = str_replace('%n', (string)$this->count, $text);
+		$text = str_replace('%n', (string) $this->count, $text);
 		return vsprintf($text, $this->parameters);
 	}
 

lib/private/App/AppStore/Bundles/EducationBundle.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Education Edition');
+		return (string) $this->l10n->t('Education Edition');
 	}
 
 	/**

apps/files_sharing/lib/AppInfo/Application.php

Spacing +10 added lines, -10 removed lines

@@ -51,7 +51,7 @@ 
 		/**
 		 * Controllers
 		 */
-		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ShareController', function(SimpleContainer $c) use ($server) {
 			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
 			return new ShareController(
 				$c->query('AppName'),
@@ -71,7 +71,7 @@ 
 				$server->query(Defaults::class)
 			);
 		});
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
+		$container->registerService('ExternalSharesController', function(SimpleContainer $c) {
 			return new ExternalSharesController(
 				$c->query('AppName'),
 				$c->query('Request'),
@@ -83,13 +83,13 @@ 
 		/**
 		 * Core class wrappers
 		 */
-		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
+		$container->registerService('HttpClientService', function(SimpleContainer $c) use ($server) {
 			return $server->getHTTPClientService();
 		});
-		$container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
+		$container->registerService(ICloudIdManager::class, function(SimpleContainer $c) use ($server) {
 			return $server->getCloudIdManager();
 		});
-		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
+		$container->registerService('ExternalManager', function(SimpleContainer $c) use ($server) {
 			$user = $server->getUserSession()->getUser();
 			$uid = $user ? $user->getUID() : null;
 			return new \OCA\Files_Sharing\External\Manager(
@@ -107,7 +107,7 @@ 
 		/**
 		 * Middleware
 		 */
-		$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
+		$container->registerService('SharingCheckMiddleware', function(SimpleContainer $c) use ($server) {
 			return new SharingCheckMiddleware(
 				$c->query('AppName'),
 				$server->getConfig(),
@@ -118,14 +118,14 @@ 
 			);
 		});
 
-		$container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) {
+		$container->registerService('OCSShareAPIMiddleware', function(SimpleContainer $c) use ($server) {
 			return new OCSShareAPIMiddleware(
 				$server->getShareManager(),
 				$server->getL10N($c->query('AppName'))
 			);
 		});
 
-		$container->registerService(ShareInfoMiddleware::class, function () use ($server) {
+		$container->registerService(ShareInfoMiddleware::class, function() use ($server) {
 			return new ShareInfoMiddleware(
 				$server->getShareManager()
 			);
@@ -136,7 +136,7 @@ 
 		$container->registerMiddleWare('OCSShareAPIMiddleware');
 		$container->registerMiddleWare(ShareInfoMiddleware::class);
 
-		$container->registerService('MountProvider', function (IContainer $c) {
+		$container->registerService('MountProvider', function(IContainer $c) {
 			/** @var \OCP\IServerContainer $server */
 			$server = $c->query('ServerContainer');
 			return new MountProvider(
@@ -146,7 +146,7 @@ 
 			);
 		});
 
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
+		$container->registerService('ExternalMountProvider', function(IContainer $c) {
 			/** @var \OCP\IServerContainer $server */
 			$server = $c->query('ServerContainer');
 			return new \OCA\Files_Sharing\External\MountProvider(