From 50b599b1a956a6f42cbba8c857f30c747f005e62 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 21 Jun 2018 18:58:27 +0200 Subject: [PATCH] Some refactoring. --- app/Http/Controllers/Admin/HomeController.php | 4 ++-- app/Http/Controllers/DebugController.php | 6 +++--- app/Http/Controllers/HomeController.php | 7 ------- app/Http/Controllers/RuleController.php | 2 +- app/Http/Controllers/Transaction/SingleController.php | 4 +--- app/Models/Account.php | 3 ++- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 41fb8cdae3..b53ac0b274 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -51,9 +51,9 @@ class HomeController extends Controller { $title = (string)trans('firefly.administration'); $mainTitleIcon = 'fa-hand-spock-o'; - $sandstorm = 1 === (int)getenv('SANDSTORM'); + $sandstorm = 1 === (int)getenv('SANDSTORM'); - return view('admin.index', compact('title', 'mainTitleIcon','sandstorm')); + return view('admin.index', compact('title', 'mainTitleIcon', 'sandstorm')); } /** diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index a5e7b81036..1caf4925df 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -185,9 +185,9 @@ class DebugController extends Controller 'two-factor.lost', 'reports.options', 'debug', 'import.create-job', 'import.download', 'import.start', 'import.status.json', 'preferences.delete-code', 'rules.test-triggers', 'piggy-banks.remove-money', 'piggy-banks.add-money', 'accounts.reconcile.transactions', 'accounts.reconcile.overview', 'export.download', - 'transactions.clone', 'two-factor.index', 'api.v1', 'installer.','attachments.view','import.create', - 'import.job.download','import.job.start','import.job.status.json','import.job.store','recurring.events', - 'recurring.suggest' + 'transactions.clone', 'two-factor.index', 'api.v1', 'installer.', 'attachments.view', 'import.create', + 'import.job.download', 'import.job.start', 'import.job.status.json', 'import.job.store', 'recurring.events', + 'recurring.suggest', ]; $return = ' '; /** @var Route $route */ diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index dcca1c2d3f..6dc45a198d 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -22,11 +22,8 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; -use Artisan; use Carbon\Carbon; -use Exception; use FireflyIII\Events\RequestedVersionCheckStatus; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Middleware\Installer; use FireflyIII\Http\Middleware\IsDemoUser; @@ -35,11 +32,9 @@ use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Http\Request; -use Illuminate\Routing\Route; use Illuminate\Support\Collection; use Log; use Preferences; -use Route as RouteFacade; use View; /** @@ -99,8 +94,6 @@ class HomeController extends Controller } - - /** * @param AccountRepositoryInterface $repository * diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 3c44641bd1..5704a28d89 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -230,7 +230,7 @@ class RuleController extends Controller } $hasOldInput = null !== $request->old('_token'); - $preFilled = [ + $preFilled = [ 'active' => $hasOldInput ? (bool)$request->old('active') : $rule->active, 'stop_processing' => $hasOldInput ? (bool)$request->old('stop_processing') : $rule->stop_processing, 'strict' => $hasOldInput ? (bool)$request->old('strict') : $rule->strict, diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index c1b22258c1..8d91025d75 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -34,9 +34,7 @@ use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Log; @@ -93,7 +91,7 @@ class SingleController extends Controller $destination = $this->repository->getJournalDestinationAccounts($journal)->first(); $budgetId = $this->repository->getJournalBudgetId($journal); $categoryName = $this->repository->getJournalCategoryName($journal); - $tags = implode(',', $this->repository->getTags($journal)); + $tags = implode(',', $this->repository->getTags($journal)); /** @var Transaction $transaction */ $transaction = $journal->transactions()->first(); $amount = app('steam')->positive($transaction->amount); diff --git a/app/Models/Account.php b/app/Models/Account.php index b58d60de6d..c29fe3c988 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -42,7 +42,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property string $name * @property string $iban * @property AccountType $accountType - * @property bool $active + * @property bool $active + * @property string $virtual_balance */ class Account extends Model {