nextcloud / server

core/Command/App/Disable.php

Indentation +60 added lines, -60 removed lines

@@ -35,74 +35,74 @@
 
 class Disable extends Command implements CompletionAwareInterface {
 
-	/** @var IAppManager */
-	protected $appManager;
+    /** @var IAppManager */
+    protected $appManager;
 
-	/** @var int */
-	protected $exitCode = 0;
+    /** @var int */
+    protected $exitCode = 0;
 
-	/**
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IAppManager $appManager) {
-		parent::__construct();
-		$this->appManager = $appManager;
-	}
+    /**
+     * @param IAppManager $appManager
+     */
+    public function __construct(IAppManager $appManager) {
+        parent::__construct();
+        $this->appManager = $appManager;
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('app:disable')
-			->setDescription('disable an app')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'disable the specified app'
-			);
-	}
+    protected function configure(): void {
+        $this
+            ->setName('app:disable')
+            ->setDescription('disable an app')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'disable the specified app'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appIds = $input->getArgument('app-id');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appIds = $input->getArgument('app-id');
 
-		foreach ($appIds as $appId) {
-			$this->disableApp($appId, $output);
-		}
+        foreach ($appIds as $appId) {
+            $this->disableApp($appId, $output);
+        }
 
-		return $this->exitCode;
-	}
+        return $this->exitCode;
+    }
 
-	private function disableApp(string $appId, OutputInterface $output): void {
-		if ($this->appManager->isInstalled($appId) === false) {
-			$output->writeln('No such app enabled: ' . $appId);
-			return;
-		}
+    private function disableApp(string $appId, OutputInterface $output): void {
+        if ($this->appManager->isInstalled($appId) === false) {
+            $output->writeln('No such app enabled: ' . $appId);
+            return;
+        }
 
-		try {
-			$this->appManager->disableApp($appId);
-			$output->writeln($appId . ' disabled');
-		} catch (\Exception $e) {
-			$output->writeln($e->getMessage());
-			$this->exitCode = 2;
-		}
-	}
+        try {
+            $this->appManager->disableApp($appId);
+            $output->writeln($appId . ' disabled');
+        } catch (\Exception $e) {
+            $output->writeln($e->getMessage());
+            $this->exitCode = 2;
+        }
+    }
 
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app-id') {
-			return array_diff(\OC_App::getEnabledApps(true, true), $this->appManager->getAlwaysEnabledApps());
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app-id') {
+            return array_diff(\OC_App::getEnabledApps(true, true), $this->appManager->getAlwaysEnabledApps());
+        }
+        return [];
+    }
 }

core/Command/App/Install.php

Indentation +44 added lines, -44 removed lines

