Improve code quality and fix test coverage.

This commit is contained in:
James Cole
2018-04-28 10:27:33 +02:00
parent 7b39828980
commit e126427809
75 changed files with 430 additions and 369 deletions

View File

@@ -140,7 +140,7 @@ class Range
$first = Carbon::now()->startOfYear();
if (null !== $journal) {
$first = $journal->date;
$first = $journal->date ?? $first;
}
Session::put('first', $first);
}

View File

@@ -80,7 +80,7 @@ class Sandstorm
return $next($request);
}
if (1 === $count && 0 === \strlen($userId)) {
if (1 === $count && '' === $userId) {
// login but indicate anonymous
$user = User::first();
Auth::guard($guard)->login($user);
@@ -111,7 +111,7 @@ class Sandstorm
return $next($request);
}
if (0 === $count && 0 === \strlen($userId)) {
if (0 === $count && '' === $userId) {
throw new FireflyException('The first visit to a new Firefly III administration cannot be by a guest user.');
}
@@ -121,7 +121,7 @@ class Sandstorm
}
// if in Sandstorm, user logged in, still must check if user is anon.
$userId = (string)$request->header('X-Sandstorm-User-Id');
if (\strlen($userId) === 0) {
if ('' === $userId) {
View::share('SANDSTORM_ANON', true);
return $next($request);