nextcloud / server

lib/private/Files/Storage/Temporary.php

Indentation +13 added lines, -13 removed lines

@@ -29,20 +29,20 @@
  * local storage backend in temporary folder for testing purpose
  */
 class Temporary extends Local {
-	public function __construct($arguments = null) {
-		parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]);
-	}
+    public function __construct($arguments = null) {
+        parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]);
+    }
 
-	public function cleanUp() {
-		\OC_Helper::rmdirr($this->datadir);
-	}
+    public function cleanUp() {
+        \OC_Helper::rmdirr($this->datadir);
+    }
 
-	public function __destruct() {
-		parent::__destruct();
-		$this->cleanUp();
-	}
+    public function __destruct() {
+        parent::__destruct();
+        $this->cleanUp();
+    }
 
-	public function getDataDir() {
-		return $this->datadir;
-	}
+    public function getDataDir() {
+        return $this->datadir;
+    }
 }

lib/private/Files/Storage/Home.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	public function __construct($arguments) {
 		$this->user = $arguments['user'];
 		$datadir = $this->user->getHome();
-		$this->id = 'home::' . $this->user->getUID();
+		$this->id = 'home::'.$this->user->getUID();
 
 		parent::__construct(['datadir' => $datadir]);
 	}

Indentation +67 added lines, -67 removed lines

@@ -33,80 +33,80 @@
  * Specialized version of Local storage for home directory usage
  */
 class Home extends Local implements \OCP\Files\IHomeStorage {
-	/**
-	 * @var string
-	 */
-	protected $id;
+    /**
+     * @var string
+     */
+    protected $id;
 
-	/**
-	 * @var \OC\User\User $user
-	 */
-	protected $user;
+    /**
+     * @var \OC\User\User $user
+     */
+    protected $user;
 
-	/**
-	 * Construct a Home storage instance
-	 *
-	 * @param array $arguments array with "user" containing the
-	 * storage owner
-	 */
-	public function __construct($arguments) {
-		$this->user = $arguments['user'];
-		$datadir = $this->user->getHome();
-		$this->id = 'home::' . $this->user->getUID();
+    /**
+     * Construct a Home storage instance
+     *
+     * @param array $arguments array with "user" containing the
+     * storage owner
+     */
+    public function __construct($arguments) {
+        $this->user = $arguments['user'];
+        $datadir = $this->user->getHome();
+        $this->id = 'home::' . $this->user->getUID();
 
-		parent::__construct(['datadir' => $datadir]);
-	}
+        parent::__construct(['datadir' => $datadir]);
+    }
 
-	public function getId() {
-		return $this->id;
-	}
+    public function getId() {
+        return $this->id;
+    }
 
-	/**
-	 * @return \OC\Files\Cache\HomeCache
-	 */
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->cache)) {
-			$this->cache = new \OC\Files\Cache\HomeCache($storage);
-		}
-		return $this->cache;
-	}
+    /**
+     * @return \OC\Files\Cache\HomeCache
+     */
+    public function getCache($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->cache)) {
+            $this->cache = new \OC\Files\Cache\HomeCache($storage);
+        }
+        return $this->cache;
+    }
 
-	/**
-	 * get a propagator instance for the cache
-	 *
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Propagator
-	 */
-	public function getPropagator($storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->propagator)) {
-			$this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection());
-		}
-		return $this->propagator;
-	}
+    /**
+     * get a propagator instance for the cache
+     *
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Propagator
+     */
+    public function getPropagator($storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->propagator)) {
+            $this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection());
+        }
+        return $this->propagator;
+    }
 
 
-	/**
-	 * Returns the owner of this home storage
-	 *
-	 * @return \OC\User\User owner of this home storage
-	 */
-	public function getUser() {
-		return $this->user;
-	}
+    /**
+     * Returns the owner of this home storage
+     *
+     * @return \OC\User\User owner of this home storage
+     */
+    public function getUser() {
+        return $this->user;
+    }
 
-	/**
-	 * get the owner of a path
-	 *
-	 * @param string $path The path to get the owner
-	 * @return string uid or false
-	 */
-	public function getOwner($path) {
-		return $this->user->getUID();
-	}
+    /**
+     * get the owner of a path
+     *
+     * @param string $path The path to get the owner
+     * @return string uid or false
+     */
+    public function getOwner($path) {
+        return $this->user->getUID();
+    }
 }

