Inspection of "Merge pull request #5644 from nextcloud/add-occ-ap..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 63aa12...c7757b )

by Morris

created 2017-07-27 13:37 UTC

Status

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -28,48 +28,48 @@
 block discarded – undo
 
 class Install extends Command {
 
-	protected function configure() {
-		$this
-			->setName('app:install')
-			->setDescription('install an app')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED,
-				'install the specified app'
-			)
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('app:install')
+            ->setDescription('install an app')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED,
+                'install the specified app'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appId = $input->getArgument('app-id');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appId = $input->getArgument('app-id');
 
-		if (\OC_App::getAppPath($appId)) {
-			$output->writeln($appId . ' already installed');
-			return 1;
-		}
+        if (\OC_App::getAppPath($appId)) {
+            $output->writeln($appId . ' already installed');
+            return 1;
+        }
 
-		try {
-			$installer = new Installer(
-				\OC::$server->getAppFetcher(),
-				\OC::$server->getHTTPClientService(),
-				\OC::$server->getTempManager(),
-				\OC::$server->getLogger(),
-				\OC::$server->getConfig()
-			);
-			$installer->downloadApp($appId);
-			$result = $installer->installApp($appId);
-		} catch(\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
+        try {
+            $installer = new Installer(
+                \OC::$server->getAppFetcher(),
+                \OC::$server->getHTTPClientService(),
+                \OC::$server->getTempManager(),
+                \OC::$server->getLogger(),
+                \OC::$server->getConfig()
+            );
+            $installer->downloadApp($appId);
+            $result = $installer->installApp($appId);
+        } catch(\Exception $e) {
+            $output->writeln('Error: ' . $e->getMessage());
+            return 1;
+        }
 
-		if($result === false) {
-			$output->writeln($appId . ' couldn\'t be installed');
-			return 1;
-		}
+        if($result === false) {
+            $output->writeln($appId . ' couldn\'t be installed');
+            return 1;
+        }
 
-		$output->writeln($appId . ' installed');
+        $output->writeln($appId . ' installed');
 
-		return 0;
-	}
+        return 0;
+    }
 }

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 		$appId = $input->getArgument('app-id');
 
 		if (\OC_App::getAppPath($appId)) {
-			$output->writeln($appId . ' already installed');
+			$output->writeln($appId.' already installed');
 			return 1;
 		}
 
@@ -58,17 +58,17 @@  discard block
 block discarded – undo
 			);
 			$installer->downloadApp($appId);
 			$result = $installer->installApp($appId);
-		} catch(\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
+		} catch (\Exception $e) {
+			$output->writeln('Error: '.$e->getMessage());
 			return 1;
 		}
 
-		if($result === false) {
-			$output->writeln($appId . ' couldn\'t be installed');
+		if ($result === false) {
+			$output->writeln($appId.' couldn\'t be installed');
 			return 1;
 		}
 
-		$output->writeln($appId . ' installed');
+		$output->writeln($appId.' installed');
 
 		return 0;
 	}

Please login to merge, or discard this patch.

core/register_command.php 1 patch

Indentation +94 added lines, -94 removed lines patch added patch discarded remove patch

@@ -40,121 +40,121 @@
 block discarded – undo
 $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\Install());
-	$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\Install());
+    $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()));
 }

Please login to merge, or discard this patch.

		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	$appId = $input->getArgument('app-id');
45	45
46	46	if (\OC_App::getAppPath($appId)) {
47		- $output->writeln($appId . ' already installed');
	47	+ $output->writeln($appId.' already installed');
48	48	return 1;
49	49	}
50	50
		@@ -58,17 +58,17 @@ discard block
		block discarded – undo
58	58	);
59	59	$installer->downloadApp($appId);
60	60	$result = $installer->installApp($appId);
61		- } catch(\Exception $e) {
62		- $output->writeln('Error: ' . $e->getMessage());
	61	+ } catch (\Exception $e) {
	62	+ $output->writeln('Error: '.$e->getMessage());
63	63	return 1;
64	64	}
65	65
66		- if($result === false) {
67		- $output->writeln($appId . ' couldn\'t be installed');
	66	+ if ($result === false) {
	67	+ $output->writeln($appId.' couldn\'t be installed');
68	68	return 1;
69	69	}
70	70
71		- $output->writeln($appId . ' installed');
	71	+ $output->writeln($appId.' installed');
72	72
73	73	return 0;
74	74	}

		@@ -28,48 +28,48 @@
		block discarded – undo
