Inspection of "Add command to apply updates to custom themes" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#5441)

by Julius

created 2017-06-16 13:40 UTC

Status

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

@@ -32,33 +32,33 @@
 block discarded – undo
 
 class UpdateTheme extends UpdateJS {
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
+    /** @var IMimeTypeDetector */
+    protected $mimetypeDetector;
 
-	/** @var ICacheFactory */
-	protected $cacheFactory;
+    /** @var ICacheFactory */
+    protected $cacheFactory;
 
-	public function __construct(
-		IMimeTypeDetector $mimetypeDetector,
-		ICacheFactory $cacheFactory
-	) {
-		parent::__construct($mimetypeDetector);
-		$this->cacheFactory = $cacheFactory;
-	}
+    public function __construct(
+        IMimeTypeDetector $mimetypeDetector,
+        ICacheFactory $cacheFactory
+    ) {
+        parent::__construct($mimetypeDetector);
+        $this->cacheFactory = $cacheFactory;
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:theme:update')
-			->setDescription('Apply custom theme changes');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:theme:update')
+            ->setDescription('Apply custom theme changes');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		// run mimetypelist.js update since themes might change mimetype icons
-		parent::execute($input, $output);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        // run mimetypelist.js update since themes might change mimetype icons
+        parent::execute($input, $output);
 
-		// cleanup image cache
-		$c = $this->cacheFactory->create('imagePath');
-		$c->clear('');
-		$output->writeln('<info>Image cache cleared');
-	}
+        // cleanup image cache
+        $c = $this->cacheFactory->create('imagePath');
+        $c->clear('');
+        $output->writeln('<info>Image cache cleared');
+    }
 }

Please login to merge, or discard this patch.

core/register_command.php 1 patch

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

@@ -40,116 +40,116 @@
 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\GetPath());
-	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\GetPath());
+    $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
 	
-	$application->add(new OC\Core\Command\TwoFactorAuth\Enable(
-		\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
-	));
-	$application->add(new OC\Core\Command\TwoFactorAuth\Disable(
-		\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
-	));
+    $application->add(new OC\Core\Command\TwoFactorAuth\Enable(
+        \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
+    ));
+    $application->add(new OC\Core\Command\TwoFactorAuth\Disable(
+        \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
+    ));
 
-	$application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
 
-	$application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
-	$application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
+    $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
 
-	$application->add(new OC\Core\Command\Db\GenerateChangeScript());
-	$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\GenerateChangeScript());
+    $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\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.

		@@ -32,33 +32,33 @@
		block discarded – undo
32	32
33	33	class UpdateTheme extends UpdateJS {
34	34
35		- /** @var IMimeTypeDetector */
36		- protected $mimetypeDetector;
	35	+ /** @var IMimeTypeDetector */
	36	+ protected $mimetypeDetector;
37	37
38		- /** @var ICacheFactory */
39		- protected $cacheFactory;
	38	+ /** @var ICacheFactory */
	39	+ protected $cacheFactory;
40	40
41		- public function __construct(
42		- IMimeTypeDetector $mimetypeDetector,
43		- ICacheFactory $cacheFactory
44		- ) {
45		- parent::__construct($mimetypeDetector);
46		- $this->cacheFactory = $cacheFactory;
47		- }
	41	+ public function __construct(
	42	+ IMimeTypeDetector $mimetypeDetector,
	43	+ ICacheFactory $cacheFactory
	44	+ ) {
	45	+ parent::__construct($mimetypeDetector);
	46	+ $this->cacheFactory = $cacheFactory;
	47	+ }
48	48
49		- protected function configure() {
50		- $this
51		- ->setName('maintenance:theme:update')
52		- ->setDescription('Apply custom theme changes');
53		- }
	49	+ protected function configure() {
	50	+ $this
	51	+ ->setName('maintenance:theme:update')
	52	+ ->setDescription('Apply custom theme changes');
	53	+ }
54	54
55		- protected function execute(InputInterface $input, OutputInterface $output) {
56		- // run mimetypelist.js update since themes might change mimetype icons
57		- parent::execute($input, $output);
	55	+ protected function execute(InputInterface $input, OutputInterface $output) {
	56	+ // run mimetypelist.js update since themes might change mimetype icons
	57	+ parent::execute($input, $output);
58	58
59		- // cleanup image cache
60		- $c = $this->cacheFactory->create('imagePath');
61		- $c->clear('');
62		- $output->writeln('<info>Image cache cleared');
63		- }
	59	+ // cleanup image cache
	60	+ $c = $this->cacheFactory->create('imagePath');
	61	+ $c->clear('');
	62	+ $output->writeln('<info>Image cache cleared');
	63	+ }
64	64	}

		@@ -40,116 +40,116 @@
		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\GetPath());