lib/private/Files/SimpleFS/SimpleFolder.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	public function getDirectoryListing() {
 		$listing = $this->folder->getDirectoryListing();
 
-		$fileListing = array_map(function (Node $file) {
+		$fileListing = array_map(function(Node $file) {
 			if ($file instanceof File) {
 				return new SimpleFile($file);
 			}

Indentation +58 added lines, -58 removed lines

@@ -32,62 +32,62 @@
 
 class SimpleFolder implements ISimpleFolder {
 
-	/** @var Folder */
-	private $folder;
-
-	/**
-	 * Folder constructor.
-	 *
-	 * @param Folder $folder
-	 */
-	public function __construct(Folder $folder) {
-		$this->folder = $folder;
-	}
-
-	public function getName() {
-		return $this->folder->getName();
-	}
-
-	public function getDirectoryListing() {
-		$listing = $this->folder->getDirectoryListing();
-
-		$fileListing = array_map(function (Node $file) {
-			if ($file instanceof File) {
-				return new SimpleFile($file);
-			}
-			return null;
-		}, $listing);
-
-		$fileListing = array_filter($fileListing);
-
-		return array_values($fileListing);
-	}
-
-	public function delete() {
-		$this->folder->delete();
-	}
-
-	public function fileExists($name) {
-		return $this->folder->nodeExists($name);
-	}
-
-	public function getFile($name) {
-		$file = $this->folder->get($name);
-
-		if (!($file instanceof File)) {
-			throw new NotFoundException();
-		}
-
-		return new SimpleFile($file);
-	}
-
-	public function newFile($name, $content = null) {
-		if ($content === null) {
-			// delay creating the file until it's written to
-			return new NewSimpleFile($this->folder, $name);
-		} else {
-			$file = $this->folder->newFile($name, $content);
-			return new SimpleFile($file);
-		}
-	}
+    /** @var Folder */
+    private $folder;
+
+    /**
+     * Folder constructor.
+     *
+     * @param Folder $folder
+     */
+    public function __construct(Folder $folder) {
+        $this->folder = $folder;
+    }
+
+    public function getName() {
+        return $this->folder->getName();
+    }
+
+    public function getDirectoryListing() {
+        $listing = $this->folder->getDirectoryListing();
+
+        $fileListing = array_map(function (Node $file) {
+            if ($file instanceof File) {
+                return new SimpleFile($file);
+            }
+            return null;
+        }, $listing);
+
+        $fileListing = array_filter($fileListing);
+
+        return array_values($fileListing);
+    }
+
+    public function delete() {
+        $this->folder->delete();
+    }
+
+    public function fileExists($name) {
+        return $this->folder->nodeExists($name);
+    }
+
+    public function getFile($name) {
+        $file = $this->folder->get($name);
+
+        if (!($file instanceof File)) {
+            throw new NotFoundException();
+        }
+
+        return new SimpleFile($file);
+    }
+
+    public function newFile($name, $content = null) {
+        if ($content === null) {
+            // delay creating the file until it's written to
+            return new NewSimpleFile($this->folder, $name);
+        } else {
+            $file = $this->folder->newFile($name, $content);
+            return new SimpleFile($file);
+        }
+    }
 }

lib/private/Files/ObjectStore/HomeObjectStoreStorage.php

Indentation +33 added lines, -33 removed lines

@@ -28,40 +28,40 @@
 
 class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IHomeStorage {
 
-	/**
-	 * The home user storage requires a user object to create a unique storage id
-	 * @param array $params
-	 */
-	public function __construct($params) {
-		if (! isset($params['user']) || ! $params['user'] instanceof User) {
-			throw new \Exception('missing user object in parameters');
-		}
-		$this->user = $params['user'];
-		parent::__construct($params);
-	}
+    /**
+     * The home user storage requires a user object to create a unique storage id
+     * @param array $params
+     */
+    public function __construct($params) {
+        if (! isset($params['user']) || ! $params['user'] instanceof User) {
+            throw new \Exception('missing user object in parameters');
+        }
+        $this->user = $params['user'];
+        parent::__construct($params);
+    }
 
-	public function getId() {
-		return 'object::user:' . $this->user->getUID();
-	}
+    public function getId() {
+        return 'object::user:' . $this->user->getUID();
+    }
 
-	/**
-	 * get the owner of a path
-	 *
-	 * @param string $path The path to get the owner
-	 * @return false|string uid
-	 */
-	public function getOwner($path) {
-		if (is_object($this->user)) {
-			return $this->user->getUID();
-		}
-		return false;
-	}
+    /**
+     * get the owner of a path
+     *
+     * @param string $path The path to get the owner
+     * @return false|string uid
+     */
+    public function getOwner($path) {
+        if (is_object($this->user)) {
+            return $this->user->getUID();
+        }
+        return false;
+    }
 
-	/**
-	 * @param string $path, optional
-	 * @return \OC\User\User
-	 */
-	public function getUser($path = null) {
-		return $this->user;
-	}
+    /**
+     * @param string $path, optional
+     * @return \OC\User\User
+     */
+    public function getUser($path = null) {
+        return $this->user;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array $params
 	 */
 	public function __construct($params) {
-		if (! isset($params['user']) || ! $params['user'] instanceof User) {
+		if (!isset($params['user']) || !$params['user'] instanceof User) {
 			throw new \Exception('missing user object in parameters');
 		}
 		$this->user = $params['user'];
@@ -41,7 +41,7 @@ 
 	}
 
 	public function getId() {
-		return 'object::user:' . $this->user->getUID();
+		return 'object::user:'.$this->user->getUID();
 	}
 
 	/**

lib/private/DB/MigrationException.php

Indentation +11 added lines, -11 removed lines

@@ -24,17 +24,17 @@
 namespace OC\DB;
 
 class MigrationException extends \Exception {
-	private $table;
+    private $table;
 
-	public function __construct($table, $message) {
-		$this->table = $table;
-		parent::__construct($message);
-	}
+    public function __construct($table, $message) {
+        $this->table = $table;
+        parent::__construct($message);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getTable() {
-		return $this->table;
-	}
+    /**
+     * @return string
+     */
+    public function getTable() {
+        return $this->table;
+    }
 }

lib/private/DB/QueryBuilder/Literal.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 use OCP\DB\QueryBuilder\ILiteral;
 
 class Literal implements ILiteral {
-	/** @var mixed */
-	protected $literal;
+    /** @var mixed */
+    protected $literal;
 
-	public function __construct($literal) {
-		$this->literal = $literal;
-	}
+    public function __construct($literal) {
+        $this->literal = $literal;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		return (string) $this->literal;
-	}
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return (string) $this->literal;
+    }
 }

lib/private/DB/MySQLMigrator.php

Indentation +38 added lines, -38 removed lines

@@ -29,47 +29,47 @@
 use Doctrine\DBAL\Schema\Table;
 
 class MySQLMigrator extends Migrator {
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$platform = $connection->getDatabasePlatform();
-		$platform->registerDoctrineTypeMapping('enum', 'string');
-		$platform->registerDoctrineTypeMapping('bit', 'string');
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $platform = $connection->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+        $platform->registerDoctrineTypeMapping('bit', 'string');
 
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
 
-		// identifiers need to be quoted for mysql
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			$tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
-			}
-		}
+        // identifiers need to be quoted for mysql
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
+            }
+        }
 
-		return $schemaDiff;
-	}
+        return $schemaDiff;
+    }
 	
-	/**
-	 * Speed up migration test by disabling autocommit and unique indexes check
-	 *
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @throws \OC\DB\MigrationException
-	 */
-	protected function checkTableMigrate(Table $table) {
-		$this->connection->exec('SET autocommit=0');
-		$this->connection->exec('SET unique_checks=0');
+    /**
+     * Speed up migration test by disabling autocommit and unique indexes check
+     *
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @throws \OC\DB\MigrationException
+     */
+    protected function checkTableMigrate(Table $table) {
+        $this->connection->exec('SET autocommit=0');
+        $this->connection->exec('SET unique_checks=0');
 
-		try {
-			parent::checkTableMigrate($table);
-		} catch (\Exception $e) {
-			$this->connection->exec('SET unique_checks=1');
-			$this->connection->exec('SET autocommit=1');
-			throw new MigrationException($table->getName(), $e->getMessage());
-		}
-		$this->connection->exec('SET unique_checks=1');
-		$this->connection->exec('SET autocommit=1');
-	}
+        try {
+            parent::checkTableMigrate($table);
+        } catch (\Exception $e) {
+            $this->connection->exec('SET unique_checks=1');
+            $this->connection->exec('SET autocommit=1');
+            throw new MigrationException($table->getName(), $e->getMessage());
+        }
+        $this->connection->exec('SET unique_checks=1');
+        $this->connection->exec('SET autocommit=1');
+    }
 }

