From ab21d69903c4360cbce59741624b6e765e3bd35f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 26 Jun 2020 14:54:51 +0200 Subject: [PATCH] Add return value to all commands Signed-off-by: Joas Schilling --- core/Command/App/CheckCode.php | 2 +- core/Command/App/Disable.php | 2 +- core/Command/App/Enable.php | 2 +- core/Command/App/GetPath.php | 2 +- core/Command/App/Install.php | 2 +- core/Command/App/ListApps.php | 3 ++- core/Command/App/Remove.php | 2 +- core/Command/App/Update.php | 2 +- core/Command/Background/Base.php | 5 +++-- core/Command/Broadcast/Test.php | 2 +- core/Command/Check.php | 2 +- core/Command/Config/App/DeleteConfig.php | 2 +- core/Command/Config/App/GetConfig.php | 2 +- core/Command/Config/App/SetConfig.php | 2 +- core/Command/Config/Import.php | 5 +++-- core/Command/Config/ListConfigs.php | 3 ++- core/Command/Config/System/DeleteConfig.php | 2 +- core/Command/Config/System/GetConfig.php | 2 +- core/Command/Config/System/SetConfig.php | 2 +- core/Command/Db/AddMissingColumns.php | 3 ++- core/Command/Db/AddMissingIndices.php | 3 ++- core/Command/Db/ConvertFilecacheBigInt.php | 2 +- core/Command/Db/ConvertMysqlToMB4.php | 2 +- core/Command/Db/ConvertType.php | 5 +++-- core/Command/Db/Migrations/ExecuteCommand.php | 2 +- core/Command/Db/Migrations/GenerateCommand.php | 2 +- .../Db/Migrations/GenerateFromSchemaFileCommand.php | 2 +- core/Command/Db/Migrations/MigrateCommand.php | 3 ++- core/Command/Db/Migrations/StatusCommand.php | 3 ++- core/Command/Encryption/ChangeKeyStorageRoot.php | 6 ++++-- core/Command/Encryption/DecryptAll.php | 10 ++++++---- core/Command/Encryption/Disable.php | 3 ++- core/Command/Encryption/Enable.php | 6 +++++- core/Command/Encryption/EncryptAll.php | 6 ++++-- core/Command/Encryption/ListModules.php | 5 +++-- core/Command/Encryption/SetDefaultModule.php | 6 ++++-- core/Command/Encryption/ShowKeyStorageRoot.php | 3 ++- core/Command/Encryption/Status.php | 3 ++- core/Command/Group/Add.php | 2 +- core/Command/Group/AddUser.php | 3 ++- core/Command/Group/Delete.php | 3 ++- core/Command/Group/ListCommand.php | 3 ++- core/Command/Group/RemoveUser.php | 3 ++- core/Command/Integrity/CheckApp.php | 3 ++- core/Command/Integrity/CheckCore.php | 3 ++- core/Command/Integrity/SignApp.php | 8 ++++---- core/Command/Integrity/SignCore.php | 8 ++++---- core/Command/L10n/CreateJs.php | 5 +++-- core/Command/Log/File.php | 3 ++- core/Command/Log/Manage.php | 3 ++- core/Command/Maintenance/DataFingerprint.php | 3 ++- core/Command/Maintenance/Install.php | 2 +- core/Command/Maintenance/Mimetype/UpdateDB.php | 3 ++- core/Command/Maintenance/Mimetype/UpdateJS.php | 3 ++- core/Command/Maintenance/Mode.php | 3 ++- core/Command/Maintenance/Repair.php | 3 ++- core/Command/Maintenance/UpdateHtaccess.php | 2 +- core/Command/Maintenance/UpdateTheme.php | 3 ++- core/Command/Security/ImportCertificate.php | 5 +++-- core/Command/Security/ListCertificates.php | 3 ++- core/Command/Security/RemoveCertificate.php | 3 ++- core/Command/Security/ResetBruteforceAttempts.php | 3 ++- core/Command/Status.php | 3 ++- core/Command/TwoFactorAuth/Cleanup.php | 3 ++- core/Command/TwoFactorAuth/Disable.php | 2 +- core/Command/TwoFactorAuth/Enable.php | 2 +- core/Command/TwoFactorAuth/Enforce.php | 3 ++- core/Command/TwoFactorAuth/State.php | 2 +- core/Command/Upgrade.php | 2 +- core/Command/User/Add.php | 3 ++- core/Command/User/Delete.php | 7 ++++--- core/Command/User/Disable.php | 5 +++-- core/Command/User/Enable.php | 5 +++-- core/Command/User/Info.php | 3 ++- core/Command/User/LastSeen.php | 5 +++-- core/Command/User/ListCommand.php | 5 +++-- core/Command/User/Report.php | 3 ++- core/Command/User/ResetPassword.php | 3 ++- core/Command/User/Setting.php | 2 +- 79 files changed, 159 insertions(+), 103 deletions(-) diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php index 25e22d0417..f7b3723a8d 100644 --- a/core/Command/App/CheckCode.php +++ b/core/Command/App/CheckCode.php @@ -80,7 +80,7 @@ class CheckCode extends Command implements CompletionAwareInterface { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appId = $input->getArgument('app-id'); $checkList = new EmptyCheck(); diff --git a/core/Command/App/Disable.php b/core/Command/App/Disable.php index 94dd1f6354..ba9b8d769e 100644 --- a/core/Command/App/Disable.php +++ b/core/Command/App/Disable.php @@ -60,7 +60,7 @@ class Disable extends Command implements CompletionAwareInterface { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appIds = $input->getArgument('app-id'); foreach ($appIds as $appId) { diff --git a/core/Command/App/Enable.php b/core/Command/App/Enable.php index e782a7fc0b..2e26184b19 100644 --- a/core/Command/App/Enable.php +++ b/core/Command/App/Enable.php @@ -83,7 +83,7 @@ class Enable extends Command implements CompletionAwareInterface { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appIds = $input->getArgument('app-id'); $groups = $this->resolveGroupIds($input->getOption('groups')); $forceEnable = (bool) $input->getOption('force'); diff --git a/core/Command/App/GetPath.php b/core/Command/App/GetPath.php index 07a8a38bbc..1659a110ab 100644 --- a/core/Command/App/GetPath.php +++ b/core/Command/App/GetPath.php @@ -51,7 +51,7 @@ class GetPath extends Base { * @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) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); $path = \OC_App::getAppPath($appName); if ($path !== false) { diff --git a/core/Command/App/Install.php b/core/Command/App/Install.php index 6581789495..41e3e20c9d 100644 --- a/core/Command/App/Install.php +++ b/core/Command/App/Install.php @@ -51,7 +51,7 @@ class Install extends Command { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appId = $input->getArgument('app-id'); if (\OC_App::getAppPath($appId)) { diff --git a/core/Command/App/ListApps.php b/core/Command/App/ListApps.php index 0765ab39a2..74f2ad76cc 100644 --- a/core/Command/App/ListApps.php +++ b/core/Command/App/ListApps.php @@ -61,7 +61,7 @@ class ListApps extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false') { $shippedFilter = $input->getOption('shipped') === 'true'; } else { @@ -97,6 +97,7 @@ class ListApps extends Base { } $this->writeAppList($input, $output, $apps); + return 0; } /** diff --git a/core/Command/App/Remove.php b/core/Command/App/Remove.php index 6e3fa704ef..96d1efe8c6 100644 --- a/core/Command/App/Remove.php +++ b/core/Command/App/Remove.php @@ -75,7 +75,7 @@ class Remove extends Command implements CompletionAwareInterface { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appId = $input->getArgument('app-id'); // Check if the app is installed diff --git a/core/Command/App/Update.php b/core/Command/App/Update.php index 417d1915d0..34178c1ee7 100644 --- a/core/Command/App/Update.php +++ b/core/Command/App/Update.php @@ -80,7 +80,7 @@ class Update extends Command { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $singleAppId = $input->getArgument('app-id'); if ($singleAppId) { diff --git a/core/Command/Background/Base.php b/core/Command/Background/Base.php index 4146666000..b80fd75117 100644 --- a/core/Command/Background/Base.php +++ b/core/Command/Background/Base.php @@ -48,8 +48,8 @@ abstract class Base extends Command { * @param \OCP\IConfig $config */ public function __construct(IConfig $config) { - $this->config = $config; parent::__construct(); + $this->config = $config; } protected function configure() { @@ -67,9 +67,10 @@ abstract class Base extends Command { * @param InputInterface $input * @param OutputInterface $output */ - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $mode = $this->getMode(); $this->config->setAppValue('core', 'backgroundjobs_mode', $mode); $output->writeln("Set mode for background jobs to '$mode'"); + return 0; } } diff --git a/core/Command/Broadcast/Test.php b/core/Command/Broadcast/Test.php index 93734369ac..7be49156a7 100644 --- a/core/Command/Broadcast/Test.php +++ b/core/Command/Broadcast/Test.php @@ -60,7 +60,7 @@ class Test extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $name = $input->getArgument('name'); $uid = $input->getArgument('uid'); diff --git a/core/Command/Check.php b/core/Command/Check.php index a4e17e0bf9..f1615fa941 100644 --- a/core/Command/Check.php +++ b/core/Command/Check.php @@ -50,7 +50,7 @@ class Check extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $errors = \OC_Util::checkServer($this->config); if (!empty($errors)) { $errors = array_map(function ($item) { diff --git a/core/Command/Config/App/DeleteConfig.php b/core/Command/Config/App/DeleteConfig.php index 8f8f9e66d4..6eb1585d59 100644 --- a/core/Command/Config/App/DeleteConfig.php +++ b/core/Command/Config/App/DeleteConfig.php @@ -65,7 +65,7 @@ class DeleteConfig extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); $configName = $input->getArgument('name'); diff --git a/core/Command/Config/App/GetConfig.php b/core/Command/Config/App/GetConfig.php index f52461c17e..32a83451b7 100644 --- a/core/Command/Config/App/GetConfig.php +++ b/core/Command/Config/App/GetConfig.php @@ -72,7 +72,7 @@ class GetConfig extends Base { * @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) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); $configName = $input->getArgument('name'); $defaultValue = $input->getOption('default-value'); diff --git a/core/Command/Config/App/SetConfig.php b/core/Command/Config/App/SetConfig.php index 393deb010e..327eebfaeb 100644 --- a/core/Command/Config/App/SetConfig.php +++ b/core/Command/Config/App/SetConfig.php @@ -71,7 +71,7 @@ class SetConfig extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); $configName = $input->getArgument('name'); diff --git a/core/Command/Config/Import.php b/core/Command/Config/Import.php index 3ff1950b76..755c6c80cd 100644 --- a/core/Command/Config/Import.php +++ b/core/Command/Config/Import.php @@ -60,7 +60,7 @@ class Import extends Command implements CompletionAwareInterface { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $importFile = $input->getArgument('file'); if ($importFile !== null) { $content = $this->getArrayFromFile($importFile); @@ -72,7 +72,7 @@ class Import extends Command implements CompletionAwareInterface { $configs = $this->validateFileContent($content); } catch (\UnexpectedValueException $e) { $output->writeln('' . $e->getMessage(). ''); - return; + return 1; } if (!empty($configs['system'])) { @@ -92,6 +92,7 @@ class Import extends Command implements CompletionAwareInterface { } $output->writeln('Config successfully imported from: ' . $importFile . ''); + return 0; } /** diff --git a/core/Command/Config/ListConfigs.php b/core/Command/Config/ListConfigs.php index 2394811f51..e73c3a4831 100644 --- a/core/Command/Config/ListConfigs.php +++ b/core/Command/Config/ListConfigs.php @@ -71,7 +71,7 @@ class ListConfigs extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $app = $input->getArgument('app'); $noSensitiveValues = !$input->getOption('private'); @@ -102,6 +102,7 @@ class ListConfigs extends Base { } $this->writeArrayInOutputFormat($input, $output, $configs); + return 0; } /** diff --git a/core/Command/Config/System/DeleteConfig.php b/core/Command/Config/System/DeleteConfig.php index 9bd162f987..8df3f934e1 100644 --- a/core/Command/Config/System/DeleteConfig.php +++ b/core/Command/Config/System/DeleteConfig.php @@ -62,7 +62,7 @@ class DeleteConfig extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $configNames = $input->getArgument('name'); $configName = $configNames[0]; diff --git a/core/Command/Config/System/GetConfig.php b/core/Command/Config/System/GetConfig.php index a1ea135e59..f01ed804de 100644 --- a/core/Command/Config/System/GetConfig.php +++ b/core/Command/Config/System/GetConfig.php @@ -68,7 +68,7 @@ class GetConfig extends Base { * @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) { + protected function execute(InputInterface $input, OutputInterface $output): int { $configNames = $input->getArgument('name'); $configName = array_shift($configNames); $defaultValue = $input->getOption('default-value'); diff --git a/core/Command/Config/System/SetConfig.php b/core/Command/Config/System/SetConfig.php index 55030be545..bcc55d746a 100644 --- a/core/Command/Config/System/SetConfig.php +++ b/core/Command/Config/System/SetConfig.php @@ -77,7 +77,7 @@ class SetConfig extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $configNames = $input->getArgument('name'); $configName = $configNames[0]; $configValue = $this->castValue($input->getOption('value'), $input->getOption('type')); diff --git a/core/Command/Db/AddMissingColumns.php b/core/Command/Db/AddMissingColumns.php index 5794b95b76..3ace75b4ee 100644 --- a/core/Command/Db/AddMissingColumns.php +++ b/core/Command/Db/AddMissingColumns.php @@ -63,12 +63,13 @@ class AddMissingColumns extends Command { ->setDescription('Add missing optional columns to the database tables'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $this->addCoreColumns($output); // Dispatch event so apps can also update columns if needed $event = new GenericEvent($output); $this->dispatcher->dispatch(IDBConnection::ADD_MISSING_COLUMNS_EVENT, $event); + return 0; } /** diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php index 2784721f55..6f41d9dce2 100644 --- a/core/Command/Db/AddMissingIndices.php +++ b/core/Command/Db/AddMissingIndices.php @@ -69,12 +69,13 @@ class AddMissingIndices extends Command { ->setDescription('Add missing indices to the database tables'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $this->addCoreIndexes($output); // Dispatch event so apps can also update indexes if needed $event = new GenericEvent($output); $this->dispatcher->dispatch(IDBConnection::ADD_MISSING_INDEXES_EVENT, $event); + return 0; } /** diff --git a/core/Command/Db/ConvertFilecacheBigInt.php b/core/Command/Db/ConvertFilecacheBigInt.php index 4a833fbbed..f65e76ddfc 100644 --- a/core/Command/Db/ConvertFilecacheBigInt.php +++ b/core/Command/Db/ConvertFilecacheBigInt.php @@ -71,7 +71,7 @@ class ConvertFilecacheBigInt extends Command { ]; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $schema = new SchemaWrapper($this->connection); $isSqlite = $this->connection->getDatabasePlatform() instanceof SqlitePlatform; $updates = []; diff --git a/core/Command/Db/ConvertMysqlToMB4.php b/core/Command/Db/ConvertMysqlToMB4.php index fd16dd0943..369badf0df 100644 --- a/core/Command/Db/ConvertMysqlToMB4.php +++ b/core/Command/Db/ConvertMysqlToMB4.php @@ -68,7 +68,7 @@ class ConvertMysqlToMB4 extends Command { ->setDescription('Convert charset of MySQL/MariaDB to use utf8mb4'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) { $output->writeln("This command is only valid for MySQL/MariaDB databases."); return 1; diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php index c6d4c9e10f..2c4b7d14de 100644 --- a/core/Command/Db/ConvertType.php +++ b/core/Command/Db/ConvertType.php @@ -188,7 +188,7 @@ class ConvertType extends Command implements CompletionAwareInterface { } } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $this->validateInput($input, $output); $this->readPassword($input, $output); @@ -221,11 +221,12 @@ class ConvertType extends Command implements CompletionAwareInterface { $helper = $this->getHelper('question'); if (!$helper->ask($input, $output, $question)) { - return; + return 1; } } $intersectingTables = array_intersect($toTables, $fromTables); $this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output); + return 0; } protected function createSchema(Connection $fromDB, Connection $toDB, InputInterface $input, OutputInterface $output) { diff --git a/core/Command/Db/Migrations/ExecuteCommand.php b/core/Command/Db/Migrations/ExecuteCommand.php index 149ca8904b..95f1acd14f 100644 --- a/core/Command/Db/Migrations/ExecuteCommand.php +++ b/core/Command/Db/Migrations/ExecuteCommand.php @@ -75,7 +75,7 @@ class ExecuteCommand extends Command implements CompletionAwareInterface { * @param OutputInterface $output * @return int */ - public function execute(InputInterface $input, OutputInterface $output) { + public function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output)); $version = $input->getArgument('version'); diff --git a/core/Command/Db/Migrations/GenerateCommand.php b/core/Command/Db/Migrations/GenerateCommand.php index 6d554a5785..754d1f4840 100644 --- a/core/Command/Db/Migrations/GenerateCommand.php +++ b/core/Command/Db/Migrations/GenerateCommand.php @@ -110,7 +110,7 @@ class {{classname}} extends SimpleMigrationStep { parent::configure(); } - public function execute(InputInterface $input, OutputInterface $output) { + public function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); $version = $input->getArgument('version'); diff --git a/core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php b/core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php index 4f93b59fe3..71349c0fa5 100644 --- a/core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php +++ b/core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php @@ -52,7 +52,7 @@ class GenerateFromSchemaFileCommand extends GenerateCommand { $this->setName('migrations:generate-from-schema'); } - public function execute(InputInterface $input, OutputInterface $output) { + public function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); $version = $input->getArgument('version'); diff --git a/core/Command/Db/Migrations/MigrateCommand.php b/core/Command/Db/Migrations/MigrateCommand.php index 2b0fe26836..229288c794 100644 --- a/core/Command/Db/Migrations/MigrateCommand.php +++ b/core/Command/Db/Migrations/MigrateCommand.php @@ -55,12 +55,13 @@ class MigrateCommand extends Command implements CompletionAwareInterface { parent::configure(); } - public function execute(InputInterface $input, OutputInterface $output) { + public function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output)); $version = $input->getArgument('version'); $ms->migrate($version); + return 0; } /** diff --git a/core/Command/Db/Migrations/StatusCommand.php b/core/Command/Db/Migrations/StatusCommand.php index b9aa918ebb..dc92dfb1f5 100644 --- a/core/Command/Db/Migrations/StatusCommand.php +++ b/core/Command/Db/Migrations/StatusCommand.php @@ -53,7 +53,7 @@ class StatusCommand extends Command implements CompletionAwareInterface { ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on'); } - public function execute(InputInterface $input, OutputInterface $output) { + public function execute(InputInterface $input, OutputInterface $output): int { $appName = $input->getArgument('app'); $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output)); @@ -68,6 +68,7 @@ class StatusCommand extends Command implements CompletionAwareInterface { $output->writeln(" >> $key: " . str_repeat(' ', 50 - strlen($key)) . $value); } } + return 0; } /** diff --git a/core/Command/Encryption/ChangeKeyStorageRoot.php b/core/Command/Encryption/ChangeKeyStorageRoot.php index 894b1f664b..00e0f8fe33 100644 --- a/core/Command/Encryption/ChangeKeyStorageRoot.php +++ b/core/Command/Encryption/ChangeKeyStorageRoot.php @@ -84,14 +84,14 @@ class ChangeKeyStorageRoot extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $oldRoot = $this->util->getKeyStorageRoot(); $newRoot = $input->getArgument('newRoot'); if ($newRoot === null) { $question = new ConfirmationQuestion('No storage root given, do you want to reset the key storage root to the default location? (y/n) ', false); if (!$this->questionHelper->ask($input, $output, $question)) { - return; + return 1; } $newRoot = ''; } @@ -104,7 +104,9 @@ class ChangeKeyStorageRoot extends Command { $this->util->setKeyStorageRoot($newRoot); $output->writeln(''); $output->writeln("Key storage root successfully changed to $newRootDescription"); + return 0; } + return 1; } /** diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php index 14bf74d812..51dc74d1eb 100644 --- a/core/Command/Encryption/DecryptAll.php +++ b/core/Command/Encryption/DecryptAll.php @@ -125,14 +125,14 @@ class DecryptAll extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { if (!$input->isInteractive()) { $output->writeln('Invalid TTY.'); $output->writeln('If you are trying to execute the command in a Docker '); $output->writeln("container, do not forget to execute 'docker exec' with"); $output->writeln("the '-i' and '-t' options."); $output->writeln(''); - return; + return 1; } $isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false); @@ -141,7 +141,7 @@ class DecryptAll extends Command { $output->writeln("in order to load the relevant encryption modules correctly."); $output->writeln("Your instance will automatically be put to maintenance mode"); $output->writeln("during the actual decryption of the files."); - return; + return 1; } try { @@ -151,7 +151,7 @@ class DecryptAll extends Command { $output->writeln('done.'); } else { $output->writeln('Server side encryption not enabled. Nothing to do.'); - return; + return 0; } $uid = $input->getArgument('user'); @@ -181,11 +181,13 @@ class DecryptAll extends Command { $this->config->setAppValue('core', 'encryption_enabled', 'yes'); } $this->resetMaintenanceAndTrashbin(); + return 0; } else { $output->write('Enable server side encryption... '); $this->config->setAppValue('core', 'encryption_enabled', 'yes'); $output->writeln('done.'); $output->writeln('aborted'); + return 1; } } catch (\Exception $e) { // enable server side encryption again if something went wrong diff --git a/core/Command/Encryption/Disable.php b/core/Command/Encryption/Disable.php index 4d7542f0a0..c188e6c097 100644 --- a/core/Command/Encryption/Disable.php +++ b/core/Command/Encryption/Disable.php @@ -46,12 +46,13 @@ class Disable extends Command { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + 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('Encryption disabled'); } + return 0; } } diff --git a/core/Command/Encryption/Enable.php b/core/Command/Encryption/Enable.php index 2c475ca666..2de6eb2e0c 100644 --- a/core/Command/Encryption/Enable.php +++ b/core/Command/Encryption/Enable.php @@ -54,7 +54,7 @@ class Enable extends Command { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { if ($this->config->getAppValue('core', 'encryption_enabled', 'no') === 'yes') { $output->writeln('Encryption is already enabled'); } else { @@ -66,15 +66,19 @@ class Enable extends Command { $modules = $this->encryptionManager->getEncryptionModules(); if (empty($modules)) { $output->writeln('No encryption module is loaded'); + return 1; } else { $defaultModule = $this->config->getAppValue('core', 'default_encryption_module', null); if ($defaultModule === null) { $output->writeln('No default module is set'); + return 1; } elseif (!isset($modules[$defaultModule])) { $output->writeln('The current default module does not exist: ' . $defaultModule . ''); + return 1; } else { $output->writeln('Default module: ' . $defaultModule); } } + return 0; } } diff --git a/core/Command/Encryption/EncryptAll.php b/core/Command/Encryption/EncryptAll.php index f2e798966b..0be03fd95b 100644 --- a/core/Command/Encryption/EncryptAll.php +++ b/core/Command/Encryption/EncryptAll.php @@ -106,14 +106,14 @@ class EncryptAll extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { if (!$input->isInteractive()) { $output->writeln('Invalid TTY.'); $output->writeln('If you are trying to execute the command in a Docker '); $output->writeln("container, do not forget to execute 'docker exec' with"); $output->writeln("the '-i' and '-t' options."); $output->writeln(''); - return; + return 1; } if ($this->encryptionManager->isEnabled() === false) { @@ -141,6 +141,8 @@ class EncryptAll extends Command { $this->resetMaintenanceAndTrashbin(); } else { $output->writeln('aborted'); + return 1; } + return 0; } } diff --git a/core/Command/Encryption/ListModules.php b/core/Command/Encryption/ListModules.php index 812d2542d5..21a8be8057 100644 --- a/core/Command/Encryption/ListModules.php +++ b/core/Command/Encryption/ListModules.php @@ -59,12 +59,12 @@ class ListModules extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false); if ($isMaintenanceModeEnabled) { $output->writeln("Maintenance mode must be disabled when listing modules"); $output->writeln("in order to list the relevant encryption modules correctly."); - return; + return 1; } $encryptionModules = $this->encryptionManager->getEncryptionModules(); @@ -76,6 +76,7 @@ class ListModules extends Base { $encModules[$module['id']]['default'] = $module['id'] === $defaultEncryptionModuleId; } $this->writeModuleList($input, $output, $encModules); + return 0; } /** diff --git a/core/Command/Encryption/SetDefaultModule.php b/core/Command/Encryption/SetDefaultModule.php index 01c85abdf6..21c1ba7732 100644 --- a/core/Command/Encryption/SetDefaultModule.php +++ b/core/Command/Encryption/SetDefaultModule.php @@ -65,12 +65,12 @@ class SetDefaultModule extends Command { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false); if ($isMaintenanceModeEnabled) { $output->writeln("Maintenance mode must be disabled when setting default module,"); $output->writeln("in order to load the relevant encryption modules correctly."); - return; + return 1; } $moduleId = $input->getArgument('module'); @@ -81,6 +81,8 @@ class SetDefaultModule extends Command { $output->writeln('Set default module to "' . $moduleId . '"'); } else { $output->writeln('The specified module "' . $moduleId . '" does not exist'); + return 1; } + return 0; } } diff --git a/core/Command/Encryption/ShowKeyStorageRoot.php b/core/Command/Encryption/ShowKeyStorageRoot.php index 8156781e17..caac043856 100644 --- a/core/Command/Encryption/ShowKeyStorageRoot.php +++ b/core/Command/Encryption/ShowKeyStorageRoot.php @@ -48,11 +48,12 @@ class ShowKeyStorageRoot extends Command { ->setDescription('Show current key storage root'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $currentRoot = $this->util->getKeyStorageRoot(); $rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)'; $output->writeln("Current key storage root: $rootDescription"); + return 0; } } diff --git a/core/Command/Encryption/Status.php b/core/Command/Encryption/Status.php index 70b7aa8776..b7a6f33d7d 100644 --- a/core/Command/Encryption/Status.php +++ b/core/Command/Encryption/Status.php @@ -48,10 +48,11 @@ class Status extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $this->writeArrayInOutputFormat($input, $output, [ 'enabled' => $this->encryptionManager->isEnabled(), 'defaultModule' => $this->encryptionManager->getDefaultEncryptionModuleId(), ]); + return 0; } } diff --git a/core/Command/Group/Add.php b/core/Command/Group/Add.php index 1469968d2f..14b733f9af 100644 --- a/core/Command/Group/Add.php +++ b/core/Command/Group/Add.php @@ -65,7 +65,7 @@ class Add extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $gid = $input->getArgument('groupid'); $group = $this->groupManager->get($gid); if ($group) { diff --git a/core/Command/Group/AddUser.php b/core/Command/Group/AddUser.php index 5cbcbf1014..c941c90d1b 100644 --- a/core/Command/Group/AddUser.php +++ b/core/Command/Group/AddUser.php @@ -61,7 +61,7 @@ class AddUser extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $group = $this->groupManager->get($input->getArgument('group')); if (is_null($group)) { $output->writeln('group not found'); @@ -73,5 +73,6 @@ class AddUser extends Base { return 1; } $group->addUser($user); + return 0; } } diff --git a/core/Command/Group/Delete.php b/core/Command/Group/Delete.php index 948665585d..010fb55640 100644 --- a/core/Command/Group/Delete.php +++ b/core/Command/Group/Delete.php @@ -55,7 +55,7 @@ class Delete extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $gid = $input->getArgument('groupid'); if ($gid === 'admin') { $output->writeln('Group "' . $gid . '" could not be deleted.'); @@ -72,5 +72,6 @@ class Delete extends Base { $output->writeln('Group "' . $gid . '" could not be deleted. Please check the logs.'); return 1; } + return 0; } } diff --git a/core/Command/Group/ListCommand.php b/core/Command/Group/ListCommand.php index 09b91cce3b..d8f11ed5b7 100644 --- a/core/Command/Group/ListCommand.php +++ b/core/Command/Group/ListCommand.php @@ -67,9 +67,10 @@ class ListCommand extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset')); $this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups)); + return 0; } /** diff --git a/core/Command/Group/RemoveUser.php b/core/Command/Group/RemoveUser.php index 1401e70458..f00853279f 100644 --- a/core/Command/Group/RemoveUser.php +++ b/core/Command/Group/RemoveUser.php @@ -61,7 +61,7 @@ class RemoveUser extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $group = $this->groupManager->get($input->getArgument('group')); if (is_null($group)) { $output->writeln('group not found'); @@ -73,5 +73,6 @@ class RemoveUser extends Base { return 1; } $group->removeUser($user); + return 0; } } diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php index e57e3fdc9d..225be750d2 100644 --- a/core/Command/Integrity/CheckApp.php +++ b/core/Command/Integrity/CheckApp.php @@ -66,7 +66,7 @@ class CheckApp extends Base { /** * {@inheritdoc } */ - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $appid = $input->getArgument('appid'); $path = (string)$input->getOption('path'); $result = $this->checker->verifyAppSignature($appid, $path); @@ -74,5 +74,6 @@ class CheckApp extends Base { if (count($result)>0) { return 1; } + return 0; } } diff --git a/core/Command/Integrity/CheckCore.php b/core/Command/Integrity/CheckCore.php index ee61962d42..1dee779990 100644 --- a/core/Command/Integrity/CheckCore.php +++ b/core/Command/Integrity/CheckCore.php @@ -59,11 +59,12 @@ class CheckCore extends Base { /** * {@inheritdoc } */ - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $result = $this->checker->verifyCoreSignature(); $this->writeArrayInOutputFormat($input, $output, $result); if (count($result)>0) { return 1; } + return 0; } } diff --git a/core/Command/Integrity/SignApp.php b/core/Command/Integrity/SignApp.php index c8a876dca5..411ea43cbe 100644 --- a/core/Command/Integrity/SignApp.php +++ b/core/Command/Integrity/SignApp.php @@ -73,7 +73,7 @@ class SignApp extends Command { /** * {@inheritdoc } */ - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $path = $input->getOption('path'); $privateKeyPath = $input->getOption('privateKey'); $keyBundlePath = $input->getOption('certificate'); @@ -82,7 +82,7 @@ class SignApp extends Command { $output->writeln('This command requires the --path, --privateKey and --certificate.'); $output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"'); $output->writeln('For more information please consult the documentation: '. $documentationUrl); - return null; + return 1; } $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); @@ -90,12 +90,12 @@ class SignApp extends Command { if ($privateKey === false) { $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); - return null; + return 1; } if ($keyBundle === false) { $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); - return null; + return 1; } $rsa = new RSA(); diff --git a/core/Command/Integrity/SignCore.php b/core/Command/Integrity/SignCore.php index 6da09b52c1..54c1f2a544 100644 --- a/core/Command/Integrity/SignCore.php +++ b/core/Command/Integrity/SignCore.php @@ -67,13 +67,13 @@ class SignCore extends Command { /** * {@inheritdoc } */ - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $privateKeyPath = $input->getOption('privateKey'); $keyBundlePath = $input->getOption('certificate'); $path = $input->getOption('path'); if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) { $output->writeln('--privateKey, --certificate and --path are required.'); - return null; + return 1; } $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); @@ -81,12 +81,12 @@ class SignCore extends Command { if ($privateKey === false) { $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); - return null; + return 1; } if ($keyBundle === false) { $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); - return null; + return 1; } $rsa = new RSA(); diff --git a/core/Command/L10n/CreateJs.php b/core/Command/L10n/CreateJs.php index 05d58ec231..2402369d27 100644 --- a/core/Command/L10n/CreateJs.php +++ b/core/Command/L10n/CreateJs.php @@ -52,14 +52,14 @@ class CreateJs extends Command implements CompletionAwareInterface { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $app = $input->getArgument('app'); $lang = $input->getArgument('lang'); $path = \OC_App::getAppPath($app); if ($path === false) { $output->writeln("The app <$app> is unknown."); - return; + return 1; } $languages = $lang; if (empty($lang)) { @@ -69,6 +69,7 @@ class CreateJs extends Command implements CompletionAwareInterface { foreach ($languages as $lang) { $this->writeFiles($app, $path, $lang, $output); } + return 0; } private function getAllLanguages($path) { diff --git a/core/Command/Log/File.php b/core/Command/Log/File.php index 0f7fa9c1a4..5ab3cc16e4 100644 --- a/core/Command/Log/File.php +++ b/core/Command/Log/File.php @@ -72,7 +72,7 @@ class File extends Command implements Completion\CompletionAwareInterface { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $toBeSet = []; if ($input->getOption('enable')) { @@ -115,6 +115,7 @@ class File extends Command implements Completion\CompletionAwareInterface { $rotateString = 'disabled'; } $output->writeln('Rotate at: '.$rotateString); + return 0; } /** diff --git a/core/Command/Log/Manage.php b/core/Command/Log/Manage.php index 3eb24a4417..3a2cd64a9a 100644 --- a/core/Command/Log/Manage.php +++ b/core/Command/Log/Manage.php @@ -73,7 +73,7 @@ class Manage extends Command implements CompletionAwareInterface { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { // collate config setting to the end, to avoid partial configuration $toBeSet = []; @@ -114,6 +114,7 @@ class Manage extends Command implements CompletionAwareInterface { $timezone = $this->config->getSystemValue('logtimezone', self::DEFAULT_TIMEZONE); $output->writeln('Log timezone: '.$timezone); + return 0; } /** diff --git a/core/Command/Maintenance/DataFingerprint.php b/core/Command/Maintenance/DataFingerprint.php index 18c54819a1..4b513ffd40 100644 --- a/core/Command/Maintenance/DataFingerprint.php +++ b/core/Command/Maintenance/DataFingerprint.php @@ -48,7 +48,8 @@ class DataFingerprint extends Command { ->setDescription('update the systems data-fingerprint after a backup is restored'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime())); + return 0; } } diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php index f726699d03..9cca77bb9c 100644 --- a/core/Command/Maintenance/Install.php +++ b/core/Command/Maintenance/Install.php @@ -73,7 +73,7 @@ class Install extends Command { ->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data"); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { // validate the environment $server = \OC::$server; diff --git a/core/Command/Maintenance/Mimetype/UpdateDB.php b/core/Command/Maintenance/Mimetype/UpdateDB.php index 80ea06433b..ddca668dd1 100644 --- a/core/Command/Maintenance/Mimetype/UpdateDB.php +++ b/core/Command/Maintenance/Mimetype/UpdateDB.php @@ -63,7 +63,7 @@ class UpdateDB extends Command { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $mappings = $this->mimetypeDetector->getAllMappings(); $totalFilecacheUpdates = 0; @@ -95,5 +95,6 @@ class UpdateDB extends Command { $output->writeln('Added '.$totalNewMimetypes.' new mimetypes'); $output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows'); + return 0; } } diff --git a/core/Command/Maintenance/Mimetype/UpdateJS.php b/core/Command/Maintenance/Mimetype/UpdateJS.php index fd5f17ef7b..bc1ab7de79 100644 --- a/core/Command/Maintenance/Mimetype/UpdateJS.php +++ b/core/Command/Maintenance/Mimetype/UpdateJS.php @@ -48,7 +48,7 @@ class UpdateJS extends Command { ->setDescription('Update mimetypelist.js'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { // Fetch all the aliases $aliases = $this->mimetypeDetector->getAllAliases(); @@ -57,5 +57,6 @@ class UpdateJS extends Command { file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $generatedMimetypeFile->generateFile($aliases)); $output->writeln('mimetypelist.js is updated'); + return 0; } } diff --git a/core/Command/Maintenance/Mode.php b/core/Command/Maintenance/Mode.php index e78d7827fd..4a2f64981e 100644 --- a/core/Command/Maintenance/Mode.php +++ b/core/Command/Maintenance/Mode.php @@ -61,7 +61,7 @@ class Mode extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $maintenanceMode = $this->config->getSystemValueBool('maintenance'); if ($input->getOption('on')) { if ($maintenanceMode === false) { @@ -84,5 +84,6 @@ class Mode extends Command { $output->writeln('Maintenance mode is currently disabled'); } } + return 0; } } diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php index df5ce068b4..b61bd6e348 100644 --- a/core/Command/Maintenance/Repair.php +++ b/core/Command/Maintenance/Repair.php @@ -79,7 +79,7 @@ class Repair extends Command { 'Use this option when you want to include resource and load expensive tasks'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $repairSteps = $this->repair::getRepairSteps(); if ($input->getOption('include-expensive')) { @@ -126,6 +126,7 @@ class Repair extends Command { $this->repair->run(); $this->config->setSystemValue('maintenance', $maintenanceMode); + return 0; } public function handleRepairFeedBack($event) { diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php index 7f143536bf..b06127d712 100644 --- a/core/Command/Maintenance/UpdateHtaccess.php +++ b/core/Command/Maintenance/UpdateHtaccess.php @@ -36,7 +36,7 @@ class UpdateHtaccess extends Command { ->setDescription('Updates the .htaccess file'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { if (\OC\Setup::updateHtaccess()) { $output->writeln('.htaccess has been updated'); return 0; diff --git a/core/Command/Maintenance/UpdateTheme.php b/core/Command/Maintenance/UpdateTheme.php index ce13215e05..b055f1a0c7 100644 --- a/core/Command/Maintenance/UpdateTheme.php +++ b/core/Command/Maintenance/UpdateTheme.php @@ -54,7 +54,7 @@ class UpdateTheme extends UpdateJS { ->setDescription('Apply custom theme changes'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { // run mimetypelist.js update since themes might change mimetype icons parent::execute($input, $output); @@ -62,5 +62,6 @@ class UpdateTheme extends UpdateJS { $c = $this->cacheFactory->createDistributed('imagePath'); $c->clear(''); $output->writeln('Image cache cleared'); + return 0; } } diff --git a/core/Command/Security/ImportCertificate.php b/core/Command/Security/ImportCertificate.php index 7d540bc946..0d4ca70dab 100644 --- a/core/Command/Security/ImportCertificate.php +++ b/core/Command/Security/ImportCertificate.php @@ -49,17 +49,18 @@ class ImportCertificate extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $path = $input->getArgument('path'); if (!file_exists($path)) { $output->writeln('certificate not found'); - return; + return 1; } $certData = file_get_contents($path); $name = basename($path); $this->certificateManager->addCertificate($certData, $name); + return 0; } } diff --git a/core/Command/Security/ListCertificates.php b/core/Command/Security/ListCertificates.php index 594fa1bc4d..59cb92abe1 100644 --- a/core/Command/Security/ListCertificates.php +++ b/core/Command/Security/ListCertificates.php @@ -50,7 +50,7 @@ class ListCertificates extends Base { parent::configure(); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $outputType = $input->getOption('output'); if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) { $certificates = array_map(function (ICertificate $certificate) { @@ -91,5 +91,6 @@ class ListCertificates extends Base { $table->setRows($rows); $table->render(); } + return 0; } } diff --git a/core/Command/Security/RemoveCertificate.php b/core/Command/Security/RemoveCertificate.php index 4aa97a6175..fd0b536f29 100644 --- a/core/Command/Security/RemoveCertificate.php +++ b/core/Command/Security/RemoveCertificate.php @@ -50,9 +50,10 @@ class RemoveCertificate extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $name = $input->getArgument('name'); $this->certificateManager->removeCertificate($name); + return 0; } } diff --git a/core/Command/Security/ResetBruteforceAttempts.php b/core/Command/Security/ResetBruteforceAttempts.php index dcb827f8dd..694b65c7ac 100644 --- a/core/Command/Security/ResetBruteforceAttempts.php +++ b/core/Command/Security/ResetBruteforceAttempts.php @@ -49,7 +49,7 @@ class ResetBruteforceAttempts extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $ip = $input->getArgument('ipaddress'); if (!filter_var($ip, FILTER_VALIDATE_IP)) { @@ -58,5 +58,6 @@ class ResetBruteforceAttempts extends Base { } $this->throttler->resetDelayForIP($ip); + return 0; } } diff --git a/core/Command/Status.php b/core/Command/Status.php index 7702a672fc..0c3257f8a5 100644 --- a/core/Command/Status.php +++ b/core/Command/Status.php @@ -38,7 +38,7 @@ class Status extends Base { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $values = [ 'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false), 'version' => implode('.', \OCP\Util::getVersion()), @@ -47,5 +47,6 @@ class Status extends Base { ]; $this->writeArrayInOutputFormat($input, $output, $values); + return 0; } } diff --git a/core/Command/TwoFactorAuth/Cleanup.php b/core/Command/TwoFactorAuth/Cleanup.php index ac9dceef34..1ff7e16c5e 100644 --- a/core/Command/TwoFactorAuth/Cleanup.php +++ b/core/Command/TwoFactorAuth/Cleanup.php @@ -50,11 +50,12 @@ class Cleanup extends Base { $this->addArgument('provider-id', InputArgument::REQUIRED); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $providerId = $input->getArgument('provider-id'); $this->registry->cleanUp($providerId); $output->writeln("All user-provider associations for provider $providerId have been removed."); + return 0; } } diff --git a/core/Command/TwoFactorAuth/Disable.php b/core/Command/TwoFactorAuth/Disable.php index 128699a397..b4f1b1b282 100644 --- a/core/Command/TwoFactorAuth/Disable.php +++ b/core/Command/TwoFactorAuth/Disable.php @@ -52,7 +52,7 @@ class Disable extends Base { $this->addArgument('provider_id', InputArgument::REQUIRED); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $uid = $input->getArgument('uid'); $providerId = $input->getArgument('provider_id'); $user = $this->userManager->get($uid); diff --git a/core/Command/TwoFactorAuth/Enable.php b/core/Command/TwoFactorAuth/Enable.php index d979768f18..37ef08c2fa 100644 --- a/core/Command/TwoFactorAuth/Enable.php +++ b/core/Command/TwoFactorAuth/Enable.php @@ -52,7 +52,7 @@ class Enable extends Base { $this->addArgument('provider_id', InputArgument::REQUIRED); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $uid = $input->getArgument('uid'); $providerId = $input->getArgument('provider_id'); $user = $this->userManager->get($uid); diff --git a/core/Command/TwoFactorAuth/Enforce.php b/core/Command/TwoFactorAuth/Enforce.php index 7f3ceb9694..0174fcc76f 100644 --- a/core/Command/TwoFactorAuth/Enforce.php +++ b/core/Command/TwoFactorAuth/Enforce.php @@ -74,7 +74,7 @@ class Enforce extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { if ($input->getOption('on')) { $enforcedGroups = $input->getOption('group'); $excludedGroups = $input->getOption('exclude'); @@ -89,6 +89,7 @@ class Enforce extends Command { } else { $this->writeNotEnforced($output); } + return 0; } /** diff --git a/core/Command/TwoFactorAuth/State.php b/core/Command/TwoFactorAuth/State.php index 438a272223..5784853d60 100644 --- a/core/Command/TwoFactorAuth/State.php +++ b/core/Command/TwoFactorAuth/State.php @@ -52,7 +52,7 @@ class State extends Base { $this->addArgument('uid', InputArgument::REQUIRED); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $uid = $input->getArgument('uid'); $user = $this->userManager->get($uid); if (is_null($user)) { diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index 41088c1685..76d65ce73c 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -83,7 +83,7 @@ class Upgrade extends Command { * @param InputInterface $input input interface * @param OutputInterface $output output interface */ - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { if (Util::needUpgrade()) { if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) { // Prepend each line with a little timestamp diff --git a/core/Command/User/Add.php b/core/Command/User/Add.php index dfb2c9b8ad..b75664f16f 100644 --- a/core/Command/User/Add.php +++ b/core/Command/User/Add.php @@ -85,7 +85,7 @@ class Add extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $uid = $input->getArgument('uid'); if ($this->userManager->userExists($uid)) { $output->writeln('The user "' . $uid . '" already exists.'); @@ -164,5 +164,6 @@ class Add extends Command { $output->writeln('User "' . $user->getUID() . '" added to group "' . $group->getGID() . '"'); } } + return 0; } } diff --git a/core/Command/User/Delete.php b/core/Command/User/Delete.php index 37099749d0..c6c7700ce5 100644 --- a/core/Command/User/Delete.php +++ b/core/Command/User/Delete.php @@ -55,18 +55,19 @@ class Delete extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $user = $this->userManager->get($input->getArgument('uid')); if (is_null($user)) { $output->writeln('User does not exist'); - return; + return 0; } if ($user->delete()) { $output->writeln('The specified user was deleted'); - return; + return 0; } $output->writeln('The specified user could not be deleted. Please check the logs.'); + return 1; } } diff --git a/core/Command/User/Disable.php b/core/Command/User/Disable.php index 4967856beb..7abb625c97 100644 --- a/core/Command/User/Disable.php +++ b/core/Command/User/Disable.php @@ -52,14 +52,15 @@ class Disable extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $user = $this->userManager->get($input->getArgument('uid')); if (is_null($user)) { $output->writeln('User does not exist'); - return; + return 1; } $user->setEnabled(false); $output->writeln('The specified user is disabled'); + return 0; } } diff --git a/core/Command/User/Enable.php b/core/Command/User/Enable.php index 5792ba9b75..c62eee8701 100644 --- a/core/Command/User/Enable.php +++ b/core/Command/User/Enable.php @@ -52,14 +52,15 @@ class Enable extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $user = $this->userManager->get($input->getArgument('uid')); if (is_null($user)) { $output->writeln('User does not exist'); - return; + return 1; } $user->setEnabled(true); $output->writeln('The specified user is enabled'); + return 0; } } diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php index 52579a5603..ec5f9a4d1f 100644 --- a/core/Command/User/Info.php +++ b/core/Command/User/Info.php @@ -65,7 +65,7 @@ class Info extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $user = $this->userManager->get($input->getArgument('user')); if (is_null($user)) { $output->writeln('user not found'); @@ -85,5 +85,6 @@ class Info extends Base { 'backend' => $user->getBackendClassName() ]; $this->writeArrayInOutputFormat($input, $output, $data); + return 0; } } diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index b60d88c861..af80b1e1c0 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -56,11 +56,11 @@ class LastSeen extends Command { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $user = $this->userManager->get($input->getArgument('uid')); if (is_null($user)) { $output->writeln('User does not exist'); - return; + return 1; } $lastLogin = $user->getLastLogin(); @@ -73,5 +73,6 @@ class LastSeen extends Command { $output->writeln($user->getUID() . '`s last login: ' . $date->format('d.m.Y H:i')); } + return 0; } } diff --git a/core/Command/User/ListCommand.php b/core/Command/User/ListCommand.php index 103a999375..65305304bf 100644 --- a/core/Command/User/ListCommand.php +++ b/core/Command/User/ListCommand.php @@ -81,10 +81,11 @@ class ListCommand extends Base { ); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $users = $this->userManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset')); $this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users, (bool)$input->getOption('info'))); + return 0; } /** @@ -96,7 +97,7 @@ class ListCommand extends Base { $keys = array_map(function (IUser $user) { return $user->getUID(); }, $users); - + $values = array_map(function (IUser $user) use ($detailed) { if ($detailed) { $groups = $this->groupManager->getUserGroupIds($user); diff --git a/core/Command/User/Report.php b/core/Command/User/Report.php index fff3924d32..b7fecee61b 100644 --- a/core/Command/User/Report.php +++ b/core/Command/User/Report.php @@ -51,7 +51,7 @@ class Report extends Command { ->setDescription('shows how many users have access'); } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $table = new Table($output); $table->setHeaders(['User Report', '']); $userCountArray = $this->countUsers(); @@ -75,6 +75,7 @@ class Report extends Command { $table->setRows($rows); $table->render(); + return 0; } private function countUsers() { diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php index f5b0736d72..bcb3c774ef 100644 --- a/core/Command/User/ResetPassword.php +++ b/core/Command/User/ResetPassword.php @@ -67,7 +67,7 @@ class ResetPassword extends Command { ; } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { $username = $input->getArgument('user'); /** @var $user \OCP\IUser */ @@ -134,5 +134,6 @@ class ResetPassword extends Command { $output->writeln("Error while resetting password!"); return 1; } + return 0; } } diff --git a/core/Command/User/Setting.php b/core/Command/User/Setting.php index 5a2c653bbd..2ce09fba64 100644 --- a/core/Command/User/Setting.php +++ b/core/Command/User/Setting.php @@ -158,7 +158,7 @@ class Setting extends Base { } } - protected function execute(InputInterface $input, OutputInterface $output) { + protected function execute(InputInterface $input, OutputInterface $output): int { try { $this->checkInput($input); } catch (\InvalidArgumentException $e) {