nextcloud / server

core/Command/Db/Migrations/GenerateCommand.php

Spacing +4 added lines, -4 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;
@@ -128,7 +128,7 @@ 
 	 */
 	protected function generateMigration(MigrationService $ms, $className, $schemaBody = '') {
 		if ($schemaBody === '') {
-			$schemaBody = "\t\t" . 'return null;';
+			$schemaBody = "\t\t".'return null;';
 		}
 
 
@@ -146,7 +146,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.');

Indentation +92 added lines, -92 removed lines

@@ -36,8 +36,8 @@ 
 
 class GenerateCommand extends Command {
 
-	protected static $_templateSimple =
-		'<?php
+    protected static $_templateSimple =
+        '<?php
 namespace {{<namespace}};
 
 use Doctrine\DBAL\Schema\Schema;
@@ -80,94 +80,94 @@ 
 }
 ';
 
-	/** @var IDBConnection */
-	protected $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
-	 * @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;
+
+    /**
+     * @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
+     * @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\"");
+        }
+    }
 }

lib/private/Setup.php

Indentation +482 added lines, -482 removed lines

@@ -48,486 +48,486 @@
 use OCP\Security\ISecureRandom;
 
 class Setup {
-	/** @var SystemConfig */
-	protected $config;
-	/** @var IniGetWrapper */
-	protected $iniWrapper;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var Defaults */
-	protected $defaults;
-	/** @var ILogger */
-	protected $logger;
-	/** @var ISecureRandom */
-	protected $random;
-
-	/**
-	 * @param SystemConfig $config
-	 * @param IniGetWrapper $iniWrapper
-	 * @param IL10N $l10n
-	 * @param Defaults $defaults
-	 * @param ILogger $logger
-	 * @param ISecureRandom $random
-	 */
-	public function __construct(SystemConfig $config,
-						 IniGetWrapper $iniWrapper,
-						 IL10N $l10n,
-						 Defaults $defaults,
-						 ILogger $logger,
-						 ISecureRandom $random
-		) {
-		$this->config = $config;
-		$this->iniWrapper = $iniWrapper;
-		$this->l10n = $l10n;
-		$this->defaults = $defaults;
-		$this->logger = $logger;
-		$this->random = $random;
-	}
-
-	static $dbSetupClasses = [
-		'mysql' => \OC\Setup\MySQL::class,
-		'pgsql' => \OC\Setup\PostgreSQL::class,
-		'oci'   => \OC\Setup\OCI::class,
-		'sqlite' => \OC\Setup\Sqlite::class,
-		'sqlite3' => \OC\Setup\Sqlite::class,
-	];
-
-	/**
-	 * Wrapper around the "class_exists" PHP function to be able to mock it
-	 * @param string $name
-	 * @return bool
-	 */
-	protected function class_exists($name) {
-		return class_exists($name);
-	}
-
-	/**
-	 * Wrapper around the "is_callable" PHP function to be able to mock it
-	 * @param string $name
-	 * @return bool
-	 */
-	protected function is_callable($name) {
-		return is_callable($name);
-	}
-
-	/**
-	 * Wrapper around \PDO::getAvailableDrivers
-	 *
-	 * @return array
-	 */
-	protected function getAvailableDbDriversForPdo() {
-		return \PDO::getAvailableDrivers();
-	}
-
-	/**
-	 * Get the available and supported databases of this instance
-	 *
-	 * @param bool $allowAllDatabases
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getSupportedDatabases($allowAllDatabases = false) {
-		$availableDatabases = array(
-			'sqlite' =>  array(
-				'type' => 'pdo',
-				'call' => 'sqlite',
-				'name' => 'SQLite'
-			),
-			'mysql' => array(
-				'type' => 'pdo',
-				'call' => 'mysql',
-				'name' => 'MySQL/MariaDB'
-			),
-			'pgsql' => array(
-				'type' => 'pdo',
-				'call' => 'pgsql',
-				'name' => 'PostgreSQL'
-			),
-			'oci' => array(
-				'type' => 'function',
-				'call' => 'oci_connect',
-				'name' => 'Oracle'
-			)
-		);
-		if ($allowAllDatabases) {
-			$configuredDatabases = array_keys($availableDatabases);
-		} else {
-			$configuredDatabases = $this->config->getValue('supportedDatabases',
-				array('sqlite', 'mysql', 'pgsql'));
-		}
-		if(!is_array($configuredDatabases)) {
-			throw new Exception('Supported databases are not properly configured.');
-		}
-
-		$supportedDatabases = array();
-
-		foreach($configuredDatabases as $database) {
-			if(array_key_exists($database, $availableDatabases)) {
-				$working = false;
-				$type = $availableDatabases[$database]['type'];
-				$call = $availableDatabases[$database]['call'];
-
-				if ($type === 'function') {
-					$working = $this->is_callable($call);
-				} elseif($type === 'pdo') {
-					$working = in_array($call, $this->getAvailableDbDriversForPdo(), TRUE);
-				}
-				if($working) {
-					$supportedDatabases[$database] = $availableDatabases[$database]['name'];
-				}
-			}
-		}
-
-		return $supportedDatabases;
-	}
-
-	/**
-	 * Gathers system information like database type and does
-	 * a few system checks.
-	 *
-	 * @return array of system info, including an "errors" value
-	 * in case of errors/warnings
-	 */
-	public function getSystemInfo($allowAllDatabases = false) {
-		$databases = $this->getSupportedDatabases($allowAllDatabases);
-
-		$dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT.'/data');
-
-		$errors = array();
-
-		// Create data directory to test whether the .htaccess works
-		// Notice that this is not necessarily the same data directory as the one
-		// that will effectively be used.
-		if(!file_exists($dataDir)) {
-			@mkdir($dataDir);
-		}
-		$htAccessWorking = true;
-		if (is_dir($dataDir) && is_writable($dataDir)) {
-			// Protect data directory here, so we can test if the protection is working
-			\OC\Setup::protectDataDirectory();
-
-			try {
-				$util = new \OC_Util();
-				$htAccessWorking = $util->isHtaccessWorking(\OC::$server->getConfig());
-			} catch (\OC\HintException $e) {
-				$errors[] = array(
-					'error' => $e->getMessage(),
-					'hint' => $e->getHint()
-				);
-				$htAccessWorking = false;
-			}
-		}
-
-		if (\OC_Util::runningOnMac()) {
-			$errors[] = array(
-				'error' => $this->l10n->t(
-					'Mac OS X is not supported and %s will not work properly on this platform. ' .
-					'Use it at your own risk! ',
-					$this->defaults->getName()
-				),
-				'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.')
-			);
-		}
-
-		if($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) {
-			$errors[] = array(
-				'error' => $this->l10n->t(
-					'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' .
-					'This will lead to problems with files over 4 GB and is highly discouraged.',
-					$this->defaults->getName()
-				),
-				'hint' => $this->l10n->t('Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.')
-			);
-		}
-
-		return array(
-			'hasSQLite' => isset($databases['sqlite']),
-			'hasMySQL' => isset($databases['mysql']),
-			'hasPostgreSQL' => isset($databases['pgsql']),
-			'hasOracle' => isset($databases['oci']),
-			'databases' => $databases,
-			'directory' => $dataDir,
-			'htaccessWorking' => $htAccessWorking,
-			'errors' => $errors,
-		);
-	}
-
-	/**
-	 * @param $options
-	 * @return array
-	 */
-	public function install($options) {
-		$l = $this->l10n;
-
-		$error = array();
-		$dbType = $options['dbtype'];
-
-		if(empty($options['adminlogin'])) {
-			$error[] = $l->t('Set an admin username.');
-		}
-		if(empty($options['adminpass'])) {
-			$error[] = $l->t('Set an admin password.');
-		}
-		if(empty($options['directory'])) {
-			$options['directory'] = \OC::$SERVERROOT."/data";
-		}
-
-		if (!isset(self::$dbSetupClasses[$dbType])) {
-			$dbType = 'sqlite';
-		}
-
-		$username = htmlspecialchars_decode($options['adminlogin']);
-		$password = htmlspecialchars_decode($options['adminpass']);
-		$dataDir = htmlspecialchars_decode($options['directory']);
-
-		$class = self::$dbSetupClasses[$dbType];
-		/** @var \OC\Setup\AbstractDatabase $dbSetup */
-		$dbSetup = new $class($l, $this->config, $this->logger, $this->random);
-		$error = array_merge($error, $dbSetup->validate($options));
-
-		// validate the data directory
-		if (
-			(!is_dir($dataDir) and !mkdir($dataDir)) or
-			!is_writable($dataDir)
-		) {
-			$error[] = $l->t("Can't create or write into the data directory %s", array($dataDir));
-		}
-
-		if(count($error) != 0) {
-			return $error;
-		}
-
-		$request = \OC::$server->getRequest();
-
-		//no errors, good
-		if(isset($options['trusted_domains'])
-		    && is_array($options['trusted_domains'])) {
-			$trustedDomains = $options['trusted_domains'];
-		} else {
-			$trustedDomains = [$request->getInsecureServerHost()];
-		}
-
-		//use sqlite3 when available, otherwise sqlite2 will be used.
-		if($dbType=='sqlite' and class_exists('SQLite3')) {
-			$dbType='sqlite3';
-		}
-
-		//generate a random salt that is used to salt the local user passwords
-		$salt = $this->random->generate(30);
-		// generate a secret
-		$secret = $this->random->generate(48);
-
-		//write the config file
-		$this->config->setValues([
-			'passwordsalt'		=> $salt,
-			'secret'			=> $secret,
-			'trusted_domains'	=> $trustedDomains,
-			'datadirectory'		=> $dataDir,
-			'overwrite.cli.url'	=> $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . \OC::$WEBROOT,
-			'dbtype'			=> $dbType,
-			'version'			=> implode('.', \OCP\Util::getVersion()),
-		]);
-
-		try {
-			$dbSetup->initialize($options);
-			$dbSetup->setupDatabase($username);
-			// apply necessary migrations
-			$dbSetup->runMigrations();
-		} catch (\OC\DatabaseSetupException $e) {
-			$error[] = array(
-				'error' => $e->getMessage(),
-				'hint' => $e->getHint()
-			);
-			return($error);
-		} catch (Exception $e) {
-			$error[] = array(
-				'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
-				'hint' => ''
-			);
-			return($error);
-		}
-
-		//create the user and group
-		$user =  null;
-		try {
-			$user = \OC::$server->getUserManager()->createUser($username, $password);
-			if (!$user) {
-				$error[] = "User <$username> could not be created.";
-			}
-		} catch(Exception $exception) {
-			$error[] = $exception->getMessage();
-		}
-
-		if(count($error) == 0) {
-			$config = \OC::$server->getConfig();
-			$config->setAppValue('core', 'installedat', microtime(true));
-			$config->setAppValue('core', 'lastupdatedat', microtime(true));
-			$config->setAppValue('core', 'vendor', $this->getVendor());
-
-			$group =\OC::$server->getGroupManager()->createGroup('admin');
-			$group->addUser($user);
-
-			// Install shipped apps and specified app bundles
-			Installer::installShippedApps();
-			$installer = new Installer(
-				\OC::$server->getAppFetcher(),
-				\OC::$server->getHTTPClientService(),
-				\OC::$server->getTempManager(),
-				\OC::$server->getLogger(),
-				\OC::$server->getConfig()
-			);
-			$bundleFetcher = new BundleFetcher(\OC::$server->getL10N('lib'));
-			$defaultInstallationBundles = $bundleFetcher->getDefaultInstallationBundle();
-			foreach($defaultInstallationBundles as $bundle) {
-				try {
-					$installer->installAppBundle($bundle);
-				} catch (Exception $e) {}
-			}
-
-			// create empty file in data dir, so we can later find
-			// out that this is indeed an ownCloud data directory
-			file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
-
-			// Update .htaccess files
-			Setup::updateHtaccess();
-			Setup::protectDataDirectory();
-
-			self::installBackgroundJobs();
-
-			//and we are done
-			$config->setSystemValue('installed', true);
-
-			// Create a session token for the newly created user
-			// The token provider requires a working db, so it's not injected on setup
-			/* @var $userSession User\Session */
-			$userSession = \OC::$server->getUserSession();
-			$defaultTokenProvider = \OC::$server->query('OC\Authentication\Token\DefaultTokenProvider');
-			$userSession->setTokenProvider($defaultTokenProvider);
-			$userSession->login($username, $password);
-			$userSession->createSessionToken($request, $userSession->getUser()->getUID(), $username, $password);
-		}
-
-		return $error;
-	}
-
-	public static function installBackgroundJobs() {
-		\OC::$server->getJobList()->add('\OC\Authentication\Token\DefaultTokenCleanupJob');
-	}
-
-	/**
-	 * @return string Absolute path to htaccess
-	 */
-	private function pathToHtaccess() {
-		return \OC::$SERVERROOT.'/.htaccess';
-	}
-
-	/**
-	 * Append the correct ErrorDocument path for Apache hosts
-	 * @return bool True when success, False otherwise
-	 */
-	public static function updateHtaccess() {
-		$config = \OC::$server->getSystemConfig();
-
-		// For CLI read the value from overwrite.cli.url
-		if(\OC::$CLI) {
-			$webRoot = $config->getValue('overwrite.cli.url', '');
-			if($webRoot === '') {
-				return false;
-			}
-			$webRoot = parse_url($webRoot, PHP_URL_PATH);
-			$webRoot = rtrim($webRoot, '/');
-		} else {
-			$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
-		}
-
-		$setupHelper = new \OC\Setup($config, \OC::$server->getIniWrapper(),
-			\OC::$server->getL10N('lib'), \OC::$server->query(Defaults::class), \OC::$server->getLogger(),
-			\OC::$server->getSecureRandom());
-
-		$htaccessContent = file_get_contents($setupHelper->pathToHtaccess());
-		$content = "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####\n";
-		$htaccessContent = explode($content, $htaccessContent, 2)[0];
-
-		//custom 403 error page
-		$content.= "\nErrorDocument 403 ".$webRoot."/core/templates/403.php";
-
-		//custom 404 error page
-		$content.= "\nErrorDocument 404 ".$webRoot."/core/templates/404.php";
-
-		// Add rewrite rules if the RewriteBase is configured
-		$rewriteBase = $config->getValue('htaccess.RewriteBase', '');
-		if($rewriteBase !== '') {
-			$content .= "\n<IfModule mod_rewrite.c>";
-			$content .= "\n  Options -MultiViews";
-			$content .= "\n  RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/manifest.json$";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/remote.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/public.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/cron.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/core/ajax/update.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/status.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/robots.txt";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/updater/";
-			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
-			$content .= "\n  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*";
-			$content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
-			$content .= "\n  RewriteBase " . $rewriteBase;
-			$content .= "\n  <IfModule mod_env.c>";
-			$content .= "\n    SetEnv front_controller_active true";
-			$content .= "\n    <IfModule mod_dir.c>";
-			$content .= "\n      DirectorySlash off";
-			$content .= "\n    </IfModule>";
-			$content .= "\n  </IfModule>";
-			$content .= "\n</IfModule>";
-		}
-
-		if ($content !== '') {
-			//suppress errors in case we don't have permissions for it
-			return (bool) @file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent.$content . "\n");
-		}
-
-		return false;
-	}
-
-	public static function protectDataDirectory() {
-		//Require all denied
-		$now =  date('Y-m-d H:i:s');
-		$content = "# Generated by Nextcloud on $now\n";
-		$content.= "# line below if for Apache 2.4\n";
-		$content.= "<ifModule mod_authz_core.c>\n";
-		$content.= "Require all denied\n";
-		$content.= "</ifModule>\n\n";
-		$content.= "# line below if for Apache 2.2\n";
-		$content.= "<ifModule !mod_authz_core.c>\n";
-		$content.= "deny from all\n";
-		$content.= "Satisfy All\n";
-		$content.= "</ifModule>\n\n";
-		$content.= "# section for Apache 2.2 and 2.4\n";
-		$content.= "<ifModule mod_autoindex.c>\n";
-		$content.= "IndexIgnore *\n";
-		$content.= "</ifModule>\n";
-
-		$baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		file_put_contents($baseDir . '/.htaccess', $content);
-		file_put_contents($baseDir . '/index.html', '');
-	}
-
-	/**
-	 * Return vendor from which this version was published
-	 *
-	 * @return string Get the vendor
-	 *
-	 * Copy of \OC\Updater::getVendor()
-	 */
-	private function getVendor() {
-		// this should really be a JSON file
-		require \OC::$SERVERROOT . '/version.php';
-		/** @var string $vendor */
-		return (string) $vendor;
-	}
+    /** @var SystemConfig */
+    protected $config;
+    /** @var IniGetWrapper */
+    protected $iniWrapper;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var Defaults */
+    protected $defaults;
+    /** @var ILogger */
+    protected $logger;
+    /** @var ISecureRandom */
+    protected $random;
+
+    /**
+     * @param SystemConfig $config
+     * @param IniGetWrapper $iniWrapper
+     * @param IL10N $l10n
+     * @param Defaults $defaults
+     * @param ILogger $logger
+     * @param ISecureRandom $random
+     */
+    public function __construct(SystemConfig $config,
+                            IniGetWrapper $iniWrapper,
+                            IL10N $l10n,
+                            Defaults $defaults,
+                            ILogger $logger,
+                            ISecureRandom $random
+        ) {
+        $this->config = $config;
+        $this->iniWrapper = $iniWrapper;
+        $this->l10n = $l10n;
+        $this->defaults = $defaults;
+        $this->logger = $logger;
+        $this->random = $random;
+    }
+
+    static $dbSetupClasses = [
+        'mysql' => \OC\Setup\MySQL::class,
+        'pgsql' => \OC\Setup\PostgreSQL::class,
+        'oci'   => \OC\Setup\OCI::class,
+        'sqlite' => \OC\Setup\Sqlite::class,
+        'sqlite3' => \OC\Setup\Sqlite::class,
+    ];
+
+    /**
+     * Wrapper around the "class_exists" PHP function to be able to mock it
+     * @param string $name
+     * @return bool
+     */
+    protected function class_exists($name) {
+        return class_exists($name);
+    }
+
+    /**
+     * Wrapper around the "is_callable" PHP function to be able to mock it
+     * @param string $name
+     * @return bool
+     */
+    protected function is_callable($name) {
+        return is_callable($name);
+    }
+
+    /**
+     * Wrapper around \PDO::getAvailableDrivers
+     *
+     * @return array
+     */
+    protected function getAvailableDbDriversForPdo() {
+        return \PDO::getAvailableDrivers();
+    }
+
+    /**
+     * Get the available and supported databases of this instance
+     *
+     * @param bool $allowAllDatabases
+     * @return array
+     * @throws Exception
+     */
+    public function getSupportedDatabases($allowAllDatabases = false) {
+        $availableDatabases = array(
+            'sqlite' =>  array(
+                'type' => 'pdo',
+                'call' => 'sqlite',
+                'name' => 'SQLite'
+            ),
+            'mysql' => array(
+                'type' => 'pdo',
+                'call' => 'mysql',
+                'name' => 'MySQL/MariaDB'
+            ),
+            'pgsql' => array(
+                'type' => 'pdo',
+                'call' => 'pgsql',
+                'name' => 'PostgreSQL'
+            ),
+            'oci' => array(
+                'type' => 'function',
+                'call' => 'oci_connect',
+                'name' => 'Oracle'
+            )
+        );
+        if ($allowAllDatabases) {
+            $configuredDatabases = array_keys($availableDatabases);
+        } else {
+            $configuredDatabases = $this->config->getValue('supportedDatabases',
+                array('sqlite', 'mysql', 'pgsql'));
+        }
+        if(!is_array($configuredDatabases)) {
+            throw new Exception('Supported databases are not properly configured.');
+        }
+
+        $supportedDatabases = array();
+
+        foreach($configuredDatabases as $database) {
+            if(array_key_exists($database, $availableDatabases)) {
+                $working = false;
+                $type = $availableDatabases[$database]['type'];
+                $call = $availableDatabases[$database]['call'];
+
+                if ($type === 'function') {
+                    $working = $this->is_callable($call);
+                } elseif($type === 'pdo') {
+                    $working = in_array($call, $this->getAvailableDbDriversForPdo(), TRUE);
+                }
+                if($working) {
+                    $supportedDatabases[$database] = $availableDatabases[$database]['name'];
+                }
+            }
+        }
+
+        return $supportedDatabases;
+    }
+
+    /**
+     * Gathers system information like database type and does
+     * a few system checks.
+     *
+     * @return array of system info, including an "errors" value
+     * in case of errors/warnings
+     */
+    public function getSystemInfo($allowAllDatabases = false) {
+        $databases = $this->getSupportedDatabases($allowAllDatabases);
+
+        $dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT.'/data');
+
+        $errors = array();
+
+        // Create data directory to test whether the .htaccess works
+        // Notice that this is not necessarily the same data directory as the one
+        // that will effectively be used.
+        if(!file_exists($dataDir)) {
+            @mkdir($dataDir);
+        }
+        $htAccessWorking = true;
+        if (is_dir($dataDir) && is_writable($dataDir)) {
+            // Protect data directory here, so we can test if the protection is working
+            \OC\Setup::protectDataDirectory();
+
+            try {
+                $util = new \OC_Util();
+                $htAccessWorking = $util->isHtaccessWorking(\OC::$server->getConfig());
+            } catch (\OC\HintException $e) {
+                $errors[] = array(
+                    'error' => $e->getMessage(),
+                    'hint' => $e->getHint()
+                );
+                $htAccessWorking = false;
+            }
+        }
+
+        if (\OC_Util::runningOnMac()) {
+            $errors[] = array(
+                'error' => $this->l10n->t(
+                    'Mac OS X is not supported and %s will not work properly on this platform. ' .
+                    'Use it at your own risk! ',
+                    $this->defaults->getName()
+                ),
+                'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.')
+            );
+        }
+
+        if($this->iniWrapper->getString('open_basedir') !== '' && PHP_INT_SIZE === 4) {
+            $errors[] = array(
+                'error' => $this->l10n->t(
+                    'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' .
+                    'This will lead to problems with files over 4 GB and is highly discouraged.',
+                    $this->defaults->getName()
+                ),
+                'hint' => $this->l10n->t('Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.')
+            );
+        }
+
+        return array(
+            'hasSQLite' => isset($databases['sqlite']),
+            'hasMySQL' => isset($databases['mysql']),
+            'hasPostgreSQL' => isset($databases['pgsql']),
+            'hasOracle' => isset($databases['oci']),
+            'databases' => $databases,
+            'directory' => $dataDir,
+            'htaccessWorking' => $htAccessWorking,
+            'errors' => $errors,
+        );
+    }
+
+    /**
+     * @param $options
+     * @return array
+     */
+    public function install($options) {
+        $l = $this->l10n;
+
+        $error = array();
+        $dbType = $options['dbtype'];
+
+        if(empty($options['adminlogin'])) {
+            $error[] = $l->t('Set an admin username.');
+        }
+        if(empty($options['adminpass'])) {
+            $error[] = $l->t('Set an admin password.');
+        }
+        if(empty($options['directory'])) {
+            $options['directory'] = \OC::$SERVERROOT."/data";
+        }
+
+        if (!isset(self::$dbSetupClasses[$dbType])) {
+            $dbType = 'sqlite';
+        }
+
+        $username = htmlspecialchars_decode($options['adminlogin']);
+        $password = htmlspecialchars_decode($options['adminpass']);
+        $dataDir = htmlspecialchars_decode($options['directory']);
+
+        $class = self::$dbSetupClasses[$dbType];
+        /** @var \OC\Setup\AbstractDatabase $dbSetup */
+        $dbSetup = new $class($l, $this->config, $this->logger, $this->random);
+        $error = array_merge($error, $dbSetup->validate($options));
+
+        // validate the data directory
+        if (
+            (!is_dir($dataDir) and !mkdir($dataDir)) or
+            !is_writable($dataDir)
+        ) {
+            $error[] = $l->t("Can't create or write into the data directory %s", array($dataDir));
+        }
+
+        if(count($error) != 0) {
+            return $error;
+        }
+
+        $request = \OC::$server->getRequest();
+
+        //no errors, good
+        if(isset($options['trusted_domains'])
+            && is_array($options['trusted_domains'])) {
+            $trustedDomains = $options['trusted_domains'];
+        } else {
+            $trustedDomains = [$request->getInsecureServerHost()];
+        }
+
+        //use sqlite3 when available, otherwise sqlite2 will be used.
+        if($dbType=='sqlite' and class_exists('SQLite3')) {
+            $dbType='sqlite3';
+        }
+
+        //generate a random salt that is used to salt the local user passwords
+        $salt = $this->random->generate(30);
+        // generate a secret
+        $secret = $this->random->generate(48);
+
+        //write the config file
+        $this->config->setValues([
+            'passwordsalt'		=> $salt,
+            'secret'			=> $secret,
+            'trusted_domains'	=> $trustedDomains,
+            'datadirectory'		=> $dataDir,
+            'overwrite.cli.url'	=> $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . \OC::$WEBROOT,
+            'dbtype'			=> $dbType,
+            'version'			=> implode('.', \OCP\Util::getVersion()),
+        ]);
+
+        try {
+            $dbSetup->initialize($options);
+            $dbSetup->setupDatabase($username);
+            // apply necessary migrations
+            $dbSetup->runMigrations();
+        } catch (\OC\DatabaseSetupException $e) {
+            $error[] = array(
+                'error' => $e->getMessage(),
+                'hint' => $e->getHint()
+            );
+            return($error);
+        } catch (Exception $e) {
+            $error[] = array(
+                'error' => 'Error while trying to create admin user: ' . $e->getMessage(),
+                'hint' => ''
+            );
+            return($error);
+        }
+
+        //create the user and group
+        $user =  null;
+        try {
+            $user = \OC::$server->getUserManager()->createUser($username, $password);
+            if (!$user) {
+                $error[] = "User <$username> could not be created.";
+            }
+        } catch(Exception $exception) {
+            $error[] = $exception->getMessage();
+        }
+
+        if(count($error) == 0) {
+            $config = \OC::$server->getConfig();
+            $config->setAppValue('core', 'installedat', microtime(true));
+            $config->setAppValue('core', 'lastupdatedat', microtime(true));
+            $config->setAppValue('core', 'vendor', $this->getVendor());
+
+            $group =\OC::$server->getGroupManager()->createGroup('admin');
+            $group->addUser($user);
+
+            // Install shipped apps and specified app bundles
+            Installer::installShippedApps();
+            $installer = new Installer(
+                \OC::$server->getAppFetcher(),
+                \OC::$server->getHTTPClientService(),
+                \OC::$server->getTempManager(),
+                \OC::$server->getLogger(),
+                \OC::$server->getConfig()
+            );
+            $bundleFetcher = new BundleFetcher(\OC::$server->getL10N('lib'));
+            $defaultInstallationBundles = $bundleFetcher->getDefaultInstallationBundle();
+            foreach($defaultInstallationBundles as $bundle) {
+                try {
+                    $installer->installAppBundle($bundle);
+                } catch (Exception $e) {}
+            }
+
+            // create empty file in data dir, so we can later find
+            // out that this is indeed an ownCloud data directory
+            file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
+
+            // Update .htaccess files
+            Setup::updateHtaccess();
+            Setup::protectDataDirectory();
+
+            self::installBackgroundJobs();
+
+            //and we are done
+            $config->setSystemValue('installed', true);
+
+            // Create a session token for the newly created user
+            // The token provider requires a working db, so it's not injected on setup
+            /* @var $userSession User\Session */
+            $userSession = \OC::$server->getUserSession();
+            $defaultTokenProvider = \OC::$server->query('OC\Authentication\Token\DefaultTokenProvider');
+            $userSession->setTokenProvider($defaultTokenProvider);
+            $userSession->login($username, $password);
+            $userSession->createSessionToken($request, $userSession->getUser()->getUID(), $username, $password);
+        }
+
+        return $error;
+    }
+
+    public static function installBackgroundJobs() {
+        \OC::$server->getJobList()->add('\OC\Authentication\Token\DefaultTokenCleanupJob');
+    }
+
+    /**
+     * @return string Absolute path to htaccess
+     */
+    private function pathToHtaccess() {
+        return \OC::$SERVERROOT.'/.htaccess';
+    }
+
+    /**
+     * Append the correct ErrorDocument path for Apache hosts
+     * @return bool True when success, False otherwise
+     */
+    public static function updateHtaccess() {
+        $config = \OC::$server->getSystemConfig();
+
+        // For CLI read the value from overwrite.cli.url
+        if(\OC::$CLI) {
+            $webRoot = $config->getValue('overwrite.cli.url', '');
+            if($webRoot === '') {
+                return false;
+            }
+            $webRoot = parse_url($webRoot, PHP_URL_PATH);
+            $webRoot = rtrim($webRoot, '/');
+        } else {
+            $webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
+        }
+
+        $setupHelper = new \OC\Setup($config, \OC::$server->getIniWrapper(),
+            \OC::$server->getL10N('lib'), \OC::$server->query(Defaults::class), \OC::$server->getLogger(),
+            \OC::$server->getSecureRandom());
+
+        $htaccessContent = file_get_contents($setupHelper->pathToHtaccess());
+        $content = "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####\n";
+        $htaccessContent = explode($content, $htaccessContent, 2)[0];
+
+        //custom 403 error page
+        $content.= "\nErrorDocument 403 ".$webRoot."/core/templates/403.php";
+
+        //custom 404 error page
+        $content.= "\nErrorDocument 404 ".$webRoot."/core/templates/404.php";
+
+        // Add rewrite rules if the RewriteBase is configured
+        $rewriteBase = $config->getValue('htaccess.RewriteBase', '');
+        if($rewriteBase !== '') {
+            $content .= "\n<IfModule mod_rewrite.c>";
+            $content .= "\n  Options -MultiViews";
+            $content .= "\n  RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]";
+            $content .= "\n  RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/manifest.json$";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/remote.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/public.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/cron.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/core/ajax/update.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/status.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/robots.txt";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/updater/";
+            $content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
+            $content .= "\n  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*";
+            $content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
+            $content .= "\n  RewriteBase " . $rewriteBase;
+            $content .= "\n  <IfModule mod_env.c>";
+            $content .= "\n    SetEnv front_controller_active true";
+            $content .= "\n    <IfModule mod_dir.c>";
+            $content .= "\n      DirectorySlash off";
+            $content .= "\n    </IfModule>";
+            $content .= "\n  </IfModule>";
+            $content .= "\n</IfModule>";
+        }
+
+        if ($content !== '') {
+            //suppress errors in case we don't have permissions for it
+            return (bool) @file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent.$content . "\n");
+        }
+
+        return false;
+    }
+
+    public static function protectDataDirectory() {
+        //Require all denied
+        $now =  date('Y-m-d H:i:s');
+        $content = "# Generated by Nextcloud on $now\n";
+        $content.= "# line below if for Apache 2.4\n";
+        $content.= "<ifModule mod_authz_core.c>\n";
+        $content.= "Require all denied\n";
+        $content.= "</ifModule>\n\n";
+        $content.= "# line below if for Apache 2.2\n";
+        $content.= "<ifModule !mod_authz_core.c>\n";
+        $content.= "deny from all\n";
+        $content.= "Satisfy All\n";
+        $content.= "</ifModule>\n\n";
+        $content.= "# section for Apache 2.2 and 2.4\n";
+        $content.= "<ifModule mod_autoindex.c>\n";
+        $content.= "IndexIgnore *\n";
+        $content.= "</ifModule>\n";
+
+        $baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        file_put_contents($baseDir . '/.htaccess', $content);
+        file_put_contents($baseDir . '/index.html', '');
+    }
+
+    /**
+     * Return vendor from which this version was published
+     *
+     * @return string Get the vendor
+     *
+     * Copy of \OC\Updater::getVendor()
+     */
+    private function getVendor() {
+        // this should really be a JSON file
+        require \OC::$SERVERROOT . '/version.php';
+        /** @var string $vendor */
+        return (string) $vendor;
+    }
 }

