nextcloud / server

core/Command/Db/Migrations/GenerateCommand.php

Indentation +84 added lines, -84 removed lines

@@ -36,8 +36,8 @@ 
 
 class GenerateCommand extends Command {
 
-	private static $_templateSimple =
-		'<?php
+    private static $_templateSimple =
+        '<?php
 namespace <namespace>;
 
 use Doctrine\DBAL\Schema\Schema;
@@ -80,86 +80,86 @@ 
 }
 ';
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('migrations:generate')
-			->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
-			->addArgument('version', InputArgument::REQUIRED, 'Major version of this app, to allow versions on parallel development branches')
-		;
-
-		parent::configure();
-	}
-
-	public function execute(InputInterface $input, OutputInterface $output) {
-		$appName = $input->getArgument('app');
-		$version = $input->getArgument('version');
-
-		if (!preg_match('/^\d{1,16}$/',$version)) {
-			$output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
-			return 1;
-		}
-
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
-
-		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date);
-
-		$output->writeln("New migration class has been generated to <info>$path</info>");
-		return 0;
-	}
-
-	/**
-	 * @param MigrationService $ms
-	 * @param string $className
-	 * @return string
-	 */
-	private function generateMigration(MigrationService $ms, $className) {
-		$placeHolders = [
-			'<namespace>',
-			'<classname>',
-		];
-		$replacements = [
-			$ms->getMigrationsNamespace(),
-			$className,
-		];
-		$code = str_replace($placeHolders, $replacements, self::$_templateSimple);
-		$dir = $ms->getMigrationsDirectory();
-
-		$this->ensureMigrationDirExists($dir);
-		$path = $dir . '/' . $className . '.php';
-
-		if (file_put_contents($path, $code) === false) {
-			throw new RuntimeException('Failed to generate new migration step.');
-		}
-
-		return $path;
-	}
-
-	private function ensureMigrationDirExists($directory) {
-		if (file_exists($directory) && is_dir($directory)) {
-			return;
-		}
-
-		if (file_exists($directory)) {
-			throw new \RuntimeException("Could not create folder \"$directory\"");
-		}
-
-		$this->ensureMigrationDirExists(dirname($directory));
-
-		if (!@mkdir($directory) && !is_dir($directory)) {
-			throw new \RuntimeException("Could not create folder \"$directory\"");
-		}
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('migrations:generate')
+            ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
+            ->addArgument('version', InputArgument::REQUIRED, 'Major version of this app, to allow versions on parallel development branches')
+        ;
+
+        parent::configure();
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output) {
+        $appName = $input->getArgument('app');
+        $version = $input->getArgument('version');
+
+        if (!preg_match('/^\d{1,16}$/',$version)) {
+            $output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
+            return 1;
+        }
+
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+
+        $date = date('YmdHis');
+        $path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date);
+
+        $output->writeln("New migration class has been generated to <info>$path</info>");
+        return 0;
+    }
+
+    /**
+     * @param MigrationService $ms
+     * @param string $className
+     * @return string
+     */
+    private function generateMigration(MigrationService $ms, $className) {
+        $placeHolders = [
+            '<namespace>',
+            '<classname>',
+        ];
+        $replacements = [
+            $ms->getMigrationsNamespace(),
+            $className,
+        ];
+        $code = str_replace($placeHolders, $replacements, self::$_templateSimple);
+        $dir = $ms->getMigrationsDirectory();
+
+        $this->ensureMigrationDirExists($dir);
+        $path = $dir . '/' . $className . '.php';
+
+        if (file_put_contents($path, $code) === false) {
+            throw new RuntimeException('Failed to generate new migration step.');
+        }
+
+        return $path;
+    }
+
+    private function ensureMigrationDirExists($directory) {
+        if (file_exists($directory) && is_dir($directory)) {
+            return;
+        }
+
+        if (file_exists($directory)) {
+            throw new \RuntimeException("Could not create folder \"$directory\"");
+        }
+
+        $this->ensureMigrationDirExists(dirname($directory));
+
+        if (!@mkdir($directory) && !is_dir($directory)) {
+            throw new \RuntimeException("Could not create folder \"$directory\"");
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -106,7 +106,7 @@ 
 		$appName = $input->getArgument('app');
 		$version = $input->getArgument('version');
 
-		if (!preg_match('/^\d{1,16}$/',$version)) {
+		if (!preg_match('/^\d{1,16}$/', $version)) {
 			$output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
 			return 1;
 		}
@@ -114,7 +114,7 @@ 
 		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
 		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date);
+		$path = $this->generateMigration($ms, 'Version'.$version.'Date'.$date);
 
 		$output->writeln("New migration class has been generated to <info>$path</info>");
 		return 0;
@@ -138,7 +138,7 @@ 
 		$dir = $ms->getMigrationsDirectory();
 
 		$this->ensureMigrationDirExists($dir);
-		$path = $dir . '/' . $className . '.php';
+		$path = $dir.'/'.$className.'.php';
 
 		if (file_put_contents($path, $code) === false) {
 			throw new RuntimeException('Failed to generate new migration step.');

lib/private/DB/MigrationService.php

Indentation +376 added lines, -376 removed lines

@@ -38,380 +38,380 @@
 
 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;
-		}
-
-		if ($this->connection->tableExists('migrations')) {
-			$this->migrationTableCreated = true;
-			return false;
-		}
-
-		$tableName = $this->connection->getPrefix() . 'migrations';
-		$tableName = $this->connection->getDatabasePlatform()->quoteIdentifier($tableName);
-
-		$columns = [
-			'app' => new Column($this->connection->getDatabasePlatform()->quoteIdentifier('app'), Type::getType('string'), ['length' => 255]),
-			'version' => new Column($this->connection->getDatabasePlatform()->quoteIdentifier('version'), Type::getType('string'), ['length' => 255]),
-		];
-		$table = new Table($tableName, $columns);
-		$table->setPrimaryKey([
-			$this->connection->getDatabasePlatform()->quoteIdentifier('app'),
-			$this->connection->getDatabasePlatform()->quoteIdentifier('version')]);
-		$this->connection->getSchemaManager()->createTable($table);
-
-		$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 (!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();
-
-				return @end($this->getAvailableVersions());
-		}
-		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';
-		}
-		return @end(array_values($m));
-	}
-
-	/**
-	 * @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);
-		}
-	}
-
-	/**
-	 * @param string $version
-	 * @return mixed
-	 * @throws \InvalidArgumentException
-	 */
-	protected function createInstance($version) {
-		$class = $this->getClass($version);
-		try {
-			$s = \OC::$server->query($class);
-		} 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);
-		if (!$instance instanceof IMigrationStep) {
-			throw new \InvalidArgumentException('Not a valid migration');
-		}
-
-		$instance->preSchemaChange($this->output, function() {
-			return $this->connection->createSchema();
-		}, ['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 $this->connection->createSchema();
-		}, ['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;
+        }
+
+        if ($this->connection->tableExists('migrations')) {
+            $this->migrationTableCreated = true;
+            return false;
+        }
+
+        $tableName = $this->connection->getPrefix() . 'migrations';
+        $tableName = $this->connection->getDatabasePlatform()->quoteIdentifier($tableName);
+
+        $columns = [
+            'app' => new Column($this->connection->getDatabasePlatform()->quoteIdentifier('app'), Type::getType('string'), ['length' => 255]),
+            'version' => new Column($this->connection->getDatabasePlatform()->quoteIdentifier('version'), Type::getType('string'), ['length' => 255]),
+        ];
+        $table = new Table($tableName, $columns);
+        $table->setPrimaryKey([
+            $this->connection->getDatabasePlatform()->quoteIdentifier('app'),
+            $this->connection->getDatabasePlatform()->quoteIdentifier('version')]);
+        $this->connection->getSchemaManager()->createTable($table);
+
+        $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 (!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();
+
+                return @end($this->getAvailableVersions());
+        }
+        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';
+        }
+        return @end(array_values($m));
+    }
+
+    /**
+     * @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);
+        }
+    }
+
+    /**
+     * @param string $version
+     * @return mixed
+     * @throws \InvalidArgumentException
+     */
+    protected function createInstance($version) {
+        $class = $this->getClass($version);
+        try {
+            $s = \OC::$server->query($class);
+        } 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);
+        if (!$instance instanceof IMigrationStep) {
+            throw new \InvalidArgumentException('Not a valid migration');
+        }
+
+        $instance->preSchemaChange($this->output, function() {
+            return $this->connection->createSchema();
+        }, ['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 $this->connection->createSchema();
+        }, ['tablePrefix' => $this->connection->getPrefix()]);
+
+        $this->markAsExecuted($version);
+    }
+
+    private function ensureMigrationsAreLoaded() {
+        if (empty($this->migrations)) {
+            $this->migrations = $this->findMigrations();
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -67,7 +67,7 @@ 
 		}
 
 		if ($appName === 'core') {
-			$this->migrationsPath = \OC::$SERVERROOT . '/core/Migrations';
+			$this->migrationsPath = \OC::$SERVERROOT.'/core/Migrations';
 			$this->migrationsNamespace = 'OC\\Core\\Migrations';
 		} else {
 			if (null === $appLocator) {
@@ -76,7 +76,7 @@ 
 			$appPath = $appLocator->getAppPath($appName);
 			$namespace = App::buildAppNamespace($appName);
 			$this->migrationsPath = "$appPath/lib/Migration";
-			$this->migrationsNamespace = $namespace . '\\Migration';
+			$this->migrationsNamespace = $namespace.'\\Migration';
 		}
 	}
 
@@ -103,7 +103,7 @@ 
 			return false;
 		}
 
-		$tableName = $this->connection->getPrefix() . 'migrations';
+		$tableName = $this->connection->getPrefix().'migrations';
 		$tableName = $this->connection->getDatabasePlatform()->quoteIdentifier($tableName);
 
 		$columns = [
@@ -168,7 +168,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)) {
@@ -246,7 +246,7 @@ 
 	 * @return string
 	 */
 	public function getMigrationsTableName() {
-		return $this->connection->getPrefix() . 'migrations';
+		return $this->connection->getPrefix().'migrations';
 	}
 
 	/**
@@ -274,7 +274,7 @@ 
 	 * @return mixed|null|string
 	 */
 	public function getMigration($alias) {
-		switch($alias) {
+		switch ($alias) {
 			case 'current':
 				return $this->getCurrentVersion();
 			case 'next':