nextcloud / server

lib/public/Migration/SimpleMigrationStep.php

Indentation +32 added lines, -32 removed lines

@@ -29,40 +29,40 @@
  * @since 13.0.0
  */
 abstract class SimpleMigrationStep implements IMigrationStep {
-	public function name(): string {
-		return '';
-	}
+    public function name(): string {
+        return '';
+    }
 
-	public function description(): string {
-		return '';
-	}
+    public function description(): string {
+        return '';
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		return null;
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        return null;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 }

lib/public/Migration/IMigrationStep.php

Indentation +36 added lines, -36 removed lines

@@ -29,44 +29,44 @@
  * @since 13.0.0
  */
 interface IMigrationStep {
-	/**
-	 * Human readable name of the migration step
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function name(): string;
+    /**
+     * Human readable name of the migration step
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function name(): string;
 
-	/**
-	 * Human readable description of the migration steps
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function description(): string;
+    /**
+     * Human readable description of the migration steps
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function description(): string;
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options);
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options);
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options);
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options);
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options);
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options);
 }

lib/private/DB/MigrationService.php

Indentation +427 added lines, -427 removed lines

@@ -35,431 +35,431 @@
 
 class MigrationService {
 
-	/** @var boolean */
-	private $migrationTableCreated;
-	/** @var array */
-	private $migrations;
-	/** @var IOutput */
-	private $output;
-	/** @var Connection */
-	private $connection;
-	/** @var string */
-	private $appName;
-
-	/**
-	 * MigrationService constructor.
-	 *
-	 * @param $appName
-	 * @param IDBConnection $connection
-	 * @param AppLocator $appLocator
-	 * @param IOutput|null $output
-	 * @throws \Exception
-	 */
-	public function __construct($appName, IDBConnection $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';
-		} else {
-			if (null === $appLocator) {
-				$appLocator = new AppLocator();
-			}
-			$appPath = $appLocator->getAppPath($appName);
-			$namespace = App::buildAppNamespace($appName);
-			$this->migrationsPath = "$appPath/lib/Migration";
-			$this->migrationsNamespace = $namespace . '\\Migration';
-		}
-	}
-
-	/**
-	 * 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;
-		}
-
-		$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', Type::STRING, ['length' => 255]);
-		$table->addColumn('version', Type::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
-	 * @throws \InvalidArgumentException
-	 */
-	public function migrate($to = 'latest') {
-		// read known migrations
-		$toBeExecuted = $this->getMigrationsToExecute($to);
-		foreach ($toBeExecuted as $version) {
-			$this->executeStep($version);
-		}
-	}
-
-	/**
-	 * 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
-	 * @throws \InvalidArgumentException
-	 */
-	public function executeStep($version) {
-		$instance = $this->createInstance($version);
-
-		$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) {
-			$this->connection->migrateToSchema($toSchema->getWrappedSchema());
-			$toSchema->performDropTableCalls();
-		}
-
-		$instance->postSchemaChange($this->output, function() {
-			return new SchemaWrapper($this->connection);
-		}, ['tablePrefix' => $this->connection->getPrefix()]);
-
-		$this->markAsExecuted($version);
-	}
-
-	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;
+
+    /**
+     * MigrationService constructor.
+     *
+     * @param $appName
+     * @param IDBConnection $connection
+     * @param AppLocator $appLocator
+     * @param IOutput|null $output
+     * @throws \Exception
+     */
+    public function __construct($appName, IDBConnection $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';
+        } else {
+            if (null === $appLocator) {
+                $appLocator = new AppLocator();
+            }
+            $appPath = $appLocator->getAppPath($appName);
+            $namespace = App::buildAppNamespace($appName);
+            $this->migrationsPath = "$appPath/lib/Migration";
+            $this->migrationsNamespace = $namespace . '\\Migration';
+        }
+    }
+
+    /**
+     * 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;
+        }
+
+        $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', Type::STRING, ['length' => 255]);
+        $table->addColumn('version', Type::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
+     * @throws \InvalidArgumentException
+     */
+    public function migrate($to = 'latest') {
+        // read known migrations
+        $toBeExecuted = $this->getMigrationsToExecute($to);
+        foreach ($toBeExecuted as $version) {
+            $this->executeStep($version);
+        }
+    }
+
+    /**
+     * 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
+     * @throws \InvalidArgumentException
+     */
+    public function executeStep($version) {
+        $instance = $this->createInstance($version);
+
+        $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) {
+            $this->connection->migrateToSchema($toSchema->getWrappedSchema());
+            $toSchema->performDropTableCalls();
+        }
+
+        $instance->postSchemaChange($this->output, function() {
+            return new SchemaWrapper($this->connection);
+        }, ['tablePrefix' => $this->connection->getPrefix()]);
+
+        $this->markAsExecuted($version);
+    }
+
+    private function ensureMigrationsAreLoaded() {
+        if (empty($this->migrations)) {
+            $this->migrations = $this->findMigrations();
+        }
+    }
 }