@@ -33,55 +33,55 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Install extends Command {
-	protected function configure() {
-		$this
-			->setName('app:install')
-			->setDescription('install an app')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED,
-				'install the specified app'
-			)
-			->addOption(
-				'keep-disabled',
-				null,
-				InputOption::VALUE_NONE,
-				'don\'t enable the app afterwards'
-			)
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('app:install')
+            ->setDescription('install an app')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED,
+                'install the specified app'
+            )
+            ->addOption(
+                'keep-disabled',
+                null,
+                InputOption::VALUE_NONE,
+                'don\'t enable the app afterwards'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appId = $input->getArgument('app-id');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $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 {
-			/** @var Installer $installer */
-			$installer = \OC::$server->query(Installer::class);
-			$installer->downloadApp($appId);
-			$result = $installer->installApp($appId);
-		} catch (\Exception $e) {
-			$output->writeln('Error: ' . $e->getMessage());
-			return 1;
-		}
+        try {
+            /** @var Installer $installer */
+            $installer = \OC::$server->query(Installer::class);
+            $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');
 
-		if (!$input->getOption('keep-disabled')) {
-			$appClass = new \OC_App();
-			$appClass->enable($appId);
-			$output->writeln($appId . ' enabled');
-		}
+        if (!$input->getOption('keep-disabled')) {
+            $appClass = new \OC_App();
+            $appClass->enable($appId);
+            $output->writeln($appId . ' enabled');
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 }

core/Command/App/Remove.php

Indentation +110 added lines, -110 removed lines

@@ -39,114 +39,114 @@
 
 class Remove extends Command implements CompletionAwareInterface {
 
-	/** @var IAppManager */
-	protected $manager;
-	/** @var Installer */
-	private $installer;
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IAppManager $manager
-	 * @param Installer $installer
-	 * @param ILogger $logger
-	 */
-	public function __construct(IAppManager $manager, Installer $installer, ILogger $logger) {
-		parent::__construct();
-		$this->manager = $manager;
-		$this->installer = $installer;
-		$this->logger = $logger;
-	}
-
-	protected function configure() {
-		$this
-			->setName('app:remove')
-			->setDescription('remove an app')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED,
-				'remove the specified app'
-			)
-			->addOption(
-				'keep-data',
-				null,
-				InputOption::VALUE_NONE,
-				'keep app data and do not remove them'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appId = $input->getArgument('app-id');
-
-		// Check if the app is installed
-		if (!\OC_App::getAppPath($appId)) {
-			$output->writeln($appId . ' is not installed');
-			return 1;
-		}
-
-		// Removing shipped apps is not possible, therefore we pre-check that
-		// before trying to remove it
-		if ($this->manager->isShipped($appId)) {
-			$output->writeln($appId . ' could not be removed as it is a shipped app');
-			return 1;
-		}
-
-		// If we want to keep the data of the app, we simply don't disable it here.
-		// App uninstall tasks are being executed when disabled. More info: PR #11627.
-		if (!$input->getOption('keep-data')) {
-			try {
-				$this->manager->disableApp($appId);
-				$output->writeln($appId . ' disabled');
-			} catch (Throwable $e) {
-				$output->writeln('<error>Error: ' . $e->getMessage() . '</error>');
-				$this->logger->logException($e, [
-					'app' => 'CLI',
-					'level' => ILogger::ERROR
-				]);
-				return 1;
-			}
-		}
-
-		// Let's try to remove the app...
-		try {
-			$result = $this->installer->removeApp($appId);
-		} catch (Throwable $e) {
-			$output->writeln('<error>Error: ' . $e->getMessage() . '</error>');
-			$this->logger->logException($e, [
-				'app' => 'CLI',
-				'level' => ILogger::ERROR
-			]);
-			return 1;
-		}
-
-		if ($result === false) {
-			$output->writeln($appId . ' could not be removed');
-			return 1;
-		}
-
-		$output->writeln($appId . ' removed');
-
-		return 0;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app-id') {
-			return \OC_App::getAllApps();
-		}
-		return [];
-	}
+    /** @var IAppManager */
+    protected $manager;
+    /** @var Installer */
+    private $installer;
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param IAppManager $manager
+     * @param Installer $installer
+     * @param ILogger $logger
+     */
+    public function __construct(IAppManager $manager, Installer $installer, ILogger $logger) {
+        parent::__construct();
+        $this->manager = $manager;
+        $this->installer = $installer;
+        $this->logger = $logger;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('app:remove')
+            ->setDescription('remove an app')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED,
+                'remove the specified app'
+            )
+            ->addOption(
+                'keep-data',
+                null,
+                InputOption::VALUE_NONE,
+                'keep app data and do not remove them'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appId = $input->getArgument('app-id');
+
+        // Check if the app is installed
+        if (!\OC_App::getAppPath($appId)) {
+            $output->writeln($appId . ' is not installed');
+            return 1;
+        }
+
+        // Removing shipped apps is not possible, therefore we pre-check that
+        // before trying to remove it
+        if ($this->manager->isShipped($appId)) {
+            $output->writeln($appId . ' could not be removed as it is a shipped app');
+            return 1;
+        }
+
+        // If we want to keep the data of the app, we simply don't disable it here.
+        // App uninstall tasks are being executed when disabled. More info: PR #11627.
+        if (!$input->getOption('keep-data')) {
+            try {
+                $this->manager->disableApp($appId);
+                $output->writeln($appId . ' disabled');
+            } catch (Throwable $e) {
+                $output->writeln('<error>Error: ' . $e->getMessage() . '</error>');
+                $this->logger->logException($e, [
+                    'app' => 'CLI',
+                    'level' => ILogger::ERROR
+                ]);
+                return 1;
+            }
+        }
+
+        // Let's try to remove the app...
+        try {
+            $result = $this->installer->removeApp($appId);
+        } catch (Throwable $e) {
+            $output->writeln('<error>Error: ' . $e->getMessage() . '</error>');
+            $this->logger->logException($e, [
+                'app' => 'CLI',
+                'level' => ILogger::ERROR
+            ]);
+            return 1;
+        }
+
+        if ($result === false) {
+            $output->writeln($appId . ' could not be removed');
+            return 1;
+        }
+
+        $output->writeln($appId . ' removed');
+
+        return 0;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app-id') {
+            return \OC_App::getAllApps();
+        }
+        return [];
+    }
 }

core/Command/App/CheckCode.php

Indentation +163 added lines, -163 removed lines

