nextcloud / server

core/Command/Integrity/SignApp.php

Indentation +65 added lines, -65 removed lines

@@ -40,76 +40,76 @@
  * @package OC\Core\Command\Integrity
  */
 class SignApp extends Command {
-	/** @var Checker */
-	private $checker;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var Checker */
+    private $checker;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param Checker $checker
-	 * @param FileAccessHelper $fileAccessHelper
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(Checker $checker,
-								FileAccessHelper $fileAccessHelper,
-								IURLGenerator $urlGenerator) {
-		parent::__construct(null);
-		$this->checker = $checker;
-		$this->fileAccessHelper = $fileAccessHelper;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param Checker $checker
+     * @param FileAccessHelper $fileAccessHelper
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(Checker $checker,
+                                FileAccessHelper $fileAccessHelper,
+                                IURLGenerator $urlGenerator) {
+        parent::__construct(null);
+        $this->checker = $checker;
+        $this->fileAccessHelper = $fileAccessHelper;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	protected function configure() {
-		$this
-			->setName('integrity:sign-app')
-			->setDescription('Signs an app using a private key.')
-			->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign')
-			->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
-			->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing');
-	}
+    protected function configure() {
+        $this
+            ->setName('integrity:sign-app')
+            ->setDescription('Signs an app using a private key.')
+            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign')
+            ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
+            ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$path = $input->getOption('path');
-		$privateKeyPath = $input->getOption('privateKey');
-		$keyBundlePath = $input->getOption('certificate');
-		if (is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) {
-			$documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
-			$output->writeln('This command requires the --path, --privateKey and --certificate.');
-			$output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
-			$output->writeln('For more information please consult the documentation: '. $documentationUrl);
-			return 1;
-		}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $path = $input->getOption('path');
+        $privateKeyPath = $input->getOption('privateKey');
+        $keyBundlePath = $input->getOption('certificate');
+        if (is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) {
+            $documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
+            $output->writeln('This command requires the --path, --privateKey and --certificate.');
+            $output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
+            $output->writeln('For more information please consult the documentation: '. $documentationUrl);
+            return 1;
+        }
 
-		$privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
-		$keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
+        $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
+        $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
 
-		if ($privateKey === false) {
-			$output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
-			return 1;
-		}
+        if ($privateKey === false) {
+            $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
+            return 1;
+        }
 
-		if ($keyBundle === false) {
-			$output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
-			return 1;
-		}
+        if ($keyBundle === false) {
+            $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
+            return 1;
+        }
 
-		$rsa = new RSA();
-		$rsa->loadKey($privateKey);
-		$x509 = new X509();
-		$x509->loadX509($keyBundle);
-		$x509->setPrivateKey($rsa);
-		try {
-			$this->checker->writeAppSignature($path, $x509, $rsa);
-			$output->writeln('Successfully signed "'.$path.'"');
-		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
-		return 0;
-	}
+        $rsa = new RSA();
+        $rsa->loadKey($privateKey);
+        $x509 = new X509();
+        $x509->loadX509($keyBundle);
+        $x509->setPrivateKey($rsa);
+        try {
+            $this->checker->writeAppSignature($path, $x509, $rsa);
+            $output->writeln('Successfully signed "'.$path.'"');
+        } catch (\Exception $e) {
+            $output->writeln('Error: ' . $e->getMessage());
+            return 1;
+        }
+        return 0;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 			$documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity');
 			$output->writeln('This command requires the --path, --privateKey and --certificate.');
 			$output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"');
-			$output->writeln('For more information please consult the documentation: '. $documentationUrl);
+			$output->writeln('For more information please consult the documentation: '.$documentationUrl);
 			return 1;
 		}
 
@@ -107,7 +107,7 @@ 
 			$this->checker->writeAppSignature($path, $x509, $rsa);
 			$output->writeln('Successfully signed "'.$path.'"');
 		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
+			$output->writeln('Error: '.$e->getMessage());
 			return 1;
 		}
 		return 0;

core/Command/Integrity/CheckCore.php

Indentation +28 added lines, -28 removed lines

@@ -36,35 +36,35 @@
  * @package OC\Core\Command\Integrity
  */
 class CheckCore extends Base {
-	/**
-	 * @var Checker
-	 */
-	private $checker;
+    /**
+     * @var Checker
+     */
+    private $checker;
 
-	public function __construct(Checker $checker) {
-		parent::__construct();
-		$this->checker = $checker;
-	}
+    public function __construct(Checker $checker) {
+        parent::__construct();
+        $this->checker = $checker;
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function configure() {
-		parent::configure();
-		$this
-			->setName('integrity:check-core')
-			->setDescription('Check integrity of core code using a signature.');
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('integrity:check-core')
+            ->setDescription('Check integrity of core code using a signature.');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$result = $this->checker->verifyCoreSignature();
-		$this->writeArrayInOutputFormat($input, $output, $result);
-		if (count($result)>0) {
-			return 1;
-		}
-		return 0;
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $result = $this->checker->verifyCoreSignature();
+        $this->writeArrayInOutputFormat($input, $output, $result);
+        if (count($result)>0) {
+            return 1;
+        }
+        return 0;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$result = $this->checker->verifyCoreSignature();
 		$this->writeArrayInOutputFormat($input, $output, $result);
-		if (count($result)>0) {
+		if (count($result) > 0) {
 			return 1;
 		}
 		return 0;

core/Command/Integrity/CheckApp.php

Indentation +32 added lines, -32 removed lines

@@ -41,39 +41,39 @@
  */
 class CheckApp extends Base {
 
-	/**
-	 * @var Checker
-	 */
-	private $checker;
+    /**
+     * @var Checker
+     */
+    private $checker;
 
-	public function __construct(Checker $checker) {
-		parent::__construct();
-		$this->checker = $checker;
-	}
+    public function __construct(Checker $checker) {
+        parent::__construct();
+        $this->checker = $checker;
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function configure() {
-		parent::configure();
-		$this
-			->setName('integrity:check-app')
-			->setDescription('Check integrity of an app using a signature.')
-			->addArgument('appid', InputArgument::REQUIRED, 'Application to check')
-			->addOption('path', null, InputOption::VALUE_OPTIONAL, 'Path to application. If none is given it will be guessed.');
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function configure() {
+        parent::configure();
+        $this
+            ->setName('integrity:check-app')
+            ->setDescription('Check integrity of an app using a signature.')
+            ->addArgument('appid', InputArgument::REQUIRED, 'Application to check')
+            ->addOption('path', null, InputOption::VALUE_OPTIONAL, 'Path to application. If none is given it will be guessed.');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appid = $input->getArgument('appid');
-		$path = (string)$input->getOption('path');
-		$result = $this->checker->verifyAppSignature($appid, $path);
-		$this->writeArrayInOutputFormat($input, $output, $result);
-		if (count($result)>0) {
-			return 1;
-		}
-		return 0;
-	}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appid = $input->getArgument('appid');
+        $path = (string)$input->getOption('path');
+        $result = $this->checker->verifyAppSignature($appid, $path);
+        $this->writeArrayInOutputFormat($input, $output, $result);
+        if (count($result)>0) {
+            return 1;
+        }
+        return 0;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -68,10 +68,10 @@
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$appid = $input->getArgument('appid');
-		$path = (string)$input->getOption('path');
+		$path = (string) $input->getOption('path');
 		$result = $this->checker->verifyAppSignature($appid, $path);
 		$this->writeArrayInOutputFormat($input, $output, $result);
-		if (count($result)>0) {
+		if (count($result) > 0) {
 			return 1;
 		}
 		return 0;

core/Command/Integrity/SignCore.php

Indentation +57 added lines, -57 removed lines

@@ -39,69 +39,69 @@
  * @package OC\Core\Command\Integrity
  */
 class SignCore extends Command {
-	/** @var Checker */
-	private $checker;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
+    /** @var Checker */
+    private $checker;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
 
-	/**
-	 * @param Checker $checker
-	 * @param FileAccessHelper $fileAccessHelper
-	 */
-	public function __construct(Checker $checker,
-								FileAccessHelper $fileAccessHelper) {
-		parent::__construct(null);
-		$this->checker = $checker;
-		$this->fileAccessHelper = $fileAccessHelper;
-	}
+    /**
+     * @param Checker $checker
+     * @param FileAccessHelper $fileAccessHelper
+     */
+    public function __construct(Checker $checker,
+                                FileAccessHelper $fileAccessHelper) {
+        parent::__construct(null);
+        $this->checker = $checker;
+        $this->fileAccessHelper = $fileAccessHelper;
+    }
 
-	protected function configure() {
-		$this
-			->setName('integrity:sign-core')
-			->setDescription('Sign core using a private key.')
-			->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
-			->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing')
-			->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign');
-	}
+    protected function configure() {
+        $this
+            ->setName('integrity:sign-core')
+            ->setDescription('Sign core using a private key.')
+            ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing')
+            ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing')
+            ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign');
+    }
 
-	/**
-	 * {@inheritdoc }
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$privateKeyPath = $input->getOption('privateKey');
-		$keyBundlePath = $input->getOption('certificate');
-		$path = $input->getOption('path');
-		if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) {
-			$output->writeln('--privateKey, --certificate and --path are required.');
-			return 1;
-		}
+    /**
+     * {@inheritdoc }
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $privateKeyPath = $input->getOption('privateKey');
+        $keyBundlePath = $input->getOption('certificate');
+        $path = $input->getOption('path');
+        if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) {
+            $output->writeln('--privateKey, --certificate and --path are required.');
+            return 1;
+        }
 
-		$privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
-		$keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
+        $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath);
+        $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath);
 
-		if ($privateKey === false) {
-			$output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
-			return 1;
-		}
+        if ($privateKey === false) {
+            $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath));
+            return 1;
+        }
 
-		if ($keyBundle === false) {
-			$output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
-			return 1;
-		}
+        if ($keyBundle === false) {
+            $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath));
+            return 1;
+        }
 
-		$rsa = new RSA();
-		$rsa->loadKey($privateKey);
-		$x509 = new X509();
-		$x509->loadX509($keyBundle);
-		$x509->setPrivateKey($rsa);
+        $rsa = new RSA();
+        $rsa->loadKey($privateKey);
+        $x509 = new X509();
+        $x509->loadX509($keyBundle);
+        $x509->setPrivateKey($rsa);
 
-		try {
-			$this->checker->writeCoreSignature($x509, $rsa, $path);
-			$output->writeln('Successfully signed "core"');
-		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
-		return 0;
-	}
+        try {
+            $this->checker->writeCoreSignature($x509, $rsa, $path);
+            $output->writeln('Successfully signed "core"');
+        } catch (\Exception $e) {
+            $output->writeln('Error: ' . $e->getMessage());
+            return 1;
+        }
+        return 0;
+    }
 }

core/Command/Background/Base.php

Indentation +32 added lines, -32 removed lines

@@ -37,40 +37,40 @@
  * Subclasses will override the getMode() function to specify the mode to configure.
  */
 abstract class Base extends Command {
-	abstract protected function getMode();
+    abstract protected function getMode();
 
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		$mode = $this->getMode();
-		$this
-			->setName("background:$mode")
-			->setDescription("Use $mode to run background jobs");
-	}
+    protected function configure() {
+        $mode = $this->getMode();
+        $this
+            ->setName("background:$mode")
+            ->setDescription("Use $mode to run background jobs");
+    }
 
-	/**
-	 * Executing this command will set the background job mode for owncloud.
-	 * The mode to set is specified by the concrete sub class by implementing the
-	 * getMode() function.
-	 *
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mode = $this->getMode();
-		$this->config->setAppValue('core', 'backgroundjobs_mode', $mode);
-		$output->writeln("Set mode for background jobs to '$mode'");
-		return 0;
-	}
+    /**
+     * Executing this command will set the background job mode for owncloud.
+     * The mode to set is specified by the concrete sub class by implementing the
+     * getMode() function.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mode = $this->getMode();
+        $this->config->setAppValue('core', 'backgroundjobs_mode', $mode);
+        $output->writeln("Set mode for background jobs to '$mode'");
+        return 0;
+    }
 }

core/Command/L10n/CreateJs.php

Indentation +131 added lines, -131 removed lines

@@ -36,135 +36,135 @@
 use UnexpectedValueException;
 
 class CreateJs extends Command implements CompletionAwareInterface {
-	protected function configure() {
-		$this
-			->setName('l10n:createjs')
-			->setDescription('Create javascript translation files for a given app')
-			->addArgument(
-				'app',
-				InputOption::VALUE_REQUIRED,
-				'name of the app'
-			)
-			->addArgument(
-				'lang',
-				InputOption::VALUE_OPTIONAL,
-				'name of the language'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$app = $input->getArgument('app');
-		$lang = $input->getArgument('lang');
-
-		$path = \OC_App::getAppPath($app);
-		if ($path === false) {
-			$output->writeln("The app <$app> is unknown.");
-			return 1;
-		}
-		$languages = $lang;
-		if (empty($lang)) {
-			$languages= $this->getAllLanguages($path);
-		}
-
-		foreach ($languages as $lang) {
-			$this->writeFiles($app, $path, $lang, $output);
-		}
-		return 0;
-	}
-
-	private function getAllLanguages($path) {
-		$result = [];
-		foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
-			if ($fileInfo->isDot()) {
-				continue;
-			}
-			if ($fileInfo->isDir()) {
-				continue;
-			}
-			if ($fileInfo->getExtension() !== 'php') {
-				continue;
-			}
-			$result[]= substr($fileInfo->getBasename(), 0, -4);
-		}
-
-		return $result;
-	}
-
-	private function writeFiles($app, $path, $lang, OutputInterface $output) {
-		list($translations, $plurals) = $this->loadTranslations($path, $lang);
-		$this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
-		$this->writeJsonFile($path, $lang, $output, $translations, $plurals);
-	}
-
-	private function writeJsFile($app, $path, $lang, OutputInterface $output, $translations, $plurals) {
-		$jsFile = "$path/l10n/$lang.js";
-		if (file_exists($jsFile)) {
-			$output->writeln("File already exists: $jsFile");
-			return;
-		}
-		$content = "OC.L10N.register(\n    \"$app\",\n    {\n    ";
-		$jsTrans = [];
-		foreach ($translations as $id => $val) {
-			if (is_array($val)) {
-				$val = '[ ' . implode(',', $val) . ']';
-			}
-			$jsTrans[] = "\"$id\" : \"$val\"";
-		}
-		$content .= implode(",\n    ", $jsTrans);
-		$content .= "\n},\n\"$plurals\");\n";
-
-		file_put_contents($jsFile, $content);
-		$output->writeln("Javascript translation file generated: $jsFile");
-	}
-
-	private function writeJsonFile($path, $lang, OutputInterface $output, $translations, $plurals) {
-		$jsFile = "$path/l10n/$lang.json";
-		if (file_exists($jsFile)) {
-			$output->writeln("File already exists: $jsFile");
-			return;
-		}
-		$content = ['translations' => $translations, 'pluralForm' => $plurals];
-		file_put_contents($jsFile, json_encode($content));
-		$output->writeln("Json translation file generated: $jsFile");
-	}
-
-	private function loadTranslations($path, $lang) {
-		$phpFile = "$path/l10n/$lang.php";
-		$TRANSLATIONS = [];
-		$PLURAL_FORMS = '';
-		if (!file_exists($phpFile)) {
-			throw new UnexpectedValueException("PHP translation file <$phpFile> does not exist.");
-		}
-		require $phpFile;
-
-		return [$TRANSLATIONS, $PLURAL_FORMS];
-	}
-
-	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * Return possible values for the named argument
-	 *
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return \OC_App::getAllApps();
-		} elseif ($argumentName === 'lang') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-			return $this->getAllLanguages(\OC_App::getAppPath($appName));
-		}
-		return [];
-	}
+    protected function configure() {
+        $this
+            ->setName('l10n:createjs')
+            ->setDescription('Create javascript translation files for a given app')
+            ->addArgument(
+                'app',
+                InputOption::VALUE_REQUIRED,
+                'name of the app'
+            )
+            ->addArgument(
+                'lang',
+                InputOption::VALUE_OPTIONAL,
+                'name of the language'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $app = $input->getArgument('app');
+        $lang = $input->getArgument('lang');
+
+        $path = \OC_App::getAppPath($app);
+        if ($path === false) {
+            $output->writeln("The app <$app> is unknown.");
+            return 1;
+        }
+        $languages = $lang;
+        if (empty($lang)) {
+            $languages= $this->getAllLanguages($path);
+        }
+
+        foreach ($languages as $lang) {
+            $this->writeFiles($app, $path, $lang, $output);
+        }
+        return 0;
+    }
+
+    private function getAllLanguages($path) {
+        $result = [];
+        foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
+            if ($fileInfo->isDot()) {
+                continue;
+            }
+            if ($fileInfo->isDir()) {
+                continue;
+            }
+            if ($fileInfo->getExtension() !== 'php') {
+                continue;
+            }
+            $result[]= substr($fileInfo->getBasename(), 0, -4);
+        }
+
+        return $result;
+    }
+
+    private function writeFiles($app, $path, $lang, OutputInterface $output) {
+        list($translations, $plurals) = $this->loadTranslations($path, $lang);
+        $this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
+        $this->writeJsonFile($path, $lang, $output, $translations, $plurals);
+    }
+
+    private function writeJsFile($app, $path, $lang, OutputInterface $output, $translations, $plurals) {
+        $jsFile = "$path/l10n/$lang.js";
+        if (file_exists($jsFile)) {
+            $output->writeln("File already exists: $jsFile");
+            return;
+        }
+        $content = "OC.L10N.register(\n    \"$app\",\n    {\n    ";
+        $jsTrans = [];
+        foreach ($translations as $id => $val) {
+            if (is_array($val)) {
+                $val = '[ ' . implode(',', $val) . ']';
+            }
+            $jsTrans[] = "\"$id\" : \"$val\"";
+        }
+        $content .= implode(",\n    ", $jsTrans);
+        $content .= "\n},\n\"$plurals\");\n";
+
+        file_put_contents($jsFile, $content);
+        $output->writeln("Javascript translation file generated: $jsFile");
+    }
+
+    private function writeJsonFile($path, $lang, OutputInterface $output, $translations, $plurals) {
+        $jsFile = "$path/l10n/$lang.json";
+        if (file_exists($jsFile)) {
+            $output->writeln("File already exists: $jsFile");
+            return;
+        }
+        $content = ['translations' => $translations, 'pluralForm' => $plurals];
+        file_put_contents($jsFile, json_encode($content));
+        $output->writeln("Json translation file generated: $jsFile");
+    }
+
+    private function loadTranslations($path, $lang) {
+        $phpFile = "$path/l10n/$lang.php";
+        $TRANSLATIONS = [];
+        $PLURAL_FORMS = '';
+        if (!file_exists($phpFile)) {
+            throw new UnexpectedValueException("PHP translation file <$phpFile> does not exist.");
+        }
+        require $phpFile;
+
+        return [$TRANSLATIONS, $PLURAL_FORMS];
+    }
+
+    /**
+     * Return possible values for the named option
+     *
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * Return possible values for the named argument
+     *
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return \OC_App::getAllApps();
+        } elseif ($argumentName === 'lang') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+            return $this->getAllLanguages(\OC_App::getAppPath($appName));
+        }
+        return [];
+    }
 }

core/Command/Db/ConvertFilecacheBigInt.php

Indentation +83 added lines, -83 removed lines

@@ -38,87 +38,87 @@
 
 class ConvertFilecacheBigInt extends Command {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:convert-filecache-bigint')
-			->setDescription('Convert the ID columns of the filecache to BigInt');
-	}
-
-	protected function getColumnsByTable() {
-		// also update in CheckSetupController::hasBigIntConversionPendingColumns()
-		return [
-			'activity' => ['activity_id', 'object_id'],
-			'activity_mq' => ['mail_id'],
-			'authtoken' => ['id'],
-			'bruteforce_attempts' => ['id'],
-			'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
-			'file_locks' => ['id'],
-			'jobs' => ['id'],
-			'mimetypes' => ['id'],
-			'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
-			'storages' => ['numeric_id'],
-		];
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$schema = new SchemaWrapper($this->connection);
-		$isSqlite = $this->connection->getDatabasePlatform() instanceof SqlitePlatform;
-		$updates = [];
-
-		$tables = $this->getColumnsByTable();
-		foreach ($tables as $tableName => $columns) {
-			if (!$schema->hasTable($tableName)) {
-				continue;
-			}
-
-			$table = $schema->getTable($tableName);
-
-			foreach ($columns as $columnName) {
-				$column = $table->getColumn($columnName);
-				$isAutoIncrement = $column->getAutoincrement();
-				$isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
-				if ($column->getType()->getName() !== Type::BIGINT && !$isAutoIncrementOnSqlite) {
-					$column->setType(Type::getType(Type::BIGINT));
-					$column->setOptions(['length' => 20]);
-
-					$updates[] = '* ' . $tableName . '.' . $columnName;
-				}
-			}
-		}
-
-		if (empty($updates)) {
-			$output->writeln('<info>All tables already up to date!</info>');
-			return 0;
-		}
-
-		$output->writeln('<comment>Following columns will be updated:</comment>');
-		$output->writeln('');
-		$output->writeln($updates);
-		$output->writeln('');
-		$output->writeln('<comment>This can take up to hours, depending on the number of files in your instance!</comment>');
-
-		if ($input->isInteractive()) {
-			$helper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', false);
-
-			if (!$helper->ask($input, $output, $question)) {
-				return 1;
-			}
-		}
-
-		$this->connection->migrateToSchema($schema->getWrappedSchema());
-
-		return 0;
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:convert-filecache-bigint')
+            ->setDescription('Convert the ID columns of the filecache to BigInt');
+    }
+
+    protected function getColumnsByTable() {
+        // also update in CheckSetupController::hasBigIntConversionPendingColumns()
+        return [
+            'activity' => ['activity_id', 'object_id'],
+            'activity_mq' => ['mail_id'],
+            'authtoken' => ['id'],
+            'bruteforce_attempts' => ['id'],
+            'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
+            'file_locks' => ['id'],
+            'jobs' => ['id'],
+            'mimetypes' => ['id'],
+            'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
+            'storages' => ['numeric_id'],
+        ];
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $schema = new SchemaWrapper($this->connection);
+        $isSqlite = $this->connection->getDatabasePlatform() instanceof SqlitePlatform;
+        $updates = [];
+
+        $tables = $this->getColumnsByTable();
+        foreach ($tables as $tableName => $columns) {
+            if (!$schema->hasTable($tableName)) {
+                continue;
+            }
+
+            $table = $schema->getTable($tableName);
+
+            foreach ($columns as $columnName) {
+                $column = $table->getColumn($columnName);
+                $isAutoIncrement = $column->getAutoincrement();
+                $isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
+                if ($column->getType()->getName() !== Type::BIGINT && !$isAutoIncrementOnSqlite) {
+                    $column->setType(Type::getType(Type::BIGINT));
+                    $column->setOptions(['length' => 20]);
+
+                    $updates[] = '* ' . $tableName . '.' . $columnName;
+                }
+            }
+        }
+
+        if (empty($updates)) {
+            $output->writeln('<info>All tables already up to date!</info>');
+            return 0;
+        }
+
+        $output->writeln('<comment>Following columns will be updated:</comment>');
+        $output->writeln('');
+        $output->writeln($updates);
+        $output->writeln('');
+        $output->writeln('<comment>This can take up to hours, depending on the number of files in your instance!</comment>');
+
+        if ($input->isInteractive()) {
+            $helper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', false);
+
+            if (!$helper->ask($input, $output, $question)) {
+                return 1;
+            }
+        }
+
+        $this->connection->migrateToSchema($schema->getWrappedSchema());
+
+        return 0;
+    }
 }

core/Command/Db/ConvertType.php

Indentation +411 added lines, -411 removed lines

@@ -54,415 +54,415 @@
 use Symfony\Component\Console\Question\Question;
 
 class ConvertType extends Command implements CompletionAwareInterface {
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var \OC\DB\ConnectionFactory
-	 */
-	protected $connectionFactory;
-
-	/** @var array */
-	protected $columnTypes;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OC\DB\ConnectionFactory $connectionFactory
-	 */
-	public function __construct(IConfig $config, ConnectionFactory $connectionFactory) {
-		$this->config = $config;
-		$this->connectionFactory = $connectionFactory;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:convert-type')
-			->setDescription('Convert the Nextcloud database to the newly configured one')
-			->addArgument(
-				'type',
-				InputArgument::REQUIRED,
-				'the type of the database to convert to'
-			)
-			->addArgument(
-				'username',
-				InputArgument::REQUIRED,
-				'the username of the database to convert to'
-			)
-			->addArgument(
-				'hostname',
-				InputArgument::REQUIRED,
-				'the hostname of the database to convert to'
-			)
-			->addArgument(
-				'database',
-				InputArgument::REQUIRED,
-				'the name of the database to convert to'
-			)
-			->addOption(
-				'port',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'the port of the database to convert to'
-			)
-			->addOption(
-				'password',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'the password of the database to convert to. Will be asked when not specified. Can also be passed via stdin.'
-			)
-			->addOption(
-				'clear-schema',
-				null,
-				InputOption::VALUE_NONE,
-				'remove all tables from the destination database'
-			)
-			->addOption(
-				'all-apps',
-				null,
-				InputOption::VALUE_NONE,
-				'whether to create schema for all apps instead of only installed apps'
-			)
-			->addOption(
-				'chunk-size',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'the maximum number of database rows to handle in a single query, bigger tables will be handled in chunks of this size. Lower this if the process runs out of memory during conversion.',
-				1000
-			)
-		;
-	}
-
-	protected function validateInput(InputInterface $input, OutputInterface $output) {
-		$type = $this->connectionFactory->normalizeType($input->getArgument('type'));
-		if ($type === 'sqlite3') {
-			throw new \InvalidArgumentException(
-				'Converting to SQLite (sqlite3) is currently not supported.'
-			);
-		}
-		if ($type === $this->config->getSystemValue('dbtype', '')) {
-			throw new \InvalidArgumentException(sprintf(
-				'Can not convert from %1$s to %1$s.',
-				$type
-			));
-		}
-		if ($type === 'oci' && $input->getOption('clear-schema')) {
-			// Doctrine unconditionally tries (at least in version 2.3)
-			// to drop sequence triggers when dropping a table, even though
-			// such triggers may not exist. This results in errors like
-			// "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
-			throw new \InvalidArgumentException(
-				'The --clear-schema option is not supported when converting to Oracle (oci).'
-			);
-		}
-	}
-
-	protected function readPassword(InputInterface $input, OutputInterface $output) {
-		// Explicitly specified password
-		if ($input->getOption('password')) {
-			return;
-		}
-
-		// Read from stdin. stream_set_blocking is used to prevent blocking
-		// when nothing is passed via stdin.
-		stream_set_blocking(STDIN, 0);
-		$password = file_get_contents('php://stdin');
-		stream_set_blocking(STDIN, 1);
-		if (trim($password) !== '') {
-			$input->setOption('password', $password);
-			return;
-		}
-
-		// Read password by interacting
-		if ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-			$question = new Question('What is the database password?');
-			$question->setHidden(true);
-			$question->setHiddenFallback(false);
-			$password = $helper->ask($input, $output, $question);
-			$input->setOption('password', $password);
-			return;
-		}
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->validateInput($input, $output);
-		$this->readPassword($input, $output);
-
-		$fromDB = \OC::$server->getDatabaseConnection();
-		$toDB = $this->getToDBConnection($input, $output);
-
-		if ($input->getOption('clear-schema')) {
-			$this->clearSchema($toDB, $input, $output);
-		}
-
-		$this->createSchema($fromDB, $toDB, $input, $output);
-
-		$toTables = $this->getTables($toDB);
-		$fromTables = $this->getTables($fromDB);
-
-		// warn/fail if there are more tables in 'from' database
-		$extraFromTables = array_diff($fromTables, $toTables);
-		if (!empty($extraFromTables)) {
-			$output->writeln('<comment>The following tables will not be converted:</comment>');
-			$output->writeln($extraFromTables);
-			if (!$input->getOption('all-apps')) {
-				$output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>');
-				$output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
-			}
-
-			$continueConversion = !$input->isInteractive(); // assume yes for --no-interaction and no otherwise.
-			$question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', $continueConversion);
-
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			if (!$helper->ask($input, $output, $question)) {
-				return 1;
-			}
-		}
-		$intersectingTables = array_intersect($toTables, $fromTables);
-		$this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
-		return 0;
-	}
-
-	protected function createSchema(Connection $fromDB, Connection $toDB, InputInterface $input, OutputInterface $output) {
-		$output->writeln('<info>Creating schema in new database</info>');
-
-		$fromMS = new MigrationService('core', $fromDB);
-		$currentMigration = $fromMS->getMigration('current');
-		if ($currentMigration !== '0') {
-			$toMS = new MigrationService('core', $toDB);
-			$toMS->migrate($currentMigration);
-		}
-
-		$schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
-		$apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
-		foreach ($apps as $app) {
-			if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
-				$schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
-			} else {
-				// Make sure autoloading works...
-				\OC_App::loadApp($app);
-				$fromMS = new MigrationService($app, $fromDB);
-				$currentMigration = $fromMS->getMigration('current');
-				if ($currentMigration !== '0') {
-					$toMS = new MigrationService($app, $toDB);
-					$toMS->migrate($currentMigration, true);
-				}
-			}
-		}
-	}
-
-	protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
-		$type = $input->getArgument('type');
-		$connectionParams = $this->connectionFactory->createConnectionParams();
-		$connectionParams = array_merge($connectionParams, [
-			'host' => $input->getArgument('hostname'),
-			'user' => $input->getArgument('username'),
-			'password' => $input->getOption('password'),
-			'dbname' => $input->getArgument('database'),
-		]);
-		if ($input->getOption('port')) {
-			$connectionParams['port'] = $input->getOption('port');
-		}
-		return $this->connectionFactory->getConnection($type, $connectionParams);
-	}
-
-	protected function clearSchema(Connection $db, InputInterface $input, OutputInterface $output) {
-		$toTables = $this->getTables($db);
-		if (!empty($toTables)) {
-			$output->writeln('<info>Clearing schema in new database</info>');
-		}
-		foreach ($toTables as $table) {
-			$db->getSchemaManager()->dropTable($table);
-		}
-	}
-
-	protected function getTables(Connection $db) {
-		$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-		$db->getConfiguration()->
-			setFilterSchemaAssetsExpression($filterExpression);
-		return $db->getSchemaManager()->listTableNames();
-	}
-
-	/**
-	 * @param Connection $fromDB
-	 * @param Connection $toDB
-	 * @param Table $table
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @suppress SqlInjectionChecker
-	 */
-	protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
-		if ($table->getName() === $toDB->getPrefix() . 'migrations') {
-			$output->writeln('<comment>Skipping migrations table because it was already filled by running the migrations</comment>');
-			return;
-		}
-
-		$chunkSize = $input->getOption('chunk-size');
-
-		$query = $fromDB->getQueryBuilder();
-		$query->automaticTablePrefix(false);
-		$query->select($query->func()->count('*', 'num_entries'))
-			->from($table->getName());
-		$result = $query->execute();
-		$count = $result->fetchColumn();
-		$result->closeCursor();
-
-		$numChunks = ceil($count/$chunkSize);
-		if ($numChunks > 1) {
-			$output->writeln('chunked query, ' . $numChunks . ' chunks');
-		}
-
-		$progress = new ProgressBar($output, $count);
-		$progress->start();
-		$redraw = $count > $chunkSize ? 100 : ($count > 100 ? 5 : 1);
-		$progress->setRedrawFrequency($redraw);
-
-		$query = $fromDB->getQueryBuilder();
-		$query->automaticTablePrefix(false);
-		$query->select('*')
-			->from($table->getName())
-			->setMaxResults($chunkSize);
-
-		try {
-			$orderColumns = $table->getPrimaryKeyColumns();
-		} catch (DBALException $e) {
-			$orderColumns = [];
-			foreach ($table->getColumns() as $column) {
-				$orderColumns[] = $column->getName();
-			}
-		}
-
-		foreach ($orderColumns as $column) {
-			$query->addOrderBy($column);
-		}
-
-		$insertQuery = $toDB->getQueryBuilder();
-		$insertQuery->automaticTablePrefix(false);
-		$insertQuery->insert($table->getName());
-		$parametersCreated = false;
-
-		for ($chunk = 0; $chunk < $numChunks; $chunk++) {
-			$query->setFirstResult($chunk * $chunkSize);
-
-			$result = $query->execute();
-
-			while ($row = $result->fetch()) {
-				$progress->advance();
-				if (!$parametersCreated) {
-					foreach ($row as $key => $value) {
-						$insertQuery->setValue($key, $insertQuery->createParameter($key));
-					}
-					$parametersCreated = true;
-				}
-
-				foreach ($row as $key => $value) {
-					$type = $this->getColumnType($table, $key);
-					if ($type !== false) {
-						$insertQuery->setParameter($key, $value, $type);
-					} else {
-						$insertQuery->setParameter($key, $value);
-					}
-				}
-				$insertQuery->execute();
-			}
-			$result->closeCursor();
-		}
-		$progress->finish();
-	}
-
-	protected function getColumnType(Table $table, $columnName) {
-		$tableName = $table->getName();
-		if (isset($this->columnTypes[$tableName][$columnName])) {
-			return $this->columnTypes[$tableName][$columnName];
-		}
-
-		$type = $table->getColumn($columnName)->getType()->getName();
-
-		switch ($type) {
-			case Type::BLOB:
-			case Type::TEXT:
-				$this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB;
-				break;
-			case Type::BOOLEAN:
-				$this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_BOOL;
-				break;
-			default:
-				$this->columnTypes[$tableName][$columnName] = false;
-		}
-
-		return $this->columnTypes[$tableName][$columnName];
-	}
-
-	protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
-		$this->config->setSystemValue('maintenance', true);
-		$schema = $fromDB->createSchema();
-
-		try {
-			// copy table rows
-			foreach ($tables as $table) {
-				$output->writeln($table);
-				$this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
-			}
-			if ($input->getArgument('type') === 'pgsql') {
-				$tools = new \OC\DB\PgSqlTools($this->config);
-				$tools->resynchronizeDatabaseSequences($toDB);
-			}
-			// save new database config
-			$this->saveDBInfo($input);
-		} catch (\Exception $e) {
-			$this->config->setSystemValue('maintenance', false);
-			throw $e;
-		}
-		$this->config->setSystemValue('maintenance', false);
-	}
-
-	protected function saveDBInfo(InputInterface $input) {
-		$type = $input->getArgument('type');
-		$username = $input->getArgument('username');
-		$dbHost = $input->getArgument('hostname');
-		$dbName = $input->getArgument('database');
-		$password = $input->getOption('password');
-		if ($input->getOption('port')) {
-			$dbHost .= ':'.$input->getOption('port');
-		}
-
-		$this->config->setSystemValues([
-			'dbtype'		=> $type,
-			'dbname'		=> $dbName,
-			'dbhost'		=> $dbHost,
-			'dbuser'		=> $username,
-			'dbpassword'	=> $password,
-		]);
-	}
-
-	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * Return possible values for the named argument
-	 *
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'type') {
-			return ['mysql', 'oci', 'pgsql'];
-		}
-		return [];
-	}
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
+
+    /**
+     * @var \OC\DB\ConnectionFactory
+     */
+    protected $connectionFactory;
+
+    /** @var array */
+    protected $columnTypes;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OC\DB\ConnectionFactory $connectionFactory
+     */
+    public function __construct(IConfig $config, ConnectionFactory $connectionFactory) {
+        $this->config = $config;
+        $this->connectionFactory = $connectionFactory;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:convert-type')
+            ->setDescription('Convert the Nextcloud database to the newly configured one')
+            ->addArgument(
+                'type',
+                InputArgument::REQUIRED,
+                'the type of the database to convert to'
+            )
+            ->addArgument(
+                'username',
+                InputArgument::REQUIRED,
+                'the username of the database to convert to'
+            )
+            ->addArgument(
+                'hostname',
+                InputArgument::REQUIRED,
+                'the hostname of the database to convert to'
+            )
+            ->addArgument(
+                'database',
+                InputArgument::REQUIRED,
+                'the name of the database to convert to'
+            )
+            ->addOption(
+                'port',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'the port of the database to convert to'
+            )
+            ->addOption(
+                'password',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'the password of the database to convert to. Will be asked when not specified. Can also be passed via stdin.'
+            )
+            ->addOption(
+                'clear-schema',
+                null,
+                InputOption::VALUE_NONE,
+                'remove all tables from the destination database'
+            )
+            ->addOption(
+                'all-apps',
+                null,
+                InputOption::VALUE_NONE,
+                'whether to create schema for all apps instead of only installed apps'
+            )
+            ->addOption(
+                'chunk-size',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'the maximum number of database rows to handle in a single query, bigger tables will be handled in chunks of this size. Lower this if the process runs out of memory during conversion.',
+                1000
+            )
+        ;
+    }
+
+    protected function validateInput(InputInterface $input, OutputInterface $output) {
+        $type = $this->connectionFactory->normalizeType($input->getArgument('type'));
+        if ($type === 'sqlite3') {
+            throw new \InvalidArgumentException(
+                'Converting to SQLite (sqlite3) is currently not supported.'
+            );
+        }
+        if ($type === $this->config->getSystemValue('dbtype', '')) {
+            throw new \InvalidArgumentException(sprintf(
+                'Can not convert from %1$s to %1$s.',
+                $type
+            ));
+        }
+        if ($type === 'oci' && $input->getOption('clear-schema')) {
+            // Doctrine unconditionally tries (at least in version 2.3)
+            // to drop sequence triggers when dropping a table, even though
+            // such triggers may not exist. This results in errors like
+            // "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
+            throw new \InvalidArgumentException(
+                'The --clear-schema option is not supported when converting to Oracle (oci).'
+            );
+        }
+    }
+
+    protected function readPassword(InputInterface $input, OutputInterface $output) {
+        // Explicitly specified password
+        if ($input->getOption('password')) {
+            return;
+        }
+
+        // Read from stdin. stream_set_blocking is used to prevent blocking
+        // when nothing is passed via stdin.
+        stream_set_blocking(STDIN, 0);
+        $password = file_get_contents('php://stdin');
+        stream_set_blocking(STDIN, 1);
+        if (trim($password) !== '') {
+            $input->setOption('password', $password);
+            return;
+        }
+
+        // Read password by interacting
+        if ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+            $question = new Question('What is the database password?');
+            $question->setHidden(true);
+            $question->setHiddenFallback(false);
+            $password = $helper->ask($input, $output, $question);
+            $input->setOption('password', $password);
+            return;
+        }
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $this->validateInput($input, $output);
+        $this->readPassword($input, $output);
+
+        $fromDB = \OC::$server->getDatabaseConnection();
+        $toDB = $this->getToDBConnection($input, $output);
+
+        if ($input->getOption('clear-schema')) {
+            $this->clearSchema($toDB, $input, $output);
+        }
+
+        $this->createSchema($fromDB, $toDB, $input, $output);
+
+        $toTables = $this->getTables($toDB);
+        $fromTables = $this->getTables($fromDB);
+
+        // warn/fail if there are more tables in 'from' database
+        $extraFromTables = array_diff($fromTables, $toTables);
+        if (!empty($extraFromTables)) {
+            $output->writeln('<comment>The following tables will not be converted:</comment>');
+            $output->writeln($extraFromTables);
+            if (!$input->getOption('all-apps')) {
+                $output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>');
+                $output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
+            }
+
+            $continueConversion = !$input->isInteractive(); // assume yes for --no-interaction and no otherwise.
+            $question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', $continueConversion);
+
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            if (!$helper->ask($input, $output, $question)) {
+                return 1;
+            }
+        }
+        $intersectingTables = array_intersect($toTables, $fromTables);
+        $this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
+        return 0;
+    }
+
+    protected function createSchema(Connection $fromDB, Connection $toDB, InputInterface $input, OutputInterface $output) {
+        $output->writeln('<info>Creating schema in new database</info>');
+
+        $fromMS = new MigrationService('core', $fromDB);
+        $currentMigration = $fromMS->getMigration('current');
+        if ($currentMigration !== '0') {
+            $toMS = new MigrationService('core', $toDB);
+            $toMS->migrate($currentMigration);
+        }
+
+        $schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
+        $apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
+        foreach ($apps as $app) {
+            if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
+                $schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
+            } else {
+                // Make sure autoloading works...
+                \OC_App::loadApp($app);
+                $fromMS = new MigrationService($app, $fromDB);
+                $currentMigration = $fromMS->getMigration('current');
+                if ($currentMigration !== '0') {
+                    $toMS = new MigrationService($app, $toDB);
+                    $toMS->migrate($currentMigration, true);
+                }
+            }
+        }
+    }
+
+    protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
+        $type = $input->getArgument('type');
+        $connectionParams = $this->connectionFactory->createConnectionParams();
+        $connectionParams = array_merge($connectionParams, [
+            'host' => $input->getArgument('hostname'),
+            'user' => $input->getArgument('username'),
+            'password' => $input->getOption('password'),
+            'dbname' => $input->getArgument('database'),
+        ]);
+        if ($input->getOption('port')) {
+            $connectionParams['port'] = $input->getOption('port');
+        }
+        return $this->connectionFactory->getConnection($type, $connectionParams);
+    }
+
+    protected function clearSchema(Connection $db, InputInterface $input, OutputInterface $output) {
+        $toTables = $this->getTables($db);
+        if (!empty($toTables)) {
+            $output->writeln('<info>Clearing schema in new database</info>');
+        }
+        foreach ($toTables as $table) {
+            $db->getSchemaManager()->dropTable($table);
+        }
+    }
+
+    protected function getTables(Connection $db) {
+        $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+        $db->getConfiguration()->
+            setFilterSchemaAssetsExpression($filterExpression);
+        return $db->getSchemaManager()->listTableNames();
+    }
+
+    /**
+     * @param Connection $fromDB
+     * @param Connection $toDB
+     * @param Table $table
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @suppress SqlInjectionChecker
+     */
+    protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
+        if ($table->getName() === $toDB->getPrefix() . 'migrations') {
+            $output->writeln('<comment>Skipping migrations table because it was already filled by running the migrations</comment>');
+            return;
+        }
+
+        $chunkSize = $input->getOption('chunk-size');
+
+        $query = $fromDB->getQueryBuilder();
+        $query->automaticTablePrefix(false);
+        $query->select($query->func()->count('*', 'num_entries'))
+            ->from($table->getName());
+        $result = $query->execute();
+        $count = $result->fetchColumn();
+        $result->closeCursor();
+
+        $numChunks = ceil($count/$chunkSize);
+        if ($numChunks > 1) {
+            $output->writeln('chunked query, ' . $numChunks . ' chunks');
+        }
+
+        $progress = new ProgressBar($output, $count);
+        $progress->start();
+        $redraw = $count > $chunkSize ? 100 : ($count > 100 ? 5 : 1);
+        $progress->setRedrawFrequency($redraw);
+
+        $query = $fromDB->getQueryBuilder();
+        $query->automaticTablePrefix(false);
+        $query->select('*')
+            ->from($table->getName())
+            ->setMaxResults($chunkSize);
+
+        try {
+            $orderColumns = $table->getPrimaryKeyColumns();
+        } catch (DBALException $e) {
+            $orderColumns = [];
+            foreach ($table->getColumns() as $column) {
+                $orderColumns[] = $column->getName();
+            }
+        }
+
+        foreach ($orderColumns as $column) {
+            $query->addOrderBy($column);
+        }
+
+        $insertQuery = $toDB->getQueryBuilder();
+        $insertQuery->automaticTablePrefix(false);
+        $insertQuery->insert($table->getName());
+        $parametersCreated = false;
+
+        for ($chunk = 0; $chunk < $numChunks; $chunk++) {
+            $query->setFirstResult($chunk * $chunkSize);
+
+            $result = $query->execute();
+
+            while ($row = $result->fetch()) {
+                $progress->advance();
+                if (!$parametersCreated) {
+                    foreach ($row as $key => $value) {
+                        $insertQuery->setValue($key, $insertQuery->createParameter($key));
+                    }
+                    $parametersCreated = true;
+                }
+
+                foreach ($row as $key => $value) {
+                    $type = $this->getColumnType($table, $key);
+                    if ($type !== false) {
+                        $insertQuery->setParameter($key, $value, $type);
+                    } else {
+                        $insertQuery->setParameter($key, $value);
+                    }
+                }
+                $insertQuery->execute();
+            }
+            $result->closeCursor();
+        }
+        $progress->finish();
+    }
+
+    protected function getColumnType(Table $table, $columnName) {
+        $tableName = $table->getName();
+        if (isset($this->columnTypes[$tableName][$columnName])) {
+            return $this->columnTypes[$tableName][$columnName];
+        }
+
+        $type = $table->getColumn($columnName)->getType()->getName();
+
+        switch ($type) {
+            case Type::BLOB:
+            case Type::TEXT:
+                $this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB;
+                break;
+            case Type::BOOLEAN:
+                $this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_BOOL;
+                break;
+            default:
+                $this->columnTypes[$tableName][$columnName] = false;
+        }
+
+        return $this->columnTypes[$tableName][$columnName];
+    }
+
+    protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
+        $this->config->setSystemValue('maintenance', true);
+        $schema = $fromDB->createSchema();
+
+        try {
+            // copy table rows
+            foreach ($tables as $table) {
+                $output->writeln($table);
+                $this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
+            }
+            if ($input->getArgument('type') === 'pgsql') {
+                $tools = new \OC\DB\PgSqlTools($this->config);
+                $tools->resynchronizeDatabaseSequences($toDB);
+            }
+            // save new database config
+            $this->saveDBInfo($input);
+        } catch (\Exception $e) {
+            $this->config->setSystemValue('maintenance', false);
+            throw $e;
+        }
+        $this->config->setSystemValue('maintenance', false);
+    }
+
+    protected function saveDBInfo(InputInterface $input) {
+        $type = $input->getArgument('type');
+        $username = $input->getArgument('username');
+        $dbHost = $input->getArgument('hostname');
+        $dbName = $input->getArgument('database');
+        $password = $input->getOption('password');
+        if ($input->getOption('port')) {
+            $dbHost .= ':'.$input->getOption('port');
+        }
+
+        $this->config->setSystemValues([
+            'dbtype'		=> $type,
+            'dbname'		=> $dbName,
+            'dbhost'		=> $dbHost,
+            'dbuser'		=> $username,
+            'dbpassword'	=> $password,
+        ]);
+    }
+
+    /**
+     * Return possible values for the named option
+     *
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * Return possible values for the named argument
+     *
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'type') {
+            return ['mysql', 'oci', 'pgsql'];
+        }
+        return [];
+    }
 }

core/Command/Db/ConvertMysqlToMB4.php

Indentation +45 added lines, -45 removed lines

@@ -36,59 +36,59 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ConvertMysqlToMB4 extends Command {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param IConfig $config
-	 * @param IDBConnection $connection
-	 * @param IURLGenerator $urlGenerator
-	 * @param ILogger $logger
-	 */
-	public function __construct(IConfig $config, IDBConnection $connection, IURLGenerator $urlGenerator, ILogger $logger) {
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
-		parent::__construct();
-	}
+    /**
+     * @param IConfig $config
+     * @param IDBConnection $connection
+     * @param IURLGenerator $urlGenerator
+     * @param ILogger $logger
+     */
+    public function __construct(IConfig $config, IDBConnection $connection, IURLGenerator $urlGenerator, ILogger $logger) {
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->urlGenerator = $urlGenerator;
+        $this->logger = $logger;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('db:convert-mysql-charset')
-			->setDescription('Convert charset of MySQL/MariaDB to use utf8mb4');
-	}
+    protected function configure() {
+        $this
+            ->setName('db:convert-mysql-charset')
+            ->setDescription('Convert charset of MySQL/MariaDB to use utf8mb4');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-			$output->writeln("This command is only valid for MySQL/MariaDB databases.");
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            $output->writeln("This command is only valid for MySQL/MariaDB databases.");
+            return 1;
+        }
 
-		$tools = new MySqlTools();
-		if (!$tools->supports4ByteCharset($this->connection)) {
-			$url = $this->urlGenerator->linkToDocs('admin-mysql-utf8mb4');
-			$output->writeln("The database is not properly setup to use the charset utf8mb4.");
-			$output->writeln("For more information please read the documentation at $url");
-			return 1;
-		}
+        $tools = new MySqlTools();
+        if (!$tools->supports4ByteCharset($this->connection)) {
+            $url = $this->urlGenerator->linkToDocs('admin-mysql-utf8mb4');
+            $output->writeln("The database is not properly setup to use the charset utf8mb4.");
+            $output->writeln("For more information please read the documentation at $url");
+            return 1;
+        }
 
-		// enable charset
-		$this->config->setSystemValue('mysql.utf8mb4', true);
+        // enable charset
+        $this->config->setSystemValue('mysql.utf8mb4', true);
 
-		// run conversion
-		$coll = new Collation($this->config, $this->logger, $this->connection, false);
-		$coll->run(new ConsoleOutput($output));
+        // run conversion
+        $coll = new Collation($this->config, $this->logger, $this->connection, false);
+        $coll->run(new ConsoleOutput($output));
 
-		return 0;
-	}
+        return 0;
+    }
 }