]> source.dussan.org Git - nextcloud-server.git/commitdiff
Also always return in app commands
authorJoas Schilling <coding@schilljs.com>
Fri, 26 Jun 2020 13:12:11 +0000 (15:12 +0200)
committerJoas Schilling <coding@schilljs.com>
Fri, 26 Jun 2020 13:12:11 +0000 (15:12 +0200)
Signed-off-by: Joas Schilling <coding@schilljs.com>
42 files changed:
apps/dav/lib/Command/CreateAddressBook.php
apps/dav/lib/Command/CreateCalendar.php
apps/dav/lib/Command/ListCalendars.php
apps/dav/lib/Command/MoveCalendar.php
apps/dav/lib/Command/RemoveInvalidShares.php
apps/dav/lib/Command/SendEventReminders.php
apps/dav/lib/Command/SyncBirthdayCalendar.php
apps/dav/lib/Command/SyncSystemAddressBook.php
apps/encryption/lib/Command/DisableMasterKey.php
apps/encryption/lib/Command/EnableMasterKey.php
apps/encryption/lib/Command/RecoverUser.php
apps/federation/lib/Command/SyncFederationAddressBooks.php
apps/files/lib/Command/DeleteOrphanedFiles.php
apps/files/lib/Command/Scan.php
apps/files/lib/Command/ScanAppData.php
apps/files/lib/Command/TransferOwnership.php
apps/files_external/lib/Command/Applicable.php
apps/files_external/lib/Command/Backends.php
apps/files_external/lib/Command/Config.php
apps/files_external/lib/Command/Create.php
apps/files_external/lib/Command/Delete.php
apps/files_external/lib/Command/Export.php
apps/files_external/lib/Command/Import.php
apps/files_external/lib/Command/ListCommand.php
apps/files_external/lib/Command/Notify.php
apps/files_external/lib/Command/Verify.php
apps/files_sharing/lib/Command/CleanupRemoteStorages.php
apps/files_sharing/lib/Command/ExiprationNotification.php
apps/files_trashbin/lib/Command/CleanUp.php
apps/files_trashbin/lib/Command/ExpireTrash.php
apps/files_versions/lib/Command/CleanUp.php
apps/files_versions/lib/Command/ExpireVersions.php
apps/updatenotification/lib/Command/Check.php
apps/user_ldap/lib/Command/CheckUser.php
apps/user_ldap/lib/Command/CreateEmptyConfig.php
apps/user_ldap/lib/Command/DeleteConfig.php
apps/user_ldap/lib/Command/Search.php
apps/user_ldap/lib/Command/SetConfig.php
apps/user_ldap/lib/Command/ShowConfig.php
apps/user_ldap/lib/Command/ShowRemnants.php
apps/user_ldap/lib/Command/TestConfig.php
apps/workflowengine/lib/Command/Index.php

index 317b356772e19556edc9bc4b3c545f1e45f2f459..6bd175f91d3949a6e3d95856923371a1e7ab4f4b 100644 (file)
@@ -64,7 +64,7 @@ class CreateAddressBook extends Command {
                                                'Name of the addressbook');
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $user = $input->getArgument('user');
                if (!$this->userManager->userExists($user)) {
                        throw new \InvalidArgumentException("User <$user> in unknown.");
@@ -72,5 +72,6 @@ class CreateAddressBook extends Command {
 
                $name = $input->getArgument('name');
                $this->cardDavBackend->createAddressBook("principals/users/$user", $name, []);
+               return 0;
        }
 }
index 81a8773957ae1ac0bd78cef39d35ae7466a9ce71..d03b573e4abe06ad86ff81b48bf30ce06a953967 100644 (file)
@@ -73,7 +73,7 @@ class CreateCalendar extends Command {
                                'Name of the calendar');
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $user = $input->getArgument('user');
                if (!$this->userManager->userExists($user)) {
                        throw new \InvalidArgumentException("User <$user> in unknown.");
@@ -94,5 +94,6 @@ class CreateCalendar extends Command {
                $name = $input->getArgument('name');
                $caldav = new CalDavBackend($this->dbConnection, $principalBackend, $this->userManager, $this->groupManager, $random, $logger, $dispatcher);
                $caldav->createCalendar("principals/users/$user", $name, []);
+               return 0;
        }
 }
