IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Scrutinizer Auto-Fixes

Browse Source 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
This commit is contained in:
Scrutinizer Auto-Fixer 2015-06-05 08:40:26 +00:00
parent 4b7e1ae1c6
commit 58859eb35a
49 changed files with 363 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Collection/Bill.php
View File

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

2
app/Helpers/Collection/Category.php
View File

@ -55,7 +55,7 @@ class Category
public function getCategories()
{
$this->categories->sortByDesc(
function (CategoryModel $category) {
function(CategoryModel $category) {
return $category->spent;
}
);

2
app/Helpers/Collection/Expense.php
View File

@ -67,7 +67,7 @@ class Expense
public function getExpenses()
{
$this->expenses->sortByDesc(
function (stdClass $object) {
function(stdClass $object) {
return $object->amount;
}
);

2
app/Helpers/Collection/Income.php
View File

@ -68,7 +68,7 @@ class Income
public function getIncomes()
{
$this->incomes->sortByDesc(
function (stdClass $object) {
function(stdClass $object) {
return $object->amount;
}
);

2
app/Helpers/Report/ReportHelper.php
View File

@ -66,7 +66,7 @@ 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;
}

22
app/Helpers/Report/ReportQuery.php
View File

@ -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,14 +61,14 @@ 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;
}
@ -111,7 +111,7 @@ class ReportQuery implements ReportQueryInterface
}
$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
@ -152,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"');
}
@ -179,14 +179,14 @@ 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;
}

6
app/Http/Controllers/AccountController.php
View File

@ -156,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()));
@ -201,7 +201,7 @@ 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')),
];
@ -240,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'),

2
app/Http/Controllers/Auth/AuthController.php
View File