@@ -44,167 +44,167 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CheckCode extends Command implements CompletionAwareInterface {
-	protected $checkers = [
-		'private' => PrivateCheck::class,
-		'deprecation' => DeprecationCheck::class,
-		'strong-comparison' => StrongComparisonCheck::class,
-	];
-
-	protected function configure() {
-		$this
-			->setName('app:check-code')
-			->setDescription('check code to be compliant')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED,
-				'check the specified app'
-			)
-			->addOption(
-				'checker',
-				'c',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'enable the specified checker(s)',
-				[ 'private', 'deprecation', 'strong-comparison' ]
-			)
-			->addOption(
-				'--skip-checkers',
-				null,
-				InputOption::VALUE_NONE,
-				'skips the the code checkers to only check info.xml, language and database schema'
-			)
-			->addOption(
-				'--skip-validate-info',
-				null,
-				InputOption::VALUE_NONE,
-				'skips the info.xml/version check'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appId = $input->getArgument('app-id');
-
-		$checkList = new EmptyCheck();
-		foreach ($input->getOption('checker') as $checker) {
-			if (!isset($this->checkers[$checker])) {
-				throw new \InvalidArgumentException('Invalid checker: '.$checker);
-			}
-			$checkerClass = $this->checkers[$checker];
-			$checkList = new $checkerClass($checkList);
-		}
-
-		$codeChecker = new CodeChecker($checkList, !$input->getOption('skip-validate-info'));
-
-		$codeChecker->listen('CodeChecker', 'analyseFileBegin', function ($params) use ($output) {
-			if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-				$output->writeln("<info>Analysing {$params}</info>");
-			}
-		});
-		$codeChecker->listen('CodeChecker', 'analyseFileFinished', function ($filename, $errors) use ($output) {
-			$count = count($errors);
-
-			// show filename if the verbosity is low, but there are errors in a file
-			if ($count > 0 && OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
-				$output->writeln("<info>Analysing {$filename}</info>");
-			}
-
-			// show error count if there are errors present or the verbosity is high
-			if ($count > 0 || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-				$output->writeln(" {$count} errors");
-			}
-			usort($errors, function ($a, $b) {
-				return $a['line'] >$b['line'];
-			});
-
-			foreach ($errors as $p) {
-				$line = sprintf("%' 4d", $p['line']);
-				$output->writeln("    <error>line $line: {$p['disallowedToken']} - {$p['reason']}</error>");
-			}
-		});
-		$errors = [];
-		if (!$input->getOption('skip-checkers')) {
-			$errors = $codeChecker->analyse($appId);
-		}
-
-		if (!$input->getOption('skip-validate-info')) {
-			$infoChecker = new InfoChecker();
-			$infoChecker->listen('InfoChecker', 'parseError', function ($error) use ($output) {
-				$output->writeln("<error>Invalid appinfo.xml file found: $error</error>");
-			});
-
-			$infoErrors = $infoChecker->analyse($appId);
-
-			$errors = array_merge($errors, $infoErrors);
-
-			$languageParser = new LanguageParseChecker();
-			$languageErrors = $languageParser->analyse($appId);
-
-			foreach ($languageErrors as $languageError) {
-				$output->writeln("<error>$languageError</error>");
-			}
-
-			$errors = array_merge($errors, $languageErrors);
-
-			$databaseSchema = new DatabaseSchemaChecker();
-			$schemaErrors = $databaseSchema->analyse($appId);
-
-			foreach ($schemaErrors['errors'] as $schemaError) {
-				$output->writeln("<error>$schemaError</error>");
-			}
-			foreach ($schemaErrors['warnings'] as $schemaWarning) {
-				$output->writeln("<comment>$schemaWarning</comment>");
-			}
-
-			$errors = array_merge($errors, $schemaErrors['errors']);
-		}
-
-		$this->analyseUpdateFile($appId, $output);
-
-		if (empty($errors)) {
-			$output->writeln('<info>App is compliant - awesome job!</info>');
-			return 0;
-		} else {
-			$output->writeln('<error>App is not compliant</error>');
-			return 101;
-		}
-	}
-
-	/**
-	 * @param string $appId
-	 * @param $output
-	 */
-	private function analyseUpdateFile($appId, OutputInterface $output) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		$updatePhp = $appPath . '/appinfo/update.php';
-		if (file_exists($updatePhp)) {
-			$output->writeln("<info>Deprecated file found: $updatePhp - please use repair steps</info>");
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'checker') {
-			return ['private', 'deprecation', 'strong-comparison'];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app-id') {
-			return \OC_App::getAllApps();
-		}
-		return [];
-	}
+    protected $checkers = [
+        'private' => PrivateCheck::class,
+        'deprecation' => DeprecationCheck::class,
+        'strong-comparison' => StrongComparisonCheck::class,
+    ];
+
+    protected function configure() {
+        $this
+            ->setName('app:check-code')
+            ->setDescription('check code to be compliant')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED,
+                'check the specified app'
+            )
+            ->addOption(
+                'checker',
+                'c',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'enable the specified checker(s)',
+                [ 'private', 'deprecation', 'strong-comparison' ]
+            )
+            ->addOption(
+                '--skip-checkers',
+                null,
+                InputOption::VALUE_NONE,
+                'skips the the code checkers to only check info.xml, language and database schema'
+            )
+            ->addOption(
+                '--skip-validate-info',
+                null,
+                InputOption::VALUE_NONE,
+                'skips the info.xml/version check'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appId = $input->getArgument('app-id');
+
+        $checkList = new EmptyCheck();
+        foreach ($input->getOption('checker') as $checker) {
+            if (!isset($this->checkers[$checker])) {
+                throw new \InvalidArgumentException('Invalid checker: '.$checker);
+            }
+            $checkerClass = $this->checkers[$checker];
+            $checkList = new $checkerClass($checkList);
+        }
+
+        $codeChecker = new CodeChecker($checkList, !$input->getOption('skip-validate-info'));
+
+        $codeChecker->listen('CodeChecker', 'analyseFileBegin', function ($params) use ($output) {
+            if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+                $output->writeln("<info>Analysing {$params}</info>");
+            }
+        });
+        $codeChecker->listen('CodeChecker', 'analyseFileFinished', function ($filename, $errors) use ($output) {
+            $count = count($errors);
+
+            // show filename if the verbosity is low, but there are errors in a file
+            if ($count > 0 && OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
+                $output->writeln("<info>Analysing {$filename}</info>");
+            }
+
+            // show error count if there are errors present or the verbosity is high
+            if ($count > 0 || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+                $output->writeln(" {$count} errors");
+            }
+            usort($errors, function ($a, $b) {
+                return $a['line'] >$b['line'];
+            });
+
+            foreach ($errors as $p) {
+                $line = sprintf("%' 4d", $p['line']);
+                $output->writeln("    <error>line $line: {$p['disallowedToken']} - {$p['reason']}</error>");
+            }
+        });
+        $errors = [];
+        if (!$input->getOption('skip-checkers')) {
+            $errors = $codeChecker->analyse($appId);
+        }
+
+        if (!$input->getOption('skip-validate-info')) {
+            $infoChecker = new InfoChecker();
+            $infoChecker->listen('InfoChecker', 'parseError', function ($error) use ($output) {
+                $output->writeln("<error>Invalid appinfo.xml file found: $error</error>");
+            });
+
+            $infoErrors = $infoChecker->analyse($appId);
+
+            $errors = array_merge($errors, $infoErrors);
+
+            $languageParser = new LanguageParseChecker();
+            $languageErrors = $languageParser->analyse($appId);
+
+            foreach ($languageErrors as $languageError) {
+                $output->writeln("<error>$languageError</error>");
+            }
+
+            $errors = array_merge($errors, $languageErrors);
+
+            $databaseSchema = new DatabaseSchemaChecker();
+            $schemaErrors = $databaseSchema->analyse($appId);
+
+            foreach ($schemaErrors['errors'] as $schemaError) {
+                $output->writeln("<error>$schemaError</error>");
+            }
+            foreach ($schemaErrors['warnings'] as $schemaWarning) {
+                $output->writeln("<comment>$schemaWarning</comment>");
+            }
+
+            $errors = array_merge($errors, $schemaErrors['errors']);
+        }
+
+        $this->analyseUpdateFile($appId, $output);
+
+        if (empty($errors)) {
+            $output->writeln('<info>App is compliant - awesome job!</info>');
+            return 0;
+        } else {
+            $output->writeln('<error>App is not compliant</error>');
+            return 101;
+        }
+    }
+
+    /**
+     * @param string $appId
+     * @param $output
+     */
+    private function analyseUpdateFile($appId, OutputInterface $output) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        $updatePhp = $appPath . '/appinfo/update.php';
+        if (file_exists($updatePhp)) {
+            $output->writeln("<info>Deprecated file found: $updatePhp - please use repair steps</info>");
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'checker') {
+            return ['private', 'deprecation', 'strong-comparison'];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app-id') {
+            return \OC_App::getAllApps();
+        }
+        return [];
+    }
 }

