Merge pull request #353 from owncloud/symfony-command-execute-int

Always return an int from Symfony Command execute method
owncloud · May 18, 2023 · 670ee01 · 670ee01
2 parents 60de5ce + d793150
commit 670ee01
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/lib/Commands/AddClient.php b/lib/Commands/AddClient.php
@@ -90,10 +90,10 @@ protected function configure() {
 	/**
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
-	 * @return int|void
+	 * @return int
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$name = $input->getArgument('name');
 		$id = $input->getArgument('client-id');
 		$secret = $input->getArgument('client-secret');
@@ -149,5 +149,6 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 
 			$this->clientMapper->insert($client);
 		}
+		return 0;
 	}
 }
diff --git a/lib/Commands/ListClients.php b/lib/Commands/ListClients.php
@@ -48,10 +48,10 @@ protected function configure() {
 	/**
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
-	 * @return int|void
+	 * @return int
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$clients  = $this->clientMapper->findAll();
 		$clientsOutput = [];
 

diff --git a/lib/Commands/ModifyClient.php b/lib/Commands/ModifyClient.php
@@ -66,10 +66,10 @@ protected function configure() {
 	/**
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
-	 * @return int|void
+	 * @return int
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$name = $input->getArgument('name');
 		$key = $input->getArgument('key');
 		$value = $input->getArgument('value');
@@ -138,5 +138,6 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 
 		\call_user_func([$client, $funcMapper[$key]], $value);
 		$this->clientMapper->update($client);
+		return 0;
 	}
 }
diff --git a/lib/Commands/RemoveClient.php b/lib/Commands/RemoveClient.php
@@ -54,18 +54,19 @@ protected function configure() {
 	 * @param InputInterface $input
 	 * @param OutputInterface $output
 	 *
-	 * @return int|void|null
+	 * @return int
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$id = $input->getArgument('client-id');
 		try {
 			$client = $this->clientMapper->findByIdentifier($id);
 			$this->clientMapper->delete($client);
 			$output->writeln("Client <$id> has been deleted");
-			return;
 		} catch (DoesNotExistException $ex) {
 			$output->writeln("Client <$id> is unknown");
+			return 1;
 		}
+		return 0;
 	}
 }