lib/private/DB/AdapterSqlite.php

Spacing +2 added lines, -2 removed lines

@@ -64,14 +64,14 @@
 		if (empty($compare)) {
 			$compare = array_keys($input);
 		}
-		$fieldList = '`' . implode('`,`', array_keys($input)) . '`';
+		$fieldList = '`'.implode('`,`', array_keys($input)).'`';
 		$query = "INSERT INTO `$table` ($fieldList) SELECT "
 			. str_repeat('?,', count($input) - 1).'? '
 			. " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE ";
 
 		$inserts = array_values($input);
 		foreach ($compare as $key) {
-			$query .= '`' . $key . '`';
+			$query .= '`'.$key.'`';
 			if (is_null($input[$key])) {
 				$query .= ' IS NULL AND ';
 			} else {

Indentation +61 added lines, -61 removed lines

@@ -31,70 +31,70 @@
 
 class AdapterSqlite extends Adapter {
 
-	/**
-	 * @param string $tableName
-	 */
-	public function lockTable($tableName) {
-		$this->conn->executeUpdate('BEGIN EXCLUSIVE TRANSACTION');
-	}
+    /**
+     * @param string $tableName
+     */
+    public function lockTable($tableName) {
+        $this->conn->executeUpdate('BEGIN EXCLUSIVE TRANSACTION');
+    }
 
-	public function unlockTable() {
-		$this->conn->executeUpdate('COMMIT TRANSACTION');
-	}
+    public function unlockTable() {
+        $this->conn->executeUpdate('COMMIT TRANSACTION');
+    }
 
-	public function fixupStatement($statement) {
-		$statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement);
-		$statement = str_replace('`', '"', $statement);
-		$statement = str_ireplace('NOW()', 'datetime(\'now\')', $statement);
-		$statement = str_ireplace('GREATEST(', 'MAX(', $statement);
-		$statement = str_ireplace('UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement);
-		return $statement;
-	}
+    public function fixupStatement($statement) {
+        $statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement);
+        $statement = str_replace('`', '"', $statement);
+        $statement = str_ireplace('NOW()', 'datetime(\'now\')', $statement);
+        $statement = str_ireplace('GREATEST(', 'MAX(', $statement);
+        $statement = str_ireplace('UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement);
+        return $statement;
+    }
 
-	/**
-	 * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance
-	 * it is needed that there is also a unique constraint on the values. Then this method will
-	 * catch the exception and return 0.
-	 *
-	 * @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\Exception
-	 * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371
-	 */
-	public function insertIfNotExist($table, $input, array $compare = null) {
-		if (empty($compare)) {
-			$compare = array_keys($input);
-		}
-		$fieldList = '`' . implode('`,`', array_keys($input)) . '`';
-		$query = "INSERT INTO `$table` ($fieldList) SELECT "
-			. str_repeat('?,', count($input) - 1).'? '
-			. " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE ";
+    /**
+     * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance
+     * it is needed that there is also a unique constraint on the values. Then this method will
+     * catch the exception and return 0.
+     *
+     * @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\Exception
+     * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371
+     */
+    public function insertIfNotExist($table, $input, array $compare = null) {
+        if (empty($compare)) {
+            $compare = array_keys($input);
+        }
+        $fieldList = '`' . implode('`,`', array_keys($input)) . '`';
+        $query = "INSERT INTO `$table` ($fieldList) SELECT "
+            . str_repeat('?,', count($input) - 1).'? '
+            . " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE ";
 
-		$inserts = array_values($input);
-		foreach ($compare as $key) {
-			$query .= '`' . $key . '`';
-			if (is_null($input[$key])) {
-				$query .= ' IS NULL AND ';
-			} else {
-				$inserts[] = $input[$key];
-				$query .= ' = ? AND ';
-			}
-		}
-		$query = substr($query, 0, -5);
-		$query .= ')';
+        $inserts = array_values($input);
+        foreach ($compare as $key) {
+            $query .= '`' . $key . '`';
+            if (is_null($input[$key])) {
+                $query .= ' IS NULL AND ';
+            } else {
+                $inserts[] = $input[$key];
+                $query .= ' = ? AND ';
+            }
+        }
+        $query = substr($query, 0, -5);
+        $query .= ')';
 
-		try {
-			return $this->conn->executeUpdate($query, $inserts);
-		} catch (UniqueConstraintViolationException $e) {
-			// if this is thrown then a concurrent insert happened between the insert and the sub-select in the insert, that should have avoided it
-			// it's fine to ignore this then
-			//
-			// more discussions about this can be found at https://github.com/nextcloud/server/pull/12315
-			return 0;
-		}
-	}
+        try {
+            return $this->conn->executeUpdate($query, $inserts);
+        } catch (UniqueConstraintViolationException $e) {
+            // if this is thrown then a concurrent insert happened between the insert and the sub-select in the insert, that should have avoided it
+            // it's fine to ignore this then
+            //
+            // more discussions about this can be found at https://github.com/nextcloud/server/pull/12315
+            return 0;
+        }
+    }
 }

lib/private/DB/MDB2SchemaReader.php

Spacing +21 added lines, -21 removed lines

@@ -84,7 +84,7 @@ 
 					$this->loadTable($schema, $child);
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -104,7 +104,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);
@@ -120,7 +120,7 @@ 
 					$this->loadDeclaration($table, $child);
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -144,7 +144,7 @@ 
 					$this->loadIndex($table, $child);
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -156,18 +156,18 @@ 
 	 * @throws \DomainException
 	 */
 	private function loadField($table, $xml) {
-		$options = [ 'notnull' => false ];
+		$options = ['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';
@@ -184,7 +184,7 @@ 
 					}
 					break;
 				case 'length':
-					$length = (string)$child;
+					$length = (string) $child;
 					$options['length'] = $length;
 					break;
 				case 'unsigned':
@@ -200,11 +200,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':
@@ -212,15 +212,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());
 
 			}
 		}
