From ec7ef3a81341a0ca5396a9e920e76efa2b80e950 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 20 Jul 2018 20:53:48 +0200 Subject: [PATCH] Various fixes for tests and code quality. --- .../Controllers/Account/CreateController.php | 8 ++++++-- .../Controllers/Account/DeleteController.php | 9 ++++++--- .../Controllers/Account/EditController.php | 10 +++++++--- .../Controllers/Account/IndexController.php | 8 ++++++-- .../Account/ReconcileController.php | 20 +++++++++++++++---- .../Controllers/Account/ShowController.php | 8 +++++--- .../Category/NoCategoryController.php | 2 +- .../Controllers/Category/ShowController.php | 4 ++-- .../Chart/ExpenseReportController.php | 2 +- app/Http/Controllers/CurrencyController.php | 2 +- .../Controllers/Json/ReconcileController.php | 4 ++-- app/Http/Controllers/NewUserController.php | 2 +- app/Http/Controllers/PiggyBankController.php | 4 ++-- .../Controllers/Popup/ReportController.php | 2 +- .../Controllers/Report/ExpenseController.php | 2 +- .../Controllers/Rule/SelectController.php | 2 +- .../Transaction/BulkController.php | 2 +- .../Transaction/ConvertController.php | 2 +- .../Transaction/LinkController.php | 2 +- .../Transaction/MassController.php | 2 +- .../Transaction/SingleController.php | 2 +- .../Transaction/SplitController.php | 4 ++-- .../Controllers/TransactionController.php | 2 +- .../Triggers/FromAccountIsTest.php | 2 +- .../Triggers/FromAccountStartsTest.php | 4 ++-- .../Triggers/ToAccountEndsTest.php | 6 +++--- .../Triggers/ToAccountIsTest.php | 4 ++-- .../Triggers/ToAccountStartsTest.php | 8 ++++---- 28 files changed, 79 insertions(+), 50 deletions(-) diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index df4af66bb9..faad8c0f43 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -36,11 +36,11 @@ use Illuminate\Http\Request; */ class CreateController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * CreateController constructor. */ public function __construct() { @@ -60,6 +60,8 @@ class CreateController extends Controller } /** + * Create a new account. + * * @param Request $request * @param string|null $what * @@ -90,6 +92,8 @@ class CreateController extends Controller /** + * Store the new account. + * * @param AccountFormRequest $request * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php index e74cd1264b..ed9adf55be 100644 --- a/app/Http/Controllers/Account/DeleteController.php +++ b/app/Http/Controllers/Account/DeleteController.php @@ -30,16 +30,15 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Illuminate\Http\Request; /** - * * Class DeleteController */ class DeleteController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * DeleteController constructor. */ public function __construct() { @@ -59,6 +58,8 @@ class DeleteController extends Controller } /** + * Delete account screen. + * * @param Account $account * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View @@ -77,6 +78,8 @@ class DeleteController extends Controller } /** + * Delete the account. + * * @param Request $request * @param Account $account * diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php index 570113b762..1f8817902f 100644 --- a/app/Http/Controllers/Account/EditController.php +++ b/app/Http/Controllers/Account/EditController.php @@ -37,13 +37,13 @@ use Illuminate\Http\Request; */ class EditController extends Controller { - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * EditController constructor. */ public function __construct() { @@ -64,6 +64,8 @@ class EditController extends Controller } /** + * Edit account overview. + * * @param Request $request * @param Account $account * @param AccountRepositoryInterface $repository @@ -120,6 +122,8 @@ class EditController extends Controller /** + * Update the account. + * * @param AccountFormRequest $request * @param Account $account * diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 2eaa3f49d6..363a818cdc 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -36,11 +36,11 @@ use Illuminate\Pagination\LengthAwarePaginator; */ class IndexController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * IndexController constructor. */ public function __construct() { @@ -60,6 +60,8 @@ class IndexController extends Controller } /** + * Show list of accounts. + * * @param Request $request * @param string $what * @@ -106,6 +108,8 @@ class IndexController extends Controller /** + * Find the ID in a given array. Return '0' of not there (amount). + * * @param array $array * @param int $entryId * diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index ee8cfce3c6..9e16cb589a 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -45,15 +45,15 @@ use Log; */ class ReconcileController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepos; - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** - * + * ReconcileController constructor. */ public function __construct() { @@ -74,6 +74,8 @@ class ReconcileController extends Controller } /** + * Edit a reconciliation. + * * @param TransactionJournal $journal * * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector @@ -110,6 +112,8 @@ class ReconcileController extends Controller } /** + * Reconciliation overview. + * * @param Account $account * @param Carbon|null $start * @param Carbon|null $end @@ -168,6 +172,8 @@ class ReconcileController extends Controller } /** + * Show a single reconciliation. + * * @param TransactionJournal $journal * * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View @@ -193,6 +199,8 @@ class ReconcileController extends Controller /** @noinspection MoreThanThreeArgumentsInspection */ /** + * Submit a new reconciliation. + * * @param ReconciliationStoreRequest $request * @param Account $account * @param Carbon $start @@ -278,6 +286,8 @@ class ReconcileController extends Controller /** + * Update a reconciliation. + * * @param ReconciliationUpdateRequest $request * @param TransactionJournal $journal * @@ -359,6 +369,8 @@ class ReconcileController extends Controller } /** + * Redirect user to the original asset account. + * * @param Account $account * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index e174fea0b9..90e7e3802b 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -45,13 +45,13 @@ use View; */ class ShowController extends Controller { - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** - * + * ShowController constructor. */ public function __construct() { @@ -241,6 +241,8 @@ class ShowController extends Controller } /** + * Redirect to the original account. + * * @param Account $account * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index 9e4a098619..49e1b287d1 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -43,7 +43,7 @@ use Log; class NoCategoryController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepos; /** @var CategoryRepositoryInterface */ private $repository; diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index 81132d4b69..c3731c175c 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -47,9 +47,9 @@ use Illuminate\Support\Collection; class ShowController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepos; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepos; /** @var CategoryRepositoryInterface */ private $repository; diff --git a/app/Http/Controllers/Chart/ExpenseReportController.php b/app/Http/Controllers/Chart/ExpenseReportController.php index 40576c6ef6..0621985ff4 100644 --- a/app/Http/Controllers/Chart/ExpenseReportController.php +++ b/app/Http/Controllers/Chart/ExpenseReportController.php @@ -43,7 +43,7 @@ use Illuminate\Support\Collection; */ class ExpenseReportController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ protected $accountRepository; /** @var GeneratorInterface */ protected $generator; diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 67172255b2..0e88232f03 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -38,7 +38,7 @@ use View; */ class CurrencyController extends Controller { - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ protected $repository; /** @var UserRepositoryInterface */ diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index f1e64fefda..193d9d87c9 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -50,9 +50,9 @@ class ReconcileController extends Controller /** @var CurrencyUpdateService */ private $accountRepos; - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $currencyRepos; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 4dee74940d..9d341f8ed2 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -34,7 +34,7 @@ use View; */ class NewUserController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $repository; /** diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 7a450fb6ba..08d3c5c249 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -47,9 +47,9 @@ use Symfony\Component\HttpFoundation\ParameterBag; class PiggyBankController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepos; - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencyRepos; /** @var PiggyBankRepositoryInterface */ private $piggyRepos; diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index 6f10fe1224..84bdb38e87 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -44,7 +44,7 @@ use Throwable; */ class ReportController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepository; /** @var BudgetRepositoryInterface */ private $budgetRepository; diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php index 37adf0f446..916f45c1f3 100644 --- a/app/Http/Controllers/Report/ExpenseController.php +++ b/app/Http/Controllers/Report/ExpenseController.php @@ -42,7 +42,7 @@ use Throwable; */ class ExpenseController extends Controller { - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ protected $accountRepository; /** diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php index 1c6cb0b04d..de4bec4f20 100644 --- a/app/Http/Controllers/Rule/SelectController.php +++ b/app/Http/Controllers/Rule/SelectController.php @@ -48,7 +48,7 @@ use Throwable; class SelectController extends Controller { use RuleManagement; - /** @var AccountRepositoryInterface */ + /** @var AccountRepositoryInterface The account repository */ private $accountRepos; /** diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index a3ea753677..b8e9f15134 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -37,7 +37,7 @@ use Log; */ class BulkController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index d2c99ae19c..f1b30d8f78 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -38,7 +38,7 @@ use View; */ class ConvertController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index d4b4944e49..9c1a061399 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -36,7 +36,7 @@ use URL; */ class LinkController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $journalRepository; /** @var LinkTypeRepositoryInterface */ private $repository; diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 7f324c7d39..0fd5ee9294 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -47,7 +47,7 @@ use Symfony\Component\HttpFoundation\ParameterBag; */ class MassController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index c3ed9429d0..7223bb1004 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -50,7 +50,7 @@ class SingleController extends Controller private $attachments; /** @var BudgetRepositoryInterface */ private $budgets; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 7591fcad70..87faaf510c 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -52,9 +52,9 @@ class SplitController extends Controller /** @var BudgetRepositoryInterface */ private $budgets; - /** @var CurrencyRepositoryInterface */ + /** @var CurrencyRepositoryInterface The currency repository */ private $currencies; - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 7a44a3d271..36a35cebb8 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -50,7 +50,7 @@ use View; */ class TransactionController extends Controller { - /** @var JournalRepositoryInterface */ + /** @var JournalRepositoryInterface Journals and transactions overview */ private $repository; /** diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php index 7a299d08cf..d4ef43b734 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php @@ -41,7 +41,7 @@ class FromAccountIsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php index 8c765570e7..ecf2f2e8cc 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php @@ -52,7 +52,7 @@ class FromAccountStartsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; @@ -83,7 +83,7 @@ class FromAccountStartsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '<', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php index 32617ec83d..795eb179fa 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php @@ -42,7 +42,7 @@ class ToAccountEndsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; @@ -73,7 +73,7 @@ class ToAccountEndsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; @@ -103,7 +103,7 @@ class ToAccountEndsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); $name = $account->name ?? ''; diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php index 5f06021fd1..44ef88bd18 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php @@ -42,7 +42,7 @@ class ToAccountIsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); @@ -69,7 +69,7 @@ class ToAccountIsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php index 78c0ef1efe..8b05f84aac 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php @@ -44,10 +44,10 @@ class ToAccountStartsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null === $account)); $loops++; @@ -73,10 +73,10 @@ class ToAccountStartsTest extends TestCase /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $account = null === $transaction ? null : $transaction->account; $count = $journal->transactions()->count(); - Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account)); + Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null === $account)); $loops++;