Fix many issues with the tests

- Return type were not correct
- willReturn and with confusion

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

2 files changed, 5 insertions, 2 deletions

diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php
index 8abc2f8af57..8bcdc769de9 100644
--- a/apps/federation/lib/Controller/SettingsController.php
+++ b/apps/federation/lib/Controller/SettingsController.php
@@ -78,7 +78,7 @@ class SettingsController extends Controller {
 	 * @AuthorizedAdminSetting(settings=OCA\Federation\Settings\Admin)
 	 * @throws HintException
 	 */
-	protected function checkServer(string $url): void {
+	protected function checkServer(string $url): bool {
 		if ($this->trustedServers->isTrustedServer($url) === true) {
 			$message = 'Server is already in the list of trusted servers.';
 			$hint = $this->l->t('Server is already in the list of trusted servers.');
@@ -90,5 +90,7 @@ class SettingsController extends Controller {
 			$hint = $this->l->t('No server to federate with found');
 			throw new HintException($message, $hint);
 		}
+
+		return true;
 	}
 }
diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php
index 3142cfd353d..b91c9963f80 100644
--- a/apps/federation/lib/DbHandler.php
+++ b/apps/federation/lib/DbHandler.php
@@ -83,6 +83,7 @@ class DbHandler {
 		$message = 'Internal failure, Could not add trusted server: ' . $url;
 		$message_t = $this->IL10N->t('Could not add server');
 		throw new HintException($message, $message_t);
+		return -1;
 	}
 
 	/**
@@ -215,7 +216,7 @@ class DbHandler {
 		$statement = $query->executeQuery();
 		$result = $statement->fetch();
 		$statement->closeCursor();
-		return $result['shared_secret'];
+		return (string)$result['shared_secret'];
 	}
 
 	/**