Skip to content

Commit d90583c

Browse files
authored
Merge pull request #32486 from nextcloud/debt/noid/psalm-username
[Psalm] Rename $userName to $username to align with child classes
2 parents 2b0d826 + cf2bc22 commit d90583c

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

lib/private/Setup/AbstractDatabase.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ protected function connect(array $configOverwrite = []): Connection {
141141
}
142142

143143
/**
144-
* @param string $userName
144+
* @param string $username
145145
*/
146-
abstract public function setupDatabase($userName);
146+
abstract public function setupDatabase($username);
147147

148148
public function runMigrations() {
149149
if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {

lib/private/Setup/MySQL.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,8 @@ private function createDBUser($connection) {
135135
/**
136136
* @param $username
137137
* @param IDBConnection $connection
138-
* @return array
139138
*/
140-
private function createSpecificUser($username, $connection) {
139+
private function createSpecificUser($username, $connection): void {
141140
try {
142141
//user already specified in config
143142
$oldUser = $this->config->getValue('dbuser', false);

0 commit comments

Comments
 (0)