nextcloud / server

lib/private/DB/Connection.php

Spacing +13 added lines, -13 removed lines

@@ -56,7 +56,7 @@ 
 			return parent::connect();
 		} catch (DBALException $e) {
 			// throw a new exception to prevent leaking info from the stacktrace
-			throw new DBALException('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
+			throw new DBALException('Failed to connect to the database: '.$e->getMessage(), $e->getCode());
 		}
 	}
 
@@ -104,7 +104,7 @@ 
 		// 0 is the method where we use `getCallerBacktrace`
 		// 1 is the target method which uses the method we want to log
 		if (isset($traces[1])) {
-			return $traces[1]['file'] . ':' . $traces[1]['line'];
+			return $traces[1]['file'].':'.$traces[1]['line'];
 		}
 
 		return '';
@@ -150,7 +150,7 @@ 
 	 * @param int $offset
 	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
 	 */
-	public function prepare( $statement, $limit=null, $offset=null ) {
+	public function prepare($statement, $limit = null, $offset = null) {
 		if ($limit === -1) {
 			$limit = null;
 		}
@@ -161,7 +161,7 @@ 
 		$statement = $this->replaceTablePrefix($statement);
 		$statement = $this->adapter->fixupStatement($statement);
 
-		if(\OC::$server->getSystemConfig()->getValue( 'log_query', false)) {
+		if (\OC::$server->getSystemConfig()->getValue('log_query', false)) {
 			\OCP\Util::writeLog('core', 'DB prepare : '.$statement, \OCP\Util::DEBUG);
 		}
 		return parent::prepare($statement);
@@ -318,7 +318,7 @@ 
 			throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
 		}
 
-		$tableName = $this->tablePrefix . $tableName;
+		$tableName = $this->tablePrefix.$tableName;
 		$this->lockedTable = $tableName;
 		$this->adapter->lockTable($tableName);
 	}
@@ -339,11 +339,11 @@ 
 	 * @return string
 	 */
 	public function getError() {
-		$msg = $this->errorCode() . ': ';
+		$msg = $this->errorCode().': ';
 		$errorInfo = $this->errorInfo();
 		if (is_array($errorInfo)) {
-			$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
-			$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+			$msg .= 'SQLSTATE = '.$errorInfo[0].', ';
+			$msg .= 'Driver Code = '.$errorInfo[1].', ';
 			$msg .= 'Driver Message = '.$errorInfo[2];
 		}
 		return $msg;
@@ -355,9 +355,9 @@ 
 	 * @param string $table table name without the prefix
 	 */
 	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
+		$table = $this->tablePrefix.trim($table);
 		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
+		if ($schema->tablesExist(array($table))) {
 			$schema->dropTable($table);
 		}
 	}
@@ -368,8 +368,8 @@ 
 	 * @param string $table table name without the prefix
 	 * @return bool
 	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
+	public function tableExists($table) {
+		$table = $this->tablePrefix.trim($table);
 		$schema = $this->getSchemaManager();
 		return $schema->tablesExist(array($table));
 	}
@@ -380,7 +380,7 @@ 
 	 * @return string
 	 */
 	protected function replaceTablePrefix($statement) {
-		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
+		return str_replace('*PREFIX*', $this->tablePrefix, $statement);
 	}
 
 	/**

Indentation +380 added lines, -380 removed lines

@@ -41,384 +41,384 @@
 use OCP\PreConditionNotMetException;
 
 class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
-	/**
-	 * @var string $tablePrefix
-	 */
-	protected $tablePrefix;
-
-	/**
-	 * @var \OC\DB\Adapter $adapter
-	 */
-	protected $adapter;
-
-	protected $lockedTable = null;
-
-	public function connect() {
-		try {
-			return parent::connect();
-		} catch (DBALException $e) {
-			// throw a new exception to prevent leaking info from the stacktrace
-			throw new DBALException('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
-		}
-	}
-
-	/**
-	 * Returns a QueryBuilder for the connection.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder
-	 */
-	public function getQueryBuilder() {
-		return new QueryBuilder(
-			$this,
-			\OC::$server->getSystemConfig(),
-			\OC::$server->getLogger()
-		);
-	}
-
-	/**
-	 * Gets the QueryBuilder for the connection.
-	 *
-	 * @return \Doctrine\DBAL\Query\QueryBuilder
-	 * @deprecated please use $this->getQueryBuilder() instead
-	 */
-	public function createQueryBuilder() {
-		$backtrace = $this->getCallerBacktrace();
-		\OC::$server->getLogger()->debug('Doctrine QueryBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
-		return parent::createQueryBuilder();
-	}
-
-	/**
-	 * Gets the ExpressionBuilder for the connection.
-	 *
-	 * @return \Doctrine\DBAL\Query\Expression\ExpressionBuilder
-	 * @deprecated please use $this->getQueryBuilder()->expr() instead
-	 */
-	public function getExpressionBuilder() {
-		$backtrace = $this->getCallerBacktrace();
-		\OC::$server->getLogger()->debug('Doctrine ExpressionBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
-		return parent::getExpressionBuilder();
-	}
-
-	/**
-	 * Get the file and line that called the method where `getCallerBacktrace()` was used
-	 *
-	 * @return string
-	 */
-	protected function getCallerBacktrace() {
-		$traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
-
-		// 0 is the method where we use `getCallerBacktrace`
-		// 1 is the target method which uses the method we want to log
-		if (isset($traces[1])) {
-			return $traces[1]['file'] . ':' . $traces[1]['line'];
-		}
-
-		return '';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPrefix() {
-		return $this->tablePrefix;
-	}
-
-	/**
-	 * Initializes a new instance of the Connection class.
-	 *
-	 * @param array $params  The connection parameters.
-	 * @param \Doctrine\DBAL\Driver $driver
-	 * @param \Doctrine\DBAL\Configuration $config
-	 * @param \Doctrine\Common\EventManager $eventManager
-	 * @throws \Exception
-	 */
-	public function __construct(array $params, Driver $driver, Configuration $config = null,
-		EventManager $eventManager = null)
-	{
-		if (!isset($params['adapter'])) {
-			throw new \Exception('adapter not set');
-		}
-		if (!isset($params['tablePrefix'])) {
-			throw new \Exception('tablePrefix not set');
-		}
-		parent::__construct($params, $driver, $config, $eventManager);
-		$this->adapter = new $params['adapter']($this);
-		$this->tablePrefix = $params['tablePrefix'];
-
-		parent::setTransactionIsolation(parent::TRANSACTION_READ_COMMITTED);
-	}
-
-	/**
-	 * Prepares an SQL statement.
-	 *
-	 * @param string $statement The SQL statement to prepare.
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
-	 */
-	public function prepare( $statement, $limit=null, $offset=null ) {
-		if ($limit === -1) {
-			$limit = null;
-		}
-		if (!is_null($limit)) {
-			$platform = $this->getDatabasePlatform();
-			$statement = $platform->modifyLimitQuery($statement, $limit, $offset);
-		}
-		$statement = $this->replaceTablePrefix($statement);
-		$statement = $this->adapter->fixupStatement($statement);
-
-		if(\OC::$server->getSystemConfig()->getValue( 'log_query', false)) {
-			\OCP\Util::writeLog('core', 'DB prepare : '.$statement, \OCP\Util::DEBUG);
-		}
-		return parent::prepare($statement);
-	}
-
-	/**
-	 * Executes an, optionally parametrized, SQL query.
-	 *
-	 * If the query is parametrized, a prepared statement is used.
-	 * If an SQLLogger is configured, the execution is logged.
-	 *
-	 * @param string                                      $query  The SQL query to execute.
-	 * @param array                                       $params The parameters to bind to the query, if any.
-	 * @param array                                       $types  The types the previous parameters are in.
-	 * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
-	 *
-	 * @return \Doctrine\DBAL\Driver\Statement The executed statement.
-	 *
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function executeQuery($query, array $params = array(), $types = array(), QueryCacheProfile $qcp = null)
-	{
-		$query = $this->replaceTablePrefix($query);
-		$query = $this->adapter->fixupStatement($query);
-		return parent::executeQuery($query, $params, $types, $qcp);
-	}
-
-	/**
-	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
-	 * and returns the number of affected rows.
-	 *
-	 * This method supports PDO binding types as well as DBAL mapping types.
-	 *
-	 * @param string $query  The SQL query.
-	 * @param array  $params The query parameters.
-	 * @param array  $types  The parameter types.
-	 *
-	 * @return integer The number of affected rows.
-	 *
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function executeUpdate($query, array $params = array(), array $types = array())
-	{
-		$query = $this->replaceTablePrefix($query);
-		$query = $this->adapter->fixupStatement($query);
-		return parent::executeUpdate($query, $params, $types);
-	}
-
-	/**
-	 * Returns the ID of the last inserted row, or the last value from a sequence object,
-	 * depending on the underlying driver.
-	 *
-	 * Note: This method may not return a meaningful or consistent result across different drivers,
-	 * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
-	 * columns or sequences.
-	 *
-	 * @param string $seqName Name of the sequence object from which the ID should be returned.
-	 * @return string A string representation of the last inserted ID.
-	 */
-	public function lastInsertId($seqName = null) {
-		if ($seqName) {
-			$seqName = $this->replaceTablePrefix($seqName);
-		}
-		return $this->adapter->lastInsertId($seqName);
-	}
-
-	// internal use
-	public function realLastInsertId($seqName = null) {
-		return parent::lastInsertId($seqName);
-	}
-
-	/**
-	 * Insert a row if the matching row does not exists.
-	 *
-	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
-	 * @param array $input data that should be inserted into the table  (column name => value)
-	 * @param array|null $compare List of values that should be checked for "if not exists"
-	 *				If this is null or an empty array, all keys of $input will be compared
-	 *				Please note: text fields (clob) must not be used in the compare array
-	 * @return int number of inserted rows
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function insertIfNotExist($table, $input, array $compare = null) {
-		return $this->adapter->insertIfNotExist($table, $input, $compare);
-	}
-
-	private function getType($value) {
-		if (is_bool($value)) {
-			return IQueryBuilder::PARAM_BOOL;
-		} else if (is_int($value)) {
-			return IQueryBuilder::PARAM_INT;
-		} else {
-			return IQueryBuilder::PARAM_STR;
-		}
-	}
-
-	/**
-	 * Insert or update a row value
-	 *
-	 * @param string $table
-	 * @param array $keys (column name => value)
-	 * @param array $values (column name => value)
-	 * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
-	 * @return int number of new rows
-	 * @throws \Doctrine\DBAL\DBALException
-	 * @throws PreConditionNotMetException
-	 */
-	public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
-		try {
-			$insertQb = $this->getQueryBuilder();
-			$insertQb->insert($table)
-				->values(
-					array_map(function($value) use ($insertQb) {
-						return $insertQb->createNamedParameter($value, $this->getType($value));
-					}, array_merge($keys, $values))
-				);
-			return $insertQb->execute();
-		} catch (ConstraintViolationException $e) {
-			// value already exists, try update
-			$updateQb = $this->getQueryBuilder();
-			$updateQb->update($table);
-			foreach ($values as $name => $value) {
-				$updateQb->set($name, $updateQb->createNamedParameter($value, $this->getType($value)));
-			}
-			$where = $updateQb->expr()->andX();
-			$whereValues = array_merge($keys, $updatePreconditionValues);
-			foreach ($whereValues as $name => $value) {
-				$where->add($updateQb->expr()->eq(
-					$name,
-					$updateQb->createNamedParameter($value, $this->getType($value)),
-					$this->getType($value)
-				));
-			}
-			$updateQb->where($where);
-			$affected = $updateQb->execute();
-
-			if ($affected === 0 && !empty($updatePreconditionValues)) {
-				throw new PreConditionNotMetException();
-			}
-
-			return 0;
-		}
-	}
-
-	/**
-	 * Create an exclusive read+write lock on a table
-	 *
-	 * @param string $tableName
-	 * @throws \BadMethodCallException When trying to acquire a second lock
-	 * @since 9.1.0
-	 */
-	public function lockTable($tableName) {
-		if ($this->lockedTable !== null) {
-			throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
-		}
-
-		$tableName = $this->tablePrefix . $tableName;
-		$this->lockedTable = $tableName;
-		$this->adapter->lockTable($tableName);
-	}
-
-	/**
-	 * Release a previous acquired lock again
-	 *
-	 * @since 9.1.0
-	 */
-	public function unlockTable() {
-		$this->adapter->unlockTable();
-		$this->lockedTable = null;
-	}
-
-	/**
-	 * returns the error code and message as a string for logging
-	 * works with DoctrineException
-	 * @return string
-	 */
-	public function getError() {
-		$msg = $this->errorCode() . ': ';
-		$errorInfo = $this->errorInfo();
-		if (is_array($errorInfo)) {
-			$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
-			$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
-			$msg .= 'Driver Message = '.$errorInfo[2];
-		}
-		return $msg;
-	}
-
-	/**
-	 * Drop a table from the database if it exists
-	 *
-	 * @param string $table table name without the prefix
-	 */
-	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
-		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
-			$schema->dropTable($table);
-		}
-	}
-
-	/**
-	 * Check if a table exists
-	 *
-	 * @param string $table table name without the prefix
-	 * @return bool
-	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
-		$schema = $this->getSchemaManager();
-		return $schema->tablesExist(array($table));
-	}
-
-	// internal use
-	/**
-	 * @param string $statement
-	 * @return string
-	 */
-	protected function replaceTablePrefix($statement) {
-		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
-	}
-
-	/**
-	 * Check if a transaction is active
-	 *
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function inTransaction() {
-		return $this->getTransactionNestingLevel() > 0;
-	}
-
-	/**
-	 * Espace a parameter to be used in a LIKE query
-	 *
-	 * @param string $param
-	 * @return string
-	 */
-	public function escapeLikeParameter($param) {
-		return addcslashes($param, '\\_%');
-	}
-
-	/**
-	 * Check whether or not the current database support 4byte wide unicode
-	 *
-	 * @return bool
-	 * @since 11.0.0
-	 */
-	public function supports4ByteText() {
-		if (!$this->getDatabasePlatform() instanceof MySqlPlatform) {
-			return true;
-		}
-		return $this->getParams()['charset'] === 'utf8mb4';
-	}
+    /**
+     * @var string $tablePrefix
+     */
+    protected $tablePrefix;
+
+    /**
+     * @var \OC\DB\Adapter $adapter
+     */
+    protected $adapter;
+
+    protected $lockedTable = null;
+
+    public function connect() {
+        try {
+            return parent::connect();
+        } catch (DBALException $e) {
+            // throw a new exception to prevent leaking info from the stacktrace
+            throw new DBALException('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
+        }
+    }
+
+    /**
+     * Returns a QueryBuilder for the connection.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder
+     */
+    public function getQueryBuilder() {
+        return new QueryBuilder(
+            $this,
+            \OC::$server->getSystemConfig(),
+            \OC::$server->getLogger()
+        );
+    }
+
+    /**
+     * Gets the QueryBuilder for the connection.
+     *
+     * @return \Doctrine\DBAL\Query\QueryBuilder
+     * @deprecated please use $this->getQueryBuilder() instead
+     */
+    public function createQueryBuilder() {
+        $backtrace = $this->getCallerBacktrace();
+        \OC::$server->getLogger()->debug('Doctrine QueryBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
+        return parent::createQueryBuilder();
+    }
+
+    /**
+     * Gets the ExpressionBuilder for the connection.
+     *
+     * @return \Doctrine\DBAL\Query\Expression\ExpressionBuilder
+     * @deprecated please use $this->getQueryBuilder()->expr() instead
+     */
+    public function getExpressionBuilder() {
+        $backtrace = $this->getCallerBacktrace();
+        \OC::$server->getLogger()->debug('Doctrine ExpressionBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
+        return parent::getExpressionBuilder();
+    }
+
+    /**
+     * Get the file and line that called the method where `getCallerBacktrace()` was used
+     *
+     * @return string
+     */
+    protected function getCallerBacktrace() {
+        $traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+        // 0 is the method where we use `getCallerBacktrace`
+        // 1 is the target method which uses the method we want to log
+        if (isset($traces[1])) {
+            return $traces[1]['file'] . ':' . $traces[1]['line'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrefix() {
+        return $this->tablePrefix;
+    }
+
+    /**
+     * Initializes a new instance of the Connection class.
+     *
+     * @param array $params  The connection parameters.
+     * @param \Doctrine\DBAL\Driver $driver
+     * @param \Doctrine\DBAL\Configuration $config
+     * @param \Doctrine\Common\EventManager $eventManager
+     * @throws \Exception
+     */
+    public function __construct(array $params, Driver $driver, Configuration $config = null,
+        EventManager $eventManager = null)
+    {
+        if (!isset($params['adapter'])) {
+            throw new \Exception('adapter not set');
+        }
+        if (!isset($params['tablePrefix'])) {
+            throw new \Exception('tablePrefix not set');
+        }
+        parent::__construct($params, $driver, $config, $eventManager);
+        $this->adapter = new $params['adapter']($this);
+        $this->tablePrefix = $params['tablePrefix'];
+
+        parent::setTransactionIsolation(parent::TRANSACTION_READ_COMMITTED);
+    }
+
+    /**
+     * Prepares an SQL statement.
+     *
+     * @param string $statement The SQL statement to prepare.
+     * @param int $limit
+     * @param int $offset
+     * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
+     */
+    public function prepare( $statement, $limit=null, $offset=null ) {
+        if ($limit === -1) {
+            $limit = null;
+        }
+        if (!is_null($limit)) {
+            $platform = $this->getDatabasePlatform();
+            $statement = $platform->modifyLimitQuery($statement, $limit, $offset);
+        }
+        $statement = $this->replaceTablePrefix($statement);
+        $statement = $this->adapter->fixupStatement($statement);
+
+        if(\OC::$server->getSystemConfig()->getValue( 'log_query', false)) {
+            \OCP\Util::writeLog('core', 'DB prepare : '.$statement, \OCP\Util::DEBUG);
+        }
+        return parent::prepare($statement);
+    }
+
+    /**
+     * Executes an, optionally parametrized, SQL query.
+     *
+     * If the query is parametrized, a prepared statement is used.
+     * If an SQLLogger is configured, the execution is logged.
+     *
+     * @param string                                      $query  The SQL query to execute.
+     * @param array                                       $params The parameters to bind to the query, if any.
+     * @param array                                       $types  The types the previous parameters are in.
+     * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
+     *
+     * @return \Doctrine\DBAL\Driver\Statement The executed statement.
+     *
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function executeQuery($query, array $params = array(), $types = array(), QueryCacheProfile $qcp = null)
+    {
+        $query = $this->replaceTablePrefix($query);
+        $query = $this->adapter->fixupStatement($query);
+        return parent::executeQuery($query, $params, $types, $qcp);
+    }
+
+    /**
+     * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
+     * and returns the number of affected rows.
+     *
+     * This method supports PDO binding types as well as DBAL mapping types.
+     *
+     * @param string $query  The SQL query.
+     * @param array  $params The query parameters.
+     * @param array  $types  The parameter types.
+     *
+     * @return integer The number of affected rows.
+     *
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function executeUpdate($query, array $params = array(), array $types = array())
+    {
+        $query = $this->replaceTablePrefix($query);
+        $query = $this->adapter->fixupStatement($query);
+        return parent::executeUpdate($query, $params, $types);
+    }
+
+    /**
+     * Returns the ID of the last inserted row, or the last value from a sequence object,
+     * depending on the underlying driver.
+     *
+     * Note: This method may not return a meaningful or consistent result across different drivers,
+     * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
+     * columns or sequences.
+     *
+     * @param string $seqName Name of the sequence object from which the ID should be returned.
+     * @return string A string representation of the last inserted ID.
+     */
+    public function lastInsertId($seqName = null) {
+        if ($seqName) {
+            $seqName = $this->replaceTablePrefix($seqName);
+        }
+        return $this->adapter->lastInsertId($seqName);
+    }
+
+    // internal use
+    public function realLastInsertId($seqName = null) {
+        return parent::lastInsertId($seqName);
+    }
+
+    /**
+     * Insert a row if the matching row does not exists.
+     *
+     * @param string $table The table name (will replace *PREFIX* with the actual prefix)
+     * @param array $input data that should be inserted into the table  (column name => value)
+     * @param array|null $compare List of values that should be checked for "if not exists"
+     *				If this is null or an empty array, all keys of $input will be compared
+     *				Please note: text fields (clob) must not be used in the compare array
+     * @return int number of inserted rows
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function insertIfNotExist($table, $input, array $compare = null) {
+        return $this->adapter->insertIfNotExist($table, $input, $compare);
+    }
+
+    private function getType($value) {
+        if (is_bool($value)) {
+            return IQueryBuilder::PARAM_BOOL;
+        } else if (is_int($value)) {
+            return IQueryBuilder::PARAM_INT;
+        } else {
+            return IQueryBuilder::PARAM_STR;
+        }
+    }
+
+    /**
+     * Insert or update a row value
+     *
+     * @param string $table
+     * @param array $keys (column name => value)
+     * @param array $values (column name => value)
+     * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
+     * @return int number of new rows
+     * @throws \Doctrine\DBAL\DBALException
+     * @throws PreConditionNotMetException
+     */
+    public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
+        try {
+            $insertQb = $this->getQueryBuilder();
+            $insertQb->insert($table)
+                ->values(
+                    array_map(function($value) use ($insertQb) {
+                        return $insertQb->createNamedParameter($value, $this->getType($value));
+                    }, array_merge($keys, $values))
+                );
+            return $insertQb->execute();
+        } catch (ConstraintViolationException $e) {
+            // value already exists, try update
+            $updateQb = $this->getQueryBuilder();
+            $updateQb->update($table);
+            foreach ($values as $name => $value) {
+                $updateQb->set($name, $updateQb->createNamedParameter($value, $this->getType($value)));
+            }
+            $where = $updateQb->expr()->andX();
+            $whereValues = array_merge($keys, $updatePreconditionValues);
+            foreach ($whereValues as $name => $value) {
+                $where->add($updateQb->expr()->eq(
+                    $name,
+                    $updateQb->createNamedParameter($value, $this->getType($value)),
+                    $this->getType($value)
+                ));
+            }
+            $updateQb->where($where);
+            $affected = $updateQb->execute();
+
+            if ($affected === 0 && !empty($updatePreconditionValues)) {
+                throw new PreConditionNotMetException();
+            }
+
+            return 0;
+        }
+    }
+
+    /**
+     * Create an exclusive read+write lock on a table
+     *
+     * @param string $tableName
+     * @throws \BadMethodCallException When trying to acquire a second lock
+     * @since 9.1.0
+     */
+    public function lockTable($tableName) {
+        if ($this->lockedTable !== null) {
+            throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
+        }
+
+        $tableName = $this->tablePrefix . $tableName;
+        $this->lockedTable = $tableName;
+        $this->adapter->lockTable($tableName);
+    }
+
+    /**
+     * Release a previous acquired lock again
+     *
+     * @since 9.1.0
+     */
+    public function unlockTable() {
+        $this->adapter->unlockTable();
+        $this->lockedTable = null;
+    }
+
+    /**
+     * returns the error code and message as a string for logging
+     * works with DoctrineException
+     * @return string
+     */
+    public function getError() {
+        $msg = $this->errorCode() . ': ';
+        $errorInfo = $this->errorInfo();
+        if (is_array($errorInfo)) {
+            $msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
+            $msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+            $msg .= 'Driver Message = '.$errorInfo[2];
+        }
+        return $msg;
+    }
+
+    /**
+     * Drop a table from the database if it exists
+     *
+     * @param string $table table name without the prefix
+     */
+    public function dropTable($table) {
+        $table = $this->tablePrefix . trim($table);
+        $schema = $this->getSchemaManager();
+        if($schema->tablesExist(array($table))) {
+            $schema->dropTable($table);
+        }
+    }
+
+    /**
+     * Check if a table exists
+     *
+     * @param string $table table name without the prefix
+     * @return bool
+     */
+    public function tableExists($table){
+        $table = $this->tablePrefix . trim($table);
+        $schema = $this->getSchemaManager();
+        return $schema->tablesExist(array($table));
+    }
+
+    // internal use
+    /**
+     * @param string $statement
+     * @return string
+     */
+    protected function replaceTablePrefix($statement) {
+        return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
+    }
+
+    /**
+     * Check if a transaction is active
+     *
+     * @return bool
+     * @since 8.2.0
+     */
+    public function inTransaction() {
+        return $this->getTransactionNestingLevel() > 0;
+    }
+
+    /**
+     * Espace a parameter to be used in a LIKE query
+     *
+     * @param string $param
+     * @return string
+     */
+    public function escapeLikeParameter($param) {
+        return addcslashes($param, '\\_%');
+    }
+
+    /**
+     * Check whether or not the current database support 4byte wide unicode
+     *
+     * @return bool
+     * @since 11.0.0
+     */
+    public function supports4ByteText() {
+        if (!$this->getDatabasePlatform() instanceof MySqlPlatform) {
+            return true;
+        }
+        return $this->getParams()['charset'] === 'utf8mb4';
+    }
 }

lib/private/DB/MDB2SchemaReader.php

Spacing +21 added lines, -21 removed lines

@@ -94,7 +94,7 @@ 
 					$this->loadTable($schema, $child);
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -114,7 +114,7 @@ 
 			 */
 			switch ($child->getName()) {
 				case 'name':
-					$name = (string)$child;
+					$name = (string) $child;
 					$name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
 					$name = $this->platform->quoteIdentifier($name);
 					$table = $schema->createTable($name);
@@ -132,7 +132,7 @@ 
 					$this->loadDeclaration($table, $child);
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -156,7 +156,7 @@ 
 					$this->loadIndex($table, $child);
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -168,18 +168,18 @@ 
 	 * @throws \DomainException
 	 */
 	private function loadField($table, $xml) {
-		$options = array( 'notnull' => false );
+		$options = array('notnull' => false);
 		foreach ($xml->children() as $child) {
 			/**
 			 * @var \SimpleXMLElement $child
 			 */
 			switch ($child->getName()) {
 				case 'name':
-					$name = (string)$child;
+					$name = (string) $child;
 					$name = $this->platform->quoteIdentifier($name);
 					break;
 				case 'type':
-					$type = (string)$child;
+					$type = (string) $child;
 					switch ($type) {
 						case 'text':
 							$type = 'string';
@@ -196,7 +196,7 @@ 
 					}
 					break;
 				case 'length':
-					$length = (string)$child;
+					$length = (string) $child;
 					$options['length'] = $length;
 					break;
 				case 'unsigned':
@@ -212,11 +212,11 @@ 
 					$options['autoincrement'] = $autoincrement;
 					break;
 				case 'default':
-					$default = (string)$child;
+					$default = (string) $child;
 					$options['default'] = $default;
 					break;
 				case 'comments':
-					$comment = (string)$child;
+					$comment = (string) $child;
 					$options['comment'] = $comment;
 					break;
 				case 'primary':
@@ -224,15 +224,15 @@ 
 					$options['primary'] = $primary;
 					break;
 				case 'precision':
-					$precision = (string)$child;
+					$precision = (string) $child;
 					$options['precision'] = $precision;
 					break;
 				case 'scale':
-					$scale = (string)$child;
+					$scale = (string) $child;
 					$options['scale'] = $scale;
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -254,7 +254,7 @@ 
 				}
 			}
 			if ($type === 'integer' && isset($options['default'])) {
-				$options['default'] = (int)$options['default'];
+				$options['default'] = (int) $options['default'];
 			}
 			if ($type === 'integer' && isset($options['length'])) {
 				$length = $options['length'];
@@ -293,7 +293,7 @@ 
 			 */
 			switch ($child->getName()) {
 				case 'name':
-					$name = (string)$child;
+					$name = (string) $child;
 					break;
 				case 'primary':
 					$primary = $this->asBool($child);
@@ -308,20 +308,20 @@ 
 						 */
 						switch ($field->getName()) {
 							case 'name':
-								$field_name = (string)$field;
+								$field_name = (string) $field;
 								$field_name = $this->platform->quoteIdentifier($field_name);
 								$fields[] = $field_name;
 								break;
 							case 'sorting':
 								break;
 							default:
-								throw new \DomainException('Unknown element: ' . $field->getName());
+								throw new \DomainException('Unknown element: '.$field->getName());
 
 						}
 					}
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -339,7 +339,7 @@ 
 				}
 			}
 		} else {
-			throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
+			throw new \DomainException('Empty index definition: '.$name.' options:'.print_r($fields, true));
 		}
 	}
 
@@ -348,13 +348,13 @@ 
 	 * @return bool
 	 */
 	private function asBool($xml) {
-		$result = (string)$xml;
+		$result = (string) $xml;
 		if ($result == 'true') {
 			$result = true;
 		} elseif ($result == 'false') {
 			$result = false;
 		}
-		return (bool)$result;
+		return (bool) $result;
 	}
 
 }

Unused Use Statements -2 removed lines

@@ -32,8 +32,6 @@
 namespace OC\DB;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Schema\SchemaConfig;
-use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use OCP\IConfig;
 

Indentation +292 added lines, -292 removed lines

@@ -39,313 +39,313 @@
 
 class MDB2SchemaReader {
 
-	/**
-	 * @var string $DBTABLEPREFIX
-	 */
-	protected $DBTABLEPREFIX;
+    /**
+     * @var string $DBTABLEPREFIX
+     */
+    protected $DBTABLEPREFIX;
 
-	/**
-	 * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-	 */
-	protected $platform;
+    /**
+     * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+     */
+    protected $platform;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-	 */
-	public function __construct(IConfig $config, AbstractPlatform $platform) {
-		$this->platform = $platform;
-		$this->config = $config;
-		$this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_');
-	}
+    /**
+     * @param \OCP\IConfig $config
+     * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+     */
+    public function __construct(IConfig $config, AbstractPlatform $platform) {
+        $this->platform = $platform;
+        $this->config = $config;
+        $this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_');
+    }
 
-	/**
-	 * @param string $file
-	 * @param Schema $schema
-	 * @return Schema
-	 * @throws \DomainException
-	 */
-	public function loadSchemaFromFile($file, Schema $schema) {
-		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($file);
-		libxml_disable_entity_loader($loadEntities);
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-				case 'create':
-				case 'overwrite':
-				case 'charset':
-					break;
-				case 'table':
-					$this->loadTable($schema, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param string $file
+     * @param Schema $schema
+     * @return Schema
+     * @throws \DomainException
+     */
+    public function loadSchemaFromFile($file, Schema $schema) {
+        $loadEntities = libxml_disable_entity_loader(false);
+        $xml = simplexml_load_file($file);
+        libxml_disable_entity_loader($loadEntities);
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                case 'create':
+                case 'overwrite':
+                case 'charset':
+                    break;
+                case 'table':
+                    $this->loadTable($schema, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		return $schema;
-	}
+            }
+        }
+        return $schema;
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $schema
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadTable($schema, $xml) {
-		$table = null;
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					$name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
-					$name = $this->platform->quoteIdentifier($name);
-					$table = $schema->createTable($name);
-					break;
-				case 'create':
-				case 'overwrite':
-				case 'charset':
-					break;
-				case 'declaration':
-					if (is_null($table)) {
-						throw new \DomainException('Table declaration before table name');
-					}
-					$this->loadDeclaration($table, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadTable($schema, $xml) {
+        $table = null;
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    $name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
+                    $name = $this->platform->quoteIdentifier($name);
+                    $table = $schema->createTable($name);
+                    break;
+                case 'create':
+                case 'overwrite':
+                case 'charset':
+                    break;
+                case 'declaration':
+                    if (is_null($table)) {
+                        throw new \DomainException('Table declaration before table name');
+                    }
+                    $this->loadDeclaration($table, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadDeclaration($table, $xml) {
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'field':
-					$this->loadField($table, $child);
-					break;
-				case 'index':
-					$this->loadIndex($table, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadDeclaration($table, $xml) {
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'field':
+                    $this->loadField($table, $child);
+                    break;
+                case 'index':
+                    $this->loadIndex($table, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadField($table, $xml) {
-		$options = array( 'notnull' => false );
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					$name = $this->platform->quoteIdentifier($name);
-					break;
-				case 'type':
-					$type = (string)$child;
-					switch ($type) {
-						case 'text':
-							$type = 'string';
-							break;
-						case 'clob':
-							$type = 'text';
-							break;
-						case 'timestamp':
-							$type = 'datetime';
-							break;
-						case 'numeric':
-							$type = 'decimal';
-							break;
-					}
-					break;
-				case 'length':
-					$length = (string)$child;
-					$options['length'] = $length;
-					break;
-				case 'unsigned':
-					$unsigned = $this->asBool($child);
-					$options['unsigned'] = $unsigned;
-					break;
-				case 'notnull':
-					$notnull = $this->asBool($child);
-					$options['notnull'] = $notnull;
-					break;
-				case 'autoincrement':
-					$autoincrement = $this->asBool($child);
-					$options['autoincrement'] = $autoincrement;
-					break;
-				case 'default':
-					$default = (string)$child;
-					$options['default'] = $default;
-					break;
-				case 'comments':
-					$comment = (string)$child;
-					$options['comment'] = $comment;
-					break;
-				case 'primary':
-					$primary = $this->asBool($child);
-					$options['primary'] = $primary;
-					break;
-				case 'precision':
-					$precision = (string)$child;
-					$options['precision'] = $precision;
-					break;
-				case 'scale':
-					$scale = (string)$child;
-					$options['scale'] = $scale;
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadField($table, $xml) {
+        $options = array( 'notnull' => false );
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    $name = $this->platform->quoteIdentifier($name);
+                    break;
+                case 'type':
+                    $type = (string)$child;
+                    switch ($type) {
+                        case 'text':
+                            $type = 'string';
+                            break;
+                        case 'clob':
+                            $type = 'text';
+                            break;
+                        case 'timestamp':
+                            $type = 'datetime';
+                            break;
+                        case 'numeric':
+                            $type = 'decimal';
+                            break;
+                    }
+                    break;
+                case 'length':
+                    $length = (string)$child;
+                    $options['length'] = $length;
+                    break;
+                case 'unsigned':
+                    $unsigned = $this->asBool($child);
+                    $options['unsigned'] = $unsigned;
+                    break;
+                case 'notnull':
+                    $notnull = $this->asBool($child);
+                    $options['notnull'] = $notnull;
+                    break;
+                case 'autoincrement':
+                    $autoincrement = $this->asBool($child);
+                    $options['autoincrement'] = $autoincrement;
+                    break;
+                case 'default':
+                    $default = (string)$child;
+                    $options['default'] = $default;
+                    break;
+                case 'comments':
+                    $comment = (string)$child;
+                    $options['comment'] = $comment;
+                    break;
+                case 'primary':
+                    $primary = $this->asBool($child);
+                    $options['primary'] = $primary;
+                    break;
+                case 'precision':
+                    $precision = (string)$child;
+                    $options['precision'] = $precision;
+                    break;
+                case 'scale':
+                    $scale = (string)$child;
+                    $options['scale'] = $scale;
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		if (isset($name) && isset($type)) {
-			if (isset($options['default']) && empty($options['default'])) {
-				if (empty($options['notnull']) || !$options['notnull']) {
-					unset($options['default']);
-					$options['notnull'] = false;
-				} else {
-					$options['default'] = '';
-				}
-				if ($type == 'integer' || $type == 'decimal') {
-					$options['default'] = 0;
-				} elseif ($type == 'boolean') {
-					$options['default'] = false;
-				}
-				if (!empty($options['autoincrement']) && $options['autoincrement']) {
-					unset($options['default']);
-				}
-			}
-			if ($type === 'integer' && isset($options['default'])) {
-				$options['default'] = (int)$options['default'];
-			}
-			if ($type === 'integer' && isset($options['length'])) {
-				$length = $options['length'];
-				if ($length < 4) {
-					$type = 'smallint';
-				} else if ($length > 4) {
-					$type = 'bigint';
-				}
-			}
-			if ($type === 'boolean' && isset($options['default'])) {
-				$options['default'] = $this->asBool($options['default']);
-			}
-			if (!empty($options['autoincrement'])
-				&& !empty($options['notnull'])
-			) {
-				$options['primary'] = true;
-			}
+            }
+        }
+        if (isset($name) && isset($type)) {
+            if (isset($options['default']) && empty($options['default'])) {
+                if (empty($options['notnull']) || !$options['notnull']) {
+                    unset($options['default']);
+                    $options['notnull'] = false;
+                } else {
+                    $options['default'] = '';
+                }
+                if ($type == 'integer' || $type == 'decimal') {
+                    $options['default'] = 0;
+                } elseif ($type == 'boolean') {
+                    $options['default'] = false;
+                }
+                if (!empty($options['autoincrement']) && $options['autoincrement']) {
+                    unset($options['default']);
+                }
+            }
+            if ($type === 'integer' && isset($options['default'])) {
+                $options['default'] = (int)$options['default'];
+            }
+            if ($type === 'integer' && isset($options['length'])) {
+                $length = $options['length'];
+                if ($length < 4) {
+                    $type = 'smallint';
+                } else if ($length > 4) {
+                    $type = 'bigint';
+                }
+            }
+            if ($type === 'boolean' && isset($options['default'])) {
+                $options['default'] = $this->asBool($options['default']);
+            }
+            if (!empty($options['autoincrement'])
+                && !empty($options['notnull'])
+            ) {
+                $options['primary'] = true;
+            }
 
-			$table->addColumn($name, $type, $options);
-			if (!empty($options['primary']) && $options['primary']) {
-				$table->setPrimaryKey(array($name));
-			}
-		}
-	}
+            $table->addColumn($name, $type, $options);
+            if (!empty($options['primary']) && $options['primary']) {
+                $table->setPrimaryKey(array($name));
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadIndex($table, $xml) {
-		$name = null;
-		$fields = array();
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					break;
-				case 'primary':
-					$primary = $this->asBool($child);
-					break;
-				case 'unique':
-					$unique = $this->asBool($child);
-					break;
-				case 'field':
-					foreach ($child->children() as $field) {
-						/**
-						 * @var \SimpleXMLElement $field
-						 */
-						switch ($field->getName()) {
-							case 'name':
-								$field_name = (string)$field;
-								$field_name = $this->platform->quoteIdentifier($field_name);
-								$fields[] = $field_name;
-								break;
-							case 'sorting':
-								break;
-							default:
-								throw new \DomainException('Unknown element: ' . $field->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadIndex($table, $xml) {
+        $name = null;
+        $fields = array();
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    break;
+                case 'primary':
+                    $primary = $this->asBool($child);
+                    break;
+                case 'unique':
+                    $unique = $this->asBool($child);
+                    break;
+                case 'field':
+                    foreach ($child->children() as $field) {
+                        /**
+                         * @var \SimpleXMLElement $field
+                         */
+                        switch ($field->getName()) {
+                            case 'name':
+                                $field_name = (string)$field;
+                                $field_name = $this->platform->quoteIdentifier($field_name);
+                                $fields[] = $field_name;
+                                break;
+                            case 'sorting':
+                                break;
+                            default:
+                                throw new \DomainException('Unknown element: ' . $field->getName());
 
-						}
-					}
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+                        }
+                    }
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		if (!empty($fields)) {
-			if (isset($primary) && $primary) {
-				if ($table->hasPrimaryKey()) {
-					return;
-				}
-				$table->setPrimaryKey($fields, $name);
-			} else {
-				if (isset($unique) && $unique) {
-					$table->addUniqueIndex($fields, $name);
-				} else {
-					$table->addIndex($fields, $name);
-				}
-			}
-		} else {
-			throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
-		}
-	}
+            }
+        }
+        if (!empty($fields)) {
+            if (isset($primary) && $primary) {
+                if ($table->hasPrimaryKey()) {
+                    return;
+                }
+                $table->setPrimaryKey($fields, $name);
+            } else {
+                if (isset($unique) && $unique) {
+                    $table->addUniqueIndex($fields, $name);
+                } else {
+                    $table->addIndex($fields, $name);
+                }
+            }
+        } else {
+            throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
+        }
+    }
 
-	/**
-	 * @param \SimpleXMLElement|string $xml
-	 * @return bool
-	 */
-	private function asBool($xml) {
-		$result = (string)$xml;
-		if ($result == 'true') {
-			$result = true;
-		} elseif ($result == 'false') {
-			$result = false;
-		}
-		return (bool)$result;
-	}
+    /**
+     * @param \SimpleXMLElement|string $xml
+     * @return bool
+     */
+    private function asBool($xml) {
+        $result = (string)$xml;
+        if ($result == 'true') {
+            $result = true;
+        } elseif ($result == 'false') {
+            $result = false;
+        }
+        return (bool)$result;
+    }
 
 }

lib/private/Migration/ConsoleOutput.php

Indentation +46 added lines, -46 removed lines

@@ -37,57 +37,57 @@
  */
 class ConsoleOutput implements IOutput {
 
-	/** @var OutputInterface */
-	private $output;
+    /** @var OutputInterface */
+    private $output;
 
-	/** @var ProgressBar */
-	private $progressBar;
+    /** @var ProgressBar */
+    private $progressBar;
 
-	public function __construct(OutputInterface $output) {
-		$this->output = $output;
-	}
+    public function __construct(OutputInterface $output) {
+        $this->output = $output;
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function info($message) {
-		$this->output->writeln("<info>$message</info>");
-	}
+    /**
+     * @param string $message
+     */
+    public function info($message) {
+        $this->output->writeln("<info>$message</info>");
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		$this->output->writeln("<comment>$message</comment>");
-	}
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        $this->output->writeln("<comment>$message</comment>");
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar->finish();
-		}
-		$this->progressBar = new ProgressBar($this->output);
-		$this->progressBar->start($max);
-	}
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar->finish();
+        }
+        $this->progressBar = new ProgressBar($this->output);
+        $this->progressBar->start($max);
+    }
 
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		if (!is_null($this->progressBar)) {
-			$this->progressBar = new ProgressBar($this->output);
-			$this->progressBar->start();
-		}
-		$this->progressBar->advance($step);
-	}
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        if (!is_null($this->progressBar)) {
+            $this->progressBar = new ProgressBar($this->output);
+            $this->progressBar->start();
+        }
+        $this->progressBar->advance($step);
+    }
 
-	public function finishProgress() {
-		if (is_null($this->progressBar)) {
-			return;
-		}
-		$this->progressBar->finish();
-	}
+    public function finishProgress() {
+        if (is_null($this->progressBar)) {
+            return;
+        }
+        $this->progressBar->finish();
+    }
 }

lib/private/Repair/Collation.php

Indentation +115 added lines, -115 removed lines

@@ -33,120 +33,120 @@
 use OCP\Migration\IRepairStep;
 
 class Collation implements IRepairStep {
-	/**  @var IConfig */
-	protected $config;
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var bool */
-	protected $ignoreFailures;
-
-	/**
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param IDBConnection $connection
-	 * @param bool $ignoreFailures
-	 */
-	public function __construct(IConfig $config, ILogger $logger, IDBConnection $connection, $ignoreFailures) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->ignoreFailures = $ignoreFailures;
-	}
-
-	public function getName() {
-		return 'Repair MySQL collation';
-	}
-
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $output) {
-		if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-			$output->info('Not a mysql database -> nothing to do');
-			return;
-		}
-
-		$characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
-
-		$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;');
-			try {
-				$query->execute();
-			} catch (DriverException $e) {
-				// Just log this
-				$this->logger->logException($e);
-				if (!$this->ignoreFailures) {
-					throw $e;
-				}
-			}
-
-			$output->info("Change collation for $table ...");
-			if ($characterSet === 'utf8mb4') {
-				// need to set row compression first
-				$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT=COMPRESSED;');
-				$query->execute();
-			}
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;');
-			try {
-				$query->execute();
-			} catch (DriverException $e) {
-				// Just log this
-				$this->logger->logException($e);
-				if (!$this->ignoreFailures) {
-					throw $e;
-				}
-			}
-		}
-		if (empty($tables)) {
-			$output->info('All tables already have the correct collation -> nothing to do');
-		}
-	}
-
-	/**
-	 * @param IDBConnection $connection
-	 * @return string[]
-	 */
-	protected function getAllNonUTF8BinTables(IDBConnection $connection) {
-		$dbName = $this->config->getSystemValue("dbname");
-		$characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
-
-		// 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 . "')" .
-			"	AND TABLE_NAME LIKE \"*PREFIX*%\"",
-			array($dbName)
-		);
-		$rows = $statement->fetchAll();
-		$result = [];
-		foreach ($rows as $row) {
-			$result[$row['table']] = true;
-		}
-
-		// 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'" .
-			"	AND TABLE_NAME LIKE \"*PREFIX*%\"",
-			[$dbName]
-		);
-		$rows = $statement->fetchAll();
-		foreach ($rows as $row) {
-			$result[$row['table']] = true;
-		}
-
-		return array_keys($result);
-	}
+    /**  @var IConfig */
+    protected $config;
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var bool */
+    protected $ignoreFailures;
+
+    /**
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param IDBConnection $connection
+     * @param bool $ignoreFailures
+     */
+    public function __construct(IConfig $config, ILogger $logger, IDBConnection $connection, $ignoreFailures) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->ignoreFailures = $ignoreFailures;
+    }
+
+    public function getName() {
+        return 'Repair MySQL collation';
+    }
+
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $output) {
+        if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            $output->info('Not a mysql database -> nothing to do');
+            return;
+        }
+
+        $characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
+
+        $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;');
+            try {
+                $query->execute();
+            } catch (DriverException $e) {
+                // Just log this
+                $this->logger->logException($e);
+                if (!$this->ignoreFailures) {
+                    throw $e;
+                }
+            }
+
+            $output->info("Change collation for $table ...");
+            if ($characterSet === 'utf8mb4') {
+                // need to set row compression first
+                $query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT=COMPRESSED;');
+                $query->execute();
+            }
+            $query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;');
+            try {
+                $query->execute();
+            } catch (DriverException $e) {
+                // Just log this
+                $this->logger->logException($e);
+                if (!$this->ignoreFailures) {
+                    throw $e;
+                }
+            }
+        }
+        if (empty($tables)) {
+            $output->info('All tables already have the correct collation -> nothing to do');
+        }
+    }
+
+    /**
+     * @param IDBConnection $connection
+     * @return string[]
+     */
+    protected function getAllNonUTF8BinTables(IDBConnection $connection) {
+        $dbName = $this->config->getSystemValue("dbname");
+        $characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
+
+        // 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 . "')" .
+            "	AND TABLE_NAME LIKE \"*PREFIX*%\"",
+            array($dbName)
+        );
+        $rows = $statement->fetchAll();
+        $result = [];
+        foreach ($rows as $row) {
+            $result[$row['table']] = true;
+        }
+
+        // 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'" .
+            "	AND TABLE_NAME LIKE \"*PREFIX*%\"",
+            [$dbName]
+        );
+        $rows = $statement->fetchAll();
+        foreach ($rows as $row) {
+            $result[$row['table']] = true;
+        }
+
+        return array_keys($result);
+    }
 }
 

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,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,10 +90,10 @@ 
 			$output->info("Change collation for $table ...");
 			if ($characterSet === 'utf8mb4') {
 				// need to set row compression first
-				$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT=COMPRESSED;');
+				$query = $this->connection->prepare('ALTER TABLE `'.$table.'` ROW_FORMAT=COMPRESSED;');
 				$query->execute();
 			}
