diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-05-20 18:19:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 18:19:53 +0200 |
| commit | d90583ca2810dbd94976f2f45d46703266f608cf (patch) | |
| tree | 164e121b976aecb7aa335f60668cabdd0fbd16a5 | |
| parent | 2b0d82675f669f00ad90f2750b1832a60ec9f766 (diff) | |
| parent | cf2bc22e0fdc48aefca6b1760eb83dd47dcbaca0 (diff) | |
| download | nextcloud-server-d90583ca2810dbd94976f2f45d46703266f608cf.tar.gz nextcloud-server-d90583ca2810dbd94976f2f45d46703266f608cf.zip | |
Merge pull request #32486 from nextcloud/debt/noid/psalm-username
[Psalm] Rename $userName to $username to align with child classes
| -rw-r--r-- | lib/private/Setup/AbstractDatabase.php | 4 | ||||
| -rw-r--r-- | lib/private/Setup/MySQL.php | 3 |
2 files changed, 3 insertions, 4 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")) { 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); |