63		- $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\GetPath());
	63	+ $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
64	64
65		- $application->add(new OC\Core\Command\TwoFactorAuth\Enable(
66		- \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
67		- ));
68		- $application->add(new OC\Core\Command\TwoFactorAuth\Disable(
69		- \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
70		- ));
	65	+ $application->add(new OC\Core\Command\TwoFactorAuth\Enable(
	66	+ \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
	67	+ ));
	68	+ $application->add(new OC\Core\Command\TwoFactorAuth\Disable(
	69	+ \OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
	70	+ ));
71	71
72		- $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
73		- $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
74		- $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
	72	+ $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
	73	+ $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
	74	+ $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
75	75
76		- $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
77		- $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
78		- $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
79		- $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
80		- $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
81		- $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
82		- $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
83		- $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
	76	+ $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
	77	+ $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
	78	+ $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
	79	+ $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
	80	+ $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
	81	+ $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
	82	+ $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
	83	+ $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
84	84
85		- $application->add(new OC\Core\Command\Db\GenerateChangeScript());
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()));
	85	+ $application->add(new OC\Core\Command\Db\GenerateChangeScript());
	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	88
89		- $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
90		- $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
91		- $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
92		- $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
93		- $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
94		- $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
95		- $application->add(new OC\Core\Command\Encryption\DecryptAll(
96		- \OC::$server->getEncryptionManager(),
97		- \OC::$server->getAppManager(),
98		- \OC::$server->getConfig(),
99		- new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
100		- new \Symfony\Component\Console\Helper\QuestionHelper())
101		- );
	89	+ $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
	90	+ $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
	91	+ $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
	92	+ $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
	93	+ $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
	94	+ $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
	95	+ $application->add(new OC\Core\Command\Encryption\DecryptAll(
	96	+ \OC::$server->getEncryptionManager(),
	97	+ \OC::$server->getAppManager(),
	98	+ \OC::$server->getConfig(),
	99	+ new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
	100	+ new \Symfony\Component\Console\Helper\QuestionHelper())
	101	+ );
102	102
103		- $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
104		- $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
	103	+ $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
	104	+ $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
105	105
106		- $view = new \OC\Files\View();
107		- $util = new \OC\Encryption\Util(
108		- $view,
109		- \OC::$server->getUserManager(),
110		- \OC::$server->getGroupManager(),
111		- \OC::$server->getConfig()
112		- );
113		- $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
114		- $view,
115		- \OC::$server->getUserManager(),
116		- \OC::$server->getConfig(),
117		- $util,
118		- new \Symfony\Component\Console\Helper\QuestionHelper()
119		- )
120		- );
121		- $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
	106	+ $view = new \OC\Files\View();
	107	+ $util = new \OC\Encryption\Util(
	108	+ $view,
	109	+ \OC::$server->getUserManager(),
	110	+ \OC::$server->getGroupManager(),
	111	+ \OC::$server->getConfig()
	112	+ );
	113	+ $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
	114	+ $view,
	115	+ \OC::$server->getUserManager(),
	116	+ \OC::$server->getConfig(),
	117	+ $util,
	118	+ new \Symfony\Component\Console\Helper\QuestionHelper()
	119	+ )
	120	+ );
	121	+ $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
122	122
123		- $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
124		- $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
125		- $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
126		- $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
127		- $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
128		- $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
	123	+ $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
	124	+ $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
	125	+ $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
	126	+ $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
	127	+ $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
	128	+ $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
129	129
130		- $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
131		- $application->add(new OC\Core\Command\Maintenance\Repair(
132		- new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
133		- \OC::$server->getEventDispatcher()));
	130	+ $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
	131	+ $application->add(new OC\Core\Command\Maintenance\Repair(
	132	+ new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
	133	+ \OC::$server->getEventDispatcher()));
134	134
135		- $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
136		- $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
137		- $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
138		- $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
139		- $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
140		- $application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
141		- $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
142		- $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
143		- $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
144		- $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	135	+ $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	136	+ $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
	137	+ $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
	138	+ $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
	139	+ $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
	140	+ $application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
	141	+ $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
	142	+ $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
	143	+ $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager()));
	144	+ $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
145	145
146		- $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
147		- $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
148		- $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	146	+ $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
	147	+ $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	148	+ $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
149	149
150		- $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
151		- $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
152		- $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
	150	+ $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
	151	+ $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
	152	+ $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
153	153	} else {
154		- $application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
	154	+ $application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
155	155	}

nextcloud / server

Pull Request — master (#5441)

Status

Category

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

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