-			$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) {
@@ -119,10 +119,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*%\"",
 			array($dbName)
 		);
@@ -134,10 +134,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/MDB2SchemaManager.php

Indentation +121 added lines, -121 removed lines

@@ -37,136 +37,136 @@
 use OCP\IDBConnection;
 
 class MDB2SchemaManager {
-	/** @var \OC\DB\Connection $conn */
-	protected $conn;
+    /** @var \OC\DB\Connection $conn */
+    protected $conn;
 
-	/**
-	 * @param IDBConnection $conn
-	 */
-	public function __construct($conn) {
-		$this->conn = $conn;
-	}
+    /**
+     * @param IDBConnection $conn
+     */
+    public function __construct($conn) {
+        $this->conn = $conn;
+    }
 
-	/**
-	 * saves database scheme to xml file
-	 * @param string $file name of file
-	 * @return bool
-	 *
-	 * TODO: write more documentation
-	 */
-	public function getDbStructure($file) {
-		return \OC\DB\MDB2SchemaWriter::saveSchemaToFile($file, $this->conn);
-	}
+    /**
+     * saves database scheme to xml file
+     * @param string $file name of file
+     * @return bool
+     *
+     * TODO: write more documentation
+     */
+    public function getDbStructure($file) {
+        return \OC\DB\MDB2SchemaWriter::saveSchemaToFile($file, $this->conn);
+    }
 
-	/**
-	 * Creates tables from XML file
-	 * @param string $file file to read structure from
-	 * @return bool
-	 *
-	 * TODO: write more documentation
-	 */
-	public function createDbFromStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		$toSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
-		return $this->executeSchemaChange($toSchema);
-	}
+    /**
+     * Creates tables from XML file
+     * @param string $file file to read structure from
+     * @return bool
+     *
+     * TODO: write more documentation
+     */
+    public function createDbFromStructure($file) {
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        $toSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
+        return $this->executeSchemaChange($toSchema);
+    }
 
