diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 1125a79472..d508927317 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -41,7 +41,6 @@ use Navigation; use Preferences; use Response; use Session; -use View; /** * Class ReconcileController. @@ -147,9 +146,14 @@ class ReconcileController extends Controller } $difference = bcadd(bcadd(bcsub($startBalance, $endBalance), $clearedAmount), $amount); $diffCompare = bccomp($difference, '0'); - $return = [ + $return = [ 'post_uri' => $route, - 'html' => view('accounts.reconcile.overview', compact('account', 'start', 'diffCompare', 'difference', 'end', 'clearedIds', 'transactionIds', 'clearedAmount', 'startBalance', 'endBalance', 'amount', 'route', 'countCleared'))->render(), + 'html' => view( + 'accounts.reconcile.overview', compact( + 'account', 'start', 'diffCompare', 'difference', 'end', 'clearedIds', 'transactionIds', 'clearedAmount', 'startBalance', 'endBalance', 'amount', + 'route', 'countCleared' + ) + )->render(), ]; return Response::json($return); @@ -204,7 +208,11 @@ class ReconcileController extends Controller $overviewUri = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']); $indexUri = route('accounts.reconcile', [$account->id, '%start%', '%end%']); - return view('accounts.reconcile.index', compact('account', 'currency', 'subTitleIcon', 'start', 'end', 'subTitle', 'startBalance', 'endBalance', 'transactionsUri', 'overviewUri', 'indexUri')); + return view( + 'accounts.reconcile.index', compact( + 'account', 'currency', 'subTitleIcon', 'start', 'end', 'subTitle', 'startBalance', 'endBalance', 'transactionsUri', 'overviewUri', 'indexUri' + ) + ); } /** diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index ada71fbcda..38b14bae8d 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -51,7 +51,7 @@ class LinkController extends Controller return $next($request); } ); - $this->middleware(IsLimitedUser::class)->except(['index','show']); + $this->middleware(IsLimitedUser::class)->except(['index', 'show']); } /** diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 2ee4cb7684..77e08b0a47 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -52,7 +52,7 @@ class UserController extends Controller return $next($request); } ); - $this->middleware(IsLimitedUser::class)->except(['index','show']); + $this->middleware(IsLimitedUser::class)->except(['index', 'show']); } /** diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 57f16dfef1..231e216233 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -118,7 +118,7 @@ class LoginController extends Controller /** * Show the application's login form. * - * @param Request $request + * @param Request $request * * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View */ diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 389c0b689c..bffa80b359 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -229,7 +229,7 @@ class BillController extends Controller public function show(Request $request, BillRepositoryInterface $repository, Bill $bill) { /** @var Carbon $date */ - $date = session('start'); + $date = session('start'); /** @var Carbon $end */ $end = session('end'); $year = $date->year; diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 848d8df320..c1a646f55c 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -85,7 +85,7 @@ class BudgetController extends Controller $start = Carbon::createFromFormat('Y-m-d', $request->get('start')); $end = Carbon::createFromFormat('Y-m-d', $request->get('end')); $budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount); - if (bccomp($amount,'0') === 0) { + if (bccomp($amount, '0') === 0) { $budgetLimit = null; } diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index b447f9c614..43259f84fc 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -227,7 +227,7 @@ class CategoryController extends Controller $start = null; $end = null; $periods = new Collection; - $path = route('categories.show', [$category->id]); + $path = route('categories.show', [$category->id]); // prep for "all" view. if ('all' === $moment) { @@ -236,7 +236,7 @@ class CategoryController extends Controller /** @var Carbon $start */ $start = null === $first ? new Carbon : $first; $end = new Carbon; - $path = route('categories.show', [$category->id,'all']); + $path = route('categories.show', [$category->id, 'all']); } // prep for "specific date" view. @@ -249,7 +249,7 @@ class CategoryController extends Controller 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat),] ); $periods = $this->getPeriodOverview($category); - $path = route('categories.show', [$category->id, $moment]); + $path = route('categories.show', [$category->id, $moment]); } // prep for current period diff --git a/app/Http/Controllers/Import/BankController.php b/app/Http/Controllers/Import/BankController.php index 1b9358eed9..c911ffc2e8 100644 --- a/app/Http/Controllers/Import/BankController.php +++ b/app/Http/Controllers/Import/BankController.php @@ -26,9 +26,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Support\Import\Prerequisites\PrerequisitesInterface; -use Illuminate\Http\Request; -use Log; -use Session; class BankController extends Controller { @@ -61,5 +58,4 @@ class BankController extends Controller } - } diff --git a/app/Http/Controllers/Import/ConfigurationController.php b/app/Http/Controllers/Import/ConfigurationController.php index 428ffc8c9e..c51b2e432d 100644 --- a/app/Http/Controllers/Import/ConfigurationController.php +++ b/app/Http/Controllers/Import/ConfigurationController.php @@ -82,7 +82,7 @@ class ConfigurationController extends Controller if ($configurator->isJobConfigured()) { return redirect(route('import.status', [$job->key])); } - $data = $request->all(); + $data = $request->all(); $configurator->configureJob($data); // get possible warning from configurator: diff --git a/app/Http/Controllers/Import/FileController.php b/app/Http/Controllers/Import/FileController.php index d6ad685aa2..6eb81d17d8 100644 --- a/app/Http/Controllers/Import/FileController.php +++ b/app/Http/Controllers/Import/FileController.php @@ -29,7 +29,6 @@ use FireflyIII\Import\Configurator\ConfiguratorInterface; use FireflyIII\Import\Routine\ImportRoutine; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Http\Response as LaravelResponse; use Log; @@ -176,7 +175,6 @@ class FileController extends Controller } - /** * Step 4. Save the configuration. * diff --git a/app/Http/Controllers/Import/StatusController.php b/app/Http/Controllers/Import/StatusController.php index d04d4edb00..eea28fea64 100644 --- a/app/Http/Controllers/Import/StatusController.php +++ b/app/Http/Controllers/Import/StatusController.php @@ -31,6 +31,7 @@ class StatusController extends Controller } ); } + /** * @param ImportJob $job * @@ -89,6 +90,7 @@ class StatusController extends Controller $result['started'] = true; $result['running'] = true; } + // TODO cannot handle 'errored' return Response::json($result); diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 463a3cbae0..a1dbfc93a8 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -62,7 +62,7 @@ class ProfileController extends Controller return $next($request); } ); - $this->middleware(IsLimitedUser::class)->except(['confirmEmailChange','index', 'undoEmailChange']); + $this->middleware(IsLimitedUser::class)->except(['confirmEmailChange', 'index', 'undoEmailChange']); } /** diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php index 26566c82ac..2f39d2330f 100644 --- a/app/Http/Controllers/Report/ExpenseController.php +++ b/app/Http/Controllers/Report/ExpenseController.php @@ -246,7 +246,6 @@ class ExpenseController extends Controller } - public function topIncome(Collection $accounts, Collection $expense, Carbon $start, Carbon $end) { // Properties for cache: diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index cc1b2bb6fb..d7cf237f24 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -88,8 +88,9 @@ class ReportController extends Controller View::share( 'subTitle', trans( - 'firefly.report_default', ['start' => $start->formatLocalized($this->monthFormat), 'end' => $end->formatLocalized($this->monthFormat),] - ) + 'firefly.report_default', + ['start' => $start->formatLocalized($this->monthFormat), 'end' => $end->formatLocalized($this->monthFormat),] + ) ); $generator = ReportGeneratorFactory::reportGenerator('Account', $start, $end); diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index cb4bfe5e8e..9a2d316fbb 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -32,7 +32,6 @@ use Log; use Preferences; use Session; use URL; -use View; /** * Class LinkController. diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index 1d9ee97647..e8988208b9 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -22,7 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Middleware; -use Closure; use Illuminate\Http\Request; use Illuminate\Session\Middleware\StartSession; diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index 38c209887a..bf1c068918 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -22,8 +22,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Carbon\Carbon; - /** * Class PiggyBankFormRequest. */ diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index 187cf09f6d..41a0400d77 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -45,28 +45,6 @@ class ReportFormRequest extends Request return auth()->check(); } - /** - * @return Collection - */ - public function getExpenseList(): Collection - { - // fixed - /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class); - $set = $this->get('exp_rev'); - $collection = new Collection; - if (is_array($set)) { - foreach ($set as $accountId) { - $account = $repository->find(intval($accountId)); - if (null !== $account->id) { - $collection->push($account); - } - } - } - - return $collection; - } - /** * @return Collection */ @@ -152,6 +130,28 @@ class ReportFormRequest extends Request return $date; } + /** + * @return Collection + */ + public function getExpenseList(): Collection + { + // fixed + /** @var AccountRepositoryInterface $repository */ + $repository = app(AccountRepositoryInterface::class); + $set = $this->get('exp_rev'); + $collection = new Collection; + if (is_array($set)) { + foreach ($set as $accountId) { + $account = $repository->find(intval($accountId)); + if (null !== $account->id) { + $collection->push($account); + } + } + } + + return $collection; + } + /** * @return Carbon * diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 0fa4484214..ae1b3bb1a4 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -882,7 +882,9 @@ Breadcrumbs::register( 'accounts.reconcile.edit', function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.show', $journal); - $breadcrumbs->push(trans('breadcrumbs.edit_reconciliation', ['description' => $journal->description]), route('accounts.reconcile.edit', [$journal->id])); + $breadcrumbs->push( + trans('breadcrumbs.edit_reconciliation', ['description' => $journal->description]), route('accounts.reconcile.edit', [$journal->id]) + ); } );