core/Command/App/Enable.php

Indentation +137 added lines, -137 removed lines

@@ -41,141 +41,141 @@
 
 class Enable extends Command implements CompletionAwareInterface {
 
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var int */
-	protected $exitCode = 0;
-
-	/**
-	 * @param IAppManager $appManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IAppManager $appManager, IGroupManager $groupManager) {
-		parent::__construct();
-		$this->appManager = $appManager;
-		$this->groupManager = $groupManager;
-	}
-
-	protected function configure(): void {
-		$this
-			->setName('app:enable')
-			->setDescription('enable an app')
-			->addArgument(
-				'app-id',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'enable the specified app'
-			)
-			->addOption(
-				'groups',
-				'g',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'enable the app only for a list of groups'
-			)
-			->addOption(
-				'force',
-				'f',
-				InputOption::VALUE_NONE,
-				'enable the app regardless of the Nextcloud version requirement'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appIds = $input->getArgument('app-id');
-		$groups = $this->resolveGroupIds($input->getOption('groups'));
-		$forceEnable = (bool) $input->getOption('force');
-
-		foreach ($appIds as $appId) {
-			$this->enableApp($appId, $groups, $forceEnable, $output);
-		}
-
-		return $this->exitCode;
-	}
-
-	/**
-	 * @param string $appId
-	 * @param array $groupIds
-	 * @param bool $forceEnable
-	 * @param OutputInterface $output
-	 */
-	private function enableApp(string $appId, array $groupIds, bool $forceEnable, OutputInterface $output): void {
-		$groupNames = array_map(function (IGroup $group) {
-			return $group->getDisplayName();
-		}, $groupIds);
-
-		if ($this->appManager->isInstalled($appId) && $groupIds === []) {
-			$output->writeln($appId . ' already enabled');
-			return;
-		}
-
-		try {
-			/** @var Installer $installer */
-			$installer = \OC::$server->query(Installer::class);
-
-			if (false === $installer->isDownloaded($appId)) {
-				$installer->downloadApp($appId);
-			}
-
-			$installer->installApp($appId, $forceEnable);
-
-			if ($groupIds === []) {
-				$this->appManager->enableApp($appId, $forceEnable);
-				$output->writeln($appId . ' enabled');
-			} else {
-				$this->appManager->enableAppForGroups($appId, $groupIds, $forceEnable);
-				$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groupNames));
-			}
-		} catch (AppPathNotFoundException $e) {
-			$output->writeln($appId . ' not found');
-			$this->exitCode = 1;
-		} catch (\Exception $e) {
-			$output->writeln($e->getMessage());
-			$this->exitCode = 1;
-		}
-	}
-
-	/**
-	 * @param array $groupIds
-	 * @return array
-	 */
-	private function resolveGroupIds(array $groupIds): array {
-		$groups = [];
-		foreach ($groupIds as $groupId) {
-			$group = $this->groupManager->get($groupId);
-			if ($group instanceof IGroup) {
-				$groups[] = $group;
-			}
-		}
-		return $groups;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'groups') {
-			return array_map(function (IGroup $group) {
-				return $group->getGID();
-			}, $this->groupManager->search($context->getCurrentWord()));
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app-id') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-		return [];
-	}
+    /** @var IAppManager */
+    protected $appManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var int */
+    protected $exitCode = 0;
+
+    /**
+     * @param IAppManager $appManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IAppManager $appManager, IGroupManager $groupManager) {
+        parent::__construct();
+        $this->appManager = $appManager;
+        $this->groupManager = $groupManager;
+    }
+
+    protected function configure(): void {
+        $this
+            ->setName('app:enable')
+            ->setDescription('enable an app')
+            ->addArgument(
+                'app-id',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'enable the specified app'
+            )
+            ->addOption(
+                'groups',
+                'g',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'enable the app only for a list of groups'
+            )
+            ->addOption(
+                'force',
+                'f',
+                InputOption::VALUE_NONE,
+                'enable the app regardless of the Nextcloud version requirement'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appIds = $input->getArgument('app-id');
+        $groups = $this->resolveGroupIds($input->getOption('groups'));
+        $forceEnable = (bool) $input->getOption('force');
+
+        foreach ($appIds as $appId) {
+            $this->enableApp($appId, $groups, $forceEnable, $output);
+        }
+
+        return $this->exitCode;
+    }
+
+    /**
+     * @param string $appId
+     * @param array $groupIds
+     * @param bool $forceEnable
+     * @param OutputInterface $output
+     */
+    private function enableApp(string $appId, array $groupIds, bool $forceEnable, OutputInterface $output): void {
+        $groupNames = array_map(function (IGroup $group) {
+            return $group->getDisplayName();
+        }, $groupIds);
+
+        if ($this->appManager->isInstalled($appId) && $groupIds === []) {
+            $output->writeln($appId . ' already enabled');
+            return;
+        }
+
+        try {
+            /** @var Installer $installer */
+            $installer = \OC::$server->query(Installer::class);
+
+            if (false === $installer->isDownloaded($appId)) {
+                $installer->downloadApp($appId);
+            }
+
+            $installer->installApp($appId, $forceEnable);
+
+            if ($groupIds === []) {
+                $this->appManager->enableApp($appId, $forceEnable);
+                $output->writeln($appId . ' enabled');
+            } else {
+                $this->appManager->enableAppForGroups($appId, $groupIds, $forceEnable);
+                $output->writeln($appId . ' enabled for groups: ' . implode(', ', $groupNames));
+            }
+        } catch (AppPathNotFoundException $e) {
+            $output->writeln($appId . ' not found');
+            $this->exitCode = 1;
+        } catch (\Exception $e) {
+            $output->writeln($e->getMessage());
+            $this->exitCode = 1;
+        }
+    }
+
+    /**
+     * @param array $groupIds
+     * @return array
+     */
+    private function resolveGroupIds(array $groupIds): array {
+        $groups = [];
+        foreach ($groupIds as $groupId) {
+            $group = $this->groupManager->get($groupId);
+            if ($group instanceof IGroup) {
+                $groups[] = $group;
+            }
+        }
+        return $groups;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'groups') {
+            return array_map(function (IGroup $group) {
+                return $group->getGID();
+            }, $this->groupManager->search($context->getCurrentWord()));
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app-id') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+        return [];
+    }
 }