-	/**
-	 * @return \OC\DB\Migrator
-	 */
-	public function getMigrator() {
-		$random = \OC::$server->getSecureRandom();
-		$platform = $this->conn->getDatabasePlatform();
-		$config = \OC::$server->getConfig();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		if ($platform instanceof SqlitePlatform) {
-			return new SQLiteMigrator($this->conn, $random, $config, $dispatcher);
-		} else if ($platform instanceof OraclePlatform) {
-			return new OracleMigrator($this->conn, $random, $config, $dispatcher);
-		} else if ($platform instanceof MySqlPlatform) {
-			return new MySQLMigrator($this->conn, $random, $config, $dispatcher);
-		} else if ($platform instanceof PostgreSqlPlatform) {
-			return new PostgreSqlMigrator($this->conn, $random, $config, $dispatcher);
-		} else {
-			return new NoCheckMigrator($this->conn, $random, $config, $dispatcher);
-		}
-	}
+    /**
+     * @return \OC\DB\Migrator
+     */
+    public function getMigrator() {
+        $random = \OC::$server->getSecureRandom();
+        $platform = $this->conn->getDatabasePlatform();
+        $config = \OC::$server->getConfig();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        if ($platform instanceof SqlitePlatform) {
+            return new SQLiteMigrator($this->conn, $random, $config, $dispatcher);
+        } else if ($platform instanceof OraclePlatform) {
+            return new OracleMigrator($this->conn, $random, $config, $dispatcher);
+        } else if ($platform instanceof MySqlPlatform) {
+            return new MySQLMigrator($this->conn, $random, $config, $dispatcher);
+        } else if ($platform instanceof PostgreSqlPlatform) {
+            return new PostgreSqlMigrator($this->conn, $random, $config, $dispatcher);
+        } else {
+            return new NoCheckMigrator($this->conn, $random, $config, $dispatcher);
+        }
+    }
 
