mirror of
https://github.com/filegator/filegator.git
synced 2025-08-10 20:14:02 +02:00
phpstan & refactoring
This commit is contained in:
@@ -101,7 +101,7 @@ class Database implements Service, AuthInterface
|
||||
], 'WHERE username = ?', $username);
|
||||
}
|
||||
|
||||
return $this->find($user->getUsername());
|
||||
return $this->find($user->getUsername()) ?: $user;
|
||||
}
|
||||
|
||||
public function add(User $user, $password): User
|
||||
@@ -119,7 +119,7 @@ class Database implements Service, AuthInterface
|
||||
'password' => $this->hashPassword($password),
|
||||
]);
|
||||
|
||||
return $this->find($user->getUsername());
|
||||
return $this->find($user->getUsername()) ?: $user;
|
||||
}
|
||||
|
||||
public function delete(User $user)
|
||||
|
@@ -96,7 +96,7 @@ class JsonFile implements Service, AuthInterface
|
||||
|
||||
$this->saveUsers($all_users);
|
||||
|
||||
return $this->find($user->getUsername());
|
||||
return $this->find($user->getUsername()) ?: $user;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ class JsonFile implements Service, AuthInterface
|
||||
|
||||
$this->saveUsers($all_users);
|
||||
|
||||
return $this->find($user->getUsername());
|
||||
return $this->find($user->getUsername()) ?: $user;
|
||||
}
|
||||
|
||||
public function delete(User $user)
|
||||
|
@@ -55,7 +55,11 @@ class SessionStorage implements Service, SessionStorageInterface
|
||||
|
||||
public function invalidate()
|
||||
{
|
||||
if ($this->getSession() !== null || ! $this->getSession()->isStarted()) {
|
||||
if ($this->getSession() === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (! $this->getSession()->isStarted()) {
|
||||
$this->getSession()->start();
|
||||
}
|
||||
|
||||
|
@@ -282,6 +282,6 @@ class Filesystem implements Service
|
||||
|
||||
$tmp = explode($this->separator, trim($path, $this->separator));
|
||||
|
||||
return array_pop($tmp);
|
||||
return (string) array_pop($tmp);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user