core/Command/Db/Migrations/StatusCommand.php

Indentation +88 added lines, -88 removed lines

@@ -32,94 +32,94 @@
 
 class StatusCommand extends Command {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('migrations:status')
-			->setDescription('View the status of a set of migrations.')
-			->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on');
-	}
-
-	public function execute(InputInterface $input, OutputInterface $output) {
-		$appName = $input->getArgument('app');
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
-
-		$infos = $this->getMigrationsInfos($ms);
-		foreach ($infos as $key => $value) {
-			if (is_array($value)) {
-				$output->writeln("    <comment>>></comment> $key:");
-				foreach ($value as $subKey => $subValue) {
-					$output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
-				}
-			} else {
-				$output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
-			}
-		}
-	}
-
-	/**
-	 * @param MigrationService $ms
-	 * @return array associative array of human readable info name as key and the actual information as value
-	 */
-	public function getMigrationsInfos(MigrationService $ms) {
-
-		$executedMigrations = $ms->getMigratedVersions();
-		$availableMigrations = $ms->getAvailableVersions();
-		$executedUnavailableMigrations = array_diff($executedMigrations, array_keys($availableMigrations));
-
-		$numExecutedUnavailableMigrations = count($executedUnavailableMigrations);
-		$numNewMigrations = count(array_diff(array_keys($availableMigrations), $executedMigrations));
-		$pending = $ms->describeMigrationStep('lastest');
-
-		$infos = [
-			'App'								=> $ms->getApp(),
-			'Version Table Name'				=> $ms->getMigrationsTableName(),
-			'Migrations Namespace'				=> $ms->getMigrationsNamespace(),
-			'Migrations Directory'				=> $ms->getMigrationsDirectory(),
-			'Previous Version'					=> $this->getFormattedVersionAlias($ms, 'prev'),
-			'Current Version'					=> $this->getFormattedVersionAlias($ms, 'current'),
-			'Next Version'						=> $this->getFormattedVersionAlias($ms, 'next'),
-			'Latest Version'					=> $this->getFormattedVersionAlias($ms, 'latest'),
-			'Executed Migrations'				=> count($executedMigrations),
-			'Executed Unavailable Migrations'	=> $numExecutedUnavailableMigrations,
-			'Available Migrations'				=> count($availableMigrations),
-			'New Migrations'					=> $numNewMigrations,
-			'Pending Migrations'				=> count($pending) ? $pending : 'None'
-		];
-
-		return $infos;
-	}
-
-	/**
-	 * @param MigrationService $migrationService
-	 * @param string $alias
-	 * @return mixed|null|string
-	 */
-	private function getFormattedVersionAlias(MigrationService $migrationService, $alias) {
-		$migration = $migrationService->getMigration($alias);
-		//No version found
-		if ($migration === null) {
-			if ($alias === 'next') {
-				return 'Already at latest migration step';
-			}
-
-			if ($alias === 'prev') {
-				return 'Already at first migration step';
-			}
-		}
-
-		return $migration;
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('migrations:status')
+            ->setDescription('View the status of a set of migrations.')
+            ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on');
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output) {
+        $appName = $input->getArgument('app');
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+
+        $infos = $this->getMigrationsInfos($ms);
+        foreach ($infos as $key => $value) {
+            if (is_array($value)) {
+                $output->writeln("    <comment>>></comment> $key:");
+                foreach ($value as $subKey => $subValue) {
+                    $output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
+                }
+            } else {
+                $output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
+            }
+        }
+    }
+
+    /**
+     * @param MigrationService $ms
+     * @return array associative array of human readable info name as key and the actual information as value
+     */
+    public function getMigrationsInfos(MigrationService $ms) {
+
+        $executedMigrations = $ms->getMigratedVersions();
+        $availableMigrations = $ms->getAvailableVersions();
+        $executedUnavailableMigrations = array_diff($executedMigrations, array_keys($availableMigrations));
+
+        $numExecutedUnavailableMigrations = count($executedUnavailableMigrations);
+        $numNewMigrations = count(array_diff(array_keys($availableMigrations), $executedMigrations));
+        $pending = $ms->describeMigrationStep('lastest');
+
+        $infos = [
+            'App'								=> $ms->getApp(),
+            'Version Table Name'				=> $ms->getMigrationsTableName(),
+            'Migrations Namespace'				=> $ms->getMigrationsNamespace(),
+            'Migrations Directory'				=> $ms->getMigrationsDirectory(),
+            'Previous Version'					=> $this->getFormattedVersionAlias($ms, 'prev'),
+            'Current Version'					=> $this->getFormattedVersionAlias($ms, 'current'),
+            'Next Version'						=> $this->getFormattedVersionAlias($ms, 'next'),
+            'Latest Version'					=> $this->getFormattedVersionAlias($ms, 'latest'),
+            'Executed Migrations'				=> count($executedMigrations),
+            'Executed Unavailable Migrations'	=> $numExecutedUnavailableMigrations,
+            'Available Migrations'				=> count($availableMigrations),
+            'New Migrations'					=> $numNewMigrations,
+            'Pending Migrations'				=> count($pending) ? $pending : 'None'
+        ];
+
+        return $infos;
+    }
+
+    /**
+     * @param MigrationService $migrationService
+     * @param string $alias
+     * @return mixed|null|string
+     */
+    private function getFormattedVersionAlias(MigrationService $migrationService, $alias) {
+        $migration = $migrationService->getMigration($alias);
+        //No version found
+        if ($migration === null) {
+            if ($alias === 'next') {
+                return 'Already at latest migration step';
+            }
+
+            if ($alias === 'prev') {
+                return 'Already at first migration step';
+            }
+        }
+
+        return $migration;
+    }
 
 
 }

