nextcloud / server

lib/private/DB/MDB2SchemaWriter.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
 		$xml->addChild('name', $config->getSystemValue('dbname', 'owncloud'));
 		$xml->addChild('create', 'true');
 		$xml->addChild('overwrite', 'false');
-		if($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
+		if ($config->getSystemValue('dbtype', 'sqlite') === 'mysql' && $config->getSystemValue('mysql.utf8mb4', false)) {
 			$xml->addChild('charset', 'utf8mb4');
 		} else {
 			$xml->addChild('charset', 'utf8');
@@ -51,9 +51,9 @@ 
 
 		// FIX ME: bloody work around
 		if ($config->getSystemValue('dbtype', 'sqlite') === 'oci') {
-			$filterExpression = '/^"' . preg_quote($conn->getPrefix()) . '/';
+			$filterExpression = '/^"'.preg_quote($conn->getPrefix()).'/';
 		} else {
-			$filterExpression = '/^' . preg_quote($conn->getPrefix()) . '/';
+			$filterExpression = '/^'.preg_quote($conn->getPrefix()).'/';
 		}
 		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
 
@@ -71,13 +71,13 @@ 
 	private static function saveTable($table, $xml) {
 		$xml->addChild('name', $table->getName());
 		$declaration = $xml->addChild('declaration');
-		foreach($table->getColumns() as $column) {
+		foreach ($table->getColumns() as $column) {
 			self::saveColumn($column, $declaration->addChild('field'));
 		}
-		foreach($table->getIndexes() as $index) {
+		foreach ($table->getIndexes() as $index) {
 			if ($index->getName() == 'PRIMARY') {
 				$autoincrement = false;
-				foreach($index->getColumns() as $column) {
+				foreach ($index->getColumns() as $column) {
 					if ($table->getColumn($column)->getAutoincrement()) {
 						$autoincrement = true;
 					}
@@ -96,7 +96,7 @@ 
 	 */
 	private static function saveColumn($column, $xml) {
 		$xml->addChild('name', $column->getName());
-		switch($column->getType()) {
+		switch ($column->getType()) {
 			case 'SmallInt':
 			case 'Integer':
 			case 'BigInt':
@@ -169,7 +169,7 @@ 
 		elseif ($index->isUnique()) {
 			$xml->addChild('unique', 'true');
 		}
-		foreach($index->getColumns() as $column) {
+		foreach ($index->getColumns() as $column) {
 			$field = $xml->addChild('field');
 			$field->addChild('name', $column);
 			$field->addChild('sorting', 'ascending');

lib/private/DB/OracleMigrator.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 				// auto increment is not relevant for oracle and can anyhow not be applied on change
 				$column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
 			}
-			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
+			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function(ColumnDiff $column) {
 				return count($column->changedProperties) > 0;
 			});
 		}
@@ -57,7 +57,7 @@ 
 	 * @return string
 	 */
 	protected function generateTemporaryTableName($name) {
-		return 'oc_' . uniqid();
+		return 'oc_'.uniqid();
 	}
 
 	/**
@@ -66,16 +66,16 @@ 
 	 */
 	protected function convertStatementToScript($statement) {
 		if (substr($statement, -1) === ';') {
-			return $statement . PHP_EOL . '/' . PHP_EOL;
+			return $statement.PHP_EOL.'/'.PHP_EOL;
 		}
-		$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_')).'/';
 	}
 
 }

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/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', join(', ', $supportedDatabases));
+			$missing[] = (string) $this->l->t('Following databases are supported: %s', join(', ', $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', join(', ', $oss));
+			$missing[] = (string) $this->l->t('Following platforms are supported: %s', join(', ', $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;
 		}
@@ -351,6 +351,6 @@ 
 	private function getValue($element) {
 		if (isset($element['@value']))
 			return $element['@value'];
-		return (string)$element;
+		return (string) $element;
 	}
 }

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;
 				}