core/Command/App/GetPath.php

Indentation +40 added lines, -40 removed lines

@@ -30,48 +30,48 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetPath extends Base {
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('app:getpath')
-			->setDescription('Get an absolute path to the app directory')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-		;
-	}
+        $this
+            ->setName('app:getpath')
+            ->setDescription('Get an absolute path to the app directory')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+        ;
+    }
 
-	/**
-	 * Executes the current command.
-	 *
-	 * @param InputInterface  $input  An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 * @return null|int null or 0 if everything went fine, or an error code
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$path = \OC_App::getAppPath($appName);
-		if ($path !== false) {
-			$output->writeln($path);
-			return 0;
-		}
+    /**
+     * Executes the current command.
+     *
+     * @param InputInterface  $input  An InputInterface instance
+     * @param OutputInterface $output An OutputInterface instance
+     * @return null|int null or 0 if everything went fine, or an error code
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $path = \OC_App::getAppPath($appName);
+        if ($path !== false) {
+            $output->writeln($path);
+            return 0;
+        }
 
-		// App not found, exit with non-zero
-		return 1;
-	}
+        // App not found, exit with non-zero
+        return 1;
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return \OC_App::getAllApps();
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return \OC_App::getAllApps();
+        }
+        return [];
+    }
 }

core/Command/App/Update.php

Indentation +79 added lines, -79 removed lines

@@ -37,92 +37,92 @@
 
 class Update extends Command {
 
-	/** @var IAppManager */
-	protected $manager;
-	/** @var Installer */
-	private $installer;
-	/** @var ILogger */
-	private $logger;
+    /** @var IAppManager */
+    protected $manager;
+    /** @var Installer */
+    private $installer;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param IAppManager $manager
-	 * @param Installer $installer
-	 */
-	public function __construct(IAppManager $manager, Installer $installer, ILogger $logger) {
-		parent::__construct();
-		$this->manager = $manager;
-		$this->installer = $installer;
-		$this->logger = $logger;
-	}
+    /**
+     * @param IAppManager $manager
+     * @param Installer $installer
+     */
+    public function __construct(IAppManager $manager, Installer $installer, ILogger $logger) {
+        parent::__construct();
+        $this->manager = $manager;
+        $this->installer = $installer;
+        $this->logger = $logger;
+    }
 
