From cc7c2e952cd137279e9263479b7222f5c38ff256 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 3 Jun 2015 21:25:11 +0200 Subject: [PATCH] Code cleanup [skip ci] --- app/Helpers/Collection/BalanceLine.php | 1 + app/Helpers/Collection/Bill.php | 2 +- app/Helpers/Collection/Category.php | 2 +- app/Helpers/Collection/Expense.php | 2 +- app/Helpers/Collection/Income.php | 2 +- app/Helpers/Report/ReportHelper.php | 3 +- app/Helpers/Report/ReportHelperInterface.php | 2 +- app/Helpers/Report/ReportQuery.php | 100 ++++++++--------- app/Http/Controllers/AccountController.php | 11 +- app/Http/Controllers/Auth/AuthController.php | 2 +- app/Http/Controllers/BillController.php | 2 +- app/Http/Controllers/BudgetController.php | 2 +- app/Http/Controllers/CategoryController.php | 4 +- .../Controllers/Chart/AccountController.php | 58 +++++----- app/Http/Controllers/Chart/BillController.php | 39 ++++--- .../Controllers/Chart/BudgetController.php | 74 ++++++------- .../Controllers/Chart/CategoryController.php | 23 ++-- app/Http/Controllers/HomeController.php | 21 ++-- app/Http/Controllers/JsonController.php | 62 +++++------ app/Http/Controllers/NewUserController.php | 2 +- app/Http/Controllers/PiggyBankController.php | 10 +- .../Controllers/TransactionController.php | 2 +- app/Http/Middleware/Authenticate.php | 3 +- app/Http/Middleware/Reminders.php | 13 +-- app/Http/breadcrumbs.php | 102 +++++++++--------- app/Models/Account.php | 42 ++++---- app/Models/AccountMeta.php | 16 +-- app/Models/AccountType.php | 12 +-- app/Models/Bill.php | 44 ++++---- app/Models/Budget.php | 22 ++-- app/Models/BudgetLimit.php | 22 ++-- app/Models/Category.php | 20 ++-- app/Models/Component.php | 10 +- app/Models/LimitRepetition.php | 18 ++-- app/Models/PiggyBank.php | 42 ++++---- app/Models/PiggyBankEvent.php | 20 ++-- app/Models/PiggyBankRepetition.php | 30 +++--- app/Models/Preference.php | 18 ++-- app/Models/Reminder.php | 34 +++--- app/Models/Tag.php | 26 ++--- app/Models/Transaction.php | 26 ++--- app/Models/TransactionCurrency.php | 16 +-- app/Models/TransactionGroup.php | 16 +-- app/Models/TransactionJournal.php | 22 ++-- app/Models/TransactionRelation.php | 2 +- app/Models/TransactionType.php | 12 +-- app/Providers/BusServiceProvider.php | 2 +- app/Providers/EventServiceProvider.php | 12 +-- app/Providers/FireflyServiceProvider.php | 12 +-- app/Providers/RouteServiceProvider.php | 2 +- .../Account/AccountRepository.php | 22 ++-- app/Repositories/Budget/BudgetRepository.php | 94 ++++++++-------- .../Category/CategoryRepository.php | 54 +++++----- .../Journal/JournalRepository.php | 2 +- .../PiggyBank/PiggyBankRepository.php | 2 +- .../Reminder/ReminderRepository.php | 40 +++---- app/Repositories/Tag/TagRepository.php | 2 +- app/Services/Registrar.php | 6 +- app/Support/CacheProperties.php | 8 ++ app/Support/Navigation.php | 4 +- app/Support/Preferences.php | 19 ++-- app/Support/Search/Search.php | 12 +-- app/Support/Steam.php | 18 ++-- app/Support/Twig/Budget.php | 18 ++-- app/Support/Twig/General.php | 22 ++-- app/Support/Twig/Journal.php | 14 ++- app/Support/Twig/PiggyBank.php | 2 +- app/Support/Twig/Translation.php | 2 +- app/User.php | 28 ++--- 69 files changed, 695 insertions(+), 716 deletions(-) diff --git a/app/Helpers/Collection/BalanceLine.php b/app/Helpers/Collection/BalanceLine.php index de82b6814d..d491f32959 100644 --- a/app/Helpers/Collection/BalanceLine.php +++ b/app/Helpers/Collection/BalanceLine.php @@ -64,6 +64,7 @@ class BalanceLine if ($this->getRole() == self::ROLE_DIFFROLE) { return trans('firefly.leftUnbalanced'); } + return ''; } diff --git a/app/Helpers/Collection/Bill.php b/app/Helpers/Collection/Bill.php index de5b86fc97..34b3205c6b 100644 --- a/app/Helpers/Collection/Bill.php +++ b/app/Helpers/Collection/Bill.php @@ -41,7 +41,7 @@ class Bill public function getBills() { $this->bills->sortBy( - function(BillLine $bill) { + function (BillLine $bill) { $active = intval($bill->getBill()->active) == 0 ? 1 : 0; $name = $bill->getBill()->name; diff --git a/app/Helpers/Collection/Category.php b/app/Helpers/Collection/Category.php index 71af3c2607..84f426487a 100644 --- a/app/Helpers/Collection/Category.php +++ b/app/Helpers/Collection/Category.php @@ -55,7 +55,7 @@ class Category public function getCategories() { $this->categories->sortByDesc( - function(CategoryModel $category) { + function (CategoryModel $category) { return $category->spent; } ); diff --git a/app/Helpers/Collection/Expense.php b/app/Helpers/Collection/Expense.php index f328bfd42a..a66c1ef86d 100644 --- a/app/Helpers/Collection/Expense.php +++ b/app/Helpers/Collection/Expense.php @@ -67,7 +67,7 @@ class Expense public function getExpenses() { $this->expenses->sortByDesc( - function(stdClass $object) { + function (stdClass $object) { return $object->amount; } ); diff --git a/app/Helpers/Collection/Income.php b/app/Helpers/Collection/Income.php index 2b635f8aa4..c3caf9eba7 100644 --- a/app/Helpers/Collection/Income.php +++ b/app/Helpers/Collection/Income.php @@ -68,7 +68,7 @@ class Income public function getIncomes() { $this->incomes->sortByDesc( - function(stdClass $object) { + function (stdClass $object) { return $object->amount; } ); diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index a1e337531a..4790b1d81c 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -66,10 +66,11 @@ class ReportHelper implements ReportHelperInterface // remove cash account, if any: $accounts = $accounts->filter( - function(Account $account) { + function (Account $account) { if ($account->accountType->type != 'Cash account') { return $account; } + return null; } ); diff --git a/app/Helpers/Report/ReportHelperInterface.php b/app/Helpers/Report/ReportHelperInterface.php index e1e0a3df1a..75ffbdfd0c 100644 --- a/app/Helpers/Report/ReportHelperInterface.php +++ b/app/Helpers/Report/ReportHelperInterface.php @@ -5,9 +5,9 @@ namespace FireflyIII\Helpers\Report; use Carbon\Carbon; use FireflyIII\Helpers\Collection\Account as AccountCollection; use FireflyIII\Helpers\Collection\Balance; +use FireflyIII\Helpers\Collection\Bill as BillCollection; use FireflyIII\Helpers\Collection\Budget as BudgetCollection; use FireflyIII\Helpers\Collection\Category as CategoryCollection; -use FireflyIII\Helpers\Collection\Bill as BillCollection; use FireflyIII\Helpers\Collection\Expense; use FireflyIII\Helpers\Collection\Income; diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index 5bcf09f9d8..2e720e0653 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -35,15 +35,15 @@ class ReportQuery implements ReportQueryInterface $query = $this->queryJournalsWithTransactions($start, $end); if ($includeShared === false) { $query->where( - function(Builder $query) { + function (Builder $query) { $query->where( - function(Builder $q) { // only get withdrawals not from a shared account + function (Builder $q) { // only get withdrawals not from a shared account $q->where('transaction_types.type', 'Withdrawal'); $q->where('acm_from.data', '!=', '"sharedAsset"'); } ); $query->orWhere( - function(Builder $q) { // and transfers from a shared account. + function (Builder $q) { // and transfers from a shared account. $q->where('transaction_types.type', 'Transfer'); $q->where('acm_to.data', '=', '"sharedAsset"'); } @@ -61,17 +61,18 @@ class ReportQuery implements ReportQueryInterface ); $data->each( - function(TransactionJournal $journal) { + function (TransactionJournal $journal) { if (intval($journal->account_encrypted) == 1) { $journal->name = Crypt::decrypt($journal->name); } } ); $data = $data->filter( - function(TransactionJournal $journal) { + function (TransactionJournal $journal) { if ($journal->amount != 0) { return $journal; } + return null; } ); @@ -91,26 +92,26 @@ class ReportQuery implements ReportQueryInterface public function getAllAccounts(Carbon $start, Carbon $end, $includeShared = false) { $query = Auth::user()->accounts()->orderBy('accounts.name', 'ASC') - ->accountTypeIn(['Default account', 'Asset account', 'Cash account']); + ->accountTypeIn(['Default account', 'Asset account', 'Cash account']); if ($includeShared === false) { $query->leftJoin( - 'account_meta', function(JoinClause $join) { + 'account_meta', function (JoinClause $join) { $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole'); } ) - ->orderBy('accounts.name', 'ASC') - ->where( - function(Builder $query) { + ->orderBy('accounts.name', 'ASC') + ->where( + function (Builder $query) { - $query->where('account_meta.data', '!=', '"sharedAsset"'); - $query->orWhereNull('account_meta.data'); + $query->where('account_meta.data', '!=', '"sharedAsset"'); + $query->orWhereNull('account_meta.data'); - } - ); + } + ); } $set = $query->get(['accounts.*']); $set->each( - function(Account $account) use ($start, $end) { + function (Account $account) use ($start, $end) { /** * The balance for today always incorporates transactions * made on today. So to get todays "start" balance, we sub one @@ -151,15 +152,15 @@ class ReportQuery implements ReportQueryInterface // only get deposits not to a shared account // and transfers to a shared account. $query->where( - function(Builder $query) { + function (Builder $query) { $query->where( - function(Builder $q) { + function (Builder $q) { $q->where('transaction_types.type', 'Deposit'); $q->where('acm_to.data', '!=', '"sharedAsset"'); } ); $query->orWhere( - function(Builder $q) { + function (Builder $q) { $q->where('transaction_types.type', 'Transfer'); $q->where('acm_from.data', '=', '"sharedAsset"'); } @@ -178,17 +179,18 @@ class ReportQuery implements ReportQueryInterface ); $data->each( - function(TransactionJournal $journal) { + function (TransactionJournal $journal) { if (intval($journal->account_encrypted) == 1) { $journal->name = Crypt::decrypt($journal->name); } } ); $data = $data->filter( - function(TransactionJournal $journal) { + function (TransactionJournal $journal) { if ($journal->amount != 0) { return $journal; } + return null; } ); @@ -210,16 +212,16 @@ class ReportQuery implements ReportQueryInterface { return floatval( - Auth::user()->transactionjournals() - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->transactionTypes(['Withdrawal']) - ->where('transactions.account_id', $account->id) - ->before($end) - ->after($start) - ->where('budget_transaction_journal.budget_id', $budget->id) - ->get(['transaction_journals.*'])->sum('amount') - ) * -1; + Auth::user()->transactionjournals() + ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->transactionTypes(['Withdrawal']) + ->where('transactions.account_id', $account->id) + ->before($end) + ->after($start) + ->where('budget_transaction_journal.budget_id', $budget->id) + ->get(['transaction_journals.*'])->sum('amount') + ) * -1; } /** @@ -254,28 +256,28 @@ class ReportQuery implements ReportQueryInterface { $query = TransactionJournal:: leftJoin( - 'transactions as t_from', function(JoinClause $join) { + 'transactions as t_from', function (JoinClause $join) { $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0); } ) - ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id') - ->leftJoin( - 'account_meta as acm_from', function(JoinClause $join) { - $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole'); - } - ) - ->leftJoin( - 'transactions as t_to', function(JoinClause $join) { - $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0); - } - ) - ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id') - ->leftJoin( - 'account_meta as acm_to', function(JoinClause $join) { - $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole'); - } - ) - ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'); + ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id') + ->leftJoin( + 'account_meta as acm_from', function (JoinClause $join) { + $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole'); + } + ) + ->leftJoin( + 'transactions as t_to', function (JoinClause $join) { + $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0); + } + ) + ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id') + ->leftJoin( + 'account_meta as acm_to', function (JoinClause $join) { + $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole'); + } + ) + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'); $query->before($end)->after($start)->where('transaction_journals.user_id', Auth::user()->id); return $query; diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index dbef12d1e4..be1a8545c8 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -7,12 +7,13 @@ use FireflyIII\Http\Requests\AccountFormRequest; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Input; +use Preferences; use Redirect; use Session; use Steam; use URL; use View; -use Preferences; + /** * Class AccountController * @@ -155,7 +156,7 @@ class AccountController extends Controller $start = clone Session::get('start', Carbon::now()->startOfMonth()); $start->subDay(); $accounts->each( - function(Account $account) use ($start, $repository) { + function (Account $account) use ($start, $repository) { $account->lastActivityDate = $repository->getLastActivity($account); $account->startBalance = Steam::balance($account, $start); $account->endBalance = Steam::balance($account, clone Session::get('end', Carbon::now()->endOfMonth())); @@ -200,11 +201,11 @@ class AccountController extends Controller 'user' => Auth::user()->id, 'accountRole' => $request->input('accountRole'), 'openingBalance' => floatval($request->input('openingBalance')), - 'openingBalanceDate' => new Carbon((string) $request->input('openingBalanceDate')), + 'openingBalanceDate' => new Carbon((string)$request->input('openingBalanceDate')), 'openingBalanceCurrency' => intval($request->input('balance_currency_id')), ]; - $account = $repository->store($accountData); + $account = $repository->store($accountData); Session::flash('success', 'New account "' . $account->name . '" stored!'); Preferences::mark(); @@ -239,7 +240,7 @@ class AccountController extends Controller 'accountRole' => $request->input('accountRole'), 'virtualBalance' => floatval($request->input('virtualBalance')), 'openingBalance' => floatval($request->input('openingBalance')), - 'openingBalanceDate' => new Carbon((string) $request->input('openingBalanceDate')), + 'openingBalanceDate' => new Carbon((string)$request->input('openingBalanceDate')), 'openingBalanceCurrency' => intval($request->input('balance_currency_id')), 'ccType' => $request->input('ccType'), 'ccMonthlyPaymentDate' => $request->input('ccMonthlyPaymentDate'), diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index a44ab81cbc..7819d86383 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -109,7 +109,7 @@ class AuthController extends Controller if (User::count() == 1) { $admin = Role::where('name', 'owner')->first(); $this->auth->user()->attachRole($admin); -// $this->auth->user()->roles()->save($admin); + // $this->auth->user()->roles()->save($admin); } diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 6d96298615..045b242b97 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -112,7 +112,7 @@ class BillController extends Controller { $bills = $repository->getBills(); $bills->each( - function(Bill $bill) use ($repository) { + function (Bill $bill) use ($repository) { $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill); $bill->lastFoundMatch = $repository->lastFoundMatch($bill); } diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 95d43d1535..0925ce2056 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -242,7 +242,7 @@ class BudgetController extends Controller 'name' => $request->input('name'), 'user' => Auth::user()->id, ]; - $budget = $repository->store($budgetData); + $budget = $repository->store($budgetData); Session::flash('success', 'New budget "' . $budget->name . '" stored!'); Preferences::mark(); diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 6de44dbba9..b6f016f272 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -114,7 +114,7 @@ class CategoryController extends Controller $categories = $repository->getCategories(); $categories->each( - function(Category $category) use ($repository) { + function (Category $category) use ($repository) { $category->lastActivity = $repository->getLatestActivity($category); } ); @@ -167,7 +167,7 @@ class CategoryController extends Controller 'name' => $request->input('name'), 'user' => Auth::user()->id, ]; - $category = $repository->store($categoryData); + $category = $repository->store($categoryData); Session::flash('success', 'New category "' . $category->name . '" stored!'); Preferences::mark(); diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index bd862d3012..af8aef6b57 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -2,8 +2,6 @@ namespace FireflyIII\Http\Controllers\Chart; -use Auth; -use Cache; use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; @@ -11,7 +9,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Support\CacheProperties; use Grumpydictator\Gchart\GChart; use Illuminate\Support\Collection; -use Log; use Preferences; use Response; use Session; @@ -43,15 +40,14 @@ class AccountController extends Controller $end->endOfMonth(); // chart properties for cache: - $chartProperties = new CacheProperties(); - $chartProperties->addProperty($start); - $chartProperties->addProperty($end); - $chartProperties->addProperty('all'); - $chartProperties->addProperty('accounts'); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties(); + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('all'); + $cache->addProperty('accounts'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); $chart->addColumn(trans('firefly.dayOfMonth'), 'date'); @@ -91,7 +87,7 @@ class AccountController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); } @@ -114,15 +110,14 @@ class AccountController extends Controller $accounts = $repository->getFrontpageAccounts($frontPage); // chart properties for cache: - $chartProperties = new CacheProperties(); - $chartProperties->addProperty($start); - $chartProperties->addProperty($end); - $chartProperties->addProperty('frontpage'); - $chartProperties->addProperty('accounts'); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties(); + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('frontpage'); + $cache->addProperty('accounts'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); $index = 1; @@ -148,7 +143,7 @@ class AccountController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); @@ -174,18 +169,15 @@ class AccountController extends Controller $today = new Carbon; // chart properties for cache: - $chartProperties = new CacheProperties(); - $chartProperties->addProperty($start); - $chartProperties->addProperty($end); - $chartProperties->addProperty('frontpage'); - $chartProperties->addProperty('single'); - $chartProperties->addProperty($account->id); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties(); + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('frontpage'); + $cache->addProperty('single'); + $cache->addProperty($account->id); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); - - while ($end >= $current) { $certain = $current < $today; @@ -197,7 +189,7 @@ class AccountController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); } diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index 7950e294ed..a1b8985ee5 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -14,8 +14,7 @@ use Illuminate\Support\Collection; use Response; use Session; use Steam; -use Cache; -use Log; + /** * Class BillController * @@ -40,14 +39,13 @@ class BillController extends Controller $chart->addColumn(trans('firefly.minAmount'), 'number'); $chart->addColumn(trans('firefly.billEntry'), 'number'); - $chartProperties = new CacheProperties; - $chartProperties->addProperty('single'); - $chartProperties->addProperty('bill'); - $chartProperties->addProperty($bill->id); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties; + $cache->addProperty('single'); + $cache->addProperty('bill'); + $cache->addProperty($bill->id); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); // get first transaction or today for start: $results = $repository->getJournals($bill); @@ -59,7 +57,7 @@ class BillController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); } @@ -79,20 +77,19 @@ class BillController extends Controller $chart->addColumn(trans('firefly.name'), 'string'); $chart->addColumn(trans('firefly.amount'), 'number'); - $start = Session::get('start', Carbon::now()->startOfMonth()); - $end = Session::get('end', Carbon::now()->endOfMonth()); + $start = Session::get('start', Carbon::now()->startOfMonth()); + $end = Session::get('end', Carbon::now()->endOfMonth()); // chart properties for cache: - $chartProperties = new CacheProperties(); - $chartProperties->addProperty($start); - $chartProperties->addProperty($end); - $chartProperties->addProperty('bills'); - $chartProperties->addProperty('frontpage'); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties(); + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('bills'); + $cache->addProperty('frontpage'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); $bills = $repository->getActiveBills(); $paid = new Collection; // journals. @@ -163,7 +160,7 @@ class BillController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); } diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 731f87b4de..dbd569d682 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -2,7 +2,6 @@ namespace FireflyIII\Http\Controllers\Chart; -use Cache; use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Budget; @@ -11,7 +10,6 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Support\CacheProperties; use Grumpydictator\Gchart\GChart; use Illuminate\Support\Collection; -use Log; use Navigation; use Preferences; use Response; @@ -45,15 +43,14 @@ class BudgetController extends Controller $last = Navigation::endOfX($last, $range, $final); // chart properties for cache: - $chartProperties = new CacheProperties(); - $chartProperties->addProperty($first); - $chartProperties->addProperty($last); - $chartProperties->addProperty('budget'); - $chartProperties->addProperty('budget'); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties(); + $cache->addProperty($first); + $cache->addProperty($last); + $cache->addProperty('budget'); + $cache->addProperty('budget'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); while ($first < $last) { @@ -69,7 +66,7 @@ class BudgetController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); } @@ -90,17 +87,16 @@ class BudgetController extends Controller $end = $repetition->enddate; // chart properties for cache: - $chartProperties = new CacheProperties(); - $chartProperties->addProperty($start); - $chartProperties->addProperty($end); - $chartProperties->addProperty('budget'); - $chartProperties->addProperty('limit'); - $chartProperties->addProperty($budget->id); - $chartProperties->addProperty($repetition->id); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties(); + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('budget'); + $cache->addProperty('limit'); + $cache->addProperty($budget->id); + $cache->addProperty($repetition->id); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); $chart->addColumn(trans('firefly.day'), 'date'); $chart->addColumn(trans('firefly.left'), 'number'); @@ -120,7 +116,7 @@ class BudgetController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); @@ -147,15 +143,14 @@ class BudgetController extends Controller $allEntries = new Collection; // chart properties for cache: - $chartProperties = new CacheProperties(); - $chartProperties->addProperty($start); - $chartProperties->addProperty($end); - $chartProperties->addProperty('budget'); - $chartProperties->addProperty('all'); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties(); + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('budget'); + $cache->addProperty('all'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); /** @var Budget $budget */ @@ -194,7 +189,7 @@ class BudgetController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); @@ -218,15 +213,14 @@ class BudgetController extends Controller $budgets = $repository->getBudgets(); // chart properties for cache: - $chartProperties = new CacheProperties(); - $chartProperties->addProperty($start); - $chartProperties->addProperty($end); - $chartProperties->addProperty('budget'); - $chartProperties->addProperty('year'); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties(); + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('budget'); + $cache->addProperty('year'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); // add columns: $chart->addColumn(trans('firefly.month'), 'date'); @@ -254,7 +248,7 @@ class BudgetController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); } diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 5d0a57b031..fed7840398 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -3,14 +3,12 @@ namespace FireflyIII\Http\Controllers\Chart; -use Cache; use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Support\CacheProperties; use Grumpydictator\Gchart\GChart; -use Log; use Navigation; use Preferences; use Response; @@ -80,22 +78,21 @@ class CategoryController extends Controller $end = Session::get('end', Carbon::now()->endOfMonth()); // chart properties for cache: - $chartProperties = new CacheProperties; - $chartProperties->addProperty($start); - $chartProperties->addProperty($end); - $chartProperties->addProperty('category'); - $chartProperties->addProperty('frontpage'); - if ($chartProperties->has()) { - return Response::json($chartProperties->get()); + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('category'); + $cache->addProperty('frontpage'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $chartProperties->getMd5(); - $set = $repository->getCategoriesAndExpensesCorrected($start, $end); + $set = $repository->getCategoriesAndExpensesCorrected($start, $end); // sort by callback: uasort( $set, - function($left, $right) { + function ($left, $right) { if ($left['sum'] == $right['sum']) { return 0; } @@ -115,7 +112,7 @@ class CategoryController extends Controller $chart->generate(); $data = $chart->getData(); - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 17472183d5..4477ae09d3 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -2,7 +2,6 @@ use Carbon\Carbon; use Config; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Input; use Preferences; @@ -61,20 +60,19 @@ class HomeController extends Controller return Redirect::route('new-user.index'); } - $title = 'Firefly'; - $subTitle = trans('firefly.welcomeBack'); - $mainTitleIcon = 'fa-fire'; - $transactions = []; - $frontPage = Preferences::get('frontPageAccounts', []); - $start = Session::get('start', Carbon::now()->startOfMonth()); - $end = Session::get('end', Carbon::now()->endOfMonth()); - $accounts = $repository->getFrontpageAccounts($frontPage); - $savings = $repository->getSavingsAccounts(); + $title = 'Firefly'; + $subTitle = trans('firefly.welcomeBack'); + $mainTitleIcon = 'fa-fire'; + $transactions = []; + $frontPage = Preferences::get('frontPageAccounts', []); + $start = Session::get('start', Carbon::now()->startOfMonth()); + $end = Session::get('end', Carbon::now()->endOfMonth()); + $accounts = $repository->getFrontpageAccounts($frontPage); + $savings = $repository->getSavingsAccounts(); $piggyBankAccounts = $repository->getPiggyBankAccounts(); - $savingsTotal = 0; foreach ($savings as $savingAccount) { $savingsTotal += Steam::balance($savingAccount, $end); @@ -95,6 +93,7 @@ class HomeController extends Controller $transactions[] = [$set, $account]; } } + return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal', 'piggyBankAccounts')); } diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 9d0295411a..37ce8f34f5 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -1,7 +1,6 @@ endOfMonth()); // works for json too! - $prop = new CacheProperties; - $prop->addProperty($start); - $prop->addProperty($end); - $prop->addProperty('box-bills-paid'); - if ($prop->has()) { - return Response::json($prop->get()); + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('box-bills-paid'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $prop->getMd5(); $amount = 0; @@ -75,7 +73,8 @@ class JsonController extends Controller } } $data = ['box' => 'bills-paid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]; - Cache::forever($md5, $data); + $cache->store($data); + return Response::json($data); } @@ -93,14 +92,13 @@ class JsonController extends Controller $end = Session::get('end', Carbon::now()->endOfMonth()); // works for json too! - $prop = new CacheProperties; - $prop->addProperty($start); - $prop->addProperty($end); - $prop->addProperty('box-bills-unpaid'); - if ($prop->has()) { - return Response::json($prop->get()); + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('box-bills-unpaid'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $prop->getMd5(); $bills = $repository->getActiveBills(); $unpaid = new Collection; // bills @@ -137,7 +135,7 @@ class JsonController extends Controller } $data = ['box' => 'bills-unpaid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]; - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); } @@ -153,19 +151,18 @@ class JsonController extends Controller $end = Session::get('end', Carbon::now()->endOfMonth()); // works for json too! - $prop = new CacheProperties; - $prop->addProperty($start); - $prop->addProperty($end); - $prop->addProperty('box-in'); - if ($prop->has()) { - return Response::json($prop->get()); + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('box-in'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $prop->getMd5(); $amount = $reportQuery->incomeInPeriodCorrected($start, $end, true)->sum('amount'); $data = ['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]; - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); } @@ -182,19 +179,18 @@ class JsonController extends Controller // works for json too! - $prop = new CacheProperties; - $prop->addProperty($start); - $prop->addProperty($end); - $prop->addProperty('box-out'); - if ($prop->has()) { - return Response::json($prop->get()); + $cache = new CacheProperties; + $cache->addProperty($start); + $cache->addProperty($end); + $cache->addProperty('box-out'); + if ($cache->has()) { + return Response::json($cache->get()); } - $md5 = $prop->getMd5(); $amount = $reportQuery->expenseInPeriodCorrected($start, $end, true)->sum('amount'); $data = ['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]; - Cache::forever($md5, $data); + $cache->store($data); return Response::json($data); } diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index 7dc2738bcd..29734168c2 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -107,7 +107,7 @@ class NewUserController extends Controller AccountMeta::create( [ 'name' => 'ccMonthlyPaymentDate', - 'data' => Carbon::now()->year.'-01-01', + 'data' => Carbon::now()->year . '-01-01', 'account_id' => $creditCard->id, ] ); diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index f9bc5f87c6..381f1c544c 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -139,11 +139,11 @@ class PiggyBankController extends Controller $targetDate = $targetDate->format('Y-m-d'); } $preFilled = ['name' => $piggyBank->name, - 'account_id' => $piggyBank->account_id, - 'targetamount' => $piggyBank->targetamount, - 'targetdate' => $targetDate, - 'reminder' => $piggyBank->reminder, - 'remind_me' => intval($piggyBank->remind_me) == 1 && !is_null($piggyBank->reminder) ? true : false + 'account_id' => $piggyBank->account_id, + 'targetamount' => $piggyBank->targetamount, + 'targetdate' => $targetDate, + 'reminder' => $piggyBank->reminder, + 'remind_me' => intval($piggyBank->remind_me) == 1 && !is_null($piggyBank->reminder) ? true : false ]; Session::flash('preFilled', $preFilled); Session::flash('gaEventCategory', 'piggy-banks'); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 575d35c383..e3fb0f0e31 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -253,7 +253,7 @@ class TransactionController extends Controller public function show(JournalRepositoryInterface $repository, TransactionJournal $journal) { $journal->transactions->each( - function(Transaction $t) use ($journal, $repository) { + function (Transaction $t) use ($journal, $repository) { $t->before = $repository->getAmountBefore($journal, $t); $t->after = $t->before + $t->amount; } diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index d447376e03..e83a32aefb 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -1,12 +1,13 @@ addProperty('reminders'); - if ($properties->has()) { - $reminders = $properties->get(); + $cache->addProperty('reminders'); + if ($cache->has()) { + $reminders = $cache->get(); View::share('reminders', $reminders); return $next($request); } - $md5 = $properties->getMd5(); - $piggyBanks = $this->auth->user()->piggyBanks()->where('remind_me', 1)->get(); @@ -89,7 +86,7 @@ class Reminders $reminder->description = $helper->getReminderText($reminder); } ); - Cache::forever($md5, $reminders); + $cache->store($reminders); View::share('reminders', $reminders); } diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 80aa857876..fd8e5a146f 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -17,7 +17,7 @@ use FireflyIII\Models\TransactionJournal; */ Breadcrumbs::register( 'home', - function(Generator $breadcrumbs) { + function (Generator $breadcrumbs) { $breadcrumbs->push(trans('breadcrumbs.home'), route('index')); } @@ -25,7 +25,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'index', - function(Generator $breadcrumbs) { + function (Generator $breadcrumbs) { $breadcrumbs->push(trans('breadcrumbs.home'), route('index')); } @@ -34,21 +34,21 @@ Breadcrumbs::register( // accounts Breadcrumbs::register( - 'accounts.index', function(Generator $breadcrumbs, $what) { + 'accounts.index', function (Generator $breadcrumbs, $what) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what])); } ); Breadcrumbs::register( - 'accounts.create', function(Generator $breadcrumbs, $what) { + 'accounts.create', function (Generator $breadcrumbs, $what) { $breadcrumbs->parent('accounts.index', $what); $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what])); } ); Breadcrumbs::register( - 'accounts.show', function(Generator $breadcrumbs, Account $account) { + 'accounts.show', function (Generator $breadcrumbs, Account $account) { $what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); @@ -58,7 +58,7 @@ Breadcrumbs::register( } ); Breadcrumbs::register( - 'accounts.delete', function(Generator $breadcrumbs, Account $account) { + 'accounts.delete', function (Generator $breadcrumbs, Account $account) { $breadcrumbs->parent('accounts.show', $account); $breadcrumbs->push(trans('breadcrumbs.delete_account', ['name' => e($account->name)]), route('accounts.delete', [$account->id])); } @@ -66,7 +66,7 @@ Breadcrumbs::register( Breadcrumbs::register( - 'accounts.edit', function(Generator $breadcrumbs, Account $account) { + 'accounts.edit', function (Generator $breadcrumbs, Account $account) { $breadcrumbs->parent('accounts.show', $account); $what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); @@ -76,40 +76,40 @@ Breadcrumbs::register( // budgets. Breadcrumbs::register( - 'budgets.index', function(Generator $breadcrumbs) { + 'budgets.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.budgets'), route('budgets.index')); } ); Breadcrumbs::register( - 'budgets.create', function(Generator $breadcrumbs) { + 'budgets.create', function (Generator $breadcrumbs) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(trans('breadcrumbs.newBudget'), route('budgets.create')); } ); Breadcrumbs::register( - 'budgets.edit', function(Generator $breadcrumbs, Budget $budget) { + 'budgets.edit', function (Generator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); $breadcrumbs->push(trans('breadcrumbs.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', [$budget->id])); } ); Breadcrumbs::register( - 'budgets.delete', function(Generator $breadcrumbs, Budget $budget) { + 'budgets.delete', function (Generator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); $breadcrumbs->push(trans('breadcrumbs.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', [$budget->id])); } ); Breadcrumbs::register( - 'budgets.noBudget', function(Generator $breadcrumbs, $subTitle) { + 'budgets.noBudget', function (Generator $breadcrumbs, $subTitle) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push($subTitle, route('budgets.noBudget')); } ); Breadcrumbs::register( - 'budgets.show', function(Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) { + 'budgets.show', function (Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id])); if (!is_null($repetition) && !is_null($repetition->id)) { @@ -122,33 +122,33 @@ Breadcrumbs::register( // categories Breadcrumbs::register( - 'categories.index', function(Generator $breadcrumbs) { + 'categories.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.categories'), route('categories.index')); } ); Breadcrumbs::register( - 'categories.create', function(Generator $breadcrumbs) { + 'categories.create', function (Generator $breadcrumbs) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(trans('breadcrumbs.newCategory'), route('categories.create')); } ); Breadcrumbs::register( - 'categories.edit', function(Generator $breadcrumbs, Category $category) { + 'categories.edit', function (Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show', $category); $breadcrumbs->push(trans('breadcrumbs.edit_category', ['name' => e($category->name)]), route('categories.edit', [$category->id])); } ); Breadcrumbs::register( - 'categories.delete', function(Generator $breadcrumbs, Category $category) { + 'categories.delete', function (Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show', $category); $breadcrumbs->push(trans('breadcrumbs.delete_category', ['name' => e($category->name)]), route('categories.delete', [$category->id])); } ); Breadcrumbs::register( - 'categories.show', function(Generator $breadcrumbs, Category $category) { + 'categories.show', function (Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(e($category->name), route('categories.show', [$category->id])); @@ -156,7 +156,7 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'categories.noCategory', function(Generator $breadcrumbs, $subTitle) { + 'categories.noCategory', function (Generator $breadcrumbs, $subTitle) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push($subTitle, route('categories.noCategory')); } @@ -164,20 +164,20 @@ Breadcrumbs::register( // currencies. Breadcrumbs::register( - 'currency.index', function(Generator $breadcrumbs) { + 'currency.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.currencies'), route('currency.index')); } ); Breadcrumbs::register( - 'currency.edit', function(Generator $breadcrumbs, TransactionCurrency $currency) { + 'currency.edit', function (Generator $breadcrumbs, TransactionCurrency $currency) { $breadcrumbs->parent('currency.index'); $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => e($currency->name)]), route('currency.edit', [$currency->id])); } ); Breadcrumbs::register( - 'currency.delete', function(Generator $breadcrumbs, TransactionCurrency $currency) { + 'currency.delete', function (Generator $breadcrumbs, TransactionCurrency $currency) { $breadcrumbs->parent('currency.index'); $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => e($currency->name)]), route('currency.delete', [$currency->id])); } @@ -186,33 +186,33 @@ Breadcrumbs::register( // piggy banks Breadcrumbs::register( - 'piggy-banks.index', function(Generator $breadcrumbs) { + 'piggy-banks.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.piggyBanks'), route('piggy-banks.index')); } ); Breadcrumbs::register( - 'piggy-banks.create', function(Generator $breadcrumbs) { + 'piggy-banks.create', function (Generator $breadcrumbs) { $breadcrumbs->parent('piggy-banks.index'); $breadcrumbs->push(trans('breadcrumbs.newPiggyBank'), route('piggy-banks.create')); } ); Breadcrumbs::register( - 'piggy-banks.edit', function(Generator $breadcrumbs, PiggyBank $piggyBank) { + 'piggy-banks.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.edit', [$piggyBank->id])); } ); Breadcrumbs::register( - 'piggy-banks.delete', function(Generator $breadcrumbs, PiggyBank $piggyBank) { + 'piggy-banks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id])); } ); Breadcrumbs::register( - 'piggy-banks.show', function(Generator $breadcrumbs, PiggyBank $piggyBank) { + 'piggy-banks.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.index'); $breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', [$piggyBank->id])); @@ -221,7 +221,7 @@ Breadcrumbs::register( // preferences Breadcrumbs::register( - 'preferences', function(Generator $breadcrumbs) { + 'preferences', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences')); @@ -230,14 +230,14 @@ Breadcrumbs::register( // profile Breadcrumbs::register( - 'profile', function(Generator $breadcrumbs) { + 'profile', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile')); } ); Breadcrumbs::register( - 'change-password', function(Generator $breadcrumbs) { + 'change-password', function (Generator $breadcrumbs) { $breadcrumbs->parent('profile'); $breadcrumbs->push(trans('breadcrumbs.changePassword'), route('change-password')); @@ -246,33 +246,33 @@ Breadcrumbs::register( // bills Breadcrumbs::register( - 'bills.index', function(Generator $breadcrumbs) { + 'bills.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.bills'), route('bills.index')); } ); Breadcrumbs::register( - 'bills.create', function(Generator $breadcrumbs) { + 'bills.create', function (Generator $breadcrumbs) { $breadcrumbs->parent('bills.index'); $breadcrumbs->push(trans('breadcrumbs.newBill'), route('bills.create')); } ); Breadcrumbs::register( - 'bills.edit', function(Generator $breadcrumbs, Bill $bill) { + 'bills.edit', function (Generator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.show', $bill); $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => e($bill->name)]), route('bills.edit', [$bill->id])); } ); Breadcrumbs::register( - 'bills.delete', function(Generator $breadcrumbs, Bill $bill) { + 'bills.delete', function (Generator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.show', $bill); $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => e($bill->name)]), route('bills.delete', [$bill->id])); } ); Breadcrumbs::register( - 'bills.show', function(Generator $breadcrumbs, Bill $bill) { + 'bills.show', function (Generator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.index'); $breadcrumbs->push(e($bill->name), route('bills.show', [$bill->id])); @@ -281,7 +281,7 @@ Breadcrumbs::register( // reminders Breadcrumbs::register( - 'reminders.index', function(Generator $breadcrumbs) { + 'reminders.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.reminders'), route('reminders.index')); @@ -290,7 +290,7 @@ Breadcrumbs::register( // reminders Breadcrumbs::register( - 'reminders.show', function(Generator $breadcrumbs, Reminder $reminder) { + 'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) { $breadcrumbs->parent('reminders.index'); $breadcrumbs->push(trans('breadcrumbs.reminder', ['id' => e($reminder->id)]), route('reminders.show', [$reminder->id])); @@ -300,14 +300,14 @@ Breadcrumbs::register( // reports Breadcrumbs::register( - 'reports.index', function(Generator $breadcrumbs) { + 'reports.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.reports'), route('reports.index')); } ); Breadcrumbs::register( - 'reports.year', function(Generator $breadcrumbs, Carbon $date, $shared) { + 'reports.year', function (Generator $breadcrumbs, Carbon $date, $shared) { $breadcrumbs->parent('reports.index'); if ($shared) { $title = trans('breadcrumbs.yearly_report_shared', ['date' => $date->year]); @@ -319,7 +319,7 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'reports.month', function(Generator $breadcrumbs, Carbon $date, $shared) { + 'reports.month', function (Generator $breadcrumbs, Carbon $date, $shared) { $breadcrumbs->parent('reports.year', $date, $shared); if ($shared) { @@ -334,7 +334,7 @@ Breadcrumbs::register( // search Breadcrumbs::register( - 'search', function(Generator $breadcrumbs, $query) { + 'search', function (Generator $breadcrumbs, $query) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.searchResult', ['query' => e($query)]), route('search')); } @@ -342,33 +342,33 @@ Breadcrumbs::register( // transactions Breadcrumbs::register( - 'transactions.index', function(Generator $breadcrumbs, $what) { + 'transactions.index', function (Generator $breadcrumbs, $what) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); } ); Breadcrumbs::register( - 'transactions.create', function(Generator $breadcrumbs, $what) { + 'transactions.create', function (Generator $breadcrumbs, $what) { $breadcrumbs->parent('transactions.index', $what); $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', [$what])); } ); Breadcrumbs::register( - 'transactions.edit', function(Generator $breadcrumbs, TransactionJournal $journal) { + 'transactions.edit', function (Generator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.show', $journal); $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', [$journal->id])); } ); Breadcrumbs::register( - 'transactions.delete', function(Generator $breadcrumbs, TransactionJournal $journal) { + 'transactions.delete', function (Generator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.show', $journal); $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => e($journal->description)]), route('transactions.delete', [$journal->id])); } ); Breadcrumbs::register( - 'transactions.show', function(Generator $breadcrumbs, TransactionJournal $journal) { + 'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type)); $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id])); @@ -378,28 +378,28 @@ Breadcrumbs::register( // tags Breadcrumbs::register( - 'tags.index', function(Generator $breadcrumbs) { + 'tags.index', function (Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.tags'), route('tags.index')); } ); Breadcrumbs::register( - 'tags.create', function(Generator $breadcrumbs) { + 'tags.create', function (Generator $breadcrumbs) { $breadcrumbs->parent('tags.index'); $breadcrumbs->push(trans('breadcrumbs.createTag'), route('tags.create')); } ); Breadcrumbs::register( - 'tags.edit', function(Generator $breadcrumbs, Tag $tag) { + 'tags.edit', function (Generator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.show', $tag); $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', [$tag->id])); } ); Breadcrumbs::register( - 'tags.delete', function(Generator $breadcrumbs, Tag $tag) { + 'tags.delete', function (Generator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.show', $tag); $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', [$tag->id])); } @@ -407,7 +407,7 @@ Breadcrumbs::register( Breadcrumbs::register( - 'tags.show', function(Generator $breadcrumbs, Tag $tag) { + 'tags.show', function (Generator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.index'); $breadcrumbs->push(e($tag->tag), route('tags.show', [$tag->id])); } diff --git a/app/Models/Account.php b/app/Models/Account.php index c621afca8e..5453a136a1 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -11,22 +11,22 @@ use Watson\Validating\ValidatingTrait; * Class Account * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $user_id - * @property integer $account_type_id - * @property string $name - * @property boolean $active - * @property boolean $encrypted - * @property float $virtual_balance - * @property string $virtual_balance_encrypted + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property integer $account_type_id + * @property string $name + * @property boolean $active + * @property boolean $encrypted + * @property float $virtual_balance + * @property string $virtual_balance_encrypted * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta - * @property-read \FireflyIII\Models\AccountType $accountType - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks + * @property-read \FireflyIII\Models\AccountType $accountType + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions - * @property-read \FireflyIII\User $user + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUpdatedAt($value) @@ -40,12 +40,12 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalanceEncrypted($value) * @method static \FireflyIII\Models\Account accountTypeIn($types) * @method static \FireflyIII\Models\Account hasMetaValue($name, $value) - * @property boolean joinedAccountTypes - * @property mixed startBalance - * @property mixed endBalance - * @property mixed lastActivityDate - * @property mixed piggyBalance - * @property mixed difference + * @property boolean joinedAccountTypes + * @property mixed startBalance + * @property mixed endBalance + * @property mixed lastActivityDate + * @property mixed piggyBalance + * @property mixed difference * @propery mixed percentage * */ @@ -216,7 +216,7 @@ class Account extends Model { $joinName = str_replace('.', '_', $name); $query->leftJoin( - 'account_meta as ' . $joinName, function(JoinClause $join) use ($joinName, $name) { + 'account_meta as ' . $joinName, function (JoinClause $join) use ($joinName, $name) { $join->on($joinName . '.account_id', '=', 'accounts.id')->where($joinName . '.name', '=', $name); } ); diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index f3ec8dfb60..279fe60765 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -6,14 +6,14 @@ use Watson\Validating\ValidatingTrait; /** * Class AccountMeta * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $account_id - * @property string $name - * @property string $data + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $account_id + * @property string $name + * @property string $data * @property-read \FireflyIII\Models\Account $account * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereCreatedAt($value) @@ -33,7 +33,7 @@ class AccountMeta extends Model 'name' => 'required|between:1,100', 'data' => 'required' ]; - protected $table = 'account_meta'; + protected $table = 'account_meta'; /** * diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 10c10a1ef4..2148b9e961 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -5,13 +5,13 @@ use Illuminate\Database\Eloquent\Model; /** * Class AccountType * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $type - * @property boolean $editable + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $type + * @property boolean $editable * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereCreatedAt($value) diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 70fab19668..a1b048e99a 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -7,26 +7,26 @@ use Illuminate\Database\Eloquent\Model; * FireflyIII\Models\Bill * * @codeCoverageIgnore Class Bill - * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property string $name - * @property string $match - * @property float $amount_min - * @property string $amount_min_encrypted - * @property float $amount_max - * @property string $amount_max_encrypted - * @property \Carbon\Carbon $date - * @property boolean $active - * @property boolean $automatch - * @property string $repeat_freq - * @property integer $skip - * @property boolean $name_encrypted - * @property boolean $match_encrypted + * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property string $name + * @property string $match + * @property float $amount_min + * @property string $amount_min_encrypted + * @property float $amount_max + * @property string $amount_max_encrypted + * @property \Carbon\Carbon $date + * @property boolean $active + * @property boolean $automatch + * @property string $repeat_freq + * @property integer $skip + * @property boolean $name_encrypted + * @property boolean $match_encrypted * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUpdatedAt($value) @@ -44,14 +44,14 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereSkip($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value) - * @property mixed nextExpectedMatch - * @property mixed lastFoundMatch + * @property mixed nextExpectedMatch + * @property mixed lastFoundMatch */ class Bill extends Model { protected $fillable - = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active', ]; + = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active',]; protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted']; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 7de89a558e..02f1e46808 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -7,19 +7,19 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class Budget * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property integer $user_id - * @property boolean $active - * @property boolean $encrypted - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[] $budgetlimits + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $name + * @property integer $user_id + * @property boolean $active + * @property boolean $encrypted + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[] $budgetlimits * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUpdatedAt($value) diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 921f37d9db..42e72dc502 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -5,18 +5,18 @@ use Illuminate\Database\Eloquent\Model; /** * Class BudgetLimit * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $budget_id - * @property \Carbon\Carbon $startdate - * @property float $amount - * @property string $amount_encrypted - * @property boolean $repeats - * @property string $repeat_freq - * @property-read \FireflyIII\Models\Budget $budget + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $budget_id + * @property \Carbon\Carbon $startdate + * @property float $amount + * @property string $amount_encrypted + * @property boolean $repeats + * @property string $repeat_freq + * @property-read \FireflyIII\Models\Budget $budget * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\LimitRepetition[] $limitrepetitions * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereCreatedAt($value) diff --git a/app/Models/Category.php b/app/Models/Category.php index 3497fd9dc6..dc4f7cbbff 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -8,15 +8,15 @@ use Illuminate\Database\Eloquent\SoftDeletes; * Class Category * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property integer $user_id - * @property boolean $encrypted + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $name + * @property integer $user_id + * @property boolean $encrypted * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUpdatedAt($value) @@ -24,8 +24,8 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereName($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value) - * @property mixed spent - * @property mixed lastActivity + * @property mixed spent + * @property mixed lastActivity */ class Category extends Model { diff --git a/app/Models/Component.php b/app/Models/Component.php index ac43425ad7..84686751be 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -6,15 +6,15 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class Component * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id + * @property integer $id * @property \Carbon\Carbon $created_at * @property \Carbon\Carbon $updated_at * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property integer $user_id - * @property string $class + * @property string $name + * @property integer $user_id + * @property string $class * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUpdatedAt($value) diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 1adffb5e18..d5fd692dae 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -5,16 +5,16 @@ use Illuminate\Database\Eloquent\Model; /** * Class LimitRepetition * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $budget_limit_id - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $enddate - * @property float $amount - * @property string $amount_encrypted + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $budget_limit_id + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $enddate + * @property float $amount + * @property string $amount_encrypted * @property-read \FireflyIII\Models\BudgetLimit $budgetLimit * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereCreatedAt($value) diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index a08241d1a1..44c05fa63b 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -7,27 +7,27 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class PiggyBank * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $account_id - * @property string $name - * @property float $targetamount - * @property string $targetamount_encrypted - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $targetdate - * @property string $reminder - * @property integer $reminder_skip - * @property boolean $remind_me - * @property integer $order - * @property boolean $encrypted - * @property-read \FireflyIII\Models\Account $account + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $account_id + * @property string $name + * @property float $targetamount + * @property string $targetamount_encrypted + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $targetdate + * @property string $reminder + * @property integer $reminder_skip + * @property boolean $remind_me + * @property integer $order + * @property boolean $encrypted + * @property-read \FireflyIII\Models\Account $account * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereUpdatedAt($value) @@ -43,14 +43,14 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereOrder($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value) - * @property PiggyBankRepetition currentRep + * @property PiggyBankRepetition currentRep */ class PiggyBank extends Model { use SoftDeletes; protected $fillable - = ['name', 'account_id', 'order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me']; + = ['name', 'account_id', 'order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me']; protected $hidden = ['targetamount_encrypted', 'encrypted']; /** diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 2c03dadace..6b9bdceda1 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -5,17 +5,17 @@ use Illuminate\Database\Eloquent\Model; /** * Class PiggyBankEvent * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $piggy_bank_id - * @property integer $transaction_journal_id - * @property \Carbon\Carbon $date - * @property float $amount - * @property string $amount_encrypted - * @property-read \FireflyIII\Models\PiggyBank $piggyBank + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $piggy_bank_id + * @property integer $transaction_journal_id + * @property \Carbon\Carbon $date + * @property float $amount + * @property string $amount_encrypted + * @property-read \FireflyIII\Models\PiggyBank $piggyBank * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereCreatedAt($value) diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 699b712c25..a24066f2ee 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -7,16 +7,16 @@ use Illuminate\Database\Eloquent\Model; /** * Class PiggyBankRepetition * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $piggy_bank_id - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $targetdate - * @property float $currentamount - * @property string $currentamount_encrypted + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $piggy_bank_id + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $targetdate + * @property float $currentamount + * @property string $currentamount_encrypted * @property-read \FireflyIII\Models\PiggyBank $piggyBank * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCreatedAt($value) @@ -77,13 +77,13 @@ class PiggyBankRepetition extends Model $q->orWhereNull('startdate'); } ) - ->where( - function (EloquentBuilder $q) use ($date) { + ->where( + function (EloquentBuilder $q) use ($date) { - $q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00')); - $q->orWhereNull('targetdate'); - } - ); + $q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00')); + $q->orWhereNull('targetdate'); + } + ); } /** diff --git a/app/Models/Preference.php b/app/Models/Preference.php index a25fd850e6..3f22c4330d 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -6,16 +6,16 @@ use Illuminate\Database\Eloquent\Model; /** * Class Preference * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property string $name - * @property string $name_encrypted - * @property string $data - * @property string $data_encrypted + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property string $name + * @property string $name_encrypted + * @property string $data + * @property string $data_encrypted * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value) diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php index 99baf19835..b4797dae8d 100644 --- a/app/Models/Reminder.php +++ b/app/Models/Reminder.php @@ -8,21 +8,21 @@ use Illuminate\Database\Eloquent\Model; /** * Class Reminder * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $enddate - * @property boolean $active - * @property boolean $notnow - * @property integer $remindersable_id - * @property string $remindersable_type - * @property string $metadata - * @property boolean $encrypted - * @property-read \ $remindersable + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $enddate + * @property boolean $active + * @property boolean $notnow + * @property integer $remindersable_id + * @property string $remindersable_type + * @property string $metadata + * @property boolean $encrypted + * @property-read \ $remindersable * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereCreatedAt($value) @@ -38,13 +38,13 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereEncrypted($value) * @method static \FireflyIII\Models\Reminder onDates($start, $end) * @method static \FireflyIII\Models\Reminder today() - * @property string description + * @property string description */ class Reminder extends Model { - protected $fillable = ['user_id', 'startdate', 'metadata', 'enddate', 'active', 'notnow', 'remindersable_id', 'remindersable_type', ]; + protected $fillable = ['user_id', 'startdate', 'metadata', 'enddate', 'active', 'notnow', 'remindersable_id', 'remindersable_type',]; protected $hidden = ['encrypted']; /** @@ -124,7 +124,7 @@ class Reminder extends Model $today = new Carbon; return $query->where('startdate', '<=', $today->format('Y-m-d 00:00:00'))->where('enddate', '>=', $today->format('Y-m-d 00:00:00'))->where('active', 1) - ->where('notnow', 0); + ->where('notnow', 0); } /** diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 0fb6a9c876..7018ecc8fa 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -10,20 +10,20 @@ use Watson\Validating\ValidatingTrait; * Class Tag * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $deleted_at - * @property integer $user_id - * @property string $tag - * @property string $tagMode - * @property \Carbon\Carbon $date - * @property string $description - * @property float $latitude - * @property float $longitude - * @property integer $zoomLevel + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $deleted_at + * @property integer $user_id + * @property string $tag + * @property string $tagMode + * @property \Carbon\Carbon $date + * @property string $description + * @property float $latitude + * @property float $longitude + * @property integer $zoomLevel * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUpdatedAt($value) diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 827f6958e3..26ca48ef45 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -9,18 +9,18 @@ use Watson\Validating\ValidatingTrait; /** * Class Transaction * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $account_id - * @property integer $transaction_journal_id - * @property string $description - * @property float $amount - * @property string $amount_encrypted - * @property-read \FireflyIII\Models\Account $account + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $account_id + * @property integer $transaction_journal_id + * @property string $description + * @property float $amount + * @property string $amount_encrypted + * @property-read \FireflyIII\Models\Account $account * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereCreatedAt($value) @@ -33,8 +33,8 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmountEncrypted($value) * @method static \FireflyIII\Models\Transaction after($date) * @method static \FireflyIII\Models\Transaction before($date) - * @property mixed before - * @property mixed after + * @property mixed before + * @property mixed after */ class Transaction extends Model { diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index edc8797aca..27b21f36c3 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -6,15 +6,15 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionCurrency * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $code - * @property string $name - * @property string $symbol + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $code + * @property string $name + * @property string $symbol * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCreatedAt($value) diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index 9ef702872c..bb41749ca2 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -6,16 +6,16 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionGroup * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $user_id - * @property string $relation + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property string $relation * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUpdatedAt($value) diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 60f76d1cbe..2248c31229 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -1,6 +1,5 @@ addProperty($this->id); - $prop->addProperty('amount'); - if ($prop->has()) { - return $prop->get(); + $cache = new CacheProperties(); + $cache->addProperty($this->id); + $cache->addProperty('amount'); + if ($cache->has()) { + return $cache->get(); } - $md5 = $prop->getMd5(); $amount = '0'; @@ -158,7 +156,7 @@ class TransactionJournal extends Model * If the journal has tags, it gets complicated. */ if ($this->tags->count() == 0) { - Cache::forever($md5, $amount); + $cache->store($amount); return $amount; } @@ -173,7 +171,7 @@ class TransactionJournal extends Model foreach ($others as $other) { $amount = bcsub($amount, $other->actual_amount); } - Cache::forever($md5, $amount); + $cache->store($amount); return $amount; } @@ -181,7 +179,7 @@ class TransactionJournal extends Model // if this journal is part of an advancePayment AND the journal is a deposit, // then the journal amount is correcting a withdrawal, and the amount is zero: if ($advancePayment && $this->transactionType->type == 'Deposit') { - Cache::forever($md5, '0'); + $cache->store('0'); return '0'; } @@ -196,14 +194,14 @@ class TransactionJournal extends Model $transfer = $balancingAct->transactionJournals()->transactionTypes(['Transfer'])->first(); if ($transfer) { $amount = bcsub($amount, $transfer->actual_amount); - Cache::forever($md5, $amount); + $cache->store($amount); return $amount; } } // @codeCoverageIgnore } // @codeCoverageIgnore - Cache::forever($md5, $amount); + $cache->store($amount); return $amount; } diff --git a/app/Models/TransactionRelation.php b/app/Models/TransactionRelation.php index 056d61fdd8..aa4d3810af 100644 --- a/app/Models/TransactionRelation.php +++ b/app/Models/TransactionRelation.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class TransactionRelation * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models */ class TransactionRelation extends Model diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 697b0e8432..098d5bcfc7 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -6,13 +6,13 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionType * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $type + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $type * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereCreatedAt($value) diff --git a/app/Providers/BusServiceProvider.php b/app/Providers/BusServiceProvider.php index 1eef3684d7..dc2e86ac21 100644 --- a/app/Providers/BusServiceProvider.php +++ b/app/Providers/BusServiceProvider.php @@ -23,7 +23,7 @@ class BusServiceProvider extends ServiceProvider public function boot(Dispatcher $dispatcher) { $dispatcher->mapUsing( - function($command) { + function ($command) { return Dispatcher::simpleMapping( $command, 'FireflyIII\Commands', 'FireflyIII\Handlers\Commands' ); diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 3e01105bd5..9299f12fcb 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -52,12 +52,12 @@ class EventServiceProvider extends ServiceProvider $this->registerDeleteEvents(); $this->registerCreateEvents(); BudgetLimit::saved( - function(BudgetLimit $budgetLimit) { + function (BudgetLimit $budgetLimit) { $end = Navigation::addPeriod(clone $budgetLimit->startdate, $budgetLimit->repeat_freq, 0); $end->subDay(); $set = $budgetLimit->limitrepetitions()->where('startdate', $budgetLimit->startdate->format('Y-m-d'))->where('enddate', $end->format('Y-m-d')) - ->get(); + ->get(); if ($set->count() == 0) { $repetition = new LimitRepetition; $repetition->startdate = $budgetLimit->startdate; @@ -91,7 +91,7 @@ class EventServiceProvider extends ServiceProvider protected function registerDeleteEvents() { TransactionJournal::deleted( - function(TransactionJournal $journal) { + function (TransactionJournal $journal) { /** @var Transaction $transaction */ foreach ($journal->transactions()->get() as $transaction) { @@ -100,7 +100,7 @@ class EventServiceProvider extends ServiceProvider } ); PiggyBank::deleting( - function(PiggyBank $piggyBank) { + function (PiggyBank $piggyBank) { $reminders = $piggyBank->reminders()->get(); /** @var Reminder $reminder */ foreach ($reminders as $reminder) { @@ -110,7 +110,7 @@ class EventServiceProvider extends ServiceProvider ); Account::deleted( - function(Account $account) { + function (Account $account) { /** @var Transaction $transaction */ foreach ($account->transactions()->get() as $transaction) { @@ -131,7 +131,7 @@ class EventServiceProvider extends ServiceProvider // move this routine to a filter // in case of repeated piggy banks and/or other problems. PiggyBank::created( - function(PiggyBank $piggyBank) { + function (PiggyBank $piggyBank) { $repetition = new PiggyBankRepetition; $repetition->piggyBank()->associate($piggyBank); $repetition->startdate = is_null($piggyBank->startdate) ? null : $piggyBank->startdate; diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index ab5d1be9e5..eff456ea08 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -30,7 +30,7 @@ class FireflyServiceProvider extends ServiceProvider public function boot() { Validator::resolver( - function($translator, $data, $rules, $messages) { + function ($translator, $data, $rules, $messages) { return new FireflyValidator($translator, $data, $rules, $messages); } ); @@ -55,28 +55,28 @@ class FireflyServiceProvider extends ServiceProvider $this->app->bind( - 'preferences', function() { + 'preferences', function () { return new Preferences; } ); $this->app->bind( - 'navigation', function() { + 'navigation', function () { return new Navigation; } ); $this->app->bind( - 'amount', function() { + 'amount', function () { return new Amount; } ); $this->app->bind( - 'steam', function() { + 'steam', function () { return new Steam; } ); $this->app->bind( - 'expandedform', function() { + 'expandedform', function () { return new ExpandedForm; } ); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index b95fa98635..4e40f5bec8 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -44,7 +44,7 @@ class RouteServiceProvider extends ServiceProvider public function map(Router $router) { $router->group( - ['namespace' => $this->namespace], function($router) { + ['namespace' => $this->namespace], function ($router) { /** @noinspection PhpIncludeInspection */ require app_path('Http/routes.php'); } diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 352a89b756..15889ff5d7 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -4,7 +4,6 @@ namespace FireflyIII\Repositories\Account; use App; use Auth; -use Cache; use Carbon\Carbon; use Config; use DB; @@ -117,7 +116,6 @@ class AccountRepository implements AccountRepositoryInterface if ($cache->has()) { return $cache->get(); } - $md5 = $cache->getMd5(); if ($preference->data == []) { @@ -126,7 +124,7 @@ class AccountRepository implements AccountRepositoryInterface $accounts = Auth::user()->accounts()->whereIn('id', $preference->data)->orderBy('accounts.name', 'ASC')->get(['accounts.*']); } - Cache::forever($md5, $accounts); + $cache->store($accounts); return $accounts; } @@ -144,14 +142,13 @@ class AccountRepository implements AccountRepositoryInterface */ public function getFrontpageTransactions(Account $account, Carbon $start, Carbon $end) { - $prop = new CacheProperties(); - $prop->addProperty($account->id); - $prop->addProperty($start); - $prop->addProperty($end); - if ($prop->has()) { - return $prop->get(); + $cache = new CacheProperties(); + $cache->addProperty($account->id); + $cache->addProperty($start); + $cache->addProperty($end); + if ($cache->has()) { + return $cache->get(); } - $md5 = $prop->getMd5(); $set = Auth::user() ->transactionjournals() @@ -166,7 +163,7 @@ class AccountRepository implements AccountRepositoryInterface ->orderBy('transaction_journals.id', 'DESC') ->take(10) ->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']); - Cache::forever($md5, $set); + $cache->store($set); return $set; } @@ -238,7 +235,6 @@ class AccountRepository implements AccountRepositoryInterface if ($cache->has()) { return $cache->get(); } - $md5 = $cache->getMd5(); $ids = array_unique($ids); if (count($ids) > 0) { @@ -264,7 +260,7 @@ class AccountRepository implements AccountRepositoryInterface } ); - Cache::forever($md5, $accounts); + $cache->store($accounts); return $accounts; diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index efe12c2eab..bed615d4ad 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -79,10 +79,10 @@ class BudgetRepository implements BudgetRepositoryInterface /** @var Collection $repetitions */ return LimitRepetition:: leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00')) - ->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00')) - ->where('budget_limits.budget_id', $budget->id) - ->get(['limit_repetitions.*']); + ->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00')) + ->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00')) + ->where('budget_limits.budget_id', $budget->id) + ->get(['limit_repetitions.*']); } /** @@ -154,9 +154,9 @@ class BudgetRepository implements BudgetRepositoryInterface $setQuery = $budget->transactionJournals()->withRelevantData()->take($take)->offset($offset) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC'); + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC'); $countQuery = $budget->transactionJournals(); @@ -196,9 +196,9 @@ class BudgetRepository implements BudgetRepositoryInterface public function getLimitAmountOnDate(Budget $budget, Carbon $date) { $repetition = LimitRepetition::leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->where('limit_repetitions.startdate', $date->format('Y-m-d 00:00:00')) - ->where('budget_limits.budget_id', $budget->id) - ->first(['limit_repetitions.*']); + ->where('limit_repetitions.startdate', $date->format('Y-m-d 00:00:00')) + ->where('budget_limits.budget_id', $budget->id) + ->first(['limit_repetitions.*']); if ($repetition) { return floatval($repetition->amount); @@ -216,15 +216,15 @@ class BudgetRepository implements BudgetRepositoryInterface public function getWithoutBudget(Carbon $start, Carbon $end) { return Auth::user() - ->transactionjournals() - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->whereNull('budget_transaction_journal.id') - ->before($end) - ->after($start) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC') - ->get(['transaction_journals.*']); + ->transactionjournals() + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->whereNull('budget_transaction_journal.id') + ->before($end) + ->after($start) + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC') + ->get(['transaction_journals.*']); } /** @@ -236,22 +236,22 @@ class BudgetRepository implements BudgetRepositoryInterface public function getWithoutBudgetSum(Carbon $start, Carbon $end) { $noBudgetSet = Auth::user() - ->transactionjournals() - ->whereNotIn( - 'transaction_journals.id', function (QueryBuilder $query) use ($start, $end) { - $query - ->select('transaction_journals.id') - ->from('transaction_journals') - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00')) - ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00')) - ->whereNotNull('budget_transaction_journal.budget_id'); - } - ) - ->after($start) - ->before($end) - ->transactionTypes(['Withdrawal']) - ->get(['transaction_journals.*'])->sum('amount'); + ->transactionjournals() + ->whereNotIn( + 'transaction_journals.id', function (QueryBuilder $query) use ($start, $end) { + $query + ->select('transaction_journals.id') + ->from('transaction_journals') + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00')) + ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00')) + ->whereNotNull('budget_transaction_journal.budget_id'); + } + ) + ->after($start) + ->before($end) + ->transactionTypes(['Withdrawal']) + ->get(['transaction_journals.*'])->sum('amount'); return floatval($noBudgetSet) * -1; } @@ -272,18 +272,18 @@ class BudgetRepository implements BudgetRepositoryInterface } else { // get all journals in this month where the asset account is NOT shared. $sum = $budget->transactionjournals() - ->before($end) - ->after($start) - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') - ->leftJoin( - 'account_meta', function (JoinClause $join) { - $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole'); - } - ) - ->where('account_meta.data', '!=', '"sharedAsset"') - ->get(['transaction_journals.*']) - ->sum('amount'); + ->before($end) + ->after($start) + ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') + ->leftJoin( + 'account_meta', function (JoinClause $join) { + $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole'); + } + ) + ->where('account_meta.data', '!=', '"sharedAsset"') + ->get(['transaction_journals.*']) + ->sum('amount'); $sum = floatval($sum); } diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 5bf3dfd1b1..1fbb964e42 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -49,7 +49,7 @@ class CategoryRepository implements CategoryRepositoryInterface /** @var Collection $set */ $set = Auth::user()->categories()->orderBy('name', 'ASC')->get(); $set->sortBy( - function(Category $category) { + function (Category $category) { return $category->name; } ); @@ -67,16 +67,16 @@ class CategoryRepository implements CategoryRepositoryInterface public function getCategoriesAndExpensesCorrected($start, $end) { $set = Auth::user()->transactionjournals() - ->leftJoin( - 'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id' - ) - ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id') - ->before($end) - ->where('categories.user_id', Auth::user()->id) - ->after($start) - ->transactionTypes(['Withdrawal']) - ->groupBy('categories.id') - ->get(['categories.id as category_id', 'categories.encrypted as category_encrypted', 'categories.name', 'transaction_journals.*']); + ->leftJoin( + 'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id' + ) + ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id') + ->before($end) + ->where('categories.user_id', Auth::user()->id) + ->after($start) + ->transactionTypes(['Withdrawal']) + ->groupBy('categories.id') + ->get(['categories.id as category_id', 'categories.encrypted as category_encrypted', 'categories.name', 'transaction_journals.*']); $result = []; foreach ($set as $entry) { @@ -143,10 +143,10 @@ class CategoryRepository implements CategoryRepositoryInterface public function getLatestActivity(Category $category) { $latest = $category->transactionjournals() - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC') - ->first(); + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC') + ->first(); if ($latest) { return $latest->date; } @@ -163,15 +163,15 @@ class CategoryRepository implements CategoryRepositoryInterface public function getWithoutCategory(Carbon $start, Carbon $end) { return Auth::user() - ->transactionjournals() - ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->whereNull('category_transaction_journal.id') - ->before($end) - ->after($start) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC') - ->get(['transaction_journals.*']); + ->transactionjournals() + ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->whereNull('category_transaction_journal.id') + ->before($end) + ->after($start) + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC') + ->get(['transaction_journals.*']); } /** @@ -190,8 +190,8 @@ class CategoryRepository implements CategoryRepositoryInterface // always ignore transfers between accounts! $sum = floatval( $category->transactionjournals() - ->transactionTypes(['Withdrawal']) - ->before($end)->after($start)->get(['transaction_journals.*'])->sum('amount') + ->transactionTypes(['Withdrawal']) + ->before($end)->after($start)->get(['transaction_journals.*'])->sum('amount') ); } else { @@ -204,7 +204,7 @@ class CategoryRepository implements CategoryRepositoryInterface ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin( - 'account_meta', function(JoinClause $join) { + 'account_meta', function (JoinClause $join) { $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole'); } ) diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index a7fb12f50a..965ad63b43 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -111,7 +111,7 @@ class JournalRepository implements JournalRepositoryInterface */ public function getJournalsOfTypes(array $types, $offset, $page) { - $set = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset) + $set = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset) ->orderBy('date', 'DESC') ->orderBy('order', 'ASC') ->orderBy('id', 'DESC') diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 3db4693284..78c8d80b2d 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -102,7 +102,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface public function setOrder($id, $order) { $piggyBank = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', Auth::user()->id) - ->where('piggy_banks.id', $id)->first(['piggy_banks.*']); + ->where('piggy_banks.id', $id)->first(['piggy_banks.*']); if ($piggyBank) { $piggyBank->order = $order; $piggyBank->save(); diff --git a/app/Repositories/Reminder/ReminderRepository.php b/app/Repositories/Reminder/ReminderRepository.php index ae04c59c66..8db6d0ada0 100644 --- a/app/Repositories/Reminder/ReminderRepository.php +++ b/app/Repositories/Reminder/ReminderRepository.php @@ -36,14 +36,14 @@ class ReminderRepository implements ReminderRepositoryInterface $today = new Carbon; // active reminders: $active = Auth::user()->reminders() - ->where('notnow', 0) - ->where('active', 1) - ->where('startdate', '<=', $today->format('Y-m-d 00:00:00')) - ->where('enddate', '>=', $today->format('Y-m-d 00:00:00')) - ->get(); + ->where('notnow', 0) + ->where('active', 1) + ->where('startdate', '<=', $today->format('Y-m-d 00:00:00')) + ->where('enddate', '>=', $today->format('Y-m-d 00:00:00')) + ->get(); $active->each( - function(Reminder $reminder) { + function (Reminder $reminder) { $reminder->description = $this->helper->getReminderText($reminder); } ); @@ -58,11 +58,11 @@ class ReminderRepository implements ReminderRepositoryInterface public function getDismissedReminders() { $dismissed = Auth::user()->reminders() - ->where('notnow', 1) - ->get(); + ->where('notnow', 1) + ->get(); $dismissed->each( - function(Reminder $reminder) { + function (Reminder $reminder) { $reminder->description = $this->helper->getReminderText($reminder); } ); @@ -77,18 +77,18 @@ class ReminderRepository implements ReminderRepositoryInterface { $expired = Auth::user()->reminders() - ->where('notnow', 0) - ->where('active', 1) - ->where( - function (Builder $q) { - $today = new Carbon; - $q->where('startdate', '>', $today->format('Y-m-d 00:00:00')); - $q->orWhere('enddate', '<', $today->format('Y-m-d 00:00:00')); - } - )->get(); + ->where('notnow', 0) + ->where('active', 1) + ->where( + function (Builder $q) { + $today = new Carbon; + $q->where('startdate', '>', $today->format('Y-m-d 00:00:00')); + $q->orWhere('enddate', '<', $today->format('Y-m-d 00:00:00')); + } + )->get(); $expired->each( - function(Reminder $reminder) { + function (Reminder $reminder) { $reminder->description = $this->helper->getReminderText($reminder); } ); @@ -106,7 +106,7 @@ class ReminderRepository implements ReminderRepositoryInterface ->get(); $inactive->each( - function(Reminder $reminder) { + function (Reminder $reminder) { $reminder->description = $this->helper->getReminderText($reminder); } ); diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 358eeac892..252a08a2a9 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -109,7 +109,7 @@ class TagRepository implements TagRepositoryInterface /** @var Collection $tags */ $tags = Auth::user()->tags()->get(); $tags->sortBy( - function(Tag $tag) { + function (Tag $tag) { return $tag->tag; } ); diff --git a/app/Services/Registrar.php b/app/Services/Registrar.php index 6f9ffa729a..5f69c7ba24 100644 --- a/app/Services/Registrar.php +++ b/app/Services/Registrar.php @@ -41,9 +41,9 @@ class Registrar implements RegistrarContract { return Validator::make( $data, [ - 'email' => 'required|email|max:255|unique:users', - 'password' => 'required|confirmed|min:6', - ] + 'email' => 'required|email|max:255|unique:users', + 'password' => 'required|confirmed|min:6', + ] ); } diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php index f7f7018b44..9c3cffd501 100644 --- a/app/Support/CacheProperties.php +++ b/app/Support/CacheProperties.php @@ -99,4 +99,12 @@ class CacheProperties $this->md5 = md5($this->md5); } + + /** + * @param $data + */ + public function store($data) + { + Cache::forever($this->md5, $data); + } } \ No newline at end of file diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index f2dd884673..542cd669f3 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -118,7 +118,7 @@ class Navigation 'year' => 'endOfYear', 'yearly' => 'endOfYear', ]; - $specials = ['mont', 'monthly']; + $specials = ['mont', 'monthly']; $currentEnd = clone $theCurrentEnd; @@ -270,7 +270,7 @@ class Navigation '3M' => 'lastOfQuarter', '1Y' => 'endOfYear', ]; - $end = clone $start; + $end = clone $start; if (isset($functionMap[$range])) { $function = $functionMap[$range]; diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index d5ddc4f181..5d24ca6818 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -4,6 +4,7 @@ namespace FireflyIII\Support; use Auth; use FireflyIII\Models\Preference; + /** * Class Preferences * @@ -21,14 +22,6 @@ class Preferences return md5($preference); } - /** - * @return bool - */ - public function mark() { - $this->set('lastActivity',microtime()); - return true; - } - /** * @param $name * @param null $default @@ -85,4 +78,14 @@ class Preferences return $pref; } + + /** + * @return bool + */ + public function mark() + { + $this->set('lastActivity', microtime()); + + return true; + } } diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index 7b1e0f42b5..a493ad0741 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -25,7 +25,7 @@ class Search implements SearchInterface public function searchAccounts(array $words) { return Auth::user()->accounts()->with('accounttype')->where( - function(EloquentBuilder $q) use ($words) { + function (EloquentBuilder $q) use ($words) { foreach ($words as $word) { $q->orWhere('name', 'LIKE', '%' . e($word) . '%'); } @@ -43,7 +43,7 @@ class Search implements SearchInterface /** @var Collection $set */ $set = Auth::user()->budgets()->get(); $newSet = $set->filter( - function(Budget $b) use ($words) { + function (Budget $b) use ($words) { $found = 0; foreach ($words as $word) { if (!(strpos(strtolower($b->name), strtolower($word)) === false)) { @@ -68,7 +68,7 @@ class Search implements SearchInterface /** @var Collection $set */ $set = Auth::user()->categories()->get(); $newSet = $set->filter( - function(Category $c) use ($words) { + function (Category $c) use ($words) { $found = 0; foreach ($words as $word) { if (!(strpos(strtolower($c->name), strtolower($word)) === false)) { @@ -103,7 +103,7 @@ class Search implements SearchInterface { // decrypted transaction journals: $decrypted = Auth::user()->transactionjournals()->withRelevantData()->where('encrypted', 0)->where( - function(EloquentBuilder $q) use ($words) { + function (EloquentBuilder $q) use ($words) { foreach ($words as $word) { $q->orWhere('description', 'LIKE', '%' . e($word) . '%'); } @@ -113,7 +113,7 @@ class Search implements SearchInterface // encrypted $all = Auth::user()->transactionjournals()->withRelevantData()->where('encrypted', 1)->get(); $set = $all->filter( - function(TransactionJournal $journal) use ($words) { + function (TransactionJournal $journal) use ($words) { foreach ($words as $word) { $haystack = strtolower($journal->description); $word = strtolower($word); @@ -129,7 +129,7 @@ class Search implements SearchInterface $filtered = $set->merge($decrypted); $filtered->sortBy( - function(TransactionJournal $journal) { + function (TransactionJournal $journal) { return intval($journal->date->format('U')); } ); diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 5e3804864b..234559844b 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -2,7 +2,6 @@ namespace FireflyIII\Support; -use Cache; use Carbon\Carbon; use FireflyIII\Models\Account; @@ -25,15 +24,14 @@ class Steam { // abuse chart properties: - $properties = new CacheProperties; - $properties->addProperty($account->id); - $properties->addProperty('balance'); - $properties->addProperty($date); - $properties->addProperty($ignoreVirtualBalance); - if ($properties->has()) { - return $properties->get(); + $cache = new CacheProperties; + $cache->addProperty($account->id); + $cache->addProperty('balance'); + $cache->addProperty($date); + $cache->addProperty($ignoreVirtualBalance); + if ($cache->has()) { + return $cache->get(); } - $md5 = $properties->getMd5(); // find the first known transaction on this account: @@ -57,7 +55,7 @@ class Steam if (!$ignoreVirtualBalance) { $balance = bcadd($balance, $account->virtual_balance); } - Cache::forever($md5, round($balance, 2)); + $cache->store(round($balance, 2)); return round($balance, 2); } diff --git a/app/Support/Twig/Budget.php b/app/Support/Twig/Budget.php index 2424f8b0c8..f1ce2ff4da 100644 --- a/app/Support/Twig/Budget.php +++ b/app/Support/Twig/Budget.php @@ -19,18 +19,18 @@ class Budget extends Twig_Extension */ public function getFunctions() { - $functions = []; + $functions = []; $functions[] = new Twig_SimpleFunction( - 'spentInRepetitionCorrected', function(LimitRepetition $repetition) { + 'spentInRepetitionCorrected', function (LimitRepetition $repetition) { $sum = Auth::user()->transactionjournals() - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id') - ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->before($repetition->enddate) - ->after($repetition->startdate) - ->where('limit_repetitions.id', '=', $repetition->id) - ->get(['transaction_journals.*'])->sum('amount'); + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id') + ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') + ->before($repetition->enddate) + ->after($repetition->startdate) + ->where('limit_repetitions.id', '=', $repetition->id) + ->get(['transaction_journals.*'])->sum('amount'); return floatval($sum); } diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index 81ea504928..c1bcf09e16 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -31,31 +31,31 @@ class General extends Twig_Extension $filters = []; $filters[] = new Twig_SimpleFilter( - 'formatAmount', function($string) { + 'formatAmount', function ($string) { return App::make('amount')->format($string); }, ['is_safe' => ['html']] ); $filters[] = new Twig_SimpleFilter( - 'formatTransaction', function(Transaction $transaction) { + 'formatTransaction', function (Transaction $transaction) { return App::make('amount')->formatTransaction($transaction); }, ['is_safe' => ['html']] ); $filters[] = new Twig_SimpleFilter( - 'formatAmountPlain', function($string) { + 'formatAmountPlain', function ($string) { return App::make('amount')->format($string, false); }, ['is_safe' => ['html']] ); $filters[] = new Twig_SimpleFilter( - 'formatJournal', function($journal) { + 'formatJournal', function ($journal) { return App::make('amount')->formatJournal($journal); }, ['is_safe' => ['html']] ); $filters[] = new Twig_SimpleFilter( - 'balance', function(Account $account = null) { + 'balance', function (Account $account = null) { if (is_null($account)) { return 'NULL'; } @@ -67,7 +67,7 @@ class General extends Twig_Extension // should be a function but OK $filters[] = new Twig_SimpleFilter( - 'getAccountRole', function($name) { + 'getAccountRole', function ($name) { return Config::get('firefly.accountRoles.' . $name); } ); @@ -83,32 +83,32 @@ class General extends Twig_Extension $functions = []; $functions[] = new Twig_SimpleFunction( - 'getCurrencyCode', function() { + 'getCurrencyCode', function () { return App::make('amount')->getCurrencyCode(); } ); $functions[] = new Twig_SimpleFunction( - 'getCurrencySymbol', function() { + 'getCurrencySymbol', function () { return App::make('amount')->getCurrencySymbol(); } ); $functions[] = new Twig_SimpleFunction( - 'phpdate', function($str) { + 'phpdate', function ($str) { return date($str); } ); $functions[] = new Twig_SimpleFunction( - 'env', function($name, $default) { + 'env', function ($name, $default) { return env($name, $default); } ); $functions[] = new Twig_SimpleFunction( - 'activeRoute', function($context) { + 'activeRoute', function ($context) { $args = func_get_args(); $route = $args[1]; $what = isset($args[2]) ? $args[2] : false; diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index 7e53787fde..293a2a5a34 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -4,7 +4,6 @@ namespace FireflyIII\Support\Twig; use App; -use Cache; use FireflyIII\Models\TransactionJournal; use FireflyIII\Support\CacheProperties; use Twig_Extension; @@ -30,13 +29,12 @@ class Journal extends Twig_Extension $filters[] = new Twig_SimpleFilter( 'typeIcon', function (TransactionJournal $journal) { - $prop = new CacheProperties(); - $prop->addProperty($journal->id); - $prop->addProperty('typeIcon'); - if ($prop->has()) { - return $prop->get(); + $cache = new CacheProperties(); + $cache->addProperty($journal->id); + $cache->addProperty('typeIcon'); + if ($cache->has()) { + return $cache->get(); } - $md5 = $prop->getMd5(); $type = $journal->transactionType->type; @@ -57,7 +55,7 @@ class Journal extends Twig_Extension $txt = ''; break; } - Cache::forever($md5, $txt); + $cache->store($txt); return $txt; diff --git a/app/Support/Twig/PiggyBank.php b/app/Support/Twig/PiggyBank.php index f178aa6316..6ff4aafe90 100644 --- a/app/Support/Twig/PiggyBank.php +++ b/app/Support/Twig/PiggyBank.php @@ -22,7 +22,7 @@ class PiggyBank extends Twig_Extension $functions = []; $functions[] = new Twig_SimpleFunction( - 'currentRelevantRepAmount', function(PB $piggyBank) { + 'currentRelevantRepAmount', function (PB $piggyBank) { return $piggyBank->currentRelevantRep()->currentamount; } ); diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php index d91c1816e6..1cb3314cf2 100644 --- a/app/Support/Twig/Translation.php +++ b/app/Support/Twig/Translation.php @@ -21,7 +21,7 @@ class Translation extends Twig_Extension $filters = []; $filters[] = new Twig_SimpleFilter( - '_', function($name) { + '_', function ($name) { return trans('firefly.' . $name); diff --git a/app/User.php b/app/User.php index 0207cc0fad..f1c7774829 100644 --- a/app/User.php +++ b/app/User.php @@ -11,20 +11,20 @@ use Zizaco\Entrust\Traits\EntrustUserTrait; * Class User * * @package FireflyIII - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $email - * @property string $password - * @property string $reset - * @property string $remember_token - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[] $preferences - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $email + * @property string $password + * @property string $reset + * @property string $remember_token + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[] $preferences + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereCreatedAt($value)