nextcloud / server

lib/private/DB/Migrator.php

Spacing +11 added lines, -11 removed lines

@@ -137,7 +137,7 @@ 
 	 * @return string
 	 */
 	protected function generateTemporaryTableName($name) {
-		return $this->config->getSystemValue('dbtableprefix', 'oc_') . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+		return $this->config->getSystemValue('dbtableprefix', 'oc_').$name.'_'.$this->random->generate(13, ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 				$indexName = $index->getName();
 			} else {
 				// avoid conflicts in index names
-				$indexName = $this->config->getSystemValue('dbtableprefix', 'oc_') . $this->random->generate(13, ISecureRandom::CHAR_LOWER);
+				$indexName = $this->config->getSystemValue('dbtableprefix', 'oc_').$this->random->generate(13, ISecureRandom::CHAR_LOWER);
 			}
 			$newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
 		}
@@ -268,15 +268,15 @@ 
 		$quotedSource = $this->connection->quoteIdentifier($sourceName);
 		$quotedTarget = $this->connection->quoteIdentifier($targetName);
 
-		$this->connection->exec('CREATE TABLE ' . $quotedTarget . ' (LIKE ' . $quotedSource . ')');
-		$this->connection->exec('INSERT INTO ' . $quotedTarget . ' SELECT * FROM ' . $quotedSource);
+		$this->connection->exec('CREATE TABLE '.$quotedTarget.' (LIKE '.$quotedSource.')');
+		$this->connection->exec('INSERT INTO '.$quotedTarget.' SELECT * FROM '.$quotedSource);
 	}
 
 	/**
 	 * @param string $name
 	 */
 	protected function dropTable($name) {
-		$this->connection->exec('DROP TABLE ' . $this->connection->quoteIdentifier($name));
+		$this->connection->exec('DROP TABLE '.$this->connection->quoteIdentifier($name));
 	}
 
 	/**
@@ -284,30 +284,30 @@ 
 	 * @return string
 	 */
 	protected function convertStatementToScript($statement) {
-		$script = $statement . ';';
+		$script = $statement.';';
 		$script .= PHP_EOL;
 		$script .= PHP_EOL;
 		return $script;
 	}
 
 	protected function getFilterExpression() {
-		return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+		return '/^'.preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')).'/';
 	}
 
 	protected function emit($sql, $step, $max) {
 		if ($this->noEmit) {
 			return;
 		}
-		if(is_null($this->dispatcher)) {
+		if (is_null($this->dispatcher)) {
 			return;
 		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max]));
+		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step + 1, $max]));
 	}
 
 	private function emitCheckStep($tableName, $step, $max) {
-		if(is_null($this->dispatcher)) {
+		if (is_null($this->dispatcher)) {
 			return;
 		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step+1, $max]));
+		$this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step + 1, $max]));
 	}
 }

lib/private/DB/SQLiteMigrator.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 * @return string
 	 */
 	private function buildTempDatabase() {
-		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT.'/data');
 		$tmpFile = uniqid("oc_");
 		return "$dataDir/$tmpFile.db";
 	}

lib/private/DB/AdapterPgSql.php

Spacing +2 added lines, -2 removed lines

@@ -31,8 +31,8 @@
 
 	const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
 	public function fixupStatement($statement) {
-		$statement = str_replace( '`', '"', $statement );
-		$statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
+		$statement = str_replace('`', '"', $statement);
+		$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
 		return $statement;
 	}
 }

lib/private/App/AppStore/Version/VersionParser.php

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
 	 * @return bool
 	 */
 	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