-	protected function configure() {
-		$this
-			->setName('app:update')
-			->setDescription('update an app or all apps')
-			->addArgument(
-				'app-id',
-				InputArgument::OPTIONAL,
-				'update the specified app'
-			)
-			->addOption(
-				'all',
-				null,
-				InputOption::VALUE_NONE,
-				'update all updatable apps'
-			)
-			->addOption(
-				'showonly',
-				null,
-				InputOption::VALUE_NONE,
-				'show update(s) without updating'
-			)
+    protected function configure() {
+        $this
+            ->setName('app:update')
+            ->setDescription('update an app or all apps')
+            ->addArgument(
+                'app-id',
+                InputArgument::OPTIONAL,
+                'update the specified app'
+            )
+            ->addOption(
+                'all',
+                null,
+                InputOption::VALUE_NONE,
+                'update all updatable apps'
+            )
+            ->addOption(
+                'showonly',
+                null,
+                InputOption::VALUE_NONE,
+                'show update(s) without updating'
+            )
 
-		;
-	}
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$singleAppId = $input->getArgument('app-id');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $singleAppId = $input->getArgument('app-id');
 
-		if ($singleAppId) {
-			$apps = [$singleAppId];
-			try {
-				$this->manager->getAppPath($singleAppId);
-			} catch (\OCP\App\AppPathNotFoundException $e) {
-				$output->writeln($singleAppId . ' not installed');
-				return 1;
-			}
-		} elseif ($input->getOption('all') || $input->getOption('showonly')) {
-			$apps = \OC_App::getAllApps();
-		} else {
-			$output->writeln("<error>Please specify an app to update or \"--all\" to update all updatable apps\"</error>");
-			return 1;
-		}
+        if ($singleAppId) {
+            $apps = [$singleAppId];
+            try {
+                $this->manager->getAppPath($singleAppId);
+            } catch (\OCP\App\AppPathNotFoundException $e) {
+                $output->writeln($singleAppId . ' not installed');
+                return 1;
+            }
+        } elseif ($input->getOption('all') || $input->getOption('showonly')) {
+            $apps = \OC_App::getAllApps();
+        } else {
+            $output->writeln("<error>Please specify an app to update or \"--all\" to update all updatable apps\"</error>");
+            return 1;
+        }
 
-		$return = 0;
-		foreach ($apps as $appId) {
-			$newVersion = $this->installer->isUpdateAvailable($appId);
-			if ($newVersion) {
-				$output->writeln($appId . ' new version available: ' . $newVersion);
+        $return = 0;
+        foreach ($apps as $appId) {
+            $newVersion = $this->installer->isUpdateAvailable($appId);
+            if ($newVersion) {
+                $output->writeln($appId . ' new version available: ' . $newVersion);
 
-				if (!$input->getOption('showonly')) {
-					try {
-						$result = $this->installer->updateAppstoreApp($appId);
-					} catch (\Exception $e) {
-						$this->logger->logException($e, ['message' => 'Failure during update of app "' . $appId . '"','app' => 'app:update']);
-						$output->writeln('Error: ' . $e->getMessage());
-						$return = 1;
-					}
+                if (!$input->getOption('showonly')) {
+                    try {
+                        $result = $this->installer->updateAppstoreApp($appId);
+                    } catch (\Exception $e) {
+                        $this->logger->logException($e, ['message' => 'Failure during update of app "' . $appId . '"','app' => 'app:update']);
+                        $output->writeln('Error: ' . $e->getMessage());
+                        $return = 1;
+                    }
 
-					if ($result === false) {
-						$output->writeln($appId . ' couldn\'t be updated');
-						$return = 1;
-					} elseif ($result === true) {
-						$output->writeln($appId . ' updated');
-					}
-				}
-			}
-		}
+                    if ($result === false) {
+                        $output->writeln($appId . ' couldn\'t be updated');
+                        $return = 1;
+                    } elseif ($result === true) {
+                        $output->writeln($appId . ' updated');
+                    }
+                }
+            }
+        }
 
-		return $return;
-	}
+        return $return;
+    }
 }