Spacing +2 added lines, -2 removed lines

@@ -59,10 +59,10 @@
 			if (is_array($value)) {
 				$output->writeln("    <comment>>></comment> $key:");
 				foreach ($value as $subKey => $subValue) {
-					$output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
+					$output->writeln("        <comment>>></comment> $subKey: ".str_repeat(' ', 46 - strlen($subKey)).$subValue);
 				}
 			} else {
-				$output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
+				$output->writeln("    <comment>>></comment> $key: ".str_repeat(' ', 50 - strlen($key)).$value);
 			}
 		}
 	}

core/Migrations/Version14000Date20180404140050.php

Indentation +42 added lines, -42 removed lines

@@ -34,55 +34,55 @@
  */
 class Version14000Date20180404140050 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
 
-	public function name(): string {
-		return 'Add lowercase user id column to users table';
-	}
+    public function name(): string {
+        return 'Add lowercase user id column to users table';
+    }
 
-	public function description(): string {
-		return 'Adds "uid_lower" column to the users table and fills the column to allow indexed case-insensitive searches';
-	}
+    public function description(): string {
+        return 'Adds "uid_lower" column to the users table and fills the column to allow indexed case-insensitive searches';
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('users');
+        $table = $schema->getTable('users');
 
-		$table->addColumn('uid_lower', 'string', [
-			'notnull' => false,
-			'length' => 64,
-			'default' => '',
-		]);
-		$table->addIndex(['uid_lower'], 'user_uid_lower');
+        $table->addColumn('uid_lower', 'string', [
+            'notnull' => false,
+            'length' => 64,
+            'default' => '',
+        ]);
+        $table->addIndex(['uid_lower'], 'user_uid_lower');
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 *
-	 * @suppress SqlInjectionChecker
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		$qb = $this->connection->getQueryBuilder();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     *
+     * @suppress SqlInjectionChecker
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        $qb = $this->connection->getQueryBuilder();
 
-		$qb->update('users')
-			->set('uid_lower', $qb->func()->lower('uid'));
-		$qb->execute();
-	}
+        $qb->update('users')
+            ->set('uid_lower', $qb->func()->lower('uid'));
+        $qb->execute();
+    }
 }

core/Migrations/Version14000Date20180129121024.php

Indentation +22 added lines, -22 removed lines

@@ -30,30 +30,30 @@
  * Delete the admin|personal sections and settings tables
  */
 class Version14000Date20180129121024 extends SimpleMigrationStep {
-	public function name(): string {
-		return 'Drop obsolete settings tables';
-	}
+    public function name(): string {
+        return 'Drop obsolete settings tables';
+    }
 
-	public function description(): string {
-		return 'Drops the following obsolete tables: "admin_sections", "admin_settings", "personal_sections" and "personal_settings"';
-	}
+    public function description(): string {
+        return 'Drops the following obsolete tables: "admin_sections", "admin_settings", "personal_sections" and "personal_settings"';
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$schema->dropTable('admin_sections');
-		$schema->dropTable('admin_settings');
-		$schema->dropTable('personal_sections');
-		$schema->dropTable('personal_settings');
+        $schema->dropTable('admin_sections');
+        $schema->dropTable('admin_settings');
+        $schema->dropTable('personal_sections');
+        $schema->dropTable('personal_settings');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }