Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/text.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Meurer <jonas@freesources.org>2021-07-27 11:13:06 +0300
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2021-07-27 14:18:51 +0300
commitc92a695a0744cce4cdd35fe78a4abd7b98301213 (patch)
tree148236a8ddafbd377c8f50109a07a21f9c55da90
parentda06ae51e4045609cadb1c104eea64cbd0d0cc80 (diff)
Make occ command return an integer as return code
As of release 4.4, `symfony/console` requires commands to return integers: https://github.com/symfony/console/commit/cdef5a4 Signed-off-by: Jonas Meurer <jonas@freesources.org>
-rw-r--r--lib/Command/ResetDocument.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/Command/ResetDocument.php b/lib/Command/ResetDocument.php
index 9d50a852a..6e972f08e 100644
--- a/lib/Command/ResetDocument.php
+++ b/lib/Command/ResetDocument.php
@@ -47,7 +47,7 @@ class ResetDocument extends Command {
$this->sessionMapper = $sessionMapper;
}
- protected function configure() {
+ protected function configure(): void {
$this
->setName('text:reset')
->setDescription('Reset a text document')
@@ -68,15 +68,17 @@ class ResetDocument extends Command {
/**
* @param InputInterface $input
* @param OutputInterface $output
- * @return void
+ * @return int
*/
- protected function execute(InputInterface $input, OutputInterface $output) {
+ protected function execute(InputInterface $input, OutputInterface $output): int {
$fileId = $input->getArgument('file-id');
$fullReset = $input->getOption('full');
if ($fullReset) {
$output->writeln('Full document reset');
$this->documentService->resetDocument($fileId, true);
+
+ return 0;
} else {
$output->writeln('Trying to restore to last saved version');
$document = $this->documentMapper->find($fileId);
@@ -86,9 +88,13 @@ class ResetDocument extends Command {
$this->documentMapper->update($document);
$this->sessionMapper->deleteByDocumentId($fileId);
$output->writeln('Reverted document to the last saved version');
+
+ return 0;
} else {
$output->writeln('Failed revert changes that are newer than the last saved version');
}
+
+ return 1;
}
}
}