lib/private/Setup/OCI.php

Indentation +207 added lines, -207 removed lines

@@ -31,233 +31,233 @@
 namespace OC\Setup;
 
 class OCI extends AbstractDatabase {
-	public $dbprettyname = 'Oracle';
+    public $dbprettyname = 'Oracle';
 
-	protected $dbtablespace;
+    protected $dbtablespace;
 
-	public function initialize($config) {
-		parent::initialize($config);
-		if (array_key_exists('dbtablespace', $config)) {
-			$this->dbtablespace = $config['dbtablespace'];
-		} else {
-			$this->dbtablespace = 'USERS';
-		}
-		// allow empty hostname for oracle
-		$this->dbHost = $config['dbhost'];
+    public function initialize($config) {
+        parent::initialize($config);
+        if (array_key_exists('dbtablespace', $config)) {
+            $this->dbtablespace = $config['dbtablespace'];
+        } else {
+            $this->dbtablespace = 'USERS';
+        }
+        // allow empty hostname for oracle
+        $this->dbHost = $config['dbhost'];
 
-		$this->config->setValues([
-			'dbhost'		=> $this->dbHost,
-			'dbtablespace'	=> $this->dbtablespace,
-		]);
-	}
+        $this->config->setValues([
+            'dbhost'		=> $this->dbHost,
+            'dbtablespace'	=> $this->dbtablespace,
+        ]);
+    }
 
-	public function validate($config) {
-		$errors = array();
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if(empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if(empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
-		}
-		return $errors;
-	}
+    public function validate($config) {
+        $errors = array();
+        if(empty($config['dbuser']) && empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
+        } else if(empty($config['dbuser'])) {
+            $errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
+        } else if(empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
+        }
+        return $errors;
+    }
 
-	public function setupDatabase($username) {
-		$e_host = addslashes($this->dbHost);
-		// casting to int to avoid malicious input
-		$e_port = (int)$this->dbPort;
-		$e_dbname = addslashes($this->dbName);
-		//check if the database user has admin right
-		if ($e_host == '') {
-			$easy_connect_string = $e_dbname; // use dbname as easy connect name
-		} else {
-			$easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname;
-		}
-		$this->logger->debug('connect string: ' . $easy_connect_string, ['app' => 'setup.oci']);
-		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
-			$errorMessage = $this->getLastError();
-			if ($errorMessage) {
-				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
-				$errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
-							.' ORACLE_SID='.getenv('ORACLE_SID')
-							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
-							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
-			}
-			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
-					'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
-							.' ORACLE_SID='.getenv('ORACLE_SID')
-							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
-							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
-		}
-		//check for roles creation rights in oracle
+    public function setupDatabase($username) {
+        $e_host = addslashes($this->dbHost);
+        // casting to int to avoid malicious input
+        $e_port = (int)$this->dbPort;
+        $e_dbname = addslashes($this->dbName);
+        //check if the database user has admin right
+        if ($e_host == '') {
+            $easy_connect_string = $e_dbname; // use dbname as easy connect name
+        } else {
+            $easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname;
+        }
+        $this->logger->debug('connect string: ' . $easy_connect_string, ['app' => 'setup.oci']);
+        $connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
+        if(!$connection) {
+            $errorMessage = $this->getLastError();
+            if ($errorMessage) {
+                throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
+                $errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+                            .' ORACLE_SID='.getenv('ORACLE_SID')
+                            .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+                            .' NLS_LANG='.getenv('NLS_LANG')
+                            .' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+            }
+            throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+                    'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+                            .' ORACLE_SID='.getenv('ORACLE_SID')
+                            .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+                            .' NLS_LANG='.getenv('NLS_LANG')
+                            .' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+        }
+        //check for roles creation rights in oracle
 
-		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
-			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
-		$result = oci_execute($stmt);
-		if($result) {
-			$row = oci_fetch_row($stmt);
+        $query='SELECT count(*) FROM user_role_privs, role_sys_privs'
+            ." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
+        $stmt = oci_parse($connection, $query);
+        if (!$stmt) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
+        $result = oci_execute($stmt);
+        if($result) {
+            $row = oci_fetch_row($stmt);
 
-			if ($row[0] > 0) {
-				//use the admin login data for the new database user
+            if ($row[0] > 0) {
+                //use the admin login data for the new database user
 
-				//add prefix to the oracle user name to prevent collisions
-				$this->dbUser='oc_'.$username;
-				//create a new password so we don't need to store the admin config in the config file
-				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
+                //add prefix to the oracle user name to prevent collisions
+                $this->dbUser='oc_'.$username;
+                //create a new password so we don't need to store the admin config in the config file
+                $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 
-				//oracle passwords are treated as identifiers:
-				//  must start with alphanumeric char
-				//  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
-				$this->dbPassword=substr($this->dbPassword, 0, 30);
+                //oracle passwords are treated as identifiers:
+                //  must start with alphanumeric char
+                //  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
+                $this->dbPassword=substr($this->dbPassword, 0, 30);
 
-				$this->createDBUser($connection);
-			}
-		}
+                $this->createDBUser($connection);
+            }
+        }
 
-		$this->config->setValues([
-			'dbuser'		=> $this->dbUser,
-			'dbname'		=> $this->dbName,
-			'dbpassword'	=> $this->dbPassword,
-		]);
+        $this->config->setValues([
+            'dbuser'		=> $this->dbUser,
+            'dbname'		=> $this->dbName,
+            'dbpassword'	=> $this->dbPassword,
+        ]);
 
-		//create the database not necessary, oracle implies user = schema
-		//$this->createDatabase($this->dbname, $this->dbuser, $connection);
+        //create the database not necessary, oracle implies user = schema
+        //$this->createDatabase($this->dbname, $this->dbuser, $connection);
 
-		//FIXME check tablespace exists: select * from user_tablespaces
+        //FIXME check tablespace exists: select * from user_tablespaces
 
-		// the connection to dbname=oracle is not needed anymore
-		oci_close($connection);
+        // the connection to dbname=oracle is not needed anymore
+        oci_close($connection);
 
-		// connect to the oracle database (schema=$this->dbuser) an check if the schema needs to be filled
-		$this->dbUser = $this->config->getValue('dbuser');
-		//$this->dbname = \OC_Config::getValue('dbname');
-		$this->dbPassword = $this->config->getValue('dbpassword');
+        // connect to the oracle database (schema=$this->dbuser) an check if the schema needs to be filled
+        $this->dbUser = $this->config->getValue('dbuser');
+        //$this->dbname = \OC_Config::getValue('dbname');
+        $this->dbPassword = $this->config->getValue('dbpassword');
 
-		$e_host = addslashes($this->dbHost);
-		$e_dbname = addslashes($this->dbName);
+        $e_host = addslashes($this->dbHost);
+        $e_dbname = addslashes($this->dbName);
 
-		if ($e_host == '') {
-			$easy_connect_string = $e_dbname; // use dbname as easy connect name
-		} else {
-			$easy_connect_string = '//' . $e_host . (!empty($e_port) ? ":{$e_port}" : "") . '/' . $e_dbname;
-		}
-		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
-			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
-					$this->trans->t('You need to enter details of an existing account.'));
-		}
-		$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
-		$stmt = oci_parse($connection, $query);
-		$un = $this->tablePrefix.'users';
-		oci_bind_by_name($stmt, ':un', $un);
-		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning( $entry, ['app' => 'setup.oci']);
-		}
-		oci_execute($stmt);
-	}
+        if ($e_host == '') {
+            $easy_connect_string = $e_dbname; // use dbname as easy connect name
+        } else {
+            $easy_connect_string = '//' . $e_host . (!empty($e_port) ? ":{$e_port}" : "") . '/' . $e_dbname;
+        }
+        $connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
+        if(!$connection) {
+            throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+                    $this->trans->t('You need to enter details of an existing account.'));
+        }
+        $query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
+        $stmt = oci_parse($connection, $query);
+        $un = $this->tablePrefix.'users';
+        oci_bind_by_name($stmt, ':un', $un);
+        if (!$stmt) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning( $entry, ['app' => 'setup.oci']);
+        }
+        oci_execute($stmt);
+    }
 
