mirror_html/filegator
1
0
Fork 0
mirror of https://github.com/filegator/filegator.git synced 2025-08-12 18:14:11 +02:00
Code Issues Projects Releases Wiki Activity

phpstan & refactoring

Browse Source
This commit is contained in:
Milos Stojanovic
2019-06-14 13:07:01 +02:00
parent f6185c92ab
commit fa319eda36
8 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/Controllers/AuthController.php
View File

@@ -67,6 +67,10 @@ class AuthController
return $response->json($errors->firstOfAll(), 422);
}
if ($auth->user() === null) {
return $response->json(['oldpassword' => 'Wrong password'], 422);
}
if (! $auth->authenticate($auth->user()->getUsername(), $request->input('oldpassword'))) {
return $response->json(['oldpassword' => 'Wrong password'], 422);
}

4
backend/Services/Auth/Adapters/Database.php
View File

@@ -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)

4
backend/Services/Auth/Adapters/JsonFile.php
View File

@@ -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)

6
backend/Services/Session/Adapters/SessionStorage.php
View File

@@ -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();
}

2
backend/Services/Storage/Filesystem.php
View File

@@ -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);
}
}