nextcloud / server

lib/private/DB/ResultAdapter.php

Indentation +27 added lines, -27 removed lines

@@ -33,39 +33,39 @@
  */
 class ResultAdapter implements IResult {
 
-	/** @var Result */
-	private $inner;
+    /** @var Result */
+    private $inner;
 
-	public function __construct(Result $inner) {
-		$this->inner = $inner;
-	}
+    public function __construct(Result $inner) {
+        $this->inner = $inner;
+    }
 
-	public function closeCursor(): bool {
-		$this->inner->free();
+    public function closeCursor(): bool {
+        $this->inner->free();
 
-		return true;
-	}
+        return true;
+    }
 
-	public function fetch(int $fetchMode = PDO::FETCH_ASSOC) {
-		return $this->inner->fetch($fetchMode);
-	}
+    public function fetch(int $fetchMode = PDO::FETCH_ASSOC) {
+        return $this->inner->fetch($fetchMode);
+    }
 
-	public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array {
-		if ($fetchMode !== PDO::FETCH_ASSOC && $fetchMode !== PDO::FETCH_NUM && $fetchMode !== PDO::FETCH_COLUMN) {
-			throw new \Exception('Fetch mode needs to be assoc, num or column.');
-		}
-		return $this->inner->fetchAll($fetchMode);
-	}
+    public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array {
+        if ($fetchMode !== PDO::FETCH_ASSOC && $fetchMode !== PDO::FETCH_NUM && $fetchMode !== PDO::FETCH_COLUMN) {
+            throw new \Exception('Fetch mode needs to be assoc, num or column.');
+        }
+        return $this->inner->fetchAll($fetchMode);
+    }
 
-	public function fetchColumn($columnIndex = 0) {
-		return $this->inner->fetchOne();
-	}
+    public function fetchColumn($columnIndex = 0) {
+        return $this->inner->fetchOne();
+    }
 
-	public function fetchOne() {
-		return $this->inner->fetchOne();
-	}
+    public function fetchOne() {
+        return $this->inner->fetchOne();
+    }
 
-	public function rowCount(): int {
-		return $this->inner->rowCount();
-	}
+    public function rowCount(): int {
+        return $this->inner->rowCount();
+    }
 }

lib/private/DB/SQLiteMigrator.php

Indentation +20 added lines, -20 removed lines

@@ -32,26 +32,26 @@
 
 class SQLiteMigrator 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('tinyint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('varchar ', '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('tinyint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('varchar ', 'string');
 
-		// with sqlite autoincrement columns is of type integer
-		foreach ($targetSchema->getTables() as $table) {
-			foreach ($table->getColumns() as $column) {
-				if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
-					$column->setType(Type::getType('integer'));
-				}
-			}
-		}
+        // with sqlite autoincrement columns is of type integer
+        foreach ($targetSchema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
+                    $column->setType(Type::getType('integer'));
+                }
+            }
+        }
 
-		return parent::getDiff($targetSchema, $connection);
-	}
+        return parent::getDiff($targetSchema, $connection);
+    }
 }

lib/private/DB/MigrationService.php

Indentation +579 added lines, -579 removed lines