28	28
29	29	class Install extends Command {
30	30
31		- protected function configure() {
32		- $this
33		- ->setName('app:install')
34		- ->setDescription('install an app')
35		- ->addArgument(
36		- 'app-id',
37		- InputArgument::REQUIRED,
38		- 'install the specified app'
39		- )
40		- ;
41		- }
	31	+ protected function configure() {
	32	+ $this
	33	+ ->setName('app:install')
	34	+ ->setDescription('install an app')
	35	+ ->addArgument(
	36	+ 'app-id',
	37	+ InputArgument::REQUIRED,
	38	+ 'install the specified app'
	39	+ )
	40	+ ;
	41	+ }
42	42
43		- protected function execute(InputInterface $input, OutputInterface $output) {
44		- $appId = $input->getArgument('app-id');
	43	+ protected function execute(InputInterface $input, OutputInterface $output) {
	44	+ $appId = $input->getArgument('app-id');
45	45
46		- if (\OC_App::getAppPath($appId)) {
47		- $output->writeln($appId . ' already installed');
48		- return 1;
49		- }
	46	+ if (\OC_App::getAppPath($appId)) {
	47	+ $output->writeln($appId . ' already installed');
	48	+ return 1;
	49	+ }
50	50
51		- try {
52		- $installer = new Installer(
53		- \OC::$server->getAppFetcher(),
54		- \OC::$server->getHTTPClientService(),
55		- \OC::$server->getTempManager(),
56		- \OC::$server->getLogger(),
57		- \OC::$server->getConfig()
58		- );
59		- $installer->downloadApp($appId);
60		- $result = $installer->installApp($appId);
61		- } catch(\Exception $e) {
62		- $output->writeln('Error: ' . $e->getMessage());
63		- return 1;
64		- }
	51	+ try {
	52	+ $installer = new Installer(
	53	+ \OC::$server->getAppFetcher(),
	54	+ \OC::$server->getHTTPClientService(),
	55	+ \OC::$server->getTempManager(),
	56	+ \OC::$server->getLogger(),
	57	+ \OC::$server->getConfig()
	58	+ );
	59	+ $installer->downloadApp($appId);
	60	+ $result = $installer->installApp($appId);
	61	+ } catch(\Exception $e) {
	62	+ $output->writeln('Error: ' . $e->getMessage());
	63	+ return 1;
	64	+ }
65	65
66		- if($result === false) {
67		- $output->writeln($appId . ' couldn\'t be installed');
68		- return 1;
69		- }
	66	+ if($result === false) {
	67	+ $output->writeln($appId . ' couldn\'t be installed');
	68	+ return 1;
	69	+ }
70	70
71		- $output->writeln($appId . ' installed');
	71	+ $output->writeln($appId . ' installed');
72	72
73		- return 0;
74		- }
	73	+ return 0;
	74	+ }
75	75	}

		@@ -40,121 +40,121 @@
		block discarded – undo
40	40	$application->add(new OC\Core\Command\App\CheckCode($infoParser));
41	41	$application->add(new OC\Core\Command\L10n\CreateJs());
42	42	$application->add(new \OC\Core\Command\Integrity\SignApp(
43		- \OC::$server->getIntegrityCodeChecker(),
44		- new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
45		- \OC::$server->getURLGenerator()
	43	+ \OC::$server->getIntegrityCodeChecker(),
	44	+ new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
	45	+ \OC::$server->getURLGenerator()
46	46	));
47	47	$application->add(new \OC\Core\Command\Integrity\SignCore(
48		- \OC::$server->getIntegrityCodeChecker(),
49		- new \OC\IntegrityCheck\Helpers\FileAccessHelper()
	48	+ \OC::$server->getIntegrityCodeChecker(),
	49	+ new \OC\IntegrityCheck\Helpers\FileAccessHelper()
50	50	));
51	51	$application->add(new \OC\Core\Command\Integrity\CheckApp(
52		- \OC::$server->getIntegrityCodeChecker()
	52	+ \OC::$server->getIntegrityCodeChecker()
53	53	));
54	54	$application->add(new \OC\Core\Command\Integrity\CheckCore(
55		- \OC::$server->getIntegrityCodeChecker()
	55	+ \OC::$server->getIntegrityCodeChecker()
56	56	));
57	57
58	58
59	59	if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
60		- $application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
61		- $application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
62		- $application->add(new OC\Core\Command\App\Install());
63		- $application->add(new OC\Core\Command\App\GetPath());
64		- $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
	60	+ $application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
	61	+ $application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
	62	+ $application->add(new OC\Core\Command\App\Install());
	63	+ $application->add(new OC\Core\Command\App\GetPath());
	64	+ $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