+		return (bool) preg_match('/^[0-9.]+$/', $versionString);
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	 */
 	public function getVersion($versionSpec) {
 		// * indicates that the version is compatible with all versions
-		if($versionSpec === '*') {
+		if ($versionSpec === '*') {
 			return new Version('', '');
 		}
 
@@ -56,18 +56,18 @@ 
 		$secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
 		$secondVersionNumber = substr($secondVersion, 2);
 
-		switch(count($versionElements)) {
+		switch (count($versionElements)) {
 			case 1:
-				if(!$this->isValidVersionString($firstVersionNumber)) {
+				if (!$this->isValidVersionString($firstVersionNumber)) {
 					break;
 				}
-				if(substr($firstVersion, 0, 1) === '>') {
+				if (substr($firstVersion, 0, 1) === '>') {
 					return new Version($firstVersionNumber, '');
 				} else {
 					return new Version('', $firstVersionNumber);
 				}
 			case 2:
-				if(!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
+				if (!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
 					break;
 				}
 				return new Version($firstVersionNumber, $secondVersionNumber);

lib/private/App/CodeChecker/NodeVisitor.php

Spacing +13 added lines, -13 removed lines

@@ -102,7 +102,7 @@ 
 
 	public function enterNode(Node $node) {
 		if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\Equal) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => '==',
 				'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
 				'line' => $node->getLine(),
@@ -110,7 +110,7 @@ 
 			];
 		}
 		if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\NotEqual) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => '!=',
 				'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
 				'line' => $node->getLine(),
@@ -214,28 +214,28 @@ 
 		$alias = strtolower($alias);
 
 		foreach ($this->blackListedClassNames as $blackListedAlias => $blackListedClassName) {
-			if (strpos($blackListedClassName, $name . '\\') === 0) {
+			if (strpos($blackListedClassName, $name.'\\') === 0) {
 				$aliasedClassName = str_replace($name, $alias, $blackListedClassName);
 				$this->blackListedClassNames[$aliasedClassName] = $blackListedClassName;
 			}
 		}
 
 		foreach ($this->blackListedConstants as $blackListedAlias => $blackListedConstant) {
-			if (strpos($blackListedConstant, $name . '\\') === 0 || strpos($blackListedConstant, $name . '::') === 0) {
+			if (strpos($blackListedConstant, $name.'\\') === 0 || strpos($blackListedConstant, $name.'::') === 0) {
 				$aliasedConstantName = str_replace($name, $alias, $blackListedConstant);
 				$this->blackListedConstants[$aliasedConstantName] = $blackListedConstant;
 			}
 		}
 
 		foreach ($this->blackListedFunctions as $blackListedAlias => $blackListedFunction) {
-			if (strpos($blackListedFunction, $name . '\\') === 0 || strpos($blackListedFunction, $name . '::') === 0) {
+			if (strpos($blackListedFunction, $name.'\\') === 0 || strpos($blackListedFunction, $name.'::') === 0) {
 				$aliasedFunctionName = str_replace($name, $alias, $blackListedFunction);
 				$this->blackListedFunctions[$aliasedFunctionName] = $blackListedFunction;
 			}
 		}
 
 		foreach ($this->blackListedMethods as $blackListedAlias => $blackListedMethod) {
-			if (strpos($blackListedMethod, $name . '\\') === 0 || strpos($blackListedMethod, $name . '::') === 0) {
+			if (strpos($blackListedMethod, $name.'\\') === 0 || strpos($blackListedMethod, $name.'::') === 0) {
 				$aliasedMethodName = str_replace($name, $alias, $blackListedMethod);
 				$this->blackListedMethods[$aliasedMethodName] = $blackListedMethod;
 			}
@@ -246,7 +246,7 @@ 
 		$lowerName = strtolower($name);
 
 		if (isset($this->blackListedClassNames[$lowerName])) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => $name,
 				'errorCode' => $errorCode,
 				'line' => $node->getLine(),
@@ -256,11 +256,11 @@ 
 	}
 
 	private function checkBlackListConstant($class, $constantName, Node $node) {
-		$name = $class . '::' . $constantName;
+		$name = $class.'::'.$constantName;
 		$lowerName = strtolower($name);
 
 		if (isset($this->blackListedConstants[$lowerName])) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => $name,
 				'errorCode' => CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED,
 				'line' => $node->getLine(),
@@ -270,11 +270,11 @@ 
 	}
 
 	private function checkBlackListFunction($class, $functionName, Node $node) {
-		$name = $class . '::' . $functionName;
+		$name = $class.'::'.$functionName;
 		$lowerName = strtolower($name);
 
 		if (isset($this->blackListedFunctions[$lowerName])) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => $name,
 				'errorCode' => CodeChecker::STATIC_CALL_NOT_ALLOWED,
 				'line' => $node->getLine(),
@@ -284,11 +284,11 @@ 
 	}
 
 	private function checkBlackListMethod($class, $functionName, Node $node) {
-		$name = $class . '::' . $functionName;
+		$name = $class.'::'.$functionName;
 		$lowerName = strtolower($name);
 
 		if (isset($this->blackListedMethods[$lowerName])) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => $name,
 				'errorCode' => CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED,
 				'line' => $node->getLine(),

lib/private/App/CodeChecker/CodeChecker.php

Spacing +6 added lines, -6 removed lines

@@ -42,10 +42,10 @@ 
 	const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001;
 	const STATIC_CALL_NOT_ALLOWED = 1002;
 	const CLASS_CONST_FETCH_NOT_ALLOWED = 1003;
-	const CLASS_NEW_NOT_ALLOWED =  1004;
-	const OP_OPERATOR_USAGE_DISCOURAGED =  1005;
-	const CLASS_USE_NOT_ALLOWED =  1006;
-	const CLASS_METHOD_CALL_NOT_ALLOWED =  1007;
+	const CLASS_NEW_NOT_ALLOWED = 1004;
+	const OP_OPERATOR_USAGE_DISCOURAGED = 1005;
+	const CLASS_USE_NOT_ALLOWED = 1006;
+	const CLASS_METHOD_CALL_NOT_ALLOWED = 1007;
 
 	/** @var Parser */
 	private $parser;
@@ -85,13 +85,13 @@ 
 		}
 
 		$excludes = array_map(function($item) use ($folder) {
-			return $folder . '/' . $item;
+			return $folder.'/'.$item;
 		}, $excludedDirectories);
 
 		$iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
 		$iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
 			/** @var SplFileInfo $item */
-			foreach($excludes as $exclude) {
+			foreach ($excludes as $exclude) {
 				if (substr($item->getPath(), 0, strlen($exclude)) === $exclude) {
 					return false;
 				}

lib/private/App/PlatformRepository.php

Spacing +12 added lines, -12 removed lines

@@ -90,8 +90,8 @@ 
 					break;
 
 				case 'openssl':
-					$prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) {
-						return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96));
+					$prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function($match) {
+						return $match[1].(empty($match[2]) ? '' : '.'.(ord($match[2]) - 96));
 					}, OPENSSL_VERSION_TEXT);
 					break;
 
@@ -166,19 +166,19 @@ 
 			return '9999999-dev';
 		}
 		if ('dev-' === strtolower(substr($version, 0, 4))) {
-			return 'dev-' . substr($version, 4);
+			return 'dev-'.substr($version, 4);
 		}
 		// match classical versioning
-		if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+		if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?'.self::$modifierRegex.'$}i', $version, $matches)) {
 			$version = $matches[1]
 				. (!empty($matches[2]) ? $matches[2] : '.0')
 				. (!empty($matches[3]) ? $matches[3] : '.0')
 				. (!empty($matches[4]) ? $matches[4] : '.0');
 			$index = 5;
-		} elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning
+		} elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)'.self::$modifierRegex.'$}i', $version, $matches)) { // match date-based versioning
 			$version = preg_replace('{\D}', '-', $matches[1]);
 			$index = 2;
-		} elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+		} elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?'.self::$modifierRegex.'$}i', $version, $matches)) {
 			$version = $matches[1]
 				. (!empty($matches[2]) ? $matches[2] : '.0')
 				. (!empty($matches[3]) ? $matches[3] : '.0')