-	/**
-	 * @param resource $connection
-	 */
-	private function createDBUser($connection) {
-		$name = $this->dbUser;
-		$password = $this->dbPassword;
-		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
-		oci_bind_by_name($stmt, ':un', $name);
-		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
+    /**
+     * @param resource $connection
+     */
+    private function createDBUser($connection) {
+        $name = $this->dbUser;
+        $password = $this->dbPassword;
+        $query = "SELECT * FROM all_users WHERE USERNAME = :un";
+        $stmt = oci_parse($connection, $query);
+        if (!$stmt) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
+        oci_bind_by_name($stmt, ':un', $name);
+        $result = oci_execute($stmt);
+        if(!$result) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
 
-		if(! oci_fetch_row($stmt)) {
-			//user does not exists let's create it :)
-			//password must start with alphabetic character in oracle
-			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$this->dbtablespace;
-			$stmt = oci_parse($connection, $query);
-			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-				$this->logger->warning($entry, ['app' => 'setup.oci']);
+        if(! oci_fetch_row($stmt)) {
+            //user does not exists let's create it :)
+            //password must start with alphabetic character in oracle
+            $query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$this->dbtablespace;
+            $stmt = oci_parse($connection, $query);
+            if (!$stmt) {
+                $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+                $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+                $this->logger->warning($entry, ['app' => 'setup.oci']);
 
-			}
-			//oci_bind_by_name($stmt, ':un', $name);
-			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-					array($query, $name, $password)) . '<br />';
-				$this->logger->warning($entry, ['app' => 'setup.oci']);
+            }
+            //oci_bind_by_name($stmt, ':un', $name);
+            $result = oci_execute($stmt);
+            if(!$result) {
+                $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+                $entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
+                    array($query, $name, $password)) . '<br />';
+                $this->logger->warning($entry, ['app' => 'setup.oci']);
 
-			}
-		} else { // change password of the existing role
-			$query = "ALTER USER :un IDENTIFIED BY :pw";
-			$stmt = oci_parse($connection, $query);
-			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-				$this->logger->warning($entry, ['app' => 'setup.oci']);
-			}
-			oci_bind_by_name($stmt, ':un', $name);
-			oci_bind_by_name($stmt, ':pw', $password);
-			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-				$this->logger->warning($entry, ['app' => 'setup.oci']);
-			}
-		}
-		// grant necessary roles
-		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
-		$stmt = oci_parse($connection, $query);
-		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
-		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-				array($query, $name, $password)) . '<br />';
-			$this->logger->warning($entry, ['app' => 'setup.oci']);
-		}
-	}
+            }
+        } else { // change password of the existing role
+            $query = "ALTER USER :un IDENTIFIED BY :pw";
+            $stmt = oci_parse($connection, $query);
+            if (!$stmt) {
+                $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+                $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+                $this->logger->warning($entry, ['app' => 'setup.oci']);
+            }
+            oci_bind_by_name($stmt, ':un', $name);
+            oci_bind_by_name($stmt, ':pw', $password);
+            $result = oci_execute($stmt);
+            if(!$result) {
+                $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+                $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+                $this->logger->warning($entry, ['app' => 'setup.oci']);
+            }
+        }
+        // grant necessary roles
+        $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
+        $stmt = oci_parse($connection, $query);
+        if (!$stmt) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
+        $result = oci_execute($stmt);
+        if(!$result) {
+            $entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+            $entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
+                array($query, $name, $password)) . '<br />';
+            $this->logger->warning($entry, ['app' => 'setup.oci']);
+        }
+    }
 