index 85aa25be946e4293cb384c6bf32537f6b35491fc..422202d922796cb1a9a723b60a57929115c8e50e 100644 (file)
@@ -62,7 +62,7 @@ class ListCalendars extends Command {
                                'User for whom all calendars will be listed');
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $user = $input->getArgument('uid');
                if (!$this->userManager->userExists($user)) {
                        throw new \InvalidArgumentException("User <$user> is unknown.");
@@ -101,5 +101,6 @@ class ListCalendars extends Command {
                } else {
                        $output->writeln("<info>User <$user> has no calendars</info>");
                }
+               return 0;
        }
 }
index d40f46007450ffd445481b351df87fe24494121b..b89c64d7ba7d91561c12079d8bf40d7603f8d7e6 100644 (file)
@@ -106,7 +106,7 @@ class MoveCalendar extends Command {
                        ->addOption('force', 'f', InputOption::VALUE_NONE, "Force the migration by removing existing shares");
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $userOrigin = $input->getArgument('sourceuid');
                $userDestination = $input->getArgument('destinationuid');
 
@@ -137,6 +137,7 @@ class MoveCalendar extends Command {
                $this->calDav->moveCalendar($name, self::URI_USERS . $userOrigin, self::URI_USERS . $userDestination);
 
                $this->io->success("Calendar <$name> was moved from user <$userOrigin> to <$userDestination>");
+               return 0;
        }
 
        /**
index 71644456f67b8badde3a8f624df7537e7b4332a0..0129191c18b2857491c72dbfee95ef675a053964 100644 (file)
@@ -57,7 +57,7 @@ class RemoveInvalidShares extends Command {
                        ->setDescription('Remove invalid dav shares');
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $query = $this->connection->getQueryBuilder();
                $result = $query->selectDistinct('principaluri')
                        ->from('dav_shares')
@@ -72,6 +72,7 @@ class RemoveInvalidShares extends Command {
                }
 
                $result->closeCursor();
+               return 0;
        }
 
        /**
index 8313f265bfc92b6368ff1742d17b497e3097f283..3eb7f1a56eeac221f39e3a22e2844ec62fd54636 100644 (file)
@@ -67,19 +67,20 @@ class SendEventReminders extends Command {
         * @param InputInterface $input
         * @param OutputInterface $output
         */
-       protected function execute(InputInterface $input, OutputInterface $output):void {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
                        $output->writeln('<error>Sending event reminders disabled!</error>');
                        $output->writeln('<info>Please run "php occ config:app:set dav sendEventReminders --value yes"');
-                       return;
+                       return 1;
                }
 
                if ($this->config->getAppValue('dav', 'sendEventRemindersMode', 'backgroundjob') !== 'occ') {
                        $output->writeln('<error>Sending event reminders mode set to background-job!</error>');
                        $output->writeln('<info>Please run "php occ config:app:set dav sendEventRemindersMode --value occ"');
-                       return;
+                       return 1;
                }
 
                $this->reminderService->processReminders();
+               return 0;
        }
 }
