nextcloud / server

core/Command/Db/Migrations/GenerateCommand.php

Indentation +127 added lines, -127 removed lines

@@ -38,8 +38,8 @@ 
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GenerateCommand extends Command implements CompletionAwareInterface {
-	protected static $_templateSimple =
-		'<?php
+    protected static $_templateSimple =
+        '<?php
 
 declare(strict_types=1);
 
@@ -83,129 +83,129 @@ 
 }
 ';
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IDBConnection $connection, IAppManager $appManager) {
-		$this->connection = $connection;
-		$this->appManager = $appManager;
-
-		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): int {
-		$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 string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-
-		if ($argumentName === 'version') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-
-			$version = explode('.', $this->appManager->getAppVersion($appName));
-			return [$version[0] . sprintf('%1$03d', $version[1])];
-		}
-
-		return [];
-	}
-
-	/**
-	 * @param MigrationService $ms
-	 * @param string $className
-	 * @param string $schemaBody
-	 * @return string
-	 */
-	protected function generateMigration(MigrationService $ms, $className, $schemaBody = '') {
-		if ($schemaBody === '') {
-			$schemaBody = "\t\t" . 'return null;';
-		}
-
-
-		$placeHolders = [
-			'{{namespace}}',
-			'{{classname}}',
-			'{{schemabody}}',
-		];
-		$replacements = [
-			$ms->getMigrationsNamespace(),
-			$className,
-			$schemaBody,
-		];
-		$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;
-	}
-
-	protected 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 */
+    protected $connection;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IAppManager $appManager
+     */
+    public function __construct(IDBConnection $connection, IAppManager $appManager) {
+        $this->connection = $connection;
+        $this->appManager = $appManager;
+
+        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): int {
+        $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 string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+
+        if ($argumentName === 'version') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+
+            $version = explode('.', $this->appManager->getAppVersion($appName));
+            return [$version[0] . sprintf('%1$03d', $version[1])];
+        }
+
+        return [];
+    }
+
+    /**
+     * @param MigrationService $ms
+     * @param string $className
+     * @param string $schemaBody
+     * @return string
+     */
+    protected function generateMigration(MigrationService $ms, $className, $schemaBody = '') {
+        if ($schemaBody === '') {
+            $schemaBody = "\t\t" . 'return null;';
+        }
+
+
+        $placeHolders = [
+            '{{namespace}}',
+            '{{classname}}',
+            '{{schemabody}}',
+        ];
+        $replacements = [
+            $ms->getMigrationsNamespace(),
+            $className,
+            $schemaBody,
+        ];
+        $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;
+    }
+
+    protected 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\"");
+        }
+    }
 }

core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php

Indentation +99 added lines, -99 removed lines

@@ -37,170 +37,170 @@
 
 class GenerateFromSchemaFileCommand extends GenerateCommand {
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	public function __construct(IConfig $config, IAppManager $appManager, IDBConnection $connection) {
-		parent::__construct($connection, $appManager);
-		$this->config = $config;
-	}
+    public function __construct(IConfig $config, IAppManager $appManager, IDBConnection $connection) {
+        parent::__construct($connection, $appManager);
+        $this->config = $config;
+    }
 
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('migrations:generate-from-schema');
-	}
+        $this->setName('migrations:generate-from-schema');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$version = $input->getArgument('version');
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $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;
-		}
+        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;
+        }
 
-		$schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
-		if (!file_exists($schemaFile)) {
-			$output->writeln('<error>App ' . $appName . ' does not have a database.xml file</error>');
-			return 2;
-		}
+        $schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
+        if (!file_exists($schemaFile)) {
+            $output->writeln('<error>App ' . $appName . ' does not have a database.xml file</error>');
+            return 2;
+        }
 
-		$reader = new MDB2SchemaReader($this->config, $this->connection->getDatabasePlatform());
-		$schema = new Schema();
-		$reader->loadSchemaFromFile($schemaFile, $schema);
+        $reader = new MDB2SchemaReader($this->config, $this->connection->getDatabasePlatform());
+        $schema = new Schema();
+        $reader->loadSchemaFromFile($schemaFile, $schema);
 
-		$schemaBody = $this->schemaToMigration($schema);
+        $schemaBody = $this->schemaToMigration($schema);
 
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
-		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
+        $date = date('YmdHis');
+        $path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
 
-		$output->writeln("New migration class has been generated to <info>$path</info>");
-		return 0;
-	}
+        $output->writeln("New migration class has been generated to <info>$path</info>");
+        return 0;
+    }
 