-	/**
-	 * @param resource $connection
-	 * @return string
-	 */
-	protected function getLastError($connection = null) {
-		if ($connection) {
-			$error = oci_error($connection);
-		} else {
-			$error = oci_error();
-		}
-		foreach (array('message', 'code') as $key) {
-			if (isset($error[$key])) {
-				return $error[$key];
-			}
-		}
-		return '';
-	}
+    /**
+     * @param resource $connection
+     * @return string
+     */
+    protected function getLastError($connection = null) {
+        if ($connection) {
+            $error = oci_error($connection);
+        } else {
+            $error = oci_error();
+        }
+        foreach (array('message', 'code') as $key) {
+            if (isset($error[$key])) {
+                return $error[$key];
+            }
+        }
+        return '';
+    }
 }

Spacing +40 added lines, -40 removed lines

@@ -53,11 +53,11 @@ 
 
 	public function validate($config) {
 		$errors = array();
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
+		if (empty($config['dbuser']) && empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if(empty($config['dbuser'])) {
+		} else if (empty($config['dbuser'])) {
 			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if(empty($config['dbname'])) {
+		} else if (empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
 		}
 		return $errors;
@@ -66,7 +66,7 @@ 
 	public function setupDatabase($username) {
 		$e_host = addslashes($this->dbHost);
 		// casting to int to avoid malicious input
-		$e_port = (int)$this->dbPort;
+		$e_port = (int) $this->dbPort;
 		$e_dbname = addslashes($this->dbName);
 		//check if the database user has admin right
 		if ($e_host == '') {
@@ -74,9 +74,9 @@ 
 		} else {
 			$easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname;
 		}
-		$this->logger->debug('connect string: ' . $easy_connect_string, ['app' => 'setup.oci']);
+		$this->logger->debug('connect string: '.$easy_connect_string, ['app' => 'setup.oci']);
 		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
+		if (!$connection) {
 			$errorMessage = $this->getLastError();
 			if ($errorMessage) {
 				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
@@ -84,41 +84,41 @@ 
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
 							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 			}
 			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
 					'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
 							.' NLS_LANG='.getenv('NLS_LANG')
-							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 		}
 		//check for roles creation rights in oracle
 
-		$query='SELECT count(*) FROM user_role_privs, role_sys_privs'
+		$query = 'SELECT count(*) FROM user_role_privs, role_sys_privs'
 			." WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		$result = oci_execute($stmt);
-		if($result) {
+		if ($result) {
 			$row = oci_fetch_row($stmt);
 
 			if ($row[0] > 0) {
 				//use the admin login data for the new database user
 
 				//add prefix to the oracle user name to prevent collisions
-				$this->dbUser='oc_'.$username;
+				$this->dbUser = 'oc_'.$username;
 				//create a new password so we don't need to store the admin config in the config file
 				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 
 				//oracle passwords are treated as identifiers:
 				//  must start with alphanumeric char
 				//  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
-				$this->dbPassword=substr($this->dbPassword, 0, 30);
+				$this->dbPassword = substr($this->dbPassword, 0, 30);
 
 				$this->createDBUser($connection);
 			}
@@ -149,10 +149,10 @@ 
 		if ($e_host == '') {
 			$easy_connect_string = $e_dbname; // use dbname as easy connect name
 		} else {
-			$easy_connect_string = '//' . $e_host . (!empty($e_port) ? ":{$e_port}" : "") . '/' . $e_dbname;
+			$easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname;
 		}
 		$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
-		if(!$connection) {
+		if (!$connection) {
 			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
 					$this->trans->t('You need to enter details of an existing account.'));
 		}
@@ -161,9 +161,9 @@ 
 		$un = $this->tablePrefix.'users';
 		oci_bind_by_name($stmt, ':un', $un);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
-			$this->logger->warning( $entry, ['app' => 'setup.oci']);
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
+			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		oci_execute($stmt);
 	}
@@ -177,35 +177,35 @@ 
 		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		oci_bind_by_name($stmt, ':un', $name);
 		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+		if (!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 
-		if(! oci_fetch_row($stmt)) {
+		if (!oci_fetch_row($stmt)) {
 			//user does not exists let's create it :)
 			//password must start with alphabetic character in oracle
 			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$this->dbtablespace;
 			$stmt = oci_parse($connection, $query);
 			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 
 			}
 			//oci_bind_by_name($stmt, ':un', $name);
 			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+			if (!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
 				$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-					array($query, $name, $password)) . '<br />';
+					array($query, $name, $password)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 
 			}
@@ -213,16 +213,16 @@ 
 			$query = "ALTER USER :un IDENTIFIED BY :pw";
 			$stmt = oci_parse($connection, $query);
 			if (!$stmt) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 			}
 			oci_bind_by_name($stmt, ':un', $name);
 			oci_bind_by_name($stmt, ':pw', $password);
 			$result = oci_execute($stmt);
-			if(!$result) {
-				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-				$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			if (!$result) {
+				$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+				$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 				$this->logger->warning($entry, ['app' => 'setup.oci']);
 			}
 		}
@@ -230,15 +230,15 @@ 
 		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
 		$stmt = oci_parse($connection, $query);
 		if (!$stmt) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
-			$entry .= $this->trans->t('Offending command was: "%s"', array($query)) . '<br />';
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
+			$entry .= $this->trans->t('Offending command was: "%s"', array($query)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 		$result = oci_execute($stmt);
-		if(!$result) {
-			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))) . '<br />';
+		if (!$result) {
+			$entry = $this->trans->t('DB Error: "%s"', array($this->getLastError($connection))).'<br />';
 			$entry .= $this->trans->t('Offending command was: "%s", name: %s, password: %s',
-				array($query, $name, $password)) . '<br />';
+				array($query, $name, $password)).'<br />';
 			$this->logger->warning($entry, ['app' => 'setup.oci']);
 		}
 	}

lib/private/Setup/Sqlite.php

Indentation +15 added lines, -15 removed lines

@@ -23,23 +23,23 @@
 namespace OC\Setup;
 
 class Sqlite extends AbstractDatabase {
-	public $dbprettyname = 'Sqlite';
+    public $dbprettyname = 'Sqlite';
 
-	public function validate($config) {
-		return array();
-	}
+    public function validate($config) {
+        return array();
+    }
 
-	public function initialize($config) {
-	}
+    public function initialize($config) {
+    }
 
-	public function setupDatabase($username) {
-		$datadir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data');
+    public function setupDatabase($username) {
+        $datadir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data');
 
-		//delete the old sqlite database first, might cause infinte loops otherwise
-		if(file_exists("$datadir/owncloud.db")) {
-			unlink("$datadir/owncloud.db");
-		}
-		//in case of sqlite, we can always fill the database
-		error_log("creating sqlite db");
-	}
+        //delete the old sqlite database first, might cause infinte loops otherwise
+        if(file_exists("$datadir/owncloud.db")) {
+            unlink("$datadir/owncloud.db");
+        }
+        //in case of sqlite, we can always fill the database
+        error_log("creating sqlite db");
+    }
 }

lib/private/Setup/MySQL.php

Indentation +132 added lines, -132 removed lines

@@ -31,139 +31,139 @@
 use OCP\IDBConnection;
 
 class MySQL extends AbstractDatabase {
-	public $dbprettyname = 'MySQL/MariaDB';
-
-	public function setupDatabase($username) {
-		//check if the database user has admin right
-		$connection = $this->connect(['dbname' => null]);
-
-		// detect mb4
-		$tools = new MySqlTools();
-		if ($tools->supports4ByteCharset($connection)) {
-			$this->config->setValue('mysql.utf8mb4', true);
-			$connection = $this->connect(['dbname' => null]);
-		}
-
-		$this->createSpecificUser($username, $connection);
-
-		//create the database
-		$this->createDatabase($connection);
-
-		//fill the database if needed
-		$query='select count(*) from information_schema.tables where table_schema=? AND table_name = ?';
-		$connection->executeQuery($query, [$this->dbName, $this->tablePrefix.'users']);
-	}
-
-	/**
-	 * @param \OC\DB\Connection $connection
-	 */
-	private function createDatabase($connection) {
-		try{
-			$name = $this->dbName;
-			$user = $this->dbUser;
-			//we can't use OC_DB functions here because we need to connect as the administrative user.
-			$characterSet = $this->config->getValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
-			$query = "CREATE DATABASE IF NOT EXISTS `$name` CHARACTER SET $characterSet COLLATE ${characterSet}_bin;";
-			$connection->executeUpdate($query);
-		} catch (\Exception $ex) {
-			$this->logger->error('Database creation failed: {error}', [
-				'app' => 'mysql.setup',
-				'error' => $ex->getMessage()
-			]);
-			return;
-		}
-
-		try {
-			//this query will fail if there aren't the right permissions, ignore the error
-			$query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
-			$connection->executeUpdate($query);
-		} catch (\Exception $ex) {
-			$this->logger->debug('Could not automatically grant privileges, this can be ignored if database user already had privileges: {error}', [
-				'app' => 'mysql.setup',
-				'error' => $ex->getMessage()
-			]);
-		}
-	}
-
-	/**
-	 * @param IDBConnection $connection
-	 * @throws \OC\DatabaseSetupException
-	 */
-	private function createDBUser($connection) {
-		try{
-			$name = $this->dbUser;
-			$password = $this->dbPassword;
-			// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
-			// the anonymous user would take precedence when there is one.
-			$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
-			$connection->executeUpdate($query);
-			$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
-			$connection->executeUpdate($query);
-		}
-		catch (\Exception $ex){
-			$this->logger->error('Database User creation failed: {error}', [
+    public $dbprettyname = 'MySQL/MariaDB';
+
+    public function setupDatabase($username) {
+        //check if the database user has admin right
+        $connection = $this->connect(['dbname' => null]);
+
+        // detect mb4
+        $tools = new MySqlTools();
+        if ($tools->supports4ByteCharset($connection)) {
+            $this->config->setValue('mysql.utf8mb4', true);
+            $connection = $this->connect(['dbname' => null]);
+        }
+
+        $this->createSpecificUser($username, $connection);
+
+        //create the database
+        $this->createDatabase($connection);
+
+        //fill the database if needed
+        $query='select count(*) from information_schema.tables where table_schema=? AND table_name = ?';
+        $connection->executeQuery($query, [$this->dbName, $this->tablePrefix.'users']);
+    }
+
+    /**
+     * @param \OC\DB\Connection $connection
+     */
+    private function createDatabase($connection) {
+        try{
+            $name = $this->dbName;
+            $user = $this->dbUser;
+            //we can't use OC_DB functions here because we need to connect as the administrative user.
+            $characterSet = $this->config->getValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
+            $query = "CREATE DATABASE IF NOT EXISTS `$name` CHARACTER SET $characterSet COLLATE ${characterSet}_bin;";
+            $connection->executeUpdate($query);
+        } catch (\Exception $ex) {
+            $this->logger->error('Database creation failed: {error}', [
+                'app' => 'mysql.setup',
+                'error' => $ex->getMessage()
+            ]);
+            return;
+        }
+
+        try {
+            //this query will fail if there aren't the right permissions, ignore the error
+            $query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
+            $connection->executeUpdate($query);
+        } catch (\Exception $ex) {
+            $this->logger->debug('Could not automatically grant privileges, this can be ignored if database user already had privileges: {error}', [
+                'app' => 'mysql.setup',
+                'error' => $ex->getMessage()
+            ]);
+        }
+    }
+
+    /**
+     * @param IDBConnection $connection
+     * @throws \OC\DatabaseSetupException
+     */
+    private function createDBUser($connection) {
+        try{
+            $name = $this->dbUser;
+            $password = $this->dbPassword;
+            // we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
+            // the anonymous user would take precedence when there is one.
+            $query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
+            $connection->executeUpdate($query);
+            $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
+            $connection->executeUpdate($query);
+        }
+        catch (\Exception $ex){
+            $this->logger->error('Database User creation failed: {error}', [
                                 'app' => 'mysql.setup',
                                 'error' => $ex->getMessage()
                         ]);
-		}
-	}
-
-	/**
-	 * @param $username
-	 * @param IDBConnection $connection
-	 * @return array
-	 */
-	private function createSpecificUser($username, $connection) {
-		try {
-			//user already specified in config
-			$oldUser = $this->config->getValue('dbuser', false);
-
-			//we don't have a dbuser specified in config
-			if ($this->dbUser !== $oldUser) {
-				//add prefix to the admin username to prevent collisions
-				$adminUser = substr('oc_' . $username, 0, 16);
-
-				$i = 1;
-				while (true) {
-					//this should be enough to check for admin rights in mysql
-					$query = 'SELECT user FROM mysql.user WHERE user=?';
-					$result = $connection->executeQuery($query, [$adminUser]);
-
-					//current dbuser has admin rights
-					if ($result) {
-						$data = $result->fetchAll();
-						//new dbuser does not exist
-						if (count($data) === 0) {
-							//use the admin login data for the new database user
-							$this->dbUser = $adminUser;
-
-							//create a random password so we don't need to store the admin password in the config file
-							$this->dbPassword =  $this->random->generate(30);
-
-							$this->createDBUser($connection);
-
-							break;
-						} else {
-							//repeat with different username
-							$length = strlen((string)$i);
-							$adminUser = substr('oc_' . $username, 0, 16 - $length) . $i;
-							$i++;
-						}
-					} else {
-						break;
-					}
-				};
-			}
-		} catch (\Exception $ex) {
-			$this->logger->info('Can not create a new MySQL user, will continue with the provided user: {error}', [
-				'app' => 'mysql.setup',
-				'error' => $ex->getMessage()
-			]);
-		}
-
-		$this->config->setValues([
-			'dbuser' => $this->dbUser,
-			'dbpassword' => $this->dbPassword,
-		]);
-	}
+        }
+    }
+
+    /**
+     * @param $username
+     * @param IDBConnection $connection
+     * @return array
+     */
+    private function createSpecificUser($username, $connection) {
+        try {
+            //user already specified in config
+            $oldUser = $this->config->getValue('dbuser', false);
+
+            //we don't have a dbuser specified in config
+            if ($this->dbUser !== $oldUser) {
+                //add prefix to the admin username to prevent collisions
+                $adminUser = substr('oc_' . $username, 0, 16);
+
+                $i = 1;
+                while (true) {
+                    //this should be enough to check for admin rights in mysql
+                    $query = 'SELECT user FROM mysql.user WHERE user=?';
+                    $result = $connection->executeQuery($query, [$adminUser]);
+
+                    //current dbuser has admin rights
+                    if ($result) {
+                        $data = $result->fetchAll();
+                        //new dbuser does not exist
+                        if (count($data) === 0) {
+                            //use the admin login data for the new database user
+                            $this->dbUser = $adminUser;
+
+                            //create a random password so we don't need to store the admin password in the config file
+                            $this->dbPassword =  $this->random->generate(30);
+
+                            $this->createDBUser($connection);
+
+                            break;
+                        } else {
+                            //repeat with different username
+                            $length = strlen((string)$i);
+                            $adminUser = substr('oc_' . $username, 0, 16 - $length) . $i;
+                            $i++;
+                        }
+                    } else {
+                        break;
+                    }
+                };
+            }
+        } catch (\Exception $ex) {
+            $this->logger->info('Can not create a new MySQL user, will continue with the provided user: {error}', [
+                'app' => 'mysql.setup',
+                'error' => $ex->getMessage()
+            ]);
+        }
+
+        $this->config->setValues([
+            'dbuser' => $this->dbUser,
+            'dbpassword' => $this->dbPassword,
+        ]);
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
 		$this->createDatabase($connection);
 
 		//fill the database if needed
-		$query='select count(*) from information_schema.tables where table_schema=? AND table_name = ?';
+		$query = 'select count(*) from information_schema.tables where table_schema=? AND table_name = ?';
 		$connection->executeQuery($query, [$this->dbName, $this->tablePrefix.'users']);
 	}
 
@@ -58,7 +58,7 @@ 
 	 * @param \OC\DB\Connection $connection
 	 */
 	private function createDatabase($connection) {
-		try{
+		try {
 			$name = $this->dbName;
 			$user = $this->dbUser;
 			//we can't use OC_DB functions here because we need to connect as the administrative user.
@@ -75,7 +75,7 @@ 
 
 		try {
 			//this query will fail if there aren't the right permissions, ignore the error
-			$query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
+			$query = "GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
 			$connection->executeUpdate($query);
 		} catch (\Exception $ex) {
 			$this->logger->debug('Could not automatically grant privileges, this can be ignored if database user already had privileges: {error}', [
@@ -90,7 +90,7 @@ 
 	 * @throws \OC\DatabaseSetupException
 	 */
 	private function createDBUser($connection) {
-		try{
+		try {
 			$name = $this->dbUser;
 			$password = $this->dbPassword;
 			// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
@@ -100,7 +100,7 @@ 
 			$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
 			$connection->executeUpdate($query);
 		}
-		catch (\Exception $ex){
+		catch (\Exception $ex) {
 			$this->logger->error('Database User creation failed: {error}', [
                                 'app' => 'mysql.setup',
                                 'error' => $ex->getMessage()
@@ -121,7 +121,7 @@ 
 			//we don't have a dbuser specified in config
 			if ($this->dbUser !== $oldUser) {
 				//add prefix to the admin username to prevent collisions
-				$adminUser = substr('oc_' . $username, 0, 16);
+				$adminUser = substr('oc_'.$username, 0, 16);
 
 				$i = 1;
 				while (true) {
@@ -138,15 +138,15 @@ 
 							$this->dbUser = $adminUser;
 
 							//create a random password so we don't need to store the admin password in the config file
-							$this->dbPassword =  $this->random->generate(30);
+							$this->dbPassword = $this->random->generate(30);
 
 							$this->createDBUser($connection);
 
 							break;
 						} else {
 							//repeat with different username
-							$length = strlen((string)$i);
-							$adminUser = substr('oc_' . $username, 0, 16 - $length) . $i;
+							$length = strlen((string) $i);
+							$adminUser = substr('oc_'.$username, 0, 16 - $length).$i;
 							$i++;
 						}
 					} else {

lib/private/Setup/AbstractDatabase.php

Indentation +104 added lines, -104 removed lines

@@ -35,118 +35,118 @@
 
 abstract class AbstractDatabase {
 
-	/** @var IL10N */
-	protected $trans;
-	/** @var string */
-	protected $dbUser;
-	/** @var string */
-	protected $dbPassword;
-	/** @var string */
-	protected $dbName;
-	/** @var string */
-	protected $dbHost;
-	/** @var string */
-	protected $dbPort;
-	/** @var string */
-	protected $tablePrefix;
-	/** @var SystemConfig */
-	protected $config;
-	/** @var ILogger */
-	protected $logger;
-	/** @var ISecureRandom */
-	protected $random;
+    /** @var IL10N */
+    protected $trans;
+    /** @var string */
+    protected $dbUser;
+    /** @var string */
+    protected $dbPassword;
+    /** @var string */
+    protected $dbName;
+    /** @var string */
+    protected $dbHost;
+    /** @var string */
+    protected $dbPort;
+    /** @var string */
+    protected $tablePrefix;
+    /** @var SystemConfig */
+    protected $config;
+    /** @var ILogger */
+    protected $logger;
+    /** @var ISecureRandom */
+    protected $random;
 
-	public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
-		$this->trans = $trans;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->random = $random;
-	}
+    public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
+        $this->trans = $trans;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->random = $random;
+    }
 
-	public function validate($config) {
-		$errors = array();
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if(empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if(empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
-		}
-		if(substr_count($config['dbname'], '.') >= 1) {
-			$errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
-		}
-		return $errors;
-	}
+    public function validate($config) {
+        $errors = array();
+        if(empty($config['dbuser']) && empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
+        } else if(empty($config['dbuser'])) {
+            $errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
+        } else if(empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
+        }
+        if(substr_count($config['dbname'], '.') >= 1) {
+            $errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
+        }
+        return $errors;
+    }
 
-	public function initialize($config) {
-		$dbUser = $config['dbuser'];
-		$dbPass = $config['dbpass'];
-		$dbName = $config['dbname'];
-		$dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
-		$dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
-		$dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+    public function initialize($config) {
+        $dbUser = $config['dbuser'];
+        $dbPass = $config['dbpass'];
+        $dbName = $config['dbname'];
+        $dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+        $dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
+        $dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
 
-		$this->config->setValues([
-			'dbname'		=> $dbName,
-			'dbhost'		=> $dbHost,
-			'dbport' => $dbPort,
-			'dbtableprefix'	=> $dbTablePrefix,
-		]);
+        $this->config->setValues([
+            'dbname'		=> $dbName,
+            'dbhost'		=> $dbHost,
+            'dbport' => $dbPort,
+            'dbtableprefix'	=> $dbTablePrefix,
+        ]);
 
-		$this->dbUser = $dbUser;
-		$this->dbPassword = $dbPass;
-		$this->dbName = $dbName;
-		$this->dbHost = $dbHost;
-		$this->dbPort = $dbPort;
-		$this->tablePrefix = $dbTablePrefix;
-	}
+        $this->dbUser = $dbUser;
+        $this->dbPassword = $dbPass;
+        $this->dbName = $dbName;
+        $this->dbHost = $dbHost;
+        $this->dbPort = $dbPort;
+        $this->tablePrefix = $dbTablePrefix;
+    }
 
-	/**
-	 * @param array $configOverwrite
-	 * @return \OC\DB\Connection
-	 */
-	protected function connect(array $configOverwrite = []) {
-		$connectionParams = array(
-			'host' => $this->dbHost,
-			'user' => $this->dbUser,
-			'password' => $this->dbPassword,
-			'tablePrefix' => $this->tablePrefix,
-			'dbname' => $this->dbName
-		);
+    /**
+     * @param array $configOverwrite
+     * @return \OC\DB\Connection
+     */
+    protected function connect(array $configOverwrite = []) {
+        $connectionParams = array(
+            'host' => $this->dbHost,
+            'user' => $this->dbUser,
+            'password' => $this->dbPassword,
+            'tablePrefix' => $this->tablePrefix,
+            'dbname' => $this->dbName
+        );
 
-		// adding port support through installer
-		if (!empty($this->dbPort)) {
-			if (ctype_digit($this->dbPort)) {
-				$connectionParams['port'] = $this->dbPort;
-			} else {
-				$connectionParams['unix_socket'] = $this->dbPort;
-			}
-		} else if (strpos($this->dbHost, ':')) {
-			// Host variable may carry a port or socket.
-			list($host, $portOrSocket) = explode(':', $this->dbHost, 2);
-			if (ctype_digit($portOrSocket)) {
-				$connectionParams['port'] = $portOrSocket;
-			} else {
-				$connectionParams['unix_socket'] = $portOrSocket;
-			}
-			$connectionParams['host'] = $host;
-		}
+        // adding port support through installer
+        if (!empty($this->dbPort)) {
+            if (ctype_digit($this->dbPort)) {
+                $connectionParams['port'] = $this->dbPort;
+            } else {
+                $connectionParams['unix_socket'] = $this->dbPort;
+            }
+        } else if (strpos($this->dbHost, ':')) {
+            // Host variable may carry a port or socket.
+            list($host, $portOrSocket) = explode(':', $this->dbHost, 2);
+            if (ctype_digit($portOrSocket)) {
+                $connectionParams['port'] = $portOrSocket;
+            } else {
+                $connectionParams['unix_socket'] = $portOrSocket;
+            }
+            $connectionParams['host'] = $host;
+        }
 
-		$connectionParams = array_merge($connectionParams, $configOverwrite);
-		$cf = new ConnectionFactory($this->config);
-		return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
-	}
+        $connectionParams = array_merge($connectionParams, $configOverwrite);
+        $cf = new ConnectionFactory($this->config);
+        return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
+    }
 
-	/**
-	 * @param string $userName
-	 */
-	abstract public function setupDatabase($userName);
+    /**
+     * @param string $userName
+     */
+    abstract public function setupDatabase($userName);
 
-	public function runMigrations() {
-		if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
-			return;
-		}
-		$ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
-		$ms->migrate();
-	}
+    public function runMigrations() {
+        if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
+            return;
+        }
+        $ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
+        $ms->migrate();
+    }
 }

lib/private/DB/MigrationService.php

Doc Comments +1 added lines, -1 removed lines

@@ -271,7 +271,7 @@
 	 * Return the explicit version for the aliases; current, next, prev, latest
 	 *
 	 * @param string $alias
-	 * @return mixed|null|string
+	 * @return string
 	 */
 	public function getMigration($alias) {
 		switch($alias) {

Indentation +378 added lines, -378 removed lines

@@ -38,382 +38,382 @@
 
 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();
-
-				$migrations = $this->getAvailableVersions();
-				return @end($migrations);
-		}
-		return '0';
-	}
-
-	/**
-	 * @param string $version
-	 * @param int $delta
-	 * @return null|string
-	 */
-	private function getRelativeVersion($version, $delta) {
-		$this->ensureMigrationsAreLoaded();
-
-		$versions = $this->getAvailableVersions();
-		array_unshift($versions, 0);
-		$offset = array_search($version, $versions, true);
-		if ($offset === false || !isset($versions[$offset + $delta])) {
-			// Unknown version or delta out of bounds.
-			return null;
-		}
-
-		return (string) $versions[$offset + $delta];
-	}
-
-	/**
-	 * @return string
-	 */
-	private function getCurrentVersion() {
-		$m = $this->getMigratedVersions();
-		if (count($m) === 0) {
-			return '0';
-		}
-		$migrations = array_values($m);
-		return @end($migrations);
-	}
-
-	/**
-	 * @param string $version
-	 * @return string
-	 * @throws \InvalidArgumentException
-	 */
-	private function getClass($version) {
-		$this->ensureMigrationsAreLoaded();
-
-		if (isset($this->migrations[$version])) {
-			return $this->migrations[$version];
-		}
-
-		throw new \InvalidArgumentException("Version $version is unknown.");
-	}
-
-	/**
-	 * Allows to set an IOutput implementation which is used for logging progress and messages
-	 *
-	 * @param IOutput $output
-	 */
-	public function setOutput(IOutput $output) {
-		$this->output = $output;
-	}
-
-	/**
-	 * Applies all not yet applied versions up to $to
-	 *
-	 * @param string $to
-	 * @throws \InvalidArgumentException
-	 */
-	public function migrate($to = 'latest') {
-		// read known migrations
-		$toBeExecuted = $this->getMigrationsToExecute($to);
-		foreach ($toBeExecuted as $version) {
-			$this->executeStep($version);
-		}
-	}
-
-	/**
-	 * @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();
+
+                $migrations = $this->getAvailableVersions();
+                return @end($migrations);
+        }
+        return '0';
+    }
+
+    /**
+     * @param string $version
+     * @param int $delta
+     * @return null|string
+     */
+    private function getRelativeVersion($version, $delta) {
+        $this->ensureMigrationsAreLoaded();
+
+        $versions = $this->getAvailableVersions();
+        array_unshift($versions, 0);
+        $offset = array_search($version, $versions, true);
+        if ($offset === false || !isset($versions[$offset + $delta])) {
+            // Unknown version or delta out of bounds.
+            return null;
+        }
+
+        return (string) $versions[$offset + $delta];
+    }
+
+    /**
+     * @return string
+     */
+    private function getCurrentVersion() {
+        $m = $this->getMigratedVersions();
+        if (count($m) === 0) {
+            return '0';
+        }
+        $migrations = array_values($m);
+        return @end($migrations);
+    }
+
+    /**
+     * @param string $version
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    private function getClass($version) {
+        $this->ensureMigrationsAreLoaded();
+
+        if (isset($this->migrations[$version])) {
+            return $this->migrations[$version];
+        }
+
+        throw new \InvalidArgumentException("Version $version is unknown.");
+    }
+
+    /**
+     * Allows to set an IOutput implementation which is used for logging progress and messages
+     *
+     * @param IOutput $output
+     */
+    public function setOutput(IOutput $output) {
+        $this->output = $output;
+    }
+
+    /**
+     * Applies all not yet applied versions up to $to
+     *
+     * @param string $to
+     * @throws \InvalidArgumentException
+     */
+    public function migrate($to = 'latest') {
+        // read known migrations
+        $toBeExecuted = $this->getMigrationsToExecute($to);
+        foreach ($toBeExecuted as $version) {
+            $this->executeStep($version);
+        }
+    }
+
+    /**
+     * @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();
+        }
+    }
 }

core/register_command.php

Indentation +93 added lines, -93 removed lines

@@ -40,120 +40,120 @@
 $application->add(new OC\Core\Command\App\CheckCode($infoParser));
 $application->add(new OC\Core\Command\L10n\CreateJs());
 $application->add(new \OC\Core\Command\Integrity\SignApp(
-		\OC::$server->getIntegrityCodeChecker(),
-		new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
-		\OC::$server->getURLGenerator()
+        \OC::$server->getIntegrityCodeChecker(),
+        new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
+        \OC::$server->getURLGenerator()
 ));
 $application->add(new \OC\Core\Command\Integrity\SignCore(
-		\OC::$server->getIntegrityCodeChecker(),
-		new \OC\IntegrityCheck\Helpers\FileAccessHelper()
+        \OC::$server->getIntegrityCodeChecker(),
+        new \OC\IntegrityCheck\Helpers\FileAccessHelper()
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckApp(
-		\OC::$server->getIntegrityCodeChecker()
+        \OC::$server->getIntegrityCodeChecker()
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckCore(
-		\OC::$server->getIntegrityCodeChecker()
+        \OC::$server->getIntegrityCodeChecker()
 ));
 
 
 if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
-	$application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\GetPath());
-	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\GetPath());
+    $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
 	
-	$application->add(new OC\Core\Command\TwoFactorAuth\Enable(
-		\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
-	));
-	$application->add(new OC\Core\Command\TwoFactorAuth\Disable(
-		\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
-	));
+    $application->add(new OC\Core\Command\TwoFactorAuth\Enable(
+        \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
+    ));
+    $application->add(new OC\Core\Command\TwoFactorAuth\Disable(
+        \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
+    ));
 
-	$application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
 
-	$application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
-	$application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
+    $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
 
-	$application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
-	$application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
-	$application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
+    $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
+    $application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()));
 
-	$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
-	$application->add(new OC\Core\Command\Encryption\DecryptAll(
-		\OC::$server->getEncryptionManager(),
-		\OC::$server->getAppManager(),
-		\OC::$server->getConfig(),
-		new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
-		new \Symfony\Component\Console\Helper\QuestionHelper())
-	);
+    $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
+    $application->add(new OC\Core\Command\Encryption\DecryptAll(
+        \OC::$server->getEncryptionManager(),
+        \OC::$server->getAppManager(),
+        \OC::$server->getConfig(),
+        new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
+        new \Symfony\Component\Console\Helper\QuestionHelper())
+    );
 
-	$application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
 
-	$view = new \OC\Files\View();
-	$util = new \OC\Encryption\Util(
-		$view,
-		\OC::$server->getUserManager(),
-		\OC::$server->getGroupManager(),
-		\OC::$server->getConfig()
-	);
-	$application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
-			$view,
-			\OC::$server->getUserManager(),
-			\OC::$server->getConfig(),
-			$util,
-			new \Symfony\Component\Console\Helper\QuestionHelper()
-		)
-	);
-	$application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
+    $view = new \OC\Files\View();
+    $util = new \OC\Encryption\Util(
+        $view,
+        \OC::$server->getUserManager(),
+        \OC::$server->getGroupManager(),
+        \OC::$server->getConfig()
+    );
+    $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
+            $view,
+            \OC::$server->getUserManager(),
+            \OC::$server->getConfig(),
+            $util,
+            new \Symfony\Component\Console\Helper\QuestionHelper()
+        )
+    );
+    $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
 
-	$application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
-	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
-	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
-	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
-	$application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
+    $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
+    $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
+    $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
+    $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
+    $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
 
-	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
-	$application->add(new OC\Core\Command\Maintenance\Repair(
-		new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
-		\OC::$server->getEventDispatcher()));
+    $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
+    $application->add(new OC\Core\Command\Maintenance\Repair(
+        new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
+        \OC::$server->getEventDispatcher()));
 
-	$application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
 
-	$application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
 
-	$application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
-	$application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
-	$application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
+    $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
+    $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
+    $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
 } else {
-	$application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
 }

core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php

Indentation +95 added lines, -95 removed lines

@@ -37,163 +37,163 @@
 
 class GenerateFromSchemaFileCommand extends GenerateCommand {
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var IAppManager */
-	protected $appManager;
+    /** @var IAppManager */
+    protected $appManager;
 
-	public function __construct(IConfig $config, IAppManager $appManager, IDBConnection $connection) {
-		parent::__construct($connection);
-		$this->config = $config;
-		$this->appManager = $appManager;
-	}
+    public function __construct(IConfig $config, IAppManager $appManager, IDBConnection $connection) {
+        parent::__construct($connection);
+        $this->config = $config;
+        $this->appManager = $appManager;
+    }
 
 
-	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) {
-		$appName = $input->getArgument('app');
-		$version = $input->getArgument('version');
+    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;
-		}
+        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 Schema $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) {
-					$default = is_numeric($default) ? $default : "'$default'";
-					$content .= str_replace('{{default}}', $default, <<<'EOT'
+                    );
+                }
+                $default = $column->getDefault();
+                if ($default !== null) {
+                    $default = is_numeric($default) ? $default : "'$default'";
+                    $content .= str_replace('{{default}}', $default, <<<'EOT'
 				'default' => {{default}},
 
 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;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -60,14 +60,14 @@ 
 		$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;
 		}
 
-		$schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
+		$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>');
+			$output->writeln('<error>App '.$appName.' does not have a database.xml file</error>');
 			return 2;
 		}
 
@@ -80,7 +80,7 @@ 
 		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
 		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
+		$path = $this->generateMigration($ms, 'Version'.$version.'Date'.$date, $schemaBody);
 
 		$output->writeln("New migration class has been generated to <info>$path</info>");
 		return 0;