index 0addbc08a73d36993be1c017b2812f51035db624..6536f8439a4c18f966bb376e174214adfcd1ca01 100644 (file)
@@ -73,7 +73,7 @@ class SyncBirthdayCalendar extends Command {
         * @param InputInterface $input
         * @param OutputInterface $output
         */
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $this->verifyEnabled();
 
                $user = $input->getArgument('user');
@@ -91,7 +91,7 @@ class SyncBirthdayCalendar extends Command {
 
                        $output->writeln("Start birthday calendar sync for $user");
                        $this->birthdayService->syncUser($user);
-                       return;
+                       return 0;
                }
                $output->writeln("Start birthday calendar sync for all users ...");
                $p = new ProgressBar($output);
@@ -111,6 +111,7 @@ class SyncBirthdayCalendar extends Command {
 
                $p->finish();
                $output->writeln('');
+               return 0;
        }
 
        protected function verifyEnabled() {
index 26cb0aa64394bd42f358dd2b68136cbc814e5c35..9fabc6de883e6c906650ce3eb08861a54c1fea0c 100644 (file)
@@ -53,7 +53,7 @@ class SyncSystemAddressBook extends Command {
         * @param InputInterface $input
         * @param OutputInterface $output
         */
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $output->writeln('Syncing users ...');
                $progress = new ProgressBar($output);
                $progress->start();
@@ -63,5 +63,6 @@ class SyncSystemAddressBook extends Command {
 
                $progress->finish();
                $output->writeln('');
+               return 0;
        }
 }
index 319286bc926be5dc1500e50b4d111e848f04e73c..fa0572c5fb8ddbabdcf68c0f44e638636321e0b1 100644 (file)
@@ -63,7 +63,7 @@ class DisableMasterKey extends Command {
                        ->setDescription('Disable the master key and use per-user keys instead. Only available for fresh installations with no existing encrypted data! There is no way to enable it again.');
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
 
                if (!$isMasterKeyEnabled) {
@@ -80,7 +80,9 @@ class DisableMasterKey extends Command {
                                $output->writeln('Master key successfully disabled.');
                        } else {
                                $output->writeln('aborted.');
+                               return 1;
                        }
                }
+               return 0;
        }
 }
index 4b1a5219c11ee52e94853ec6cc91cfcf4334ee6a..b1e7319384a98a5a87f1dcc4125b3354449c07f4 100644 (file)
@@ -62,7 +62,7 @@ class EnableMasterKey extends Command {
                        ->setDescription('Enable the master key. Only available for fresh installations with no existing encrypted data! There is also no way to disable it again.');
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $isAlreadyEnabled = $this->util->isMasterKeyEnabled();
 
                if ($isAlreadyEnabled) {
@@ -76,7 +76,9 @@ class EnableMasterKey extends Command {
                                $output->writeln('Master key successfully enabled.');
                        } else {
                                $output->writeln('aborted.');
+                               return 1;
                        }
                }
+               return 0;
        }
 }
index fd702bc0313b77374c4be9df26971da46824c0ab..642182dbf5968519b1d2cf379859c0cdc39c0431 100644 (file)
@@ -73,25 +73,25 @@ class RecoverUser extends Command {
                );
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
 
                if ($isMasterKeyEnabled) {
                        $output->writeln('You use the master key, no individual user recovery needed.');
-                       return;
+                       return 0;
                }
 
                $uid = $input->getArgument('user');
                $userExists = $this->userManager->userExists($uid);
                if ($userExists === false) {
                        $output->writeln('User "' . $uid . '" unknown.');
-                       return;
+                       return 1;
                }
 
                $recoveryKeyEnabled = $this->util->isRecoveryEnabledForUser($uid);
                if ($recoveryKeyEnabled === false) {
                        $output->writeln('Recovery key is not enabled for: ' . $uid);
-                       return;
+                       return 1;
                }
 
                $question = new Question('Please enter the recovery key password: ');
@@ -107,5 +107,6 @@ class RecoverUser extends Command {
                $output->write('Start to recover users files... This can take some time...');
                $this->userManager->get($uid)->setPassword($newLoginPassword, $recoveryPassword);
                $output->writeln('Done.');
+               return 0;
        }
 }