core/Command/App/ListApps.php

Indentation +106 added lines, -106 removed lines

@@ -35,110 +35,110 @@
 
 class ListApps extends Base {
 
-	/** @var IAppManager */
-	protected $manager;
-
-	/**
-	 * @param IAppManager $manager
-	 */
-	public function __construct(IAppManager $manager) {
-		parent::__construct();
-		$this->manager = $manager;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('app:list')
-			->setDescription('List all available apps')
-			->addOption(
-				'shipped',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'true - limit to shipped apps only, false - limit to non-shipped apps only'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false') {
-			$shippedFilter = $input->getOption('shipped') === 'true';
-		} else {
-			$shippedFilter = null;
-		}
-
-		$apps = \OC_App::getAllApps();
-		$enabledApps = $disabledApps = [];
-		$versions = \OC_App::getAppVersions();
-
-		//sort enabled apps above disabled apps
-		foreach ($apps as $app) {
-			if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter) {
-				continue;
-			}
-			if ($this->manager->isInstalled($app)) {
-				$enabledApps[] = $app;
-			} else {
-				$disabledApps[] = $app;
-			}
-		}
-
-		$apps = ['enabled' => [], 'disabled' => []];
-
-		sort($enabledApps);
-		foreach ($enabledApps as $app) {
-			$apps['enabled'][$app] = isset($versions[$app]) ? $versions[$app] : true;
-		}
-
-		sort($disabledApps);
-		foreach ($disabledApps as $app) {
-			$apps['disabled'][$app] = null;
-		}
-
-		$this->writeAppList($input, $output, $apps);
-		return 0;
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param array $items
-	 */
-	protected function writeAppList(InputInterface $input, OutputInterface $output, $items) {
-		switch ($input->getOption('output')) {
-			case self::OUTPUT_FORMAT_PLAIN:
-				$output->writeln('Enabled:');
-				parent::writeArrayInOutputFormat($input, $output, $items['enabled']);
-
-				$output->writeln('Disabled:');
-				parent::writeArrayInOutputFormat($input, $output, $items['disabled']);
-			break;
-
-			default:
-				parent::writeArrayInOutputFormat($input, $output, $items);
-			break;
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $completionContext
-	 * @return array
-	 */
-	public function completeOptionValues($optionName, CompletionContext $completionContext) {
-		if ($optionName === 'shipped') {
-			return ['true', 'false'];
-		}
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		return [];
-	}
+    /** @var IAppManager */
+    protected $manager;
+
+    /**
+     * @param IAppManager $manager
+     */
+    public function __construct(IAppManager $manager) {
+        parent::__construct();
+        $this->manager = $manager;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('app:list')
+            ->setDescription('List all available apps')
+            ->addOption(
+                'shipped',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'true - limit to shipped apps only, false - limit to non-shipped apps only'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false') {
+            $shippedFilter = $input->getOption('shipped') === 'true';
+        } else {
+            $shippedFilter = null;
+        }
+
+        $apps = \OC_App::getAllApps();
+        $enabledApps = $disabledApps = [];
+        $versions = \OC_App::getAppVersions();
+
+        //sort enabled apps above disabled apps
+        foreach ($apps as $app) {
+            if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter) {
+                continue;
+            }
+            if ($this->manager->isInstalled($app)) {
+                $enabledApps[] = $app;
+            } else {
+                $disabledApps[] = $app;
+            }
+        }
+
+        $apps = ['enabled' => [], 'disabled' => []];
+
+        sort($enabledApps);
+        foreach ($enabledApps as $app) {
+            $apps['enabled'][$app] = isset($versions[$app]) ? $versions[$app] : true;
+        }
+
+        sort($disabledApps);
+        foreach ($disabledApps as $app) {
+            $apps['disabled'][$app] = null;
+        }
+
+        $this->writeAppList($input, $output, $apps);
+        return 0;
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param array $items
+     */
+    protected function writeAppList(InputInterface $input, OutputInterface $output, $items) {
+        switch ($input->getOption('output')) {
+            case self::OUTPUT_FORMAT_PLAIN:
+                $output->writeln('Enabled:');
+                parent::writeArrayInOutputFormat($input, $output, $items['enabled']);
+
+                $output->writeln('Disabled:');
+                parent::writeArrayInOutputFormat($input, $output, $items['disabled']);
+            break;
+
+            default:
+                parent::writeArrayInOutputFormat($input, $output, $items);
+            break;
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $completionContext
+     * @return array
+     */
+    public function completeOptionValues($optionName, CompletionContext $completionContext) {
+        if ($optionName === 'shipped') {
+            return ['true', 'false'];
+        }
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        return [];
+    }
 }

core/Command/Encryption/Disable.php

Indentation +24 added lines, -24 removed lines

@@ -28,31 +28,31 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Disable extends Command {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		$this
-			->setName('encryption:disable')
-			->setDescription('Disable encryption')
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('encryption:disable')
+            ->setDescription('Disable encryption')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if ($this->config->getAppValue('core', 'encryption_enabled', 'no') !== 'yes') {
-			$output->writeln('Encryption is already disabled');
-		} else {
-			$this->config->setAppValue('core', 'encryption_enabled', 'no');
-			$output->writeln('<info>Encryption disabled</info>');
-		}
-		return 0;
-	}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        if ($this->config->getAppValue('core', 'encryption_enabled', 'no') !== 'yes') {
+            $output->writeln('Encryption is already disabled');
+        } else {
+            $this->config->setAppValue('core', 'encryption_enabled', 'no');
+            $output->writeln('<info>Encryption disabled</info>');
+        }
+        return 0;
+    }
 }