-	/**
-	 * Reads database schema from file
-	 *
-	 * @param string $file file to read from
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 */
-	private function readSchemaFromFile($file) {
-		$platform = $this->conn->getDatabasePlatform();
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $platform);
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		return $schemaReader->loadSchemaFromFile($file, $toSchema);
-	}
+    /**
+     * Reads database schema from file
+     *
+     * @param string $file file to read from
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    private function readSchemaFromFile($file) {
+        $platform = $this->conn->getDatabasePlatform();
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $platform);
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        return $schemaReader->loadSchemaFromFile($file, $toSchema);
+    }
 
-	/**
-	 * update the database scheme
-	 * @param string $file file to read structure from
-	 * @param bool $generateSql only return the sql needed for the upgrade
-	 * @return string|boolean
-	 */
-	public function updateDbFromStructure($file, $generateSql = false) {
-		$toSchema = $this->readSchemaFromFile($file);
-		$migrator = $this->getMigrator();
+    /**
+     * update the database scheme
+     * @param string $file file to read structure from
+     * @param bool $generateSql only return the sql needed for the upgrade
+     * @return string|boolean
+     */
+    public function updateDbFromStructure($file, $generateSql = false) {
+        $toSchema = $this->readSchemaFromFile($file);
+        $migrator = $this->getMigrator();
 
-		if ($generateSql) {
-			return $migrator->generateChangeScript($toSchema);
-		} else {
-			$migrator->migrate($toSchema);
-			return true;
-		}
-	}
+        if ($generateSql) {
+            return $migrator->generateChangeScript($toSchema);
+        } else {
+            $migrator->migrate($toSchema);
+            return true;
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $schema
-	 * @return string
-	 */
-	public function generateChangeScript($schema) {
-		$migrator = $this->getMigrator();
-		return $migrator->generateChangeScript($schema);
-	}
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     * @return string
+     */
+    public function generateChangeScript($schema) {
+        $migrator = $this->getMigrator();
+        return $migrator->generateChangeScript($schema);
+    }
 
-	/**
-	 * remove all tables defined in a database structure xml file
-	 *
-	 * @param string $file the xml file describing the tables
-	 */
-	public function removeDBStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		$fromSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
-		$toSchema = clone $fromSchema;
-		/** @var $table \Doctrine\DBAL\Schema\Table */
-		foreach ($toSchema->getTables() as $table) {
-			$toSchema->dropTable($table->getName());
-		}
-		$comparator = new \Doctrine\DBAL\Schema\Comparator();
-		$schemaDiff = $comparator->compare($fromSchema, $toSchema);
-		$this->executeSchemaChange($schemaDiff);
-	}
+    /**
+     * remove all tables defined in a database structure xml file
+     *
+     * @param string $file the xml file describing the tables
+     */
+    public function removeDBStructure($file) {
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        $fromSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
+        $toSchema = clone $fromSchema;
+        /** @var $table \Doctrine\DBAL\Schema\Table */
+        foreach ($toSchema->getTables() as $table) {
+            $toSchema->dropTable($table->getName());
+        }
+        $comparator = new \Doctrine\DBAL\Schema\Comparator();
+        $schemaDiff = $comparator->compare($fromSchema, $toSchema);
+        $this->executeSchemaChange($schemaDiff);
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema|\Doctrine\DBAL\Schema\SchemaDiff $schema
-	 * @return bool
-	 */
-	private function executeSchemaChange($schema) {
-		$this->conn->beginTransaction();
-		foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
-			$this->conn->query($sql);
-		}
-		$this->conn->commit();
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema|\Doctrine\DBAL\Schema\SchemaDiff $schema
+     * @return bool
+     */
+    private function executeSchemaChange($schema) {
+        $this->conn->beginTransaction();
+        foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
+            $this->conn->query($sql);
+        }
+        $this->conn->commit();
 
-		if ($this->conn->getDatabasePlatform() instanceof SqlitePlatform) {
-			$this->conn->close();
-			$this->conn->connect();
-		}
-		return true;
-	}
+        if ($this->conn->getDatabasePlatform() instanceof SqlitePlatform) {
+            $this->conn->close();
+            $this->conn->connect();
+        }
+        return true;
+    }
 }