-	/**
-	 * @param Schema $schema
-	 * @return string
-	 */
-	protected function schemaToMigration(Schema $schema) {
-		$content = <<<'EOT'
+    /**
+     * @param Schema $schema
+     * @return string
+     */
+    protected function schemaToMigration(Schema $schema) {
+        $content = <<<'EOT'
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 
 EOT;
 
-		foreach ($schema->getTables() as $table) {
-			$content .= str_replace('{{table-name}}', substr($table->getName(), 3), <<<'EOT'
+        foreach ($schema->getTables() as $table) {
+            $content .= str_replace('{{table-name}}', substr($table->getName(), 3), <<<'EOT'
 
 		if (!$schema->hasTable('{{table-name}}')) {
 			$table = $schema->createTable('{{table-name}}');
 
 EOT
-			);
+            );
 
-			foreach ($table->getColumns() as $column) {
-				$content .= str_replace(['{{name}}', '{{type}}'], [$column->getName(), $column->getType()->getName()], <<<'EOT'
+            foreach ($table->getColumns() as $column) {
+                $content .= str_replace(['{{name}}', '{{type}}'], [$column->getName(), $column->getType()->getName()], <<<'EOT'
 			$table->addColumn('{{name}}', '{{type}}', [
 
 EOT
-				);
-				if ($column->getAutoincrement()) {
-					$content .= <<<'EOT'
+                );
+                if ($column->getAutoincrement()) {
+                    $content .= <<<'EOT'
 				'autoincrement' => true,
 
 EOT;
-				}
-				$content .= str_replace('{{notnull}}', $column->getNotnull() ? 'true' : 'false', <<<'EOT'
+                }
+                $content .= str_replace('{{notnull}}', $column->getNotnull() ? 'true' : 'false', <<<'EOT'
 				'notnull' => {{notnull}},
 
 EOT
-				);
-				if ($column->getLength() !== null) {
-					$content .= str_replace('{{length}}', $column->getLength(), <<<'EOT'
+                );
+                if ($column->getLength() !== null) {
+                    $content .= str_replace('{{length}}', $column->getLength(), <<<'EOT'
 				'length' => {{length}},
 
 EOT
-					);
-				}
-				$default = $column->getDefault();
-				if ($default !== null) {
-					if (is_string($default)) {
-						$default = "'$default'";
-					} elseif (is_bool($default)) {
-						$default = ($default === true) ? 'true' : 'false';
-					}
-					$content .= str_replace('{{default}}', $default, <<<'EOT'
+                    );
+                }
+                $default = $column->getDefault();
+                if ($default !== null) {
+                    if (is_string($default)) {
+                        $default = "'$default'";
+                    } elseif (is_bool($default)) {
+                        $default = ($default === true) ? 'true' : 'false';
+                    }
+                    $content .= str_replace('{{default}}', $default, <<<'EOT'
 				'default' => {{default}},
 
 EOT
-					);
-				}
-				if ($column->getUnsigned()) {
-					$content .= <<<'EOT'
+                    );
+                }
+                if ($column->getUnsigned()) {
+                    $content .= <<<'EOT'
 				'unsigned' => true,
 
 EOT;
-				}
+                }
 
-				$content .= <<<'EOT'
+                $content .= <<<'EOT'
 			]);
 
 EOT;
-			}
+            }
 
-			$content .= <<<'EOT'
+            $content .= <<<'EOT'
 
 EOT;
 
-			$primaryKey = $table->getPrimaryKey();
-			if ($primaryKey !== null) {
-				$content .= str_replace('{{columns}}', implode('\', \'', $primaryKey->getUnquotedColumns()), <<<'EOT'
+            $primaryKey = $table->getPrimaryKey();
+            if ($primaryKey !== null) {
+                $content .= str_replace('{{columns}}', implode('\', \'', $primaryKey->getUnquotedColumns()), <<<'EOT'
 			$table->setPrimaryKey(['{{columns}}']);
 
 EOT
-				);
-			}
-
-			foreach ($table->getIndexes() as $index) {
-				if ($index->isPrimary()) {
-					continue;
-				}
-
-				if ($index->isUnique()) {
-					$content .= str_replace(
-						['{{columns}}', '{{name}}'],
-						[implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
-						<<<'EOT'
+                );
+            }
+
+            foreach ($table->getIndexes() as $index) {
+                if ($index->isPrimary()) {
+                    continue;
+                }
+
+                if ($index->isUnique()) {
+                    $content .= str_replace(
+                        ['{{columns}}', '{{name}}'],
+                        [implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
+                        <<<'EOT'
 			$table->addUniqueIndex(['{{columns}}'], '{{name}}');
 
 EOT
-					);
-				} else {
-					$content .= str_replace(
-						['{{columns}}', '{{name}}'],
-						[implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
-						<<<'EOT'
+                    );
+                } else {
+                    $content .= str_replace(
+                        ['{{columns}}', '{{name}}'],
+                        [implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
+                        <<<'EOT'
 			$table->addIndex(['{{columns}}'], '{{name}}');
 
 EOT
-					);
-				}
-			}
+                    );
+                }
+            }
 
-			$content .= <<<'EOT'
+            $content .= <<<'EOT'
 		}
 
 EOT;
-		}
+        }
 
-		$content .= <<<'EOT'
+        $content .= <<<'EOT'
 		return $schema;
 EOT;
 
-		return $content;
-	}
+        return $content;
+    }
 }

core/Command/Db/Migrations/StatusCommand.php

Indentation +110 added lines, -110 removed lines

@@ -35,114 +35,114 @@
 
 class StatusCommand extends Command implements CompletionAwareInterface {
 
-	/** @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): int {
-		$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);
-			}
-		}
-		return 0;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-		return [];
-	}
-
-	/**
-	 * @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): int {
+        $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);
+            }
+        }
+        return 0;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+        return [];
+    }
+
+    /**
+     * @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

@@ -62,10 +62,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);
 			}
 		}
 		return 0;

core/Command/Db/Migrations/ExecuteCommand.php

Indentation +90 added lines, -90 removed lines

@@ -37,94 +37,94 @@
 
 class ExecuteCommand extends Command implements CompletionAwareInterface {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/**
-	 * ExecuteCommand constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IDBConnection $connection, IAppManager $appManager, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('migrations:execute')
-			->setDescription('Execute a single migration version manually.')
-			->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
-			->addArgument('version', InputArgument::REQUIRED, 'The version to execute.', null);
-
-		parent::configure();
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 */
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
-		$version = $input->getArgument('version');
-
-		if ($this->config->getSystemValue('debug', false) === false) {
-			$olderVersions = $ms->getMigratedVersions();
-			$olderVersions[] = '0';
-			$olderVersions[] = 'prev';
-			if (in_array($version,  $olderVersions, true)) {
-				$output->writeln('<error>Can not go back to previous migration without debug enabled</error>');
-				return 1;
-			}
-		}
-
-
-		$ms->executeStep($version);
-		return 0;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-
-		if ($argumentName === 'version') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-
-			$ms = new MigrationService($appName, $this->connection);
-			$migrations = $ms->getAvailableVersions();
-
-			array_unshift($migrations, 'next', 'latest');
-			return $migrations;
-		}
-
-		return [];
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /**
+     * ExecuteCommand constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     */
+    public function __construct(IDBConnection $connection, IAppManager $appManager, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('migrations:execute')
+            ->setDescription('Execute a single migration version manually.')
+            ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on')
+            ->addArgument('version', InputArgument::REQUIRED, 'The version to execute.', null);
+
+        parent::configure();
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+        $version = $input->getArgument('version');
+
+        if ($this->config->getSystemValue('debug', false) === false) {
+            $olderVersions = $ms->getMigratedVersions();
+            $olderVersions[] = '0';
+            $olderVersions[] = 'prev';
+            if (in_array($version,  $olderVersions, true)) {
+                $output->writeln('<error>Can not go back to previous migration without debug enabled</error>');
+                return 1;
+            }
+        }
+
+
+        $ms->executeStep($version);
+        return 0;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+
+        if ($argumentName === 'version') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+
+            $ms = new MigrationService($appName, $this->connection);
+            $migrations = $ms->getAvailableVersions();
+
+            array_unshift($migrations, 'next', 'latest');
+            return $migrations;
+        }
+
+        return [];
+    }
 }

core/Command/Db/AddMissingIndices.php

Indentation +223 added lines, -223 removed lines

@@ -50,227 +50,227 @@
  */
 class AddMissingIndices extends Command {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	public function __construct(IDBConnection $connection, EventDispatcherInterface $dispatcher) {
-		parent::__construct();
-
-		$this->connection = $connection;
-		$this->dispatcher = $dispatcher;
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:add-missing-indices')
-			->setDescription('Add missing indices to the database tables');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->addCoreIndexes($output);
-
-		// Dispatch event so apps can also update indexes if needed
-		$event = new GenericEvent($output);
-		$this->dispatcher->dispatch(IDBConnection::ADD_MISSING_INDEXES_EVENT, $event);
-		return 0;
-	}
-
-	/**
-	 * add missing indices to the share table
-	 *
-	 * @param OutputInterface $output
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 */
-	private function addCoreIndexes(OutputInterface $output) {
-		$output->writeln('<info>Check indices of the share table.</info>');
-
-		$schema = new SchemaWrapper($this->connection);
-		$updated = false;
-
-		if ($schema->hasTable('share')) {
-			$table = $schema->getTable('share');
-			if (!$table->hasIndex('share_with_index')) {
-				$output->writeln('<info>Adding additional share_with index to the share table, this can take some time...</info>');
-				$table->addIndex(['share_with'], 'share_with_index');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>Share table updated successfully.</info>');
-			}
-
-			if (!$table->hasIndex('parent_index')) {
-				$output->writeln('<info>Adding additional parent index to the share table, this can take some time...</info>');
-				$table->addIndex(['parent'], 'parent_index');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>Share table updated successfully.</info>');
-			}
-
-			if (!$table->hasIndex('owner_index')) {
-				$output->writeln('<info>Adding additional owner index to the share table, this can take some time...</info>');
-				$table->addIndex(['uid_owner'], 'owner_index');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>Share table updated successfully.</info>');
-			}
-
-			if (!$table->hasIndex('initiator_index')) {
-				$output->writeln('<info>Adding additional initiator index to the share table, this can take some time...</info>');
-				$table->addIndex(['uid_initiator'], 'initiator_index');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>Share table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the filecache table.</info>');
-		if ($schema->hasTable('filecache')) {
-			$table = $schema->getTable('filecache');
-			if (!$table->hasIndex('fs_mtime')) {
-				$output->writeln('<info>Adding additional mtime index to the filecache table, this can take some time...</info>');
-				$table->addIndex(['mtime'], 'fs_mtime');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>Filecache table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the twofactor_providers table.</info>');
-		if ($schema->hasTable('twofactor_providers')) {
-			$table = $schema->getTable('twofactor_providers');
-			if (!$table->hasIndex('twofactor_providers_uid')) {
-				$output->writeln('<info>Adding additional twofactor_providers_uid index to the twofactor_providers table, this can take some time...</info>');
-				$table->addIndex(['uid'], 'twofactor_providers_uid');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>Twofactor_providers table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the login_flow_v2 table.</info>');
-		if ($schema->hasTable('login_flow_v2')) {
-			$table = $schema->getTable('login_flow_v2');
-			if (!$table->hasIndex('poll_token')) {
-				$output->writeln('<info>Adding additional indeces to the login_flow_v2 table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					$columns = $index->getColumns();
-					if ($columns === ['poll_token'] ||
-						$columns === ['login_token'] ||
-						$columns === ['timestamp']) {
-						$table->dropIndex($index->getName());
-					}
-				}
-
-				$table->addUniqueIndex(['poll_token'], 'poll_token');
-				$table->addUniqueIndex(['login_token'], 'login_token');
-				$table->addIndex(['timestamp'], 'timestamp');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>login_flow_v2 table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the whats_new table.</info>');
-		if ($schema->hasTable('whats_new')) {
-			$table = $schema->getTable('whats_new');
-			if (!$table->hasIndex('version')) {
-				$output->writeln('<info>Adding version index to the whats_new table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					if ($index->getColumns() === ['version']) {
-						$table->dropIndex($index->getName());
-					}
-				}
-
-				$table->addUniqueIndex(['version'], 'version');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>whats_new table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the cards table.</info>');
-		if ($schema->hasTable('cards')) {
-			$table = $schema->getTable('cards');
-			if (!$table->hasIndex('cards_abid')) {
-				$output->writeln('<info>Adding cards_abid index to the cards table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					if ($index->getColumns() === ['addressbookid']) {
-						$table->dropIndex($index->getName());
-					}
-				}
-
-				$table->addIndex(['addressbookid'], 'cards_abid');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>cards table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the cards_properties table.</info>');
-		if ($schema->hasTable('cards_properties')) {
-			$table = $schema->getTable('cards_properties');
-			if (!$table->hasIndex('cards_prop_abid')) {
-				$output->writeln('<info>Adding cards_prop_abid index to the cards_properties table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					if ($index->getColumns() === ['addressbookid']) {
-						$table->dropIndex($index->getName());
-					}
-				}
-
-				$table->addIndex(['addressbookid'], 'cards_prop_abid');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>cards_properties table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the calendarobjects_props table.</info>');
-		if ($schema->hasTable('calendarobjects_props')) {
-			$table = $schema->getTable('calendarobjects_props');
-			if (!$table->hasIndex('calendarobject_calid_index')) {
-				$output->writeln('<info>Adding calendarobject_calid_index index to the calendarobjects_props table, this can take some time...</info>');
-
-				$table->addIndex(['calendarid', 'calendartype'], 'calendarobject_calid_index');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>calendarobjects_props table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the schedulingobjects table.</info>');
-		if ($schema->hasTable('schedulingobjects')) {
-			$table = $schema->getTable('schedulingobjects');
-			if (!$table->hasIndex('schedulobj_principuri_index')) {
-				$output->writeln('<info>Adding schedulobj_principuri_index index to the schedulingobjects table, this can take some time...</info>');
-
-				$table->addIndex(['principaluri'], 'schedulobj_principuri_index');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>schedulingobjects table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the oc_properties table.</info>');
-		if ($schema->hasTable('properties')) {
-			$table = $schema->getTable('properties');
-			if (!$table->hasIndex('properties_path_index')) {
-				$output->writeln('<info>Adding properties_path_index index to the oc_properties table, this can take some time...</info>');
-
-				$table->addIndex(['userid', 'propertypath'], 'properties_path_index');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>oc_properties table updated successfully.</info>');
-			}
-		}
-
-		if (!$updated) {
-			$output->writeln('<info>Done.</info>');
-		}
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    public function __construct(IDBConnection $connection, EventDispatcherInterface $dispatcher) {
+        parent::__construct();
+
+        $this->connection = $connection;
+        $this->dispatcher = $dispatcher;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:add-missing-indices')
+            ->setDescription('Add missing indices to the database tables');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $this->addCoreIndexes($output);
+
+        // Dispatch event so apps can also update indexes if needed
+        $event = new GenericEvent($output);
+        $this->dispatcher->dispatch(IDBConnection::ADD_MISSING_INDEXES_EVENT, $event);
+        return 0;
+    }
+
+    /**
+     * add missing indices to the share table
+     *
+     * @param OutputInterface $output
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    private function addCoreIndexes(OutputInterface $output) {
+        $output->writeln('<info>Check indices of the share table.</info>');
+
+        $schema = new SchemaWrapper($this->connection);
+        $updated = false;
+
+        if ($schema->hasTable('share')) {
+            $table = $schema->getTable('share');
+            if (!$table->hasIndex('share_with_index')) {
+                $output->writeln('<info>Adding additional share_with index to the share table, this can take some time...</info>');
+                $table->addIndex(['share_with'], 'share_with_index');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>Share table updated successfully.</info>');
+            }
+
+            if (!$table->hasIndex('parent_index')) {
+                $output->writeln('<info>Adding additional parent index to the share table, this can take some time...</info>');
+                $table->addIndex(['parent'], 'parent_index');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>Share table updated successfully.</info>');
+            }
+
+            if (!$table->hasIndex('owner_index')) {
+                $output->writeln('<info>Adding additional owner index to the share table, this can take some time...</info>');
+                $table->addIndex(['uid_owner'], 'owner_index');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>Share table updated successfully.</info>');
+            }
+
+            if (!$table->hasIndex('initiator_index')) {
+                $output->writeln('<info>Adding additional initiator index to the share table, this can take some time...</info>');
+                $table->addIndex(['uid_initiator'], 'initiator_index');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>Share table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the filecache table.</info>');
+        if ($schema->hasTable('filecache')) {
+            $table = $schema->getTable('filecache');
+            if (!$table->hasIndex('fs_mtime')) {
+                $output->writeln('<info>Adding additional mtime index to the filecache table, this can take some time...</info>');
+                $table->addIndex(['mtime'], 'fs_mtime');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>Filecache table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the twofactor_providers table.</info>');
+        if ($schema->hasTable('twofactor_providers')) {
+            $table = $schema->getTable('twofactor_providers');
+            if (!$table->hasIndex('twofactor_providers_uid')) {
+                $output->writeln('<info>Adding additional twofactor_providers_uid index to the twofactor_providers table, this can take some time...</info>');
+                $table->addIndex(['uid'], 'twofactor_providers_uid');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>Twofactor_providers table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the login_flow_v2 table.</info>');
+        if ($schema->hasTable('login_flow_v2')) {
+            $table = $schema->getTable('login_flow_v2');
+            if (!$table->hasIndex('poll_token')) {
+                $output->writeln('<info>Adding additional indeces to the login_flow_v2 table, this can take some time...</info>');
+
+                foreach ($table->getIndexes() as $index) {
+                    $columns = $index->getColumns();
+                    if ($columns === ['poll_token'] ||
+                        $columns === ['login_token'] ||
+                        $columns === ['timestamp']) {
+                        $table->dropIndex($index->getName());
+                    }
+                }
+
+                $table->addUniqueIndex(['poll_token'], 'poll_token');
+                $table->addUniqueIndex(['login_token'], 'login_token');
+                $table->addIndex(['timestamp'], 'timestamp');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>login_flow_v2 table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the whats_new table.</info>');
+        if ($schema->hasTable('whats_new')) {
+            $table = $schema->getTable('whats_new');
+            if (!$table->hasIndex('version')) {
+                $output->writeln('<info>Adding version index to the whats_new table, this can take some time...</info>');
+
+                foreach ($table->getIndexes() as $index) {
+                    if ($index->getColumns() === ['version']) {
+                        $table->dropIndex($index->getName());
+                    }
+                }
+
+                $table->addUniqueIndex(['version'], 'version');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>whats_new table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the cards table.</info>');
+        if ($schema->hasTable('cards')) {
+            $table = $schema->getTable('cards');
+            if (!$table->hasIndex('cards_abid')) {
+                $output->writeln('<info>Adding cards_abid index to the cards table, this can take some time...</info>');
+
+                foreach ($table->getIndexes() as $index) {
+                    if ($index->getColumns() === ['addressbookid']) {
+                        $table->dropIndex($index->getName());
+                    }
+                }
+
+                $table->addIndex(['addressbookid'], 'cards_abid');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>cards table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the cards_properties table.</info>');
+        if ($schema->hasTable('cards_properties')) {
+            $table = $schema->getTable('cards_properties');
+            if (!$table->hasIndex('cards_prop_abid')) {
+                $output->writeln('<info>Adding cards_prop_abid index to the cards_properties table, this can take some time...</info>');
+
+                foreach ($table->getIndexes() as $index) {
+                    if ($index->getColumns() === ['addressbookid']) {
+                        $table->dropIndex($index->getName());
+                    }
+                }
+
+                $table->addIndex(['addressbookid'], 'cards_prop_abid');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>cards_properties table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the calendarobjects_props table.</info>');
+        if ($schema->hasTable('calendarobjects_props')) {
+            $table = $schema->getTable('calendarobjects_props');
+            if (!$table->hasIndex('calendarobject_calid_index')) {
+                $output->writeln('<info>Adding calendarobject_calid_index index to the calendarobjects_props table, this can take some time...</info>');
+
+                $table->addIndex(['calendarid', 'calendartype'], 'calendarobject_calid_index');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>calendarobjects_props table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the schedulingobjects table.</info>');
+        if ($schema->hasTable('schedulingobjects')) {
+            $table = $schema->getTable('schedulingobjects');
+            if (!$table->hasIndex('schedulobj_principuri_index')) {
+                $output->writeln('<info>Adding schedulobj_principuri_index index to the schedulingobjects table, this can take some time...</info>');
+
+                $table->addIndex(['principaluri'], 'schedulobj_principuri_index');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>schedulingobjects table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the oc_properties table.</info>');
+        if ($schema->hasTable('properties')) {
+            $table = $schema->getTable('properties');
+            if (!$table->hasIndex('properties_path_index')) {
+                $output->writeln('<info>Adding properties_path_index index to the oc_properties table, this can take some time...</info>');
+
+                $table->addIndex(['userid', 'propertypath'], 'properties_path_index');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>oc_properties table updated successfully.</info>');
+            }
+        }
+
+        if (!$updated) {
+            $output->writeln('<info>Done.</info>');
+        }
+    }
 }

core/Command/Db/AddMissingColumns.php

Indentation +58 added lines, -58 removed lines

@@ -44,62 +44,62 @@
  */
 class AddMissingColumns extends Command {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	public function __construct(IDBConnection $connection, EventDispatcherInterface $dispatcher) {
-		parent::__construct();
-
-		$this->connection = $connection;
-		$this->dispatcher = $dispatcher;
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:add-missing-columns')
-			->setDescription('Add missing optional columns to the database tables');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->addCoreColumns($output);
-
-		// Dispatch event so apps can also update columns if needed
-		$event = new GenericEvent($output);
-		$this->dispatcher->dispatch(IDBConnection::ADD_MISSING_COLUMNS_EVENT, $event);
-		return 0;
-	}
-
-	/**
-	 * add missing indices to the share table
-	 *
-	 * @param OutputInterface $output
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 */
-	private function addCoreColumns(OutputInterface $output) {
-		$output->writeln('<info>Check columns of the comments table.</info>');
-
-		$schema = new SchemaWrapper($this->connection);
-		$updated = false;
-
-		if ($schema->hasTable('comments')) {
-			$table = $schema->getTable('comments');
-			if (!$table->hasColumn('reference_id')) {
-				$output->writeln('<info>Adding additional reference_id column to the comments table, this can take some time...</info>');
-				$table->addColumn('reference_id', 'string', [
-					'notnull' => false,
-					'length' => 64,
-				]);
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>Comments table updated successfully.</info>');
-			}
-		}
-
-		if (!$updated) {
-			$output->writeln('<info>Done.</info>');
-		}
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    public function __construct(IDBConnection $connection, EventDispatcherInterface $dispatcher) {
+        parent::__construct();
+
+        $this->connection = $connection;
+        $this->dispatcher = $dispatcher;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:add-missing-columns')
+            ->setDescription('Add missing optional columns to the database tables');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $this->addCoreColumns($output);
+
+        // Dispatch event so apps can also update columns if needed
+        $event = new GenericEvent($output);
+        $this->dispatcher->dispatch(IDBConnection::ADD_MISSING_COLUMNS_EVENT, $event);
+        return 0;
+    }
+
+    /**
+     * add missing indices to the share table
+     *
+     * @param OutputInterface $output
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    private function addCoreColumns(OutputInterface $output) {
+        $output->writeln('<info>Check columns of the comments table.</info>');
+
+        $schema = new SchemaWrapper($this->connection);
+        $updated = false;
+
+        if ($schema->hasTable('comments')) {
+            $table = $schema->getTable('comments');
+            if (!$table->hasColumn('reference_id')) {
+                $output->writeln('<info>Adding additional reference_id column to the comments table, this can take some time...</info>');
+                $table->addColumn('reference_id', 'string', [
+                    'notnull' => false,
+                    'length' => 64,
+                ]);
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>Comments table updated successfully.</info>');
+            }
+        }
+
+        if (!$updated) {
+            $output->writeln('<info>Done.</info>');
+        }
+    }
 }

core/Command/Config/ListConfigs.php

Indentation +124 added lines, -124 removed lines

@@ -32,128 +32,128 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListConfigs extends Base {
-	protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
-
-	/** * @var SystemConfig */
-	protected $systemConfig;
-
-	/** @var IAppConfig */
-	protected $appConfig;
-
-	/**
-	 * @param SystemConfig $systemConfig
-	 * @param IAppConfig $appConfig
-	 */
-	public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) {
-		parent::__construct();
-		$this->systemConfig = $systemConfig;
-		$this->appConfig = $appConfig;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('config:list')
-			->setDescription('List all configs')
-			->addArgument(
-				'app',
-				InputArgument::OPTIONAL,
-				'Name of the app ("system" to get the config.php values, "all" for all apps and system)',
-				'all'
-			)
-			->addOption(
-				'private',
-				null,
-				InputOption::VALUE_NONE,
-				'Use this option when you want to include sensitive configs like passwords, salts, ...'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$app = $input->getArgument('app');
-		$noSensitiveValues = !$input->getOption('private');
-
-		switch ($app) {
-			case 'system':
-				$configs = [
-					'system' => $this->getSystemConfigs($noSensitiveValues),
-				];
-			break;
-
-			case 'all':
-				$apps = $this->appConfig->getApps();
-				$configs = [
-					'system' => $this->getSystemConfigs($noSensitiveValues),
-					'apps' => [],
-				];
-				foreach ($apps as $appName) {
-					$configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
-				}
-			break;
-
-			default:
-				$configs = [
-					'apps' => [
-						$app => $this->getAppConfigs($app, $noSensitiveValues),
-					],
-				];
-		}
-
-		$this->writeArrayInOutputFormat($input, $output, $configs);
-		return 0;
-	}
-
-	/**
-	 * Get the system configs
-	 *
-	 * @param bool $noSensitiveValues
-	 * @return array
-	 */
-	protected function getSystemConfigs($noSensitiveValues) {
-		$keys = $this->systemConfig->getKeys();
-
-		$configs = [];
-		foreach ($keys as $key) {
-			if ($noSensitiveValues) {
-				$value = $this->systemConfig->getFilteredValue($key, serialize(null));
-			} else {
-				$value = $this->systemConfig->getValue($key, serialize(null));
-			}
-
-			if ($value !== 'N;') {
-				$configs[$key] = $value;
-			}
-		}
-
-		return $configs;
-	}
-
-	/**
-	 * Get the app configs
-	 *
-	 * @param string $app
-	 * @param bool $noSensitiveValues
-	 * @return array
-	 */
-	protected function getAppConfigs($app, $noSensitiveValues) {
-		if ($noSensitiveValues) {
-			return $this->appConfig->getFilteredValues($app, false);
-		} else {
-			return $this->appConfig->getValues($app, false);
-		}
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return array_merge(['all', 'system'], \OC_App::getAllApps());
-		}
-		return [];
-	}
+    protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
+
+    /** * @var SystemConfig */
+    protected $systemConfig;
+
+    /** @var IAppConfig */
+    protected $appConfig;
+
+    /**
+     * @param SystemConfig $systemConfig
+     * @param IAppConfig $appConfig
+     */
+    public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) {
+        parent::__construct();
+        $this->systemConfig = $systemConfig;
+        $this->appConfig = $appConfig;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('config:list')
+            ->setDescription('List all configs')
+            ->addArgument(
+                'app',
+                InputArgument::OPTIONAL,
+                'Name of the app ("system" to get the config.php values, "all" for all apps and system)',
+                'all'
+            )
+            ->addOption(
+                'private',
+                null,
+                InputOption::VALUE_NONE,
+                'Use this option when you want to include sensitive configs like passwords, salts, ...'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $app = $input->getArgument('app');
+        $noSensitiveValues = !$input->getOption('private');
+
+        switch ($app) {
+            case 'system':
+                $configs = [
+                    'system' => $this->getSystemConfigs($noSensitiveValues),
+                ];
+            break;
+
+            case 'all':
+                $apps = $this->appConfig->getApps();
+                $configs = [
+                    'system' => $this->getSystemConfigs($noSensitiveValues),
+                    'apps' => [],
+                ];
+                foreach ($apps as $appName) {
+                    $configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
+                }
+            break;
+
+            default:
+                $configs = [
+                    'apps' => [
+                        $app => $this->getAppConfigs($app, $noSensitiveValues),
+                    ],
+                ];
+        }
+
+        $this->writeArrayInOutputFormat($input, $output, $configs);
+        return 0;
+    }
+
+    /**
+     * Get the system configs
+     *
+     * @param bool $noSensitiveValues
+     * @return array
+     */
+    protected function getSystemConfigs($noSensitiveValues) {
+        $keys = $this->systemConfig->getKeys();
+
+        $configs = [];
+        foreach ($keys as $key) {
+            if ($noSensitiveValues) {
+                $value = $this->systemConfig->getFilteredValue($key, serialize(null));
+            } else {
+                $value = $this->systemConfig->getValue($key, serialize(null));
+            }
+
+            if ($value !== 'N;') {
+                $configs[$key] = $value;
+            }
+        }
+
+        return $configs;
+    }
+
+    /**
+     * Get the app configs
+     *
+     * @param string $app
+     * @param bool $noSensitiveValues
+     * @return array
+     */
+    protected function getAppConfigs($app, $noSensitiveValues) {
+        if ($noSensitiveValues) {
+            return $this->appConfig->getFilteredValues($app, false);
+        } else {
+            return $this->appConfig->getValues($app, false);
+        }
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return array_merge(['all', 'system'], \OC_App::getAllApps());
+        }
+        return [];
+    }
 }

core/Command/Config/App/SetConfig.php

Indentation +50 added lines, -50 removed lines

@@ -29,61 +29,61 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Base {
-	/** * @var IConfig */
-	protected $config;
+    /** * @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:app:set')
-			->setDescription('Set an app config value')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'Name of the config to set'
-			)
-			->addOption(
-				'value',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'The new value of the config'
-			)
-			->addOption(
-				'update-only',
-				null,
-				InputOption::VALUE_NONE,
-				'Only updates the value, if it is not set before, it is not being added'
-			)
-		;
-	}
+        $this
+            ->setName('config:app:set')
+            ->setDescription('Set an app config value')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'Name of the config to set'
+            )
+            ->addOption(
+                'value',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The new value of the config'
+            )
+            ->addOption(
+                'update-only',
+                null,
+                InputOption::VALUE_NONE,
+                'Only updates the value, if it is not set before, it is not being added'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
 
-		if (!in_array($configName, $this->config->getAppKeys($appName)) && $input->hasParameterOption('--update-only')) {
-			$output->writeln('<comment>Config value ' . $configName . ' for app ' . $appName . ' not updated, as it has not been set before.</comment>');
-			return 1;
-		}
+        if (!in_array($configName, $this->config->getAppKeys($appName)) && $input->hasParameterOption('--update-only')) {
+            $output->writeln('<comment>Config value ' . $configName . ' for app ' . $appName . ' not updated, as it has not been set before.</comment>');
+            return 1;
+        }
 
-		$configValue = $input->getOption('value');
-		$this->config->setAppValue($appName, $configName, $configValue);
+        $configValue = $input->getOption('value');
+        $this->config->setAppValue($appName, $configName, $configValue);
 
-		$output->writeln('<info>Config value ' . $configName . ' for app ' . $appName . ' set to ' . $configValue . '</info>');
-		return 0;
-	}
+        $output->writeln('<info>Config value ' . $configName . ' for app ' . $appName . ' set to ' . $configValue . '</info>');
+        return 0;
+    }
 }

core/Command/Config/App/GetConfig.php

Indentation +54 added lines, -54 removed lines

@@ -29,65 +29,65 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetConfig extends Base {
-	/** * @var IConfig */
-	protected $config;
+    /** * @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:app:get')
-			->setDescription('Get an app config value')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'Name of the config to get'
-			)
-			->addOption(
-				'default-value',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'If no default value is set and the config does not exist, the command will exit with 1'
-			)
-		;
-	}
+        $this
+            ->setName('config:app:get')
+            ->setDescription('Get an app config value')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'Name of the config to get'
+            )
+            ->addOption(
+                'default-value',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'If no default value is set and the config does not exist, the command will exit with 1'
+            )
+        ;
+    }
 
-	/**
-	 * Executes the current command.
-	 *
-	 * @param InputInterface  $input  An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 * @return null|int null or 0 if everything went fine, or an error code
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
-		$defaultValue = $input->getOption('default-value');
+    /**
+     * Executes the current command.
+     *
+     * @param InputInterface  $input  An InputInterface instance
+     * @param OutputInterface $output An OutputInterface instance
+     * @return null|int null or 0 if everything went fine, or an error code
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
+        $defaultValue = $input->getOption('default-value');
 
-		if (!in_array($configName, $this->config->getAppKeys($appName)) && !$input->hasParameterOption('--default-value')) {
-			return 1;
-		}
+        if (!in_array($configName, $this->config->getAppKeys($appName)) && !$input->hasParameterOption('--default-value')) {
+            return 1;
+        }
 
-		if (!in_array($configName, $this->config->getAppKeys($appName))) {
-			$configValue = $defaultValue;
-		} else {
-			$configValue = $this->config->getAppValue($appName, $configName);
-		}
+        if (!in_array($configName, $this->config->getAppKeys($appName))) {
+            $configValue = $defaultValue;
+        } else {
+            $configValue = $this->config->getAppValue($appName, $configName);
+        }
 
-		$this->writeMixedInOutputFormat($input, $output, $configValue);
-		return 0;
-	}
+        $this->writeMixedInOutputFormat($input, $output, $configValue);
+        return 0;
+    }
 }