@ -95,7 +95,7 @@ class AuthController extends Controller
// send email.
Mail::send(
'emails.registered', [], function (Message $message) use ($email) {
'emails.registered', [], function(Message $message) use ($email) {
$message->to($email, $email)->subject('Welcome to Firefly III!');
}
);

2
app/Http/Controllers/BillController.php
View File

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

2
app/Http/Controllers/CategoryController.php
View File

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

2
app/Http/Controllers/Chart/CategoryController.php
View File

@ -92,7 +92,7 @@ class CategoryController extends Controller
// sort by callback:
uasort(
$set,
function ($left, $right) {
function($left, $right) {
if ($left['sum'] == $right['sum']) {
return 0;
}

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

@ -99,8 +99,8 @@ class NewUserController extends Controller
$creditCard = $repository->store($creditAccount);
// store meta for CC:
AccountMeta::create(['name' => 'ccType', 'data' => 'monthlyFull', 'account_id' => $creditCard->id,]);
AccountMeta::create(['name' => 'ccMonthlyPaymentDate', 'data' => Carbon::now()->year . '-01-01', 'account_id' => $creditCard->id,]);
AccountMeta::create(['name' => 'ccType', 'data' => 'monthlyFull', 'account_id' => $creditCard->id, ]);
AccountMeta::create(['name' => 'ccMonthlyPaymentDate', 'data' => Carbon::now()->year . '-01-01', 'account_id' => $creditCard->id, ]);
}
Session::flash('success', 'New account(s) created!');

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

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

2
app/Http/Middleware/Reminders.php
View File

@ -83,7 +83,7 @@ class Reminders
// get and list active reminders:
$reminders = $user->reminders()->today()->get();
$reminders->each(
function (Reminder $reminder) use ($helper) {
function(Reminder $reminder) use ($helper) {
$reminder->description = $helper->getReminderText($reminder);
}
);

102
app/Http/breadcrumbs.php
View File

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

24
app/Http/routes.php
View File

@ -15,7 +15,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
// models
Route::bind(
'account',
function ($value) {
function($value) {
if (Auth::check()) {
$object = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('account_types.editable', 1)
@ -31,7 +31,7 @@ Route::bind(
);
Route::bind(
'tj', function ($value) {
'tj', function($value) {
if (Auth::check()) {
$object = TransactionJournal::where('id', $value)->where('user_id', Auth::user()->id)->first();
if ($object) {
@ -44,7 +44,7 @@ Route::bind(
);
Route::bind(
'currency', function ($value) {
'currency', function($value) {
if (Auth::check()) {
$object = TransactionCurrency::find($value);
if ($object) {
@ -56,7 +56,7 @@ Route::bind(
);
Route::bind(
'bill', function ($value) {
'bill', function($value) {
if (Auth::check()) {
$object = Bill::where('id', $value)->where('user_id', Auth::user()->id)->first();
if ($object) {
@ -69,7 +69,7 @@ Route::bind(
);
Route::bind(
'budget', function ($value) {
'budget', function($value) {
if (Auth::check()) {
$object = Budget::where('id', $value)->where('user_id', Auth::user()->id)->first();
if ($object) {
@ -82,7 +82,7 @@ Route::bind(
);
Route::bind(
'reminder', function ($value) {
'reminder', function($value) {
if (Auth::check()) {
$object = Reminder::where('id', $value)->where('user_id', Auth::user()->id)->first();
if ($object) {
@ -95,7 +95,7 @@ Route::bind(
);
Route::bind(
'limitrepetition', function ($value) {
'limitrepetition', function($value) {
if (Auth::check()) {
$object = LimitRepetition::where('limit_repetitions.id', $value)
->leftjoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id')
@ -112,7 +112,7 @@ Route::bind(
);
Route::bind(
'piggyBank', function ($value) {
'piggyBank', function($value) {
if (Auth::check()) {
$object = PiggyBank::where('piggy_banks.id', $value)
->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
@ -128,7 +128,7 @@ Route::bind(
);
Route::bind(
'category', function ($value) {
'category', function($value) {
if (Auth::check()) {
$object = Category::where('id', $value)->where('user_id', Auth::user()->id)->first();
if ($object) {
@ -142,7 +142,7 @@ Route::bind(
/** @noinspection PhpUnusedParameterInspection */
Route::bind(
'reminder', function ($value) {
'reminder', function($value) {
if (Auth::check()) {
/** @var \FireflyIII\Models\Reminder $object */
$object = Reminder::find($value);
@ -158,7 +158,7 @@ Route::bind(
);
Route::bind(
'tag', function ($value) {
'tag', function($value) {
if (Auth::check()) {
$object = Tag::where('id', $value)->where('user_id', Auth::user()->id)->first();
if ($object) {
@ -187,7 +187,7 @@ Route::controllers(
* Home Controller
*/
Route::group(
['middleware' => ['auth', 'range', 'reminders']], function () {
['middleware' => ['auth', 'range', 'reminders']], function() {
Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']);
Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']);

2
app/Models/Account.php
View File

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

2
app/Models/Bill.php
View File

@ -51,7 +51,7 @@ 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'];

2
app/Models/Reminder.php
View File

@ -44,7 +44,7 @@ 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'];
/**

2
app/Models/TransactionJournal.php
View File

@ -415,7 +415,7 @@ class TransactionJournal extends Model
public function scopeWithRelevantData(EloquentBuilder $query)
{
$query->with(
['transactions' => function (HasMany $q) {
['transactions' => function(HasMany $q) {
$q->orderBy('amount', 'ASC');
}, 'transactiontype', 'transactioncurrency', 'budgets', 'categories', 'transactions.account.accounttype', 'bill', 'budgets', 'categories']
);

2
app/Providers/BusServiceProvider.php
View File

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

10
app/Providers/EventServiceProvider.php
View File

@ -52,7 +52,7 @@ 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();
@ -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;

12
app/Providers/FireflyServiceProvider.php
View File

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

2
app/Providers/RouteServiceProvider.php
View File

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

10
app/Repositories/Account/AccountRepository.php
View File

@ -65,7 +65,7 @@ class AccountRepository implements AccountRepositoryInterface
public function getAccounts(array $types)
{
$result = Auth::user()->accounts()->with(
['accountmeta' => function (HasMany $query) {
['accountmeta' => function(HasMany $query) {
$query->where('name', 'accountRole');
}]
)->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*'])->sortBy('name');
@ -242,7 +242,7 @@ class AccountRepository implements AccountRepositoryInterface
}
$accounts->each(
function (Account $account) use ($start, $end) {
function(Account $account) use ($start, $end) {
$account->startBalance = Steam::balance($account, $start, true);
$account->endBalance = Steam::balance($account, $end, true);
$account->piggyBalance = 0;
@ -282,7 +282,7 @@ class AccountRepository implements AccountRepositoryInterface
$end = clone Session::get('end', new Carbon);
$accounts->each(
function (Account $account) use ($start, $end) {
function(Account $account) use ($start, $end) {
$account->startBalance = Steam::balance($account, $start);
$account->endBalance = Steam::balance($account, $end);
@ -321,7 +321,7 @@ class AccountRepository implements AccountRepositoryInterface
public function getTransfersInRange(Account $account, Carbon $start, Carbon $end)
{
$set = TransactionJournal::whereIn(
'id', function (Builder $q) use ($account, $start, $end) {
'id', function(Builder $q) use ($account, $start, $end) {
$q->select('transaction_journals.id')
->from('transactions')
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
@ -335,7 +335,7 @@ class AccountRepository implements AccountRepositoryInterface
}
)->get();
$filtered = $set->filter(
function (TransactionJournal $journal) use ($account) {
function(TransactionJournal $journal) use ($account) {
if ($journal->destination_account->id == $account->id) {
return $journal;
}

1
app/Repositories/Budget/BudgetRepository.php
View File

@ -9,7 +9,6 @@ use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\LimitRepetition;
use FireflyIII\Repositories\Shared\ComponentRepository;
use Illuminate\Database\Query\Builder as QueryBuilder;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Input;

2
app/Repositories/Category/CategoryRepository.php
View File

@ -49,7 +49,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
/** @var Collection $set */
$set = Auth::user()->categories()->orderBy('name', 'ASC')->get();
$set->sortBy(
function (Category $category) {
function(Category $category) {
return $category->name;
}
);

8
app/Repositories/Reminder/ReminderRepository.php
View File

@ -43,7 +43,7 @@ class ReminderRepository implements ReminderRepositoryInterface
->get();
$active->each(
function (Reminder $reminder) {
function(Reminder $reminder) {
$reminder->description = $this->helper->getReminderText($reminder);
}
);
@ -62,7 +62,7 @@ class ReminderRepository implements ReminderRepositoryInterface
->get();
$dismissed->each(
function (Reminder $reminder) {
function(Reminder $reminder) {
$reminder->description = $this->helper->getReminderText($reminder);
}
);
@ -88,7 +88,7 @@ class ReminderRepository implements ReminderRepositoryInterface
)->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);
}
);

2
app/Repositories/Tag/TagRepository.php
View File

@ -110,7 +110,7 @@ class TagRepository implements TagRepositoryInterface
/** @var Collection $tags */
$tags = Auth::user()->tags()->get();
$tags->sortBy(
function (Tag $tag) {
function(Tag $tag) {
return $tag->tag;
}
);

2
app/Support/CacheProperties.php
View File

@ -94,7 +94,7 @@ class CacheProperties
if (is_array($property)) {
$this->md5 .= print_r($property, true);
}
$this->md5 .= (string)$property;
$this->md5 .= (string) $property;
}
$this->md5 = md5($this->md5);

6
app/Support/Preferences.php
View File

@ -24,8 +24,8 @@ class Preferences
}
/**
* @param $name
* @param null $default
* @param string $name
* @param string $default
*
* @return null|\FireflyIII\Models\Preference
*/
@ -56,7 +56,7 @@ class Preferences
/**
* @param $name
* @param $value
* @param string $value
*
* @return Preference
*/

12
app/Support/Search/Search.php
View File

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

2
app/Support/Twig/Budget.php
View File

@ -21,7 +21,7 @@ class Budget extends Twig_Extension
{
$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')

22
app/Support/Twig/General.php
View File

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

6
app/Support/Twig/Journal.php
View File

@ -27,7 +27,7 @@ class Journal extends Twig_Extension
$filters = [];
$filters[] = new Twig_SimpleFilter(
'typeIcon', function (TransactionJournal $journal) {
'typeIcon', function(TransactionJournal $journal) {
$cache = new CacheProperties();
$cache->addProperty($journal->id);
@ -76,7 +76,7 @@ class Journal extends Twig_Extension
$functions = [];
$functions[] = new Twig_SimpleFunction(
'invalidJournal', function (TransactionJournal $journal) {
'invalidJournal', function(TransactionJournal $journal) {
if (!isset($journal->transactions[1]) || !isset($journal->transactions[0])) {
return true;
}
@ -86,7 +86,7 @@ class Journal extends Twig_Extension
);
$functions[] = new Twig_SimpleFunction(
'relevantTags', function (TransactionJournal $journal) {
'relevantTags', function(TransactionJournal $journal) {
if ($journal->tags->count() == 0) {
return App::make('amount')->formatJournal($journal);
}

2
app/Support/Twig/PiggyBank.php
View File

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

2
app/Support/Twig/Translation.php
View File

@ -21,7 +21,7 @@ class Translation extends Twig_Extension
$filters = [];
$filters[] = new Twig_SimpleFilter(
'_', function ($name) {
'_', function($name) {
return trans('firefly.' . $name);