From 1b4d55cca437d6781a8ab93652e660816301d12e Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 15 Dec 2016 21:35:33 +0100 Subject: [PATCH] Fix various code style issues. --- .../Controllers/Transaction/ConvertController.php | 12 ++++++------ app/Models/Account.php | 4 ++-- app/Models/Budget.php | 4 ++-- app/Models/Category.php | 4 ++-- app/Models/LimitRepetition.php | 2 +- app/Models/Tag.php | 4 ++-- app/Models/TransactionJournal.php | 2 +- app/Models/TransactionType.php | 8 ++++---- app/Repositories/Budget/BudgetRepository.php | 3 +-- app/Repositories/PiggyBank/PiggyBankRepository.php | 3 +-- app/Support/Steam.php | 3 +-- app/Validation/FireflyValidator.php | 3 +-- 12 files changed, 24 insertions(+), 28 deletions(-) diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index c06fa91ff4..f83a317229 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -172,14 +172,14 @@ class ConvertController extends Controller switch ($joined) { default: throw new FireflyException('Cannot handle ' . $joined); - case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: # one + case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: // one $destination = $sourceAccount; break; - case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: # two + case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: // two $destination = $accountRepository->find(intval($data['destination_account_asset'])); break; - case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: # three - case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: #five + case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: // three + case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: // five $data = [ 'name' => $data['destination_account_expense'], 'accountType' => 'expense', @@ -189,8 +189,8 @@ class ConvertController extends Controller ]; $destination = $accountRepository->store($data); break; - case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: # four - case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: #six + case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: // four + case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: // six $destination = $destinationAccount; break; } diff --git a/app/Models/Account.php b/app/Models/Account.php index c62c558e8e..bc06e9b665 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -61,7 +61,7 @@ class Account extends Model public static function firstOrCreateEncrypted(array $fields) { // everything but the name: - $query = Account::orderBy('id'); + $query = self::orderBy('id'); $search = $fields; unset($search['name'], $search['iban']); @@ -81,7 +81,7 @@ class Account extends Model } // create it! - $account = Account::create($fields); + $account = self::create($fields); return $account; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index c20df153b0..8d073fa561 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -43,7 +43,7 @@ class Budget extends Model public static function firstOrCreateEncrypted(array $fields) { // everything but the name: - $query = Budget::orderBy('id'); + $query = self::orderBy('id'); $search = $fields; unset($search['name']); foreach ($search as $name => $value) { @@ -57,7 +57,7 @@ class Budget extends Model } } // create it! - $budget = Budget::create($fields); + $budget = self::create($fields); return $budget; diff --git a/app/Models/Category.php b/app/Models/Category.php index e56adb3f2a..b80e03d1b7 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -42,7 +42,7 @@ class Category extends Model public static function firstOrCreateEncrypted(array $fields) { // everything but the name: - $query = Category::orderBy('id'); + $query = self::orderBy('id'); $search = $fields; unset($search['name']); foreach ($search as $name => $value) { @@ -56,7 +56,7 @@ class Category extends Model } } // create it! - $category = Category::create($fields); + $category = self::create($fields); return $category; diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 1ce71bb237..be87b5accf 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -37,7 +37,7 @@ class LimitRepetition extends Model public static function routeBinder($value) { if (auth()->check()) { - $object = LimitRepetition::where('limit_repetitions.id', $value) + $object = self::where('limit_repetitions.id', $value) ->leftJoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id') ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') ->where('budgets.user_id', auth()->user()->id) diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 8106423a33..6912a47582 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -43,7 +43,7 @@ class Tag extends TagSupport $search = $fields; unset($search['tag']); - $query = Tag::orderBy('id'); + $query = self::orderBy('id'); foreach ($search as $name => $value) { $query->where($name, $value); } @@ -57,7 +57,7 @@ class Tag extends TagSupport // create it! $fields['tagMode'] = 'nothing'; $fields['description'] = $fields['description'] ?? ''; - $tag = Tag::create($fields); + $tag = self::create($fields); return $tag; diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index d46f7349e5..56773f7b5c 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -64,7 +64,7 @@ class TransactionJournal extends TransactionJournalSupport public static function routeBinder($value) { if (auth()->check()) { - $object = TransactionJournal::where('transaction_journals.id', $value) + $object = self::where('transaction_journals.id', $value) ->with('transactionType') ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->where('user_id', auth()->user()->id)->first(['transaction_journals.*']); diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index d22d725a0e..9d0e6af288 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -57,7 +57,7 @@ class TransactionType extends Model */ public function isDeposit() { - return $this->type === TransactionType::DEPOSIT; + return $this->type === self::DEPOSIT; } /** @@ -65,7 +65,7 @@ class TransactionType extends Model */ public function isOpeningBalance() { - return $this->type === TransactionType::OPENING_BALANCE; + return $this->type === self::OPENING_BALANCE; } /** @@ -73,7 +73,7 @@ class TransactionType extends Model */ public function isTransfer() { - return $this->type === TransactionType::TRANSFER; + return $this->type === self::TRANSFER; } /** @@ -81,7 +81,7 @@ class TransactionType extends Model */ public function isWithdrawal() { - return $this->type === TransactionType::WITHDRAWAL; + return $this->type === self::WITHDRAWAL; } /** diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index ff5e4467b5..f4633d5ec3 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -199,8 +199,7 @@ class BudgetRepository implements BudgetRepositoryInterface */ public function getAllBudgetLimitRepetitions(Carbon $start, Carbon $end): Collection { - $query = LimitRepetition:: - leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') + $query = LimitRepetition::leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_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')) diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index ede86894c7..5a9f07704c 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -136,8 +136,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface public function reset(): bool { // split query to make it work in sqlite: - $set = PiggyBank:: - leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id') + $set = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id') ->where('accounts.user_id', $this->user->id)->get(['piggy_banks.*']); foreach ($set as $e) { $e->order = 0; diff --git a/app/Support/Steam.php b/app/Support/Steam.php index d94b7af230..65e4b148a6 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -159,8 +159,7 @@ class Steam return $cache->get(); } - $balances = Transaction:: - leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') + $balances = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->where('transaction_journals.date', '<=', $date->format('Y-m-d')) ->groupBy('transactions.account_id') ->whereIn('transactions.account_id', $ids) diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index 35b973c265..9555f3e00c 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -296,8 +296,7 @@ class FireflyValidator extends Validator { $accountId = $this->data['id'] ?? 0; - $query = AccountMeta:: - leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id') + $query = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id') ->where('accounts.user_id', auth()->user()->id) ->where('account_meta.name', 'accountNumber');