kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Improve code quality and fix test coverage.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/BudgetController.php
View File

@@ -649,9 +649,10 @@ class BudgetController extends Controller
*/
private function getPeriodOverview(): Collection
{
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
$first = $repository->first();
$start = $first->date ?? new Carbon;
$first = $repository->firstNull();
$start = null === $first ? new Carbon : $first->date;
$range = Preferences::get('viewRange', '1M')->data;
$start = app('navigation')->startOfPeriod($start, $range);
$end = app('navigation')->endOfX(new Carbon, $range, null);

4
app/Http/Controllers/TransactionController.php
View File

@@ -128,8 +128,8 @@ class TransactionController extends Controller
$page = (int)$request->get('page');
$pageSize = (int)Preferences::get('listPageSize', 50)->data;
$path = route('transactions.index.all', [$what]);
$first = $this->repository->first();
$start = $first->date ?? new Carbon;
$first = $this->repository->firstNull();
$start = null === $first ? new Carbon : $first->date;
$end = new Carbon;
$subTitle = trans('firefly.all_' . $what);

2
app/Http/Middleware/Range.php
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);
}

6
app/Http/Middleware/Sandstorm.php
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);