nextcloud / server

index.php

Spacing +2 added lines, -2 removed lines

@@ -28,10 +28,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
-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';
 
 	OC::handleRequest();
 } catch (\OC\ServiceUnavailableException $ex) {

ocs/providers.php

Spacing +3 added lines, -3 removed lines

@@ -23,14 +23,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
-require_once __DIR__ . '/../lib/versioncheck.php';
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/versioncheck.php';
+require_once __DIR__.'/../lib/base.php';
 
 header('Content-type: application/xml');
 
 $request = \OC::$server->getRequest();
 
-$url = $request->getServerProtocol() . '://' . substr($request->getServerHost() . $request->getRequestUri(), 0, -17).'ocs/v1.php/';
+$url = $request->getServerProtocol().'://'.substr($request->getServerHost().$request->getRequestUri(), 0, -17).'ocs/v1.php/';
 
 $writer = new XMLWriter();
 $writer->openURI('php://output');

apps/workflowengine/lib/Check/FileSystemTags.php

Spacing +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
 			 * @psalm-suppress UndefinedDocblockClass
 			 * @psalm-suppress UndefinedInterfaceMethod
 			 */
-			$cacheId = $cache->getNumericStorageId() . '/' . $groupFolderStorage->getFolderId();
+			$cacheId = $cache->getNumericStorageId().'/'.$groupFolderStorage->getFolderId();
 		} else {
 			$cacheId = $cache->getNumericStorageId();
 		}