index 48f8895c1d795fd3b61dabe94a4d43f937583f8e..05c24bdcb81ad8ce98dad5cfa6187d68e7cf6e28 100644 (file)
@@ -56,7 +56,7 @@ class SyncFederationAddressBooks extends Command {
         * @param OutputInterface $output
         * @return int
         */
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $progress = new ProgressBar($output);
                $progress->start();
                $this->syncService->syncThemAll(function ($url, $ex) use ($progress, $output) {
index 167d679e3c84d4aed4491ec564a777c475e0d979..c8ce9729ef7ed90bb8359dc22ff3265d251409c6 100644 (file)
@@ -51,7 +51,7 @@ class DeleteOrphanedFiles extends Command {
                        ->setDescription('cleanup filecache');
        }
 
-       public function execute(InputInterface $input, OutputInterface $output) {
+       public function execute(InputInterface $input, OutputInterface $output): int {
                $deletedEntries = 0;
 
                $query = $this->connection->getQueryBuilder();
@@ -78,5 +78,6 @@ class DeleteOrphanedFiles extends Command {
                }
 
                $output->writeln("$deletedEntries orphaned file cache entries deleted");
+               return 0;
        }
 }
index c75073e428f16d91a42d0a28951085fb48ee13c6..aea6003417d62ec5354f393e2b2f2e67291df689 100644 (file)
@@ -169,7 +169,7 @@ class Scan extends Base {
                return substr_count($mountPoint->getMountPoint(), '/') <= 3;
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $inputPath = $input->getOption('path');
                if ($inputPath) {
                        $inputPath = '/' . trim($inputPath, '/');
@@ -190,7 +190,7 @@ class Scan extends Base {
                $users_total = count($users);
                if ($users_total === 0) {
                        $output->writeln('<error>Please specify the user id to scan, --all to scan for all users or --path=...</error>');
-                       return;
+                       return 1;
                }
 
                $this->initTools();
@@ -219,6 +219,7 @@ class Scan extends Base {
                }
 
                $this->presentStats($output);
+               return 0;
        }
 
        /**
index 47cd81e6b4e4e1b6950022b078899c86261ca2cf..47a153d3895e04e758b6d157773236c41f7bb948 100644 (file)
@@ -149,7 +149,7 @@ class ScanAppData extends Base {
        }
 
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                # restrict the verbosity level to VERBOSITY_VERBOSE
                if ($output->getVerbosity() > OutputInterface::VERBOSITY_VERBOSE) {
                        $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
index b1d90452c237f01c983c48df7233dc60d595c6f0..92d8fba8f27707d8d3fcd4a12fd1cd7368c96259 100644 (file)
@@ -86,7 +86,7 @@ class TransferOwnership extends Command {
                );
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $sourceUserObject = $this->userManager->get($input->getArgument('source-user'));
                $destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
 
index 81d7f972f463aab4a568be4672918ae9a19627ae..bec312bdcb2c182118c0d23a0fc402e7411370dc 100644 (file)
@@ -100,7 +100,7 @@ class Applicable extends Base {
                parent::configure();
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $mountId = $input->getArgument('mount_id');
                try {
                        $mount = $this->globalService->getStorage($mountId);
@@ -154,5 +154,6 @@ class Applicable extends Base {
                        'users' => $applicableUsers,
                        'groups' => $applicableGroups
                ]);
+               return 0;
        }
 }
index e06f5ea5fd1c130efd39d16f94282caf2f5bfa77..3bb4b9121aef52b4a3d36d8ea046321b4c8bc63a 100644 (file)
@@ -59,7 +59,7 @@ class Backends extends Base {
                parent::configure();
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $authBackends = $this->backendService->getAuthMechanisms();
                $storageBackends = $this->backendService->getBackends();
 
@@ -87,6 +87,7 @@ class Backends extends Base {
                }
 
                $this->writeArrayInOutputFormat($input, $output, $data);
+               return 0;
        }
 
        private function serializeAuthBackend(\JsonSerializable $backend) {
index dde74de3a9c1aaf8e16202147e6bfb7502986213..467f421e7307bd514c764939001de2b5a8f02b3d 100644 (file)
@@ -64,7 +64,7 @@ class Config extends Base {
                parent::configure();
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $mountId = $input->getArgument('mount_id');
                $key = $input->getArgument('key');
                try {
@@ -80,6 +80,7 @@ class Config extends Base {
                } else {
                        $this->getOption($mount, $key, $output);
                }
+               return 0;
        }
 
        /**
index 769ffbec51ccab202ca8bc566eb399a2d447d7de..654c735702358d9f69381f19eda5f85bda193f6e 100644 (file)
@@ -119,7 +119,7 @@ class Create extends Base {
                parent::configure();
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $user = $input->getOption('user');
                $mountPoint = $input->getArgument('mount_point');
                $storageIdentifier = $input->getArgument('storage_backend');
index c44e35c7fa91cdf80a54c606c94aa74e87ecddec..71496e58d14a13cfbb25f7b550eb94801d3b3876 100644 (file)
@@ -84,7 +84,7 @@ class Delete extends Base {
                parent::configure();
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $mountId = $input->getArgument('mount_id');
                try {
                        $mount = $this->globalService->getStorage($mountId);
@@ -105,10 +105,11 @@ class Delete extends Base {
                        $question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
 
                        if (!$questionHelper->ask($input, $output, $question)) {
-                               return null;
+                               return 1;
                        }
                }
 
                $this->globalService->removeStorage($mountId);
+               return 0;
        }
 }
index 242f408a54d888e22b1684b2a3e6f19badc8fdf9..d670865f29d69c008593f20fcc25ef188b6d1173 100644 (file)
@@ -45,7 +45,7 @@ class Export extends ListCommand {
                        );
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
                $listInput = new ArrayInput([], $listCommand->getDefinition());
                $listInput->setArgument('user_id', $input->getArgument('user_id'));
@@ -54,5 +54,6 @@ class Export extends ListCommand {
                $listInput->setOption('show-password', true);
                $listInput->setOption('full', true);
                $listCommand->execute($listInput, $output);
+               return 0;
        }
 }
index 0e13a5214410370dd5ba4798fe74a61e7ba4d585..bbaeea91c3e340979a125da8a8bba2750bd5a748 100644 (file)
@@ -107,7 +107,7 @@ class Import extends Base {
                parent::configure();
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $user = $input->getOption('user');
                $path = $input->getArgument('path');
                if ($path === '-') {
index 1e7598ec5414e087db12bbfd91168eb5aa184c3e..279e581f95e9c1d612a3d6e9d6cf16c5df8e7434 100644 (file)
@@ -96,7 +96,7 @@ class ListCommand extends Base {
                parent::configure();
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                if ($input->getOption('all')) {
                        /** @var  $mounts StorageConfig[] */
                        $mounts = $this->globalService->getStorageForAllUsers();
@@ -110,6 +110,7 @@ class ListCommand extends Base {
                }
 
                $this->listMounts($userId, $mounts, $input, $output);
+               return 0;
        }
 
        /**
index 4a48a22636ccd30b2877a117a200362a837dc9ea..7f305008402db048283fe08466882d9bbd3d6552 100644 (file)
@@ -88,7 +88,7 @@ class Notify extends Base {
                parent::configure();
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $mount = $this->globalService->getStorage($input->getArgument('mount_id'));
                if (is_null($mount)) {
                        $output->writeln('<error>Mount not found</error>');
@@ -147,6 +147,7 @@ class Notify extends Base {
                        }
                        $this->markParentAsOutdated($mount->getId(), $change->getPath(), $output);
                });
+               return 0;
        }
 
        private function createStorage(StorageConfig $mount) {
index 8e1fa71cf8b96d92751ca5d9e2d8d951476e51f8..e5bfb3052eead4b85fac8cce1b2be3da4885fab7 100644 (file)
@@ -65,7 +65,7 @@ class Verify extends Base {
                parent::configure();
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $mountId = $input->getArgument('mount_id');
                $configInput = $input->getOption('config');
 
@@ -83,6 +83,7 @@ class Verify extends Base {
                        'code' => $mount->getStatus(),
                        'message' => $mount->getStatusMessage()
                ]);
+               return 0;
        }
 
        private function manipulateStorageConfig(StorageConfig $storage) {
index 2eb79f87762174572221fa43ad4ca7db49b057dd..259e55ff620fc9e4e1096ed08eed2c681fe97fd9 100644 (file)
@@ -59,7 +59,7 @@ class CleanupRemoteStorages extends Command {
                        );
        }
 
-       public function execute(InputInterface $input, OutputInterface $output) {
+       public function execute(InputInterface $input, OutputInterface $output): int {
                $remoteStorages = $this->getRemoteStorages();
 
                $output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
@@ -93,6 +93,7 @@ class CleanupRemoteStorages extends Command {
                                }
                        }
                }
+               return 0;
        }
 
        public function countFiles($numericId, OutputInterface $output) {
index 6fd04bcdcccadff3b1ad7b53590b6665bbab038f..1df4994318853446c31ee631f9ea7fa86b36df76 100644 (file)
@@ -63,7 +63,7 @@ class ExiprationNotification extends Command {
                        ->setDescription('Notify share initiators when a share will expire the next day.');
        }
 
-       public function execute(InputInterface $input, OutputInterface $output) {
+       public function execute(InputInterface $input, OutputInterface $output): int {
                //Current time
                $minTime = $this->time->getDateTime();
                $minTime->add(new \DateInterval('P1D'));
@@ -94,5 +94,6 @@ class ExiprationNotification extends Command {
                        $notification->setUser($share->getSharedBy());
                        $this->notificationManager->notify($notification);
                }
+               return 0;
        }
 }
index 7192ed26094d808f872531841faeee0f13ec496b..1b61c1ae74d7ab76df9a28d17568e3c9c8d561e7 100644 (file)
@@ -77,7 +77,7 @@ class CleanUp extends Command {
                        );
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $users = $input->getArgument('user_id');
                if ((!empty($users)) and ($input->getOption('all-users'))) {
                        throw new InvalidOptionException('Either specify a user_id or --all-users');
@@ -88,6 +88,7 @@ class CleanUp extends Command {
                                        $this->removeDeletedFiles($user);
                                } else {
                                        $output->writeln("<error>Unknown user $user</error>");
+                                       return 1;
                                }
                        }
                } elseif ($input->getOption('all-users')) {
@@ -112,6 +113,7 @@ class CleanUp extends Command {
                } else {
                        throw new InvalidOptionException('Either specify a user_id or --all-users');
                }
+               return 0;
        }
 
        /**
index 7cc6c83b36997ee8bc00128afe49e88d3491342b..26088aad37d9ff71a9ca5e499de3ebb8b909f4c3 100644 (file)
@@ -42,7 +42,7 @@ class ExpireTrash extends Command {
         * @var Expiration
         */
        private $expiration;
-       
+
        /**
         * @var IUserManager
         */
@@ -71,11 +71,11 @@ class ExpireTrash extends Command {
                        );
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $maxAge = $this->expiration->getMaxAgeAsTimestamp();
                if (!$maxAge) {
                        $output->writeln("No expiry configured.");
-                       return;
+                       return 1;
                }
 
                $users = $input->getArgument('user_id');
@@ -87,6 +87,7 @@ class ExpireTrash extends Command {
                                        $this->expireTrashForUser($userObject);
                                } else {
                                        $output->writeln("<error>Unknown user $user</error>");
+                                       return 1;
                                }
                        }
                } else {
@@ -99,6 +100,7 @@ class ExpireTrash extends Command {
                        $p->finish();
                        $output->writeln('');
                }
+               return 0;
        }
 
        public function expireTrashForUser(IUser $user) {
index d49835f2db489a3032166770e3118ff40d962b68..d67df024a1bca8f3d303c10a03c2f46058156448 100644 (file)
@@ -61,7 +61,7 @@ class CleanUp extends Command {
        }
 
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $users = $input->getArgument('user_id');
                if (!empty($users)) {
                        foreach ($users as $user) {
@@ -70,6 +70,7 @@ class CleanUp extends Command {
                                        $this->deleteVersions($user);
                                } else {
                                        $output->writeln("<error>Unknown user $user</error>");
+                                       return 1;
                                }
                        }
                } else {
@@ -95,6 +96,7 @@ class CleanUp extends Command {
                                } while (count($users) >= $limit);
                        }
                }
+               return 0;
        }
 
 
index a48908dcd6b77de4f014bfdd0287af3a9267d4f3..e3b444e8f462d66375921ac0b0d806039f2371f4 100644 (file)
@@ -41,7 +41,7 @@ class ExpireVersions extends Command {
         * @var Expiration
         */
        private $expiration;
-       
+
        /**
         * @var IUserManager
         */
@@ -70,7 +70,7 @@ class ExpireVersions extends Command {
                        );
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $maxAge = $this->expiration->getMaxAgeAsTimestamp();
                if (!$maxAge) {
                        $output->writeln("No expiry configured.");
@@ -86,6 +86,7 @@ class ExpireVersions extends Command {
                                        $this->expireVersionsForUser($userObject);
                                } else {
                                        $output->writeln("<error>Unknown user $user</error>");
+                                       return 1;
                                }
                        }
                } else {
@@ -98,6 +99,7 @@ class ExpireVersions extends Command {
                        $p->finish();
                        $output->writeln('');
                }
+               return 0;
        }
 
        public function expireVersionsForUser(IUser $user) {
index 88d7e1d4fac8b1ca8487fbbae0c4ed596d266373..351350ba3eef6e1cad0f1e33a5c915e31db0d953 100644 (file)
@@ -63,7 +63,7 @@ class Check extends Command {
                ;
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $updatesAvailableCount = 0;
 
                // Server
index 9b2c6d93de3e62d0d2f2ad04e3376ee0c6fbd7d0..5314cac365afd281eba74d09cc3237a7faa344c2 100644 (file)
@@ -87,7 +87,7 @@ class CheckUser extends Command {
                ;
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                try {
                        $uid = $input->getArgument('ocName');
                        $this->isAllowed($input->getOption('force'));
@@ -98,15 +98,17 @@ class CheckUser extends Command {
                                if ($input->getOption('update')) {
                                        $this->updateUser($uid, $output);
                                }
-                               return;
+                               return 0;
                        }
 
                        $this->dui->markUser($uid);
                        $output->writeln('The user does not exists on LDAP anymore.');
                        $output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
                                . $uid . '"');
+                       return 0;
                } catch (\Exception $e) {
                        $output->writeln('<error>' . $e->getMessage(). '</error>');
+                       return 1;
                }
        }
 
index 3f42020c1e9e8cde38ce0c0c8de91028b9cea3d9..4d88bf80c5ee3ea5e8b30f6297134a99ea98c57d 100644 (file)
@@ -58,7 +58,7 @@ class CreateEmptyConfig extends Command {
                ;
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $configPrefix = $this->helper->getNextServerConfigurationPrefix();
                $configHolder = new Configuration($configPrefix);
                $configHolder->saveConfiguration();
@@ -68,5 +68,6 @@ class CreateEmptyConfig extends Command {
                        $prose = 'Created new configuration with configID ';
                }
                $output->writeln($prose . "{$configPrefix}");
+               return 0;
        }
 }
index 43a5055e8ade2ddc480484c671ba15ab4b8a1650..c76ba6f296b3a712dca5c32e9d7e644f9b64df37 100644 (file)
@@ -57,15 +57,17 @@ class DeleteConfig extends Command {
        }
 
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $configPrefix = $input->getArgument('configID');
 
                $success = $this->helper->deleteServerConfiguration($configPrefix);
 
                if ($success) {
                        $output->writeln("Deleted configuration with configID '{$configPrefix}'");
+                       return 0;
                } else {
                        $output->writeln("Cannot delete configuration with configID '{$configPrefix}'");
+                       return 1;
                }
        }
 }