@@ -47,583 +47,583 @@
 
 class MigrationService {
 
-	/** @var boolean */
-	private $migrationTableCreated;
-	/** @var array */
-	private $migrations;
-	/** @var IOutput */
-	private $output;
-	/** @var Connection */
-	private $connection;
-	/** @var string */
-	private $appName;
-	/** @var bool */
-	private $checkOracle;
-
-	/**
-	 * MigrationService constructor.
-	 *
-	 * @param $appName
-	 * @param Connection $connection
-	 * @param AppLocator $appLocator
-	 * @param IOutput|null $output
-	 * @throws \Exception
-	 */
-	public function __construct($appName, Connection $connection, IOutput $output = null, AppLocator $appLocator = null) {
-		$this->appName = $appName;
-		$this->connection = $connection;
-		$this->output = $output;
-		if (null === $this->output) {
-			$this->output = new SimpleOutput(\OC::$server->getLogger(), $appName);
-		}
-
-		if ($appName === 'core') {
-			$this->migrationsPath = \OC::$SERVERROOT . '/core/Migrations';
-			$this->migrationsNamespace = 'OC\\Core\\Migrations';
-			$this->checkOracle = true;
-		} else {
-			if (null === $appLocator) {
-				$appLocator = new AppLocator();
-			}
-			$appPath = $appLocator->getAppPath($appName);
-			$namespace = App::buildAppNamespace($appName);
-			$this->migrationsPath = "$appPath/lib/Migration";
-			$this->migrationsNamespace = $namespace . '\\Migration';
-
-			$infoParser = new InfoParser();
-			$info = $infoParser->parse($appPath . '/appinfo/info.xml');
-			if (!isset($info['dependencies']['database'])) {
-				$this->checkOracle = true;
-			} else {
-				$this->checkOracle = false;
-				foreach ($info['dependencies']['database'] as $database) {
-					if (\is_string($database) && $database === 'oci') {
-						$this->checkOracle = true;
-					} elseif (\is_array($database) && isset($database['@value']) && $database['@value'] === 'oci') {
-						$this->checkOracle = true;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the name of the app for which this migration is executed
-	 *
-	 * @return string
-	 */
-	public function getApp() {
-		return $this->appName;
-	}
-
-	/**
-	 * @return bool
-	 * @codeCoverageIgnore - this will implicitly tested on installation
-	 */
-	private function createMigrationTable() {
-		if ($this->migrationTableCreated) {
-			return false;
-		}
-
-		if ($this->connection->tableExists('migrations') && \OC::$server->getConfig()->getAppValue('core', 'vendor', '') !== 'owncloud') {
-			$this->migrationTableCreated = true;
-			return false;
-		}
-
-		$schema = new SchemaWrapper($this->connection);
-
-		/**
-		 * We drop the table when it has different columns or the definition does not
-		 * match. E.g. ownCloud uses a length of 177 for app and 14 for version.
-		 */
-		try {
-			$table = $schema->getTable('migrations');
-			$columns = $table->getColumns();
-
-			if (count($columns) === 2) {
-				try {
-					$column = $table->getColumn('app');
-					$schemaMismatch = $column->getLength() !== 255;
-
-					if (!$schemaMismatch) {
-						$column = $table->getColumn('version');
-						$schemaMismatch = $column->getLength() !== 255;
-					}
-				} catch (SchemaException $e) {
-					// One of the columns is missing
-					$schemaMismatch = true;
-				}
-
-				if (!$schemaMismatch) {
-					// Table exists and schema matches: return back!
-					$this->migrationTableCreated = true;
-					return false;
-				}
-			}
-
-			// Drop the table, when it didn't match our expectations.
-			$this->connection->dropTable('migrations');
-
-			// Recreate the schema after the table was dropped.
-			$schema = new SchemaWrapper($this->connection);
-		} catch (SchemaException $e) {
-			// Table not found, no need to panic, we will create it.
-		}
-
-		$table = $schema->createTable('migrations');
-		$table->addColumn('app', Types::STRING, ['length' => 255]);
-		$table->addColumn('version', Types::STRING, ['length' => 255]);
-		$table->setPrimaryKey(['app', 'version']);
-
-		$this->connection->migrateToSchema($schema->getWrappedSchema());
-
-		$this->migrationTableCreated = true;
-
-		return true;
-	}
-
-	/**
-	 * Returns all versions which have already been applied
-	 *
-	 * @return string[]
-	 * @codeCoverageIgnore - no need to test this
-	 */
-	public function getMigratedVersions() {
-		$this->createMigrationTable();
-		$qb = $this->connection->getQueryBuilder();
-
-		$qb->select('version')
-			->from('migrations')
-			->where($qb->expr()->eq('app', $qb->createNamedParameter($this->getApp())))
-			->orderBy('version');
-
-		$result = $qb->execute();
-		$rows = $result->fetchAll(\PDO::FETCH_COLUMN);
-		$result->closeCursor();
-
-		return $rows;
-	}
-
-	/**
-	 * Returns all versions which are available in the migration folder
-	 *
-	 * @return array
-	 */
-	public function getAvailableVersions() {
-		$this->ensureMigrationsAreLoaded();
-		return array_map('strval', array_keys($this->migrations));
-	}
-
-	protected function findMigrations() {
-		$directory = realpath($this->migrationsPath);
-		if ($directory === false || !file_exists($directory) || !is_dir($directory)) {
-			return [];
-		}
-
-		$iterator = new \RegexIterator(
-			new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS),
-				\RecursiveIteratorIterator::LEAVES_ONLY
-			),
-			'#^.+\\/Version[^\\/]{1,255}\\.php$#i',
-			\RegexIterator::GET_MATCH);
-
-		$files = array_keys(iterator_to_array($iterator));
-		uasort($files, function ($a, $b) {
-			preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($a), $matchA);
-			preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($b), $matchB);
-			if (!empty($matchA) && !empty($matchB)) {
-				if ($matchA[1] !== $matchB[1]) {
-					return ($matchA[1] < $matchB[1]) ? -1 : 1;
-				}
-				return ($matchA[2] < $matchB[2]) ? -1 : 1;
-			}
-			return (basename($a) < basename($b)) ? -1 : 1;
-		});
-
-		$migrations = [];
-
-		foreach ($files as $file) {
-			$className = basename($file, '.php');
-			$version = (string) substr($className, 7);
-			if ($version === '0') {
-				throw new \InvalidArgumentException(
-					"Cannot load a migrations with the name '$version' because it is a reserved number"
-				);
-			}
-			$migrations[$version] = sprintf('%s\\%s', $this->migrationsNamespace, $className);
-		}
-
-		return $migrations;
-	}
-
-	/**
-	 * @param string $to
-	 * @return string[]
-	 */
-	private function getMigrationsToExecute($to) {
-		$knownMigrations = $this->getMigratedVersions();
-		$availableMigrations = $this->getAvailableVersions();
-
-		$toBeExecuted = [];
-		foreach ($availableMigrations as $v) {
-			if ($to !== 'latest' && $v > $to) {
-				continue;
-			}
-			if ($this->shallBeExecuted($v, $knownMigrations)) {
-				$toBeExecuted[] = $v;
-			}
-		}
-
-		return $toBeExecuted;
-	}
-
-	/**
-	 * @param string $m
-	 * @param string[] $knownMigrations
-	 * @return bool
-	 */
-	private function shallBeExecuted($m, $knownMigrations) {
-		if (in_array($m, $knownMigrations)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param string $version
-	 */
-	private function markAsExecuted($version) {
-		$this->connection->insertIfNotExist('*PREFIX*migrations', [
-			'app' => $this->appName,
-			'version' => $version
-		]);
-	}
-
-	/**
-	 * Returns the name of the table which holds the already applied versions
-	 *
-	 * @return string
-	 */
-	public function getMigrationsTableName() {
-		return $this->connection->getPrefix() . 'migrations';
-	}
-
-	/**
-	 * Returns the namespace of the version classes
-	 *
-	 * @return string
-	 */
-	public function getMigrationsNamespace() {
-		return $this->migrationsNamespace;
-	}
-
-	/**
-	 * Returns the directory which holds the versions
-	 *
-	 * @return string
-	 */
-	public function getMigrationsDirectory() {
-		return $this->migrationsPath;
-	}
-
-	/**
-	 * Return the explicit version for the aliases; current, next, prev, latest
-	 *
-	 * @param string $alias
-	 * @return mixed|null|string
-	 */
-	public function getMigration($alias) {
-		switch ($alias) {
-			case 'current':
-				return $this->getCurrentVersion();
-			case 'next':
-				return $this->getRelativeVersion($this->getCurrentVersion(), 1);
-			case 'prev':
-				return $this->getRelativeVersion($this->getCurrentVersion(), -1);
-			case 'latest':
-				$this->ensureMigrationsAreLoaded();
-
-				$migrations = $this->getAvailableVersions();
-				return @end($migrations);
-		}
-		return '0';
-	}
-
-	/**
-	 * @param string $version
-	 * @param int $delta
-	 * @return null|string
-	 */
-	private function getRelativeVersion($version, $delta) {
-		$this->ensureMigrationsAreLoaded();
-
-		$versions = $this->getAvailableVersions();
-		array_unshift($versions, 0);
-		$offset = array_search($version, $versions, true);
-		if ($offset === false || !isset($versions[$offset + $delta])) {
-			// Unknown version or delta out of bounds.
-			return null;
-		}
-
-		return (string) $versions[$offset + $delta];
-	}
-
-	/**
-	 * @return string
-	 */
-	private function getCurrentVersion() {
-		$m = $this->getMigratedVersions();
-		if (count($m) === 0) {
-			return '0';
-		}
-		$migrations = array_values($m);
-		return @end($migrations);
-	}
-
-	/**
-	 * @param string $version
-	 * @return string
-	 * @throws \InvalidArgumentException
-	 */
-	private function getClass($version) {
-		$this->ensureMigrationsAreLoaded();
-
-		if (isset($this->migrations[$version])) {
-			return $this->migrations[$version];
-		}
-
-		throw new \InvalidArgumentException("Version $version is unknown.");
-	}
-
-	/**
-	 * Allows to set an IOutput implementation which is used for logging progress and messages
-	 *
-	 * @param IOutput $output
-	 */
-	public function setOutput(IOutput $output) {
-		$this->output = $output;
-	}
-
-	/**
-	 * Applies all not yet applied versions up to $to
-	 *
-	 * @param string $to
-	 * @param bool $schemaOnly
-	 * @throws \InvalidArgumentException
-	 */
-	public function migrate($to = 'latest', $schemaOnly = false) {
-		if ($schemaOnly) {
-			$this->migrateSchemaOnly($to);
-			return;
-		}
-
-		// read known migrations
-		$toBeExecuted = $this->getMigrationsToExecute($to);
-		foreach ($toBeExecuted as $version) {
-			try {
-				$this->executeStep($version, $schemaOnly);
-			} catch (DriverException $e) {
-				// The exception itself does not contain the name of the migration,
-				// so we wrap it here, to make debugging easier.
-				throw new \Exception('Database error when running migration ' . $to . ' for app ' . $this->getApp(), 0, $e);
-			}
-		}
-	}
-
-	/**
-	 * Applies all not yet applied versions up to $to
-	 *
-	 * @param string $to
-	 * @throws \InvalidArgumentException
-	 */
-	public function migrateSchemaOnly($to = 'latest') {
-		// read known migrations
-		$toBeExecuted = $this->getMigrationsToExecute($to);
-
-		if (empty($toBeExecuted)) {
-			return;
-		}
-
-		$toSchema = null;
-		foreach ($toBeExecuted as $version) {
-			$instance = $this->createInstance($version);
-
-			$toSchema = $instance->changeSchema($this->output, function () use ($toSchema) {
-				return $toSchema ?: new SchemaWrapper($this->connection);
-			}, ['tablePrefix' => $this->connection->getPrefix()]) ?: $toSchema;
-
-			$this->markAsExecuted($version);
-		}
-
-		if ($toSchema instanceof SchemaWrapper) {
-			$targetSchema = $toSchema->getWrappedSchema();
-			if ($this->checkOracle) {
-				$beforeSchema = $this->connection->createSchema();
-				$this->ensureOracleIdentifierLengthLimit($beforeSchema, $targetSchema, strlen($this->connection->getPrefix()));
-			}
-			$this->connection->migrateToSchema($targetSchema);
-			$toSchema->performDropTableCalls();
-		}
-	}
-
-	/**
-	 * Get the human readable descriptions for the migration steps to run
-	 *
-	 * @param string $to
-	 * @return string[] [$name => $description]
-	 */
-	public function describeMigrationStep($to = 'latest') {
-		$toBeExecuted = $this->getMigrationsToExecute($to);
-		$description = [];
-		foreach ($toBeExecuted as $version) {
-			$migration = $this->createInstance($version);
-			if ($migration->name()) {
-				$description[$migration->name()] = $migration->description();
-			}
-		}
-		return $description;
-	}
-
-	/**
-	 * @param string $version
-	 * @return IMigrationStep
-	 * @throws \InvalidArgumentException
-	 */
-	protected function createInstance($version) {
-		$class = $this->getClass($version);
-		try {
-			$s = \OC::$server->query($class);
-
-			if (!$s instanceof IMigrationStep) {
-				throw new \InvalidArgumentException('Not a valid migration');
-			}
-		} catch (QueryException $e) {
-			if (class_exists($class)) {
-				$s = new $class();
-			} else {
-				throw new \InvalidArgumentException("Migration step '$class' is unknown");
-			}
-		}
-
-		return $s;
-	}
-
-	/**
-	 * Executes one explicit version
-	 *
-	 * @param string $version
-	 * @param bool $schemaOnly
-	 * @throws \InvalidArgumentException
-	 */
-	public function executeStep($version, $schemaOnly = false) {
-		$instance = $this->createInstance($version);
-
-		if (!$schemaOnly) {
-			$instance->preSchemaChange($this->output, function () {
-				return new SchemaWrapper($this->connection);
-			}, ['tablePrefix' => $this->connection->getPrefix()]);
-		}
-
-		$toSchema = $instance->changeSchema($this->output, function () {
-			return new SchemaWrapper($this->connection);
-		}, ['tablePrefix' => $this->connection->getPrefix()]);
-
-		if ($toSchema instanceof SchemaWrapper) {
-			$targetSchema = $toSchema->getWrappedSchema();
-			if ($this->checkOracle) {
-				$sourceSchema = $this->connection->createSchema();
-				$this->ensureOracleIdentifierLengthLimit($sourceSchema, $targetSchema, strlen($this->connection->getPrefix()));
-			}
-			$this->connection->migrateToSchema($targetSchema);
-			$toSchema->performDropTableCalls();
-		}
-
-		if (!$schemaOnly) {
-			$instance->postSchemaChange($this->output, function () {
-				return new SchemaWrapper($this->connection);
-			}, ['tablePrefix' => $this->connection->getPrefix()]);
-		}
-
-		$this->markAsExecuted($version);
-	}
-
-	public function ensureOracleIdentifierLengthLimit(Schema $sourceSchema, Schema $targetSchema, int $prefixLength) {
-		$sequences = $targetSchema->getSequences();
-
-		foreach ($targetSchema->getTables() as $table) {
-			try {
-				$sourceTable = $sourceSchema->getTable($table->getName());
-			} catch (SchemaException $e) {
-				if (\strlen($table->getName()) - $prefixLength > 27) {
-					throw new \InvalidArgumentException('Table name "'  . $table->getName() . '" is too long.');
-				}
-				$sourceTable = null;
-			}
-
-			foreach ($table->getColumns() as $thing) {
-				if ((!$sourceTable instanceof Table || !$sourceTable->hasColumn($thing->getName())) && \strlen($thing->getName()) > 30) {
-					throw new \InvalidArgumentException('Column name "'  . $table->getName() . '"."' . $thing->getName() . '" is too long.');
-				}
-
-				if ($thing->getNotnull() && $thing->getDefault() === ''
-					&& $sourceTable instanceof Table && !$sourceTable->hasColumn($thing->getName())) {
-					throw new \InvalidArgumentException('Column name "'  . $table->getName() . '"."' . $thing->getName() . '" is NotNull, but has empty string or null as default.');
-				}
-			}
-
-			foreach ($table->getIndexes() as $thing) {
-				if ((!$sourceTable instanceof Table || !$sourceTable->hasIndex($thing->getName())) && \strlen($thing->getName()) > 30) {
-					throw new \InvalidArgumentException('Index name "'  . $table->getName() . '"."' . $thing->getName() . '" is too long.');
-				}
-			}
-
-			foreach ($table->getForeignKeys() as $thing) {
-				if ((!$sourceTable instanceof Table || !$sourceTable->hasForeignKey($thing->getName())) && \strlen($thing->getName()) > 30) {
-					throw new \InvalidArgumentException('Foreign key name "'  . $table->getName() . '"."' . $thing->getName() . '" is too long.');
-				}
-			}
-
-			$primaryKey = $table->getPrimaryKey();
-			if ($primaryKey instanceof Index && (!$sourceTable instanceof Table || !$sourceTable->hasPrimaryKey())) {
-				$indexName = strtolower($primaryKey->getName());
-				$isUsingDefaultName = $indexName === 'primary';
-
-				if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) {
-					$defaultName = $table->getName() . '_pkey';
-					$isUsingDefaultName = strtolower($defaultName) === $indexName;
-
-					if ($isUsingDefaultName) {
-						$sequenceName = $table->getName() . '_' . implode('_', $primaryKey->getColumns()) . '_seq';
-						$sequences = array_filter($sequences, function (Sequence $sequence) use ($sequenceName) {
-							return $sequence->getName() !== $sequenceName;
-						});
-					}
-				} elseif ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
-					$defaultName = $table->getName() . '_seq';
-					$isUsingDefaultName = strtolower($defaultName) === $indexName;
-				}
-
-				if (!$isUsingDefaultName && \strlen($indexName) > 30) {
-					throw new \InvalidArgumentException('Primary index name  on "'  . $table->getName() . '" is too long.');
-				}
-				if ($isUsingDefaultName && \strlen($table->getName()) - $prefixLength >= 23) {
-					throw new \InvalidArgumentException('Primary index name  on "'  . $table->getName() . '" is too long.');
-				}
-			}
-		}
-
-		foreach ($sequences as $sequence) {
-			if (!$sourceSchema->hasSequence($sequence->getName()) && \strlen($sequence->getName()) > 30) {
-				throw new \InvalidArgumentException('Sequence name "'  . $sequence->getName() . '" is too long.');
-			}
-		}
-	}
-
-	private function ensureMigrationsAreLoaded() {
-		if (empty($this->migrations)) {
-			$this->migrations = $this->findMigrations();
-		}
-	}
+    /** @var boolean */
+    private $migrationTableCreated;
+    /** @var array */
+    private $migrations;
+    /** @var IOutput */
+    private $output;
+    /** @var Connection */
+    private $connection;
+    /** @var string */
+    private $appName;
+    /** @var bool */
+    private $checkOracle;
+
+    /**
+     * MigrationService constructor.
+     *
+     * @param $appName
+     * @param Connection $connection
+     * @param AppLocator $appLocator
+     * @param IOutput|null $output
+     * @throws \Exception
+     */
+    public function __construct($appName, Connection $connection, IOutput $output = null, AppLocator $appLocator = null) {
+        $this->appName = $appName;
+        $this->connection = $connection;
+        $this->output = $output;
+        if (null === $this->output) {
+            $this->output = new SimpleOutput(\OC::$server->getLogger(), $appName);
+        }
+
+        if ($appName === 'core') {
+            $this->migrationsPath = \OC::$SERVERROOT . '/core/Migrations';
+            $this->migrationsNamespace = 'OC\\Core\\Migrations';
+            $this->checkOracle = true;
+        } else {
+            if (null === $appLocator) {
+                $appLocator = new AppLocator();
+            }
+            $appPath = $appLocator->getAppPath($appName);
+            $namespace = App::buildAppNamespace($appName);
+            $this->migrationsPath = "$appPath/lib/Migration";
+            $this->migrationsNamespace = $namespace . '\\Migration';
+
+            $infoParser = new InfoParser();
+            $info = $infoParser->parse($appPath . '/appinfo/info.xml');
+            if (!isset($info['dependencies']['database'])) {
+                $this->checkOracle = true;
+            } else {
+                $this->checkOracle = false;
+                foreach ($info['dependencies']['database'] as $database) {
+                    if (\is_string($database) && $database === 'oci') {
+                        $this->checkOracle = true;
+                    } elseif (\is_array($database) && isset($database['@value']) && $database['@value'] === 'oci') {
+                        $this->checkOracle = true;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns the name of the app for which this migration is executed
+     *
+     * @return string
+     */
+    public function getApp() {
+        return $this->appName;
+    }
+
+    /**
+     * @return bool
+     * @codeCoverageIgnore - this will implicitly tested on installation
+     */
+    private function createMigrationTable() {
+        if ($this->migrationTableCreated) {
+            return false;
+        }
+
+        if ($this->connection->tableExists('migrations') && \OC::$server->getConfig()->getAppValue('core', 'vendor', '') !== 'owncloud') {
+            $this->migrationTableCreated = true;
+            return false;
+        }
+
+        $schema = new SchemaWrapper($this->connection);
+
+        /**
+         * We drop the table when it has different columns or the definition does not
+         * match. E.g. ownCloud uses a length of 177 for app and 14 for version.
+         */
+        try {
+            $table = $schema->getTable('migrations');
+            $columns = $table->getColumns();
+
+            if (count($columns) === 2) {
+                try {
+                    $column = $table->getColumn('app');
+                    $schemaMismatch = $column->getLength() !== 255;
+
+                    if (!$schemaMismatch) {
+                        $column = $table->getColumn('version');
+                        $schemaMismatch = $column->getLength() !== 255;
+                    }
+                } catch (SchemaException $e) {
+                    // One of the columns is missing
+                    $schemaMismatch = true;
+                }
+
+                if (!$schemaMismatch) {
+                    // Table exists and schema matches: return back!
+                    $this->migrationTableCreated = true;
+                    return false;
+                }
+            }
+
+            // Drop the table, when it didn't match our expectations.
+            $this->connection->dropTable('migrations');
+
+            // Recreate the schema after the table was dropped.
+            $schema = new SchemaWrapper($this->connection);
+        } catch (SchemaException $e) {
+            // Table not found, no need to panic, we will create it.
+        }
+
+        $table = $schema->createTable('migrations');
+        $table->addColumn('app', Types::STRING, ['length' => 255]);
+        $table->addColumn('version', Types::STRING, ['length' => 255]);
+        $table->setPrimaryKey(['app', 'version']);
+
+        $this->connection->migrateToSchema($schema->getWrappedSchema());
+
+        $this->migrationTableCreated = true;
+
+        return true;
+    }
+
+    /**
+     * Returns all versions which have already been applied
+     *
+     * @return string[]
+     * @codeCoverageIgnore - no need to test this
+     */
+    public function getMigratedVersions() {
+        $this->createMigrationTable();
+        $qb = $this->connection->getQueryBuilder();
+
+        $qb->select('version')
+            ->from('migrations')
+            ->where($qb->expr()->eq('app', $qb->createNamedParameter($this->getApp())))
+            ->orderBy('version');
+
+        $result = $qb->execute();
+        $rows = $result->fetchAll(\PDO::FETCH_COLUMN);
+        $result->closeCursor();
+
+        return $rows;
+    }
+
+    /**
+     * Returns all versions which are available in the migration folder
+     *
+     * @return array
+     */
+    public function getAvailableVersions() {
+        $this->ensureMigrationsAreLoaded();
+        return array_map('strval', array_keys($this->migrations));
+    }
+
+    protected function findMigrations() {
+        $directory = realpath($this->migrationsPath);
+        if ($directory === false || !file_exists($directory) || !is_dir($directory)) {
+            return [];
+        }
+
+        $iterator = new \RegexIterator(
+            new \RecursiveIteratorIterator(
+                new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS),
+                \RecursiveIteratorIterator::LEAVES_ONLY
+            ),
+            '#^.+\\/Version[^\\/]{1,255}\\.php$#i',
+            \RegexIterator::GET_MATCH);
+
+        $files = array_keys(iterator_to_array($iterator));
+        uasort($files, function ($a, $b) {
+            preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($a), $matchA);
+            preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($b), $matchB);
+            if (!empty($matchA) && !empty($matchB)) {
+                if ($matchA[1] !== $matchB[1]) {
+                    return ($matchA[1] < $matchB[1]) ? -1 : 1;
+                }
+                return ($matchA[2] < $matchB[2]) ? -1 : 1;
+            }
+            return (basename($a) < basename($b)) ? -1 : 1;
+        });
+
+        $migrations = [];
+
+        foreach ($files as $file) {
+            $className = basename($file, '.php');
+            $version = (string) substr($className, 7);
+            if ($version === '0') {
+                throw new \InvalidArgumentException(
+                    "Cannot load a migrations with the name '$version' because it is a reserved number"
+                );
+            }
+            $migrations[$version] = sprintf('%s\\%s', $this->migrationsNamespace, $className);
+        }
+
+        return $migrations;
+    }
+
+    /**
+     * @param string $to
+     * @return string[]
+     */
+    private function getMigrationsToExecute($to) {
+        $knownMigrations = $this->getMigratedVersions();
+        $availableMigrations = $this->getAvailableVersions();
+
+        $toBeExecuted = [];
+        foreach ($availableMigrations as $v) {
+            if ($to !== 'latest' && $v > $to) {
+                continue;
+            }
+            if ($this->shallBeExecuted($v, $knownMigrations)) {
+                $toBeExecuted[] = $v;
+            }
+        }
+
+        return $toBeExecuted;
+    }
+
+    /**
+     * @param string $m
+     * @param string[] $knownMigrations
+     * @return bool
+     */
+    private function shallBeExecuted($m, $knownMigrations) {
+        if (in_array($m, $knownMigrations)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $version
+     */
+    private function markAsExecuted($version) {
+        $this->connection->insertIfNotExist('*PREFIX*migrations', [
+            'app' => $this->appName,
+            'version' => $version
+        ]);
+    }
+
+    /**
+     * Returns the name of the table which holds the already applied versions
+     *
+     * @return string
+     */
+    public function getMigrationsTableName() {
+        return $this->connection->getPrefix() . 'migrations';
+    }
+
+    /**
+     * Returns the namespace of the version classes
+     *
+     * @return string
+     */
+    public function getMigrationsNamespace() {
+        return $this->migrationsNamespace;
+    }
+
+    /**
+     * Returns the directory which holds the versions
+     *
+     * @return string
+     */
+    public function getMigrationsDirectory() {
+        return $this->migrationsPath;
+    }
+
+    /**
+     * Return the explicit version for the aliases; current, next, prev, latest
+     *
+     * @param string $alias
+     * @return mixed|null|string
+     */
+    public function getMigration($alias) {
+        switch ($alias) {
+            case 'current':
+                return $this->getCurrentVersion();
+            case 'next':
+                return $this->getRelativeVersion($this->getCurrentVersion(), 1);
+            case 'prev':
+                return $this->getRelativeVersion($this->getCurrentVersion(), -1);
+            case 'latest':
+                $this->ensureMigrationsAreLoaded();
+
+                $migrations = $this->getAvailableVersions();
+                return @end($migrations);
+        }
+        return '0';
+    }
+
+    /**
+     * @param string $version
+     * @param int $delta
+     * @return null|string
+     */
+    private function getRelativeVersion($version, $delta) {
+        $this->ensureMigrationsAreLoaded();
+
+        $versions = $this->getAvailableVersions();
+        array_unshift($versions, 0);
+        $offset = array_search($version, $versions, true);
+        if ($offset === false || !isset($versions[$offset + $delta])) {
+            // Unknown version or delta out of bounds.
+            return null;
+        }
+
+        return (string) $versions[$offset + $delta];
+    }
+
+    /**
+     * @return string
+     */
+    private function getCurrentVersion() {
+        $m = $this->getMigratedVersions();
+        if (count($m) === 0) {
+            return '0';
+        }
+        $migrations = array_values($m);
+        return @end($migrations);
+    }
+
+    /**
+     * @param string $version
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    private function getClass($version) {
+        $this->ensureMigrationsAreLoaded();
+
+        if (isset($this->migrations[$version])) {
+            return $this->migrations[$version];
+        }
+
+        throw new \InvalidArgumentException("Version $version is unknown.");
+    }
+
+    /**
+     * Allows to set an IOutput implementation which is used for logging progress and messages
+     *
+     * @param IOutput $output
+     */
+    public function setOutput(IOutput $output) {
+        $this->output = $output;
+    }
+
+    /**
+     * Applies all not yet applied versions up to $to
+     *
+     * @param string $to
+     * @param bool $schemaOnly
+     * @throws \InvalidArgumentException
+     */
+    public function migrate($to = 'latest', $schemaOnly = false) {
+        if ($schemaOnly) {
+            $this->migrateSchemaOnly($to);
+            return;
+        }
+
+        // read known migrations
+        $toBeExecuted = $this->getMigrationsToExecute($to);
+        foreach ($toBeExecuted as $version) {
+            try {
+                $this->executeStep($version, $schemaOnly);
+            } catch (DriverException $e) {
+                // The exception itself does not contain the name of the migration,
+                // so we wrap it here, to make debugging easier.
+                throw new \Exception('Database error when running migration ' . $to . ' for app ' . $this->getApp(), 0, $e);
+            }
+        }
+    }
+
+    /**
+     * Applies all not yet applied versions up to $to
+     *
+     * @param string $to
+     * @throws \InvalidArgumentException
+     */
+    public function migrateSchemaOnly($to = 'latest') {
+        // read known migrations
+        $toBeExecuted = $this->getMigrationsToExecute($to);
+
+        if (empty($toBeExecuted)) {
+            return;
+        }
+
+        $toSchema = null;
+        foreach ($toBeExecuted as $version) {
+            $instance = $this->createInstance($version);
+
+            $toSchema = $instance->changeSchema($this->output, function () use ($toSchema) {
+                return $toSchema ?: new SchemaWrapper($this->connection);
+            }, ['tablePrefix' => $this->connection->getPrefix()]) ?: $toSchema;
+
+            $this->markAsExecuted($version);
+        }
+
+        if ($toSchema instanceof SchemaWrapper) {
+            $targetSchema = $toSchema->getWrappedSchema();
+            if ($this->checkOracle) {
+                $beforeSchema = $this->connection->createSchema();
+                $this->ensureOracleIdentifierLengthLimit($beforeSchema, $targetSchema, strlen($this->connection->getPrefix()));
+            }
+            $this->connection->migrateToSchema($targetSchema);
+            $toSchema->performDropTableCalls();
+        }
+    }
+
+    /**
+     * Get the human readable descriptions for the migration steps to run
+     *
+     * @param string $to
+     * @return string[] [$name => $description]
+     */
+    public function describeMigrationStep($to = 'latest') {
+        $toBeExecuted = $this->getMigrationsToExecute($to);
+        $description = [];
+        foreach ($toBeExecuted as $version) {
+            $migration = $this->createInstance($version);
+            if ($migration->name()) {
+                $description[$migration->name()] = $migration->description();
+            }
+        }
+        return $description;
+    }
+
+    /**
+     * @param string $version
+     * @return IMigrationStep
+     * @throws \InvalidArgumentException
+     */
+    protected function createInstance($version) {
+        $class = $this->getClass($version);
+        try {
+            $s = \OC::$server->query($class);
+
+            if (!$s instanceof IMigrationStep) {
+                throw new \InvalidArgumentException('Not a valid migration');
+            }
+        } catch (QueryException $e) {
+            if (class_exists($class)) {
+                $s = new $class();
+            } else {
+                throw new \InvalidArgumentException("Migration step '$class' is unknown");
+            }
+        }
+
+        return $s;
+    }
+
+    /**
+     * Executes one explicit version
+     *
+     * @param string $version
+     * @param bool $schemaOnly
+     * @throws \InvalidArgumentException
+     */
+    public function executeStep($version, $schemaOnly = false) {
+        $instance = $this->createInstance($version);
+
+        if (!$schemaOnly) {
+            $instance->preSchemaChange($this->output, function () {
+                return new SchemaWrapper($this->connection);
+            }, ['tablePrefix' => $this->connection->getPrefix()]);
+        }
+
+        $toSchema = $instance->changeSchema($this->output, function () {
+            return new SchemaWrapper($this->connection);
+        }, ['tablePrefix' => $this->connection->getPrefix()]);
+
+        if ($toSchema instanceof SchemaWrapper) {
+            $targetSchema = $toSchema->getWrappedSchema();
+            if ($this->checkOracle) {
+                $sourceSchema = $this->connection->createSchema();
+                $this->ensureOracleIdentifierLengthLimit($sourceSchema, $targetSchema, strlen($this->connection->getPrefix()));
+            }
+            $this->connection->migrateToSchema($targetSchema);
+            $toSchema->performDropTableCalls();
+        }
+
+        if (!$schemaOnly) {
+            $instance->postSchemaChange($this->output, function () {
+                return new SchemaWrapper($this->connection);
+            }, ['tablePrefix' => $this->connection->getPrefix()]);
+        }
+
+        $this->markAsExecuted($version);
+    }
+
+    public function ensureOracleIdentifierLengthLimit(Schema $sourceSchema, Schema $targetSchema, int $prefixLength) {
+        $sequences = $targetSchema->getSequences();
+
+        foreach ($targetSchema->getTables() as $table) {
+            try {
+                $sourceTable = $sourceSchema->getTable($table->getName());
+            } catch (SchemaException $e) {
+                if (\strlen($table->getName()) - $prefixLength > 27) {
+                    throw new \InvalidArgumentException('Table name "'  . $table->getName() . '" is too long.');
+                }
+                $sourceTable = null;
+            }
+
+            foreach ($table->getColumns() as $thing) {
+                if ((!$sourceTable instanceof Table || !$sourceTable->hasColumn($thing->getName())) && \strlen($thing->getName()) > 30) {
+                    throw new \InvalidArgumentException('Column name "'  . $table->getName() . '"."' . $thing->getName() . '" is too long.');
+                }
+
+                if ($thing->getNotnull() && $thing->getDefault() === ''
+                    && $sourceTable instanceof Table && !$sourceTable->hasColumn($thing->getName())) {
+                    throw new \InvalidArgumentException('Column name "'  . $table->getName() . '"."' . $thing->getName() . '" is NotNull, but has empty string or null as default.');
+                }
+            }
+
+            foreach ($table->getIndexes() as $thing) {
+                if ((!$sourceTable instanceof Table || !$sourceTable->hasIndex($thing->getName())) && \strlen($thing->getName()) > 30) {
+                    throw new \InvalidArgumentException('Index name "'  . $table->getName() . '"."' . $thing->getName() . '" is too long.');
+                }
+            }
+
+            foreach ($table->getForeignKeys() as $thing) {
+                if ((!$sourceTable instanceof Table || !$sourceTable->hasForeignKey($thing->getName())) && \strlen($thing->getName()) > 30) {
+                    throw new \InvalidArgumentException('Foreign key name "'  . $table->getName() . '"."' . $thing->getName() . '" is too long.');
+                }
+            }
+
+            $primaryKey = $table->getPrimaryKey();
+            if ($primaryKey instanceof Index && (!$sourceTable instanceof Table || !$sourceTable->hasPrimaryKey())) {
+                $indexName = strtolower($primaryKey->getName());
+                $isUsingDefaultName = $indexName === 'primary';
+
+                if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) {
+                    $defaultName = $table->getName() . '_pkey';
+                    $isUsingDefaultName = strtolower($defaultName) === $indexName;
+
+                    if ($isUsingDefaultName) {
+                        $sequenceName = $table->getName() . '_' . implode('_', $primaryKey->getColumns()) . '_seq';
+                        $sequences = array_filter($sequences, function (Sequence $sequence) use ($sequenceName) {
+                            return $sequence->getName() !== $sequenceName;
+                        });
+                    }
+                } elseif ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
+                    $defaultName = $table->getName() . '_seq';
+                    $isUsingDefaultName = strtolower($defaultName) === $indexName;
+                }
+
+                if (!$isUsingDefaultName && \strlen($indexName) > 30) {
+                    throw new \InvalidArgumentException('Primary index name  on "'  . $table->getName() . '" is too long.');
+                }
+                if ($isUsingDefaultName && \strlen($table->getName()) - $prefixLength >= 23) {
+                    throw new \InvalidArgumentException('Primary index name  on "'  . $table->getName() . '" is too long.');
+                }
+            }
+        }
+
+        foreach ($sequences as $sequence) {
+            if (!$sourceSchema->hasSequence($sequence->getName()) && \strlen($sequence->getName()) > 30) {
+                throw new \InvalidArgumentException('Sequence name "'  . $sequence->getName() . '" is too long.');
+            }
+        }
+    }
+
+    private function ensureMigrationsAreLoaded() {
+        if (empty($this->migrations)) {
+            $this->migrations = $this->findMigrations();
+        }
+    }
 }

Spacing +22 added lines, -22 removed lines

@@ -78,7 +78,7 @@ 
 		}
 
 		if ($appName === 'core') {
-			$this->migrationsPath = \OC::$SERVERROOT . '/core/Migrations';
+			$this->migrationsPath = \OC::$SERVERROOT.'/core/Migrations';
 			$this->migrationsNamespace = 'OC\\Core\\Migrations';
 			$this->checkOracle = true;
 		} else {
@@ -88,10 +88,10 @@ 
 			$appPath = $appLocator->getAppPath($appName);
 			$namespace = App::buildAppNamespace($appName);
 			$this->migrationsPath = "$appPath/lib/Migration";
-			$this->migrationsNamespace = $namespace . '\\Migration';
+			$this->migrationsNamespace = $namespace.'\\Migration';
 
 			$infoParser = new InfoParser();
-			$info = $infoParser->parse($appPath . '/appinfo/info.xml');
+			$info = $infoParser->parse($appPath.'/appinfo/info.xml');
 			if (!isset($info['dependencies']['database'])) {
 				$this->checkOracle = true;
 			} else {
@@ -229,7 +229,7 @@ 
 			\RegexIterator::GET_MATCH);
 
 		$files = array_keys(iterator_to_array($iterator));
-		uasort($files, function ($a, $b) {
+		uasort($files, function($a, $b) {
 			preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($a), $matchA);
 			preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($b), $matchB);
 			if (!empty($matchA) && !empty($matchB)) {
@@ -307,7 +307,7 @@ 
 	 * @return string
 	 */
 	public function getMigrationsTableName() {
-		return $this->connection->getPrefix() . 'migrations';
+		return $this->connection->getPrefix().'migrations';
 	}
 
 	/**
@@ -427,7 +427,7 @@ 
 			} catch (DriverException $e) {
 				// The exception itself does not contain the name of the migration,
 				// so we wrap it here, to make debugging easier.
-				throw new \Exception('Database error when running migration ' . $to . ' for app ' . $this->getApp(), 0, $e);
+				throw new \Exception('Database error when running migration '.$to.' for app '.$this->getApp(), 0, $e);
 			}
 		}
 	}
@@ -450,7 +450,7 @@ 
 		foreach ($toBeExecuted as $version) {
 			$instance = $this->createInstance($version);
 
-			$toSchema = $instance->changeSchema($this->output, function () use ($toSchema) {
+			$toSchema = $instance->changeSchema($this->output, function() use ($toSchema) {
 				return $toSchema ?: new SchemaWrapper($this->connection);
 			}, ['tablePrefix' => $this->connection->getPrefix()]) ?: $toSchema;
 
@@ -521,12 +521,12 @@ 
 		$instance = $this->createInstance($version);
 
 		if (!$schemaOnly) {
-			$instance->preSchemaChange($this->output, function () {
+			$instance->preSchemaChange($this->output, function() {
 				return new SchemaWrapper($this->connection);
 			}, ['tablePrefix' => $this->connection->getPrefix()]);
 		}
 
-		$toSchema = $instance->changeSchema($this->output, function () {
+		$toSchema = $instance->changeSchema($this->output, function() {
 			return new SchemaWrapper($this->connection);
 		}, ['tablePrefix' => $this->connection->getPrefix()]);
 
@@ -541,7 +541,7 @@ 
 		}
 
 		if (!$schemaOnly) {
-			$instance->postSchemaChange($this->output, function () {
+			$instance->postSchemaChange($this->output, function() {
 				return new SchemaWrapper($this->connection);
 			}, ['tablePrefix' => $this->connection->getPrefix()]);
 		}
@@ -557,31 +557,31 @@ 
 				$sourceTable = $sourceSchema->getTable($table->getName());
 			} catch (SchemaException $e) {
 				if (\strlen($table->getName()) - $prefixLength > 27) {
-					throw new \InvalidArgumentException('Table name "'  . $table->getName() . '" is too long.');
+					throw new \InvalidArgumentException('Table name "'.$table->getName().'" is too long.');
 				}
 				$sourceTable = null;
 			}
 
 			foreach ($table->getColumns() as $thing) {
 				if ((!$sourceTable instanceof Table || !$sourceTable->hasColumn($thing->getName())) && \strlen($thing->getName()) > 30) {
-					throw new \InvalidArgumentException('Column name "'  . $table->getName() . '"."' . $thing->getName() . '" is too long.');
+					throw new \InvalidArgumentException('Column name "'.$table->getName().'"."'.$thing->getName().'" is too long.');
 				}
 
 				if ($thing->getNotnull() && $thing->getDefault() === ''
 					&& $sourceTable instanceof Table && !$sourceTable->hasColumn($thing->getName())) {
-					throw new \InvalidArgumentException('Column name "'  . $table->getName() . '"."' . $thing->getName() . '" is NotNull, but has empty string or null as default.');
+					throw new \InvalidArgumentException('Column name "'.$table->getName().'"."'.$thing->getName().'" is NotNull, but has empty string or null as default.');
 				}
 			}
 
 			foreach ($table->getIndexes() as $thing) {
 				if ((!$sourceTable instanceof Table || !$sourceTable->hasIndex($thing->getName())) && \strlen($thing->getName()) > 30) {
-					throw new \InvalidArgumentException('Index name "'  . $table->getName() . '"."' . $thing->getName() . '" is too long.');
+					throw new \InvalidArgumentException('Index name "'.$table->getName().'"."'.$thing->getName().'" is too long.');
 				}
 			}
 
 			foreach ($table->getForeignKeys() as $thing) {
 				if ((!$sourceTable instanceof Table || !$sourceTable->hasForeignKey($thing->getName())) && \strlen($thing->getName()) > 30) {
-					throw new \InvalidArgumentException('Foreign key name "'  . $table->getName() . '"."' . $thing->getName() . '" is too long.');
+					throw new \InvalidArgumentException('Foreign key name "'.$table->getName().'"."'.$thing->getName().'" is too long.');
 				}
 			}
 
@@ -591,32 +591,32 @@ 
 				$isUsingDefaultName = $indexName === 'primary';
 
 				if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) {
-					$defaultName = $table->getName() . '_pkey';
+					$defaultName = $table->getName().'_pkey';
 					$isUsingDefaultName = strtolower($defaultName) === $indexName;
 
 					if ($isUsingDefaultName) {
-						$sequenceName = $table->getName() . '_' . implode('_', $primaryKey->getColumns()) . '_seq';
-						$sequences = array_filter($sequences, function (Sequence $sequence) use ($sequenceName) {
+						$sequenceName = $table->getName().'_'.implode('_', $primaryKey->getColumns()).'_seq';
+						$sequences = array_filter($sequences, function(Sequence $sequence) use ($sequenceName) {
 							return $sequence->getName() !== $sequenceName;
 						});
 					}
 				} elseif ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
-					$defaultName = $table->getName() . '_seq';
+					$defaultName = $table->getName().'_seq';
 					$isUsingDefaultName = strtolower($defaultName) === $indexName;
 				}
 
 				if (!$isUsingDefaultName && \strlen($indexName) > 30) {
-					throw new \InvalidArgumentException('Primary index name  on "'  . $table->getName() . '" is too long.');
+					throw new \InvalidArgumentException('Primary index name  on "'.$table->getName().'" is too long.');
 				}
 				if ($isUsingDefaultName && \strlen($table->getName()) - $prefixLength >= 23) {
-					throw new \InvalidArgumentException('Primary index name  on "'  . $table->getName() . '" is too long.');
+					throw new \InvalidArgumentException('Primary index name  on "'.$table->getName().'" is too long.');
 				}
 			}
 		}
 
 		foreach ($sequences as $sequence) {
 			if (!$sourceSchema->hasSequence($sequence->getName()) && \strlen($sequence->getName()) > 30) {
-				throw new \InvalidArgumentException('Sequence name "'  . $sequence->getName() . '" is too long.');
+				throw new \InvalidArgumentException('Sequence name "'.$sequence->getName().'" is too long.');
 			}
 		}
 	}

lib/private/DB/MDB2SchemaManager.php

Indentation +110 added lines, -110 removed lines

@@ -38,124 +38,124 @@
 use Doctrine\DBAL\Schema\Schema;
 
 class MDB2SchemaManager {
-	/** @var Connection $conn */
-	protected $conn;
+    /** @var Connection $conn */
+    protected $conn;
 
-	/**
-	 * @param Connection $conn
-	 */
-	public function __construct($conn) {
-		$this->conn = $conn;
-	}
+    /**
+     * @param Connection $conn
+     */
+    public function __construct($conn) {
+        $this->conn = $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);
-		} elseif ($platform instanceof OraclePlatform) {
-			return new OracleMigrator($this->conn, $random, $config, $dispatcher);
-		} elseif ($platform instanceof MySQLPlatform) {
-			return new MySQLMigrator($this->conn, $random, $config, $dispatcher);
-		} elseif ($platform instanceof PostgreSQL94Platform) {
-			return new PostgreSqlMigrator($this->conn, $random, $config, $dispatcher);
-		} else {
-			return new Migrator($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);
+        } elseif ($platform instanceof OraclePlatform) {
+            return new OracleMigrator($this->conn, $random, $config, $dispatcher);
+        } elseif ($platform instanceof MySQLPlatform) {
+            return new MySQLMigrator($this->conn, $random, $config, $dispatcher);
+        } elseif ($platform instanceof PostgreSQL94Platform) {
+            return new PostgreSqlMigrator($this->conn, $random, $config, $dispatcher);
+        } else {
+            return new Migrator($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;
-		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;
+        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/MySqlTools.php

Indentation +33 added lines, -33 removed lines

@@ -31,41 +31,41 @@
  */
 class MySqlTools {
 
-	/**
-	 * @param IDBConnection $connection
-	 * @return bool
-	 */
-	public function supports4ByteCharset(IDBConnection $connection) {
-		$variables = ['innodb_file_per_table' => 'ON'];
-		if (!$this->isMariaDBWithLargePrefix($connection)) {
-			$variables['innodb_file_format'] = 'Barracuda';
-			$variables['innodb_large_prefix'] = 'ON';
-		}
+    /**
+     * @param IDBConnection $connection
+     * @return bool
+     */
+    public function supports4ByteCharset(IDBConnection $connection) {
+        $variables = ['innodb_file_per_table' => 'ON'];
+        if (!$this->isMariaDBWithLargePrefix($connection)) {
+            $variables['innodb_file_format'] = 'Barracuda';
+            $variables['innodb_large_prefix'] = 'ON';
+        }
 
-		foreach ($variables as $var => $val) {
-			$result = $connection->executeQuery("SHOW VARIABLES LIKE '$var'");
-			$row = $result->fetch();
-			$result->closeCursor();
-			if ($row === false) {
-				return false;
-			}
-			if (strcasecmp($row['Value'], $val) !== 0) {
-				return false;
-			}
-		}
-		return true;
-	}
+        foreach ($variables as $var => $val) {
+            $result = $connection->executeQuery("SHOW VARIABLES LIKE '$var'");
+            $row = $result->fetch();
+            $result->closeCursor();
+            if ($row === false) {
+                return false;
+            }
+            if (strcasecmp($row['Value'], $val) !== 0) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-	protected function isMariaDBWithLargePrefix(IDBConnection $connection) {
-		$result = $connection->executeQuery('SELECT VERSION()');
-		$row = strtolower($result->fetchColumn());
-		$result->closeCursor();
+    protected function isMariaDBWithLargePrefix(IDBConnection $connection) {
+        $result = $connection->executeQuery('SELECT VERSION()');
+        $row = strtolower($result->fetchColumn());
+        $result->closeCursor();
 
-		if ($row === false) {
-			return false;
-		}
+        if ($row === false) {
+            return false;
+        }
 
-		return strpos($row, 'maria') && version_compare($row, '10.3', '>=') ||
-			strpos($row, 'maria') === false && version_compare($row, '8.0', '>=');
-	}
+        return strpos($row, 'maria') && version_compare($row, '10.3', '>=') ||
+            strpos($row, 'maria') === false && version_compare($row, '8.0', '>=');
+    }
 }

lib/private/DB/PgSqlTools.php

Indentation +42 added lines, -42 removed lines

@@ -36,51 +36,51 @@
  */
 class PgSqlTools {
 
-	/** @var \OCP\IConfig */
-	private $config;
+    /** @var \OCP\IConfig */
+    private $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @brief Resynchronizes all sequences of a database after using INSERTs
-	 *        without leaving out the auto-incremented column.
-	 * @param \OC\DB\Connection $conn
-	 * @return null
-	 */
-	public function resynchronizeDatabaseSequences(Connection $conn) {
-		$databaseName = $conn->getDatabase();
-		$conn->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
-			/** @var string|AbstractAsset $asset */
-			$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-			if ($asset instanceof AbstractAsset) {
-				return preg_match($filterExpression, $asset->getName()) !== false;
-			}
-			return preg_match($filterExpression, $asset) !== false;
-		});
+    /**
+     * @brief Resynchronizes all sequences of a database after using INSERTs
+     *        without leaving out the auto-incremented column.
+     * @param \OC\DB\Connection $conn
+     * @return null
+     */
+    public function resynchronizeDatabaseSequences(Connection $conn) {
+        $databaseName = $conn->getDatabase();
+        $conn->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+            /** @var string|AbstractAsset $asset */
+            $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+            if ($asset instanceof AbstractAsset) {
+                return preg_match($filterExpression, $asset->getName()) !== false;
+            }
+            return preg_match($filterExpression, $asset) !== false;
+        });
 
-		foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
-			$sequenceName = $sequence->getName();
-			$sqlInfo = 'SELECT table_schema, table_name, column_name
+        foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
+            $sequenceName = $sequence->getName();
+            $sqlInfo = 'SELECT table_schema, table_name, column_name
 				FROM information_schema.columns
 				WHERE column_default = ? AND table_catalog = ?';
-			$result = $conn->executeQuery($sqlInfo, [
-				"nextval('$sequenceName'::regclass)",
-				$databaseName
-			]);
-			$sequenceInfo = $result->fetchAssociative();
-			$result->free();
-			/** @var string $tableName */
-			$tableName = $sequenceInfo['table_name'];
-			/** @var string $columnName */
-			$columnName = $sequenceInfo['column_name'];
-			$sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
-			$sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
-			$conn->executeQuery($sqlSetval);
-		}
-	}
+            $result = $conn->executeQuery($sqlInfo, [
+                "nextval('$sequenceName'::regclass)",
+                $databaseName
+            ]);
+            $sequenceInfo = $result->fetchAssociative();
+            $result->free();
+            /** @var string $tableName */
+            $tableName = $sequenceInfo['table_name'];
+            /** @var string $columnName */
+            $columnName = $sequenceInfo['column_name'];
+            $sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
+            $sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
+            $conn->executeQuery($sqlSetval);
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -54,9 +54,9 @@
 	 */
 	public function resynchronizeDatabaseSequences(Connection $conn) {
 		$databaseName = $conn->getDatabase();
-		$conn->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+		$conn->getConfiguration()->setSchemaAssetsFilter(function($asset) {
 			/** @var string|AbstractAsset $asset */
-			$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+			$filterExpression = '/^'.preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')).'/';
 			if ($asset instanceof AbstractAsset) {
 				return preg_match($filterExpression, $asset->getName()) !== false;
 			}

lib/private/DB/AdapterPgSql.php

Indentation +37 added lines, -37 removed lines

@@ -28,48 +28,48 @@
 namespace OC\DB;
 
 class AdapterPgSql extends Adapter {
-	protected $compatModePre9_5 = null;
+    protected $compatModePre9_5 = null;
 
-	public function lastInsertId($table) {
-		$result = $this->conn->executeQuery('SELECT lastval()');
-		$val = $result->fetchOne();
-		$result->free();
-		return (int)$val;
-	}
+    public function lastInsertId($table) {
+        $result = $this->conn->executeQuery('SELECT lastval()');
+        $val = $result->fetchOne();
+        $result->free();
+        return (int)$val;
+    }
 
-	public const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
-	public function fixupStatement($statement) {
-		$statement = str_replace('`', '"', $statement);
-		$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
-		return $statement;
-	}
+    public const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
+    public function fixupStatement($statement) {
+        $statement = str_replace('`', '"', $statement);
+        $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
+        return $statement;
+    }
 
-	public function insertIgnoreConflict(string $table,array $values) : int {
-		if ($this->isPre9_5CompatMode() === true) {
-			return parent::insertIgnoreConflict($table, $values);
-		}
+    public function insertIgnoreConflict(string $table,array $values) : int {
+        if ($this->isPre9_5CompatMode() === true) {
+            return parent::insertIgnoreConflict($table, $values);
+        }
 
-		// "upsert" is only available since PgSQL 9.5, but the generic way
-		// would leave error logs in the DB.
-		$builder = $this->conn->getQueryBuilder();
-		$builder->insert($table);
-		foreach ($values as $key => $value) {
-			$builder->setValue($key, $builder->createNamedParameter($value));
-		}
-		$queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING';
-		return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes());
-	}
+        // "upsert" is only available since PgSQL 9.5, but the generic way
+        // would leave error logs in the DB.
+        $builder = $this->conn->getQueryBuilder();
+        $builder->insert($table);
+        foreach ($values as $key => $value) {
+            $builder->setValue($key, $builder->createNamedParameter($value));
+        }
+        $queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING';
+        return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes());
+    }
 
-	protected function isPre9_5CompatMode(): bool {
-		if ($this->compatModePre9_5 !== null) {
-			return $this->compatModePre9_5;
-		}
+    protected function isPre9_5CompatMode(): bool {
+        if ($this->compatModePre9_5 !== null) {
+            return $this->compatModePre9_5;
+        }
 
-		$result = $this->conn->executeQuery('SHOW SERVER_VERSION');
-		$version = $result->fetchOne();
-		$result->free();
-		$this->compatModePre9_5 = version_compare($version, '9.5', '<');
+        $result = $this->conn->executeQuery('SHOW SERVER_VERSION');
+        $version = $result->fetchOne();
+        $result->free();
+        $this->compatModePre9_5 = version_compare($version, '9.5', '<');
 
-		return $this->compatModePre9_5;
-	}
+        return $this->compatModePre9_5;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 		$result = $this->conn->executeQuery('SELECT lastval()');
 		$val = $result->fetchOne();
 		$result->free();
-		return (int)$val;
+		return (int) $val;
 	}
 
 	public const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
@@ -44,7 +44,7 @@ 
 		return $statement;
 	}
 
-	public function insertIgnoreConflict(string $table,array $values) : int {
+	public function insertIgnoreConflict(string $table, array $values) : int {
 		if ($this->isPre9_5CompatMode() === true) {
 			return parent::insertIgnoreConflict($table, $values);
 		}
@@ -56,7 +56,7 @@ 
 		foreach ($values as $key => $value) {
 			$builder->setValue($key, $builder->createNamedParameter($value));
 		}
-		$queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING';
+		$queryString = $builder->getSQL().' ON CONFLICT DO NOTHING';
 		return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes());
 	}
 

lib/private/DB/PreparedStatement.php

Indentation +41 added lines, -41 removed lines

@@ -43,59 +43,59 @@
  */
 class PreparedStatement implements IPreparedStatement {
 
-	/** @var Statement */
-	private $statement;
+    /** @var Statement */
+    private $statement;
 
-	/** @var IResult|null */
-	private $result;
+    /** @var IResult|null */
+    private $result;
 
-	public function __construct(Statement $statement) {
-		$this->statement = $statement;
-	}
+    public function __construct(Statement $statement) {
+        $this->statement = $statement;
+    }
 
-	public function closeCursor(): bool {
-		$this->getResult()->closeCursor();
+    public function closeCursor(): bool {
+        $this->getResult()->closeCursor();
 
-		return true;
-	}
+        return true;
+    }
 
-	public function fetch(int $fetchMode = PDO::FETCH_ASSOC) {
-		return $this->getResult()->fetch($fetchMode);
-	}
+    public function fetch(int $fetchMode = PDO::FETCH_ASSOC) {
+        return $this->getResult()->fetch($fetchMode);
+    }
 
-	public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array {
-		return $this->getResult()->fetchAll($fetchMode);
-	}
+    public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array {
+        return $this->getResult()->fetchAll($fetchMode);
+    }
 
-	public function fetchColumn() {
-		return $this->getResult()->fetchOne();
-	}
+    public function fetchColumn() {
+        return $this->getResult()->fetchOne();
+    }
 
-	public function fetchOne() {
-		return $this->getResult()->fetchOne();
-	}
+    public function fetchOne() {
+        return $this->getResult()->fetchOne();
+    }
 
-	public function bindValue($param, $value, $type = ParameterType::STRING): bool {
-		return $this->statement->bindValue($param, $value, $type);
-	}
+    public function bindValue($param, $value, $type = ParameterType::STRING): bool {
+        return $this->statement->bindValue($param, $value, $type);
+    }
 
-	public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null): bool {
-		return $this->statement->bindParam($param, $variable, $type, $length);
-	}
+    public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null): bool {
+        return $this->statement->bindParam($param, $variable, $type, $length);
+    }
 
-	public function execute($params = null): IResult {
-		return ($this->result = new ResultAdapter($this->statement->execute($params)));
-	}
+    public function execute($params = null): IResult {
+        return ($this->result = new ResultAdapter($this->statement->execute($params)));
+    }
 
-	public function rowCount(): int {
-		return $this->getResult()->rowCount();
-	}
+    public function rowCount(): int {
+        return $this->getResult()->rowCount();
+    }
 
-	private function getResult(): IResult {
-		if ($this->result !== null) {
-			return $this->result;
-		}
+    private function getResult(): IResult {
+        if ($this->result !== null) {
+            return $this->result;
+        }
 
-		throw new Exception("You have to execute the prepared statement before accessing the results");
-	}
+        throw new Exception("You have to execute the prepared statement before accessing the results");
+    }
 }

lib/private/DB/ReconnectWrapper.php

Indentation +18 added lines, -18 removed lines

@@ -29,27 +29,27 @@
 use Doctrine\DBAL\Driver;
 
 class ReconnectWrapper extends \Doctrine\DBAL\Connection {
-	public const CHECK_CONNECTION_INTERVAL = 60;
+    public const CHECK_CONNECTION_INTERVAL = 60;
 
-	private $lastConnectionCheck = null;
+    private $lastConnectionCheck = null;
 
-	public function __construct(array $params, Driver $driver, Configuration $config = null, EventManager $eventManager = null) {
-		parent::__construct($params, $driver, $config, $eventManager);
-		$this->lastConnectionCheck = time();
-	}
+    public function __construct(array $params, Driver $driver, Configuration $config = null, EventManager $eventManager = null) {
+        parent::__construct($params, $driver, $config, $eventManager);
+        $this->lastConnectionCheck = time();
+    }
 
-	public function connect() {
-		$now = time();
-		$checkTime = $now - self::CHECK_CONNECTION_INTERVAL;
+    public function connect() {
+        $now = time();
+        $checkTime = $now - self::CHECK_CONNECTION_INTERVAL;
 
-		if ($this->lastConnectionCheck > $checkTime || $this->isTransactionActive()) {
-			return parent::connect();
-		}
+        if ($this->lastConnectionCheck > $checkTime || $this->isTransactionActive()) {
+            return parent::connect();
+        }
 
-		$this->lastConnectionCheck = $now;
-		if (!$this->isConnected()) {
-			$this->close();
-		}
-		return parent::connect();
-	}
+        $this->lastConnectionCheck = $now;
+        if (!$this->isConnected()) {
+            $this->close();
+        }
+        return parent::connect();
+    }
 }