@@ -179,7 +179,7 @@ 
 	}
 
 	public function supportedEntities(): array {
-		return [ File::class ];
+		return [File::class];
 	}
 
 	public function isAvailableForScope(int $scope): bool {

lib/private/Repair/Collation.php

Spacing +10 added lines, -10 removed lines

@@ -78,7 +78,7 @@ 
 		$tables = $this->getAllNonUTF8BinTables($this->connection);
 		foreach ($tables as $table) {
 			$output->info("Change row format for $table ...");
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT = DYNAMIC;');
+			$query = $this->connection->prepare('ALTER TABLE `'.$table.'` ROW_FORMAT = DYNAMIC;');
 			try {
 				$query->execute();
 			} catch (DriverException $e) {
@@ -90,7 +90,7 @@ 
 			}
 
 			$output->info("Change collation for $table ...");
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;');
+			$query = $this->connection->prepare('ALTER TABLE `'.$table.'` CONVERT TO CHARACTER SET '.$characterSet.' COLLATE '.$characterSet.'_bin;');
 			try {
 				$query->execute();
 			} catch (DriverException $e) {
@@ -116,10 +116,10 @@ 
 
 		// fetch tables by columns
 		$statement = $connection->executeQuery(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . COLUMNS" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND (COLLATION_NAME <> '" . $characterSet . "_bin' OR CHARACTER_SET_NAME <> '" . $characterSet . "')" .
+			"SELECT DISTINCT(TABLE_NAME) AS `table`".
+			"	FROM INFORMATION_SCHEMA . COLUMNS".
+			"	WHERE TABLE_SCHEMA = ?".
+			"	AND (COLLATION_NAME <> '".$characterSet."_bin' OR CHARACTER_SET_NAME <> '".$characterSet."')".
 			"	AND TABLE_NAME LIKE '*PREFIX*%'",
 			[$dbName]
 		);
@@ -131,10 +131,10 @@ 
 
 		// fetch tables by collation
 		$statement = $connection->executeQuery(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . TABLES" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND TABLE_COLLATION <> '" . $characterSet . "_bin'" .
+			"SELECT DISTINCT(TABLE_NAME) AS `table`".
+			"	FROM INFORMATION_SCHEMA . TABLES".
+			"	WHERE TABLE_SCHEMA = ?".
+			"	AND TABLE_COLLATION <> '".$characterSet."_bin'".
 			"	AND TABLE_NAME LIKE '*PREFIX*%'",
 			[$dbName]
 		);

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

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 		parent::__construct($connection, $queryBuilder);
 
 		$params = $connection->getInner()->getParams();
-		$this->collation = $params['collation'] ?? (($params['charset'] ?? 'utf8') . '_general_ci');
+		$this->collation = $params['collation'] ?? (($params['charset'] ?? 'utf8').'_general_ci');
 	}
 
 	/**
@@ -52,7 +52,7 @@ 
 	public function iLike($x, $y, $type = null): string {
 		$x = $this->helper->quoteColumnName($x);
 		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->collation . ' LIKE', $y);
+		return $this->expressionBuilder->comparison($x, ' COLLATE '.$this->collation.' LIKE', $y);
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	public function castColumn($column, $type): IQueryFunction {
 		switch ($type) {
 			case IQueryBuilder::PARAM_STR:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS CHAR)');
+				return new QueryFunction('CAST('.$this->helper->quoteColumnName($column).' AS CHAR)');
 			default:
 				return parent::castColumn($column, $type);
 		}

lib/private/L10N/Factory.php

Spacing +15 added lines, -15 removed lines

@@ -126,7 +126,7 @@ 
 	 * @return \OCP\IL10N
 	 */
 	public function get($app, $lang = null, $locale = null) {
-		return new LazyL10N(function () use ($app, $lang, $locale) {
+		return new LazyL10N(function() use ($app, $lang, $locale) {
 			$app = \OC_App::cleanAppId($app);
 			if ($lang !== null) {
 				$lang = str_replace(['\0', '/', '\\', '..'], '', $lang);
@@ -191,7 +191,7 @@ 
 		 * @link https://github.com/owncloud/core/issues/21955
 		 */
 		if ($this->config->getSystemValue('installed', false)) {
-			$userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() :  null;
+			$userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() : null;
 			if (!is_null($userId)) {
 				$userLang = $this->config->getUserValue($userId, 'core', 'lang', null);
 			} else {
@@ -278,7 +278,7 @@ 
 		}
 
 		if ($this->config->getSystemValue('installed', false)) {
-			$userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() :  null;
+			$userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() : null;
 			$userLocale = null;
 			if (null !== $userId) {
 				$userLocale = $this->config->getUserValue($userId, 'core', 'locale', null);
@@ -359,7 +359,7 @@ 
 		// merge with translations from theme
 		$theme = $this->config->getSystemValue('theme');
 		if (!empty($theme)) {
-			$themeDir = $this->serverRoot . '/themes/' . $theme . substr($dir, strlen($this->serverRoot));
+			$themeDir = $this->serverRoot.'/themes/'.$theme.substr($dir, strlen($this->serverRoot));
 
 			if (is_dir($themeDir)) {
 				$files = scandir($themeDir);
@@ -385,7 +385,7 @@ 
 			return $this->availableLocales;
 		}
 
-		$localeData = file_get_contents(\OC::$SERVERROOT . '/resources/locales.json');
+		$localeData = file_get_contents(\OC::$SERVERROOT.'/resources/locales.json');
 		$this->availableLocales = \json_decode($localeData, true);
 
 		return $this->availableLocales;
@@ -554,11 +554,11 @@ 
 		$languageFiles = [];
 
 		$i18nDir = $this->findL10nDir($app);
-		$transFile = strip_tags($i18nDir) . strip_tags($lang) . '.json';
+		$transFile = strip_tags($i18nDir).strip_tags($lang).'.json';
 
-		if (($this->isSubDirectory($transFile, $this->serverRoot . '/core/l10n/')
-				|| $this->isSubDirectory($transFile, $this->serverRoot . '/lib/l10n/')
-				|| $this->isSubDirectory($transFile, \OC_App::getAppPath($app) . '/l10n/'))
+		if (($this->isSubDirectory($transFile, $this->serverRoot.'/core/l10n/')
+				|| $this->isSubDirectory($transFile, $this->serverRoot.'/lib/l10n/')
+				|| $this->isSubDirectory($transFile, \OC_App::getAppPath($app).'/l10n/'))
 			&& file_exists($transFile)
 		) {
 			// load the translations file
@@ -568,7 +568,7 @@ 
 		// merge with translations from theme
 		$theme = $this->config->getSystemValue('theme');
 		if (!empty($theme)) {
-			$transFile = $this->serverRoot . '/themes/' . $theme . substr($transFile, strlen($this->serverRoot));
+			$transFile = $this->serverRoot.'/themes/'.$theme.substr($transFile, strlen($this->serverRoot));
 			if (file_exists($transFile)) {
 				$languageFiles[] = $transFile;
 			}
@@ -585,14 +585,14 @@ 
 	 */
 	protected function findL10nDir($app = null) {
 		if (in_array($app, ['core', 'lib'])) {
-			if (file_exists($this->serverRoot . '/' . $app . '/l10n/')) {
-				return $this->serverRoot . '/' . $app . '/l10n/';
+			if (file_exists($this->serverRoot.'/'.$app.'/l10n/')) {
+				return $this->serverRoot.'/'.$app.'/l10n/';
 			}
 		} elseif ($app && \OC_App::getAppPath($app) !== false) {
 			// Check if the app is in the app folder
-			return \OC_App::getAppPath($app) . '/l10n/';
+			return \OC_App::getAppPath($app).'/l10n/';
 		}
-		return $this->serverRoot . '/core/l10n/';
+		return $this->serverRoot.'/core/l10n/';
 	}
 
 	/**
@@ -651,7 +651,7 @@ 
 		ksort($commonLanguages);
 
 		// sort now by displayed language not the iso-code
-		usort($otherLanguages, function ($a, $b) {
+		usort($otherLanguages, function($a, $b) {
 			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
 				// If a doesn't have a name, but b does, list b before a
 				return 1;

apps/testing/lib/Controller/LockingController.php

Spacing +9 added lines, -9 removed lines

@@ -94,7 +94,7 @@ 
 	 */
 	protected function getPath(string $user, string $path): string {
 		$node = $this->rootFolder->getUserFolder($user)->get($path);
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+		return 'files/'.md5($node->getStorage()->getId().'::'.trim($node->getInternalPath(), '/'));
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 
 		try {
 			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+			$this->config->setAppValue('testing', 'locking_'.$path, (string) $type);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -148,7 +148,7 @@ 
 
 		try {
 			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, (string)$type);
+			$this->config->setAppValue('testing', 'locking_'.$path, (string) $type);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -171,7 +171,7 @@ 
 
 		try {
 			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
+			$this->config->deleteAppValue('testing', 'locking_'.$path);
 			return new DataResponse();
 		} catch (LockedException $e) {
 			throw new OCSException('', Http::STATUS_LOCKED, $e);
@@ -206,12 +206,12 @@ 
 			if (strpos($lock, 'locking_') === 0) {
 				$path = substr($lock, strlen('locking_'));
 
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
-				} elseif ($type === ILockingProvider::LOCK_SHARED && (int)$this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+				if ($type === ILockingProvider::LOCK_EXCLUSIVE && (int) $this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_EXCLUSIVE) {
+					$lockingProvider->releaseLock($path, (int) $this->config->getAppValue('testing', $lock));
+				} elseif ($type === ILockingProvider::LOCK_SHARED && (int) $this->config->getAppValue('testing', $lock) === ILockingProvider::LOCK_SHARED) {
+					$lockingProvider->releaseLock($path, (int) $this->config->getAppValue('testing', $lock));
 				} else {
-					$lockingProvider->releaseLock($path, (int)$this->config->getAppValue('testing', $lock));
+					$lockingProvider->releaseLock($path, (int) $this->config->getAppValue('testing', $lock));
 				}
 			}
 		}

lib/private/Settings/Manager.php

Spacing +5 added lines, -5 removed lines

@@ -132,7 +132,7 @@ 
 			$sectionID = $section->getID();
 
 			if (!$this->isKnownDuplicateSectionId($sectionID) && isset($this->sections[$type][$sectionID])) {
-				$e = new \InvalidArgumentException('Section with the same ID already registered: ' . $sectionID . ', class: ' . $class);
+				$e = new \InvalidArgumentException('Section with the same ID already registered: '.$sectionID.', class: '.$class);
 				$this->log->info($e->getMessage(), ['exception' => $e]);
 				continue;
 			}
@@ -198,7 +198,7 @@ 
 			}
 
 			if (!$setting instanceof ISettings) {
-				$e = new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')');
+				$e = new \InvalidArgumentException('Invalid settings setting registered ('.$class.')');
 				$this->log->info($e->getMessage(), ['exception' => $e]);
 				continue;
 			}
@@ -249,7 +249,7 @@ 
 	 */
 	public function getAdminSettings($section, bool $subAdminOnly = false): array {
 		if ($subAdminOnly) {
-			$subAdminSettingsFilter = function (ISettings $settings) {
+			$subAdminSettingsFilter = function(ISettings $settings) {
 				return $settings instanceof ISubAdminSettings;
 			};
 			$appSettings = $this->getSettings('admin', $section, $subAdminSettingsFilter);
@@ -340,12 +340,12 @@ 
 		} else {
 			$authorizedSettingsClasses = $this->mapper->findAllClassesForUser($user);
 			if ($this->subAdmin->isSubAdmin($user)) {
-				$authorizedGroupFilter = function (ISettings $settings) use ($authorizedSettingsClasses) {
+				$authorizedGroupFilter = function(ISettings $settings) use ($authorizedSettingsClasses) {
 					return $settings instanceof ISubAdminSettings
 						|| in_array(get_class($settings), $authorizedSettingsClasses) === true;
 				};
 			} else {
-				$authorizedGroupFilter = function (ISettings $settings) use ($authorizedSettingsClasses) {
+				$authorizedGroupFilter = function(ISettings $settings) use ($authorizedSettingsClasses) {
 					return in_array(get_class($settings), $authorizedSettingsClasses) === true;
 				};
 			}

lib/private/Talk/Broker.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 			// Remember and return
 			return $this->hasBackend = true;
 		} catch (Throwable $e) {
-			$this->logger->error("Talk backend {class} could not be loaded: " . $e->getMessage(), [
+			$this->logger->error("Talk backend {class} could not be loaded: ".$e->getMessage(), [
 				'class' => $backendRegistration->getService(),
 				'exception' => $e,
 			]);