lib/private/DB/ConnectionFactory.php

Indentation +182 added lines, -182 removed lines

@@ -36,186 +36,186 @@
 * Takes care of creating and configuring Doctrine connections.
 */
 class ConnectionFactory {
-	/**
-	* @var array
-	*
-	* Array mapping DBMS type to default connection parameters passed to
-	* \Doctrine\DBAL\DriverManager::getConnection().
-	*/
-	protected $defaultConnectionParams = [
-		'mysql' => [
-			'adapter' => '\OC\DB\AdapterMySQL',
-			'charset' => 'UTF8',
-			'driver' => 'pdo_mysql',
-			'wrapperClass' => 'OC\DB\Connection',
-		],
-		'oci' => [
-			'adapter' => '\OC\DB\AdapterOCI8',
-			'charset' => 'AL32UTF8',
-			'driver' => 'oci8',
-			'wrapperClass' => 'OC\DB\OracleConnection',
-		],
-		'pgsql' => [
-			'adapter' => '\OC\DB\AdapterPgSql',
-			'driver' => 'pdo_pgsql',
-			'wrapperClass' => 'OC\DB\Connection',
-		],
-		'sqlite3' => [
-			'adapter' => '\OC\DB\AdapterSqlite',
-			'driver' => 'pdo_sqlite',
-			'wrapperClass' => 'OC\DB\Connection',
-		],
-	];
-
-	/** @var SystemConfig */
-	private $config;
-
-	/**
-	 * ConnectionFactory constructor.
-	 *
-	 * @param SystemConfig $systemConfig
-	 */
-	public function __construct(SystemConfig $systemConfig) {
-		$this->config = $systemConfig;
-		if($this->config->getValue('mysql.utf8mb4', false)) {
-			$this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
-		}
-	}
-
-	/**
-	* @brief Get default connection parameters for a given DBMS.
-	* @param string $type DBMS type
-	* @throws \InvalidArgumentException If $type is invalid
-	* @return array Default connection parameters.
-	*/
-	public function getDefaultConnectionParams($type) {
-		$normalizedType = $this->normalizeType($type);
-		if (!isset($this->defaultConnectionParams[$normalizedType])) {
-			throw new \InvalidArgumentException("Unsupported type: $type");
-		}
-		$result = $this->defaultConnectionParams[$normalizedType];
-		// \PDO::MYSQL_ATTR_FOUND_ROWS may not be defined, e.g. when the MySQL
-		// driver is missing. In this case, we won't be able to connect anyway.
-		if ($normalizedType === 'mysql' && defined('\PDO::MYSQL_ATTR_FOUND_ROWS')) {
-			$result['driverOptions'] = array(
-				\PDO::MYSQL_ATTR_FOUND_ROWS => true,
-			);
-		}
-		return $result;
-	}
-
-	/**
-	* @brief Get default connection parameters for a given DBMS.
-	* @param string $type DBMS type
-	* @param array $additionalConnectionParams Additional connection parameters
-	* @return \OC\DB\Connection
-	*/
-	public function getConnection($type, $additionalConnectionParams) {
-		$normalizedType = $this->normalizeType($type);
-		$eventManager = new EventManager();
-		switch ($normalizedType) {
-			case 'mysql':
-				$eventManager->addEventSubscriber(
-					new SQLSessionInit("SET SESSION AUTOCOMMIT=1"));
-				break;
-			case 'oci':
-				$eventManager->addEventSubscriber(new OracleSessionInit);
-				// the driverOptions are unused in dbal and need to be mapped to the parameters
-				if (isset($additionalConnectionParams['driverOptions'])) {
-					$additionalConnectionParams = array_merge($additionalConnectionParams, $additionalConnectionParams['driverOptions']);
-				}
-				break;
-			case 'sqlite3':
-				$journalMode = $additionalConnectionParams['sqlite.journal_mode'];
-				$additionalConnectionParams['platform'] = new OCSqlitePlatform();
-				$eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode));
-				break;
-		}
-		/** @var Connection $connection */
-		$connection = DriverManager::getConnection(
-			array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams),
-			new Configuration(),
-			$eventManager
-		);
-		return $connection;
-	}
-
-	/**
-	* @brief Normalize DBMS type
-	* @param string $type DBMS type
-	* @return string Normalized DBMS type
-	*/
-	public function normalizeType($type) {
-		return $type === 'sqlite' ? 'sqlite3' : $type;
-	}
-
-	/**
-	 * Checks whether the specified DBMS type is valid.
-	 *
-	 * @param string $type
-	 * @return bool
-	 */
-	public function isValidType($type) {
-		$normalizedType = $this->normalizeType($type);
-		return isset($this->defaultConnectionParams[$normalizedType]);
-	}
-
-	/**
-	 * Create the connection parameters for the config
-	 *
-	 * @return array
-	 */
-	public function createConnectionParams() {
-		$type = $this->config->getValue('dbtype', 'sqlite');
-
-		$connectionParams = [
-			'user' => $this->config->getValue('dbuser', ''),
-			'password' => $this->config->getValue('dbpassword', ''),
-		];
-		$name = $this->config->getValue('dbname', 'owncloud');
-
-		if ($this->normalizeType($type) === 'sqlite3') {
-			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
-			$connectionParams['path'] = $dataDir . '/' . $name . '.db';
-		} else {
-			$host = $this->config->getValue('dbhost', '');
-			if (strpos($host, ':')) {
-				// Host variable may carry a port or socket.
-				list($host, $portOrSocket) = explode(':', $host, 2);
-				if (ctype_digit($portOrSocket)) {
-					$connectionParams['port'] = $portOrSocket;
-				} else {
-					$connectionParams['unix_socket'] = $portOrSocket;
-				}
-			}
-			$connectionParams['host'] = $host;
-			$connectionParams['dbname'] = $name;
-		}
-
-		$connectionParams['tablePrefix'] = $this->config->getValue('dbtableprefix', 'oc_');
-		$connectionParams['sqlite.journal_mode'] = $this->config->getValue('sqlite.journal_mode', 'WAL');
-
-		//additional driver options, eg. for mysql ssl
-		$driverOptions = $this->config->getValue('dbdriveroptions', null);
-		if ($driverOptions) {
-			$connectionParams['driverOptions'] = $driverOptions;
-		}
-
-		// set default table creation options
-		$connectionParams['defaultTableOptions'] = [
-			'collate' => 'utf8_bin',
-			'tablePrefix' => $connectionParams['tablePrefix']
-		];
-
-		if($this->config->getValue('mysql.utf8mb4', false)) {
-			$connectionParams['defaultTableOptions'] = [
-				'collate' => 'utf8mb4_bin',
-				'charset' => 'utf8mb4',
-				'row_format' => 'compressed',
-				'tablePrefix' => $connectionParams['tablePrefix']
-			];
-		}
-
-		return $connectionParams;
-	}
+    /**
+     * @var array
+     *
+     * Array mapping DBMS type to default connection parameters passed to
+     * \Doctrine\DBAL\DriverManager::getConnection().
+     */
+    protected $defaultConnectionParams = [
+        'mysql' => [
+            'adapter' => '\OC\DB\AdapterMySQL',
+            'charset' => 'UTF8',
+            'driver' => 'pdo_mysql',
+            'wrapperClass' => 'OC\DB\Connection',
+        ],
+        'oci' => [
+            'adapter' => '\OC\DB\AdapterOCI8',
+            'charset' => 'AL32UTF8',
+            'driver' => 'oci8',
+            'wrapperClass' => 'OC\DB\OracleConnection',
+        ],
+        'pgsql' => [
+            'adapter' => '\OC\DB\AdapterPgSql',
+            'driver' => 'pdo_pgsql',
+            'wrapperClass' => 'OC\DB\Connection',
+        ],
+        'sqlite3' => [
+            'adapter' => '\OC\DB\AdapterSqlite',
+            'driver' => 'pdo_sqlite',
+            'wrapperClass' => 'OC\DB\Connection',
+        ],
+    ];
+
+    /** @var SystemConfig */
+    private $config;
+
+    /**
+     * ConnectionFactory constructor.
+     *
+     * @param SystemConfig $systemConfig
+     */
+    public function __construct(SystemConfig $systemConfig) {
+        $this->config = $systemConfig;
+        if($this->config->getValue('mysql.utf8mb4', false)) {
+            $this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
+        }
+    }
+
+    /**
+     * @brief Get default connection parameters for a given DBMS.
+     * @param string $type DBMS type
+     * @throws \InvalidArgumentException If $type is invalid
+     * @return array Default connection parameters.
+     */
+    public function getDefaultConnectionParams($type) {
+        $normalizedType = $this->normalizeType($type);
+        if (!isset($this->defaultConnectionParams[$normalizedType])) {
+            throw new \InvalidArgumentException("Unsupported type: $type");
+        }
+        $result = $this->defaultConnectionParams[$normalizedType];
+        // \PDO::MYSQL_ATTR_FOUND_ROWS may not be defined, e.g. when the MySQL
+        // driver is missing. In this case, we won't be able to connect anyway.
+        if ($normalizedType === 'mysql' && defined('\PDO::MYSQL_ATTR_FOUND_ROWS')) {
+            $result['driverOptions'] = array(
+                \PDO::MYSQL_ATTR_FOUND_ROWS => true,
+            );
+        }
+        return $result;
+    }
+
+    /**
+     * @brief Get default connection parameters for a given DBMS.
+     * @param string $type DBMS type
+     * @param array $additionalConnectionParams Additional connection parameters
+     * @return \OC\DB\Connection
+     */
+    public function getConnection($type, $additionalConnectionParams) {
+        $normalizedType = $this->normalizeType($type);
+        $eventManager = new EventManager();
+        switch ($normalizedType) {
+            case 'mysql':
+                $eventManager->addEventSubscriber(
+                    new SQLSessionInit("SET SESSION AUTOCOMMIT=1"));
+                break;
+            case 'oci':
+                $eventManager->addEventSubscriber(new OracleSessionInit);
+                // the driverOptions are unused in dbal and need to be mapped to the parameters
+                if (isset($additionalConnectionParams['driverOptions'])) {
+                    $additionalConnectionParams = array_merge($additionalConnectionParams, $additionalConnectionParams['driverOptions']);
+                }
+                break;
+            case 'sqlite3':
+                $journalMode = $additionalConnectionParams['sqlite.journal_mode'];
+                $additionalConnectionParams['platform'] = new OCSqlitePlatform();
+                $eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode));
+                break;
+        }
+        /** @var Connection $connection */
+        $connection = DriverManager::getConnection(
+            array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams),
+            new Configuration(),
+            $eventManager
+        );
+        return $connection;
+    }
+
+    /**
+     * @brief Normalize DBMS type
+     * @param string $type DBMS type
+     * @return string Normalized DBMS type
+     */
+    public function normalizeType($type) {
+        return $type === 'sqlite' ? 'sqlite3' : $type;
+    }
+
+    /**
+     * Checks whether the specified DBMS type is valid.
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function isValidType($type) {
+        $normalizedType = $this->normalizeType($type);
+        return isset($this->defaultConnectionParams[$normalizedType]);
+    }
+
+    /**
+     * Create the connection parameters for the config
+     *
+     * @return array
+     */
+    public function createConnectionParams() {
+        $type = $this->config->getValue('dbtype', 'sqlite');
+
+        $connectionParams = [
+            'user' => $this->config->getValue('dbuser', ''),
+            'password' => $this->config->getValue('dbpassword', ''),
+        ];
+        $name = $this->config->getValue('dbname', 'owncloud');
+
+        if ($this->normalizeType($type) === 'sqlite3') {
+            $dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
+            $connectionParams['path'] = $dataDir . '/' . $name . '.db';
+        } else {
+            $host = $this->config->getValue('dbhost', '');
+            if (strpos($host, ':')) {
+                // Host variable may carry a port or socket.
+                list($host, $portOrSocket) = explode(':', $host, 2);
+                if (ctype_digit($portOrSocket)) {
+                    $connectionParams['port'] = $portOrSocket;
+                } else {
+                    $connectionParams['unix_socket'] = $portOrSocket;
+                }
+            }
+            $connectionParams['host'] = $host;
+            $connectionParams['dbname'] = $name;
+        }
+
+        $connectionParams['tablePrefix'] = $this->config->getValue('dbtableprefix', 'oc_');
+        $connectionParams['sqlite.journal_mode'] = $this->config->getValue('sqlite.journal_mode', 'WAL');
+
+        //additional driver options, eg. for mysql ssl
+        $driverOptions = $this->config->getValue('dbdriveroptions', null);
+        if ($driverOptions) {
+            $connectionParams['driverOptions'] = $driverOptions;
+        }
+
+        // set default table creation options
+        $connectionParams['defaultTableOptions'] = [
+            'collate' => 'utf8_bin',
+            'tablePrefix' => $connectionParams['tablePrefix']
+        ];
+
+        if($this->config->getValue('mysql.utf8mb4', false)) {
+            $connectionParams['defaultTableOptions'] = [
+                'collate' => 'utf8mb4_bin',
+                'charset' => 'utf8mb4',
+                'row_format' => 'compressed',
+                'tablePrefix' => $connectionParams['tablePrefix']
+            ];
+        }
+
+        return $connectionParams;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -77,7 +77,7 @@ 
 	 */
 	public function __construct(SystemConfig $systemConfig) {
 		$this->config = $systemConfig;
-		if($this->config->getValue('mysql.utf8mb4', false)) {
+		if ($this->config->getValue('mysql.utf8mb4', false)) {
 			$this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
 		}
 	}
@@ -175,8 +175,8 @@ 
 		$name = $this->config->getValue('dbname', 'owncloud');
 
 		if ($this->normalizeType($type) === 'sqlite3') {
-			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
-			$connectionParams['path'] = $dataDir . '/' . $name . '.db';
+			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT.'/data');
+			$connectionParams['path'] = $dataDir.'/'.$name.'.db';
 		} else {
 			$host = $this->config->getValue('dbhost', '');
 			if (strpos($host, ':')) {
@@ -207,7 +207,7 @@ 
 			'tablePrefix' => $connectionParams['tablePrefix']
 		];
 
-		if($this->config->getValue('mysql.utf8mb4', false)) {
+		if ($this->config->getValue('mysql.utf8mb4', false)) {
 			$connectionParams['defaultTableOptions'] = [
 				'collate' => 'utf8mb4_bin',
 				'charset' => 'utf8mb4',

core/register_command.php

Indentation +88 added lines, -88 removed lines

@@ -40,115 +40,115 @@
 $application->add(new OC\Core\Command\App\CheckCode($infoParser));
 $application->add(new OC\Core\Command\L10n\CreateJs());
 $application->add(new \OC\Core\Command\Integrity\SignApp(
-		\OC::$server->getIntegrityCodeChecker(),
-		new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
-		\OC::$server->getURLGenerator()
+        \OC::$server->getIntegrityCodeChecker(),
+        new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
+        \OC::$server->getURLGenerator()
 ));
 $application->add(new \OC\Core\Command\Integrity\SignCore(
-		\OC::$server->getIntegrityCodeChecker(),
-		new \OC\IntegrityCheck\Helpers\FileAccessHelper()
+        \OC::$server->getIntegrityCodeChecker(),
+        new \OC\IntegrityCheck\Helpers\FileAccessHelper()
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckApp(
-		\OC::$server->getIntegrityCodeChecker()
+        \OC::$server->getIntegrityCodeChecker()
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckCore(
-		\OC::$server->getIntegrityCodeChecker()
+        \OC::$server->getIntegrityCodeChecker()
 ));
 
 
 if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
-	$application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\GetPath());
-	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\GetPath());
+    $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
 	
-	$application->add(new OC\Core\Command\TwoFactorAuth\Enable(
-		\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
-	));
-	$application->add(new OC\Core\Command\TwoFactorAuth\Disable(
-		\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
-	));
+    $application->add(new OC\Core\Command\TwoFactorAuth\Enable(
+        \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
+    ));
+    $application->add(new OC\Core\Command\TwoFactorAuth\Disable(
+        \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
+    ));
 
-	$application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
 
-	$application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
-	$application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
+    $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
 
-	$application->add(new OC\Core\Command\Db\GenerateChangeScript());
-	$application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
-	$application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
+    $application->add(new OC\Core\Command\Db\GenerateChangeScript());
+    $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
+    $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
 
-	$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
-	$application->add(new OC\Core\Command\Encryption\DecryptAll(
-		\OC::$server->getEncryptionManager(),
-		\OC::$server->getAppManager(),
-		\OC::$server->getConfig(),
-		new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
-		new \Symfony\Component\Console\Helper\QuestionHelper())
-	);
+    $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
+    $application->add(new OC\Core\Command\Encryption\DecryptAll(
+        \OC::$server->getEncryptionManager(),
+        \OC::$server->getAppManager(),
+        \OC::$server->getConfig(),
+        new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
+        new \Symfony\Component\Console\Helper\QuestionHelper())
+    );
 
-	$application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
 
-	$view = new \OC\Files\View();
-	$util = new \OC\Encryption\Util(
-		$view,
-		\OC::$server->getUserManager(),
-		\OC::$server->getGroupManager(),
-		\OC::$server->getConfig()
-	);
-	$application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
-			$view,
-			\OC::$server->getUserManager(),
-			\OC::$server->getConfig(),
-			$util,
-			new \Symfony\Component\Console\Helper\QuestionHelper()
-		)
-	);
-	$application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
+    $view = new \OC\Files\View();
+    $util = new \OC\Encryption\Util(
+        $view,
+        \OC::$server->getUserManager(),
+        \OC::$server->getGroupManager(),
+        \OC::$server->getConfig()
+    );
+    $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
+            $view,
+            \OC::$server->getUserManager(),
+            \OC::$server->getConfig(),
+            $util,
+            new \Symfony\Component\Console\Helper\QuestionHelper()
+        )
+    );
+    $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
 
-	$application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
-	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
-	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
-	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
+    $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
+    $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
+    $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
+    $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
 
-	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
-	$application->add(new OC\Core\Command\Maintenance\Repair(
-		new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
-		\OC::$server->getEventDispatcher()));
+    $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
+    $application->add(new OC\Core\Command\Maintenance\Repair(
+        new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
+        \OC::$server->getEventDispatcher()));
 
-	$application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
 
-	$application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
 
-	$application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
-	$application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
-	$application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
+    $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
+    $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
+    $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
 } else {
-	$application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
 }

