From e163b1bb48a33c08a0e433d5d98fbc567c1243a9 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Wed, 18 May 2022 21:48:58 +0200 Subject: [PATCH 1/2] Rename userName to username to align with child classes Signed-off-by: Daniel Kesselberg --- lib/private/Setup/AbstractDatabase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 8690e7c1c66..5ee9548564c 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -141,9 +141,9 @@ abstract class AbstractDatabase { } /** - * @param string $userName + * @param string $username */ - abstract public function setupDatabase($userName); + abstract public function setupDatabase($username); public function runMigrations() { if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) { From cf2bc22e0fdc48aefca6b1760eb83dd47dcbaca0 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Wed, 18 May 2022 21:50:47 +0200 Subject: [PATCH 2/2] Fix return type for createSpecificUser Signed-off-by: Daniel Kesselberg --- lib/private/Setup/MySQL.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php index 920baf3e4ee..7bd8fa7b1ec 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php @@ -135,9 +135,8 @@ class MySQL extends AbstractDatabase { /** * @param $username * @param IDBConnection $connection - * @return array */ - private function createSpecificUser($username, $connection) { + private function createSpecificUser($username, $connection): void { try { //user already specified in config $oldUser = $this->config->getValue('dbuser', false);