@@ -242,7 +242,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'];
@@ -282,7 +282,7 @@ 
 			 */
 			switch ($child->getName()) {
 				case 'name':
-					$name = (string)$child;
+					$name = (string) $child;
 					break;
 				case 'primary':
 					$primary = $this->asBool($child);
@@ -297,20 +297,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());
 
 			}
 		}
@@ -328,7 +328,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));
 		}
 	}
 
@@ -337,12 +337,12 @@ 
 	 * @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;
 	}
 }

Indentation +300 added lines, -300 removed lines

@@ -36,320 +36,320 @@
 
 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 = [ '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 = [ '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';
-				} elseif ($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';
+                } elseif ($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;
+            }
 
-			# not used anymore in the options argument
-			# see https://github.com/doctrine/dbal/commit/138eb85234a1faeaa2e6a32cd7bcc66bb51c64e8#diff-300f55366adb50a32a40882ebdc95c163b141f64cba5f45f20bda04a907b3eb3L82
-			# therefore it's read before and then unset right before the addColumn call
-			$setPrimaryKey = false;
-			if (!empty($options['primary']) && $options['primary']) {
-				$setPrimaryKey = true;
-			}
-			unset($options['primary']);
-			$table->addColumn($name, $type, $options);
-			if ($setPrimaryKey) {
-				$table->setPrimaryKey([$name]);
-			}
-		}
-	}
+            # not used anymore in the options argument
+            # see https://github.com/doctrine/dbal/commit/138eb85234a1faeaa2e6a32cd7bcc66bb51c64e8#diff-300f55366adb50a32a40882ebdc95c163b141f64cba5f45f20bda04a907b3eb3L82
+            # therefore it's read before and then unset right before the addColumn call
+            $setPrimaryKey = false;
+            if (!empty($options['primary']) && $options['primary']) {
+                $setPrimaryKey = true;
+            }
+            unset($options['primary']);
+            $table->addColumn($name, $type, $options);
+            if ($setPrimaryKey) {
+                $table->setPrimaryKey([$name]);
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadIndex($table, $xml) {
-		$name = null;
-		$fields = [];
-		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 = [];
+        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;
+    }
 }