core/Command/Db/ConvertMysqlToMB4.php

Indentation +46 added lines, -46 removed lines

@@ -33,60 +33,60 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ConvertMysqlToMB4 extends Command {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param IConfig $config
-	 * @param IDBConnection $connection
-	 * @param IURLGenerator $urlGenerator
-	 * @param ILogger $logger
-	 */
-	public function __construct(IConfig $config, IDBConnection $connection, IURLGenerator $urlGenerator, ILogger $logger) {
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
-		parent::__construct();
-	}
+    /**
+     * @param IConfig $config
+     * @param IDBConnection $connection
+     * @param IURLGenerator $urlGenerator
+     * @param ILogger $logger
+     */
+    public function __construct(IConfig $config, IDBConnection $connection, IURLGenerator $urlGenerator, ILogger $logger) {
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->urlGenerator = $urlGenerator;
+        $this->logger = $logger;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('db:convert-mysql-charset')
-			->setDescription('Convert charset of MySQL/MariaDB to use utf8mb4');
-	}
+    protected function configure() {
+        $this
+            ->setName('db:convert-mysql-charset')
+            ->setDescription('Convert charset of MySQL/MariaDB to use utf8mb4');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-			$output->writeln("This command is only valid for MySQL/MariaDB databases.");
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            $output->writeln("This command is only valid for MySQL/MariaDB databases.");
+            return 1;
+        }
 
-		$oldValue = $this->config->getSystemValue('mysql.utf8mb4', false);
-		// enable charset
-		$this->config->setSystemValue('mysql.utf8mb4', true);
+        $oldValue = $this->config->getSystemValue('mysql.utf8mb4', false);
+        // enable charset
+        $this->config->setSystemValue('mysql.utf8mb4', true);
 
-		if (!$this->connection->supports4ByteText()) {
-			$url = $this->urlGenerator->linkToDocs('admin-mysql-utf8mb4');
-			$output->writeln("The database is not properly setup to use the charset utf8mb4.");
-			$output->writeln("For more information please read the documentation at $url");
-			$this->config->setSystemValue('mysql.utf8mb4', $oldValue);
-			return 1;
-		}
+        if (!$this->connection->supports4ByteText()) {
+            $url = $this->urlGenerator->linkToDocs('admin-mysql-utf8mb4');
+            $output->writeln("The database is not properly setup to use the charset utf8mb4.");
+            $output->writeln("For more information please read the documentation at $url");
+            $this->config->setSystemValue('mysql.utf8mb4', $oldValue);
+            return 1;
+        }
 
-		// run conversion
-		$coll = new Collation($this->config, $this->logger, $this->connection, false);
-		$coll->run(new ConsoleOutput($output));
+        // run conversion
+        $coll = new Collation($this->config, $this->logger, $this->connection, false);
+        $coll->run(new ConsoleOutput($output));
 
-		return 0;
-	}
+        return 0;
+    }
 }