@@ -191,7 +191,7 @@ 
 				if ('stable' === $matches[$index]) {
 					return $version;
 				}
-				$version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
+				$version .= '-'.$this->expandStability($matches[$index]).(!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
 			}
 			if (!empty($matches[$index + 2])) {
 				$version .= '-dev';
@@ -199,12 +199,12 @@ 
 			return $version;
 		}
 		$extraMessage = '';
-		if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) {
-			$extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version';
-		} elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) {
-			$extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
+		if (preg_match('{ +as +'.preg_quote($version).'$}', $fullVersion)) {
+			$extraMessage = ' in "'.$fullVersion.'", the alias must be an exact version';
+		} elseif (preg_match('{^'.preg_quote($version).' +as +}', $fullVersion)) {
+			$extraMessage = ' in "'.$fullVersion.'", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
 		}
-		throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
+		throw new \UnexpectedValueException('Invalid version string "'.$version.'"'.$extraMessage);
 	}
 
 	/**

lib/private/DateTimeFormatter.php

Spacing +2 added lines, -2 removed lines

@@ -237,7 +237,7 @@ 
 	 * @return string Formatted date and time string
 	 */
 	public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+		return $this->format($timestamp, 'datetime', $formatDate.'|'.$formatTime, $timeZone, $l);
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 			$formatDate .= '^';
 		}
 
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+		return $this->format($timestamp, 'datetime', $formatDate.'|'.$formatTime, $timeZone, $l);
 	}
 
 	/**

lib/private/Preview/WatcherConnector.php

Spacing +3 added lines, -3 removed lines

@@ -56,15 +56,15 @@
 	public function connectWatcher() {
 		// Do not connect if we are not setup yet!
 		if ($this->config->getValue('instanceid', null) !== null) {
-			$this->root->listen('\OC\Files', 'postWrite', function (Node $node) {
+			$this->root->listen('\OC\Files', 'postWrite', function(Node $node) {
 				$this->getWatcher()->postWrite($node);
 			});
 
-			$this->root->listen('\OC\Files', 'preDelete', function (Node $node) {
+			$this->root->listen('\OC\Files', 'preDelete', function(Node $node) {
 				$this->getWatcher()->preDelete($node);
 			});
 
-			$this->root->listen('\OC\Files', 'postDelete', function (Node $node) {
+			$this->root->listen('\OC\Files', 'postDelete', function(Node $node) {
 				$this->getWatcher()->postDelete($node);
 			});
 		}