65	65
66		- $application->add(new OC\Core\Command\TwoFactorAuth\Enable(
67		- \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
68		- ));
69		- $application->add(new OC\Core\Command\TwoFactorAuth\Disable(
70		- \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
71		- ));
	66	+ $application->add(new OC\Core\Command\TwoFactorAuth\Enable(
	67	+ \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
	68	+ ));
	69	+ $application->add(new OC\Core\Command\TwoFactorAuth\Disable(
	70	+ \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
	71	+ ));
72	72
73		- $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
74		- $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
75		- $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
	73	+ $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
	74	+ $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
	75	+ $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
76	76
77		- $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
78		- $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
79		- $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
80		- $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
81		- $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
82		- $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
83		- $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
84		- $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
	77	+ $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
	78	+ $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
	79	+ $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
	80	+ $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
	81	+ $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
	82	+ $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
	83	+ $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
	84	+ $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
85	85
86		- $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
87		- $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
88		- $application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
89		- $application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
90		- $application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection()));
91		- $application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
92		- $application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()));
	86	+ $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
	87	+ $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
	88	+ $application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
	89	+ $application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
	90	+ $application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection()));
	91	+ $application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
	92	+ $application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()));
93	93
94		- $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
95		- $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
96		- $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
97		- $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
98		- $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
99		- $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
100		- $application->add(new OC\Core\Command\Encryption\DecryptAll(
101		- \OC::$server->getEncryptionManager(),
102		- \OC::$server->getAppManager(),
103		- \OC::$server->getConfig(),
104		- new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
105		- new \Symfony\Component\Console\Helper\QuestionHelper())
106		- );
	94	+ $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
	95	+ $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
	96	+ $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
	97	+ $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
	98	+ $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
	99	+ $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
	100	+ $application->add(new OC\Core\Command\Encryption\DecryptAll(
	101	+ \OC::$server->getEncryptionManager(),
	102	+ \OC::$server->getAppManager(),
	103	+ \OC::$server->getConfig(),
	104	+ new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
	105	+ new \Symfony\Component\Console\Helper\QuestionHelper())
	106	+ );
107	107
108		- $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
109		- $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
	108	+ $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
	109	+ $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
110	110
111		- $view = new \OC\Files\View();
112		- $util = new \OC\Encryption\Util(
113		- $view,
114		- \OC::$server->getUserManager(),
115		- \OC::$server->getGroupManager(),
116		- \OC::$server->getConfig()
117		- );
118		- $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
119		- $view,
120		- \OC::$server->getUserManager(),
121		- \OC::$server->getConfig(),
122		- $util,
123		- new \Symfony\Component\Console\Helper\QuestionHelper()
124		- )
125		- );
126		- $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
	111	+ $view = new \OC\Files\View();
	112	+ $util = new \OC\Encryption\Util(
	113	+ $view,
	114	+ \OC::$server->getUserManager(),
	115	+ \OC::$server->getGroupManager(),
	116	+ \OC::$server->getConfig()
	117	+ );
	118	+ $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
	119	+ $view,
	120	+ \OC::$server->getUserManager(),
	121	+ \OC::$server->getConfig(),
	122	+ $util,
	123	+ new \Symfony\Component\Console\Helper\QuestionHelper()
	124	+ )
	125	+ );
	126	+ $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
127	127
128		- $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
129		- $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
130		- $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
131		- $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
132		- $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
133		- $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
	128	+ $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
	129	+ $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
	130	+ $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
	131	+ $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
	132	+ $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
	133	+ $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
134	134
135		- $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
136		- $application->add(new OC\Core\Command\Maintenance\Repair(
137		- new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
138		- \OC::$server->getEventDispatcher()));
	135	+ $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
	136	+ $application->add(new OC\Core\Command\Maintenance\Repair(
	137	+ new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
	138	+ \OC::$server->getEventDispatcher()));
139	139
140		- $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
141		- $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
142		- $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
143		- $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
144		- $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
145		- $application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
146		- $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
147		- $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
148		- $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
149		- $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	140	+ $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	141	+ $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
	142	+ $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
	143	+ $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
	144	+ $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
	145	+ $application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
	146	+ $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
	147	+ $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
	148	+ $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
	149	+ $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
150	150
151		- $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
152		- $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
153		- $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	151	+ $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
	152	+ $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	153	+ $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
154	154
155		- $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
156		- $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
157		- $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
	155	+ $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
	156	+ $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
	157	+ $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
158	158	} else {
159		- $application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
	159	+ $application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
160	160	}

nextcloud / server

Push — master ( 63aa12...c7757b )

Status

Category

Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +94 added lines, -94 removed lines patch added patch discarded remove patch