index 1389f2eca52930b770482338cf4f46e3e07b3d6a..f19c11a46665b853ed8ba84cdd3f10697cc34fd0 100644 (file)
@@ -105,7 +105,7 @@ class Search extends Command {
                }
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $helper = new Helper($this->ocConfig);
                $configPrefixes = $helper->getServerConfigurationPrefixes(true);
                $ldapWrapper = new LDAP();
@@ -141,5 +141,6 @@ class Search extends Command {
                        $line = $name . ($printID ? ' ('.$id.')' : '');
                        $output->writeln($line);
                }
+               return 0;
        }
 }
index 53a480c652d23c3b65aaaea2ff559c56070d2f33..2b2fdfe5c8b9b0ce496000799a691fbb1dd5c23c 100644 (file)
@@ -59,13 +59,13 @@ class SetConfig extends Command {
                ;
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $helper = new Helper(\OC::$server->getConfig());
                $availableConfigs = $helper->getServerConfigurationPrefixes();
                $configID = $input->getArgument('configID');
                if (!in_array($configID, $availableConfigs)) {
                        $output->writeln("Invalid configID");
-                       return;
+                       return 1;
                }
 
                $this->setValue(
@@ -73,6 +73,7 @@ class SetConfig extends Command {
                        $input->getArgument('configKey'),
                        $input->getArgument('configValue')
                );
+               return 0;
        }
 
        /**
index cbd94287f9bea79aaaf5a40950a803b7b516b19d..80af5718dcbd278a2d2779eeabcac28560abbf8f 100644 (file)
@@ -66,20 +66,21 @@ class ShowConfig extends Command {
                ;
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $availableConfigs = $this->helper->getServerConfigurationPrefixes();
                $configID = $input->getArgument('configID');
                if (!is_null($configID)) {
                        $configIDs[] = $configID;
                        if (!in_array($configIDs[0], $availableConfigs)) {
                                $output->writeln("Invalid configID");
-                               return;
+                               return 1;
                        }
                } else {
                        $configIDs = $availableConfigs;
                }
 
                $this->renderConfigs($configIDs, $output, $input->getOption('show-password'));
+               return 0;
        }
 
        /**
index 034168cbd3ff9fdf3ea6d03d6f7d67dfd394a158..4722bf76ce167ac51b531dfba72cd2bfa0e857ad 100644 (file)
@@ -75,7 +75,7 @@ class ShowRemnants extends Command {
         *
         * {@inheritdoc}
         */
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                /** @var \Symfony\Component\Console\Helper\Table $table */
                $table = new Table($output);
                $table->setHeaders([
@@ -103,5 +103,6 @@ class ShowRemnants extends Command {
                        $table->setRows($rows);
                        $table->render($output);
                }
+               return 0;
        }
 }
index 0973e6245b38547b64f8ff7d4d854f8345e31fff..b588a8380d01d117f2167d82a1f1ba72a7d272c5 100644 (file)
@@ -47,13 +47,13 @@ class TestConfig extends Command {
                ;
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $helper = new Helper(\OC::$server->getConfig());
                $availableConfigs = $helper->getServerConfigurationPrefixes();
                $configID = $input->getArgument('configID');
                if (!in_array($configID, $availableConfigs)) {
                        $output->writeln("Invalid configID");
-                       return;
+                       return 1;
                }
 
                $result = $this->testConfig($configID);
@@ -61,11 +61,13 @@ class TestConfig extends Command {
                        $output->writeln('The configuration is valid and the connection could be established!');
                } elseif ($result === 1) {
                        $output->writeln('The configuration is invalid. Please have a look at the logs for further details.');
+                       return 1;
                } elseif ($result === 2) {
                        $output->writeln('The configuration is valid, but the Bind failed. Please check the server settings and credentials.');
                } else {
                        $output->writeln('Your LDAP server was kidnapped by aliens.');
                }
+               return 0;
        }
 
        /**
index 5f901c262df368ed4ee04579f27a16275cf89050..fdc83b1d3c223ca6180df3c12e4fa5c89fffbcf6 100644 (file)
@@ -69,7 +69,7 @@ class Index extends Command {
                return $scopes[$scope] ?? -1;
        }
 
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                $ops = $this->manager->getAllOperations(
                        new ScopeContext(
                                $this->mappedScope($input->getArgument('scope')),
@@ -77,5 +77,6 @@ class Index extends Command {
                        )
                );
                $output->writeln(\json_encode($ops));
+               return 0;
        }
 }