nextcloud / server

lib/private/App/CodeChecker/DatabaseSchemaChecker.php

Spacing +17 added lines, -17 removed lines

@@ -35,13 +35,13 @@ 
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		if (!file_exists($appPath . '/appinfo/database.xml')) {
+		if (!file_exists($appPath.'/appinfo/database.xml')) {
 			return ['errors' => [], 'warnings' => []];
 		}
 
 		libxml_use_internal_errors(true);
 		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
+		$xml = simplexml_load_file($appPath.'/appinfo/database.xml');
 		libxml_disable_entity_loader($loadEntities);
 
 
@@ -49,37 +49,37 @@ 
 
 		foreach ($xml->table as $table) {
 			// Table names
-			if (strpos((string)$table->name, '*dbprefix*') !== 0) {
-				$errors[] = 'Database schema error: name of table ' . (string)$table->name . ' does not start with *dbprefix*';
+			if (strpos((string) $table->name, '*dbprefix*') !== 0) {
+				$errors[] = 'Database schema error: name of table '.(string) $table->name.' does not start with *dbprefix*';
 			}
-			$tableName = substr((string)$table->name, strlen('*dbprefix*'));
+			$tableName = substr((string) $table->name, strlen('*dbprefix*'));
 			if (strpos($tableName, '*dbprefix*') !== false) {
-				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . (string)$table->name;
+				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table '.(string) $table->name;
 			}
 
 			if (strlen($tableName) > 27) {
-				$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+				$errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
 			}
 
 			$hasAutoIncrement = false;
 
 			// Column names
 			foreach ($table->declaration->field as $column) {
-				if (strpos((string)$column->name, '*dbprefix*') !== false) {
-					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . (string)$column->name . ' on table ' . (string)$table->name;
+				if (strpos((string) $column->name, '*dbprefix*') !== false) {
+					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column '.(string) $column->name.' on table '.(string) $table->name;
 				}
 
-				if (strlen((string)$column->name) > 30) {
-					$errors[] = 'Database schema error: Name of column ' . (string)$column->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
+				if (strlen((string) $column->name) > 30) {
+					$errors[] = 'Database schema error: Name of column '.(string) $column->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 30 characters allowed';
 				}
 
 				if ($column->autoincrement) {
 					if ($hasAutoIncrement) {
-						$errors[] = 'Database schema error: Table ' . (string)$table->name . ' has multiple autoincrement columns';
+						$errors[] = 'Database schema error: Table '.(string) $table->name.' has multiple autoincrement columns';
 					}
 
 					if (strlen($tableName) > 21) {
-						$errors[] = 'Database schema error: Name of table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+						$errors[] = 'Database schema error: Name of table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
 					}
 
 					$hasAutoIncrement = true;
@@ -88,14 +88,14 @@ 
 
 			// Index names
 			foreach ($table->declaration->index as $index) {
-				$hasPrefix = strpos((string)$index->name, '*dbprefix*');
+				$hasPrefix = strpos((string) $index->name, '*dbprefix*');
 				if ($hasPrefix !== false && $hasPrefix !== 0) {
-					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . (string)$index->name . ' on table ' . (string)$table->name;
+					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index '.(string) $index->name.' on table '.(string) $table->name;
 				}
 
-				$indexName = $hasPrefix === 0 ? substr((string)$index->name, strlen('*dbprefix*')) : (string)$index->name;
+				$indexName = $hasPrefix === 0 ? substr((string) $index->name, strlen('*dbprefix*')) : (string) $index->name;
 				if (strlen($indexName) > 27) {
-					$errors[] = 'Database schema error: Name of index ' . (string)$index->name . ' on table ' . (string)$table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
+					$errors[] = 'Database schema error: Name of index '.(string) $index->name.' on table '.(string) $table->name.' is too long ('.strlen($tableName).'), max. 27 characters + *dbprefix* allowed';
 				}
 			}
 		}

core/Controller/JsController.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 			$folder = $this->appData->getFolder($appName);
 			$gzip = false;
 			$file = $this->getFile($folder, $fileName, $gzip);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return new NotFoundResponse();
 		}
 
@@ -101,7 +101,7 @@ 
 		if (strpos($encoding, 'gzip') !== false) {
 			try {
 				$gzip = true;
-				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+				return $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
 			} catch (NotFoundException $e) {
 				// continue
 			}

apps/user_ldap/appinfo/install.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
  */
 $config = \OC::$server->getConfig();
 $state = $config->getSystemValue('ldapIgnoreNamingRules', 'doSet');
-if($state === 'doSet') {
+if ($state === 'doSet') {
 	\OC::$server->getConfig()->setSystemValue('ldapIgnoreNamingRules', false);
 }
 

apps/files_external/lib/config.php

Spacing +10 added lines, -10 removed lines

@@ -256,11 +256,11 @@ 
 	 */
 	public static function readData($user = null) {
 		if (isset($user)) {
-			$jsonFile = \OC::$server->getUserManager()->get($user)->getHome() . '/mount.json';
+			$jsonFile = \OC::$server->getUserManager()->get($user)->getHome().'/mount.json';
 		} else {
 			$config = \OC::$server->getConfig();
-			$datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/');
-			$jsonFile = $config->getSystemValue('mount_file', $datadir . '/mount.json');
+			$datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data/');
+			$jsonFile = $config->getSystemValue('mount_file', $datadir.'/mount.json');
 		}
 		if (is_file($jsonFile)) {
 			$mountPoints = json_decode(file_get_contents($jsonFile), true);
@@ -286,7 +286,7 @@ 
 		foreach ($backends as $backend) {
 			foreach ($backend->checkDependencies() as $dependency) {
 				if ($message = $dependency->getMessage()) {
-					$message .= '<p>' . $message . '</p>';
+					$message .= '<p>'.$message.'</p>';
 				} else {
 					$dependencyGroups[$dependency->getDependency()][] = $backend;
 				}
@@ -295,9 +295,9 @@ 
 
 		foreach ($dependencyGroups as $module => $dependants) {
 			$backends = implode(', ', array_map(function($backend) {
-				return '"' . $backend->getText() . '"';
+				return '"'.$backend->getText().'"';
 			}, $dependants));
-			$message .= '<p>' . OC_Mount_Config::getSingleDependencyMessage($l, $module, $backends) . '</p>';
+			$message .= '<p>'.OC_Mount_Config::getSingleDependencyMessage($l, $module, $backends).'</p>';
 		}
 
 		return $message;
@@ -314,11 +314,11 @@ 
 	private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) {
 		switch (strtolower($module)) {
 			case 'curl':
-				return (string)$l->t('The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]);
+				return (string) $l->t('The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]);
 			case 'ftp':
-				return (string)$l->t('The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]);
+				return (string) $l->t('The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$backend]);
 			default:
-				return (string)$l->t('"%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$module, $backend]);
+				return (string) $l->t('"%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', [$module, $backend]);
 		}
 	}
 
@@ -363,7 +363,7 @@ 
 		$cipher = self::getCipher();
 		$iv = \OC::$server->getSecureRandom()->generate(16);
 		$cipher->setIV($iv);
-		return base64_encode($iv . $cipher->encrypt($password));
+		return base64_encode($iv.$cipher->encrypt($password));
 	}
 
 	/**

lib/public/Template.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 	 * @since 8.0.0
 	 * @suppress PhanDeprecatedFunction
 	 */
-	public static function html_select_options($options, $selected, $params=array()) {
+	public static function html_select_options($options, $selected, $params = array()) {
 		return \html_select_options($options, $selected, $params);
 	}
 }

lib/private/Files/Cache/QuerySearchHelper.php

Spacing +9 added lines, -9 removed lines

@@ -74,7 +74,7 @@ 
 	 */
 	public function shouldJoinTags(ISearchOperator $operator) {
 		if ($operator instanceof ISearchBinaryOperator) {
-			return array_reduce($operator->getArguments(), function ($shouldJoin, ISearchOperator $operator) {
+			return array_reduce($operator->getArguments(), function($shouldJoin, ISearchOperator $operator) {
 				return $shouldJoin || $this->shouldJoinTags($operator);
 			}, false);
 		} else if ($operator instanceof ISearchComparison) {
@@ -88,7 +88,7 @@ 
 	 * @param ISearchOperator $operator
 	 */
 	public function searchOperatorArrayToDBExprArray(IQueryBuilder $builder, array $operators) {
-		return array_map(function ($operator) use ($builder) {
+		return array_map(function($operator) use ($builder) {
 			return $this->searchOperatorToDBExpr($builder, $operator);
 		}, $operators);
 	}
@@ -109,12 +109,12 @@ 
 				case ISearchBinaryOperator::OPERATOR_OR:
 					return call_user_func_array([$expr, 'orX'], $this->searchOperatorArrayToDBExprArray($builder, $operator->getArguments()));
 				default:
-					throw new \InvalidArgumentException('Invalid operator type: ' . $operator->getType());
+					throw new \InvalidArgumentException('Invalid operator type: '.$operator->getType());
 			}
 		} else if ($operator instanceof ISearchComparison) {
 			return $this->searchComparisonToDBExpr($builder, $operator, self::$searchOperatorMap);
 		} else {
-			throw new \InvalidArgumentException('Invalid operator type: ' . get_class($operator));
+			throw new \InvalidArgumentException('Invalid operator type: '.get_class($operator));
 		}
 	}
 
@@ -126,7 +126,7 @@ 
 			$queryOperator = $operatorMap[$type];
 			return $builder->expr()->$queryOperator($field, $this->getParameterForValue($builder, $value));
 		} else {
-			throw new \InvalidArgumentException('Invalid operator type: ' . $comparison->getType());
+			throw new \InvalidArgumentException('Invalid operator type: '.$comparison->getType());
 		}
 	}
 
@@ -145,7 +145,7 @@ 
 					$type = ISearchComparison::COMPARE_EQUAL;
 				}
 				if (strpos($value, '%') !== false) {
-					throw new \InvalidArgumentException('Unsupported query value for mimetype: ' . $value . ', only values in the format "mime/type" or "mime/%" are supported');
+					throw new \InvalidArgumentException('Unsupported query value for mimetype: '.$value.', only values in the format "mime/type" or "mime/%" are supported');
 				}
 			}
 		} else if ($field === 'favorite') {
@@ -178,14 +178,14 @@ 
 		];
 
 		if (!isset($types[$operator->getField()])) {
-			throw new \InvalidArgumentException('Unsupported comparison field ' . $operator->getField());
+			throw new \InvalidArgumentException('Unsupported comparison field '.$operator->getField());
 		}
 		$type = $types[$operator->getField()];
 		if (gettype($operator->getValue()) !== $type) {
-			throw new \InvalidArgumentException('Invalid type for field ' . $operator->getField());
+			throw new \InvalidArgumentException('Invalid type for field '.$operator->getField());
 		}
 		if (!in_array($operator->getType(), $comparisons[$operator->getField()])) {
-			throw new \InvalidArgumentException('Unsupported comparison for field  ' . $operator->getField() . ': ' . $operator->getType());
+			throw new \InvalidArgumentException('Unsupported comparison for field  '.$operator->getField().': '.$operator->getType());
 		}
 	}
 

apps/systemtags/list.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 // WARNING: this should be moved to proper AppFramework handling
 // Check if we are a user
 if (!\OC::$server->getUserSession()->isLoggedIn()) {
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+	header('Location: '.\OC::$server->getURLGenerator()->linkToRoute(
 			'core.login.showLoginForm',
 			[
 				'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
@@ -34,7 +34,7 @@ 
 }
 // Redirect to 2FA challenge selection if 2FA challenge was not solved yet
 if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-	header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+	header('Location: '.\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
 	exit();
 }
 

lib/private/Memcache/Factory.php

Spacing +3 added lines, -3 removed lines

@@ -133,7 +133,7 @@ 
 	 * @return IMemcache
 	 */
 	public function createLocking(string $prefix = ''): IMemcache {
-		return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
+		return new $this->lockingCacheClass($this->globalPrefix.'/'.$prefix);
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 * @return ICache
 	 */
 	public function createDistributed(string $prefix = ''): ICache {
-		return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
+		return new $this->distributedCacheClass($this->globalPrefix.'/'.$prefix);
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	 * @return ICache
 	 */
 	public function createLocal(string $prefix = ''): ICache {
-		return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
+		return new $this->localCacheClass($this->globalPrefix.'/'.$prefix);
 	}
 
 	/**

core/Controller/AvatarController.php

Spacing +4 added lines, -4 removed lines

@@ -172,7 +172,7 @@ 
 			if (!($node instanceof File)) {
 				return new JSONResponse(['data' => ['message' => $this->l->t('Please select a file.')]]);
 			}
-			if ($node->getSize() > 20*1024*1024) {
+			if ($node->getSize() > 20 * 1024 * 1024) {
 				return new JSONResponse(
 					['data' => ['message' => $this->l->t('File is too big')]],
 					Http::STATUS_BAD_REQUEST
@@ -200,7 +200,7 @@ 
 				 is_uploaded_file($files['tmp_name'][0]) &&
 				!\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
 			) {
-				if ($files['size'][0] > 20*1024*1024) {
+				if ($files['size'][0] > 20 * 1024 * 1024) {
 					return new JSONResponse(
 						['data' => ['message' => $this->l->t('File is too big')]],
 						Http::STATUS_BAD_REQUEST
@@ -292,7 +292,7 @@ 
 				Http::STATUS_OK,
 				['Content-Type' => $image->mimeType()]);
 
-		$resp->setETag((string)crc32($image->data()));
+		$resp->setETag((string) crc32($image->data()));
 		$resp->cacheFor(0);
 		$resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
 		return $resp;
@@ -325,7 +325,7 @@ 
 
 		$image = new \OC_Image();
 		$image->loadFromData($tmpAvatar);
-		$image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
+		$image->crop($crop['x'], $crop['y'], (int) round($crop['w']), (int) round($crop['h']));
 		try {
 			$avatar = $this->avatarManager->getAvatar($this->userId);
 			$avatar->set($image);